Updated Gnulib

42 files changed, 22605 insertions, 14269 deletions

diff --git a/gnulib/po/.gitignore b/gnulib/po/.gitignore
index 3dd96ebf..1aeced6b 100644
--- a/gnulib/po/.gitignore
+++ b/gnulib/po/.gitignore
@@ -1,5 +1 @@
-/LINGUAS
-/Makefile.in.in
-/Makevars
-/POTFILES.in
-/remove-potcdate.sin
+/*.gmo
diff --git a/gnulib/po/LINGUAS b/gnulib/po/LINGUAS
new file mode 100644
index 00000000..a18900cd
--- /dev/null
+++ b/gnulib/po/LINGUAS
@@ -0,0 +1,37 @@
+# Set of available languages.
+af
+be
+bg
+ca
+cs
+da
+de
+el
+es
+et
+eu
+fi
+fr
+ga
+gl
+hu
+it
+ja
+ko
+ms
+nb
+nl
+pl
+pt
+pt_BR
+ro
+ru
+rw
+sk
+sl
+sv
+tr
+uk
+vi
+zh_CN
+zh_TW
diff --git a/gnulib/po/Makefile.in.in b/gnulib/po/Makefile.in.in
new file mode 100644
index 00000000..caedd7fd
--- /dev/null
+++ b/gnulib/po/Makefile.in.in
@@ -0,0 +1,445 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.18
+GETTEXT_MACRO_VERSION = 0.18
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+CHECK_MACRO_VERSION = \
+	test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	@$(CHECK_MACRO_VERSION)
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
+	else \
+	  package_gnu=''; \
+	fi; \
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/gnulib/po/Makevars b/gnulib/po/Makevars
new file mode 100644
index 00000000..44f0b332
--- /dev/null
+++ b/gnulib/po/Makevars
@@ -0,0 +1,68 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+
+# Usually the message domain is the same as the package name.
+# But here it has a '-gnulib' suffix.
+DOMAIN = ul-gnulib
+
+# These two variables depend on the location of this directory.
+subdir = gnulib/po
+top_builddir = ../..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = \
+  --keyword=_ --flag=_:1:pass-c-format \
+  --keyword=N_ --flag=N_:1:pass-c-format \
+  --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \
+  --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \
+  --flag=error:3:c-format --flag=error_at_line:5:c-format
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  gnulib is copyrighted by the FSF.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# 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 = bug-gnulib@gnu.org
+
+# 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 =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
diff --git a/gnulib/po/POTFILES.in b/gnulib/po/POTFILES.in
new file mode 100644
index 00000000..5c5ec70d
--- /dev/null
+++ b/gnulib/po/POTFILES.in
@@ -0,0 +1,104 @@
+## DO NOT EDIT! GENERATED AUTOMATICALLY!
+# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file 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 file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# Generated by gnulib-tool.
+
+# List of files which contain translatable strings.
+gnulib/alloca.c
+gnulib/alloca.in.h
+gnulib/argp-ba.c
+gnulib/argp-eexst.c
+gnulib/argp-fmtstream.c
+gnulib/argp-fmtstream.h
+gnulib/argp-fs-xinl.c
+gnulib/argp-help.c
+gnulib/argp-namefrob.h
+gnulib/argp-parse.c
+gnulib/argp-pin.c
+gnulib/argp-pv.c
+gnulib/argp-pvh.c
+gnulib/argp-xinl.c
+gnulib/argp.h
+gnulib/asnprintf.c
+gnulib/basename-lgpl.c
+gnulib/dirname-lgpl.c
+gnulib/dirname.h
+gnulib/dosname.h
+gnulib/errno.in.h
+gnulib/float+.h
+gnulib/float.c
+gnulib/float.in.h
+gnulib/flock.c
+gnulib/getopt.c
+gnulib/getopt.in.h
+gnulib/getopt1.c
+gnulib/getopt_int.h
+gnulib/gettext.h
+gnulib/intprops.h
+gnulib/itold.c
+gnulib/malloc.c
+gnulib/memchr.c
+gnulib/memchr.valgrind
+gnulib/mempcpy.c
+gnulib/memrchr.c
+gnulib/msvc-inval.c
+gnulib/msvc-inval.h
+gnulib/msvc-nothrow.c
+gnulib/msvc-nothrow.h
+gnulib/printf-args.c
+gnulib/printf-args.h
+gnulib/printf-parse.c
+gnulib/printf-parse.h
+gnulib/progname.c
+gnulib/progname.h
+gnulib/rawmemchr.c
+gnulib/rawmemchr.valgrind
+gnulib/signal.in.h
+gnulib/size_max.h
+gnulib/sleep.c
+gnulib/stdalign.in.h
+gnulib/stdbool.in.h
+gnulib/stddef.in.h
+gnulib/stdint.in.h
+gnulib/stdio.in.h
+gnulib/stdlib.in.h
+gnulib/strcasecmp.c
+gnulib/strchrnul.c
+gnulib/strchrnul.valgrind
+gnulib/strerror-override.c
+gnulib/strerror-override.h
+gnulib/strerror.c
+gnulib/string.in.h
+gnulib/strings.in.h
+gnulib/stripslash.c
+gnulib/strncasecmp.c
+gnulib/strndup.c
+gnulib/strnlen.c
+gnulib/sys_file.in.h
+gnulib/sys_types.in.h
+gnulib/sysexits.in.h
+gnulib/unistd.in.h
+gnulib/vasnprintf.c
+gnulib/vasnprintf.h
+gnulib/verify.h
+gnulib/vsnprintf.c
+gnulib/wchar.in.h
+gnulib/xsize.h
diff --git a/gnulib/po/af.po b/gnulib/po/af.po
index 8d2af679..3aa90957 100644
--- a/gnulib/po/af.po
+++ b/gnulib/po/af.po
@@ -7,41 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.2.1\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2004-03-17 11:58+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
-"Language: af\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "ongeldige parameter %s vir %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "dubbelsinnige parameter %s vir %s"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
-
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Geldige parameters is soos volg:"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -50,413 +39,495 @@ msgstr ""
 "Verpligte parameters vir langformaat opsies is ook verpligtend vir "
 "kortformaat opsies.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Gebruik so:  %s [OPSIE]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Probeer `%s --help' vir meer inligting.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "Rapporteer foute aan <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Onbekende stelselfout"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "NAAM"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
+#: lib/argp-parse.c:619
+#, fuzzy, c-format
+msgid "%s: Too many arguments\n"
+msgstr "te veel parameters\n"
 
-#: gnulib/argp-parse.c:142
+#: lib/c-stack.c:244
 #, fuzzy
-msgid "print program version"
+msgid "program error"
 msgstr "leesfout"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "skryffout"
 
-#: gnulib/argp-parse.c:612
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: Too many arguments\n"
-msgstr "te veel parameters\n"
-
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+msgid "error while opening \"%s\" for reading"
+msgstr "kan nie %s oopmaak om te lees nie"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opsie `%s' is dubbelsinnig\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "kan nie %s oopmaak om te lees nie"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opsie `--%s' laat nie 'n parameter toe nie\n"
+msgid "error reading \"%s\""
+msgstr "fout met die les van %s"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opsie `%c%s' laat nie 'n parameter toe nie\n"
+msgid "error writing \"%s\""
+msgstr "fout met die skryf na %s"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opsie `%s' benodig 'n parameter\n"
+msgid "error after reading \"%s\""
+msgstr "fout met die les van %s"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: onbekende opsie `--%s'\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "'open' het gefaal"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: onbekende opsie `%c%s'\n"
+msgid "%s subprocess failed"
+msgstr "%s: seek het misluk"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ongeldige opsie -- %c\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "gewone le� l�er"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opsie benodig 'n parameter -- %c\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "gewone l�er"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opsie `-W %s' is dubbelsinnig\n"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "l�ergids"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opsie `-W %s' laat nie 'n parameter toe nie\n"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "spesiale blokl�er"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opsie `%s' benodig 'n parameter\n"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "spesiale karakterl�er"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "ongeldige parameter %s vir %s"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "dubbelsinnige parameter %s vir %s"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "simboliese skakel"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Geldige parameters is soos volg:"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "sok"
 
-#~ msgid "write error"
-#~ msgstr "skryffout"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "boodskapwagtou"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "kan nie %s oopmaak om te lees nie"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "semafoor"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "kan nie %s oopmaak om te lees nie"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "gedeeldegeheue-objek"
 
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "fout met die les van %s"
+msgid "typed memory object"
+msgstr "gedeeldegeheue-objek"
 
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "fout met die skryf na %s"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "vreemde l�er"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "fout met die les van %s"
+msgid "Address family for hostname not supported"
+msgstr "fifo-l�ers word nie ondersteun nie"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "'open' het gefaal"
+msgid "ai_family not supported"
+msgstr "fifo-l�ers word nie ondersteun nie"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: seek het misluk"
-
-#~ msgid "regular empty file"
-#~ msgstr "gewone le� l�er"
-
-#~ msgid "regular file"
-#~ msgstr "gewone l�er"
-
-#~ msgid "directory"
-#~ msgstr "l�ergids"
-
-#~ msgid "block special file"
-#~ msgstr "spesiale blokl�er"
-
-#~ msgid "character special file"
-#~ msgstr "spesiale karakterl�er"
-
-#~ msgid "fifo"
-#~ msgstr "fifo"
+msgid "ai_socktype not supported"
+msgstr "fifo-l�ers word nie ondersteun nie"
 
-#~ msgid "symbolic link"
-#~ msgstr "simboliese skakel"
+#: lib/gai_strerror.c:55
+#, fuzzy
+msgid "System error"
+msgstr "skryffout"
 
-#~ msgid "socket"
-#~ msgstr "sok"
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "Onbekende stelselfout"
 
-#~ msgid "message queue"
-#~ msgstr "boodskapwagtou"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opsie `%s' is dubbelsinnig\n"
 
-#~ msgid "semaphore"
-#~ msgstr "semafoor"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opsie `--%s' laat nie 'n parameter toe nie\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "gedeeldegeheue-objek"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opsie `%c%s' laat nie 'n parameter toe nie\n"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "gedeeldegeheue-objek"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opsie `%s' benodig 'n parameter\n"
 
-#~ msgid "weird file"
-#~ msgstr "vreemde l�er"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: onbekende opsie `--%s'\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "fifo-l�ers word nie ondersteun nie"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: onbekende opsie `%c%s'\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "fifo-l�ers word nie ondersteun nie"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: onwettige opsie -- %c\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "fifo-l�ers word nie ondersteun nie"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ongeldige opsie -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "skryffout"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opsie benodig 'n parameter -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Onbekende stelselfout"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opsie `-W %s' is dubbelsinnig\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: onwettige opsie -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opsie `-W %s' laat nie 'n parameter toe nie\n"
 
-#~ msgid "block size"
-#~ msgstr "blokgrootte"
+#: lib/human.c:486
+msgid "block size"
+msgstr "blokgrootte"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s bestaan maar is nie 'n l�ergids nie"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s bestaan maar is nie 'n l�ergids nie"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "kan nie die eienaar en/of groep van %s verander nie"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "kan nie die eienaar en/of groep van %s verander nie"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "Kan nie l�ergids %s skep nie."
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "Kan nie l�ergids %s skep nie."
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "kan nie chdir doen om na gids %s te gaan nie"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "kan nie chdir doen om na gids %s te gaan nie"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "kan nie toegangsregte van %s verander nie"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "kan nie toegangsregte van %s verander nie"
 
-#~ msgid "memory exhausted"
-#~ msgstr "geheue uitgeput"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "geheue uitgeput"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "kon nie na aanvanklike werkgids terugkeer nie"
+msgid "unable to record current working directory"
+msgstr "kon nie na aanvanklike werkgids terugkeer nie"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "kon nie na aanvanklike werkgids terugkeer nie"
+#: lib/openat-die.c:49
+msgid "failed to return to initial working directory"
+msgstr "kon nie na aanvanklike werkgids terugkeer nie"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "magtigings vir %s kon nie behou word nie"
+msgid "Failed to open /dev/zero for read"
+msgstr "magtigings vir %s kon nie behou word nie"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "kan nie die skakel %s skep nie"
-
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "'"
-#~ msgstr "'"
-
+msgid "cannot create pipe"
+msgstr "kan nie die skakel %s skep nie"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: ongeldige re�lmatige uitdrukking: %s"
+msgid "Invalid regular expression"
+msgstr "%s: ongeldige re�lmatige uitdrukking: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "ongeldige karakterklas `%s'"
+msgid "Invalid character class name"
+msgstr "ongeldige karakterklas `%s'"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "geheue uitgeput"
+msgid "Memory exhausted"
+msgstr "geheue uitgeput"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: ongeldige re�lmatige uitdrukking: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: ongeldige re�lmatige uitdrukking: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "fout in soektog met re�lmatige uitdrukking"
+msgid "Premature end of regular expression"
+msgstr "fout in soektog met re�lmatige uitdrukking"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: ongeldige re�lmatige uitdrukking: %s"
+msgid "Regular expression too big"
+msgstr "%s: ongeldige re�lmatige uitdrukking: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "fout in soektog met re�lmatige uitdrukking"
+msgid "No previous regular expression"
+msgstr "fout in soektog met re�lmatige uitdrukking"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[jJ]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[jJ]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv-funksie onbruikbaar"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "iconv-funksie onbruikbaar"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv-funksie is nie beskikbaar nie"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "iconv-funksie is nie beskikbaar nie"
 
-#~ msgid "character out of range"
-#~ msgstr "karakter is buite die grense"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "karakter is buite die grense"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie: %s"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "kan nie U+%04X omskakel na 'n plaaslike karakterstel nie: %s"
 
-#~ msgid "invalid user"
-#~ msgstr "ongeldige gebruiker"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "ongeldige gebruiker"
 
-#~ msgid "invalid group"
-#~ msgstr "ongeldige groep "
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "ongeldige groep "
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "kan nie die aantekengroep van 'n numeriese UID verkry nie"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "kan nie die aantekengroep van 'n numeriese UID verkry nie"
 
 #  TRANSLATORS: %s denotes an author name.
 #  TRANSLATORS: %s denotes an author name.
-#~ msgid "Written by %s.\n"
-#~ msgstr "Geskryf deur %s.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Geskryf deur %s.\n"
 
 #  TRANSLATORS: Each %s denotes an author name.
 #  TRANSLATORS: Each %s denotes an author name.
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Geskryf deur %s en %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Geskryf deur %s en %s.\n"
 
 #  TRANSLATORS: Each %s denotes an author name.
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Geskryf deur %s, %s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Geskryf deur %s, %s, %s \n"
-#~ "en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Geskryf deur %s, %s, %s, \n"
-#~ "%s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Geskryf deur %s, %s, %s, \n"
-#~ "%s, %s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Geskryf deur %s, %s, %s, \n"
-#~ "%s, %s, %s en %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Geskryf deur %s, %s en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Geskryf deur %s, %s, %s \n"
+"en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Geskryf deur %s, %s, %s, \n"
+"%s en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Geskryf deur %s, %s, %s, \n"
+"%s, %s en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Geskryf deur %s, %s, %s, \n"
+"%s, %s, %s en %s.\n"
 
 #  TRANSLATORS: Each %s denotes an author name.
 #  You can use line breaks, estimating that each author name occupies
 #  ca. 16 screen columns and that a screen line has ca. 80 columns.
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Geskryf deur %s, %s, %s, \n"
-#~ "%s, %s, %s, %s\n"
-#~ "en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Geskryf deur %s, %s, %s, \n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Geskryf deur %s, %s, %s, \n"
-#~ "%s, %s, %s, %s\n"
-#~ "%s, %s en ander.\n"
-
-#~ msgid "string comparison failed"
-#~ msgstr "stringvergelyking het gefaal"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Stel  LC_ALL='C' om die probleem te systap"
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Die stringe wat vergelyk is, is %s en %s."
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:130
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Geskryf deur %s, %s, %s, \n"
+"%s, %s, %s, %s\n"
+"en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:138
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Geskryf deur %s, %s, %s, \n"
+"%s, %s, %s, %s,\n"
+"%s en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:148
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Geskryf deur %s, %s, %s, \n"
+"%s, %s, %s, %s\n"
+"%s, %s en ander.\n"
+
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "stringvergelyking het gefaal"
+
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Stel  LC_ALL='C' om die probleem te systap"
+
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Die stringe wat vergelyk is, is %s en %s."
diff --git a/gnulib/po/be.po b/gnulib/po/be.po
index 2a6e0503..7cbf0bb2 100644
--- a/gnulib/po/be.po
+++ b/gnulib/po/be.po
@@ -7,408 +7,450 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.0.91\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2003-10-30 01:10+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "нерэчаісны довад %s для %s"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "неадназначны довад %s для %s"
 
-#: gnulib/argp-help.c:247
+#: lib/argmatch.c:157
 #, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Рэчаісныя довады:"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
 msgstr "Довады, абавязковыя для доўгіх выбараў, абавязковыя й для кароткіх.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Выкарыстаньне: %s [ВЫБАР]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Паспрабуйце \"%s --help\" для больш падрабязных зьвестак.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "Паведамляйце пра памылкі на <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Невядомая сыстэмная памылка"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "НАЗВА"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
+#: lib/argp-parse.c:619
+#, fuzzy, c-format
+msgid "%s: Too many arguments\n"
+msgstr "зашмат довадаў\n"
 
-#: gnulib/argp-parse.c:142
+#: lib/c-stack.c:244
 #, fuzzy
-msgid "print program version"
+msgid "program error"
 msgstr "памылка чытаньня"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "памылка запісу"
 
-#: gnulib/argp-parse.c:612
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: Too many arguments\n"
-msgstr "зашмат довадаў\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "немагыма адчыніць %s для чытаньня"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
-
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: выбар `%s' неадназначны\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "немагыма адчыніць %s для чытаньня"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: выбар `--%s' не дазваляе довад\n"
+msgid "error reading \"%s\""
+msgstr "памылка чытаньня %s"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: выбар `%c%s' не дазваляе довад\n"
+msgid "error writing \"%s\""
+msgstr "памылка запісу %s"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: выбар `%s' патрабуе довад\n"
+msgid "error after reading \"%s\""
+msgstr "памылка чытаньня %s"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: нераспазнаны выбар `--%s'\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "памылка адкрыцьця"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: нераспазнаны выбар `%c%s'\n"
+msgid "%s subprocess failed"
+msgstr "%s: збой seek"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: нерэчаісны выбар -- %c\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "звычайны парожні файл"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: выбар патрабуе довад -- %c\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "звычайны файл"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: выбар `-W %s' неадназначыны\n"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "тэчка"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: выбар `-W %s' не дазваляе довад\n"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "асаблівы кавалкавы файл"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: выбар `%s' патрабуе довад\n"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "асаблівы знакавы файл"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "нерэчаісны довад %s для %s"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "неадназначны довад %s для %s"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "знакавае лучыва"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Рэчаісныя довады:"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "socket"
 
-#~ msgid "write error"
-#~ msgstr "памылка запісу"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "чарга паведамленьняў"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "немагыма адчыніць %s для чытаньня"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "сэмафор"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "немагыма адчыніць %s для чытаньня"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "абьект з агульнай памяцьцю"
 
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "памылка чытаньня %s"
+msgid "typed memory object"
+msgstr "абьект з агульнай памяцьцю"
 
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "памылка запісу %s"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "лёсавы файл"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "памылка чытаньня %s"
+msgid "Address family for hostname not supported"
+msgstr "fifo файлы непадтрымліваюцца"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "памылка адкрыцьця"
+msgid "ai_family not supported"
+msgstr "fifo файлы непадтрымліваюцца"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: збой seek"
-
-#~ msgid "regular empty file"
-#~ msgstr "звычайны парожні файл"
-
-#~ msgid "regular file"
-#~ msgstr "звычайны файл"
-
-#~ msgid "directory"
-#~ msgstr "тэчка"
-
-#~ msgid "block special file"
-#~ msgstr "асаблівы кавалкавы файл"
+msgid "ai_socktype not supported"
+msgstr "fifo файлы непадтрымліваюцца"
 
-#~ msgid "character special file"
-#~ msgstr "асаблівы знакавы файл"
-
-#~ msgid "fifo"
-#~ msgstr "fifo"
-
-#~ msgid "symbolic link"
-#~ msgstr "знакавае лучыва"
+#: lib/gai_strerror.c:55
+#, fuzzy
+msgid "System error"
+msgstr "памылка запісу"
 
-#~ msgid "socket"
-#~ msgstr "socket"
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "Невядомая сыстэмная памылка"
 
-#~ msgid "message queue"
-#~ msgstr "чарга паведамленьняў"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: выбар `%s' неадназначны\n"
 
-#~ msgid "semaphore"
-#~ msgstr "сэмафор"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: выбар `--%s' не дазваляе довад\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "абьект з агульнай памяцьцю"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: выбар `%c%s' не дазваляе довад\n"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "абьект з агульнай памяцьцю"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: выбар `%s' патрабуе довад\n"
 
-#~ msgid "weird file"
-#~ msgstr "лёсавы файл"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: нераспазнаны выбар `--%s'\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "fifo файлы непадтрымліваюцца"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: нераспазнаны выбар `%c%s'\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "fifo файлы непадтрымліваюцца"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: недапушчальны выраб -- %c\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "fifo файлы непадтрымліваюцца"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: нерэчаісны выбар -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "памылка запісу"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: выбар патрабуе довад -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Невядомая сыстэмная памылка"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: выбар `-W %s' неадназначыны\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: недапушчальны выраб -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: выбар `-W %s' не дазваляе довад\n"
 
-#~ msgid "block size"
-#~ msgstr "памер кавалку"
+#: lib/human.c:486
+msgid "block size"
+msgstr "памер кавалку"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s існуе, але гэта ня тэчка"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s існуе, але гэта ня тэчка"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "немагчыма зьмяніць уладальніка й/ці групу %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "немагчыма зьмяніць уладальніка й/ці групу %s"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "немагчыма стварыць тэчку %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "немагчыма стварыць тэчку %s"
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "немагчыма перайсьці да тэчкі %s"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "немагчыма перайсьці да тэчкі %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "немагчыма зьмяніць правы %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "немагчыма зьмяніць правы %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "памяць вычарпана"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "памяць вычарпана"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "немагчыма вярнуцца ў пачатковую працоўную тэчку"
+msgid "unable to record current working directory"
+msgstr "немагчыма вярнуцца ў пачатковую працоўную тэчку"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "немагчыма вярнуцца ў пачатковую працоўную тэчку"
+#: lib/openat-die.c:49
+msgid "failed to return to initial working directory"
+msgstr "немагчыма вярнуцца ў пачатковую працоўную тэчку"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "збой пры захаваньні правоў для %s"
+msgid "Failed to open /dev/zero for read"
+msgstr "збой пры захаваньні правоў для %s"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "немагчыма стварыць лучыва %s"
-
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "'"
-#~ msgstr "'"
-
+msgid "cannot create pipe"
+msgstr "немагчыма стварыць лучыва %s"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: нерэчаісны звычайны выраз: %s"
+msgid "Invalid regular expression"
+msgstr "%s: нерэчаісны звычайны выраз: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "нерэчаісны знак %s у радку рэжыму %s"
+msgid "Invalid character class name"
+msgstr "нерэчаісны знак %s у радку рэжыму %s"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "памяць вычарпана"
+msgid "Memory exhausted"
+msgstr "памяць вычарпана"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: нерэчаісны звычайны выраз: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: нерэчаісны звычайны выраз: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "памылка ў пошуку звычайнага выразу"
+msgid "Premature end of regular expression"
+msgstr "памылка ў пошуку звычайнага выразу"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: нерэчаісны звычайны выраз: %s"
+msgid "Regular expression too big"
+msgstr "%s: нерэчаісны звычайны выраз: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "памылка ў пошуку звычайнага выразу"
-
-#~ msgid "^[yY]"
-#~ msgstr "^[тТ]"
+msgid "No previous regular expression"
+msgstr "памылка ў пошуку звычайнага выразу"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[нН]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[тТ]"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "функцыя iconv непрыгодна для выкарыстаньня"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[нН]"
 
-#~ msgid "iconv function not available"
-#~ msgstr "недаступна функцыя iconv"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "функцыя iconv непрыгодна для выкарыстаньня"
 
-#~ msgid "character out of range"
-#~ msgstr "знак па за дапушчальнымі межамі"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "недаступна функцыя iconv"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "немагчыма пераўтварыць U+%04X у мясцовы набор знакаў"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "знак па за дапушчальнымі межамі"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "немагчыма пераўтварыць U+%04X у мясцовы набор знакаў: %s"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "немагчыма пераўтварыць U+%04X у мясцовы набор знакаў"
 
-#~ msgid "invalid user"
-#~ msgstr "нерэчаісны карыстальнік"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "немагчыма пераўтварыць U+%04X у мясцовы набор знакаў: %s"
 
-#~ msgid "invalid group"
-#~ msgstr "нерэчаісная група"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "нерэчаісны карыстальнік"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "немагчыма атрымаць уліковую групу лічбавага UID"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "нерэчаісная група"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Стваральнік %s.\n"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "немагчыма атрымаць уліковую групу лічбавага UID"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Стваральнік %s.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Стваральнік %s.\n"
 
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Стваральнік %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Стваральнік %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "Стваральнік %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Стваральнік %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "Стваральнік %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Стваральнік %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Стваральнік %s.\n"
 
-#~ msgid "string comparison failed"
-#~ msgstr "памылка параўнаньня радку"
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "памылка параўнаньня радку"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Усталюйце LC_ALL='C' каб працаваць без пытаньняў."
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Усталюйце LC_ALL='C' каб працаваць без пытаньняў."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Радкі былі параўнаны тут %s і тут %s."
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Радкі былі параўнаны тут %s і тут %s."
diff --git a/gnulib/po/bg.po b/gnulib/po/bg.po
index a47ac6a1..4c447532 100644
--- a/gnulib/po/bg.po
+++ b/gnulib/po/bg.po
@@ -8,42 +8,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.90\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2005-10-12 21:41+0300\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "недопустим аргумент %s за %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "двусмислен аргумент %s за %s"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
-
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Допустими аргументи са:"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -51,470 +40,572 @@ msgid ""
 msgstr ""
 "Аргументите, задължителни за дългите опции, са задължителни и за късите.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Използване: %s [ОПЦИЯ]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Използвайте \"%s --help\" за повече информация.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "Съобщавайте за програмни грешки на <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Непозната системна грешка"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "ИМЕ"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
-#, fuzzy
-msgid "print program version"
-msgstr "грешка при четене"
-
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: твърде много редове с контролни суми"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
-
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: опцията \"%s\" е двусмислена\n"
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: опцията \"--%s\" не допуска аргумент\n"
-
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: опцията \"%c%s\" не допуска аргумент\n"
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "грешка при четене"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: опцията \"%s\" изисква аргумент\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "грешка при запис"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: непозната опция \"--%s\"\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "не може да се отвори %s за четене"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: непозната опция \"%c%s\"\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "не може да се отвори %s за запис"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: неправилна опция -- %c\n"
+msgid "error reading \"%s\""
+msgstr "грешка при четене на %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: опция изисква аргумент -- %c\n"
+msgid "error writing \"%s\""
+msgstr "грешка при запис в %s"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: опцията \"-W %s\" е двусмислена\n"
+msgid "error after reading \"%s\""
+msgstr "грешка при четене на %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: опцията \"-W %s\" не допуска аргумент\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "неуспешно отваряне на файл"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: опцията \"%s\" изисква аргумент\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "недопустим аргумент %s за %s"
+msgid "%s subprocess failed"
+msgstr "%s: неуспешно позициониране (seek) във файл"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "двусмислен аргумент %s за %s"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "обикновеният празен файл"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Допустими аргументи са:"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "обикновеният файл"
 
-#~ msgid "write error"
-#~ msgstr "грешка при запис"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "каталогът"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "не може да се отвори %s за четене"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "специалният блоков файл"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "не може да се отвори %s за запис"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "специалният символен файл"
 
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "грешка при четене на %s"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "именуваният канал"
 
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "грешка при запис в %s"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "символната връзка"
 
-#, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "грешка при четене на %s"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "гнездото"
 
-#, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "неуспешно отваряне на файл"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "опашката със съобщения"
 
-#, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: неуспешно позициониране (seek) във файл"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "семафорът"
 
-#~ msgid "regular empty file"
-#~ msgstr "обикновеният празен файл"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "споделеният обект в паметта"
 
-#~ msgid "regular file"
-#~ msgstr "обикновеният файл"
+#: lib/file-type.c:73
+msgid "typed memory object"
+msgstr "типизираният обект в паметта"
 
-#~ msgid "directory"
-#~ msgstr "каталогът"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "странният файл"
 
-#~ msgid "block special file"
-#~ msgstr "специалният блоков файл"
+#: lib/gai_strerror.c:45
+msgid "Address family for hostname not supported"
+msgstr "Този тип адреси не се поддържа за името на хоста"
 
-#~ msgid "character special file"
-#~ msgstr "специалният символен файл"
+#: lib/gai_strerror.c:46
+msgid "Temporary failure in name resolution"
+msgstr "Временен проблем при намиране IP-адреса на хост"
 
-#~ msgid "fifo"
-#~ msgstr "именуваният канал"
+#: lib/gai_strerror.c:47
+msgid "Bad value for ai_flags"
+msgstr "Неправил на стойност за ai_flags"
 
-#~ msgid "symbolic link"
-#~ msgstr "символната връзка"
+#: lib/gai_strerror.c:48
+msgid "Non-recoverable failure in name resolution"
+msgstr "Окончателен неуспех при намиране IP-адреса на хост"
 
-#~ msgid "socket"
-#~ msgstr "гнездото"
+#: lib/gai_strerror.c:49
+msgid "ai_family not supported"
+msgstr "не се поддържа посочването на тип адреси (ai_family)"
 
-#~ msgid "message queue"
-#~ msgstr "опашката със съобщения"
+#: lib/gai_strerror.c:50
+msgid "Memory allocation failure"
+msgstr "Неуспешно заделяне на памет"
 
-#~ msgid "semaphore"
-#~ msgstr "семафорът"
+#: lib/gai_strerror.c:51
+msgid "No address associated with hostname"
+msgstr "Няма IP-адрес с посоченото име на хост"
 
-#~ msgid "shared memory object"
-#~ msgstr "споделеният обект в паметта"
+#: lib/gai_strerror.c:52
+msgid "Name or service not known"
+msgstr "Името или услугата са непознати"
 
-#~ msgid "typed memory object"
-#~ msgstr "типизираният обект в паметта"
+#: lib/gai_strerror.c:53
+msgid "Servname not supported for ai_socktype"
+msgstr ""
+"Името на услугата не се поддържа за използваното тип гнездо (ai_socktype)"
 
-#~ msgid "weird file"
-#~ msgstr "странният файл"
+#: lib/gai_strerror.c:54
+msgid "ai_socktype not supported"
+msgstr "не се поддържа посочването на тип гнездо (ai_socktype)"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Този тип адреси не се поддържа за името на хоста"
+#: lib/gai_strerror.c:55
+msgid "System error"
+msgstr "грешка в системата"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Временен проблем при намиране IP-адреса на хост"
+#: lib/gai_strerror.c:57
+msgid "Processing request in progress"
+msgstr "Заявката е в процес на изпълнение"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Неправил на стойност за ai_flags"
+#: lib/gai_strerror.c:58
+msgid "Request canceled"
+msgstr "Заявката е отменена"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Окончателен неуспех при намиране IP-адреса на хост"
+#: lib/gai_strerror.c:59
+msgid "Request not canceled"
+msgstr "Заявката не е отменена"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "не се поддържа посочването на тип адреси (ai_family)"
+#: lib/gai_strerror.c:60
+msgid "All requests done"
+msgstr "Изпълнени са всички заявки"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Неуспешно заделяне на памет"
+#: lib/gai_strerror.c:61
+msgid "Interrupted by a signal"
+msgstr "Прекъснат със сигнал"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Няма IP-адрес с посоченото име на хост"
+#: lib/gai_strerror.c:62
+msgid "Parameter string not correctly encoded"
+msgstr "Неправилно кодиран низ на аргумент"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Името или услугата са непознати"
+#: lib/gai_strerror.c:74
+msgid "Unknown error"
+msgstr "Непозната грешка"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr ""
-#~ "Името на услугата не се поддържа за използваното тип гнездо (ai_socktype)"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: опцията \"%s\" е двусмислена\n"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "не се поддържа посочването на тип гнездо (ai_socktype)"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: опцията \"--%s\" не допуска аргумент\n"
 
-#~ msgid "System error"
-#~ msgstr "грешка в системата"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: опцията \"%c%s\" не допуска аргумент\n"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Заявката е в процес на изпълнение"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: опцията \"%s\" изисква аргумент\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Заявката е отменена"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: непозната опция \"--%s\"\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Заявката не е отменена"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: непозната опция \"%c%s\"\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Изпълнени са всички заявки"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: неправилна опция -- %c\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Прекъснат със сигнал"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: неправилна опция -- %c\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Неправилно кодиран низ на аргумент"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: опция изисква аргумент -- %c\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Непозната грешка"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: опцията \"-W %s\" е двусмислена\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: неправилна опция -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: опцията \"-W %s\" не допуска аргумент\n"
 
-#~ msgid "block size"
-#~ msgstr "блоковият размер"
+#: lib/human.c:486
+msgid "block size"
+msgstr "блоковият размер"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s съществува, но не е каталог"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s съществува, но не е каталог"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "не може да се смени собственика и/или групата на %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "не може да се смени собственика и/или групата на %s"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "не може да се създаде каталог %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "не може да се създаде каталог %s"
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "не може да се влезе в каталога %s"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "не може да се влезе в каталога %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "не може да се сменят правата за достъп до %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "не може да се сменят правата за достъп до %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "паметта е изчерпана"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "паметта е изчерпана"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "не може да се запомни текущият работен каталог"
+#: lib/openat-die.c:36
+msgid "unable to record current working directory"
+msgstr "не може да се запомни текущият работен каталог"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "невъзможно връщане в първоначалния работен каталог"
+#: lib/openat-die.c:49
+msgid "failed to return to initial working directory"
+msgstr "невъзможно връщане в първоначалния работен каталог"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "%s: не може да се отвори в режим за писане"
+msgid "Failed to open /dev/zero for read"
+msgstr "%s: не може да се отвори в режим за писане"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "не може да се създаде връзка %s"
-
-#~ msgid "`"
-#~ msgstr "\""
-
-#~ msgid "'"
-#~ msgstr "\""
-
+msgid "cannot create pipe"
+msgstr "не може да се създаде връзка %s"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "\""
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "\""
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: неправилен регулярен израз: %s"
+msgid "Invalid regular expression"
+msgstr "%s: неправилен регулярен израз: %s"
 
+#: lib/regcomp.c:140
 #, fuzzy
-#~ msgid "Invalid collation character"
-#~ msgstr "неправилен клас от символи %s"
+msgid "Invalid collation character"
+msgstr "неправилен клас от символи %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "неправилен клас от символи %s"
+msgid "Invalid character class name"
+msgstr "неправилен клас от символи %s"
 
+#: lib/regcomp.c:149
 #, fuzzy
-#~ msgid "Invalid back reference"
-#~ msgstr "Неправилен диапазон от страници %s"
+msgid "Invalid back reference"
+msgstr "Неправилен диапазон от страници %s"
 
+#: lib/regcomp.c:164
 #, fuzzy
-#~ msgid "Invalid range end"
-#~ msgstr "Неправилен диапазон от страници %s"
+msgid "Invalid range end"
+msgstr "Неправилен диапазон от страници %s"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "паметта е изчерпана"
+msgid "Memory exhausted"
+msgstr "паметта е изчерпана"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: неправилен регулярен израз: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: неправилен регулярен израз: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "грешка при търсене на регулярен израз"
+msgid "Premature end of regular expression"
+msgstr "грешка при търсене на регулярен израз"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "грешка при пасването на регулярния израз"
+msgid "Regular expression too big"
+msgstr "грешка при пасването на регулярния израз"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "грешка при търсене на регулярен израз"
+msgid "No previous regular expression"
+msgstr "грешка при търсене на регулярен израз"
 
 # Клавишът О (латинско) генерира "Д" според подредбата по БДС
-#~ msgid "^[yY]"
-#~ msgstr "^[дДoOyY]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[дДoOyY]"
 
 # Клавишът K (латинско) генерира "Н" според подредбата по БДС
-#~ msgid "^[nN]"
-#~ msgstr "^[нНkKnN]"
-
-#~ msgid "iconv function not usable"
-#~ msgstr "функцията iconv не е използваема"
-
-#~ msgid "iconv function not available"
-#~ msgstr "функцията iconv е недостъпна"
-
-#~ msgid "character out of range"
-#~ msgstr "знак извън диапазона"
-
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "не може да се конвертира U+%04X в локалното кодиране"
-
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "не може да се конвертира U+%04X в локалното кодиране: %s"
-
-#~ msgid "invalid user"
-#~ msgstr "несъществуващ потребител"
-
-#~ msgid "invalid group"
-#~ msgstr "несъществуваща група"
-
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "не може да се получи входящата група по потребителски номер"
-
-#~ msgid "(C)"
-#~ msgstr "©"
-
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Това е свободен софтуер.  Можете да разпространявате негови копия "
-#~ "съгласно\n"
-#~ "условията на Основната общодостъпна лицензия на ГНУ\n"
-#~ "      <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "Не се дават НИКАКВИ ГАРАНЦИИ до степента, позволявана от закона.\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Написан от %s.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Написан от %s и %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Написан от %s, %s и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Написан от %s, %s, %s\n"
-#~ "и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Написан от %s, %s, %s,\n"
-#~ "%s и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Написан от %s, %s, %s,\n"
-#~ "%s, %s и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Написан от %s, %s, %s,\n"
-#~ "%s, %s, %s и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Написан от %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Написан от %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Написан от %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s и други.\n"
-
-#~ msgid "string comparison failed"
-#~ msgstr "сравнението на низове не успя"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Използвайте LC_ALL='C', за да заобиколите този проблем."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Сравняваните низове бяха %s и %s."
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[нНkKnN]"
+
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "функцията iconv не е използваема"
+
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "функцията iconv е недостъпна"
+
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "знак извън диапазона"
+
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "не може да се конвертира U+%04X в локалното кодиране"
+
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "не може да се конвертира U+%04X в локалното кодиране: %s"
+
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "несъществуващ потребител"
+
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "несъществуваща група"
+
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "не може да се получи входящата група по потребителски номер"
+
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:72
+msgid "(C)"
+msgstr "©"
+
+#: lib/version-etc.c:74
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Това е свободен софтуер.  Можете да разпространявате негови копия съгласно\n"
+"условията на Основната общодостъпна лицензия на ГНУ\n"
+"      <http://www.gnu.org/licenses/gpl.html>.\n"
+"Не се дават НИКАКВИ ГАРАНЦИИ до степента, позволявана от закона.\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Написан от %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Написан от %s и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Написан от %s, %s и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Написан от %s, %s, %s\n"
+"и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Написан от %s, %s, %s,\n"
+"%s и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Написан от %s, %s, %s,\n"
+"%s, %s и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Написан от %s, %s, %s,\n"
+"%s, %s, %s и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:130
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Написан от %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:138
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Написан от %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:148
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Написан от %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s и други.\n"
+
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "сравнението на низове не успя"
+
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Използвайте LC_ALL='C', за да заобиколите този проблем."
+
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Сравняваните низове бяха %s и %s."
diff --git a/gnulib/po/ca.po b/gnulib/po/ca.po
index ab7a43a8..2318b089 100644
--- a/gnulib/po/ca.po
+++ b/gnulib/po/ca.po
@@ -7,43 +7,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6.90\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2005-05-21 04:10+0200\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: gnulib/argp-help.c:147
+# Usa quote() en els 2 args.  ivb
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "l'argument %s no és vàlid per %s"
 
-#: gnulib/argp-help.c:220
+# Usa quote() en els 2 args.  ivb
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s: El paràmetre ARGP_HELP_FMT requereix un valor"
+msgid "ambiguous argument %s for %s"
+msgstr "l'argument %s és ambigu per %s"
 
-#: gnulib/argp-help.c:226
-#, fuzzy, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
+#: lib/argmatch.c:157
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Els arguments vàlids són:"
+
+#: lib/argp-help.c:194
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: El paràmetre ARGP_HELP_FMT requereix un valor"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: El paràmetre d'ARGP_HELP_FMT és desconegut"
 
 # pfft, escombraries... jm
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Hi ha escombraries en ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -51,468 +57,586 @@ msgstr ""
 "Els arguments necessaris o opcionals per a les opcions llargues també són "
 "necessaris o opcionals per a qualsevol opció curta corresponent."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1581
 msgid "Usage:"
 msgstr "Forma d'ús:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1585
 msgid "  or: "
 msgstr "  ó: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [OPCIÓ...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1624
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Proveu «%s --help» o «%s --usage» per a obtindre més informació.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Informeu dels errors a %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "S'ha produït un error desconegut del sistema"
 
-#: gnulib/argp-parse.c:81
-#, fuzzy
-msgid "give this help list"
+#: lib/argp-parse.c:82
+msgid "Give this help list"
 msgstr "Mostra aquesta llista d'ajuda"
 
-#: gnulib/argp-parse.c:82
-#, fuzzy
-msgid "give a short usage message"
+#: lib/argp-parse.c:83
+msgid "Give a short usage message"
 msgstr "Mostra un curt missatge sobre l'ús"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "NOM"
 
-#: gnulib/argp-parse.c:83
-#, fuzzy
-msgid "set the program name"
+#: lib/argp-parse.c:84
+msgid "Set the program name"
 msgstr "Estableix el nom del programa"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:85
 #, fuzzy
 msgid "SECS"
 msgstr "SEGONS"
 
-#: gnulib/argp-parse.c:85
-#, fuzzy
-msgid "hang for SECS seconds (default 3600)"
+#: lib/argp-parse.c:86
+msgid "Hang for SECS seconds (default 3600)"
 msgstr "Penja durant SEGS segons (per defecte 3600)"
 
-#: gnulib/argp-parse.c:142
-#, fuzzy
-msgid "print program version"
+#: lib/argp-parse.c:147
+msgid "Print program version"
 msgstr "Mostra la versió del programa"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ERROR DEL PROGRAMA) Cap versió coneguda!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Massa arguments\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ERROR DEL PROGRAMA) L'opció s'hauria d'haver reconegut!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'opció «%s» és ambigua\n"
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "error de lectura"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: l'opció «--%s» no accepta arguments\n"
+# "underflow", bonico el paraulo.. jm
+#: lib/c-stack.c:245
+#, fuzzy
+msgid "stack overflow"
+msgstr "pila buida"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: l'opció «%c%s» no accepta arguments\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "error d'escriptura"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+# Usa quote().  ivb
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: l'opció «%s» requereix un argument\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "no s'ha pogut obrir %s per llegir"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+# Usa quote().  ivb
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: l'opció «--%s» no es reconeix\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "no s'ha pogut obrir %s per a escriure"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+# uniq no usa quote().  ivb
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: l'opció «%c%s» no es reconeix\n"
+msgid "error reading \"%s\""
+msgstr "error en llegir %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+# uniq no usa quote().  ivb
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: l'opció no és vàlida -- %c\n"
+msgid "error writing \"%s\""
+msgstr "error en escriure %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+# uniq no usa quote().  ivb
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'opció requereix un argument -- %c\n"
+msgid "error after reading \"%s\""
+msgstr "error en llegir %s"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l'opció «-W %s» és ambigua\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "no s'ha pogut obrir"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: l'opció «-W %s» no accepta arguments\n"
+msgid "%s subprocess failed"
+msgstr "%s: ha fallat el desplaçament"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l'opció «%s» requereix un argument\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "fitxer ordinari buit"
 
-# Usa quote() en els 2 args.  ivb
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "l'argument %s no és vàlid per %s"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "fitxer ordinari"
 
-# Usa quote() en els 2 args.  ivb
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "l'argument %s és ambigu per %s"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "directori"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Els arguments vàlids són:"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "fitxer especial de blocs"
 
-#, fuzzy
-#~ msgid "program error"
-#~ msgstr "error de lectura"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "fitxer especial de caràcters"
 
-# "underflow", bonico el paraulo.. jm
-#, fuzzy
-#~ msgid "stack overflow"
-#~ msgstr "pila buida"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "cua FIFO"
 
-#~ msgid "write error"
-#~ msgstr "error d'escriptura"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "enllaç simbòlic"
 
-# Usa quote().  ivb
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "no s'ha pogut obrir %s per llegir"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "connector"
 
-# Usa quote().  ivb
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "no s'ha pogut obrir %s per a escriure"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "cua de missatges"
 
-# uniq no usa quote().  ivb
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "error en llegir %s"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "semàfor"
 
-# uniq no usa quote().  ivb
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "error en escriure %s"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "objecte de memòria compartida"
 
-# uniq no usa quote().  ivb
-#, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "error en llegir %s"
+#: lib/file-type.c:73
+msgid "typed memory object"
+msgstr "objecte de memòria amb tipus"
 
-#, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "no s'ha pogut obrir"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "fitxer estrany"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: ha fallat el desplaçament"
-
-#~ msgid "regular empty file"
-#~ msgstr "fitxer ordinari buit"
-
-#~ msgid "regular file"
-#~ msgstr "fitxer ordinari"
-
-#~ msgid "directory"
-#~ msgstr "directori"
-
-#~ msgid "block special file"
-#~ msgstr "fitxer especial de blocs"
+msgid "Address family for hostname not supported"
+msgstr "els fitxers FIFO no són suportats"
 
-#~ msgid "character special file"
-#~ msgstr "fitxer especial de caràcters"
+#: lib/gai_strerror.c:49
+#, fuzzy
+msgid "ai_family not supported"
+msgstr "els fitxers FIFO no són suportats"
 
-#~ msgid "fifo"
-#~ msgstr "cua FIFO"
+#: lib/gai_strerror.c:50
+#, fuzzy
+msgid "Memory allocation failure"
+msgstr "L'operació ha fallat"
 
-#~ msgid "symbolic link"
-#~ msgstr "enllaç simbòlic"
+#: lib/gai_strerror.c:54
+#, fuzzy
+msgid "ai_socktype not supported"
+msgstr "els fitxers FIFO no són suportats"
 
-#~ msgid "socket"
-#~ msgstr "connector"
+#: lib/gai_strerror.c:55
+#, fuzzy
+msgid "System error"
+msgstr "error d'escriptura"
 
-#~ msgid "message queue"
-#~ msgstr "cua de missatges"
+#: lib/gai_strerror.c:59
+#, fuzzy
+msgid "Request not canceled"
+msgstr "No es troba l'element sol·licitat"
 
-#~ msgid "semaphore"
-#~ msgstr "semàfor"
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "S'ha produït un error desconegut del sistema"
 
-#~ msgid "shared memory object"
-#~ msgstr "objecte de memòria compartida"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: l'opció «%s» és ambigua\n"
 
-#~ msgid "typed memory object"
-#~ msgstr "objecte de memòria amb tipus"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: l'opció «--%s» no accepta arguments\n"
 
-#~ msgid "weird file"
-#~ msgstr "fitxer estrany"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: l'opció «%c%s» no accepta arguments\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "els fitxers FIFO no són suportats"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: l'opció «%s» requereix un argument\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "els fitxers FIFO no són suportats"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: l'opció «--%s» no es reconeix\n"
 
-#, fuzzy
-#~ msgid "Memory allocation failure"
-#~ msgstr "L'operació ha fallat"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: l'opció «%c%s» no es reconeix\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "els fitxers FIFO no són suportats"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: l'opció és il·legal -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "error d'escriptura"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: l'opció no és vàlida -- %c\n"
 
-#, fuzzy
-#~ msgid "Request not canceled"
-#~ msgstr "No es troba l'element sol·licitat"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'opció requereix un argument -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "S'ha produït un error desconegut del sistema"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: l'opció «-W %s» és ambigua\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: l'opció és il·legal -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: l'opció «-W %s» no accepta arguments\n"
 
 # FIXME: xmalloc.h: _STRTOL_ERROR lacks i18n.  ivb
 # Açò quedarà com «invalid mida de bloc `MIDA'» mentre no ho facen.  ivb
-#~ msgid "block size"
-#~ msgstr "mida de bloc"
+#: lib/human.c:486
+msgid "block size"
+msgstr "mida de bloc"
 
 # Els 4 usen quote().  ivb
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s existeix però no és un directori"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s existeix però no és un directori"
 
 # Els 3 usen quote().  ivb
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "no s'ha pogut canviar el propietari o grup de %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "no s'ha pogut canviar el propietari o grup de %s"
 
 # Els 3 usen quote().  ivb
-#~ msgid "cannot create directory %s"
-#~ msgstr "no s'ha pogut crear el directori %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "no s'ha pogut crear el directori %s"
 
 # Usa quote().  ivb
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "no s'ha pogut canviar al directori %s"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "no s'ha pogut canviar al directori %s"
 
 # Els 2 usen quote().  ivb
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "no s'han pogut canviar els permisos de %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "no s'han pogut canviar els permisos de %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "la memòria s'ha exhaurit"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "la memòria s'ha exhaurit"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "openat: no s'ha pogut registrar el directori de treball actual"
+msgid "unable to record current working directory"
+msgstr "openat: no s'ha pogut registrar el directori de treball actual"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "no s'ha pogut tornar al directori inicial de treball"
+#: lib/openat-die.c:49
+msgid "failed to return to initial working directory"
+msgstr "no s'ha pogut tornar al directori inicial de treball"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "%s: no s'ha pogut obrir per a escriure"
+msgid "Failed to open /dev/zero for read"
+msgstr "%s: no s'ha pogut obrir per a escriure"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "No es pot crear la llista"
+msgid "cannot create pipe"
+msgstr "No es pot crear la llista"
 
-#~ msgid "`"
-#~ msgstr "«"
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "«"
 
-#~ msgid "'"
-#~ msgstr "»"
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "»"
 
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: l'expressió regular no és vàlida: %s"
+msgid "Invalid regular expression"
+msgstr "%s: l'expressió regular no és vàlida: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "la classe de caràcters «%s» no és vàlida"
+msgid "Invalid character class name"
+msgstr "la classe de caràcters «%s» no és vàlida"
 
+#: lib/regcomp.c:149
 #, fuzzy
-#~ msgid "Invalid back reference"
-#~ msgstr "El número no és vàlid"
+msgid "Invalid back reference"
+msgstr "El número no és vàlid"
 
+#: lib/regcomp.c:161
 #, fuzzy
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "L'opció no és vàlida -- %s"
+msgid "Invalid content of \\{\\}"
+msgstr "L'opció no és vàlida -- %s"
 
+#: lib/regcomp.c:164
 #, fuzzy
-#~ msgid "Invalid range end"
-#~ msgstr "el rang de pàgines no és vàlid: «%s»"
+msgid "Invalid range end"
+msgstr "el rang de pàgines no és vàlid: «%s»"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "la memòria s'ha exhaurit"
+msgid "Memory exhausted"
+msgstr "la memòria s'ha exhaurit"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: l'expressió regular no és vàlida: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: l'expressió regular no és vàlida: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "error en la recerca de l'expressió regular"
+msgid "Premature end of regular expression"
+msgstr "error en la recerca de l'expressió regular"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: l'expressió regular no és vàlida: %s"
+msgid "Regular expression too big"
+msgstr "%s: l'expressió regular no és vàlida: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "error en la recerca de l'expressió regular"
+msgid "No previous regular expression"
+msgstr "error en la recerca de l'expressió regular"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[sS]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[sS]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "la funció iconv() no és útil"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "la funció iconv() no és útil"
 
-#~ msgid "iconv function not available"
-#~ msgstr "la funció iconv() no es troba disponible"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "la funció iconv() no es troba disponible"
 
-#~ msgid "character out of range"
-#~ msgstr "el caràcter es troba fora del rang"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "el caràcter es troba fora del rang"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "no s'ha pogut convertir U+%04X al joc de caràcters local"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "no s'ha pogut convertir U+%04X al joc de caràcters local"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "no s'ha pogut convertir U+%04X al joc de caràcters local: %s"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "no s'ha pogut convertir U+%04X al joc de caràcters local: %s"
 
-#~ msgid "invalid user"
-#~ msgstr "l'usuari no és vàlid"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "l'usuari no és vàlid"
 
-#~ msgid "invalid group"
-#~ msgstr "el grup no és vàlid"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "el grup no és vàlid"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "no s'ha pogut obtenir el grup d'entrada d'un UID numèric"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "no s'ha pogut obtenir el grup d'entrada d'un UID numèric"
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Aquest és programari lliure; podeu redistribuir-lo i/o modificar-lo sota "
-#~ "els\n"
-#~ "termes de la Llicència Pública General GNU tal i com ha estat publicada "
-#~ "per la\n"
-#~ "Free Software Foundation; bé sota la versió 2 de la Llicència o bé (si "
-#~ "ho\n"
-#~ "preferiu) sota qualsevol versió posterior.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Escrit per %s.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Escrit per %s i %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Escrit per %s, %s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Escrit per %s, %s, %s\n"
-#~ "i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Escrit per %s, %s, %s,\n"
-#~ "%s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Escrit per %s, %s, %s,\n"
-#~ "%s, %s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Escrit per %s, %s, %s,\n"
-#~ "%s, %s, %s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Escrit per %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Escrit per %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Escrit per %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s i d'altres.\n"
-
-#~ msgid "string comparison failed"
-#~ msgstr "ha fallat la comparació de cadenes"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Establiu la variable LC_ALL a «C» per evitar el problema."
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"Aquest és programari lliure; podeu redistribuir-lo i/o modificar-lo sota "
+"els\n"
+"termes de la Llicència Pública General GNU tal i com ha estat publicada per "
+"la\n"
+"Free Software Foundation; bé sota la versió 2 de la Llicència o bé (si ho\n"
+"preferiu) sota qualsevol versió posterior.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escrit per %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Escrit per %s i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Escrit per %s, %s i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Escrit per %s, %s, %s\n"
+"i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Escrit per %s, %s, %s,\n"
+"%s i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Escrit per %s, %s, %s,\n"
+"%s, %s i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Escrit per %s, %s, %s,\n"
+"%s, %s, %s i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:130
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Escrit per %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:138
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Escrit per %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:148
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Escrit per %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s i d'altres.\n"
+
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "ha fallat la comparació de cadenes"
+
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Establiu la variable LC_ALL a «C» per evitar el problema."
 
 # Usa quote() en les 2.  ivb
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Les cadenes comparades eren %s i %s."
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Les cadenes comparades eren %s i %s."
diff --git a/gnulib/po/cs.po b/gnulib/po/cs.po
index 84fd28c1..37b7c8cd 100644
--- a/gnulib/po/cs.po
+++ b/gnulib/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-12-04 08:50+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -19,753 +19,1059 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "argument %s je pro %s neplatný"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "argument %s je pro %s nejednoznačný"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Platné argumenty jsou:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: hodnota %s je menší nebo rovna %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: Parametr ARGP_HELP_FMT vyžaduje hodnotu"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: Parametr ARGP_HELP_FMT musí být kladný"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Neznámý parametr ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Nesmysly v ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Povinné či volitelné, argumenty pro dlouhé přepínače jsou povinné či "
-"volitelné, i pro případné odpovídající krátké přepínače."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Povinné či volitelné, argumenty pro dlouhé přepínače jsou povinné či volitelné, i pro případné odpovídající krátké přepínače."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Použití:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  nebo:"
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [PŘEPÍNAČ…]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Více informací získáte příkazem „%s --help“ nebo „%s --usage“.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Chyby hlaste na %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Neznámá chyba systému"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "poskytne tuto přehledovou nápovědu"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "poskytne stručnou informaci o používání"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NÁZEV"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "nastavit název programu"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEK"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "zastavit na SEK sekund (výchozí je 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "vypsat verzi programu"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(CHYBA PROGRAMU) Neznámá verze!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Příliš mnoho argumentů\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(CHYBA PROGRAMU) Měl by být rozpoznán přepínač!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: přepínač „%s“ není jednoznačný; možnosti:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "chyba programu"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: přepínač „--%s“ musí být zadán bez argumentu\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "přetečení zásobníku"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: přepínač „%c%s“ musí být zadán bez argumentu\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "nelze najít dočasnou složku, zkusí se nastavit $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: přepínač „--%s“ vyžaduje argument\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "nelze vytvořit dočasnou složku pomocí šablony „%s“"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: neznámý přepínač „--%s“\n"
+msgid "cannot remove temporary file %s"
+msgstr "nelze odstranit dočasný soubor %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: neznámý přepínač „%c%s“\n"
+msgid "cannot remove temporary directory %s"
+msgstr "nelze odstranit dočasnou složku %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neplatný přepínač -- „%c“\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "chyba při zavírání souboru"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: přepínač vyžaduje argument -- „%c“\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "chyba při zápisu"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: přepínač „-W %s“ není jednoznačný\n"
+msgid "preserving permissions for %s"
+msgstr "zachování práv k souboru %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: přepínač „-W %s“ musí být zadán bez argumentu\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "chyba při otevírání souboru „%s“ pro čtení"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: přepínač „-W %s“ vyžaduje argument\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "argument %s je pro %s neplatný"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "argument %s je pro %s nejednoznačný"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Platné argumenty jsou:"
-
-#~ msgid "program error"
-#~ msgstr "chyba programu"
-
-#~ msgid "stack overflow"
-#~ msgstr "přetečení zásobníku"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "nelze otevřít záložní soubor „%s“ pro zápis"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "nelze najít dočasnou složku, zkusí se nastavit $TMPDIR"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "nelze vytvořit dočasnou složku pomocí šablony „%s“"
-
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "nelze odstranit dočasný soubor %s"
-
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "nelze odstranit dočasnou složku %s"
-
-#~ msgid "error closing file"
-#~ msgstr "chyba při zavírání souboru"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "chyba při čtení souboru „%s“"
 
-#~ msgid "write error"
-#~ msgstr "chyba při zápisu"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "chyba při zápisu do souboru „%s“"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "zachování práv k souboru %s"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "chyba po přečtení souboru „%s“"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "chyba při otevírání souboru „%s“ pro čtení"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "selhala funkce fdopen()"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "nelze otevřít záložní soubor „%s“ pro zápis"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "Překladač C# nebyl nalezen, zkuste nainstalovat pnet"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "chyba při čtení souboru „%s“"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "Virtuální stroj C# nebyl nalezen, zkuste nainstalovat pnet"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "chyba při zápisu do souboru „%s“"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "selhal podřízený proces %s"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "chyba po přečtení souboru „%s“"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "prázdný běžný soubor"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "selhala funkce fdopen()"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "běžný soubor"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "Překladač C# nebyl nalezen, zkuste nainstalovat pnet"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "složka"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "Virtuální stroj C# nebyl nalezen, zkuste nainstalovat pnet"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "speciální soubor blokového zařízení"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "selhal podřízený proces %s"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "speciální soubor znakového zařízení"
 
-#~ msgid "regular empty file"
-#~ msgstr "prázdný běžný soubor"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fronta fifo"
 
-#~ msgid "regular file"
-#~ msgstr "běžný soubor"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "symbolický odkaz"
 
-#~ msgid "directory"
-#~ msgstr "složka"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "soket"
 
-#~ msgid "block special file"
-#~ msgstr "speciální soubor blokového zařízení"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "fronta zpráv"
 
-#~ msgid "character special file"
-#~ msgstr "speciální soubor znakového zařízení"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafor"
 
-#~ msgid "fifo"
-#~ msgstr "fronta fifo"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "sdílený paměťový objekt"
 
-#~ msgid "symbolic link"
-#~ msgstr "symbolický odkaz"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "typový paměťový objekt"
 
-#~ msgid "socket"
-#~ msgstr "soket"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "podivný soubor"
 
-#~ msgid "message queue"
-#~ msgstr "fronta zpráv"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Pro název počítače není rodina adres podporována"
 
-#~ msgid "semaphore"
-#~ msgstr "semafor"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Dočasné selhání při překladu názvu"
 
-#~ msgid "shared memory object"
-#~ msgstr "sdílený paměťový objekt"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Špatná hodnota pro příznaky ai_flags"
 
-#~ msgid "typed memory object"
-#~ msgstr "typový paměťový objekt"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Nenapravitelné selhání při překladu názvu"
 
-#~ msgid "weird file"
-#~ msgstr "podivný soubor"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family není podporována"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Pro název počítače není rodina adres podporována"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Selhalo přidělení paměti"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Dočasné selhání při překladu názvu"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "K názvu počítače není přiřazena žádná adresa"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Špatná hodnota pro příznaky ai_flags"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Název nebo služba nejsou známy"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Nenapravitelné selhání při překladu názvu"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Název služby není podporován pro ai_socktype"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family není podporována"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype není podporován"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Selhalo přidělení paměti"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Chyba systému"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "K názvu počítače není přiřazena žádná adresa"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Vyrovnávací paměť argumentů je příliš malá"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Název nebo služba nejsou známy"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Probíhá zpracování požadavku"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Název služby není podporován pro ai_socktype"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Požadavek byl zrušen"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype není podporován"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Požadavek nebyl zrušen"
 
-#~ msgid "System error"
-#~ msgstr "Chyba systému"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Všechny požadavky dokončeny"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Vyrovnávací paměť argumentů je příliš malá"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Přerušeno signálem"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Probíhá zpracování požadavku"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Řetězec s parametry není správně kódován"
 
-#~ msgid "Request canceled"
-#~ msgstr "Požadavek byl zrušen"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Neznámá chyba"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Požadavek nebyl zrušen"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: přepínač „%s“ není jednoznačný; možnosti:"
 
-#~ msgid "All requests done"
-#~ msgstr "Všechny požadavky dokončeny"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: přepínač „--%s“ musí být zadán bez argumentu\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Přerušeno signálem"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: přepínač „%c%s“ musí být zadán bez argumentu\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Řetězec s parametry není správně kódován"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: přepínač „--%s“ vyžaduje argument\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Neznámá chyba"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: neznámý přepínač „--%s“\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "neplatný argument source_version pro compile_java_class"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: neznámý přepínač „%c%s“\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "neplatný argument target_version pro compile_java_class"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: neplatný přepínač -- „%c“\n"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "selhalo vytvoření „%s“"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: přepínač vyžaduje argument -- „%c“\n"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "chyba při zápisu souboru „%s“"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: přepínač „-W %s“ není jednoznačný\n"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Překladač jazyka Java nebyl nalezen, zkuste nainstalovat gcj nebo "
-#~ "nastavit proměnnou $JAVAC"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: přepínač „-W %s“ musí být zadán bez argumentu\n"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Virtuální stroj Java nebyl nalezen, zkuste nainstalovat gij nebo nastavit "
-#~ "proměnnou $JAVAC"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: přepínač „-W %s“ vyžaduje argument\n"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "V/V chyba podřízeného procesu %s"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "neplatný argument source_version pro compile_java_class"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "nelze změnit oprávnění k %s"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "neplatný argument target_version pro compile_java_class"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "nelze vytvořit složku %s"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "selhalo vytvoření „%s“"
 
-#~ msgid "memory exhausted"
-#~ msgstr "paměť byla vyčerpána"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "chyba při zápisu souboru „%s“"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "nelze zaznamenat aktuální pracovní složku"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Překladač jazyka Java nebyl nalezen, zkuste nainstalovat gcj nebo nastavit proměnnou $JAVAC"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "selhalo vrácení počáteční pracovní složky"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Virtuální stroj Java nebyl nalezen, zkuste nainstalovat gij nebo nastavit proměnnou $JAVAC"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Selhalo otevření /dev/zero pro čtení"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "V/V chyba podřízeného procesu %s"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "vytvoření čtecího vlákna selhalo"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "nelze změnit oprávnění k %s"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "nelze nastavit neblokující V/V pro podřízený proces %s"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "nelze vytvořit složku %s"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "komunikace s podřízeným procesem %s selhala"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "paměť byla vyčerpána"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "zápis do podřízeného procesu %s selhal"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "nelze zaznamenat aktuální pracovní složku"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "čtení z podřízeného procesu %s selhalo"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "selhalo vrácení počáteční pracovní složky"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "podřízený proces %s byl ukončen s návratovým kódem %d"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Selhalo otevření /dev/zero pro čtení"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "vytvoření vlákna selhalo"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "vytvoření čtecího vlákna selhalo"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "podřízený proces %s byl ukončen s návratovým kódem %d"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "nelze nastavit neblokující V/V pro podřízený proces %s"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "Franc, ois Pinard"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "komunikace s podřízeným procesem %s selhala"
 
-#~ msgid "`"
-#~ msgstr "„"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "zápis do podřízeného procesu %s selhal"
 
-#~ msgid "'"
-#~ msgstr "“"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "čtení z podřízeného procesu %s selhalo"
 
-#~ msgid "Success"
-#~ msgstr "Úspěch"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "podřízený proces %s byl ukončen s návratovým kódem %d"
 
-#~ msgid "No match"
-#~ msgstr "Žádná shoda"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "vytvoření vlákna selhalo"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "neplatný regulární výraz"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "podřízený proces %s byl ukončen s návratovým kódem %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "Franc, ois Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "„"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "“"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Úspěch"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Žádná shoda"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "neplatný regulární výraz"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "neplatný znak pro porovnávání"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "neplatný název třídy znaku"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Zpětné lomítko na konci"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Neplatný zpětný odkaz"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Chybí odpovídající závorka k [ nebo [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Chybí odpovídající závorka k ( nebo \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Chybí odpovídající závorka k \\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Neplatný obsah \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Neplatný konec rozsahu"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Paměť byla vyčerpána"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Neplatný předchozí regulární výraz"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Předčasný konec regulárního výrazu"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Regulární výraz je příliš velký"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Chybí odpovídající závorka k ) nebo \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Žádný předchozí regulární výraz"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[aAyY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "nastavení oprávnění k %s"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "neplatný znak pro porovnávání"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Zavěsit"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "neplatný název třídy znaku"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Přerušení"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Zpětné lomítko na konci"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Ukončit"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Neplatný zpětný odkaz"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Neplatná instrukce"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Chybí odpovídající závorka k [ nebo [^"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Krokování/bod přerušení"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Chybí odpovídající závorka k ( nebo \\("
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Přerušen"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Chybí odpovídající závorka k \\{"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Výjimka ve výpočtu s plovoucí čárkou"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Neplatný obsah \\{\\}"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Zabit"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Neplatný konec rozsahu"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Chyba sběrnice"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Paměť byla vyčerpána"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Porušení ochrany paměti"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Neplatný předchozí regulární výraz"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Porušená roura"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Předčasný konec regulárního výrazu"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Alarm od hodin"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Regulární výraz je příliš velký"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Ukončen"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Chybí odpovídající závorka k ) nebo \\)"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Urgentní stav V/V"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Žádný předchozí regulární výraz"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Pozastavit (signál)"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[aAyY]"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Pozastaven"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Pokračuje"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "nastavení oprávnění k %s"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Potomek skončil"
 
-#~ msgid "Hangup"
-#~ msgstr "Zavěsit"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Pozastaven (vstup tty)"
 
-#~ msgid "Interrupt"
-#~ msgstr "Přerušení"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Pozastaven (výstup tty)"
 
-#~ msgid "Quit"
-#~ msgstr "Ukončit"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Možný V/V"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Neplatná instrukce"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Překročeno časové omezení procesoru"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Krokování/bod přerušení"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Překročeno omezení velikosti souboru"
 
-#~ msgid "Aborted"
-#~ msgstr "Přerušen"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Virtuální časovač doběhl"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Výjimka ve výpočtu s plovoucí čárkou"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Profilovací časovač doběhl"
 
-#~ msgid "Killed"
-#~ msgstr "Zabit"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Změnilo se okno"
 
-#~ msgid "Bus error"
-#~ msgstr "Chyba sběrnice"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Uživatelsky definovaný signál 1"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Porušení ochrany paměti"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Uživatelsky definovaný signál 2"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Porušená roura"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Krokování emulátoru (EMT)"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Alarm od hodin"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Chybné systémové volání"
 
-#~ msgid "Terminated"
-#~ msgstr "Ukončen"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Porušení zásobníku"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Urgentní stav V/V"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Žádost o informace"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Pozastavit (signál)"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Selhalo napájení"
 
-#~ msgid "Stopped"
-#~ msgstr "Pozastaven"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Prostředek přestal být k dispozici"
 
-#~ msgid "Continued"
-#~ msgstr "Pokračuje"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "chyba zápisu do zavřené roury nebo soketu"
 
-#~ msgid "Child exited"
-#~ msgstr "Potomek skončil"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "nelze vytvořit rouru"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Pozastaven (vstup tty)"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Signál reálného času %d"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Pozastaven (výstup tty)"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Neznámý signál %d"
 
-#~ msgid "I/O possible"
-#~ msgstr "Možný V/V"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "funkce iconv není použitelná"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Překročeno časové omezení procesoru"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "funkce iconv není dostupná"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Překročeno omezení velikosti souboru"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "znak je mimo rozsah"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Virtuální časovač doběhl"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "znak U+%04X nelze převést do místní znakové sady"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Profilovací časovač doběhl"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "znak U+%04X nelze převést do místní znakové sady: %s"
 
-#~ msgid "Window changed"
-#~ msgstr "Změnilo se okno"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "neplatný uživatel"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Uživatelsky definovaný signál 1"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "neplatná skupina"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Uživatelsky definovaný signál 2"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "neplatné zadání"
 
-#~ msgid "EMT trap"
-#~ msgstr "Krokování emulátoru (EMT)"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "nelze zobrazit chybovou zprávu"
 
-#~ msgid "Bad system call"
-#~ msgstr "Chybné systémové volání"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Zabalil %s (%s)\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Porušení zásobníku"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Zabalil %s\n"
 
-#~ msgid "Information request"
-#~ msgstr "Žádost o informace"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Power failure"
-#~ msgstr "Selhalo napájení"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Licence GPLv3+: GNU GPL verze 3 nebo novější <http://gnu.org/licenses/gpl.html>.\n"
+"Jde o svobodný software: můžete jej volně měnit a šířit.\n"
+"Nejsou poskytovány ŽÁDNÉ ZÁRUKY, mimo těch daných zákonem.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Napsal %s.\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Prostředek přestal být k dispozici"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Napsali %s a %s.\n"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "chyba zápisu do zavřené roury nebo soketu"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Napsali %s, %s a %s.\n"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "nelze vytvořit rouru"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Napsali %s, %s, %s\n"
+"a %s.\n"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Signál reálného času %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Napsali %s, %s, %s,\n"
+"%s a %s.\n"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Neznámý signál %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Napsali %s, %s, %s,\n"
+"%s, %s a %s.\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "funkce iconv není použitelná"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Napsali %s, %s, %s,\n"
+"%s, %s, %s a %s.\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "funkce iconv není dostupná"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Napsali %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"a %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Napsali %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s a %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Napsali %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s a další.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Chyby hlaste na: %s\n"
 
-#~ msgid "character out of range"
-#~ msgstr "znak je mimo rozsah"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Chyby balíčku %s hlaste na: %s\n"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "znak U+%04X nelze převést do místní znakové sady"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Domovská stránka projektu %s: <%s>\n"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "znak U+%04X nelze převést do místní znakové sady: %s"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Domovská stránka projektu %s: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "invalid user"
-#~ msgstr "neplatný uživatel"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Obecná nápověda k používání softwaru GNU: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "invalid group"
-#~ msgstr "neplatná skupina"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "selhala funkce _open_osfhandle"
 
-#~ msgid "invalid spec"
-#~ msgstr "neplatné zadání"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "nelze obnovit fd %d: selhala funkce dup2"
 
-#~ msgid "unable to display error message"
-#~ msgstr "nelze zobrazit chybovou zprávu"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "podřízený proces %s"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Zabalil %s (%s)\n"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "podřízený proces %s obdržel kritický signál %d"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Zabalil %s\n"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "standardní vstup"
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "standardní výstup"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Licence GPLv3+: GNU GPL verze 3 nebo novější <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "Jde o svobodný software: můžete jej volně měnit a šířit.\n"
-#~ "Nejsou poskytovány ŽÁDNÉ ZÁRUKY, mimo těch daných zákonem.\n"
-#~ "\n"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "standardní chybový výstup"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Napsal %s.\n"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "neznámý proud"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Napsali %s a %s.\n"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "selhalo opětovné otevření %s v režimu %s"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Napsali %s, %s a %s.\n"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "selhalo porovnání řetězců"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Napsali %s, %s, %s\n"
-#~ "a %s.\n"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Problém obejdete nastavením LC_ALL='C'."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Napsali %s, %s, %s,\n"
-#~ "%s a %s.\n"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Porovnávané řetězce byly %s a %s."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Napsali %s, %s, %s,\n"
-#~ "%s, %s a %s.\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "nelze provést formátovaný výstup"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Napsali %s, %s, %s,\n"
-#~ "%s, %s, %s a %s.\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "neplatný argument „%3$s“ pro %1$s%2$s"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Napsali %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "a %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Napsali %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s a %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Napsali %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s a další.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Chyby hlaste na: %s\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Chyby balíčku %s hlaste na: %s\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "Domovská stránka projektu %s: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "Domovská stránka projektu %s: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Obecná nápověda k používání softwaru GNU: <http://www.gnu.org/gethelp/>\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "selhala funkce _open_osfhandle"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "nelze obnovit fd %d: selhala funkce dup2"
-
-#~ msgid "%s subprocess"
-#~ msgstr "podřízený proces %s"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "podřízený proces %s obdržel kritický signál %d"
-
-#~ msgid "stdin"
-#~ msgstr "standardní vstup"
-
-#~ msgid "stdout"
-#~ msgstr "standardní výstup"
-
-#~ msgid "stderr"
-#~ msgstr "standardní chybový výstup"
-
-#~ msgid "unknown stream"
-#~ msgstr "neznámý proud"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "selhalo opětovné otevření %s v režimu %s"
-
-#~ msgid "string comparison failed"
-#~ msgstr "selhalo porovnání řetězců"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Problém obejdete nastavením LC_ALL='C'."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Porovnávané řetězce byly %s a %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "nelze provést formátovaný výstup"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "neplatný argument „%3$s“ pro %1$s%2$s"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "neplatná přípona v argumentu „%3$s“ pro %1$s%2$s"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "neplatná přípona v argumentu „%3$s“ pro %1$s%2$s"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "argument „%3$s“ pro %1$s%2$s je příliš velký"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "argument „%3$s“ pro %1$s%2$s je příliš velký"
diff --git a/gnulib/po/da.po b/gnulib/po/da.po
index 08097792..02ceb7d4 100644
--- a/gnulib/po/da.po
+++ b/gnulib/po/da.po
@@ -13,763 +13,1060 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 2.0.0.3462.e9796\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2010-02-22 12:32+0200\n"
 "PO-Revision-Date: 2011-01-20 22:11+0100\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "Ugyldigt argument %s til %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "flertydigt argument %s til %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "gyldige argumenter er:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: v�rdien p� %s er mindre end eller lig med %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT-parameteren kr�ver en v�rdi"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT-parameteren skal v�re positiv"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Ukendt ARGP_HELP_FMT-parameter"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Snavs i ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Obligatoriske eller valgfrie argumenter til lange flag er ogs� obligatoriske "
-"eller valgfrie for tilsvarende korte flag."
+#: lib/argp-help.c:1244
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Obligatoriske eller valgfrie argumenter til lange flag er ogs� obligatoriske eller valgfrie for tilsvarende korte flag."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1637
 msgid "Usage:"
 msgstr "Brug:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1641
 msgid "  or: "
 msgstr "   eller:  "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1653
 msgid " [OPTION...]"
 msgstr " [FLAG...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1680
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Fors�g med '%s --help' eller '%s --usage' for mere information.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1708
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "Rapport�r fejl til %s.\n"
 "Send synspunkter p� overs�ttelsen til <dansk@dansk-gruppen.dk>\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1927 lib/error.c:153
 msgid "Unknown system error"
 msgstr "Ukendt systemfejl"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "giv denne hj�lpeliste"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "giv en kort meddelelse om brug"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NAVN"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "angiv progravnavnet"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "S"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "h�ng i S sekunder (som standard 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "udskriv programversion"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(PROGRAMFEJL) Ingen version kendt!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: For mange argumenter\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(PROGRAMFEJL) Flaget burde v�re blevet genkendt!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaget '%s' er flertydigt\n"
+#: lib/c-stack.c:196 lib/c-stack.c:309
+msgid "program error"
+msgstr "programfejl"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flaget '--%s' tager intet argument\n"
+#: lib/c-stack.c:197 lib/c-stack.c:310
+msgid "stack overflow"
+msgstr "stakoverl�b"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:335
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flaget '%c%s' tager intet argument\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flaget '%s' kr�ver et argument\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "kan ikke finde et tempor�rt katalog, fors�g at s�tte $TMPDIR"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:349
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukendt flag '--%s'\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "kan ikke oprette et tempor�rt katalog ved brug af skabelonen '%s'"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:445
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukendt flag '%c%s'\n"
+msgid "cannot remove temporary file %s"
+msgstr "kan ikke fjerne tempor�r fil %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/clean-temp.c:460
 #, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ugyldig flag -- '%c'\n"
+msgid "cannot remove temporary directory %s"
+msgstr "kan ikke fjerne tempor�rt katalog %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flaget kr�ver et argument -- '%c'\n"
+#: lib/closein.c:99
+msgid "error closing file"
+msgstr "fejl ved lukning af fil"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "skrivefejl"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:547
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flaget '-W %s' er flertydigt\n"
+msgid "preserving permissions for %s"
+msgstr "bevarer rettigheder p� %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flaget '-W %s' tager intet argument\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "fejl ved �bning af '%s' for l�sning"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaget '%s' kr�ver et argument\n"
+#: lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "kan ikke �bne sikkerhedskopifil '%s' for skrivning"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "Ugyldigt argument %s til %s"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "fejl ved l�sning af '%s'"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "flertydigt argument %s til %s"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "fejl ved skrivning af '%s'"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "gyldige argumenter er:"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "fejl efter l�sning af '%s'"
 
-#~ msgid "program error"
-#~ msgstr "programfejl"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() mislykkedes"
 
-#~ msgid "stack overflow"
-#~ msgstr "stakoverl�b"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "C#-overs�tter ikke fundet, fors�g at installere pnet"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "kan ikke finde et tempor�rt katalog, fors�g at s�tte $TMPDIR"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "virtuel C#-maskine ikke fundet, fors�g at installere pnet"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "kan ikke oprette et tempor�rt katalog ved brug af skabelonen '%s'"
+#: lib/execute.c:189 lib/execute.c:262 lib/pipe.c:229 lib/pipe.c:342
+#: lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s-underproces mislykkedes"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "kan ikke fjerne tempor�r fil %s"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "tom normal fil"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "kan ikke fjerne tempor�rt katalog %s"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "normal fil"
 
-#~ msgid "error closing file"
-#~ msgstr "fejl ved lukning af fil"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "katalog"
 
-#~ msgid "write error"
-#~ msgstr "skrivefejl"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "blokspecialfil"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "bevarer rettigheder p� %s"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "tegnspecialfil"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "fejl ved �bning af '%s' for l�sning"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "kan ikke �bne sikkerhedskopifil '%s' for skrivning"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "symbolsk l�nke"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "fejl ved l�sning af '%s'"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "sokkel (socket)"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "fejl ved skrivning af '%s'"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "meddelelsek�"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "fejl efter l�sning af '%s'"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafor"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() mislykkedes"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "objekt af delt hukommelse"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "C#-overs�tter ikke fundet, fors�g at installere pnet"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "objekt af typet hukommelse"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "virtuel C#-maskine ikke fundet, fors�g at installere pnet"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "m�rkelig fil"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s-underproces mislykkedes"
+#: lib/gai_strerror.c:42
+msgid "Address family for hostname not supported"
+msgstr "Adressefamilien for v�rtsnavnet underst�ttes ikke"
 
-#~ msgid "regular empty file"
-#~ msgstr "tom normal fil"
+#: lib/gai_strerror.c:43
+msgid "Temporary failure in name resolution"
+msgstr "Midlertidig fejl i navneopslag"
 
-#~ msgid "regular file"
-#~ msgstr "normal fil"
+#: lib/gai_strerror.c:44
+msgid "Bad value for ai_flags"
+msgstr "Fejlagtig v�rdi for ai_flags"
 
-#~ msgid "directory"
-#~ msgstr "katalog"
+#: lib/gai_strerror.c:45
+msgid "Non-recoverable failure in name resolution"
+msgstr "Urepar�rbar fejl i navneopslag"
 
-#~ msgid "block special file"
-#~ msgstr "blokspecialfil"
+#: lib/gai_strerror.c:46
+msgid "ai_family not supported"
+msgstr "ai_family underst�ttes ikke"
 
-#~ msgid "character special file"
-#~ msgstr "tegnspecialfil"
+#: lib/gai_strerror.c:47
+msgid "Memory allocation failure"
+msgstr "Hukommelsesallokeringsfejl"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/gai_strerror.c:48
+msgid "No address associated with hostname"
+msgstr "Ingen adresse associeret med v�rtsnavnet"
 
-#~ msgid "symbolic link"
-#~ msgstr "symbolsk l�nke"
+#: lib/gai_strerror.c:49
+msgid "Name or service not known"
+msgstr "Navn eller tjeneste ikke kendt"
 
-#~ msgid "socket"
-#~ msgstr "sokkel (socket)"
+#: lib/gai_strerror.c:50
+msgid "Servname not supported for ai_socktype"
+msgstr "Servname underst�ttes ikke for ai_socktype"
 
-#~ msgid "message queue"
-#~ msgstr "meddelelsek�"
+#: lib/gai_strerror.c:51
+msgid "ai_socktype not supported"
+msgstr "ai_socktype underst�ttes ikke"
 
-#~ msgid "semaphore"
-#~ msgstr "semafor"
+#: lib/gai_strerror.c:52
+msgid "System error"
+msgstr "Systemfejl"
 
-#~ msgid "shared memory object"
-#~ msgstr "objekt af delt hukommelse"
+#: lib/gai_strerror.c:53
+msgid "Argument buffer too small"
+msgstr "Argumentbufferen for lille"
 
-#~ msgid "typed memory object"
-#~ msgstr "objekt af typet hukommelse"
+#: lib/gai_strerror.c:55
+msgid "Processing request in progress"
+msgstr "Bearbejder p�g�ende anmodning"
 
-#~ msgid "weird file"
-#~ msgstr "m�rkelig fil"
+#: lib/gai_strerror.c:56
+msgid "Request canceled"
+msgstr "Anmodning annuleret"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Adressefamilien for v�rtsnavnet underst�ttes ikke"
+#: lib/gai_strerror.c:57
+msgid "Request not canceled"
+msgstr "Anmodning ikke annuleret"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Midlertidig fejl i navneopslag"
+#: lib/gai_strerror.c:58
+msgid "All requests done"
+msgstr "Alle anmodninger udf�rt"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Fejlagtig v�rdi for ai_flags"
+#: lib/gai_strerror.c:59
+msgid "Interrupted by a signal"
+msgstr "Afbrudt af et signal"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Urepar�rbar fejl i navneopslag"
+#: lib/gai_strerror.c:60
+msgid "Parameter string not correctly encoded"
+msgstr "Parameterstreng ikke korrekt kodet"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family underst�ttes ikke"
+#: lib/gai_strerror.c:72
+msgid "Unknown error"
+msgstr "Ukendt fejl"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Hukommelsesallokeringsfejl"
+#: lib/getopt.c:529 lib/getopt.c:545
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: flaget '%s' er flertydigt\n"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Ingen adresse associeret med v�rtsnavnet"
+#: lib/getopt.c:578 lib/getopt.c:582
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: flaget '--%s' tager intet argument\n"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Navn eller tjeneste ikke kendt"
+#: lib/getopt.c:591 lib/getopt.c:596
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: flaget '%c%s' tager intet argument\n"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Servname underst�ttes ikke for ai_socktype"
+#: lib/getopt.c:639 lib/getopt.c:658 lib/getopt.c:961 lib/getopt.c:980
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr "%s: flaget '%s' kr�ver et argument\n"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype underst�ttes ikke"
+#: lib/getopt.c:696 lib/getopt.c:699
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: ukendt flag '--%s'\n"
 
-#~ msgid "System error"
-#~ msgstr "Systemfejl"
+#: lib/getopt.c:707 lib/getopt.c:710
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: ukendt flag '%c%s'\n"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Argumentbufferen for lille"
+#: lib/getopt.c:759 lib/getopt.c:762
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ugyldig flag -- '%c'\n"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Bearbejder p�g�ende anmodning"
+#: lib/getopt.c:812 lib/getopt.c:829 lib/getopt.c:1032 lib/getopt.c:1050
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: flaget kr�ver et argument -- '%c'\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Anmodning annuleret"
+#: lib/getopt.c:882 lib/getopt.c:898
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: flaget '-W %s' er flertydigt\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Anmodning ikke annuleret"
+#: lib/getopt.c:922 lib/getopt.c:940
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: flaget '-W %s' tager intet argument\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Alle anmodninger udf�rt"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "ugyldigt source_version-argument til compile_java_class"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Afbrudt af et signal"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "ugyldigt target_version-argument til compile_java_class"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Parameterstreng ikke korrekt kodet"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "det gik ikke at oprette '%s'"
 
-#~ msgid "Unknown error"
-#~ msgstr "Ukendt fejl"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "fejl ved skrivning af filen '%s'"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "ugyldigt source_version-argument til compile_java_class"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Javaovers�tter ikke fundet, fors�g at installere gcj eller s�tte $JAVAC"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "ugyldigt target_version-argument til compile_java_class"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Virtuel Javamaskine ikke fundet, fors�g at installere gij eller s�tte $JAVA"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "det gik ikke at oprette '%s'"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s-underproces I/O-fejl"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "fejl ved skrivning af filen '%s'"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "kan ikke �ndre rettigheder p� %s"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Javaovers�tter ikke fundet, fors�g at installere gcj eller s�tte $JAVAC"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "kan ikke oprette kataloget %s"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Virtuel Javamaskine ikke fundet, fors�g at installere gij eller s�tte "
-#~ "$JAVA"
+#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "hukommelsen opbrugt"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s-underproces I/O-fejl"
+#: lib/openat-die.c:34
+#, c-format
+msgid "unable to record current working directory"
+msgstr "kan ikke notere aktuelt arbejdskatalog"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "kan ikke �ndre rettigheder p� %s"
+#: lib/openat-die.c:52
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "kunne ikke g� tilbage til det oprindelige arbejdskatalog"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "kan ikke oprette kataloget %s"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Mislykkedes med at �bne /dev/zero for l�sning"
 
-#~ msgid "memory exhausted"
-#~ msgstr "hukommelsen opbrugt"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "oprettelse af l�setr�d mislykkedes"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "kan ikke notere aktuelt arbejdskatalog"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "kan ikke ops�tte ikke-blokerende I/O til %s-underproces"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "kunne ikke g� tilbage til det oprindelige arbejdskatalog"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "kommunikation med %s-underproces mislykkedes"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Mislykkedes med at �bne /dev/zero for l�sning"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:359
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "skrivning til %s-underproces mislykkedes"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "oprettelse af l�setr�d mislykkedes"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:396
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "l�sning fra %s-underproces mislykkedes"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "kan ikke ops�tte ikke-blokerende I/O til %s-underproces"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "underproces %s afsluttet med slutstatus %d"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "kommunikation med %s-underproces mislykkedes"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "oprettelse af tr�de mislykkedes"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "skrivning til %s-underproces mislykkedes"
+#: lib/pipe-filter-ii.c:428
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s-underproces afslutted med slutstatus %d"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "l�sning fra %s-underproces mislykkedes"
+#: lib/pipe.c:137 lib/pipe.c:140 lib/pipe.c:258 lib/pipe.c:261
+#, c-format
+msgid "cannot create pipe"
+msgstr "kan ikke oprette datakanal"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:272
+msgid "`"
+msgstr "'"
+
+#: lib/quotearg.c:273
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:132
+msgid "Success"
+msgstr "Lykkedes"
+
+#: lib/regcomp.c:135
+msgid "No match"
+msgstr "Ingen tr�ffer"
+
+#: lib/regcomp.c:138
+msgid "Invalid regular expression"
+msgstr "Fejlagtigt regul�rt udtryk"
+
+#: lib/regcomp.c:141
+msgid "Invalid collation character"
+msgstr "Ugyldigt sorteringstegn"
+
+#: lib/regcomp.c:144
+msgid "Invalid character class name"
+msgstr "Ugyldigt tegnklassenavn"
+
+#: lib/regcomp.c:147
+msgid "Trailing backslash"
+msgstr "Afsluttende bagl�ns skr�streg"
+
+#: lib/regcomp.c:150
+msgid "Invalid back reference"
+msgstr "Ugyldig bagudreference"
+
+#: lib/regcomp.c:153
+msgid "Unmatched [ or [^"
+msgstr "Ensomt [ eller [^"
+
+#: lib/regcomp.c:156
+msgid "Unmatched ( or \\("
+msgstr "Ensomt ( eller \\("
+
+#: lib/regcomp.c:159
+msgid "Unmatched \\{"
+msgstr "Ensomt \\\\{"
+
+#: lib/regcomp.c:162
+msgid "Invalid content of \\{\\}"
+msgstr "Ugyldigt indhold i \\{\\}"
+
+#: lib/regcomp.c:165
+msgid "Invalid range end"
+msgstr "Ugyldigt intervalslut"
+
+#: lib/regcomp.c:168
+msgid "Memory exhausted"
+msgstr "Hukommelse opbrugt"
+
+#: lib/regcomp.c:171
+msgid "Invalid preceding regular expression"
+msgstr "Fejlagtigt foreg�ende regul�rt udtryk"
+
+#: lib/regcomp.c:174
+msgid "Premature end of regular expression"
+msgstr "For tidlig afslutning af regul�rt udtryk"
+
+#: lib/regcomp.c:177
+msgid "Regular expression too big"
+msgstr "For stort regul�rt udtryk"
+
+#: lib/regcomp.c:180
+msgid "Unmatched ) or \\)"
+msgstr "Ensomt ) eller \\)"
+
+#: lib/regcomp.c:701
+msgid "No previous regular expression"
+msgstr "Intet foreg�ende regul�rt udtryk"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yYjJ]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:591
+#, c-format
+msgid "setting permissions for %s"
+msgstr "�ndrer rettigheder p� %s"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "underproces %s afsluttet med slutstatus %d"
+#: lib/siglist.h:29
+msgid "Hangup"
+msgstr "Lagt p�"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "oprettelse af tr�de mislykkedes"
+#: lib/siglist.h:32
+msgid "Interrupt"
+msgstr "Afbrudt"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "%s-underproces afslutted med slutstatus %d"
+#: lib/siglist.h:35
+msgid "Quit"
+msgstr "Afslut"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "kan ikke oprette datakanal"
+#: lib/siglist.h:38
+msgid "Illegal instruction"
+msgstr "Utilladt instruktion"
 
-#~ msgid "`"
-#~ msgstr "'"
+#: lib/siglist.h:41
+msgid "Trace/breakpoint trap"
+msgstr "Sporings-/afbrudspunktsf�lde"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/siglist.h:44
+msgid "Aborted"
+msgstr "Afbrudt (abort)"
 
-#~ msgid "Success"
-#~ msgstr "Lykkedes"
+#: lib/siglist.h:47
+msgid "Floating point exception"
+msgstr "Undtagelse ved flydende tal"
 
-#~ msgid "No match"
-#~ msgstr "Ingen tr�ffer"
+#: lib/siglist.h:50
+msgid "Killed"
+msgstr "Dr�bt"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Fejlagtigt regul�rt udtryk"
+#: lib/siglist.h:53
+msgid "Bus error"
+msgstr "Busfejl"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Ugyldigt sorteringstegn"
+#: lib/siglist.h:56
+msgid "Segmentation fault"
+msgstr "Segmenteringsfejl"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Ugyldigt tegnklassenavn"
+#: lib/siglist.h:59
+msgid "Broken pipe"
+msgstr "Brudt datakanal"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Afsluttende bagl�ns skr�streg"
+#: lib/siglist.h:62
+msgid "Alarm clock"
+msgstr "Alarmklokke"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Ugyldig bagudreference"
+#: lib/siglist.h:65
+msgid "Terminated"
+msgstr "Afsluttet"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Ensomt [ eller [^"
+#: lib/siglist.h:68
+msgid "Urgent I/O condition"
+msgstr "Hastende I/O-situation"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Ensomt ( eller \\("
+#: lib/siglist.h:71
+msgid "Stopped (signal)"
+msgstr "Stoppet (signal)"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Ensomt \\\\{"
+#: lib/siglist.h:74
+msgid "Stopped"
+msgstr "Stoppet"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Ugyldigt indhold i \\{\\}"
+#: lib/siglist.h:77
+msgid "Continued"
+msgstr "Genoptaget"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Ugyldigt intervalslut"
+#: lib/siglist.h:80
+msgid "Child exited"
+msgstr "Barn afsluttede"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Hukommelse opbrugt"
+#: lib/siglist.h:83
+msgid "Stopped (tty input)"
+msgstr "Stoppet (terminall�sning)"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Fejlagtigt foreg�ende regul�rt udtryk"
+#: lib/siglist.h:86
+msgid "Stopped (tty output)"
+msgstr "Stoppet (terminalskrivning)"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "For tidlig afslutning af regul�rt udtryk"
+#: lib/siglist.h:89
+msgid "I/O possible"
+msgstr "I/O muligt"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "For stort regul�rt udtryk"
+#: lib/siglist.h:92
+msgid "CPU time limit exceeded"
+msgstr "Gr�nse p� CPU-tid overskredet"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Ensomt ) eller \\)"
+#: lib/siglist.h:95
+msgid "File size limit exceeded"
+msgstr "Gr�nse p� filst�rrelse overskredet"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Intet foreg�ende regul�rt udtryk"
+#: lib/siglist.h:98
+msgid "Virtual timer expired"
+msgstr "Alarmklokke - virtuel tid - udl�b"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yYjJ]"
+#: lib/siglist.h:101
+msgid "Profiling timer expired"
+msgstr "Profileringsklokke udl�b"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/siglist.h:104
+msgid "Window changed"
+msgstr "�ndret vindue"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "�ndrer rettigheder p� %s"
+#: lib/siglist.h:107
+msgid "User defined signal 1"
+msgstr "Brugersignal 1"
 
-#~ msgid "Hangup"
-#~ msgstr "Lagt p�"
+#: lib/siglist.h:110
+msgid "User defined signal 2"
+msgstr "Brugersignal 2"
 
-#~ msgid "Interrupt"
-#~ msgstr "Afbrudt"
+#: lib/siglist.h:115
+msgid "EMT trap"
+msgstr "Emulatorf�lde"
 
-#~ msgid "Quit"
-#~ msgstr "Afslut"
+#: lib/siglist.h:118
+msgid "Bad system call"
+msgstr "Fejlagtigt systemkald"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Utilladt instruktion"
+#: lib/siglist.h:121
+msgid "Stack fault"
+msgstr "Stakfejl"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Sporings-/afbrudspunktsf�lde"
+#: lib/siglist.h:124
+msgid "Information request"
+msgstr "Informationsanmodning"
 
-#~ msgid "Aborted"
-#~ msgstr "Afbrudt (abort)"
+#: lib/siglist.h:126
+msgid "Power failure"
+msgstr "Str�mafbrud"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Undtagelse ved flydende tal"
+#: lib/siglist.h:129
+msgid "Resource lost"
+msgstr "Tabt resurse"
 
-#~ msgid "Killed"
-#~ msgstr "Dr�bt"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "fejl ved skrivning til en lukket datakanal eller sokkel"
 
-#~ msgid "Bus error"
-#~ msgstr "Busfejl"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Realtidsignal %d"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Segmenteringsfejl"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Ukendt signal %d"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Brudt datakanal"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "iconv-funktion ikke brugbar"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Alarmklokke"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "iconv-funktion ikke tilg�ngelig"
 
-#~ msgid "Terminated"
-#~ msgstr "Afsluttet"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "tegn udenfor interval"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Hastende I/O-situation"
+#: lib/unicodeio.c:180
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "kan ikke konvertere U+%04X til lokalt tegns�t"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Stoppet (signal)"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "kan ikke konvertere U+%04X til lokalt tegns�t: %s"
 
-#~ msgid "Stopped"
-#~ msgstr "Stoppet"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "ugyldig bruger"
 
-#~ msgid "Continued"
-#~ msgstr "Genoptaget"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "ugyldig gruppe"
 
-#~ msgid "Child exited"
-#~ msgstr "Barn afsluttede"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "ugyldig specifikation"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Stoppet (terminall�sning)"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "kan ikke vise fejlmeddelelse"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Stoppet (terminalskrivning)"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Pakket af %s (%s)\n"
 
-#~ msgid "I/O possible"
-#~ msgstr "I/O muligt"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Pakket af %s\n"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Gr�nse p� CPU-tid overskredet"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "�"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Gr�nse p� filst�rrelse overskredet"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl.html>.\n"
+"Dette er frit programmel: du m� �ndre og videredistribuere det.\n"
+"Der gives INGEN GARANTI, s� vidt lov tillader.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skrevet af %s.\n"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Alarmklokke - virtuel tid - udl�b"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Skrevet af %s og %s.\n"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Profileringsklokke udl�b"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Skrevet af %s, %s og %s.\n"
 
-#~ msgid "Window changed"
-#~ msgstr "�ndret vindue"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Skrevet af %s, %s, %s\n"
+"og %s.\n"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Brugersignal 1"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Skrevet af %s, %s, %s,\n"
+"%s og %s.\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Brugersignal 2"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Skrevet af %s, %s, %s,\n"
+"%s, %s og %s.\n"
 
-#~ msgid "EMT trap"
-#~ msgstr "Emulatorf�lde"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Skrevet af %s, %s, %s,\n"
+"%s, %s, %s og %s.\n"
 
-#~ msgid "Bad system call"
-#~ msgstr "Fejlagtigt systemkald"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Skrevet af %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"og %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Skrevet af %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s og %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Skrevet af %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s med flere.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Rapport�r fejl til: %s\n"
+"Sende synspunkter p� overs�ttelsen til: tp-sv@listor.tp-sv.se\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Stakfejl"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Rapport�r %s-fejl til: %s\n"
 
-#~ msgid "Information request"
-#~ msgstr "Informationsanmodning"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s hjemmeside: <%s>\n"
 
-#~ msgid "Power failure"
-#~ msgstr "Str�mafbrud"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s hjemmeside: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Tabt resurse"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Almindelig hj�lp til at bruge GNU-programmer: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "fejl ved skrivning til en lukket datakanal eller sokkel"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle mislykkedes"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Realtidsignal %d"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan ikke genskabe fb %d: dup2 mislykkedes"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Ukendt signal %d"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "%s-underproces"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv-funktion ikke brugbar"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s-underproces fik �del�ggende signal %d"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv-funktion ikke tilg�ngelig"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "standard ind"
 
-#~ msgid "character out of range"
-#~ msgstr "tegn udenfor interval"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "standard ud"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "kan ikke konvertere U+%04X til lokalt tegns�t"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "standard fejl"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "kan ikke konvertere U+%04X til lokalt tegns�t: %s"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "ukendt str�m"
 
-#~ msgid "invalid user"
-#~ msgstr "ugyldig bruger"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "kunne ikke gen�bne %s i tilstand %s"
 
-#~ msgid "invalid group"
-#~ msgstr "ugyldig gruppe"
+#: lib/xmemcoll.c:48
+#, c-format
+msgid "string comparison failed"
+msgstr "strengsammenligning mislykkedes"
 
-#~ msgid "invalid spec"
-#~ msgstr "ugyldig specifikation"
+#: lib/xmemcoll.c:49
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "S�t LC_ALL='C' for at omg� problemet."
 
-#~ msgid "unable to display error message"
-#~ msgstr "kan ikke vise fejlmeddelelse"
+#: lib/xmemcoll.c:51
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "De sammenlignede strenge var %s og %s."
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Pakket af %s (%s)\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "kan ikke udf�re formateret udskrift"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Pakket af %s\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "fejlagtigt %s%s-argument '%s'"
 
-#~ msgid "(C)"
-#~ msgstr "�"
-
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/"
-#~ "gpl.html>.\n"
-#~ "Dette er frit programmel: du m� �ndre og videredistribuere det.\n"
-#~ "Der gives INGEN GARANTI, s� vidt lov tillader.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Skrevet af %s.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Skrevet af %s og %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Skrevet af %s, %s og %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Skrevet af %s, %s, %s\n"
-#~ "og %s.\n"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "fejlagtigt suffiks i %s%s-argument '%s'"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Skrevet af %s, %s, %s,\n"
-#~ "%s og %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Skrevet af %s, %s, %s,\n"
-#~ "%s, %s og %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Skrevet af %s, %s, %s,\n"
-#~ "%s, %s, %s og %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Skrevet af %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "og %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Skrevet af %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s og %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Skrevet af %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s med flere.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Rapport�r fejl til: %s\n"
-#~ "Sende synspunkter p� overs�ttelsen til: tp-sv@listor.tp-sv.se\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Rapport�r %s-fejl til: %s\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "%s hjemmeside: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "%s hjemmeside: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Almindelig hj�lp til at bruge GNU-programmer: <http://www.gnu.org/gethelp/"
-#~ ">\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle mislykkedes"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "kan ikke genskabe fb %d: dup2 mislykkedes"
-
-#~ msgid "%s subprocess"
-#~ msgstr "%s-underproces"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s-underproces fik �del�ggende signal %d"
-
-#~ msgid "stdin"
-#~ msgstr "standard ind"
-
-#~ msgid "stdout"
-#~ msgstr "standard ud"
-
-#~ msgid "stderr"
-#~ msgstr "standard fejl"
-
-#~ msgid "unknown stream"
-#~ msgstr "ukendt str�m"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "kunne ikke gen�bne %s i tilstand %s"
-
-#~ msgid "string comparison failed"
-#~ msgstr "strengsammenligning mislykkedes"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "S�t LC_ALL='C' for at omg� problemet."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "De sammenlignede strenge var %s og %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "kan ikke udf�re formateret udskrift"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "fejlagtigt %s%s-argument '%s'"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "fejlagtigt suffiks i %s%s-argument '%s'"
-
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "%s%s argument '%s' er for stort"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s argument '%s' er for stort"
diff --git a/gnulib/po/de.po b/gnulib/po/de.po
index 39809833..4bf1340e 100644
--- a/gnulib/po/de.po
+++ b/gnulib/po/de.po
@@ -1,11 +1,12 @@
 # German translation of gnulib messages.
-# Copyright © 2008 Free Software Foundation, Inc.
+# Copyright © 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnulib package.
 # Karl Eichwalder <ke@suse.de>, 2001-2002.
 # Lutz Behnke <lutz.behnke@gmx.de>, 1996, 1997, 1998, 1999, 2000, 2001.
 # Michael Schmidt <michael@guug.de>, 1996, 1997, 1998, 1999, 2000.
 # Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2009.
 # Kai Wasserbäch <debian@carbon-project.org>, 2009.
+# Arun Persaud <arun@nubati.net>, 2012
 #
 # TAB: spell it out („Tabulatoren“). -ke-
 # Don't use obscure abbreviations, please.  -ke-
@@ -31,11 +32,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnulib-1.0.0.1991.dbebf\n"
+"Project-Id-Version: GNU gnulib-3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
-"PO-Revision-Date: 2009-04-16 10:26+0100\n"
-"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
+"PO-Revision-Date: 2012-06-03 12:41-0700\n"
+"Last-Translator: Arun Persaud <arun@nubati.net>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -43,698 +44,1074 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "ungültiges Argument %s für %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "mehrdeutiges Argument %s für %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Gültige Argumente sind:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: Der Wert %s ist kleiner oder gleich %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT Parameter benötigt einen Wert"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT Parameter muss positiv sein"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Unbekannter ARGP_HELP_FMT Parameter"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Müll in ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Erforderliche oder optionale Argumente für lange Optionen sind auch für "
-"kurze erforderlich bzw. optional."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Erforderliche oder optionale Argumente für lange Optionen sind auch für kurze erforderlich bzw. optional."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr " oder: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [OPTIONEN] "
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "»%s --help« oder »%s --usage« liefert weitere Informationen.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "zeigt diese Hilfeliste"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "zeigt eine Kurzfassung des Aufrufs"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NAME"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "den Programmnamen setzen"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEK"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "warte für SEK Sekunden (Standardwert 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "zeige Programmversion an"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(PROGRAMM FEHLER) Keine Version bekannt!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: zu viele Argumente\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(PROGRAMM FEHLER) Option hätte erkannt werden müssen!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: Option »%s« ist mehrdeutig\n"
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: Option »--%s« erlaubt kein Argument\n"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "Programmfehler"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: Option »%c%s« erlaubt kein Argument\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: Option »%s« erfordert ein Argument\n"
-
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: unbekannte Option »--%s«\n"
-
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: unbekannte Option »%c%s«\n"
-
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ungültige Option -- %c\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "Stacküberlauf"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: Option erfordert ein Argument -- %c\n"
-
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: Option »-W %s« ist mehrdeutig\n"
-
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: Option »-W %s« erlaubt kein Argument\n"
-
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: Option »%s« erfordert ein Argument\n"
+#: lib/clean-temp.c:332
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "kann kein temporäres Verzeichnis finden, versuchen Sie, $TMPDIR zu setzen"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "ungültiges Argument %s für %s"
+#: lib/clean-temp.c:346
+#, c-format
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "kann temporäres Verzeichnis mit der Schablone „%s“ nicht anlegen"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "mehrdeutiges Argument %s für %s"
+#: lib/clean-temp.c:442
+#, c-format
+msgid "cannot remove temporary file %s"
+msgstr "kann temporäre Datei %s nicht entfernen"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Gültige Argumente sind:"
+#: lib/clean-temp.c:457
+#, c-format
+msgid "cannot remove temporary directory %s"
+msgstr "kann temporäres Verzeichnis %s nicht entfernen"
 
-#~ msgid "program error"
-#~ msgstr "Programmfehler"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "Fehler beim Schließen der Datei"
 
-#~ msgid "stack overflow"
-#~ msgstr "Stacküberlauf"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "Schreibfehler"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "kann kein temporäres Verzeichnis finden, versuchen Sie, $TMPDIR zu setzen"
+#: lib/copy-acl.c:681
+#, c-format
+msgid "preserving permissions for %s"
+msgstr "erhalte Zugriffsrechte von %s"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "kann temporäres Verzeichnis mit der Schablone „%s“ nicht anlegen"
+#: lib/copy-file.c:67
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "Fehler beim Versuch, „%s“ zum Lesen zu öffnen"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "kann temporäre Datei %s nicht entfernen"
+#: lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "kann Sicherungsdatei „%s“ nicht zum Schreiben öffnen"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "kann temporäres Verzeichnis %s nicht entfernen"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "Fehler beim Lesen von „%s“"
 
-#~ msgid "error closing file"
-#~ msgstr "Fehler beim Schließen der Datei"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "Fehler beim Schreiben von „%s“"
 
-#~ msgid "write error"
-#~ msgstr "Schreibfehler"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "Fehler nach dem Lesen von „%s“"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "Fehler beim Versuch, „%s“ zum Lesen zu öffnen"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "Fehler bei fdopen()"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "kann Sicherungsdatei „%s“ nicht zum Schreiben öffnen"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "C#-Compiler nicht gefunden, versuchen Sie, pnet zu installieren"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "Fehler beim Lesen von „%s“"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "C#-VM nicht gefunden, versuchen Sie, pnet zu installieren"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "Fehler beim Schreiben von „%s“"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s: Unterprozess fehlgeschlagen"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "Fehler nach dem Lesen von „%s“"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "reguläre leere Datei"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "Fehler bei fdopen()"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "reguläre Datei"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "C#-Compiler nicht gefunden, versuchen Sie, pnet zu installieren"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "Verzeichnis"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "C#-VM nicht gefunden, versuchen Sie, pnet zu installieren"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "blockorientierte Spezialdatei"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: Unterprozess fehlgeschlagen"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "zeichenorientierte Spezialdatei"
 
-#~ msgid "regular empty file"
-#~ msgstr "reguläre leere Datei"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "FIFO"
 
-#~ msgid "regular file"
-#~ msgstr "reguläre Datei"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "symbolische Verknüpfung"
 
-#~ msgid "directory"
-#~ msgstr "Verzeichnis"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "Socket"
 
-#~ msgid "block special file"
-#~ msgstr "blockorientierte Spezialdatei"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "Nachrichtenwarteschlange"
 
-#~ msgid "character special file"
-#~ msgstr "zeichenorientierte Spezialdatei"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "Semaphor"
 
-#~ msgid "fifo"
-#~ msgstr "FIFO"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "Objekt gemeinsamen Speichers"
 
-#~ msgid "symbolic link"
-#~ msgstr "symbolische Verknüpfung"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "Objekt getypten Speichers"
 
-#~ msgid "socket"
-#~ msgstr "Socket"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "merkwürdige Datei"
 
-#~ msgid "message queue"
-#~ msgstr "Nachrichtenwarteschlange"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Adressfamilie für Hostnamen nicht unterstützt"
 
-#~ msgid "semaphore"
-#~ msgstr "Semaphor"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Temporäre Störung der Namensauflösung"
 
-#~ msgid "shared memory object"
-#~ msgstr "Objekt gemeinsamen Speichers"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Ungültiger Wert für ai_flags"
 
-#~ msgid "typed memory object"
-#~ msgstr "Objekt getypten Speichers"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Nicht zu umgehende Störung der Namensauflösung"
 
-#~ msgid "weird file"
-#~ msgstr "merkwürdige Datei"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family nicht unterstützt"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Adressfamilie für Hostnamen nicht unterstützt"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Speicherallokationsfehler"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Temporäre Störung der Namensauflösung"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Keine Adresse mit Hostnamen verbunden"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Ungültiger Wert für ai_flags"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Name oder Service unbekannt"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Nicht zu umgehende Störung der Namensauflösung"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Servname nicht unterstützt für ai_socktype"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family nicht unterstützt"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype nicht unterstützt"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Speicherallokationsfehler"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Systemfehler"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Keine Adresse mit Hostnamen verbunden"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Argumentpuffer zu klein"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Name oder Service unbekannt"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Verarbeitungsanfrage in Bearbeitung"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Servname nicht unterstützt für ai_socktype"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Anfrage abgebrochen"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype nicht unterstützt"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Anfrage nicht abgebrochen"
 
-#~ msgid "System error"
-#~ msgstr "Systemfehler"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Alle Anfragen erledigt"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Argumentpuffer zu klein"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Durch Signal unterbrochen"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Verarbeitungsanfrage in Bearbeitung"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Parameterzeichenkette nicht korrekt kodiert"
 
-#~ msgid "Request canceled"
-#~ msgstr "Anfrage abgebrochen"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Anfrage nicht abgebrochen"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: Option »%s« ist mehrdeutig; Möglichkeiten:"
 
-#~ msgid "All requests done"
-#~ msgstr "Alle Anfragen erledigt"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: Option »--%s« erlaubt kein Argument\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Durch Signal unterbrochen"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: Option »%c%s« erlaubt kein Argument\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Parameterzeichenkette nicht korrekt kodiert"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: Option »--%s« erfordert ein Argument\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Unbekannter Fehler"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: unbekannte Option »--%s«\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ungültige Option -- %c\n"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: unbekannte Option »%c%s«\n"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s-Unterprozess-E/A-Fehler"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ungültige Option -- »%c«\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "ungültiges Argument source_version für compile_java_class"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: Option erfordert ein Argument -- »%c«\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "ungültiges Argument target_version für compile_java_class"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "konnte „%s“ nicht erzeugen"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: Option »-W %s« erlaubt kein Argument\n"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "Fehler beim Schreiben von der Datei „%s“"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: Option »-W %s« erfordert ein Argument\n"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Java-Compiler nicht gefunden, versuchen Sie, gcj zu installieren oder "
-#~ "setzen Sie $JAVAC"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "ungültiges Argument source_version für compile_java_class"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Java-VM nicht gefunden, versuchen Sie, gij zu installieren oder setzen "
-#~ "Sie $JAVA"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "ungültiges Argument target_version für compile_java_class"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "kann Pipe nicht erzeugen"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "konnte „%s“ nicht erzeugen"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "aktuelles Arbeitsverzeichnisses kann nicht aufgezeichnet werden"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "Fehler beim Schreiben von der Datei „%s“"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr ""
-#~ "es konnte nicht ins ursprüngliche Arbeitsverzeichnis zurückgekehrt werden"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Java-Compiler nicht gefunden, versuchen Sie, gcj zu installieren oder setzen Sie $JAVAC"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "kann Zugriffsrechte von %s nicht ändern"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Java-VM nicht gefunden, versuchen Sie, gij zu installieren oder setzen Sie $JAVA"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "kann Verzeichnis %s nicht anlegen"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s-Unterprozess-E/A-Fehler"
 
-#~ msgid "memory exhausted"
-#~ msgstr "Speicher ausgeschöpft"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "kann Zugriffsrechte von %s nicht ändern"
 
-#~ msgid "Success"
-#~ msgstr "Erfolg"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "kann Verzeichnis %s nicht anlegen"
 
-#~ msgid "No match"
-#~ msgstr "Keine Übereinstimmung"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "Speicher ausgeschöpft"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "ungültiger regulärer Ausdruck"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "aktuelles Arbeitsverzeichnisses kann nicht aufgezeichnet werden"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Ungültige Zeichenklasse"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "es konnte nicht ins ursprüngliche Arbeitsverzeichnis zurückgekehrt werden"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Ungültiger Zeichenklassenname"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Konnte /dev/zero nicht zum Lesen öffnen"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "abschließender Backslash"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "Erstellen des Lese-Threads fehlgeschlagen"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Ungültige Rückreferenz"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "Nicht-blockierendes I/O zu Teilprozess %s kann nicht hergestellt werden"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Keine Übereinstimmung für [ oder [^"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "Kommunikation mit Teilprozess %s fehlgeschlagen"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Keine Übereinstimmung für ( oder \\("
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "Schreiben zu Teilprozess %s fehlgeschlagen"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Keine Übereinstimmung für \\{"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "Lesen von Teilprozess %s fehlgeschlagen"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Ungültiger Inhalt in \\{\\}"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "Teilprozess %s beendet mit Exitcode %d"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Ungültiges Bereichsende"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "Erstellen von Threads fehlgeschlagen"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Speicher ausgeschöpft"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "Teilprozess %s beendet mit Exitcode %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "„"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "“"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Erfolg"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Keine Übereinstimmung"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "ungültiger regulärer Ausdruck"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Ungültige Zeichenklasse"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Ungültiger Zeichenklassenname"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "abschließender Backslash"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Ungültige Rückreferenz"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Keine Übereinstimmung für [ oder [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Keine Übereinstimmung für ( oder \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Keine Übereinstimmung für \\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Ungültiger Inhalt in \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Ungültiges Bereichsende"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Speicher ausgeschöpft"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "ungültiger vorhergehender regulärer Ausdruck"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Vorzeitiges Ende des regulären Ausdrucks"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Der reguläre Ausdruck ist zu groß"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Keine Übereinstimmung für ) oder \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Kein vorhergehender regulärer Ausdruck"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[jJyY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "setze Zugriffsrechte von %s"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "ungültiger vorhergehender regulärer Ausdruck"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Aufgehängt"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Vorzeitiges Ende des regulären Ausdrucks"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Unterbrechung"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Der reguläre Ausdruck ist zu groß"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Beendet"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Keine Übereinstimmung für ) oder \\)"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Ungültige Anweisung"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Kein vorhergehender regulärer Ausdruck"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Trace-/Breakpoint-Falle"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Konnte /dev/zero nicht zum Lesen öffnen"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Abgebrochen"
 
-#~ msgid "`"
-#~ msgstr "„"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Fließkomma-Ausnahme"
 
-#~ msgid "'"
-#~ msgstr "“"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Getötet"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[jJyY]"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Busfehler"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Speicheraufteilungsfehler"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv-Funktion nicht benutzbar"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Unterbrochene Weiterleitung"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv-Funktion nicht verfügbar"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Alarmuhr"
 
-#~ msgid "character out of range"
-#~ msgstr "Zeichen außerhalb erlaubter Grenzen"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Terminiert"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Dringende I/O-Bedingung"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren: %s"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Gestoppt (Signal)"
 
-#~ msgid "invalid user"
-#~ msgstr "ungültiger Benutzer"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Gestoppt"
 
-#~ msgid "invalid group"
-#~ msgstr "ungültige Gruppe"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Fortgesetzt"
 
-#~ msgid "invalid spec"
-#~ msgstr "ungültige Spec"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Kind verlassen"
 
-#~ msgid "unable to display error message"
-#~ msgstr "kann Fehlermeldung nicht anzeigen"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Gestoppt (tty-Eingabe)"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "erhalte Zugriffsrechte von %s"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Gestoppt (tty-Ausgabe)"
 
-#~ msgid "string comparison failed"
-#~ msgstr "Zeichenkettenvergleich fehlgeschlagen"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "I/O möglich"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Setzen Sie LC_ALL=C, um das Problem zu umgehen."
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "CPU-Zeitbegrenzung überschritten"
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Die verglichenen Zeichenketten waren %s und %s."
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Dateigrößenbegrenzung überschritten"
 
-#~ msgid "cannot perform formatted output"
-#~ msgstr "kann keine formatierte Ausgabe durchführen"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Virtueller Zeitgeber abgelaufen"
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Zeitmesser zur Leistungsmessung abgelaufen"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Lizenz GPLv3+: GNU GPL Version 3 oder höher <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "Dies ist freie Software: Sie können sie ändern und weitergeben.\n"
-#~ "Es gibt keinerlei Garantien, soweit wie es das Gesetz erlaubt.\n"
-#~ "\n"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Fenster geändert"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Geschrieben von %s.\n"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Benutzerdefiniertes Signal 1"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Geschrieben von %s und %s.\n"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Benutzerdefiniertes Signal 2"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Geschrieben von %s, %s und %s.\n"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "EMT-Falle"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Geschrieben von %s, %s, %s\n"
-#~ "und %s.\n"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Fehlerhafter Systemaufruf"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Geschrieben von %s, %s, %s,\n"
-#~ "%s und %s.\n"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Stapelfehler"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Geschrieben von %s, %s, %s,\n"
-#~ "%s, %s und %s.\n"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Informationsanfrage"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Geschrieben von %s, %s, %s,\n"
-#~ "%s, %s, %s und %s.\n"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Stromausfall"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Geschrieben von %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "und %s.\n"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Ressource verloren"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Geschrieben von %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s und %s.\n"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "Fehler beim Schreiben in geschlossene Pipe oder Socket"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Geschrieben von %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s und anderen.\n"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "kann Pipe nicht erzeugen"
 
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to <%s>.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n"
-#~ "Melden Sie Übersetzungsfehler an <translation-team-de@lists.sourceforge."
-#~ "net>\n"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Echtzeitsignal %d"
 
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>.\n"
-#~ msgstr "Heimatseite von %s: <http://www.gnu.org/software/%s/>.\n"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Unbekanntes Signal %d"
 
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>.\n"
-#~ msgstr ""
-#~ "Allgemeine Hilfe zur Benutzung von GNU-Software: <http://www.gnu.org/"
-#~ "gethelp/>.\n"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "iconv-Funktion nicht benutzbar"
 
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "ungültiges %s%s-Argument „%s“"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "iconv-Funktion nicht verfügbar"
 
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "ungültiger Suffix in %s%s-Argument „%s“"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "Zeichen außerhalb erlaubter Grenzen"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "%s%s-Argument „%s“ zu groß"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "setze Zugriffsrechte von %s"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "kann U+%04X nicht in lokalen Zeichensatz konvertieren: %s"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Echtzeitsignal %d"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "ungültiger Benutzer"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Unbekanntes Signal %d"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "ungültige Gruppe"
 
-#~ msgid "%s subprocess"
-#~ msgstr "%s-Unterprozess"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "ungültige Spec"
 
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s-Unterprozess bekam tödliches Signal %d"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "kann Fehlermeldung nicht anzeigen"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "Fehler beim Schreiben in geschlossene Pipe oder Socket"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Paket erstellt von %s (%s)\n"
 
-#~ msgid "block size"
-#~ msgstr "Blockgröße"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Paket erstellt von %s\n"
 
-#~ msgid "Hangup"
-#~ msgstr "Aufgehängt"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Interrupt"
-#~ msgstr "Unterbrechung"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Lizenz GPLv3+: GNU GPL Version 3 oder höher <http://gnu.org/licenses/gpl.html>.\n"
+"Dies ist freie Software: Sie können sie ändern und weitergeben.\n"
+"Es gibt keinerlei Garantien, soweit wie es das Gesetz erlaubt.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Geschrieben von %s.\n"
 
-#~ msgid "Quit"
-#~ msgstr "Beendet"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Geschrieben von %s und %s.\n"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Ungültige Anweisung"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Geschrieben von %s, %s und %s.\n"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Trace-/Breakpoint-Falle"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Geschrieben von %s, %s, %s\n"
+"und %s.\n"
 
-#~ msgid "Aborted"
-#~ msgstr "Abgebrochen"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Geschrieben von %s, %s, %s,\n"
+"%s und %s.\n"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Fließkomma-Ausnahme"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Geschrieben von %s, %s, %s,\n"
+"%s, %s und %s.\n"
 
-#~ msgid "Killed"
-#~ msgstr "Getötet"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Geschrieben von %s, %s, %s,\n"
+"%s, %s, %s und %s.\n"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Speicheraufteilungsfehler"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Geschrieben von %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"und %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Geschrieben von %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s und %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Geschrieben von %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s und anderen.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Melden Sie Fehler im Program (auf Englisch, mit LC_ALL=C) an <%s>.\n"
+"Melden Sie Fehler in der Übersetzung an <translation-team-de@lists.sourceforge.net>.\n"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Unterbrochene Weiterleitung"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Melden Sie %s-Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Alarmuhr"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s Homepage: <%s>\n"
 
-#~ msgid "Terminated"
-#~ msgstr "Terminiert"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Heimatseite von %s: <http://www.gnu.org/software/%s/>.\n"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Dringende I/O-Bedingung"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Allgemeine Hilfe zur Benutzung von GNU-Software: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Gestoppt (Signal)"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle fehlgeschlagen"
 
-#~ msgid "Stopped"
-#~ msgstr "Gestoppt"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "Kann Fd %d nicht wiederherstellen: dup2 fehlgeschlagen"
 
-#~ msgid "Continued"
-#~ msgstr "Fortgesetzt"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "%s-Unterprozess"
 
-#~ msgid "Child exited"
-#~ msgstr "Kind verlassen"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s-Unterprozess bekam tödliches Signal %d"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Gestoppt (tty-Eingabe)"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "Standardeingabe (stdin)"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Gestoppt (tty-Ausgabe)"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "Standardausgabe (stdout)"
 
-#~ msgid "I/O possible"
-#~ msgstr "I/O möglich"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "Standardfehlerausgabe (stderr)"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "CPU-Zeitbegrenzung überschritten"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "Unbekannter Datenstrom"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Dateigrößenbegrenzung überschritten"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "Erneutes Öffnen von %s mit Mode %s fehlgeschlagen"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Virtueller Zeitgeber abgelaufen"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "Zeichenkettenvergleich fehlgeschlagen"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Zeitmesser zur Leistungsmessung abgelaufen"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Setzen Sie LC_ALL=C, um das Problem zu umgehen."
 
-#~ msgid "Window changed"
-#~ msgstr "Fenster geändert"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Die verglichenen Zeichenketten waren %s und %s."
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Benutzerdefiniertes Signal 1"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "kann keine formatierte Ausgabe durchführen"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Benutzerdefiniertes Signal 2"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "ungültiges %s%s-Argument „%s“"
 
-#~ msgid "EMT trap"
-#~ msgstr "EMT-Falle"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "ungültiger Suffix in %s%s-Argument „%s“"
 
-#~ msgid "Bad system call"
-#~ msgstr "Fehlerhafter Systemaufruf"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s-Argument „%s“ zu groß"
 
-#~ msgid "Stack fault"
-#~ msgstr "Stapelfehler"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: ungültige Option -- %c\n"
 
-#~ msgid "Information request"
-#~ msgstr "Informationsanfrage"
+#~ msgid ""
+#~ "\n"
+#~ "Report bugs to <%s>.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n"
+#~ "Melden Sie Übersetzungsfehler an <translation-team-de@lists.sourceforge.net>\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Ressource verloren"
+#~ msgid "block size"
+#~ msgstr "Blockgröße"
diff --git a/gnulib/po/el.po b/gnulib/po/el.po
index 105b1300..7f6ee30e 100644
--- a/gnulib/po/el.po
+++ b/gnulib/po/el.po
@@ -1,476 +1,1197 @@
-# Greek messages for GNU textutils
-# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-# Simos Xenitellis <simos@hellug.gr>, 1999, 2000, 2001, 2002.
+# Greek messages for gnulib
+# Copyright (C) 1999, 2000, 2001, 2002, 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnulib package.
+# Simos Xenitellis <simos.lists@googlemail.com>, 1999, 2000, 2001, 2002, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: textutils 2.1\n"
+"Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
-"PO-Revision-Date: 2002-08-11 11:25+0100\n"
-"Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
-"Language-Team: Greek <nls@tux.hellug.gr>\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
+"PO-Revision-Date: 2012-03-11 11:25+0100\n"
+"Last-Translator: Simos Xenitellis <simos.lists@googlemail.com>\n"
+"Language-Team: Greek <team@lists.gnome.gr>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-7\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: gnulib/argp-help.c:147
+#
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "μη έγκυρο όρισμα %s για %s"
+
+#
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "ασαφές όρισμα %s για %s"
+
+#
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Έγκυρα ορίσματα είναι:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr ""
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr ""
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr ""
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr ""
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr ""
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
 msgstr ""
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr ""
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr ""
 
 #
-#: gnulib/argp-help.c:1656
-#, fuzzy
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
-msgstr "�����: %s [�������] [������]...\n"
+msgstr " [ΕΠΙΛΟΓΗ...]"
 
 #
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1682
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr "��������� `%s --help' ��� ����������� �������.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Δοκιμάστε `%s --help' για περισσότερη βοήθεια.\n"
 
 #
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
-"��������� �������� ��� <%s>.\n"
+"Αναφέρατε σφάλματα στο <%s>.\n"
 
 #
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
-msgstr "������� ������ ����������"
+msgstr "Άγνωστο σφάλμα συστήματος"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr ""
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr ""
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr ""
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr ""
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr ""
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr ""
 
 #
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 #, fuzzy
 msgid "print program version"
-msgstr "������ ������������"
+msgstr "σφάλμα προγράμματος"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr ""
 
 #
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
-msgstr "���� ����� ��������"
+msgstr "πάρα πολλά ορίσματα"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr ""
 
 #
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: � ������� `%s' ����� ������\n"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "σφάλμα προγράμματος"
 
 #
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: � ������� `--%s' ��� ��������� ��������\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "υπερχείλιση στοίβας"
+
+#: lib/clean-temp.c:332
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr ""
 
 #
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:346
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: � ������� `%c%s' ��� ��������� ��������\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "αδύνατη η δημιουργία καταλόγου `%s'"
 
 #
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:442
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: � ������� `-%s' ������� ��� ������\n"
+msgid "cannot remove temporary file %s"
+msgstr "αδύνατη η δημιουργία καταλόγου `%s'"
 
 #
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:457
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: �� ������������ ������� `--%s'\n"
+msgid "cannot remove temporary directory %s"
+msgstr "αδύνατη η δημιουργία καταλόγου `%s'"
+
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr ""
+
+#
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "σφάλμα εγγραφής"
 
 #
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-acl.c:681
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: �� ������������ ������� `%c%s'\n"
+msgid "preserving permissions for %s"
+msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
+
+#: lib/copy-file.c:67
+#, fuzzy, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "αδυναμία μεταφοράς του `%s' στο `%s'"
+
+#: lib/copy-file.c:74
+#, fuzzy, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "αδυναμία μεταφοράς του `%s' στο `%s'"
 
 #
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:82
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: �� ������ ������� -- %c\n"
+msgid "error reading \"%s\""
+msgstr "σφάλμα ανάγνωσης %s"
 
 #
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: � ������� ������� ��� ������ -- %c\n"
+msgid "error writing \"%s\""
+msgstr "σφάλμα εγγραφής %s"
 
 #
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:96 lib/copy-file.c:135
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: � ������� `-W %s' ����� ������\n"
+msgid "error after reading \"%s\""
+msgstr "σφάλμα ανάγνωσης %s"
 
 #
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
 #, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: � ������� `-W %s' ��� ��������� ��������\n"
+msgid "fdopen() failed"
+msgstr "αποτυχία ανοίγματος"
+
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr ""
+
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr ""
 
 #
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: � ������� `-%s' ������� ��� ������\n"
+msgid "%s subprocess failed"
+msgstr "%s: μη έγκυρη μορφή"
+
+#
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "κανονικό κενό αρχείο"
+
+#
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "κανονικό αρχείο"
+
+#
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "κατάλογος"
+
+#
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "ειδικό αρχείο μπλοκ"
 
 #
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "�� ������ ������ %s ��� %s"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "ειδικό αρχείο χαρακτήρων"
 
 #
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "������ ������ %s ��� %s"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "φίφο"
 
 #
-#~ msgid "Valid arguments are:"
-#~ msgstr "������ �������� �����:"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "συμβολικός σύνδεσμος"
 
 #
-#~ msgid "program error"
-#~ msgstr "������ ������������"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "υποδοχέας"
 
 #
-#~ msgid "stack overflow"
-#~ msgstr "����������� �������"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "ουρά μηνυμάτων"
 
 #
-#~ msgid "write error"
-#~ msgstr "������ ��������"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "σημαφόρος"
 
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr ""
+
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr ""
+
+#
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "παράξενο αρχείο"
+
+#: lib/gai_strerror.c:58
 #, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "�������� ��������� ��� `%s' ��� `%s'"
+msgid "Address family for hostname not supported"
+msgstr "αρχεία fifo δεν υποστηρίζονται"
 
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr ""
+
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr ""
+
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr ""
+
+#: lib/gai_strerror.c:62
 #, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "�������� ��������� ��� `%s' ��� `%s'"
+msgid "ai_family not supported"
+msgstr "αρχεία fifo δεν υποστηρίζονται"
 
-#
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr ""
+
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr ""
+
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr ""
+
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr ""
+
+#: lib/gai_strerror.c:67
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "������ ��������� %s"
+msgid "ai_socktype not supported"
+msgstr "αρχεία fifo δεν υποστηρίζονται"
 
 #
+#: lib/gai_strerror.c:68
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "������ �������� %s"
+msgid "System error"
+msgstr "σφάλμα εγγραφής"
+
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr ""
+
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr ""
+
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr ""
+
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr ""
+
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr ""
+
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr ""
+
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr ""
 
 #
+#: lib/gai_strerror.c:88
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "������ ��������� %s"
+msgid "Unknown error"
+msgstr "Άγνωστο σφάλμα συστήματος"
 
 #
-#, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "�������� ����������"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, fuzzy, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: η επιλογή `%s' είναι ασαφής\n"
 
 #
-#, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: �� ������ �����"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, fuzzy, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: η επιλογή `--%s' δεν επιτρέπει ορίσματα\n"
+
+#
+#: lib/getopt.c:637 lib/getopt.c:642
+#, fuzzy, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: η επιλογή `%c%s' δεν επιτρέπει ορίσματα\n"
+
+#
+#: lib/getopt.c:685 lib/getopt.c:704
+#, fuzzy, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: η επιλογή `-%s' απαιτεί ένα όρισμα\n"
 
 #
-#~ msgid "regular empty file"
-#~ msgstr "�������� ���� ������"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, fuzzy, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: μη αναγνωρίσιμη επιλογή `--%s'\n"
 
 #
-#~ msgid "regular file"
-#~ msgstr "�������� ������"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, fuzzy, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: μη αναγνωρίσιμη επιλογή `%c%s'\n"
 
 #
-#~ msgid "directory"
-#~ msgstr "���������"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: μη έγκυρη επιλογή -- %c\n"
 
 #
-#~ msgid "block special file"
-#~ msgstr "������ ������ �����"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: η επιλογή απαιτεί ένα όρισμα -- %c\n"
 
 #
-#~ msgid "character special file"
-#~ msgstr "������ ������ ����������"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, fuzzy, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: η επιλογή `-W %s' είναι ασαφής\n"
 
 #
-#~ msgid "fifo"
-#~ msgstr "����"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, fuzzy, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: η επιλογή `-W %s' δεν επιτρέπει ορίσματα\n"
 
 #
-#~ msgid "symbolic link"
-#~ msgstr "���������� ���������"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, fuzzy, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: η επιλογή `-%s' απαιτεί ένα όρισμα\n"
+
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr ""
+
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr ""
+
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr ""
 
 #
-#~ msgid "socket"
-#~ msgstr "���������"
+#: lib/javacomp.c:510
+#, fuzzy, c-format
+msgid "error while writing \"%s\" file"
+msgstr "σφάλμα εγγραφής %s"
+
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr ""
+
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr ""
 
 #
-#~ msgid "message queue"
-#~ msgstr "���� ���������"
+#: lib/javaversion.c:84
+#, fuzzy, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s: μη έγκυρη μορφή"
 
 #
-#~ msgid "semaphore"
-#~ msgstr "���������"
+#: lib/mkdir-p.c:196
+#, fuzzy, c-format
+msgid "cannot change permissions of %s"
+msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
 
 #
-#~ msgid "weird file"
-#~ msgstr "�������� ������"
+#: lib/mkdir-p.c:206
+#, fuzzy, c-format
+msgid "cannot create directory %s"
+msgstr "αδύνατη η δημιουργία καταλόγου `%s'"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "������ fifo ��� ��������������"
+#
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "η μνήμη εξαντλήθηκε"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "������ fifo ��� ��������������"
+#
+#: lib/openat-die.c:38
+#, fuzzy, c-format
+msgid "unable to record current working directory"
+msgstr "αδύνατη η δημιουργία καταλόγου `%s'"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "������ fifo ��� ��������������"
+#
+#: lib/openat-die.c:57
+#, fuzzy, c-format
+msgid "failed to return to initial working directory"
+msgstr "αδύνατη η δημιουργία καταλόγου `%s'"
 
 #
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "������ ��������"
+#: lib/pagealign_alloc.c:139
+#, fuzzy, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
+
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr ""
+
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
 
 #
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "������� ������ ����������"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, fuzzy, c-format
+msgid "communication with %s subprocess failed"
+msgstr "%s: μη έγκυρη μορφή"
 
 #
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: �� ������������ ������� -- %c\n"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, fuzzy, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s: μη έγκυρη μορφή"
 
 #
-#~ msgid "block size"
-#~ msgstr "������� �����"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, fuzzy, c-format
+msgid "read from %s subprocess failed"
+msgstr "%s: μη έγκυρη μορφή"
+
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr ""
+
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr ""
+
+#
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "`"
+
+#
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr ""
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr ""
 
 #
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "�� `%s' ������� ��� ���� ��� ����� ���������"
+msgid "Invalid regular expression"
+msgstr "%s: μη έγκυρη κανονική έκφραση: %s"
 
 #
+#: lib/regcomp.c:140
 #, fuzzy
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "��� ����� ������ �� ���������� ������� ��� �����"
+msgid "Invalid collation character"
+msgstr "μη έγκυρη τάξη χαρακτήρων `%s'"
 
 #
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "cannot create directory %s"
-#~ msgstr "������� � ���������� ��������� `%s'"
+msgid "Invalid character class name"
+msgstr "μη έγκυρη τάξη χαρακτήρων `%s'"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr ""
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr ""
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr ""
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr ""
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr ""
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr ""
 
 #
+#: lib/regcomp.c:164
 #, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "������� � ������ ��� �������� %s"
+msgid "Invalid range end"
+msgstr "%s: μη έγκυρη κανονική έκφραση: %s"
 
 #
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "�������� ������� ����������� ��� %s"
+msgid "Memory exhausted"
+msgstr "η μνήμη εξαντλήθηκε"
 
 #
-#~ msgid "memory exhausted"
-#~ msgstr "� ����� �����������"
+#: lib/regcomp.c:170
+#, fuzzy
+msgid "Invalid preceding regular expression"
+msgstr "%s: μη έγκυρη κανονική έκφραση: %s"
 
 #
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "������� � ���������� ��������� `%s'"
+msgid "Premature end of regular expression"
+msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκφρασης"
 
 #
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "�������� ������� ����������� ��� %s"
+msgid "Regular expression too big"
+msgstr "%s: μη έγκυρη κανονική έκφραση: %s"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr ""
 
 #
+#: lib/regcomp.c:700
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "������� � ���������� ��������� `%s'"
+msgid "No previous regular expression"
+msgstr "σφάλμα στην ανεύρεση μέσω κανονικής έκφρασης"
 
 #
-#~ msgid "`"
-#~ msgstr "`"
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yYνΝ]"
 
 #
-#~ msgid "'"
-#~ msgstr "'"
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nNοΟ]"
 
 #
-#, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: �� ������ �������� �������: %s"
+#: lib/set-mode-acl.c:678
+#, fuzzy, c-format
+msgid "setting permissions for %s"
+msgstr "αδυναμία αλλαγής ιδιοκτησίας στο %s"
+
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr ""
+
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr ""
+
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr ""
+
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr ""
+
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr ""
+
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr ""
+
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr ""
+
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr ""
 
 #
+#: lib/siglist.h:55
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "�� ������ ���� ���������� `%s'"
+msgid "Bus error"
+msgstr "σφάλμα εγγραφής"
+
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr ""
+
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr ""
+
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr ""
+
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr ""
+
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr ""
+
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr ""
+
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr ""
+
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr ""
+
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr ""
+
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr ""
+
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr ""
+
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr ""
+
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr ""
+
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr ""
+
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr ""
+
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr ""
+
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr ""
+
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr ""
+
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr ""
+
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr ""
+
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr ""
+
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr ""
+
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr ""
+
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr ""
+
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr ""
+
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr ""
 
 #
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "� ����� �����������"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "αδύνατη η δημιουργία καταλόγου `%s'"
+
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr ""
+
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr ""
+
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr ""
+
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr ""
 
 #
+#: lib/unicodeio.c:112
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: �� ������ �������� �������: %s"
+msgid "character out of range"
+msgstr "%s: αριθμός γραμμής έξω από τα όρια"
+
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr ""
+
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr ""
 
 #
-#, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "������ ���� �������� ���� ��������� ��������"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "μη έγκυρος χρήστης"
 
 #
-#, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: �� ������ �������� �������: %s"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "μη έγκυρη ομάδα"
 
 #
+#: lib/userspec.c:108
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "������ ���� �������� ���� ��������� ��������"
+msgid "invalid spec"
+msgstr "μη έγκυρος χρήστης"
+
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr ""
+
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr ""
+
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr ""
+
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr ""
+
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
 
 #
-#~ msgid "^[yY]"
-#~ msgstr "^[yY��]"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#~ msgid "^[nN]"
-#~ msgstr "^[nN��]"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#, fuzzy
-#~ msgid "character out of range"
-#~ msgstr "%s: ������� ������� ��� ��� �� ����"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#~ msgid "invalid user"
-#~ msgstr "�� ������� �������"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#~ msgid "invalid group"
-#~ msgstr "�� ������ �����"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr ""
-#~ "������� � ���� ��� ������ ��������� ��� ������� ���� ����������� UID"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#~ msgid "Written by %s.\n"
-#~ msgstr "�������� ��� ���/��� %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "�������� ��� ���/��� %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "�������� ��� ���/��� %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "�������� ��� ���/��� %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr "Γραμμένο από τον/την %s.\n"
 
 #
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Αναφέρατε σφάλματα στο <%s>.\n"
+
+#
+#: lib/version-etc.c:247
+#, fuzzy, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr ""
+"\n"
+"Αναφέρατε σφάλματα στο <%s>.\n"
+
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr ""
+
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr ""
+
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr ""
+
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr ""
+
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr ""
+
+#
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, fuzzy, c-format
+msgid "%s subprocess"
+msgstr "%s: μη έγκυρη μορφή"
+
+#
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, fuzzy, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s: μη έγκυρη μορφή"
+
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr ""
+
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr ""
+
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr ""
+
+#
+#: lib/xfreopen.c:38
 #, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "�������� ��� ���/��� %s.\n"
+msgid "unknown stream"
+msgstr "Άγνωστο σφάλμα συστήματος"
+
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr ""
+
+#
+#: lib/xmemcoll.c:39
+#, fuzzy, c-format
+msgid "string comparison failed"
+msgstr "αποτυχία εγγραφής"
+
+#
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Θέστε LC_ALL='C' για να παρακάμψετε το πρόβλημα."
+
+#: lib/xmemcoll.c:42
+#, fuzzy, c-format
+msgid "The strings compared were %s and %s."
+msgstr "δεν είναι δυνατό να δημιουργηθεί το %s `%s' στο `%s'"
+
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr ""
+
+#
+#: lib/xstrtol-error.c:63
+#, fuzzy, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "μη έγκυρο όρισμα %s για %s"
+
+#
+#: lib/xstrtol-error.c:68
+#, fuzzy, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "μη έγκυρο όρισμα %s για %s"
+
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr ""
+
+#
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: μη αναγνωρίσιμη επιλογή -- %c\n"
+
+#
+#~ msgid "block size"
+#~ msgstr "μέγεθος μπλοκ"
 
 #
 #, fuzzy
-#~ msgid "string comparison failed"
-#~ msgstr "�������� ��������"
+#~ msgid "%s exists but is not a directory"
+#~ msgstr "το `%s' υπάρχει ήδη άλλα δεν είναι κατάλογος"
 
 #
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "����� LC_ALL='C' ��� �� ����������� �� ��������."
+#, fuzzy
+#~ msgid "cannot change owner and/or group of %s"
+#~ msgstr "δεν είναι δυνατό να παραληφθεί χρήστης και ομάδα"
 
+#
 #, fuzzy
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "��� ����� ������ �� ������������ �� %s `%s' ��� `%s'"
+#~ msgid "cannot chdir to directory %s"
+#~ msgstr "αδύνατη η αλλαγή στο κατάλογο %s"
+
+#
+#~ msgid "cannot get the login group of a numeric UID"
+#~ msgstr "αδύνατη η λήψη της ομάδας εισαγωγής στο σύστημα ενός αριθμητικού UID"
diff --git a/gnulib/po/es.po b/gnulib/po/es.po
index 5390f7d2..8e59c217 100644
--- a/gnulib/po/es.po
+++ b/gnulib/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-08-24 11:23-0500\n"
 "Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -23,593 +23,802 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "argumento %s inválido para %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "argumento %s ambiguo para %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Los argumentos válidos son:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: el valor %s es menor o igual a %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: El parámetro ARGP_HELP_FMT requiere de un valor"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: El parámetro ARGP_HELP_FMT debe ser positivo"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Parámetro de ARGP_HELP_FMT desconocido"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Basura en ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Los argumentos obligatorios u opcionales para las opciones largas también "
-"son obligatorios u opcionales para cualquier opción corta correspondiente."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Los argumentos obligatorios u opcionales para las opciones largas también son obligatorios u opcionales para cualquier opción corta correspondiente."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Modo de empleo:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  o:"
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [OPCIÓN...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Pruebe `%s --help' ó `%s --usage' para más información.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Reporte bichos a %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Error desconocido de sistema"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "da esta lista de ayuda"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "da un mensaje corto de modo de empleo"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NOMBRE"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "establece el nombre del programa"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEGUNDOS"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "espera por SECS segundos (3600 por defecto)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "muestra la versión del programa"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ERROR DEL PROGRAMA) ¿¡Sin versión conocida!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Demasiados argumentos\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ERROR DEL PROGRAMA) ¿¡La opción debería reconocerse!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: la opción '%s' es ambigua; posibilidades:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "error del programa"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: la opción '--%s' no admite un argumento\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "desbordamiento de la pila"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: la opción '%c%s' no admite un argumento\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "no se puede encontrar un directorio temporal, pruebe definir $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: la opción '--%s' requiere de un argumento\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "no se puede crear un directorio temporal usando la plantilla \"%s\""
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: no se reconoce la opción '--%s'\n"
+msgid "cannot remove temporary file %s"
+msgstr "no se puede borrar el fichero temporal %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: no se reconoce la opción '%c%s'\n"
+msgid "cannot remove temporary directory %s"
+msgstr "no se puede borrar el directorio temporal %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opción inválida -- '%c'\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "error al cerrar el fichero"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: la opción requiere de un argumento -- '%c'\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "error de escritura"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
+msgid "preserving permissions for %s"
+msgstr "se conservan los permisos de %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: la opción '-W %s' no admite un argumento\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "error al abrir \"%s\" para lectura"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: la opción '-W %s' requiere de un argumento\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "argumento %s inválido para %s"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "argumento %s ambiguo para %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Los argumentos válidos son:"
-
-#~ msgid "program error"
-#~ msgstr "error del programa"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "error al leer \"%s\""
 
-#~ msgid "stack overflow"
-#~ msgstr "desbordamiento de la pila"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "error al escribir en \"%s\""
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "no se puede encontrar un directorio temporal, pruebe definir $TMPDIR"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "error después de leer \"%s\""
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "no se puede crear un directorio temporal usando la plantilla \"%s\""
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "falló fdopen()"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "no se puede borrar el fichero temporal %s"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "No se encontró un compilador de C#, pruebe instalando pnet"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "no se puede borrar el directorio temporal %s"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "No se encontró una máquina virtual de C#, pruebe instalando pnet"
 
-#~ msgid "error closing file"
-#~ msgstr "error al cerrar el fichero"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s: falló el subproceso"
 
-#~ msgid "write error"
-#~ msgstr "error de escritura"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "fichero regular vacío"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "se conservan los permisos de %s"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "fichero regular"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "error al abrir \"%s\" para lectura"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "directorio"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "fichero especial de bloques"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "error al leer \"%s\""
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "fichero especial de caracteres"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "error al escribir en \"%s\""
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "`fifo'"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "error después de leer \"%s\""
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "enlace simbólico"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "falló fdopen()"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "`socket'"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "No se encontró un compilador de C#, pruebe instalando pnet"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "cola de mensajes"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "No se encontró una máquina virtual de C#, pruebe instalando pnet"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semáforo"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: falló el subproceso"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "objeto de memoria compartida"
 
-#~ msgid "regular empty file"
-#~ msgstr "fichero regular vacío"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "objeto de memoria con tipo"
 
-#~ msgid "regular file"
-#~ msgstr "fichero regular"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "fichero extraño"
 
-#~ msgid "directory"
-#~ msgstr "directorio"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "No se admiten las familias de direcciones para hostname"
 
-#~ msgid "block special file"
-#~ msgstr "fichero especial de bloques"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Fallo temporal en la resolución del nombre"
 
-#~ msgid "character special file"
-#~ msgstr "fichero especial de caracteres"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Valor erróneo para ai_flags"
 
-#~ msgid "fifo"
-#~ msgstr "`fifo'"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Falla irrecuperable en la resolución del nombre"
 
-#~ msgid "symbolic link"
-#~ msgstr "enlace simbólico"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "no se admite ai_family"
 
-#~ msgid "socket"
-#~ msgstr "`socket'"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Falló la llamada al sistema `malloc'"
 
-#~ msgid "message queue"
-#~ msgstr "cola de mensajes"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "No existe una dirección asociada con el nombre de anfitrión"
 
-#~ msgid "semaphore"
-#~ msgstr "semáforo"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Nombre o servicio desconocido"
 
-#~ msgid "shared memory object"
-#~ msgstr "objeto de memoria compartida"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "No se admite servname para ai_socktype"
 
-#~ msgid "typed memory object"
-#~ msgstr "objeto de memoria con tipo"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "no se admite ai_socktype"
 
-#~ msgid "weird file"
-#~ msgstr "fichero extraño"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Error del sistema"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "No se admiten las familias de direcciones para hostname"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Almacenamiento temporal de argumentos demasiado pequeño"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Fallo temporal en la resolución del nombre"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Petición de procesamiento en progreso"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Valor erróneo para ai_flags"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Se canceló la petición"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Falla irrecuperable en la resolución del nombre"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "No se canceló la petición"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "no se admite ai_family"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Se completaron todas las peticiones"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Falló la llamada al sistema `malloc'"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Interrupción por una señal"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "No existe una dirección asociada con el nombre de anfitrión"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "La cadena de parámetro no está codificada correctamente"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Nombre o servicio desconocido"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Error desconocido"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "No se admite servname para ai_socktype"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: la opción '%s' es ambigua; posibilidades:"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "no se admite ai_socktype"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: la opción '--%s' no admite un argumento\n"
 
-#~ msgid "System error"
-#~ msgstr "Error del sistema"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: la opción '%c%s' no admite un argumento\n"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Almacenamiento temporal de argumentos demasiado pequeño"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: la opción '--%s' requiere de un argumento\n"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Petición de procesamiento en progreso"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: no se reconoce la opción '--%s'\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Se canceló la petición"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: no se reconoce la opción '%c%s'\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "No se canceló la petición"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: opción inválida -- '%c'\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Se completaron todas las peticiones"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: la opción requiere de un argumento -- '%c'\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Interrupción por una señal"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "La cadena de parámetro no está codificada correctamente"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: la opción '-W %s' no admite un argumento\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Error desconocido"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: la opción '-W %s' requiere de un argumento\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "argumento source_version inválido para compile_java_class"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "argumento source_version inválido para compile_java_class"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "argumento target_version inválido para compile_java_class"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "argumento target_version inválido para compile_java_class"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "no se puede crear \"%s\""
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "no se puede crear \"%s\""
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "error al escribir el fichero \"%s\""
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "error al escribir el fichero \"%s\""
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "No se encontró un compilador de Java, pruebe instalando gcj o definiendo "
-#~ "$JAVAC"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "No se encontró un compilador de Java, pruebe instalando gcj o definiendo $JAVAC"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "No se encontró una máquina virtual de Java, pruebe instalando gij o "
-#~ "definiendo $JAVA"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "No se encontró una máquina virtual de Java, pruebe instalando gij o definiendo $JAVA"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s: error de E/S del subproceso"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s: error de E/S del subproceso"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "no se pueden cambiar los permisos de %s"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "no se pueden cambiar los permisos de %s"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "no se puede crear el directorio %s"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "no se puede crear el directorio %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "memoria agotada"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "memoria agotada"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "no se puede registrar el directorio de trabajo actual"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "no se puede registrar el directorio de trabajo actual"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "no se puede volver al directorio de trabajo inicial"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "no se puede volver al directorio de trabajo inicial"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Falló al abrir /dev/zero para lectura"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Falló al abrir /dev/zero para lectura"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "falló la creación del hilo de lectura"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "falló la creación del hilo de lectura"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "no se puede establecer E/S sin bloqueo para el subproceso %s"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "no se puede establecer E/S sin bloqueo para el subproceso %s"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "falló la comunicación con el subproceso %s"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "falló la comunicación con el subproceso %s"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "falló la escritura al subproceso %s"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "falló la escritura al subproceso %s"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "falló la lectura del subproceso %s"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "falló la lectura del subproceso %s"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "el subproceso %s terminó con el código de salida %d"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "el subproceso %s terminó con el código de salida %d"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "falló la creación de hilos"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "falló la creación de hilos"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "subproceso %s terminado con el código de salida %d"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "subproceso %s terminado con el código de salida %d"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "François Pinard"
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
 
 # Vamos a probar con el símbolo de cita tradicional en español,
 # a ver qué tal queda la cosa.
-#~ msgid "`"
-#~ msgstr "«"
-
-#~ msgid "'"
-#~ msgstr "»"
-
-#~ msgid "Success"
-#~ msgstr "Éxito"
-
-#~ msgid "No match"
-#~ msgstr "Sin coincidencia"
-
-#~ msgid "Invalid regular expression"
-#~ msgstr "Expresión regular inválida"
-
-#~ msgid "Invalid collation character"
-#~ msgstr "Carácter de ordenamiento inválido"
-
-#~ msgid "Invalid character class name"
-#~ msgstr "Nombre de clase de carácter inválido"
-
-#~ msgid "Trailing backslash"
-#~ msgstr "Barra invertida sobrante"
-
-#~ msgid "Invalid back reference"
-#~ msgstr "Referencia hacia atrás inválida"
-
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "[ o [^ sin pareja"
-
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "( o \\( sin pareja"
-
-#~ msgid "Unmatched \\{"
-#~ msgstr "\\{ sin pareja"
-
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Contenido inválido de \\{\\}"
-
-#~ msgid "Invalid range end"
-#~ msgstr "Fin de rango inválido"
-
-#~ msgid "Memory exhausted"
-#~ msgstr "Memoria agotada"
-
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Expresión regular precedente inválida"
-
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Final prematuro de la expresión regular"
-
-#~ msgid "Regular expression too big"
-#~ msgstr "Expresión regular demasiado grande"
-
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr ") o \\) sin pareja"
-
-#~ msgid "No previous regular expression"
-#~ msgstr "No hay una expresión regular previa"
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "«"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "»"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Éxito"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Sin coincidencia"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Expresión regular inválida"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Carácter de ordenamiento inválido"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Nombre de clase de carácter inválido"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Barra invertida sobrante"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Referencia hacia atrás inválida"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "[ o [^ sin pareja"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "( o \\( sin pareja"
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "\\{ sin pareja"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Contenido inválido de \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Fin de rango inválido"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Memoria agotada"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Expresión regular precedente inválida"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Final prematuro de la expresión regular"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Expresión regular demasiado grande"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr ") o \\) sin pareja"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "No hay una expresión regular previa"
 
 # Esto es para responder "sí" cuando nos pregunte.
-#~ msgid "^[yY]"
-#~ msgstr "^[sS]"
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[sS]"
 
 # Y esto es para responder "no" cuando nos pregunte.
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
-
-#~ msgid "setting permissions for %s"
-#~ msgstr "se cambian los permisos de %s"
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "se cambian los permisos de %s"
 
-#~ msgid "Hangup"
-#~ msgstr "Colgar"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Colgar"
 
-#~ msgid "Interrupt"
-#~ msgstr "Interrumpir"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Interrumpir"
 
-#~ msgid "Quit"
-#~ msgstr "Salir"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Salir"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Instrucción ilegal"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Instrucción ilegal"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Captura de rastreo/punto de quiebre"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Captura de rastreo/punto de quiebre"
 
-#~ msgid "Aborted"
-#~ msgstr "Abortar"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Abortar"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Excepción de coma flotante"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Excepción de coma flotante"
 
-#~ msgid "Killed"
-#~ msgstr "Matar"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Matar"
 
-#~ msgid "Bus error"
-#~ msgstr "Error de bus"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Error de bus"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Falta de segmentación"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Falta de segmentación"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Tubería rota"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Tubería rota"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Reloj de alarma"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Reloj de alarma"
 
-#~ msgid "Terminated"
-#~ msgstr "Terminar"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Terminar"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Condición de E/S urgente"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Condición de E/S urgente"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Detener (señal)"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Detener (señal)"
 
-#~ msgid "Stopped"
-#~ msgstr "Detener"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Detener"
 
-#~ msgid "Continued"
-#~ msgstr "Continuar"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Continuar"
 
-#~ msgid "Child exited"
-#~ msgstr "Salió el hijo"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Salió el hijo"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Detener (entrada de tty)"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Detener (entrada de tty)"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Detener (salida de tty)"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Detener (salida de tty)"
 
-#~ msgid "I/O possible"
-#~ msgstr "Posible E/S"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Posible E/S"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Excede el límite de tiempo de CPU"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Excede el límite de tiempo de CPU"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Excede el límite de tamaño de fichero"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Excede el límite de tamaño de fichero"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Expira el temporizador virtual"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Expira el temporizador virtual"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Expira el temporizador de análisis de perfil"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Expira el temporizador de análisis de perfil"
 
-#~ msgid "Window changed"
-#~ msgstr "Cambio de ventana"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Cambio de ventana"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Señal 1 definida por el usuario"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Señal 1 definida por el usuario"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Señal 2 definida por el usuario"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Señal 2 definida por el usuario"
 
-#~ msgid "EMT trap"
-#~ msgstr "Captura EMT"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Captura EMT"
 
-#~ msgid "Bad system call"
-#~ msgstr "Llamada al sistema errónea"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Llamada al sistema errónea"
 
-#~ msgid "Stack fault"
-#~ msgstr "Falta en la pila"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Falta en la pila"
 
-#~ msgid "Information request"
-#~ msgstr "Petición de información"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Petición de información"
 
-#~ msgid "Power failure"
-#~ msgstr "Falla de energía"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Falla de energía"
 
-#~ msgid "Resource lost"
-#~ msgstr "Recurso perdido"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Recurso perdido"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "error al escribir a una tubería o socket cerrados"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "error al escribir a una tubería o socket cerrados"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "no se puede una tubería"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "no se puede una tubería"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Señal de tiempo real %d"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Señal de tiempo real %d"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Señal %d desconocida"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Señal %d desconocida"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "la función iconv no es utilizable"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "la función iconv no es utilizable"
 
-#~ msgid "iconv function not available"
-#~ msgstr "la función iconv no está disponible"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "la función iconv no está disponible"
 
-#~ msgid "character out of range"
-#~ msgstr "carácter fuera de rango"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "carácter fuera de rango"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "no se puede convertir U+%04X al conjunto de caracteres local"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "no se puede convertir U+%04X al conjunto de caracteres local"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "no se puede convertir U+%04X al conjunto de caracteres local: %s"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "no se puede convertir U+%04X al conjunto de caracteres local: %s"
 
 # Me niego a considerar "inválido" como palabra "políticamente incorrecta".
 # Si algún "impedido físico" lee este mensaje y se molesta por ello, entonces
@@ -625,11 +834,13 @@ msgstr "%s: la opción '-W %s' requiere de un argumento\n"
 # Eso sí, un día tendré que preguntar a los de GNU en qué se diferencia
 # "invalid" de "not allowed" de "not recognized" y todo eso... sv
 #
-#~ msgid "invalid user"
-#~ msgstr "usuario inválido"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "usuario inválido"
 
-#~ msgid "invalid group"
-#~ msgstr "grupo inválido"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "grupo inválido"
 
 # Me niego a considerar "inválido" como palabra "políticamente incorrecta".
 # Si algún "impedido físico" lee este mensaje y se molesta por ello, entonces
@@ -645,169 +856,263 @@ msgstr "%s: la opción '-W %s' requiere de un argumento\n"
 # Eso sí, un día tendré que preguntar a los de GNU en qué se diferencia
 # "invalid" de "not allowed" de "not recognized" y todo eso... sv
 #
-#~ msgid "invalid spec"
-#~ msgstr "especificación inválida"
-
-#~ msgid "unable to display error message"
-#~ msgstr "no se puede mostrar el mensaje de error"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "especificación inválida"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Empaquetado por %s (%s)\n"
-
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Empaquetado por %s\n"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Licencia GPLv3+: GPL de GNU versión 3 o posterior\n"
-#~ "<http://gnu.org/licenses/gpl.html>.\n"
-#~ "Esto es software libre: tiene la libertad de cambiarlo y redistribuirlo.\n"
-#~ "No tiene GARANTÍA, en la extensión permitida por la ley.\n"
-#~ "\n"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "no se puede mostrar el mensaje de error"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Empaquetado por %s (%s)\n"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Escrito por %s y %s.\n"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Empaquetado por %s\n"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Escrito por %s, %s, y %s.\n"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "(C)"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Escrito por %s, %s, %s,\n"
-#~ "y %s.\n"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Licencia GPLv3+: GPL de GNU versión 3 o posterior\n"
+"<http://gnu.org/licenses/gpl.html>.\n"
+"Esto es software libre: tiene la libertad de cambiarlo y redistribuirlo.\n"
+"No tiene GARANTÍA, en la extensión permitida por la ley.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escrito por %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Escrito por %s, %s, %s,\n"
-#~ "%s, y %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Escrito por %s y %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Escrito por %s, %s, %s,\n"
-#~ "%s, %s, y %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Escrito por %s, %s, y %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Escrito por %s, %s, %s,\n"
-#~ "%s, %s, %s, y %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Escrito por %s, %s, %s,\n"
+"y %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Escrito por %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "y %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, y %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Escrito por %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, y %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, y %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Escrito por %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, y otros.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s, y %s.\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Reporte bichos a: %s.\n"
-#~ "Reporte errores de traducción a: es@li.org\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"y %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, y %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Escrito por %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, y otros.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Reporte bichos a: %s.\n"
+"Reporte errores de traducción a: es@li.org\n"
 
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Reporte bichos de %s a: %s\n"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Reporte bichos de %s a: %s\n"
 
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "Página web de %s: <%s>\n"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Página web de %s: <%s>\n"
 
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "Página web de %s: <http://www.gnu.org/software/%s/>\n"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Página web de %s: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Ayuda general para usar software de GNU: <http://www.gnu.org/gethelp/>\n"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Ayuda general para usar software de GNU: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "falló _open_osfhandle"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "falló _open_osfhandle"
 
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "no se puede restaurar el df %d: falló dup2"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "no se puede restaurar el df %d: falló dup2"
 
-#~ msgid "%s subprocess"
-#~ msgstr "subproceso %s"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "subproceso %s"
 
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "el subproceso %s recibió la señal fatal %d"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "el subproceso %s recibió la señal fatal %d"
 
-#~ msgid "stdin"
-#~ msgstr "entrada estándard"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "entrada estándard"
 
-#~ msgid "stdout"
-#~ msgstr "salida estándard"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "salida estándard"
 
-#~ msgid "stderr"
-#~ msgstr "salida de error estándard"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "salida de error estándard"
 
-#~ msgid "unknown stream"
-#~ msgstr "flujo desconocido"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "flujo desconocido"
 
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "falló al reabrir %s con modo %s"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "falló al reabrir %s con modo %s"
 
-#~ msgid "string comparison failed"
-#~ msgstr "la comparación de cadenas falló"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "la comparación de cadenas falló"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr ""
-#~ "Establezca LC_ALL='C' para solucionar este problema de forma temporal."
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Establezca LC_ALL='C' para solucionar este problema de forma temporal."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Las cadenas comparadas eran %s y %s."
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Las cadenas comparadas eran %s y %s."
 
-#~ msgid "cannot perform formatted output"
-#~ msgstr "no se puede mostrar la salida con formato"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "no se puede mostrar la salida con formato"
 
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "argumento `$3%s' inválido para $1%s$2%s"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "argumento `$3%s' inválido para $1%s$2%s"
 
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "sufijo inválido en el argumento `$3%s' para $1%s$2%s"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "sufijo inválido en el argumento `$3%s' para $1%s$2%s"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "el argumento `$3%s' es demasiado grande para $1%s$2%s"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "el argumento `$3%s' es demasiado grande para $1%s$2%s"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: opción ilegal -- %c\n"
@@ -836,15 +1141,13 @@ msgstr "%s: la opción '-W %s' requiere de un argumento\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
+#~ "This is free software.  You may redistribute copies of it under the terms of\n"
 #~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
 #~ "There is NO WARRANTY, to the extent permitted by law.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Este programa es software libre; se pueden redistribuir copias del "
-#~ "mismo \n"
+#~ "Este programa es software libre; se pueden redistribuir copias del mismo \n"
 #~ "bajo los términos de la Licencia Pública General de GNU\n"
 #~ "<http://www.gnu.org/licenses/gpl.html>.\n"
 #~ "NO HAY GARANTÍA, a la extensión permitida por la ley.\n"
diff --git a/gnulib/po/et.po b/gnulib/po/et.po
index 82c320bf..0193c2c6 100644
--- a/gnulib/po/et.po
+++ b/gnulib/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 2.0.0.3462.e9796\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2010-02-22 12:32+0200\n"
 "PO-Revision-Date: 2011-05-19 15:10+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -17,583 +17,1043 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "vigane argument %s v�tmel `%s'"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "segane argument %s v�tmele `%s'"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Lubatud argumendid on:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: %s v��rtus on v�iksem v�i v�rdne kui %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT parameeter n�uab v��rtust"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT parameeter peab olema positiivne"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Tundmatu ARGP_HELP_FMT parameeter"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Pr�gi ARGP_HELP_FMT sees: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Kohustuslikud argumendid pikkadele v�tmetele on kohustuslikud ka l�hikestele."
+#: lib/argp-help.c:1244
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Kohustuslikud argumendid pikkadele v�tmetele on kohustuslikud ka l�hikestele."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1637
 msgid "Usage:"
 msgstr "Kasutamine:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1641
 msgid "  or: "
 msgstr "  v�i: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1653
 msgid " [OPTION...]"
 msgstr " [V�TI]..."
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1680
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Lisainfo saamiseks proovige `%s --help' v�i `%s --usage'.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1708
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Vigadest teatage palun aadressil %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1927 lib/error.c:153
 msgid "Unknown system error"
 msgstr "Tundmatu s�steemne viga"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "anna see abiinfo"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "anna kasutamise l�hikirjeldus"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NIMI"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "sea programmi nimi"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEK"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "oota SEK sekundit (vaikimisi 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "v�ljasta programmi versioon"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(PROGRAMMI VIGA) Versioon ei ole teada!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Liiga palju argumente\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(PROGRAMMI VIGA) V�ti pidanuks olema teada!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: lib/c-stack.c:196 lib/c-stack.c:309
+msgid "program error"
+msgstr "programmi viga"
+
+#: lib/c-stack.c:197 lib/c-stack.c:310
+msgid "stack overflow"
+msgstr "pinu �let�itumine"
+
+#: lib/clean-temp.c:335
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "ei leia ajutist kataloogi, proovige seada $TMPDIR"
+
+#: lib/clean-temp.c:349
+#, c-format
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "vormiga \"%s\" ei saa ajutist kataloogi luua"
+
+#: lib/clean-temp.c:445
+#, c-format
+msgid "cannot remove temporary file %s"
+msgstr "ajutist faili %s ei �nnestu kustutada"
+
+#: lib/clean-temp.c:460
+#, c-format
+msgid "cannot remove temporary directory %s"
+msgstr "ajutist kataloogi %s ei �nnestu kustutada"
+
+#: lib/closein.c:99
+msgid "error closing file"
+msgstr "viga faili sulgemisel"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "viga kirjutamisel"
+
+#: lib/copy-acl.c:547
+#, c-format
+msgid "preserving permissions for %s"
+msgstr "s�ilitan %s �iguseid"
+
+#: lib/copy-file.c:67
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "viga \"%s\" lugemiseks avamisel"
+
+#: lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "Varukoopia faili \"%s\" ei �nnestu kirjutamiseks avada"
+
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "viga \"%s\" lugemisel"
+
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "viga \"%s\" kirjutamisel"
+
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "viga peale \"%s\" lugemist"
+
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() eba�nnestus"
+
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "C# kompilaatorit pole, proovige paigaldada pnet"
+
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "C# virtuaalmasinat pole, proovige paigaldada pnet"
+
+#: lib/execute.c:189 lib/execute.c:262 lib/pipe.c:229 lib/pipe.c:342
+#: lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s: alamprotsess sai vea"
+
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "tavaline t�hi fail"
+
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "tavaline fail"
+
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "Kataloog"
+
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "blokkseadme fail"
+
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "s�mbolseadme fail"
+
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
+
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "nimeviide"
+
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "sokkel"
+
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "teadete j�rjekord"
+
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafor"
+
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "jagatud m�lu objekt"
+
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "t��bitud m�lu objekt"
+
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "veider fail"
+
+#: lib/gai_strerror.c:42
+msgid "Address family for hostname not supported"
+msgstr "Aadressiperekonda v�i hostinime ei toetata"
+
+#: lib/gai_strerror.c:43
+msgid "Temporary failure in name resolution"
+msgstr "Ajutine t�rge nime lahendamisel"
+
+#: lib/gai_strerror.c:44
+msgid "Bad value for ai_flags"
+msgstr "Vigane ai_flags v��rtus"
+
+#: lib/gai_strerror.c:45
+msgid "Non-recoverable failure in name resolution"
+msgstr "nime lahendamisl tekkis taastumatu t�rge"
+
+#: lib/gai_strerror.c:46
+msgid "ai_family not supported"
+msgstr "ai_family ei toetata"
+
+#: lib/gai_strerror.c:47
+msgid "Memory allocation failure"
+msgstr "T�rge m�lu haaramisel"
+
+#: lib/gai_strerror.c:48
+msgid "No address associated with hostname"
+msgstr "Hosti nimega ei ole aadresse seostatud"
+
+#: lib/gai_strerror.c:49
+msgid "Name or service not known"
+msgstr "Nimi v�i teenus on tundmatu"
+
+#: lib/gai_strerror.c:50
+msgid "Servname not supported for ai_socktype"
+msgstr "ai_socktype ei toeta teenuse nime"
+
+#: lib/gai_strerror.c:51
+msgid "ai_socktype not supported"
+msgstr "ai_socktype ei toetata"
+
+#: lib/gai_strerror.c:52
+msgid "System error"
+msgstr "S�steemne viga"
+
+#: lib/gai_strerror.c:53
+msgid "Argument buffer too small"
+msgstr "Argumentide puhver on liiga v�ike"
+
+#: lib/gai_strerror.c:55
+msgid "Processing request in progress"
+msgstr "P�ringu t��tlemine k�ib"
+
+#: lib/gai_strerror.c:56
+msgid "Request canceled"
+msgstr "P�ring katkestati"
+
+#: lib/gai_strerror.c:57
+msgid "Request not canceled"
+msgstr "P�ringut ei katkestatud"
+
+#: lib/gai_strerror.c:58
+msgid "All requests done"
+msgstr "K�ik p�ringud t�idetud"
+
+#: lib/gai_strerror.c:59
+msgid "Interrupted by a signal"
+msgstr "Katkestatud signaaliga"
+
+#: lib/gai_strerror.c:60
+msgid "Parameter string not correctly encoded"
+msgstr "Parameeters�ne ei ole korrektselt kodeeritud"
+
+#: lib/gai_strerror.c:72
+msgid "Unknown error"
+msgstr "Tundmatu viga"
+
+#: lib/getopt.c:529 lib/getopt.c:545
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
 msgstr "%s: v�ti '%s' on segane\n"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/getopt.c:578 lib/getopt.c:582
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: v�ti '--%s' ei luba kasutada argumenti\n"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/getopt.c:591 lib/getopt.c:596
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: v�ti '%c%s' ei luba kasutada argumenti\n"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: lib/getopt.c:639 lib/getopt.c:658 lib/getopt.c:961 lib/getopt.c:980
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
 msgstr "%s: v�ti '%s' n�uab argumenti\n"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/getopt.c:696 lib/getopt.c:699
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: tundmatu v�ti '--%s'\n"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/getopt.c:707 lib/getopt.c:710
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: tundmatu v�ti '%c%s'\n"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/getopt.c:759 lib/getopt.c:762
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: vigane v�ti -- '%c'\n"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/getopt.c:812 lib/getopt.c:829 lib/getopt.c:1032 lib/getopt.c:1050
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: v�ti n�uab argumenti -- '%c'\n"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/getopt.c:882 lib/getopt.c:898
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: v�ti '-W %s' on segane\n"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/getopt.c:922 lib/getopt.c:940
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: v�ti '-W %s' ei luba kasutada argumenti\n"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: v�ti '%s' n�uab argumenti\n"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "funktsiooni compile_java_class argument source_version on vigane"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "vigane argument %s v�tmel `%s'"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "funktsiooni compile_java_class argument target_version on vigane"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "segane argument %s v�tmele `%s'"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "\"%s\" ei �nnestu luua"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Lubatud argumendid on:"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "viga faili \"%s\" kirjutamisel"
 
-#~ msgid "program error"
-#~ msgstr "programmi viga"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Java kompilaatorit pole, proovige paigaldada gcj v�i seada $JAVAC"
 
-#~ msgid "stack overflow"
-#~ msgstr "pinu �let�itumine"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Java virtuaalmasinat pole, proovige paigaldada gcj v�i seada $JAVAC"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "ei leia ajutist kataloogi, proovige seada $TMPDIR"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s: alamprotsess sai S/V vea"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "vormiga \"%s\" ei saa ajutist kataloogi luua"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "ei �nnestu muuta %s �igusi"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "ajutist faili %s ei �nnestu kustutada"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "kataloogi `%s' ei �nnestu luua"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "ajutist kataloogi %s ei �nnestu kustutada"
+#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "m�lu on otsas"
 
-#~ msgid "error closing file"
-#~ msgstr "viga faili sulgemisel"
+#: lib/openat-die.c:34
+#, c-format
+msgid "unable to record current working directory"
+msgstr "ei �nnestu registreerida jooksvat t��kataloogi"
 
-#~ msgid "write error"
-#~ msgstr "viga kirjutamisel"
+#: lib/openat-die.c:52
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "esialgsesse t��kataloogi ei �nnestu tagasi minna"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "s�ilitan %s �iguseid"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Faili /dev/zero saa lugemiseks avada"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "viga \"%s\" lugemiseks avamisel"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "lugemise l�ime loomine eba�nnestus"
+
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "�hendus %s alamprotsessiga eba�nnestus"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "Varukoopia faili \"%s\" ei �nnestu kirjutamiseks avada"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:359
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "kirjutamine %s alamprotsessi sai vea"
+
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:396
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "lugemine %s alamprotsessist sai vea"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "viga \"%s\" lugemisel"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr ""
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "viga \"%s\" kirjutamisel"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "l�imede loomine eba�nnestus"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "viga peale \"%s\" lugemist"
+#: lib/pipe-filter-ii.c:428
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() eba�nnestus"
+#: lib/pipe.c:137 lib/pipe.c:140 lib/pipe.c:258 lib/pipe.c:261
+#, c-format
+msgid "cannot create pipe"
+msgstr "ei �nnestu luua toru"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:272
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:273
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:132
+msgid "Success"
+msgstr ""
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "C# kompilaatorit pole, proovige paigaldada pnet"
+#: lib/regcomp.c:135
+msgid "No match"
+msgstr ""
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "C# virtuaalmasinat pole, proovige paigaldada pnet"
+#: lib/regcomp.c:138
+msgid "Invalid regular expression"
+msgstr "Vigane regulaaravaldis"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: alamprotsess sai vea"
+#: lib/regcomp.c:141
+msgid "Invalid collation character"
+msgstr "Vigane v�rdluss�mbol"
 
-#~ msgid "regular empty file"
-#~ msgstr "tavaline t�hi fail"
+#: lib/regcomp.c:144
+msgid "Invalid character class name"
+msgstr "Vigane s�mbolite klassi nimi"
 
-#~ msgid "regular file"
-#~ msgstr "tavaline fail"
+#: lib/regcomp.c:147
+msgid "Trailing backslash"
+msgstr ""
 
-#~ msgid "directory"
-#~ msgstr "Kataloog"
+#: lib/regcomp.c:150
+msgid "Invalid back reference"
+msgstr "Vigane tagasiviide"
 
-#~ msgid "block special file"
-#~ msgstr "blokkseadme fail"
+#: lib/regcomp.c:153
+msgid "Unmatched [ or [^"
+msgstr ""
 
-#~ msgid "character special file"
-#~ msgstr "s�mbolseadme fail"
+#: lib/regcomp.c:156
+msgid "Unmatched ( or \\("
+msgstr ""
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/regcomp.c:159
+msgid "Unmatched \\{"
+msgstr ""
 
-#~ msgid "symbolic link"
-#~ msgstr "nimeviide"
+#: lib/regcomp.c:162
+msgid "Invalid content of \\{\\}"
+msgstr ""
 
-#~ msgid "socket"
-#~ msgstr "sokkel"
+#: lib/regcomp.c:165
+msgid "Invalid range end"
+msgstr "Vigane vahemiku l�pp"
 
-#~ msgid "message queue"
-#~ msgstr "teadete j�rjekord"
+#: lib/regcomp.c:168
+msgid "Memory exhausted"
+msgstr "M�lu on otsas"
 
-#~ msgid "semaphore"
-#~ msgstr "semafor"
+#: lib/regcomp.c:171
+msgid "Invalid preceding regular expression"
+msgstr "Vigane eelnev regulaaravaldis"
 
-#~ msgid "shared memory object"
-#~ msgstr "jagatud m�lu objekt"
+#: lib/regcomp.c:174
+msgid "Premature end of regular expression"
+msgstr "Enneaegne regulaaravaldise l�pp"
 
-#~ msgid "typed memory object"
-#~ msgstr "t��bitud m�lu objekt"
+#: lib/regcomp.c:177
+msgid "Regular expression too big"
+msgstr "Regulaaravaldis on liiga pikk"
 
-#~ msgid "weird file"
-#~ msgstr "veider fail"
+#: lib/regcomp.c:180
+msgid "Unmatched ) or \\)"
+msgstr ""
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Aadressiperekonda v�i hostinime ei toetata"
+#: lib/regcomp.c:701
+msgid "No previous regular expression"
+msgstr "Eelmist regulaaravaldist pole"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[jJ]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[eE]"
+
+#: lib/set-mode-acl.c:591
+#, c-format
+msgid "setting permissions for %s"
+msgstr "ei �nnestu seada %s �igusi"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Ajutine t�rge nime lahendamisel"
+#: lib/siglist.h:29
+msgid "Hangup"
+msgstr ""
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Vigane ai_flags v��rtus"
+#: lib/siglist.h:32
+msgid "Interrupt"
+msgstr ""
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "nime lahendamisl tekkis taastumatu t�rge"
+#: lib/siglist.h:35
+msgid "Quit"
+msgstr ""
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family ei toetata"
+#: lib/siglist.h:38
+msgid "Illegal instruction"
+msgstr ""
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "T�rge m�lu haaramisel"
+#: lib/siglist.h:41
+msgid "Trace/breakpoint trap"
+msgstr ""
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Hosti nimega ei ole aadresse seostatud"
+#: lib/siglist.h:44
+msgid "Aborted"
+msgstr ""
 
-#~ msgid "Name or service not known"
-#~ msgstr "Nimi v�i teenus on tundmatu"
+#: lib/siglist.h:47
+msgid "Floating point exception"
+msgstr ""
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "ai_socktype ei toeta teenuse nime"
+#: lib/siglist.h:50
+msgid "Killed"
+msgstr ""
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype ei toetata"
+#: lib/siglist.h:53
+msgid "Bus error"
+msgstr "Siini viga"
 
-#~ msgid "System error"
-#~ msgstr "S�steemne viga"
+#: lib/siglist.h:56
+msgid "Segmentation fault"
+msgstr ""
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Argumentide puhver on liiga v�ike"
+#: lib/siglist.h:59
+msgid "Broken pipe"
+msgstr ""
 
-#~ msgid "Processing request in progress"
-#~ msgstr "P�ringu t��tlemine k�ib"
+#: lib/siglist.h:62
+msgid "Alarm clock"
+msgstr ""
 
-#~ msgid "Request canceled"
-#~ msgstr "P�ring katkestati"
+#: lib/siglist.h:65
+msgid "Terminated"
+msgstr ""
 
-#~ msgid "Request not canceled"
-#~ msgstr "P�ringut ei katkestatud"
+#: lib/siglist.h:68
+msgid "Urgent I/O condition"
+msgstr ""
 
-#~ msgid "All requests done"
-#~ msgstr "K�ik p�ringud t�idetud"
+#: lib/siglist.h:71
+msgid "Stopped (signal)"
+msgstr ""
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Katkestatud signaaliga"
+#: lib/siglist.h:74
+msgid "Stopped"
+msgstr ""
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Parameeters�ne ei ole korrektselt kodeeritud"
+#: lib/siglist.h:77
+msgid "Continued"
+msgstr ""
 
-#~ msgid "Unknown error"
-#~ msgstr "Tundmatu viga"
+#: lib/siglist.h:80
+msgid "Child exited"
+msgstr ""
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "funktsiooni compile_java_class argument source_version on vigane"
+#: lib/siglist.h:83
+msgid "Stopped (tty input)"
+msgstr ""
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "funktsiooni compile_java_class argument target_version on vigane"
+#: lib/siglist.h:86
+msgid "Stopped (tty output)"
+msgstr ""
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "\"%s\" ei �nnestu luua"
+#: lib/siglist.h:89
+msgid "I/O possible"
+msgstr ""
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "viga faili \"%s\" kirjutamisel"
+#: lib/siglist.h:92
+msgid "CPU time limit exceeded"
+msgstr ""
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr "Java kompilaatorit pole, proovige paigaldada gcj v�i seada $JAVAC"
+#: lib/siglist.h:95
+msgid "File size limit exceeded"
+msgstr ""
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr "Java virtuaalmasinat pole, proovige paigaldada gcj v�i seada $JAVAC"
+#: lib/siglist.h:98
+msgid "Virtual timer expired"
+msgstr ""
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s: alamprotsess sai S/V vea"
+#: lib/siglist.h:101
+msgid "Profiling timer expired"
+msgstr ""
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "ei �nnestu muuta %s �igusi"
+#: lib/siglist.h:104
+msgid "Window changed"
+msgstr ""
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "kataloogi `%s' ei �nnestu luua"
+#: lib/siglist.h:107
+msgid "User defined signal 1"
+msgstr ""
 
-#~ msgid "memory exhausted"
-#~ msgstr "m�lu on otsas"
+#: lib/siglist.h:110
+msgid "User defined signal 2"
+msgstr ""
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "ei �nnestu registreerida jooksvat t��kataloogi"
+#: lib/siglist.h:115
+msgid "EMT trap"
+msgstr ""
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "esialgsesse t��kataloogi ei �nnestu tagasi minna"
+#: lib/siglist.h:118
+msgid "Bad system call"
+msgstr ""
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Faili /dev/zero saa lugemiseks avada"
+#: lib/siglist.h:121
+msgid "Stack fault"
+msgstr ""
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "lugemise l�ime loomine eba�nnestus"
+#: lib/siglist.h:124
+msgid "Information request"
+msgstr ""
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "�hendus %s alamprotsessiga eba�nnestus"
+#: lib/siglist.h:126
+msgid "Power failure"
+msgstr "Toite viga"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "kirjutamine %s alamprotsessi sai vea"
+#: lib/siglist.h:129
+msgid "Resource lost"
+msgstr ""
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "lugemine %s alamprotsessist sai vea"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr ""
 
-#~ msgid "creation of threads failed"
-#~ msgstr "l�imede loomine eba�nnestus"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr ""
 
-#~ msgid "cannot create pipe"
-#~ msgstr "ei �nnestu luua toru"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr ""
 
-#~ msgid "`"
-#~ msgstr "`"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "iconv funktsioon ei ole kasutatav"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "iconv funktsioon puudub"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Vigane regulaaravaldis"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "s�mbol on piirkonnast v�ljas"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Vigane v�rdluss�mbol"
+#: lib/unicodeio.c:180
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Vigane s�mbolite klassi nimi"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada: %s"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Vigane tagasiviide"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "vigane kasutaja"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Vigane vahemiku l�pp"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "vigane grupp"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "M�lu on otsas"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "vigane spetsifikatsioon"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Vigane eelnev regulaaravaldis"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr ""
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Enneaegne regulaaravaldise l�pp"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr ""
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Regulaaravaldis on liiga pikk"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr ""
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Eelmist regulaaravaldist pole"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "�"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[jJ]"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
 
-#~ msgid "^[nN]"
-#~ msgstr "^[eE]"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Kirjutanud %s.\n"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "ei �nnestu seada %s �igusi"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Kirjutanud %s ja %s.\n"
 
-#~ msgid "Bus error"
-#~ msgstr "Siini viga"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Kirjutanud %s, %s ja %s.\n"
 
-#~ msgid "Power failure"
-#~ msgstr "Toite viga"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Kirjutanud %s, %s, %s\n"
+"ja %s.\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv funktsioon ei ole kasutatav"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Kirjutanud %s, %s, %s,\n"
+"%s ja %s.\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv funktsioon puudub"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Kirjutanud %s, %s, %s,\n"
+"%s, %s ja %s.\n"
 
-#~ msgid "character out of range"
-#~ msgstr "s�mbol on piirkonnast v�ljas"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Kirjutanud %s, %s, %s,\n"
+"%s, %s, %s ja %s.\n"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Kirjutanud %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"ja %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Kirjutanud %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s ja %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Kirjutanud %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s ja teised.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Vigadest teatage palun aadressil: %s.\n"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "U+%04X ei saa lokaalsesse kooditabelisse teisendada: %s"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "%s vigadest teatage palun aadressil: %s\n"
 
-#~ msgid "invalid user"
-#~ msgstr "vigane kasutaja"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s koduleht: <%s>\n"
 
-#~ msgid "invalid group"
-#~ msgstr "vigane grupp"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s koduleht: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "invalid spec"
-#~ msgstr "vigane spetsifikatsioon"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "�ldine abiinfo GNU tarkvara kasutamisest: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "(C)"
-#~ msgstr "�"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle eba�nnestus"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Kirjutanud %s.\n"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "failipidet %d ei �nnestu taastada: dup2 eba�nnestus"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Kirjutanud %s ja %s.\n"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "%s alamprotsess"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Kirjutanud %s, %s ja %s.\n"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s alamprotsess sai fataalse signaali %d"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Kirjutanud %s, %s, %s\n"
-#~ "ja %s.\n"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "standardsisend"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjutanud %s, %s, %s,\n"
-#~ "%s ja %s.\n"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "standardv�ljund"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjutanud %s, %s, %s,\n"
-#~ "%s, %s ja %s.\n"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "standardvead"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjutanud %s, %s, %s,\n"
-#~ "%s, %s, %s ja %s.\n"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "undmatu voog"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Kirjutanud %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "ja %s.\n"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "reopen %s moodiga %s eba�nnestus"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjutanud %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s ja %s.\n"
+#: lib/xmemcoll.c:48
+#, c-format
+msgid "string comparison failed"
+msgstr "s�nede v�rdlus eba�nnestus"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Kirjutanud %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s ja teised.\n"
+#: lib/xmemcoll.c:49
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Probleemi lahendamiseks seadke LC_ALL=C."
 
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vigadest teatage palun aadressil: %s.\n"
+#: lib/xmemcoll.c:51
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "V�rreldi s�nesid %s ja %s."
 
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "%s vigadest teatage palun aadressil: %s\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "ei �nnestu luua vormindatud v�ljundit"
 
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "%s koduleht: <%s>\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "vigane %s%s argument `%s'"
 
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "%s koduleht: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "�ldine abiinfo GNU tarkvara kasutamisest: <http://www.gnu.org/gethelp/>\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle eba�nnestus"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "failipidet %d ei �nnestu taastada: dup2 eba�nnestus"
-
-#~ msgid "%s subprocess"
-#~ msgstr "%s alamprotsess"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s alamprotsess sai fataalse signaali %d"
-
-#~ msgid "stdin"
-#~ msgstr "standardsisend"
-
-#~ msgid "stdout"
-#~ msgstr "standardv�ljund"
-
-#~ msgid "stderr"
-#~ msgstr "standardvead"
-
-#~ msgid "unknown stream"
-#~ msgstr "undmatu voog"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "reopen %s moodiga %s eba�nnestus"
-
-#~ msgid "string comparison failed"
-#~ msgstr "s�nede v�rdlus eba�nnestus"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Probleemi lahendamiseks seadke LC_ALL=C."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "V�rreldi s�nesid %s ja %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "ei �nnestu luua vormindatud v�ljundit"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "vigane %s%s argument `%s'"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "vigane sufiks %s%s argument `%s'"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "vigane sufiks %s%s argument `%s'"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "%s%s argument `%s' on liiga suur"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s argument `%s' on liiga suur"
diff --git a/gnulib/po/eu.po b/gnulib/po/eu.po
index 3b3b8721..0a2cf19d 100644
--- a/gnulib/po/eu.po
+++ b/gnulib/po/eu.po
@@ -8,42 +8,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils-5.2.1\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2005-01-04 20:27+0100\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
-"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "%s baliogabeko argumentua da %s-(r)entzat"
 
-#: gnulib/argp-help.c:220
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "%s argumentu anbiguoa da %s-(r)entzat"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
-
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Baliozko argumentuak hauek dira:"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -52,404 +41,479 @@ msgstr ""
 "Beharrezkoak diren argumentuak aukera luzeetan, beharrezkoak dira aukera "
 "txikietan ere.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Erabilera: %s [AUKERA]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Saiatu `%s --help' erabiltzen informazio gehiagorako.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "Programa-erroreen berri emateko idatzi hona: <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Sistema-errore ezezaguna"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "IZENA"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
+#: lib/argp-parse.c:619
+#, fuzzy, c-format
+msgid "%s: Too many arguments\n"
+msgstr "e"
 
-#: gnulib/argp-parse.c:142
+#: lib/c-stack.c:244
 #, fuzzy
-msgid "print program version"
+msgid "program error"
 msgstr "irakurketa errorea"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "idazketa errorea"
 
-#: gnulib/argp-parse.c:612
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: Too many arguments\n"
-msgstr "e"
-
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+msgid "error while opening \"%s\" for reading"
+msgstr "errepikatu arte"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: '%s' aukera anbiguoa da\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "errepikatu arte"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: '--%s' aukerak ez du argumenturik onartzen\n"
+msgid "error reading \"%s\""
+msgstr "errorea %s irakurtzen"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: '%c%s' aukerak ez du argumenturik onartzen\n"
+msgid "error writing \"%s\""
+msgstr "errorea %s idazten"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: '%s' aukerak argumentu bat behar du\n"
+msgid "error after reading \"%s\""
+msgstr "errorea %s irakurtzen"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: '--%s' aukera ezezaguna\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "irekitzeak huts egin du"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: '%c%s' aukera ezezaguna\n"
+msgid "%s subprocess failed"
+msgstr "baliogabea"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: -- %c aukera baliogabea\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "fitxategi erregular hutsa"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: aukerak --%c argumentu bat behar du\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "Espresio erregularra"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: '-W %s' aukera anbiguoa da\n"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "direktorioa"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: '-W.%s' aukerak ez du argumenturik onartzen\n"
+#: lib/file-type.c:49
+#, fuzzy
+msgid "block special file"
+msgstr "bloke tamainua"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: '%s' aukerak argumentu bat behar du\n"
+#: lib/file-type.c:52
+#, fuzzy
+msgid "character special file"
+msgstr "offset karakterea zero da"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "%s baliogabeko argumentua da %s-(r)entzat"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "%s argumentu anbiguoa da %s-(r)entzat"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "esteka sinbolikoa"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Baliozko argumentuak hauek dira:"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "socket-a"
 
-#~ msgid "write error"
-#~ msgstr "idazketa errorea"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "Bidali ilara"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "errepikatu arte"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "semaforoa"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "errepikatu arte"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "memoria partekatuaren objektua"
 
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "errorea %s irakurtzen"
+msgid "typed memory object"
+msgstr "memoria partekatuaren objektua"
 
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "errorea %s idazten"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "fitxategi arraroa"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "errorea %s irakurtzen"
+msgid "Address family for hostname not supported"
+msgstr "fifo fitxategiek ez dute euskarririk"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "irekitzeak huts egin du"
+msgid "ai_family not supported"
+msgstr "fifo fitxategiek ez dute euskarririk"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "baliogabea"
-
-#~ msgid "regular empty file"
-#~ msgstr "fitxategi erregular hutsa"
-
-#~ msgid "regular file"
-#~ msgstr "Espresio erregularra"
-
-#~ msgid "directory"
-#~ msgstr "direktorioa"
+msgid "ai_socktype not supported"
+msgstr "fifo fitxategiek ez dute euskarririk"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "block special file"
-#~ msgstr "bloke tamainua"
+msgid "System error"
+msgstr "idazketa errorea"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "character special file"
-#~ msgstr "offset karakterea zero da"
+msgid "Unknown error"
+msgstr "Sistema-errore ezezaguna"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: '%s' aukera anbiguoa da\n"
 
-#~ msgid "symbolic link"
-#~ msgstr "esteka sinbolikoa"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: '--%s' aukerak ez du argumenturik onartzen\n"
 
-#~ msgid "socket"
-#~ msgstr "socket-a"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: '%c%s' aukerak ez du argumenturik onartzen\n"
 
-#~ msgid "message queue"
-#~ msgstr "Bidali ilara"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: '%s' aukerak argumentu bat behar du\n"
 
-#~ msgid "semaphore"
-#~ msgstr "semaforoa"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: '--%s' aukera ezezaguna\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "memoria partekatuaren objektua"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: '%c%s' aukera ezezaguna\n"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "memoria partekatuaren objektua"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: -- %c aukera ilegala\n"
 
-#~ msgid "weird file"
-#~ msgstr "fitxategi arraroa"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: -- %c aukera baliogabea\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "fifo fitxategiek ez dute euskarririk"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: aukerak --%c argumentu bat behar du\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "fifo fitxategiek ez dute euskarririk"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: '-W %s' aukera anbiguoa da\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "fifo fitxategiek ez dute euskarririk"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: '-W.%s' aukerak ez du argumenturik onartzen\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "idazketa errorea"
+#: lib/human.c:486
+msgid "block size"
+msgstr "bloke tamainua"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Sistema-errore ezezaguna"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s badago baina ez da direktorio bat"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: -- %c aukera ilegala\n"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "ezin da %s-(r)en jabetza eta/edo taldea aldatu"
 
-#~ msgid "block size"
-#~ msgstr "bloke tamainua"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "ezin da %s direktorioa sortu"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s badago baina ez da direktorio bat"
+#: lib/mkdir-p.c:240
+#, fuzzy, c-format
+msgid "cannot chdir to directory %s"
+msgstr "ezin da %s direktoriora aldatu"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "ezin da %s-(r)en jabetza eta/edo taldea aldatu"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "ezin da %s-(r)en baimenak aldatu"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "ezin da %s direktorioa sortu"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "memoria agortuta"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "ezin da %s direktoriora aldatu"
-
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "ezin da %s-(r)en baimenak aldatu"
-
-#~ msgid "memory exhausted"
-#~ msgstr "memoria agortuta"
+msgid "unable to record current working directory"
+msgstr "Inprimatu Fitxategi-izena - e e"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "Inprimatu Fitxategi-izena - e e"
+msgid "Failed to open /dev/zero for read"
+msgstr "baimenak errepikatu arte"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "baimenak errepikatu arte"
-
+msgid "cannot create pipe"
+msgstr "ezin da %s esteka sortu"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "ezin da %s esteka sortu"
-
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "'"
-#~ msgstr "'"
+msgid "Invalid regular expression"
+msgstr "baliogabea"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "baliogabea"
+msgid "Invalid character class name"
+msgstr "baliogabea"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "baliogabea"
+msgid "Memory exhausted"
+msgstr "memoria agortuta"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "memoria agortuta"
+msgid "Invalid preceding regular expression"
+msgstr "baliogabea"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "baliogabea"
+msgid "Premature end of regular expression"
+msgstr "in bilatu"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "in bilatu"
+msgid "Regular expression too big"
+msgstr "baliogabea"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "baliogabea"
+msgid "No previous regular expression"
+msgstr "in bilatu"
 
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[bB]"
+
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[eE]"
+
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "karakterea barrutitik kanpora"
+
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "baliogabeko erabiltzailea"
+
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "baliogabeko taldea"
+
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "ezin da UID zenbaki baten saio taldea lortu"
+
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "in bilatu"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"programa da eta edo - Orokorra Publikoa Lizentzia bider Libre Softwarea edo "
+"e e"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[bB]"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "%s-k idatzia.\n"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[eE]"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "%s-k eta %s-k idatzia.\n"
 
-#~ msgid "character out of range"
-#~ msgstr "karakterea barrutitik kanpora"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "%s, %s eta %s-k idatzia.\n"
 
-#~ msgid "invalid user"
-#~ msgstr "baliogabeko erabiltzailea"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"%s, %s, %s,\n"
+"eta %s-k idatzia.\n"
 
-#~ msgid "invalid group"
-#~ msgstr "baliogabeko taldea"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"%s, %s, %s,\n"
+"%s eta %s-k idatzia.\n"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "ezin da UID zenbaki baten saio taldea lortu"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"%s, %s, %s,\n"
+"%s, %s eta %s-k idatzia.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "programa da eta edo - Orokorra Publikoa Lizentzia bider Libre Softwarea "
-#~ "edo e e"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "%s-k idatzia.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "%s-k eta %s-k idatzia.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "%s, %s eta %s-k idatzia.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s,\n"
-#~ "eta %s-k idatzia.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s,\n"
-#~ "%s eta %s-k idatzia.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s,\n"
-#~ "%s, %s eta %s-k idatzia.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s,\n"
-#~ "%s, %s, %s, eta %s-k idatzia.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "eta %s-k idatzia.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s,\n"
-#~ "%s, %s, %s, %s,%s, eta %s-k idatzia.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "%s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s,�eta beste batzuk idatzia.\n"
-
-#~ msgid "string comparison failed"
-#~ msgstr "kate konparaketak huts egin du"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Ezarri LC_ALL='C' arazo hau une batez konpontzeko"
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Alderatutako bi kateak %s eta %s izan dira."
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"%s, %s, %s,\n"
+"%s, %s, %s, eta %s-k idatzia.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:130
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"%s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"eta %s-k idatzia.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:138
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"%s, %s, %s,\n"
+"%s, %s, %s, %s,%s, eta %s-k idatzia.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:148
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"%s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s,�eta beste batzuk idatzia.\n"
+
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "kate konparaketak huts egin du"
+
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Ezarri LC_ALL='C' arazo hau une batez konpontzeko"
+
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Alderatutako bi kateak %s eta %s izan dira."
diff --git a/gnulib/po/fi.po b/gnulib/po/fi.po
index 940d8544..035aa2f5 100644
--- a/gnulib/po/fi.po
+++ b/gnulib/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-12-10 19:05+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -19,763 +19,1063 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural= ( n!=1) ;\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "virheellinen argumentti %s kohteelle %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "moniselitteinen argumentti %s kohteelle %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Kelvolliset argumentit:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: %s arvo on pienempi tai yhtäsuuri kuin %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT parametri vaatii arvon"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT parametrin on oltava positiivinen"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Tuntematon ARGP_HELP_FMT-parametri"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Roskaa kohteessa ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Pitkien valitsimien pakolliset tai valinnaiset argumentit ovat pakollisia "
-"tai valinnaisia myös lyhyille valitsimille."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Pitkien valitsimien pakolliset tai valinnaiset argumentit ovat pakollisia tai valinnaisia myös lyhyille valitsimille."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  tai: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [VALITSIN...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Lisätietoja saa komennolla ”%s --help” tai ”%s --usage”.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Lähetä raportit ohjelmistovioista (englanniksi) osoitteeseen %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Tuntematon järjestelmävirhe"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "anna tämä opasteluettelo"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "anna tämä lyhyt käyttösanoma"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NIMI"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "aseta ohjelman nimi"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEKUNTIA"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "odota SEKUNTIA sekuntia (oletus 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "tulosta ohjelman versio"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(OHJELMAVIRHE) Versiota ei tiedetä!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Liian monta argumenttia\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(OHJELMAVIRHE) Valitsimen pitäisi olla tunnistettava!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "ohjelmavirhe"
+
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "pinon ylivuoto"
+
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "ei voi löytää tilapäistä hakemistoa, yritä asettaa $TMPDIR-ympäristömuuttuja"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "ei voida luoda tilapäistä hakemistoa käyttäen mallinnetta ”%s”"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
+msgid "cannot remove temporary file %s"
+msgstr "ei voida poistaa tilapäistä tiedostoa %s"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
+msgid "cannot remove temporary directory %s"
+msgstr "ei voida poistaa tilapäistä hakemistoa %s"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "virhe suljettaessa tiedostoa"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "kirjoitusvirhe"
+
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: tunnistamaton valitsin ’--%s’\n"
+msgid "preserving permissions for %s"
+msgstr "säilytetään oikeudet kohteelle %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: epäkelpo valitsin -- ’%c’\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "ei voida avata varmuuskopiotiedostoa ”%s” kirjoittamista varten"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:82
 #, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
+msgid "error reading \"%s\""
+msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n"
+msgid "error writing \"%s\""
+msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:96 lib/copy-file.c:135
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
+msgid "error after reading \"%s\""
+msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
+msgid "fdopen() failed"
+msgstr "fdopen()-kutsu epäonnistui"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "virheellinen argumentti %s kohteelle %s"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "C#-kääntäjää ei löytynyt, yritä asentaa pnet"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "moniselitteinen argumentti %s kohteelle %s"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "C#-virtuaalikonetta ei löytynyt, yritä asentaa pnet"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Kelvolliset argumentit:"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s-aliprosessi epäonnistui"
 
-#~ msgid "program error"
-#~ msgstr "ohjelmavirhe"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "tavallinen tyhjä tiedosto"
 
-#~ msgid "stack overflow"
-#~ msgstr "pinon ylivuoto"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "tavallinen tiedosto"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "ei voi löytää tilapäistä hakemistoa, yritä asettaa $TMPDIR-"
-#~ "ympäristömuuttuja"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "hakemisto"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "ei voida luoda tilapäistä hakemistoa käyttäen mallinnetta ”%s”"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "lohkoerikoistiedosto"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "ei voida poistaa tilapäistä tiedostoa %s"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "merkkierikoistiedosto"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "ei voida poistaa tilapäistä hakemistoa %s"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "putkitiedosto"
 
-#~ msgid "error closing file"
-#~ msgstr "virhe suljettaessa tiedostoa"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "symbolinen linkki"
 
-#~ msgid "write error"
-#~ msgstr "kirjoitusvirhe"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "pistoke"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "säilytetään oikeudet kohteelle %s"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "viestijono"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafori"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "ei voida avata varmuuskopiotiedostoa ”%s” kirjoittamista varten"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "jaettu muistiobjekti"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "virhe luettaessa tiedostoa ”%s”"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "tyypitetty muistiobjekti"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "outo tiedosto"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "virhe luettaessa tiedostoa ”%s”"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Osoiteperhe tietokonenimelle ei ole tuettu"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen()-kutsu epäonnistui"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Tilapäinen virhe nimiratkaisussa"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "C#-kääntäjää ei löytynyt, yritä asentaa pnet"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Väärä arvo kohteelle ai_flags"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "C#-virtuaalikonetta ei löytynyt, yritä asentaa pnet"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Korjaamaton virhe nimiratkaisussa"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s-aliprosessi epäonnistui"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family ei ole tuettu"
 
-#~ msgid "regular empty file"
-#~ msgstr "tavallinen tyhjä tiedosto"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Muistinvarausvirhe"
 
-#~ msgid "regular file"
-#~ msgstr "tavallinen tiedosto"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Tietokonenimeen ei ole liitetty osoitetta"
 
-#~ msgid "directory"
-#~ msgstr "hakemisto"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Nimeä tai palvelua ei tunneta"
 
-#~ msgid "block special file"
-#~ msgstr "lohkoerikoistiedosto"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Servname ei ole tuettu kohteelle ai_socktype"
 
-#~ msgid "character special file"
-#~ msgstr "merkkierikoistiedosto"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype ei ole tuettu"
 
-#~ msgid "fifo"
-#~ msgstr "putkitiedosto"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Järjestelmävirhe"
 
-#~ msgid "symbolic link"
-#~ msgstr "symbolinen linkki"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Argumenttipuskuri on liian suuri"
 
-#~ msgid "socket"
-#~ msgstr "pistoke"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Prosessointipyyntö käsittelyssä"
 
-#~ msgid "message queue"
-#~ msgstr "viestijono"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Pyyntö peruttu"
 
-#~ msgid "semaphore"
-#~ msgstr "semafori"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Pyyntöä ei ole peruttu"
 
-#~ msgid "shared memory object"
-#~ msgstr "jaettu muistiobjekti"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Kaikki pyynnöt suoritettu"
 
-#~ msgid "typed memory object"
-#~ msgstr "tyypitetty muistiobjekti"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Signaalin keskeyttämä"
 
-#~ msgid "weird file"
-#~ msgstr "outo tiedosto"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Parametrimerkkijono ei ole oikein koodattu"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Osoiteperhe tietokonenimelle ei ole tuettu"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Tilapäinen virhe nimiratkaisussa"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: valitsin ’%s’ ei ole yksiselitteinen; mahdollisuudet:"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Väärä arvo kohteelle ai_flags"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: valitsin ’--%s’ ei salli argumenttia\n"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Korjaamaton virhe nimiratkaisussa"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: valitsin ’%c%s’ ei salli argumenttia\n"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family ei ole tuettu"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: valitsin ’--%s’ vaatii argumentin\n"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Muistinvarausvirhe"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: tunnistamaton valitsin ’--%s’\n"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Tietokonenimeen ei ole liitetty osoitetta"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: tunnistamaton valitsin ’%c%s’\n"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Nimeä tai palvelua ei tunneta"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: epäkelpo valitsin -- ’%c’\n"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Servname ei ole tuettu kohteelle ai_socktype"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: valitsin vaatii argumentin -- ’%c’\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: valitsin ’-W %s’ ei ole yksiselitteinen\n"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype ei ole tuettu"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
 
-#~ msgid "System error"
-#~ msgstr "Järjestelmävirhe"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Argumenttipuskuri on liian suuri"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Prosessointipyyntö käsittelyssä"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
 
-#~ msgid "Request canceled"
-#~ msgstr "Pyyntö peruttu"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "kohteen ”%s” luominen epäonnistui"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Pyyntöä ei ole peruttu"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
 
-#~ msgid "All requests done"
-#~ msgstr "Kaikki pyynnöt suoritettu"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta $JAVAC-ympäristömuuttuja"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Signaalin keskeyttämä"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta $JAVA-ympäristömuuttuja"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Parametrimerkkijono ei ole oikein koodattu"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s-aliprosessisiirräntävirhe"
 
-#~ msgid "Unknown error"
-#~ msgstr "Tuntematon virhe"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "kohteen %s oikeuksien muuttaminen ei onnistu"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "hakemiston %s luominen ei onnistu"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "muisti loppui"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "kohteen ”%s” luominen epäonnistui"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "ei kyetä tallentaman nykyistä työhakemistoa"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "alkuperäiseen työhakemistoon palaaminen epäonnistui"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta $JAVAC-"
-#~ "ympäristömuuttuja"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Kohteen /dev/zero avaaminen lukemista varten epäonnistui"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta $JAVA-"
-#~ "ympäristömuuttuja"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "lukemissäikeen luominen epäonnistui"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s-aliprosessisiirräntävirhe"
+#  nonblocking I/O on synonyymi termille asynchronous I/O
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "ei voi asettaa tahdistamatonta siirräntää aliprosessille %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "kohteen %s oikeuksien muuttaminen ei onnistu"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "viestintä aliprosessin %s kanssa epäonnistui"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "hakemiston %s luominen ei onnistu"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "kirjoittaminen aliprosessiin %s epäonnistui"
 
-#~ msgid "memory exhausted"
-#~ msgstr "muisti loppui"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "lukeminen aliprosessista %s epäonnistui"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "ei kyetä tallentaman nykyistä työhakemistoa"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "aliprosessi %s päättyi poistumiskoodilla %d"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "alkuperäiseen työhakemistoon palaaminen epäonnistui"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "säikeiden luominen epäonnistui"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Kohteen /dev/zero avaaminen lukemista varten epäonnistui"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s-aliprosessi päättyi poistumiskoodilla %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "”"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "”"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Onnistui"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Ei osumaa"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Virheellinen säännöllinen lauseke"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "virheellinen collation-merkkiluokka"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Virheellinen merkkiluokkanimi"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Jälkikenoviiva"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Virheellinen paluuviite"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Pariton [ tai [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "pariton ( tai \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Pariton \\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Kohteen \\{\\} virheellinen sisältö"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Virheellinen lukualueen loppu"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Muisti loppui"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Virheellinen edeltävä säännöllinen lauseke"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Ennenaikainen säännöllisen lausekkeen loppu"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Säännöllinen lauseke on liian iso"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Pariton ) tai \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Ei edellistä säännöllistä lauseketta"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "lukemissäikeen luominen epäonnistui"
+# Kaikkihan muistavat kääntää nämä ja vastaavat juuri näin. Ei pelkkä kK.
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[kKyY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[eEnN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "asetetaan oikeudet kohteelle %s"
 
-#  nonblocking I/O on synonyymi termille asynchronous I/O
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "ei voi asettaa tahdistamatonta siirräntää aliprosessille %s"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Yhteyden katkaisu"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "viestintä aliprosessin %s kanssa epäonnistui"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Keskeytys"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "kirjoittaminen aliprosessiin %s epäonnistui"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Poistu"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "lukeminen aliprosessista %s epäonnistui"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Virheellinen käsky"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "aliprosessi %s päättyi poistumiskoodilla %d"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Jäljitys/keskeytyspistekeskeytys"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "säikeiden luominen epäonnistui"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Keskeytetty"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "%s-aliprosessi päättyi poistumiskoodilla %d"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Liukulukupoikkeus"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "François Pinard"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Sammutettu"
 
-#~ msgid "`"
-#~ msgstr "”"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Väylävirhe"
 
-#~ msgid "'"
-#~ msgstr "”"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Osiinjakamisvirhe"
 
-#~ msgid "Success"
-#~ msgstr "Onnistui"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Rikkoutunut putki"
 
-#~ msgid "No match"
-#~ msgstr "Ei osumaa"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Hälytyskello"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Virheellinen säännöllinen lauseke"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Päättynyt"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "virheellinen collation-merkkiluokka"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Kiireellinen siirräntätila"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Virheellinen merkkiluokkanimi"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Pysäytetty (signaali)"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Jälkikenoviiva"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Pysäytetty"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Virheellinen paluuviite"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Jatkettu"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Pariton [ tai [^"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Lapsiprosessi poistunut"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "pariton ( tai \\("
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Pysäytetty (tty-syöte)"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Pariton \\{"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Pysäytetty (tty-tuloste)"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Kohteen \\{\\} virheellinen sisältö"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Siirräntä mahdollinen"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Virheellinen lukualueen loppu"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Suoritinaikaraja ylitetty"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Muisti loppui"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Tiedostonkokoraja ylitetty"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Virheellinen edeltävä säännöllinen lauseke"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Virtuaaliajastin päättynyt"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Ennenaikainen säännöllisen lausekkeen loppu"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Profilointiajastin päättynyt"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Säännöllinen lauseke on liian iso"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Ikkuna vaihtunut"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Pariton ) tai \\)"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Käyttäjän määrittelemä signaali 1"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Ei edellistä säännöllistä lauseketta"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Käyttäjän määrittelemä signaali 2"
 
-# Kaikkihan muistavat kääntää nämä ja vastaavat juuri näin. Ei pelkkä kK.
-#~ msgid "^[yY]"
-#~ msgstr "^[kKyY]"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "EMT-keskeytys"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[eEnN]"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Väärä järjestelmäkutsu"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "asetetaan oikeudet kohteelle %s"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Pinovirhe"
 
-#~ msgid "Hangup"
-#~ msgstr "Yhteyden katkaisu"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Tietopyyntö"
 
-#~ msgid "Interrupt"
-#~ msgstr "Keskeytys"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Teholähdevika"
 
-#~ msgid "Quit"
-#~ msgstr "Poistu"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Resurssi kadonnut"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Virheellinen käsky"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "virhe kirjoitettaessa suljettuun putkeen tai pistokkeeseen"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Jäljitys/keskeytyspistekeskeytys"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "ei voida luoda putkea"
 
-#~ msgid "Aborted"
-#~ msgstr "Keskeytetty"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Tosiaikasignaali %d"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Liukulukupoikkeus"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Tuntematon signaali %d"
 
-#~ msgid "Killed"
-#~ msgstr "Sammutettu"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "iconv-funktio ei ole käyttökelpoinen"
 
-#~ msgid "Bus error"
-#~ msgstr "Väylävirhe"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "iconv-funktio ei ole saatavilla"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Osiinjakamisvirhe"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "merkki sallitun välin ulkopuolella"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Rikkoutunut putki"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Hälytyskello"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu: %s"
 
-#~ msgid "Terminated"
-#~ msgstr "Päättynyt"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "virheellinen käyttäjä"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Kiireellinen siirräntätila"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "virheellinen ryhmä"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Pysäytetty (signaali)"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "virheellinen määrittely"
 
-#~ msgid "Stopped"
-#~ msgstr "Pysäytetty"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "ei kyetä näyttämään virheilmoitusta"
 
-#~ msgid "Continued"
-#~ msgstr "Jatkettu"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Pakkaaja: %s (%s)\n"
 
-#~ msgid "Child exited"
-#~ msgstr "Lapsiprosessi poistunut"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Pakkaaja: %s\n"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Pysäytetty (tty-syöte)"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Pysäytetty (tty-tuloste)"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Lisenssi GPLv3+: GNU GPL versio 3 tai myöhäisempi <http://gnu.org/licenses/gpl.html>.\n"
+"Tämä on vapaa ohjelmisto: voit vapaasti muuttaa sitä tai jakaa sitä edelleen.\n"
+"Ohjelmalle EI OLE TAKUUTA siinä laajuudessa mitä laki sen sallii.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Kirjoittanut %s.\n"
 
-#~ msgid "I/O possible"
-#~ msgstr "Siirräntä mahdollinen"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Kirjoittaneet %s ja %s.\n"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Suoritinaikaraja ylitetty"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Kirjoittaneet %s, %s ja %s.\n"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Tiedostonkokoraja ylitetty"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Kirjoittaneet %s, %s,\n"
+"%s ja %s.\n"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Virtuaaliajastin päättynyt"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Kirjoittaneet %s, %s,\n"
+"%s, %s ja %s.\n"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Profilointiajastin päättynyt"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Kirjoittaneet %s, %s,\n"
+"%s, %s, %s ja %s.\n"
 
-#~ msgid "Window changed"
-#~ msgstr "Ikkuna vaihtunut"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Kirjoittaneet %s, %s,\n"
+"%s, %s, %s,\n"
+"%s ja %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Kirjoittaneet %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s ja %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Kirjoittaneet %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s ja %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Kirjoittaneet %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, %s ja muut.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Lähetä ilmoitukset ohjelmistovioista (englanniksi) osoitteeseen %s\n"
+"Lähetä ilmoitukset käännösvirheistä osoitteeseen <translation-team-fi@lists.sourceforge.net>\n"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Käyttäjän määrittelemä signaali 1"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Lähetä %s ilmoitukset ohjelmistovioista (englanniksi) osoitteeseen %s\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Käyttäjän määrittelemä signaali 2"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s kotisivu: <%s>\n"
 
-#~ msgid "EMT trap"
-#~ msgstr "EMT-keskeytys"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s kotisivu:  <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "Bad system call"
-#~ msgstr "Väärä järjestelmäkutsu"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Yleinen opaste GNU-ohjelmiston käyttämiseen: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Pinovirhe"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle epäonnistui"
 
-#~ msgid "Information request"
-#~ msgstr "Tietopyyntö"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ei voi palauttaa fd %d: dup2 epäonnistui"
 
-#~ msgid "Power failure"
-#~ msgstr "Teholähdevika"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "%s-aliprosessi"
 
-#~ msgid "Resource lost"
-#~ msgstr "Resurssi kadonnut"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s-aliprosessi sai sammuttavan signaalin %d"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "virhe kirjoitettaessa suljettuun putkeen tai pistokkeeseen"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "vakiosyöte"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "ei voida luoda putkea"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "vakiotuloste"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Tosiaikasignaali %d"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "vakiovirhe"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Tuntematon signaali %d"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "tuntematon merkkivirta"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv-funktio ei ole käyttökelpoinen"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "kohteen %s avaaminen uudelleen tilassa %s epäonnistui"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv-funktio ei ole saatavilla"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "merkkijonovertailu epäonnistui"
 
-#~ msgid "character out of range"
-#~ msgstr "merkki sallitun välin ulkopuolella"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Aseta LC_ALL='C' ongelman kiertämiseksi."
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Vertaillut merkkijonot olivat %s ja %s."
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "merkin U+%04X muunnos paikalliseen merkistöön ei onnistu: %s"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "muotoiltua tulostetta ei voitu suorittaa"
 
-#~ msgid "invalid user"
-#~ msgstr "virheellinen käyttäjä"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "virheellinen %s%s-argumentti ”%s”"
 
-#~ msgid "invalid group"
-#~ msgstr "virheellinen ryhmä"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "virheellinen jälkiliite kohteen %s%s argumentissa ”%s”"
 
-#~ msgid "invalid spec"
-#~ msgstr "virheellinen määrittely"
-
-#~ msgid "unable to display error message"
-#~ msgstr "ei kyetä näyttämään virheilmoitusta"
-
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Pakkaaja: %s (%s)\n"
-
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Pakkaaja: %s\n"
-
-#~ msgid "(C)"
-#~ msgstr "©"
-
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Lisenssi GPLv3+: GNU GPL versio 3 tai myöhäisempi <http://gnu.org/"
-#~ "licenses/gpl.html>.\n"
-#~ "Tämä on vapaa ohjelmisto: voit vapaasti muuttaa sitä tai jakaa sitä "
-#~ "edelleen.\n"
-#~ "Ohjelmalle EI OLE TAKUUTA siinä laajuudessa mitä laki sen sallii.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Kirjoittanut %s.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Kirjoittaneet %s ja %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Kirjoittaneet %s, %s ja %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Kirjoittaneet %s, %s,\n"
-#~ "%s ja %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjoittaneet %s, %s,\n"
-#~ "%s, %s ja %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjoittaneet %s, %s,\n"
-#~ "%s, %s, %s ja %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjoittaneet %s, %s,\n"
-#~ "%s, %s, %s,\n"
-#~ "%s ja %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Kirjoittaneet %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s ja %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Kirjoittaneet %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s ja %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Kirjoittaneet %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, %s ja muut.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Lähetä ilmoitukset ohjelmistovioista (englanniksi) osoitteeseen %s\n"
-#~ "Lähetä ilmoitukset käännösvirheistä osoitteeseen <translation-team-"
-#~ "fi@lists.sourceforge.net>\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr ""
-#~ "Lähetä %s ilmoitukset ohjelmistovioista (englanniksi) osoitteeseen %s\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "%s kotisivu: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "%s kotisivu:  <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Yleinen opaste GNU-ohjelmiston käyttämiseen: <http://www.gnu.org/gethelp/"
-#~ ">\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle epäonnistui"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "ei voi palauttaa fd %d: dup2 epäonnistui"
-
-#~ msgid "%s subprocess"
-#~ msgstr "%s-aliprosessi"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s-aliprosessi sai sammuttavan signaalin %d"
-
-#~ msgid "stdin"
-#~ msgstr "vakiosyöte"
-
-#~ msgid "stdout"
-#~ msgstr "vakiotuloste"
-
-#~ msgid "stderr"
-#~ msgstr "vakiovirhe"
-
-#~ msgid "unknown stream"
-#~ msgstr "tuntematon merkkivirta"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "kohteen %s avaaminen uudelleen tilassa %s epäonnistui"
-
-#~ msgid "string comparison failed"
-#~ msgstr "merkkijonovertailu epäonnistui"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Aseta LC_ALL='C' ongelman kiertämiseksi."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Vertaillut merkkijonot olivat %s ja %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "muotoiltua tulostetta ei voitu suorittaa"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "virheellinen %s%s-argumentti ”%s”"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "virheellinen jälkiliite kohteen %s%s argumentissa ”%s”"
-
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "%s%s argumentti ”%s” on liian iso"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s argumentti ”%s” on liian iso"
diff --git a/gnulib/po/fr.po b/gnulib/po/fr.po
index 68463d6d..2f180ae1 100644
--- a/gnulib/po/fr.po
+++ b/gnulib/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib-3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-12-07 20:41-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -20,763 +20,1062 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.2\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "argument %s non valable pour %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "argument %s ambigu pour %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Les arguments valables sont :"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT : la valeur %s est inférieure ou égale à %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s : le paramètre ARGP_HELP_FMT nécessite une valeur"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s : le paramètre ARGP_HELP_FMT doit être positif"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s : paramètre ARGP_HELP_FMT inconnu"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Problème dans ARGP_HELP_FMT : %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Les arguments obligatoires pour la forme longue des options le sont aussi "
-"pour les formes courtes associées."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Les arguments obligatoires pour la forme longue des options le sont aussi pour les formes courtes associées."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  ou : "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [OPTION...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr ""
-"Essayez « %s --help » ou « %s --usage » pour obtenir plus de "
-"renseignements.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Essayez « %s --help » ou « %s --usage » pour obtenir plus de renseignements.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Signalez toute anomalie à %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Erreur système inconnue"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "affiche cette aide"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "donne un court message d'utilisation"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NOM"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "définit le nom du programme"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SECS"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "suspension pendant SECS secondes (par défaut 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "affiche la version du programme"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(Erreur du programme) pas de version connue !"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s : trop d'arguments\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(Erreur du programme) l'option aurait dû être reconnue !"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s : l'option « %s » est ambiguë, possibilités :"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "erreur du programme"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s : l'option « --%s » ne prend pas d'argument\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "dépassement de pile"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s : l'option « %c%s » ne prend pas d'argument\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "impossible de trouver un répertoire temporaire, essayez de définir $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s : l'option « --%s » nécessite un argument\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "impossible de créer un répertoire temporaire en utilisant le modèle « %s »."
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s : option « --%s » non reconnue\n"
+msgid "cannot remove temporary file %s"
+msgstr "impossible de supprimer le ficher temporaire %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s : option « %c%s » non reconnue\n"
+msgid "cannot remove temporary directory %s"
+msgstr "impossible de supprimer le répertoire temporaire %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s : option non valable -- « %c »\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "erreur de fermeture de fichier"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s : l'option nécessite un argument -- « %c »\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "erreur d'écriture"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s : l'option « -W %s » est ambiguë\n"
+msgid "preserving permissions for %s"
+msgstr "conservation des permissions de %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s : l'option « -W %s » ne prend pas d'argument\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "erreur à l'ouverture de « %s » en lecture"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s : l'option « -W %s » nécessite un argument\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "argument %s non valable pour %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "argument %s ambigu pour %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Les arguments valables sont :"
-
-#~ msgid "program error"
-#~ msgstr "erreur du programme"
-
-#~ msgid "stack overflow"
-#~ msgstr "dépassement de pile"
-
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "impossible de trouver un répertoire temporaire, essayez de définir $TMPDIR"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr ""
-#~ "impossible de créer un répertoire temporaire en utilisant le modèle "
-#~ "« %s »."
-
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "impossible de supprimer le ficher temporaire %s"
-
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "impossible de supprimer le répertoire temporaire %s"
-
-#~ msgid "error closing file"
-#~ msgstr "erreur de fermeture de fichier"
-
-#~ msgid "write error"
-#~ msgstr "erreur d'écriture"
-
-#~ msgid "preserving permissions for %s"
-#~ msgstr "conservation des permissions de %s"
-
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "erreur à l'ouverture de « %s » en lecture"
-
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "impossible d'ouvrir le fichier de sauvegarde « %s » en écriture"
-
-#~ msgid "error reading \"%s\""
-#~ msgstr "erreur de lecture de « %s »"
-
-#~ msgid "error writing \"%s\""
-#~ msgstr "erreur d'écriture de « %s »"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "impossible d'ouvrir le fichier de sauvegarde « %s » en écriture"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "erreur après la lecture de « %s »"
-
-#~ msgid "fdopen() failed"
-#~ msgstr "échec de fdopen()"
-
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "compilateur C# non trouvé, essayez d'installer pnet"
-
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "machine virtuelle C# non trouvée, essayez d'installer pnet"
-
-#~ msgid "%s subprocess failed"
-#~ msgstr "échec de sous-processus %s"
-
-#~ msgid "regular empty file"
-#~ msgstr "fichier régulier vide"
-
-#~ msgid "regular file"
-#~ msgstr "fichier régulier"
-
-#~ msgid "directory"
-#~ msgstr "répertoire"
-
-#~ msgid "block special file"
-#~ msgstr "fichier spécial de blocs"
-
-#~ msgid "character special file"
-#~ msgstr "fichier spécial de caractères"
-
-#~ msgid "fifo"
-#~ msgstr "PEPS (FIFO)"
-
-#~ msgid "symbolic link"
-#~ msgstr "lien symbolique"
-
-#~ msgid "socket"
-#~ msgstr "socket"
-
-#~ msgid "message queue"
-#~ msgstr "file de messages"
-
-#~ msgid "semaphore"
-#~ msgstr "sémaphore"
-
-#~ msgid "shared memory object"
-#~ msgstr "objet de mémoire partagée"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "erreur de lecture de « %s »"
 
-#~ msgid "typed memory object"
-#~ msgstr "objet mémoire typé"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "erreur d'écriture de « %s »"
 
-#~ msgid "weird file"
-#~ msgstr "fichier bizarre"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "erreur après la lecture de « %s »"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Famille d'adresses du nom d'hôte non pris en charge"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "échec de fdopen()"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Échec temporaire lors de la résolution de noms"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "compilateur C# non trouvé, essayez d'installer pnet"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Mauvaise valeur pour ai_flags"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "machine virtuelle C# non trouvée, essayez d'installer pnet"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Échec définitif lors de la résolution de noms"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "échec de sous-processus %s"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family non pris en charge"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "fichier régulier vide"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Échec d'allocation mémoire"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "fichier régulier"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Aucune adresse associée au nom d'hôte"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "répertoire"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Nom ou service inconnu"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "fichier spécial de blocs"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Nom de serveur non pris en charge pour ai_socktype"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "fichier spécial de caractères"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype non pris en charge"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "PEPS (FIFO)"
 
-#~ msgid "System error"
-#~ msgstr "Erreur système"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "lien symbolique"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Mémoire tampon d'argument trop petite"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "socket"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Traitement de la requête en cours"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "file de messages"
 
-#~ msgid "Request canceled"
-#~ msgstr "Requête annulée"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "sémaphore"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Requête non annulée"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "objet de mémoire partagée"
 
-#~ msgid "All requests done"
-#~ msgstr "Requêtes toutes traitées"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "objet mémoire typé"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Interruption par un signal"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "fichier bizarre"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Chaîne de paramètre mal encodé"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Famille d'adresses du nom d'hôte non pris en charge"
 
-#~ msgid "Unknown error"
-#~ msgstr "Erreur inconnue"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Échec temporaire lors de la résolution de noms"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "argument source_version non valable pour compile_java_class"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Mauvaise valeur pour ai_flags"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "argument target_version non valable pour compile_java_class"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Échec définitif lors de la résolution de noms"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "échec de création de « %s »"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family non pris en charge"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "erreur lors de l'écriture du fichier « %s »"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Échec d'allocation mémoire"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "compilateur Java non trouvé, essayez d'installer gcj ou de définir $JAVAC"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Aucune adresse associée au nom d'hôte"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "machine virtuelle Java non trouvée, essayez d'installer gij ou de définir "
-#~ "$JAVAC"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Nom ou service inconnu"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "erreur d'entrée sortie du sous-processus %s"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Nom de serveur non pris en charge pour ai_socktype"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "impossible de modifier les permissions de %s"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype non pris en charge"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "impossible de créer le répertoire %s"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Erreur système"
 
-#~ msgid "memory exhausted"
-#~ msgstr "mémoire épuisée"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Mémoire tampon d'argument trop petite"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "impossible de mémoriser le répertoire de travail courant"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Traitement de la requête en cours"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "échec de retour au répertoire initial de travail"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Requête annulée"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Échec d'ouverture de /dev/zero en lecture"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Requête non annulée"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "échec de création du processus de lecture"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Requêtes toutes traitées"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr ""
-#~ "impossible de configurer l'entrée sortie non bloquante au sous-processus "
-#~ "%s"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Interruption par un signal"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "échec de communication avec le sous-processus %s"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Chaîne de paramètre mal encodé"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "échec d'écriture vers le sous-processus %s"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Erreur inconnue"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "échec de lecture depuis le sous-processus %s"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s : l'option « %s » est ambiguë, possibilités :"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "le sous-processus %s s'est terminé avec le code de retour %d"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s : l'option « --%s » ne prend pas d'argument\n"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "échec de création de processus"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s : l'option « %c%s » ne prend pas d'argument\n"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "le sous-processus de %s s'est terminé avec le code de retour %d"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s : l'option « --%s » nécessite un argument\n"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "François Pinard"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s : option « --%s » non reconnue\n"
 
-#~ msgid "`"
-#~ msgstr "« "
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s : option « %c%s » non reconnue\n"
 
-#~ msgid "'"
-#~ msgstr " »"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s : option non valable -- « %c »\n"
 
-#~ msgid "Success"
-#~ msgstr "Succès"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s : l'option nécessite un argument -- « %c »\n"
 
-#~ msgid "No match"
-#~ msgstr "Pas de correspondance"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s : l'option « -W %s » est ambiguë\n"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Expression rationnelle non valable"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s : l'option « -W %s » ne prend pas d'argument\n"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Caractère d'assemblage non valable"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s : l'option « -W %s » nécessite un argument\n"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Nom de classe de caractères non valable"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "argument source_version non valable pour compile_java_class"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Barre oblique inverse en fin de ligne"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "argument target_version non valable pour compile_java_class"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Référence antérieure non valable"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "échec de création de « %s »"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "[ ou [^ non appairé"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "erreur lors de l'écriture du fichier « %s »"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "( ou \\( non appairée"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "compilateur Java non trouvé, essayez d'installer gcj ou de définir $JAVAC"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "\\{ non appairée"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "machine virtuelle Java non trouvée, essayez d'installer gij ou de définir $JAVAC"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Le contenu de \\{\\} n'est pas valable"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "erreur d'entrée sortie du sous-processus %s"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Borne finale de l'intervalle non valable"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "impossible de modifier les permissions de %s"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Mémoire épuisée"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "impossible de créer le répertoire %s"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Expression rationnelle précédente non valable"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "mémoire épuisée"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Fin prématurée d'expression rationnelle"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "impossible de mémoriser le répertoire de travail courant"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Expression rationnelle trop grande"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "échec de retour au répertoire initial de travail"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr ") ou \\) non appairée"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Échec d'ouverture de /dev/zero en lecture"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Pas d'expression rationnelle précédente"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "échec de création du processus de lecture"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[oOyY].*"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "impossible de configurer l'entrée sortie non bloquante au sous-processus %s"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN].*"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "échec de communication avec le sous-processus %s"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "impossible de définir les permissions de %s"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "échec d'écriture vers le sous-processus %s"
 
-#~ msgid "Hangup"
-#~ msgstr "Raccrocher"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "échec de lecture depuis le sous-processus %s"
 
-#~ msgid "Interrupt"
-#~ msgstr "Interrompre"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "le sous-processus %s s'est terminé avec le code de retour %d"
 
-#~ msgid "Quit"
-#~ msgstr "Quitter"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "échec de création de processus"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Instruction illégale"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "le sous-processus de %s s'est terminé avec le code de retour %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "« "
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr " »"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Succès"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Pas de correspondance"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Expression rationnelle non valable"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Caractère d'assemblage non valable"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Nom de classe de caractères non valable"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Barre oblique inverse en fin de ligne"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Référence antérieure non valable"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "[ ou [^ non appairé"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "( ou \\( non appairée"
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "\\{ non appairée"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Le contenu de \\{\\} n'est pas valable"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Borne finale de l'intervalle non valable"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Mémoire épuisée"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Expression rationnelle précédente non valable"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Fin prématurée d'expression rationnelle"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Expression rationnelle trop grande"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr ") ou \\) non appairée"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Pas d'expression rationnelle précédente"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[oOyY].*"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN].*"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "impossible de définir les permissions de %s"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Piège de trace ou point de d'arrêt "
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Raccrocher"
 
-#~ msgid "Aborted"
-#~ msgstr "Abandonné"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Interrompre"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Exception de virgule flottante"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Quitter"
 
-#~ msgid "Killed"
-#~ msgstr "Tué"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Instruction illégale"
 
-#~ msgid "Bus error"
-#~ msgstr "Erreur de bus"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Piège de trace ou point de d'arrêt "
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Erreur de segmentation"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Abandonné"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Tube rompu"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Exception de virgule flottante"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Réveil"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Tué"
 
-#~ msgid "Terminated"
-#~ msgstr "Terminé"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Erreur de bus"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Condition d'entrée sortie urgente"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Erreur de segmentation"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Arrêté (signal)"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Tube rompu"
 
-#~ msgid "Stopped"
-#~ msgstr "Arrêté"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Réveil"
 
-#~ msgid "Continued"
-#~ msgstr "Continué"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Terminé"
 
-#~ msgid "Child exited"
-#~ msgstr "Fin du processus fils"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Condition d'entrée sortie urgente"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Arrêté (entrée de tty)"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Arrêté (signal)"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Arrêté (sortie de tty)"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Arrêté"
 
-#~ msgid "I/O possible"
-#~ msgstr "Entrée sortie possible"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Continué"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Temps limite de processeur dépassé"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Fin du processus fils"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Taille limite de fichier dépassée"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Arrêté (entrée de tty)"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Temporisation virtuelle dépassée"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Arrêté (sortie de tty)"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Temporisation de profilage dépassée"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Entrée sortie possible"
 
-#~ msgid "Window changed"
-#~ msgstr "Fenêtre modifiée"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Temps limite de processeur dépassé"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Signal 1 défini par utilisateur"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Taille limite de fichier dépassée"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Signal 2 défini par utilisateur"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Temporisation virtuelle dépassée"
 
-#~ msgid "EMT trap"
-#~ msgstr "Piège EMT"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Temporisation de profilage dépassée"
 
-#~ msgid "Bad system call"
-#~ msgstr "Mauvais appel système"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Fenêtre modifiée"
 
-#~ msgid "Stack fault"
-#~ msgstr "Défaut de pile"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Signal 1 défini par utilisateur"
 
-#~ msgid "Information request"
-#~ msgstr "Demande de renseignements"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Signal 2 défini par utilisateur"
 
-#~ msgid "Power failure"
-#~ msgstr "Échec d'alimentation"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Piège EMT"
 
-#~ msgid "Resource lost"
-#~ msgstr "Ressource perdue"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Mauvais appel système"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "Erreur d'écriture vers un tube ou un socket fermé"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Défaut de pile"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "impossible de créer un tube (« pipe »)"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Demande de renseignements"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Signal %d en temps réel"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Échec d'alimentation"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Signal %d inconnu"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Ressource perdue"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "fonction iconv non utilisable"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "Erreur d'écriture vers un tube ou un socket fermé"
 
-#~ msgid "iconv function not available"
-#~ msgstr "fonction iconv non disponible"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "impossible de créer un tube (« pipe »)"
 
-#~ msgid "character out of range"
-#~ msgstr "caractère hors limites"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Signal %d en temps réel"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "impossible de convertir U+%04X dans le jeu de caractères local"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Signal %d inconnu"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "impossible de convertir U+%04X dans le jeu de caractères local : %s"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "fonction iconv non utilisable"
 
-#~ msgid "invalid user"
-#~ msgstr "utilisateur non valable"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "fonction iconv non disponible"
 
-#~ msgid "invalid group"
-#~ msgstr "groupe non valable"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "caractère hors limites"
 
-#~ msgid "invalid spec"
-#~ msgstr "spécification non valable"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "impossible de convertir U+%04X dans le jeu de caractères local"
 
-#~ msgid "unable to display error message"
-#~ msgstr "impossible d'afficher le message d'erreur"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "impossible de convertir U+%04X dans le jeu de caractères local : %s"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Empaqueté par %s (%s)\n"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "utilisateur non valable"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Empaqueté par %s\n"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "groupe non valable"
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "spécification non valable"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Licence GPLv3+ : GNU GPL version 3 ou ultérieure <http://gnu.org/licenses/"
-#~ "gpl.html>\n"
-#~ "Logiciel libre : vous êtes libre de le modifier ou de le redistribuer.\n"
-#~ "Il n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\n"
-#~ "\n"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "impossible d'afficher le message d'erreur"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Écrit par %s.\n"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Empaqueté par %s (%s)\n"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Écrit par %s et %s.\n"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Empaqueté par %s\n"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Écrit par %s, %s et %s.\n"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Écrit par %s, %s, %s,\n"
-#~ "et %s.\n"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Licence GPLv3+ : GNU GPL version 3 ou ultérieure <http://gnu.org/licenses/gpl.html>\n"
+"Logiciel libre : vous êtes libre de le modifier ou de le redistribuer.\n"
+"Il n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Écrit par %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Écrit par %s, %s, %s,\n"
-#~ "%s et %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Écrit par %s et %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Écrit par %s, %s, %s,\n"
-#~ "%s, %s, et %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Écrit par %s, %s et %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Écrit par %s, %s, %s,\n"
-#~ "%s, %s, %s, et %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Écrit par %s, %s, %s,\n"
+"et %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Écrit par %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "et %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Écrit par %s, %s, %s,\n"
+"%s et %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Écrit par %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s et %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Écrit par %s, %s, %s,\n"
+"%s, %s, et %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Écrit par %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s et d'autres.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Écrit par %s, %s, %s,\n"
+"%s, %s, %s, et %s.\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Signalez toute anomalie à : %s\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Écrit par %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"et %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Écrit par %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s et %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Écrit par %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s et d'autres.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Signalez toute anomalie à : %s\n"
 
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Signalez les anomalies de %s à : %s\n"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Signalez les anomalies de %s à : %s\n"
 
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "page d'accueil de %s : <%s>\n"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "page d'accueil de %s : <%s>\n"
 
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "page d'accueil de %s : <http://www.gnu.org/software/%s/>\n"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "page d'accueil de %s : <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Aide globale sur les logiciels GNU : <http://www.gnu.org/help/gethelp>\n"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Aide globale sur les logiciels GNU : <http://www.gnu.org/help/gethelp>\n"
 
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "échec de _open_osfhandle"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "échec de _open_osfhandle"
 
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr ""
-#~ "impossible de restaurer le descripteur de fichier (fd) %d : échec de dup2"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "impossible de restaurer le descripteur de fichier (fd) %d : échec de dup2"
 
-#~ msgid "%s subprocess"
-#~ msgstr "sous-processus %s"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "sous-processus %s"
 
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "le sous-processus %s a reçu un signal fatal %d"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "le sous-processus %s a reçu un signal fatal %d"
 
-#~ msgid "stdin"
-#~ msgstr "entrée standard (stdin)"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "entrée standard (stdin)"
 
-#~ msgid "stdout"
-#~ msgstr "sortie standard (stdout)"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "sortie standard (stdout)"
 
-#~ msgid "stderr"
-#~ msgstr "sortie d'erreur (stderr)"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "sortie d'erreur (stderr)"
 
-#~ msgid "unknown stream"
-#~ msgstr "flux inconnu"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "flux inconnu"
 
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "impossible de rouvrir %s en mode %s"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "impossible de rouvrir %s en mode %s"
 
-#~ msgid "string comparison failed"
-#~ msgstr "échec de comparaison de chaîne"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "échec de comparaison de chaîne"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Définir LC_ALL='C' pour contourner le problème."
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Définir LC_ALL='C' pour contourner le problème."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Les chaînes comparées étaient %s et %s."
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Les chaînes comparées étaient %s et %s."
 
-#~ msgid "cannot perform formatted output"
-#~ msgstr "impossible mettre en forme la sortie formatée"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "impossible mettre en forme la sortie formatée"
 
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "argument %s%s non valable « %s »"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "argument %s%s non valable « %s »"
 
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "suffixe non valable dans l'argument %s%s « %s »"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "suffixe non valable dans l'argument %s%s « %s »"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "argument %s%s « %s » trop grand"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "argument %s%s « %s » trop grand"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s : option illégale -- %c\n"
@@ -800,22 +1099,18 @@ msgstr "%s : l'option « -W %s » nécessite un argument\n"
 #~ msgstr "ne peut aller vers le répertoire %s"
 
 #~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr ""
-#~ "ne peut obtenir le groupe d'établissement de session à partir du UID "
-#~ "numérique"
+#~ msgstr "ne peut obtenir le groupe d'établissement de session à partir du UID numérique"
 
 #, fuzzy
 #~ msgid ""
 #~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
+#~ "This is free software.  You may redistribute copies of it under the terms of\n"
 #~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
 #~ "There is NO WARRANTY, to the extent permitted by law.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "Ce programme est un logiciel libre; vous pouvez le redistribuer ou le\n"
-#~ "modifier selon les termes de la License Publique Générale de GNU, "
-#~ "publiée\n"
+#~ "modifier selon les termes de la License Publique Générale de GNU, publiée\n"
 #~ "par la Free Software Foundation (soit la version 2 ou soit, à votre\n"
 #~ "discrétion, toute version ultérieure).\n"
 #~ "\n"
diff --git a/gnulib/po/ga.po b/gnulib/po/ga.po
index 035df0da..88776b23 100644
--- a/gnulib/po/ga.po
+++ b/gnulib/po/ga.po
@@ -7,440 +7,563 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 1.1\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2009-03-20 14:42+0200\n"
 "PO-Revision-Date: 2007-07-20 12:24-0600\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :"
-"(n>6 && n<11) ? 3 : 4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :(n>6 && n<11) ? 3 : 4;\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "arg�int neamhbhail� %s chun %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "arg�int dh�bhr�och %s chun %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Na harg�int� bail�:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: luach %s n�os l� n� n� cothrom le %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: luach de dh�th ar pharaim�adar ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: luach deimhneach de dh�th ar pharaim�adar ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Paraim�adar anaithnid ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Truflais i ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Is riachtanach/roghnach le rogha ghearr aon arg�int at� riachtanach/roghnach "
-"leis an rogha fhada."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Is riachtanach/roghnach le rogha ghearr aon arg�int at� riachtanach/roghnach leis an rogha fhada."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "�s�id:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  n�: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [ROGHA...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr ""
-"Bain triail as `%s --help' n� `%s --usage' chun tuilleadh eolais a fh�il.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Bain triail as `%s --help' n� `%s --usage' chun tuilleadh eolais a fh�il.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Seol tuairisc� fabhtanna chuig %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:125
 msgid "Unknown system error"
 msgstr "Earr�id ch�rais anaithnid"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "taispe�in an chabhair seo"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "tabhair teachtaireacht bheag �s�ide"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "AINM"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "socraigh ainm an chl�ir"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SOIC"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "d�an moill SOIC soicind (r�amhshocr�: 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "taispe�in leagan an chl�ir"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
+#, c-format
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(EARR�ID CHL�IR) Leagan anaithnid!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: An iomarca arg�int�\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(EARR�ID CHL�IR) Ba ch�ir an rogha a aithint!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: T� an rogha `%s' d�bhr�och\n"
+#: lib/c-stack.c:198 lib/c-stack.c:309
+msgid "program error"
+msgstr "earr�id chl�ir"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `--%s'\n"
+#: lib/c-stack.c:199 lib/c-stack.c:310
+msgid "stack overflow"
+msgstr "cruach thar maoil"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `%c%s'\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
-
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: rogha anaithnid `--%s'\n"
-
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: rogha anaithnid `%c%s'\n"
-
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: rogha neamhbhail� -- %c\n"
-
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha -- %c\n"
+#: lib/clean-temp.c:333
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr ""
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/clean-temp.c:347
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: T� an rogha `-W %s' d�bhr�och\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "n� f�idir comhadlann %s a chruth�"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/clean-temp.c:443
 #, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `-W %s'\n"
+msgid "cannot remove temporary file %s"
+msgstr "n� f�idir comhadlann %s a chruth�"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/clean-temp.c:458
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
+msgid "cannot remove temporary directory %s"
+msgstr "n� f�idir comhadlann %s a chruth�"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "arg�int neamhbhail� %s chun %s"
+#: lib/closein.c:99
+#, fuzzy
+msgid "error closing file"
+msgstr "earr�id agus comhad \"%s\" � scr�obh"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "arg�int dh�bhr�och %s chun %s"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "earr�id sa scr�obh"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Na harg�int� bail�:"
+#: lib/copy-file.c:66
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "earr�id agus \"%s\" � oscailt chun � a l�amh"
 
-#~ msgid "program error"
-#~ msgstr "earr�id chl�ir"
+#: lib/copy-file.c:73
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "n� f�idir comhad c�ltaca \"%s\" a oscailt chun scr�obh ann"
 
-#~ msgid "stack overflow"
-#~ msgstr "cruach thar maoil"
+#: lib/copy-file.c:81
+#, c-format
+msgid "error reading \"%s\""
+msgstr "earr�id agus \"%s\" � l�amh"
 
-#, fuzzy
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "n� f�idir comhadlann %s a chruth�"
+#: lib/copy-file.c:86 lib/copy-file.c:91 lib/copy-file.c:130
+#, c-format
+msgid "error writing \"%s\""
+msgstr "earr�id agus \"%s\" � scr�obh"
 
-#, fuzzy
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "n� f�idir comhadlann %s a chruth�"
+#: lib/copy-file.c:93 lib/copy-file.c:132
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "earr�id tar �is \"%s\" � l�amh"
 
-#, fuzzy
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "n� f�idir comhadlann %s a chruth�"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "theip ar fdopen()"
 
-#, fuzzy
-#~ msgid "error closing file"
-#~ msgstr "earr�id agus comhad \"%s\" � scr�obh"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "Tiomsaitheoir C# gan aimsi�, bain triail as pnet"
 
-#~ msgid "write error"
-#~ msgstr "earr�id sa scr�obh"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "Meais�n f�or�il C# gan aimsi�, bain triail as pnet"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "earr�id agus \"%s\" � oscailt chun � a l�amh"
+#: lib/execute.c:189 lib/execute.c:262 lib/pipe.c:233 lib/pipe.c:348
+#: lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "theip ar fhophr�iseas %s"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "n� f�idir comhad c�ltaca \"%s\" a oscailt chun scr�obh ann"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "gn�thchomhad folamh"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "earr�id agus \"%s\" � l�amh"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "gn�thchomhad"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "earr�id agus \"%s\" � scr�obh"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "comhadlann"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "earr�id tar �is \"%s\" � l�amh"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "comhad speisialta den chine�l `bloc'"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "theip ar fdopen()"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "comhad speisialta den chine�l `carachtar'"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "Tiomsaitheoir C# gan aimsi�, bain triail as pnet"
+# `TITA' ?! -KPS
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "Meais�n f�or�il C# gan aimsi�, bain triail as pnet"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "nasc siombalach"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "theip ar fhophr�iseas %s"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "soic�ad"
 
-#~ msgid "regular empty file"
-#~ msgstr "gn�thchomhad folamh"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "ci� teachtaireachta"
 
-#~ msgid "regular file"
-#~ msgstr "gn�thchomhad"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "s�amaf�r"
 
-#~ msgid "directory"
-#~ msgstr "comhadlann"
+# FARF --KPS
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "comhad comhchuimhne"
 
-#~ msgid "block special file"
-#~ msgstr "comhad speisialta den chine�l `bloc'"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "comhad cuimhne le cine�l"
 
-#~ msgid "character special file"
-#~ msgstr "comhad speisialta den chine�l `carachtar'"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "comhad aisteach"
 
-# `TITA' ?! -KPS
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/gai_strerror.c:41
+msgid "Address family for hostname not supported"
+msgstr "Aicme sheolta d'�stainm gan taca�ocht"
 
-#~ msgid "symbolic link"
-#~ msgstr "nasc siombalach"
+#: lib/gai_strerror.c:42
+msgid "Temporary failure in name resolution"
+msgstr "Teip shealadach ar r�iteach na n-ainmneacha"
 
-#~ msgid "socket"
-#~ msgstr "soic�ad"
+#: lib/gai_strerror.c:43
+msgid "Bad value for ai_flags"
+msgstr "Luach neamhbhail� do 'ai_flags'"
 
-#~ msgid "message queue"
-#~ msgstr "ci� teachtaireachta"
+#: lib/gai_strerror.c:44
+msgid "Non-recoverable failure in name resolution"
+msgstr "Teip dhocheartaithe ar r�iteach na n-ainmneacha"
 
-#~ msgid "semaphore"
-#~ msgstr "s�amaf�r"
+#: lib/gai_strerror.c:45
+msgid "ai_family not supported"
+msgstr "n� thaca�tear le 'ai_family'"
 
-# FARF --KPS
-#~ msgid "shared memory object"
-#~ msgstr "comhad comhchuimhne"
+#: lib/gai_strerror.c:46
+msgid "Memory allocation failure"
+msgstr "Theip ar dh�il chuimhne"
 
-#~ msgid "typed memory object"
-#~ msgstr "comhad cuimhne le cine�l"
+#: lib/gai_strerror.c:47
+msgid "No address associated with hostname"
+msgstr "N�l seoladh ar bith ceangailte leis an �stainm"
 
-#~ msgid "weird file"
-#~ msgstr "comhad aisteach"
+#: lib/gai_strerror.c:48
+msgid "Name or service not known"
+msgstr "Ainm n� seirbh�s anaithnid"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Aicme sheolta d'�stainm gan taca�ocht"
+#: lib/gai_strerror.c:49
+msgid "Servname not supported for ai_socktype"
+msgstr "N� thaca�tear le hainm freastalaithe do 'ai_socktype'"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Teip shealadach ar r�iteach na n-ainmneacha"
+#: lib/gai_strerror.c:50
+msgid "ai_socktype not supported"
+msgstr "n� thaca�tear le 'ai_socktype'"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Luach neamhbhail� do 'ai_flags'"
+#: lib/gai_strerror.c:51
+msgid "System error"
+msgstr "Earr�id ch�rais"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Teip dhocheartaithe ar r�iteach na n-ainmneacha"
+#: lib/gai_strerror.c:52
+msgid "Argument buffer too small"
+msgstr "T� an arg�int mhaol�in r�bheag"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "n� thaca�tear le 'ai_family'"
+#: lib/gai_strerror.c:54
+msgid "Processing request in progress"
+msgstr "Iarratas pr�ise�la ar si�l"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Theip ar dh�il chuimhne"
+#: lib/gai_strerror.c:55
+msgid "Request canceled"
+msgstr "Ceala�odh an t-iarratas"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "N�l seoladh ar bith ceangailte leis an �stainm"
+#: lib/gai_strerror.c:56
+msgid "Request not canceled"
+msgstr "N�or ceala�odh an t-iarratas"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Ainm n� seirbh�s anaithnid"
+#: lib/gai_strerror.c:57
+msgid "All requests done"
+msgstr "Cuireadh gach iarratas i gcr�ch"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "N� thaca�tear le hainm freastalaithe do 'ai_socktype'"
+#: lib/gai_strerror.c:58
+msgid "Interrupted by a signal"
+msgstr "Idirbhriste ag comhartha"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "n� thaca�tear le 'ai_socktype'"
+#: lib/gai_strerror.c:59
+msgid "Parameter string not correctly encoded"
+msgstr "N�l an teaghr�n paraim�adair ionch�daithe i gceart"
 
-#~ msgid "System error"
-#~ msgstr "Earr�id ch�rais"
+#: lib/gai_strerror.c:71
+msgid "Unknown error"
+msgstr "Earr�id anaithnid"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "T� an arg�int mhaol�in r�bheag"
+#: lib/getopt.c:526 lib/getopt.c:542
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: T� an rogha `%s' d�bhr�och\n"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Iarratas pr�ise�la ar si�l"
+#: lib/getopt.c:575 lib/getopt.c:579
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `--%s'\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Ceala�odh an t-iarratas"
+#: lib/getopt.c:588 lib/getopt.c:593
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `%c%s'\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "N�or ceala�odh an t-iarratas"
+#: lib/getopt.c:636 lib/getopt.c:655 lib/getopt.c:971 lib/getopt.c:990
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Cuireadh gach iarratas i gcr�ch"
+#: lib/getopt.c:693 lib/getopt.c:696
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: rogha anaithnid `--%s'\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Idirbhriste ag comhartha"
+#: lib/getopt.c:704 lib/getopt.c:707
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: rogha anaithnid `%c%s'\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "N�l an teaghr�n paraim�adair ionch�daithe i gceart"
+#: lib/getopt.c:759 lib/getopt.c:762
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: rogha neamhcheadaithe -- %c\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Earr�id anaithnid"
+#: lib/getopt.c:768 lib/getopt.c:771
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: rogha neamhbhail� -- %c\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: rogha neamhcheadaithe -- %c\n"
+#: lib/getopt.c:823 lib/getopt.c:839 lib/getopt.c:1043 lib/getopt.c:1061
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha -- %c\n"
 
-#, fuzzy
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "fophr�iseas %s"
+#: lib/getopt.c:892 lib/getopt.c:908
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: T� an rogha `-W %s' d�bhr�och\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "arg�int neamhbhail� \"source_version\" ar compile_java_class"
+#: lib/getopt.c:932 lib/getopt.c:950
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: n� cheada�tear arg�int i ndiaidh na rogha `-W %s'\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "arg�int neamhbhail� \"target_version\" ar compile_java_class"
+#: lib/javaversion.c:84
+#, fuzzy, c-format
+msgid "%s subprocess I/O error"
+msgstr "fophr�iseas %s"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "theip ar chruth� \"%s\""
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "arg�int neamhbhail� \"source_version\" ar compile_java_class"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "earr�id agus comhad \"%s\" � scr�obh"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "arg�int neamhbhail� \"target_version\" ar compile_java_class"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Tiomsaitheoir Java gan aimsi�, bain triail as gcj, n� socraigh $JAVAC"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "theip ar chruth� \"%s\""
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Meais�n f�or�il Java gan aimsi�, bain triail as gij, n� socraigh $JAVA"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "earr�id agus comhad \"%s\" � scr�obh"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "n� f�idir p�opa a chruth�"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Tiomsaitheoir Java gan aimsi�, bain triail as gcj, n� socraigh $JAVAC"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "n� f�idir an chomhadlann oibre a thaifead"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Meais�n f�or�il Java gan aimsi�, bain triail as gij, n� socraigh $JAVA"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "n�l aon fh�il ar an ch�ad chomhadlann oibre"
+#: lib/pipe.c:138 lib/pipe.c:142 lib/pipe.c:263 lib/pipe.c:267
+#, c-format
+msgid "cannot create pipe"
+msgstr "n� f�idir p�opa a chruth�"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "n� f�idir na ceadanna de %s a athr�"
+#: lib/openat-die.c:34
+#, c-format
+msgid "unable to record current working directory"
+msgstr "n� f�idir an chomhadlann oibre a thaifead"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "n� f�idir comhadlann %s a chruth�"
+#: lib/openat-die.c:47
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "n�l aon fh�il ar an ch�ad chomhadlann oibre"
 
-#~ msgid "memory exhausted"
-#~ msgstr "cuimhne �dithe"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "n� f�idir na ceadanna de %s a athr�"
 
-#~ msgid "Success"
-#~ msgstr "D'�irigh leis"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "n� f�idir comhadlann %s a chruth�"
 
-#~ msgid "No match"
-#~ msgstr "Gan mheaitse�il"
+#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "cuimhne �dithe"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Slonn ionada�ochta neamhbhail�"
+#: lib/regcomp.c:132
+msgid "Success"
+msgstr "D'�irigh leis"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Carachtar neamhbhail� comhordaithe"
+#: lib/regcomp.c:135
+msgid "No match"
+msgstr "Gan mheaitse�il"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Ainm neamhbhail� ar aicme charachtar"
+#: lib/regcomp.c:138
+msgid "Invalid regular expression"
+msgstr "Slonn ionada�ochta neamhbhail�"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "C�lslais chun deiridh"
+#: lib/regcomp.c:141
+msgid "Invalid collation character"
+msgstr "Carachtar neamhbhail� comhordaithe"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "C�ltagairt neamhbhail�"
+#: lib/regcomp.c:144
+msgid "Invalid character class name"
+msgstr "Ainm neamhbhail� ar aicme charachtar"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "[ n� [^ corr"
+#: lib/regcomp.c:147
+msgid "Trailing backslash"
+msgstr "C�lslais chun deiridh"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "( n� \\( corr"
+#: lib/regcomp.c:150
+msgid "Invalid back reference"
+msgstr "C�ltagairt neamhbhail�"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "\\{ corr"
+#: lib/regcomp.c:153
+msgid "Unmatched [ or [^"
+msgstr "[ n� [^ corr"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "�bhar neamhbhail� idir \\{ agus \\}"
+#: lib/regcomp.c:156
+msgid "Unmatched ( or \\("
+msgstr "( n� \\( corr"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Deireadh raoin neamhbhail�"
+#: lib/regcomp.c:159
+msgid "Unmatched \\{"
+msgstr "\\{ corr"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Cuimhne �dithe"
+#: lib/regcomp.c:162
+msgid "Invalid content of \\{\\}"
+msgstr "�bhar neamhbhail� idir \\{ agus \\}"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Is neamhbhail� an slonn ionada�ochta roimhe seo"
+#: lib/regcomp.c:165
+msgid "Invalid range end"
+msgstr "Deireadh raoin neamhbhail�"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Deireadh le slonn ionada�ochta gan choinne"
+#: lib/regcomp.c:168
+msgid "Memory exhausted"
+msgstr "Cuimhne �dithe"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Slonn ionada�ochta r�mh�r"
+#: lib/regcomp.c:171
+msgid "Invalid preceding regular expression"
+msgstr "Is neamhbhail� an slonn ionada�ochta roimhe seo"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr ") n� \\) corr"
+#: lib/regcomp.c:174
+msgid "Premature end of regular expression"
+msgstr "Deireadh le slonn ionada�ochta gan choinne"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "N�l aon slonn ionada�ochta roimhe seo"
+#: lib/regcomp.c:177
+msgid "Regular expression too big"
+msgstr "Slonn ionada�ochta r�mh�r"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Theip ar oscailt /dev/zero chun � a l�amh"
+#: lib/regcomp.c:180
+msgid "Unmatched ) or \\)"
+msgstr ") n� \\) corr"
 
-#~ msgid "`"
-#~ msgstr "`"
+#: lib/regcomp.c:701
+msgid "No previous regular expression"
+msgstr "N�l aon slonn ionada�ochta roimhe seo"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Theip ar oscailt /dev/zero chun � a l�amh"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:249
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:250
+msgid "'"
+msgstr "'"
 
 # #-#-#-#-#  findutils-4.1.7.ga.po (findutils 4.1.7)  #-#-#-#-#
 # allow yes, but also 'i' as in 'is sea' or 's' for 'sea' -- KPS
@@ -453,8 +576,15 @@ msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
 # #-#-#-#-#  findutils-4.1.7.ga.po (findutils 4.1.7)  #-#-#-#-#
 # allow yes, but also 'i' as in 'is sea' or 's' for 'sea' -- KPS
 # neither of these letters is near the 'N' on standard keyboard...
-#~ msgid "^[yY]"
-#~ msgstr "^[yYiIsS]"
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yYiIsS]"
 
 # #-#-#-#-#  findutils-4.1.7.ga.po (findutils 4.1.7)  #-#-#-#-#
 # fortunately, 'n' for 'no' or 'n� hea' - KPS
@@ -464,152 +594,273 @@ msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
 # #-#-#-#-#  textutils-2.1.ga.po (textutils 2.1)  #-#-#-#-#
 # #-#-#-#-#  findutils-4.1.7.ga.po (findutils 4.1.7)  #-#-#-#-#
 # fortunately, 'n' for 'no' or 'n� hea' - KPS
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/unicodeio.c:102
+msgid "iconv function not usable"
+msgstr "n� f�idir an fheidhm iconv a �s�id"
+
+#: lib/unicodeio.c:104
+msgid "iconv function not available"
+msgstr "n�l an fheidhm iconv ar f�il"
+
+#: lib/unicodeio.c:111
+msgid "character out of range"
+msgstr "carachtar as raon"
+
+#: lib/unicodeio.c:175
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "n� f�idir U+%04X a thiont� chuig an fhoireann carachtar log�nta"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "n� f�idir an fheidhm iconv a �s�id"
+#: lib/unicodeio.c:177
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "n� f�idir U+%04X a thiont� chuig an fhoireann carachtar log�nta: %s"
 
-#~ msgid "iconv function not available"
-#~ msgstr "n�l an fheidhm iconv ar f�il"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "�s�ideoir neamhbhail�"
 
-#~ msgid "character out of range"
-#~ msgstr "carachtar as raon"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "gr�pa neamhbhail�"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "n� f�idir U+%04X a thiont� chuig an fhoireann carachtar log�nta"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "sonr� neamhbhail�"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "n� f�idir U+%04X a thiont� chuig an fhoireann carachtar log�nta: %s"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr ""
 
-#~ msgid "invalid user"
-#~ msgstr "�s�ideoir neamhbhail�"
+#: lib/copy-acl.c:547
+#, fuzzy, c-format
+msgid "preserving permissions for %s"
+msgstr "n� f�idir na ceadanna de %s a athr�"
 
-#~ msgid "invalid group"
-#~ msgstr "gr�pa neamhbhail�"
+#: lib/xmemcoll.c:48
+#, c-format
+msgid "string comparison failed"
+msgstr "theip ar chompar�id idir teaghr�in"
 
-#~ msgid "invalid spec"
-#~ msgstr "sonr� neamhbhail�"
+#: lib/xmemcoll.c:49
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Cuir LC_ALL='C' ionas gur f�idir an fhadhb seo a sheachaint."
 
-#, fuzzy
-#~ msgid "preserving permissions for %s"
-#~ msgstr "n� f�idir na ceadanna de %s a athr�"
+#: lib/xmemcoll.c:51
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Rinneadh compar�id idir na teaghr�in %s agus %s."
 
-#~ msgid "string comparison failed"
-#~ msgstr "theip ar chompar�id idir teaghr�in"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr ""
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Cuir LC_ALL='C' ionas gur f�idir an fhadhb seo a sheachaint."
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:65
+msgid "(C)"
+msgstr "�"
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Rinneadh compar�id idir na teaghr�in %s agus %s."
+#: lib/version-etc.c:67
+#, fuzzy
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Cead�nas GPLv3+: GNU GPL leagan 3 n� n�os nua� <http://gnu.org/licenses/gpl.html>\n"
+"Is saorbhogearra � seo: ceada�tear duit � a athr� agus a athdh�ileadh.\n"
+"N�l bar�nta AR BITH ann, an oiread at� ceadaithe de r�ir dl�.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:83
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Le %s.\n"
 
-#~ msgid "(C)"
-#~ msgstr "�"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:87
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Le %s agus %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Cead�nas GPLv3+: GNU GPL leagan 3 n� n�os nua� <http://gnu.org/licenses/"
-#~ "gpl.html>\n"
-#~ "Is saorbhogearra � seo: ceada�tear duit � a athr� agus a athdh�ileadh.\n"
-#~ "N�l bar�nta AR BITH ann, an oiread at� ceadaithe de r�ir dl�.\n"
-#~ "\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:91
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Le %s, %s, agus %s.\n"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Le %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:97
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Le %s, %s, %s,\n"
+"agus %s.\n"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Le %s agus %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:103
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Le %s, %s, %s,\n"
+"%s, agus %s.\n"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Le %s, %s, agus %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:109
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Le %s, %s, %s,\n"
+"%s, %s, agus %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Le %s, %s, %s,\n"
-#~ "agus %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Le %s, %s, %s,\n"
+"%s, %s, %s, agus %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Le %s, %s, %s,\n"
-#~ "%s, agus %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Le %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"agus %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Le %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, agus %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:141
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Le %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, agus daoine eile nach iad.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:181
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Report bugs to <%s>.\n"
+msgstr "Seol tuairisc� fabhtanna chuig %s.\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Le %s, %s, %s,\n"
-#~ "%s, %s, agus %s.\n"
+#: lib/version-etc.c:182
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>.\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Le %s, %s, %s,\n"
-#~ "%s, %s, %s, agus %s.\n"
+#: lib/version-etc.c:184
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>.\n"
+msgstr ""
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Le %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "agus %s.\n"
+#: lib/xstrtol-error.c:63
+#, fuzzy, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "arg�int neamhbhail� %s chun %s"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Le %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, agus %s.\n"
+#: lib/xstrtol-error.c:68
+#, fuzzy, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "arg�int neamhbhail� %s chun %s"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Le %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, agus daoine eile nach iad.\n"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to <%s>.\n"
-#~ msgstr "Seol tuairisc� fabhtanna chuig %s.\n"
+#: lib/set-mode-acl.c:488
+#, fuzzy, c-format
+msgid "setting permissions for %s"
+msgstr "n� f�idir na ceadanna de %s a athr�"
 
-#, fuzzy
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "arg�int neamhbhail� %s chun %s"
+#: lib/strsignal.c:111
+#, c-format
+msgid "Real-time signal %d"
+msgstr ""
 
-#, fuzzy
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "arg�int neamhbhail� %s chun %s"
+#: lib/strsignal.c:115
+#, c-format
+msgid "Unknown signal %d"
+msgstr ""
 
-#, fuzzy
-#~ msgid "setting permissions for %s"
-#~ msgstr "n� f�idir na ceadanna de %s a athr�"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "fophr�iseas %s"
 
-#~ msgid "%s subprocess"
-#~ msgstr "fophr�iseas %s"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "fuair fophr�iseas %s comhartha marfach %d"
 
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "fuair fophr�iseas %s comhartha marfach %d"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr ""
 
 #~ msgid "block size"
 #~ msgstr "m�id bloc"
@@ -628,8 +879,7 @@ msgstr "%s: t� arg�int de dh�th i ndiaidh na rogha `%s'\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
+#~ "This is free software.  You may redistribute copies of it under the terms of\n"
 #~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
 #~ "There is NO WARRANTY, to the extent permitted by law.\n"
 #~ "\n"
diff --git a/gnulib/po/gl.po b/gnulib/po/gl.po
index 68b50146..658f99ca 100644
--- a/gnulib/po/gl.po
+++ b/gnulib/po/gl.po
@@ -6,41 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: textutils 2.0.22\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2002-07-23 03:07+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
-"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "argumento incorrecto %s para %s"
 
-#: gnulib/argp-help.c:226
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "argumento %s ambiguo para %s"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Os par�metros correctos son:"
 
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
-
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -49,25 +38,17 @@ msgstr ""
 "Os argumentos obrigatorios nas opci�ns longas tam�n o son nas opci�ns "
 "curtas.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Uso: %s [OPCI�N] [FICHEIRO]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Escriba \"%s --help\" para m�is informaci�n.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
@@ -75,357 +56,416 @@ msgstr ""
 "Informe dos erros no programa a <%s>.\n"
 "Informe dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Erro do sistema desco�ecido"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "NAME"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:147
 #, fuzzy
-msgid "print program version"
+msgid "Print program version"
 msgstr "erro do programa"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "demasiados argumentos"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+#: lib/c-stack.c:244
+msgid "program error"
+msgstr "erro do programa"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a opci�n \"%s\" � ambigua\n"
+#: lib/c-stack.c:245
+msgid "stack overflow"
+msgstr "desbordamento da pila"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a opci�n \"--%s\" non permite un argumento\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "erro de escritura"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a opci�n \"%c%s\" precisa dun argumento\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "non se pode abrir %s para lectura"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a opci�n \"%s\" precisa dun argumento\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "non se pode abrir %s para lectura"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opci�n desco�ecida \"--%s\"\n"
+msgid "error reading \"%s\""
+msgstr "erro lendo %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opci�n desco�ecida \"%c%s\"\n"
+msgid "error writing \"%s\""
+msgstr "erro escribindo %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opci�n incorrecta -- %c\n"
+msgid "error after reading \"%s\""
+msgstr "erro lendo %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: a opci�n precisa dun argumento -- %c\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "a apertura fallou"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a opci�n \"-W %s\" � ambigua\n"
+msgid "%s subprocess failed"
+msgstr "%s: patr�n incorrecto"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a opci�n \"-W %s\" non permite un argumento\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "ficheiro normal baleiro"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a opci�n \"%s\" precisa dun argumento\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "ficheiro normal"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "argumento incorrecto %s para %s"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "directorio"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "argumento %s ambiguo para %s"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "ficheiro especial de bloque"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Os par�metros correctos son:"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "ficheiro especial de car�cter"
 
-#~ msgid "program error"
-#~ msgstr "erro do programa"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "stack overflow"
-#~ msgstr "desbordamento da pila"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "ligaz�n simb�lica"
 
-#~ msgid "write error"
-#~ msgstr "erro de escritura"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "socket"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "non se pode abrir %s para lectura"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "cola de mensaxes"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "non se pode abrir %s para lectura"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "sem�foro"
 
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "erro lendo %s"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "obxecto de memoria compartida"
 
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "erro escribindo %s"
+msgid "typed memory object"
+msgstr "obxecto de memoria compartida"
 
-#, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "erro lendo %s"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "ficheiro estra�o"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "a apertura fallou"
+msgid "Address family for hostname not supported"
+msgstr "os ficheiros \"fifo\" non est�n soportados"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: patr�n incorrecto"
+msgid "ai_family not supported"
+msgstr "os ficheiros \"fifo\" non est�n soportados"
 
-#~ msgid "regular empty file"
-#~ msgstr "ficheiro normal baleiro"
-
-#~ msgid "regular file"
-#~ msgstr "ficheiro normal"
-
-#~ msgid "directory"
-#~ msgstr "directorio"
-
-#~ msgid "block special file"
-#~ msgstr "ficheiro especial de bloque"
-
-#~ msgid "character special file"
-#~ msgstr "ficheiro especial de car�cter"
-
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/gai_strerror.c:54
+#, fuzzy
+msgid "ai_socktype not supported"
+msgstr "os ficheiros \"fifo\" non est�n soportados"
 
-#~ msgid "symbolic link"
-#~ msgstr "ligaz�n simb�lica"
+#: lib/gai_strerror.c:55
+#, fuzzy
+msgid "System error"
+msgstr "erro de escritura"
 
-#~ msgid "socket"
-#~ msgstr "socket"
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "Erro do sistema desco�ecido"
 
-#~ msgid "message queue"
-#~ msgstr "cola de mensaxes"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: a opci�n \"%s\" � ambigua\n"
 
-#~ msgid "semaphore"
-#~ msgstr "sem�foro"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: a opci�n \"--%s\" non permite un argumento\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "obxecto de memoria compartida"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: a opci�n \"%c%s\" precisa dun argumento\n"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "obxecto de memoria compartida"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: a opci�n \"%s\" precisa dun argumento\n"
 
-#~ msgid "weird file"
-#~ msgstr "ficheiro estra�o"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opci�n desco�ecida \"--%s\"\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "os ficheiros \"fifo\" non est�n soportados"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opci�n desco�ecida \"%c%s\"\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "os ficheiros \"fifo\" non est�n soportados"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opci�n incorrecta -- %c\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "os ficheiros \"fifo\" non est�n soportados"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opci�n incorrecta -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "erro de escritura"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: a opci�n precisa dun argumento -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Erro do sistema desco�ecido"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: a opci�n \"-W %s\" � ambigua\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opci�n incorrecta -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: a opci�n \"-W %s\" non permite un argumento\n"
 
-#~ msgid "block size"
-#~ msgstr "tama�o de bloque"
+#: lib/human.c:486
+msgid "block size"
+msgstr "tama�o de bloque"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s existe pero non � un directorio"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s existe pero non � un directorio"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "non se pode cambia-lo propietario e/ou grupo de %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "non se pode cambia-lo propietario e/ou grupo de %s"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "non se pode crea-lo directorio %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "non se pode crea-lo directorio %s"
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "non se pode cambiar ao directorio %s"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "non se pode cambiar ao directorio %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "non se pode cambia-los permisos de %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "non se pode cambia-los permisos de %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "memoria esgotada"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "memoria esgotada"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "non se pode crea-lo directorio %s"
+msgid "unable to record current working directory"
+msgstr "non se pode crea-lo directorio %s"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "non se pode cambia-los permisos de %s"
+msgid "Failed to open /dev/zero for read"
+msgstr "non se pode cambia-los permisos de %s"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "non se pode crea-lo directorio %s"
-
-#~ msgid "`"
-#~ msgstr "\""
-
-#~ msgid "'"
-#~ msgstr "\""
-
+msgid "cannot create pipe"
+msgstr "non se pode crea-lo directorio %s"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "\""
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "\""
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: expresi�n regular incorrecta: %s"
+msgid "Invalid regular expression"
+msgstr "%s: expresi�n regular incorrecta: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "clase de caracteres \"%s\" incorrecta"
+msgid "Invalid character class name"
+msgstr "clase de caracteres \"%s\" incorrecta"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "memoria esgotada"
+msgid "Memory exhausted"
+msgstr "memoria esgotada"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: expresi�n regular incorrecta: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: expresi�n regular incorrecta: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "erro ao buscar por expresi�ns regulares"
+msgid "Premature end of regular expression"
+msgstr "erro ao buscar por expresi�ns regulares"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: expresi�n regular incorrecta: %s"
+msgid "Regular expression too big"
+msgstr "%s: expresi�n regular incorrecta: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "erro ao buscar por expresi�ns regulares"
+msgid "No previous regular expression"
+msgstr "erro ao buscar por expresi�ns regulares"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[sSyY]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[sSyY]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "a funci�n iconv non � utilizable"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "a funci�n iconv non � utilizable"
 
-#~ msgid "iconv function not available"
-#~ msgstr "a funci�n iconv non est� dispo�ible"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "a funci�n iconv non est� dispo�ible"
 
-#~ msgid "character out of range"
-#~ msgstr "car�cter f�ra de rango"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "car�cter f�ra de rango"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "non se pode converter U+%04X ao xogo de caracteres local"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "non se pode converter U+%04X ao xogo de caracteres local"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "non se pode converter U+%04X ao xogo de caracteres local: %s"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "non se pode converter U+%04X ao xogo de caracteres local: %s"
 
-#~ msgid "invalid user"
-#~ msgstr "usuario incorrecto"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "usuario incorrecto"
 
-#~ msgid "invalid group"
-#~ msgstr "grupo incorrecto"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "grupo incorrecto"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "non se pode obte-lo grupo de login dun UID num�rico"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "non se pode obte-lo grupo de login dun UID num�rico"
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Este programa � software libre; pode redistribu�lo e/ou modificalo baixo\n"
-#~ "os termos da Licencia P�blica Xeral de GNU tal como a publicou a Free\n"
-#~ "Software Foundation; xa ben a versi�n 2 ou (� s�a elecci�n) calquera\n"
-#~ "versi�n posterior.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Escrito por %s.\n"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"Este programa � software libre; pode redistribu�lo e/ou modificalo baixo\n"
+"os termos da Licencia P�blica Xeral de GNU tal como a publicou a Free\n"
+"Software Foundation; xa ben a versi�n 2 ou (� s�a elecci�n) calquera\n"
+"versi�n posterior.\n"
+"\n"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escrito por %s.\n"
 
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Escrito por %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Escrito por %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Escrito por %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Escrito por %s.\n"
 
-#~ msgid "string comparison failed"
-#~ msgstr "a comparaci�n de cadeas fallou"
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "a comparaci�n de cadeas fallou"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Estabreza LC_ALL='C' para palia-lo problema"
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Estabreza LC_ALL='C' para palia-lo problema"
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "As cadeas que se compararon foron %s e %s"
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "As cadeas que se compararon foron %s e %s"
diff --git a/gnulib/po/hu.po b/gnulib/po/hu.po
index c9797cd7..66d8b22c 100644
--- a/gnulib/po/hu.po
+++ b/gnulib/po/hu.po
@@ -8,702 +8,1058 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 2.0.0.3462.e9796\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2010-02-22 12:32+0200\n"
 "PO-Revision-Date: 2010-02-23 19:52+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "a(z) „%s” argumentum érvénytelen a következőhöz: %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "a(z) „%s” argumentum nem egyértelmű ehhez: „%s”"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Az érvényes argumentumok a következők:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: %s értéke nem nagyobb, mint %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: Az ARGP_HELP_FMT paraméter értéket igényel"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: Az ARGP_HELP_FMT paraméternek pozitívnak kell lennie"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Ismeretlen ARGP_HELP_FMT paraméter"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Szemét az ARGP_HELP_FMT-ben: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Ha egy hosszú kapcsolóhoz kötelező vagy opcionális argumentumot megadni, "
-"akkor ez a megfelelő rövid kapcsolónál is kötelező vagy opcionális."
+#: lib/argp-help.c:1244
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Ha egy hosszú kapcsolóhoz kötelező vagy opcionális argumentumot megadni, akkor ez a megfelelő rövid kapcsolónál is kötelező vagy opcionális."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1637
 msgid "Usage:"
 msgstr "Használat:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1641
 msgid "  or: "
 msgstr "  vagy: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1653
 msgid " [OPTION...]"
 msgstr " [KAPCSOLÓ…]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr ""
-"További információkért lásd a(z) „%s --help” vagy „%s --usage” kimenetét.\n"
+#: lib/argp-help.c:1680
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "További információkért lásd a(z) „%s --help” vagy „%s --usage” kimenetét.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1708
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "A hibák itt jelenthetők: %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1927 lib/error.c:153
 msgid "Unknown system error"
 msgstr "Ismeretlen rendszerhiba"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "ezen súgószöveg megjelenítése"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "rövid használati utasítás megjelenítése"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NÉV"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "a program nevének beállítása"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "MÁSODPERC"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "szünet MP másodpercre (alapértelmezetten 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "a programverzió kiírása"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(PROGRAMHIBA) A verzió nem ismert!"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Túl sok argumentum\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(PROGRAMHIBA) A kapcsolót ismerni kellene?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n"
+#: lib/c-stack.c:196 lib/c-stack.c:309
+msgid "program error"
+msgstr "olvasási hiba"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/c-stack.c:197 lib/c-stack.c:310
+msgid "stack overflow"
+msgstr "veremtúlcsordulás"
+
+#: lib/clean-temp.c:335
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "nem található átmeneti könyvtár, próbálja beállítani a $TMPDIR változót"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:349
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "nem lehet létrehozni átmeneti könyvtárat a(z) „%s” sablon használatával"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: a(z) „%s” kapcsolóhoz argumentum szükséges\n"
+#: lib/clean-temp.c:445
+#, c-format
+msgid "cannot remove temporary file %s"
+msgstr "nem lehet eltávolítani a(z) %s átmeneti fájlt"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:460
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: a(z) „--%s” kapcsoló ismeretlen\n"
+msgid "cannot remove temporary directory %s"
+msgstr "nem lehet eltávolítani a(z) %s átmeneti könyvtárat"
+
+#: lib/closein.c:99
+msgid "error closing file"
+msgstr "hiba a fájl lezárásakor"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "írási hiba"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-acl.c:547
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: a(z) „%c%s” kapcsoló ismeretlen\n"
+msgid "preserving permissions for %s"
+msgstr "%s jogosultságainak megőrzése"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: érvénytelen kapcsoló -- „%c”\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "hiba \"%s\" megnyitásakor olvasásra"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: a kapcsoló egy argumentumot igényel -- „%c”\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "%s mentési fájl megnyitása írásra sikertelen"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:82
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
+msgid "error reading \"%s\""
+msgstr "hiba \"%s\" olvasásakor"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n"
+msgid "error writing \"%s\""
+msgstr "hiba \"%s\" írásakor"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: a(z) „%s” kapcsolóhoz argumentum szükséges\n"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "hiba \"%s\" olvasása után"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "a(z) „%s” argumentum érvénytelen a következőhöz: %s"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "az fdopen() sikertelen"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "a(z) „%s” argumentum nem egyértelmű ehhez: „%s”"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "a C# fordító nem található, próbálja telepíteni a pnetet"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Az érvényes argumentumok a következők:"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "a C# virtuális gép nem található, próbálja telepíteni a pnetet"
 
-#~ msgid "program error"
-#~ msgstr "olvasási hiba"
+#: lib/execute.c:189 lib/execute.c:262 lib/pipe.c:229 lib/pipe.c:342
+#: lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s alfolyamat sikertelen"
 
-#~ msgid "stack overflow"
-#~ msgstr "veremtúlcsordulás"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "szabályos üres fájl"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "nem található átmeneti könyvtár, próbálja beállítani a $TMPDIR változót"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "szabályos fájl"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr ""
-#~ "nem lehet létrehozni átmeneti könyvtárat a(z) „%s” sablon használatával"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "könyvtár"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "nem lehet eltávolítani a(z) %s átmeneti fájlt"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "speciális blokkfájl"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "nem lehet eltávolítani a(z) %s átmeneti könyvtárat"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "speciális karakterfájl"
 
-#~ msgid "error closing file"
-#~ msgstr "hiba a fájl lezárásakor"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "write error"
-#~ msgstr "írási hiba"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "szimbolikus link"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "%s jogosultságainak megőrzése"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "foglalat"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "hiba \"%s\" megnyitásakor olvasásra"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "üzenetsor"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "%s mentési fájl megnyitása írásra sikertelen"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "szemafor"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "hiba \"%s\" olvasásakor"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "megosztott memóriaobjektum"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "hiba \"%s\" írásakor"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "típusos memóriaobjektum"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "hiba \"%s\" olvasása után"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "szokatlan fájl"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "az fdopen() sikertelen"
+#: lib/gai_strerror.c:42
+msgid "Address family for hostname not supported"
+msgstr "A gépnév címcsaládja nem támogatott"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "a C# fordító nem található, próbálja telepíteni a pnetet"
+#: lib/gai_strerror.c:43
+msgid "Temporary failure in name resolution"
+msgstr "Átmeneti névfeloldási hiba"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "a C# virtuális gép nem található, próbálja telepíteni a pnetet"
+#: lib/gai_strerror.c:44
+msgid "Bad value for ai_flags"
+msgstr "Az ai_flags értéke hibás"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s alfolyamat sikertelen"
+#: lib/gai_strerror.c:45
+msgid "Non-recoverable failure in name resolution"
+msgstr "Helyrehozhatatlan névfeloldási hiba"
 
-#~ msgid "regular empty file"
-#~ msgstr "szabályos üres fájl"
+#: lib/gai_strerror.c:46
+msgid "ai_family not supported"
+msgstr "Az ai_family nem támogatott"
 
-#~ msgid "regular file"
-#~ msgstr "szabályos fájl"
+#: lib/gai_strerror.c:47
+msgid "Memory allocation failure"
+msgstr "Memóriafoglalási hiba"
 
-#~ msgid "directory"
-#~ msgstr "könyvtár"
+#: lib/gai_strerror.c:48
+msgid "No address associated with hostname"
+msgstr "A gépnévhez nem tartozik cím"
 
-#~ msgid "block special file"
-#~ msgstr "speciális blokkfájl"
+#: lib/gai_strerror.c:49
+msgid "Name or service not known"
+msgstr "A név vagy szolgáltatás ismeretlen"
 
-#~ msgid "character special file"
-#~ msgstr "speciális karakterfájl"
+#: lib/gai_strerror.c:50
+msgid "Servname not supported for ai_socktype"
+msgstr "A kiszolgálónév nem támogatott az ai_socktype-hoz"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/gai_strerror.c:51
+msgid "ai_socktype not supported"
+msgstr "Az ai_socktype nem támogatott"
 
-#~ msgid "symbolic link"
-#~ msgstr "szimbolikus link"
+#: lib/gai_strerror.c:52
+msgid "System error"
+msgstr "Rendszerhiba"
 
-#~ msgid "socket"
-#~ msgstr "foglalat"
+#: lib/gai_strerror.c:53
+msgid "Argument buffer too small"
+msgstr "A paraméterpuffer túl kicsi"
 
-#~ msgid "message queue"
-#~ msgstr "üzenetsor"
+#: lib/gai_strerror.c:55
+msgid "Processing request in progress"
+msgstr "Kérés feldolgozása folyamatban"
 
-#~ msgid "semaphore"
-#~ msgstr "szemafor"
+#: lib/gai_strerror.c:56
+msgid "Request canceled"
+msgstr "Kérés megszakítva"
 
-#~ msgid "shared memory object"
-#~ msgstr "megosztott memóriaobjektum"
+#: lib/gai_strerror.c:57
+msgid "Request not canceled"
+msgstr "Kérés nincs megszakítva"
 
-#~ msgid "typed memory object"
-#~ msgstr "típusos memóriaobjektum"
+#: lib/gai_strerror.c:58
+msgid "All requests done"
+msgstr "Minden kérés kész"
 
-#~ msgid "weird file"
-#~ msgstr "szokatlan fájl"
+#: lib/gai_strerror.c:59
+msgid "Interrupted by a signal"
+msgstr "Szignál által megszakítva"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "A gépnév címcsaládja nem támogatott"
+#: lib/gai_strerror.c:60
+msgid "Parameter string not correctly encoded"
+msgstr "A paraméter-karakterlánc nem megfelelő kódolású"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Átmeneti névfeloldási hiba"
+#: lib/gai_strerror.c:72
+msgid "Unknown error"
+msgstr "Ismeretlen hiba"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Az ai_flags értéke hibás"
+#: lib/getopt.c:529 lib/getopt.c:545
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Helyrehozhatatlan névfeloldási hiba"
+#: lib/getopt.c:578 lib/getopt.c:582
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "Az ai_family nem támogatott"
+#: lib/getopt.c:591 lib/getopt.c:596
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Memóriafoglalási hiba"
+#: lib/getopt.c:639 lib/getopt.c:658 lib/getopt.c:961 lib/getopt.c:980
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr "%s: a(z) „%s” kapcsolóhoz argumentum szükséges\n"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "A gépnévhez nem tartozik cím"
+#: lib/getopt.c:696 lib/getopt.c:699
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: a(z) „--%s” kapcsoló ismeretlen\n"
 
-#~ msgid "Name or service not known"
-#~ msgstr "A név vagy szolgáltatás ismeretlen"
+#: lib/getopt.c:707 lib/getopt.c:710
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: a(z) „%c%s” kapcsoló ismeretlen\n"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "A kiszolgálónév nem támogatott az ai_socktype-hoz"
+#: lib/getopt.c:759 lib/getopt.c:762
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: érvénytelen kapcsoló -- „%c”\n"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "Az ai_socktype nem támogatott"
+#: lib/getopt.c:812 lib/getopt.c:829 lib/getopt.c:1032 lib/getopt.c:1050
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: a kapcsoló egy argumentumot igényel -- „%c”\n"
 
-#~ msgid "System error"
-#~ msgstr "Rendszerhiba"
+#: lib/getopt.c:882 lib/getopt.c:898
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "A paraméterpuffer túl kicsi"
+#: lib/getopt.c:922 lib/getopt.c:940
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Kérés feldolgozása folyamatban"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr ""
 
-#~ msgid "Request canceled"
-#~ msgstr "Kérés megszakítva"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr ""
 
-#~ msgid "Request not canceled"
-#~ msgstr "Kérés nincs megszakítva"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr ""
 
-#~ msgid "All requests done"
-#~ msgstr "Minden kérés kész"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "hiba \"%s\" fájl írásakor"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Szignál által megszakítva"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr ""
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "A paraméter-karakterlánc nem megfelelő kódolású"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr ""
 
-#~ msgid "Unknown error"
-#~ msgstr "Ismeretlen hiba"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr ""
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "hiba \"%s\" fájl írásakor"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "nem lehet %s jogosultságait megváltoztatni"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "nem lehet %s jogosultságait megváltoztatni"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "nem lehet létrehozni a(z) %s könyvtárat"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "nem lehet létrehozni a(z) %s könyvtárat"
+#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "elfogyott a memória"
 
-#~ msgid "memory exhausted"
-#~ msgstr "elfogyott a memória"
+#: lib/openat-die.c:34
+#, c-format
+msgid "unable to record current working directory"
+msgstr "az aktuális munkakönyvtár feljegyzése meghiúsult"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "az aktuális munkakönyvtár feljegyzése meghiúsult"
+#: lib/openat-die.c:52
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "a visszatérés meghiúsult a kiinduló munkakönyvtárba"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "a visszatérés meghiúsult a kiinduló munkakönyvtárba"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "/dev/zero megnyitása olvasásra sikertelen"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "/dev/zero megnyitása olvasásra sikertelen"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr ""
+
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr ""
+
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:359
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:396
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr ""
+
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr ""
+
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: lib/pipe-filter-ii.c:428
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""
 
-#~ msgid "cannot create pipe"
-#~ msgstr "nem hozható létre adatcsatorna"
+#: lib/pipe.c:137 lib/pipe.c:140 lib/pipe.c:258 lib/pipe.c:261
+#, c-format
+msgid "cannot create pipe"
+msgstr "nem hozható létre adatcsatorna"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:272
+msgid "`"
+msgstr "„"
+
+#: lib/quotearg.c:273
+msgid "'"
+msgstr "”"
+
+#: lib/regcomp.c:132
+msgid "Success"
+msgstr "Sikerült"
+
+#: lib/regcomp.c:135
+msgid "No match"
+msgstr "Nincs találat"
+
+#: lib/regcomp.c:138
+msgid "Invalid regular expression"
+msgstr "Érvénytelen szabályos kifejezés"
+
+#: lib/regcomp.c:141
+msgid "Invalid collation character"
+msgstr "Érvénytelen leválogatási karakter"
+
+#: lib/regcomp.c:144
+msgid "Invalid character class name"
+msgstr "Érvénytelen karakterosztálynév"
+
+#: lib/regcomp.c:147
+msgid "Trailing backslash"
+msgstr "Záró visszaper"
+
+#: lib/regcomp.c:150
+msgid "Invalid back reference"
+msgstr "Érvénytelen visszahivatkozás"
+
+#: lib/regcomp.c:153
+msgid "Unmatched [ or [^"
+msgstr "Pár nélküli [ vagy [^"
+
+#: lib/regcomp.c:156
+msgid "Unmatched ( or \\("
+msgstr "Pár nélküli ( vagy \\("
+
+#: lib/regcomp.c:159
+msgid "Unmatched \\{"
+msgstr "Pár nélküli \\{"
+
+#: lib/regcomp.c:162
+msgid "Invalid content of \\{\\}"
+msgstr "A \\{\\} tartalma érvénytelen"
+
+#: lib/regcomp.c:165
+msgid "Invalid range end"
+msgstr "Érvénytelen tartományvég"
+
+#: lib/regcomp.c:168
+msgid "Memory exhausted"
+msgstr "Elfogyott a memória"
+
+#: lib/regcomp.c:171
+msgid "Invalid preceding regular expression"
+msgstr "Érvénytelen megelőző szabályos kifejezés"
+
+#: lib/regcomp.c:174
+msgid "Premature end of regular expression"
+msgstr "A szabályos kifejezés túl korán véget ért"
+
+#: lib/regcomp.c:177
+msgid "Regular expression too big"
+msgstr "A szabályos kifejezés túl nagy"
+
+#: lib/regcomp.c:180
+msgid "Unmatched ) or \\)"
+msgstr "Pár nélküli ) vagy \\)"
+
+#: lib/regcomp.c:701
+msgid "No previous regular expression"
+msgstr "Nincs megelőző szabályos kifejezés"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[iIyY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:591
+#, c-format
+msgid "setting permissions for %s"
+msgstr "%s jogosultságainak beállítása"
 
-#~ msgid "`"
-#~ msgstr "„"
+#: lib/siglist.h:29
+msgid "Hangup"
+msgstr "Felfüggesztés"
 
-#~ msgid "'"
-#~ msgstr "”"
+#: lib/siglist.h:32
+msgid "Interrupt"
+msgstr "Megszakítás"
 
-#~ msgid "Success"
-#~ msgstr "Sikerült"
+#: lib/siglist.h:35
+msgid "Quit"
+msgstr "Kilépés"
 
-#~ msgid "No match"
-#~ msgstr "Nincs találat"
+#: lib/siglist.h:38
+msgid "Illegal instruction"
+msgstr "Illegális utasítás"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Érvénytelen szabályos kifejezés"
+#: lib/siglist.h:41
+msgid "Trace/breakpoint trap"
+msgstr "Nyomkövetési/töréspont csapda"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Érvénytelen leválogatási karakter"
+#: lib/siglist.h:44
+msgid "Aborted"
+msgstr "Megszakítva"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Érvénytelen karakterosztálynév"
+#: lib/siglist.h:47
+msgid "Floating point exception"
+msgstr "Lebegőpontos kivétel"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Záró visszaper"
+#: lib/siglist.h:50
+msgid "Killed"
+msgstr "Kilőve"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Érvénytelen visszahivatkozás"
+#: lib/siglist.h:53
+msgid "Bus error"
+msgstr "Buszhiba"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Pár nélküli [ vagy [^"
+#: lib/siglist.h:56
+msgid "Segmentation fault"
+msgstr "Szegmentálási hiba"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Pár nélküli ( vagy \\("
+#: lib/siglist.h:59
+msgid "Broken pipe"
+msgstr "Megszakadt csővezeték"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Pár nélküli \\{"
+#: lib/siglist.h:62
+msgid "Alarm clock"
+msgstr "Ébresztőóra"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "A \\{\\} tartalma érvénytelen"
+#: lib/siglist.h:65
+msgid "Terminated"
+msgstr "Befejeződött"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Érvénytelen tartományvég"
+#: lib/siglist.h:68
+msgid "Urgent I/O condition"
+msgstr "Sürgős I/O feltétel"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Elfogyott a memória"
+#: lib/siglist.h:71
+msgid "Stopped (signal)"
+msgstr "Leállítva (szignál)"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Érvénytelen megelőző szabályos kifejezés"
+#: lib/siglist.h:74
+msgid "Stopped"
+msgstr "Leállítva"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "A szabályos kifejezés túl korán véget ért"
+#: lib/siglist.h:77
+msgid "Continued"
+msgstr "Folytatva"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "A szabályos kifejezés túl nagy"
+#: lib/siglist.h:80
+msgid "Child exited"
+msgstr "Gyerekfolyamat kilépett"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Pár nélküli ) vagy \\)"
+#: lib/siglist.h:83
+msgid "Stopped (tty input)"
+msgstr "Leállítva (tty bemenet)"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Nincs megelőző szabályos kifejezés"
+#: lib/siglist.h:86
+msgid "Stopped (tty output)"
+msgstr "Leállítva (tty kimenet)"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[iIyY]"
+#: lib/siglist.h:89
+msgid "I/O possible"
+msgstr "I/O lehetséges"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/siglist.h:92
+msgid "CPU time limit exceeded"
+msgstr "CPU-időkorlát túllépve"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "%s jogosultságainak beállítása"
+#: lib/siglist.h:95
+msgid "File size limit exceeded"
+msgstr "Fájlméret korlátja túllépve"
 
-#~ msgid "Hangup"
-#~ msgstr "Felfüggesztés"
+#: lib/siglist.h:98
+msgid "Virtual timer expired"
+msgstr "Virtuális időzítés lejárt"
 
-#~ msgid "Interrupt"
-#~ msgstr "Megszakítás"
+#: lib/siglist.h:101
+msgid "Profiling timer expired"
+msgstr "A profilozási időzítő lejárt"
 
-#~ msgid "Quit"
-#~ msgstr "Kilépés"
+#: lib/siglist.h:104
+msgid "Window changed"
+msgstr "Ablakméret változott"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Illegális utasítás"
+#: lib/siglist.h:107
+msgid "User defined signal 1"
+msgstr "Felhasználói szignál 1"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Nyomkövetési/töréspont csapda"
+#: lib/siglist.h:110
+msgid "User defined signal 2"
+msgstr "Felhasználói szignál 2"
 
-#~ msgid "Aborted"
-#~ msgstr "Megszakítva"
+#: lib/siglist.h:115
+msgid "EMT trap"
+msgstr "EMT csapda"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Lebegőpontos kivétel"
+#: lib/siglist.h:118
+msgid "Bad system call"
+msgstr "Hibás rendszerhívás"
 
-#~ msgid "Killed"
-#~ msgstr "Kilőve"
+#: lib/siglist.h:121
+msgid "Stack fault"
+msgstr "Veremhiba"
 
-#~ msgid "Bus error"
-#~ msgstr "Buszhiba"
+#: lib/siglist.h:124
+msgid "Information request"
+msgstr "Információkérés"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Szegmentálási hiba"
+#: lib/siglist.h:126
+msgid "Power failure"
+msgstr "Tápfeszültség-kimaradás"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Megszakadt csővezeték"
+#: lib/siglist.h:129
+msgid "Resource lost"
+msgstr "Erőforrás elveszítve"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Ébresztőóra"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr ""
 
-#~ msgid "Terminated"
-#~ msgstr "Befejeződött"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Valós idejű szignál %d"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Sürgős I/O feltétel"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Ismeretlen szignál %d"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Leállítva (szignál)"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "az iconv függvény nem használható"
 
-#~ msgid "Stopped"
-#~ msgstr "Leállítva"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "az iconv függvény nem elérhető"
 
-#~ msgid "Continued"
-#~ msgstr "Folytatva"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "tartományon kívüli karakter"
 
-#~ msgid "Child exited"
-#~ msgstr "Gyerekfolyamat kilépett"
+#: lib/unicodeio.c:180
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "nem lehet helyi karakterkészletbe átalakítani a következőt: U+%04X"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Leállítva (tty bemenet)"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "az U+%04X nem konvertálható a helyi karakterkészletbe:  %s"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Leállítva (tty kimenet)"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "érvénytelen felhasználó"
 
-#~ msgid "I/O possible"
-#~ msgstr "I/O lehetséges"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "érvénytelen csoport"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "CPU-időkorlát túllépve"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "érvénytelen specifikáció"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Fájlméret korlátja túllépve"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "nem jeleníthető meg hibaüzenet"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Virtuális időzítés lejárt"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Csomagolta: %s (%s)\n"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "A profilozási időzítő lejárt"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Csomagolta: %s\n"
+
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
+
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"A licenc GPLv3+: a GNU GPL 3. vagy újabb változata <http://gnu.org/licenses/gpl.html>\n"
+"Ez egy szabad szoftver, terjesztheti és/vagy módosíthatja.\n"
+"NINCS GARANCIA, a törvény által engedélyezett mértékig.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Írta: %s.\n"
 
-#~ msgid "Window changed"
-#~ msgstr "Ablakméret változott"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Írta: %s és %s.\n"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Felhasználói szignál 1"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Írta: %s, %s és %s\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Felhasználói szignál 2"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Írta: %s, %s, %s\n"
+"és %s\n"
 
-#~ msgid "EMT trap"
-#~ msgstr "EMT csapda"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Írta: %s, %s, %s,\n"
+"%s és %s\n"
 
-#~ msgid "Bad system call"
-#~ msgstr "Hibás rendszerhívás"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Írta: %s, %s, %s,\n"
+"%s, %s és %s\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Veremhiba"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Írta: %s, %s, %s,\n"
+"%s, %s, %s és %s\n"
 
-#~ msgid "Information request"
-#~ msgstr "Információkérés"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Írta: %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"és %s\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Írta: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s és %s\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Írta: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s és mások\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"A hibák a(z) %s címen jelenthetők.\n"
 
-#~ msgid "Power failure"
-#~ msgstr "Tápfeszültség-kimaradás"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "A(z) %s hibái a(z) %s címen jelenthetők.\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Erőforrás elveszítve"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "A(z) %s honlapja: <%s>\n"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Valós idejű szignál %d"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "A(z) %s honlapja: <http://www.gnu.org/software/%s/>.\n"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Ismeretlen szignál %d"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Általános segítség a GNU szoftverek használatához: <http://www.gnu.org/gethelp/>.\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "az iconv függvény nem használható"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr ""
 
-#~ msgid "iconv function not available"
-#~ msgstr "az iconv függvény nem elérhető"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr ""
 
-#~ msgid "character out of range"
-#~ msgstr "tartományon kívüli karakter"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr ""
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "nem lehet helyi karakterkészletbe átalakítani a következőt: U+%04X"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr ""
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "az U+%04X nem konvertálható a helyi karakterkészletbe:  %s"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "szabványos bemenet"
 
-#~ msgid "invalid user"
-#~ msgstr "érvénytelen felhasználó"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "szabványos kimenet"
 
-#~ msgid "invalid group"
-#~ msgstr "érvénytelen csoport"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "szabványos hibakimenet"
 
-#~ msgid "invalid spec"
-#~ msgstr "érvénytelen specifikáció"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "ismeretlen adatfolyam"
 
-#~ msgid "unable to display error message"
-#~ msgstr "nem jeleníthető meg hibaüzenet"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "%s újranyitása %s móddal meghiúsult"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Csomagolta: %s (%s)\n"
+#: lib/xmemcoll.c:48
+#, c-format
+msgid "string comparison failed"
+msgstr "karakterlánc-összehasonlítás sikertelen"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Csomagolta: %s\n"
+#: lib/xmemcoll.c:49
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Állítsa be az LC_ALL='C' környezeti változót a probléma megkerüléséhez."
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/xmemcoll.c:51
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Az összehasonlított karakterláncok: %s és %s."
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "A licenc GPLv3+: a GNU GPL 3. vagy újabb változata <http://gnu.org/"
-#~ "licenses/gpl.html>\n"
-#~ "Ez egy szabad szoftver, terjesztheti és/vagy módosíthatja.\n"
-#~ "NINCS GARANCIA, a törvény által engedélyezett mértékig.\n"
-#~ "\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr ""
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Írta: %s.\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "érvénytelen %s%s argumentum: „%s”"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Írta: %s és %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Írta: %s, %s és %s\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Írta: %s, %s, %s\n"
-#~ "és %s\n"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "érvénytelen utótag a(z) %s%s argumentumban: „%s”"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Írta: %s, %s, %s,\n"
-#~ "%s és %s\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Írta: %s, %s, %s,\n"
-#~ "%s, %s és %s\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Írta: %s, %s, %s,\n"
-#~ "%s, %s, %s és %s\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Írta: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "és %s\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Írta: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s és %s\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Írta: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s és mások\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "A hibák a(z) %s címen jelenthetők.\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "A(z) %s hibái a(z) %s címen jelenthetők.\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "A(z) %s honlapja: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "A(z) %s honlapja: <http://www.gnu.org/software/%s/>.\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Általános segítség a GNU szoftverek használatához: <http://www.gnu.org/"
-#~ "gethelp/>.\n"
-
-#~ msgid "stdin"
-#~ msgstr "szabványos bemenet"
-
-#~ msgid "stdout"
-#~ msgstr "szabványos kimenet"
-
-#~ msgid "stderr"
-#~ msgstr "szabványos hibakimenet"
-
-#~ msgid "unknown stream"
-#~ msgstr "ismeretlen adatfolyam"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "%s újranyitása %s móddal meghiúsult"
-
-#~ msgid "string comparison failed"
-#~ msgstr "karakterlánc-összehasonlítás sikertelen"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr ""
-#~ "Állítsa be az LC_ALL='C' környezeti változót a probléma megkerüléséhez."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Az összehasonlított karakterláncok: %s és %s."
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "érvénytelen %s%s argumentum: „%s”"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "érvénytelen utótag a(z) %s%s argumentumban: „%s”"
-
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "%s%s: a(z) „%s” argumentum túl nagy"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s: a(z) „%s” argumentum túl nagy"
diff --git a/gnulib/po/it.po b/gnulib/po/it.po
index 0e4ed64c..20391ada 100644
--- a/gnulib/po/it.po
+++ b/gnulib/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib-3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-08-22 21:58+0200\n"
 "Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,641 +19,852 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "argomento %s non valido per %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "argomento %s ambiguo per %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Sono argomenti validi:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: il valore %s è minore o uguale a %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: il parametro ARGP_HELP_FMT richiede un valore"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: il parametro ARGP_HELP_FMT deve essere positivo"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: parametro ARGP_HELP_FMT sconosciuto"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Spazzatura in ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Gli argomenti obbligatori o facoltativi per le opzioni estese lo sono anche "
-"per le corrispondenti opzioni brevi."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Gli argomenti obbligatori o facoltativi per le opzioni estese lo sono anche per le corrispondenti opzioni brevi."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Uso:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  o: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [OPZIONE...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Usare \"%s --help\" o \"%s --usage\" per ulteriori informazioni.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Segnalare i bug a %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "Mostra questo aiuto"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "Mostra un breve messaggio sull'uso"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NOME"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "Imposta il nome del programma"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEC"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "Resta in attesa per SEC secondi (predefinito 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "Stampa la versione del programma"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ERRORE DEL PROGRAMMA) Nessuna versione conosciuta."
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: troppi argomenti\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ERRORE DEL PROGRAMMA) L'opzione dovrebbe essere stata riconosciuta."
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: l'opzione \"%s\" è ambigua. Possibilità:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "errore del programma"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: l'opzione \"--%s\" non accetta un argomento\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "overflow dello stack"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: l'opzione \"%c%s\" non accetta un argomento\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "impossibile trovare una directory temporanea, provare a impostare $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: l'opzione \"--%s\" richiede un argomento\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "impossibile creare una directory temporanea usando il modello \"%s\""
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opzione \"--%s\" non riconosciuta\n"
+msgid "cannot remove temporary file %s"
+msgstr "impossibile rimuovere il file temporaneo %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
+msgid "cannot remove temporary directory %s"
+msgstr "impossibile rimuovere la directory temporanea %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opzione non valida -- %c\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "errore nel chiudere il file"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: l'opzione richiede un argomento -- %c\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "errore di scrittura"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
+msgid "preserving permissions for %s"
+msgstr "preservazione dei permessi per %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: l'opzione \"-W %s\" non accetta un argomento\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "errore nell'aprire \"%s\" in lettura"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "argomento %s non valido per %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "argomento %s ambiguo per %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Sono argomenti validi:"
-
-#~ msgid "program error"
-#~ msgstr "errore del programma"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "impossibile aprire il file di backup \"%s\" in scrittura"
 
-#~ msgid "stack overflow"
-#~ msgstr "overflow dello stack"
-
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "impossibile trovare una directory temporanea, provare a impostare $TMPDIR"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr ""
-#~ "impossibile creare una directory temporanea usando il modello \"%s\""
-
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "impossibile rimuovere il file temporaneo %s"
-
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "impossibile rimuovere la directory temporanea %s"
-
-#~ msgid "error closing file"
-#~ msgstr "errore nel chiudere il file"
-
-#~ msgid "write error"
-#~ msgstr "errore di scrittura"
-
-#~ msgid "preserving permissions for %s"
-#~ msgstr "preservazione dei permessi per %s"
-
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "errore nell'aprire \"%s\" in lettura"
-
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "impossibile aprire il file di backup \"%s\" in scrittura"
-
-#~ msgid "error reading \"%s\""
-#~ msgstr "errore nel leggere \"%s\""
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "errore nel leggere \"%s\""
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "errore nello scrivere \"%s\""
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "errore nello scrivere \"%s\""
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "errore dopo la lettura di \"%s\""
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "errore dopo la lettura di \"%s\""
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() non riuscita"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() non riuscita"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "compilatore C# non trovato, provare a installare pnet"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "compilatore C# non trovato, provare a installare pnet"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "macchina virtuale C# non trovata, provare a installare pnet"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "macchina virtuale C# non trovata, provare a installare pnet"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: sottoprocesso non riuscito"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s: sottoprocesso non riuscito"
 
-#~ msgid "regular empty file"
-#~ msgstr "file normale vuoto"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "file normale vuoto"
 
-#~ msgid "regular file"
-#~ msgstr "file normale"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "file normale"
 
-#~ msgid "directory"
-#~ msgstr "directory"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "directory"
 
-#~ msgid "block special file"
-#~ msgstr "file speciale a blocchi"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "file speciale a blocchi"
 
-#~ msgid "character special file"
-#~ msgstr "file speciale a caratteri"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "file speciale a caratteri"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "symbolic link"
-#~ msgstr "collegamento simbolico"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "collegamento simbolico"
 
-#~ msgid "socket"
-#~ msgstr "socket"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "socket"
 
-#~ msgid "message queue"
-#~ msgstr "coda di messaggi"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "coda di messaggi"
 
-#~ msgid "semaphore"
-#~ msgstr "semaforo"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semaforo"
 
-#~ msgid "shared memory object"
-#~ msgstr "oggetto di memoria condivisa"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "oggetto di memoria condivisa"
 
 # (ndt) sono accettati:
 # - suggerimenti
 # - collegamenti dove si spieghi cosa sia un 'typed memory object'
 # Ma dove si spieghi VERAMENTE e CONCRETAMENTE cos'è.
-#~ msgid "typed memory object"
-#~ msgstr "oggetto di memoria con nome"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "oggetto di memoria con nome"
 
-#~ msgid "weird file"
-#~ msgstr "file strano"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "file strano"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Famiglia di indirizzi per il nome host non supportata"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Famiglia di indirizzi per il nome host non supportata"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Errore temporaneo nella risoluzione del nome"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Errore temporaneo nella risoluzione del nome"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Valore per ai_flags errato"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Valore per ai_flags errato"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Errore irreversibile nella risoluzione del nome"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Errore irreversibile nella risoluzione del nome"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family non supportato"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family non supportato"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Allocazione memoria non riuscita"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Allocazione memoria non riuscita"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Nessun indirizzo associato col nome host"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Nessun indirizzo associato col nome host"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Nome o servizio sconosciuto"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Nome o servizio sconosciuto"
 
 # (ndt)
 #
 # define EAI_SERVICE  -8 /* SERVICE not supported for `ai_socktype'.  */
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Nome servizio non supportato per ai_socktype"
-
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype non supportato"
-
-#~ msgid "System error"
-#~ msgstr "Errore di sistema"
-
-#~ msgid "Argument buffer too small"
-#~ msgstr "Buffer argomento troppo piccolo"
-
-#~ msgid "Processing request in progress"
-#~ msgstr "Elaborazione richiesta in corso"
-
-#~ msgid "Request canceled"
-#~ msgstr "Richiesta annullata"
-
-#~ msgid "Request not canceled"
-#~ msgstr "Richiesta non annullata"
-
-#~ msgid "All requests done"
-#~ msgstr "Tutte le richieste completate"
-
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Interrotto da un segnale"
-
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Stringa del parametro non codificata correttamente"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Nome servizio non supportato per ai_socktype"
 
-#~ msgid "Unknown error"
-#~ msgstr "Errore sconosciuto"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype non supportato"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "argomento source_version in compile_java_class non valido"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Errore di sistema"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "argomento target_version in compile_java_class non valido"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Buffer argomento troppo piccolo"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "creazione di \"%s\" non riuscita"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Elaborazione richiesta in corso"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "errore durante la scrittura del file \"%s\""
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Richiesta annullata"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "compilatore Java non trovato, provare a installare gcj o impostare $JAVAC"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Richiesta non annullata"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "macchina virtuale Java non trovato, provare a installare gij o impostare "
-#~ "$JAVA"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Tutte le richieste completate"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "errore di I/O nel sottoprocesso %s"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Interrotto da un segnale"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "impossibile cambiare i permessi di %s"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Stringa del parametro non codificata correttamente"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "impossibile creare la directory %s"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Errore sconosciuto"
 
-#~ msgid "memory exhausted"
-#~ msgstr "memoria esaurita"
-
-#~ msgid "unable to record current working directory"
-#~ msgstr "impossibile registrare la directory di lavoro corrente"
-
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "ritorno alla directory di lavoro iniziale non riuscito"
-
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Apertura di /dev/zero in lettura non riuscita"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: l'opzione \"%s\" è ambigua. Possibilità:"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "creazione del thread di lettura non riuscita"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: l'opzione \"--%s\" non accetta un argomento\n"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "impossibile impostare I/O non bloccante sul sottoprocesso di %s"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: l'opzione \"%c%s\" non accetta un argomento\n"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "comunicazione col sottoprocesso di %s non riuscita"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: l'opzione \"--%s\" richiede un argomento\n"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "scrittura sul sottoprocesso di %s non riuscita"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: opzione \"--%s\" non riconosciuta\n"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "lettura dal sottoprocesso di %s non riuscita"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: opzione \"%c%s\" non riconosciuta\n"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "sottoprocesso %s terminato con codice d'uscita %d"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: opzione non valida -- %c\n"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "creazione dei thread non riuscita"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: l'opzione richiede un argomento -- %c\n"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "sottoprocesso di %s terminato con codice d'uscita %d"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "Francois Pinard"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: l'opzione \"-W %s\" non accetta un argomento\n"
 
-#~ msgid "`"
-#~ msgstr "\""
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n"
 
-#~ msgid "'"
-#~ msgstr "\""
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "argomento source_version in compile_java_class non valido"
 
-#~ msgid "Success"
-#~ msgstr "Successo"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "argomento target_version in compile_java_class non valido"
 
-#~ msgid "No match"
-#~ msgstr "Nessuna corrispondenza"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "creazione di \"%s\" non riuscita"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Espressione regolare non valida"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "errore durante la scrittura del file \"%s\""
 
-# (ndt) http://en.wikipedia.org/wiki/Collation
-#~ msgid "Invalid collation character"
-#~ msgstr "Carattere di collazione non valido"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "compilatore Java non trovato, provare a installare gcj o impostare $JAVAC"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Nome classe del carattere non valida"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "macchina virtuale Java non trovato, provare a installare gij o impostare $JAVA"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Backslash finale"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "errore di I/O nel sottoprocesso %s"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Riferimento all'indietro non valido"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "impossibile cambiare i permessi di %s"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "[ o [^ senza corrispondenza"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "impossibile creare la directory %s"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "( o \\( senza corrispondenza"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "memoria esaurita"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "\\{ senza corrispondenza"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "impossibile registrare la directory di lavoro corrente"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Contenuto di \\{\\} non valido"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "ritorno alla directory di lavoro iniziale non riuscito"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Fine dell'intervallo non valida"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Apertura di /dev/zero in lettura non riuscita"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Memoria esaurita"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "creazione del thread di lettura non riuscita"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Espressione regolare precedente non valida"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "impossibile impostare I/O non bloccante sul sottoprocesso di %s"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Fine prematura dell'espressione regolare"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "comunicazione col sottoprocesso di %s non riuscita"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Espressione regolare troppo grande"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "scrittura sul sottoprocesso di %s non riuscita"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr ") o \\) senza corrispondenza"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "lettura dal sottoprocesso di %s non riuscita"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Nessuna espressione regolare precedente"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "sottoprocesso %s terminato con codice d'uscita %d"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[sSyY]"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "creazione dei thread non riuscita"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "sottoprocesso di %s terminato con codice d'uscita %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "Francois Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "\""
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "\""
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Successo"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Nessuna corrispondenza"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Espressione regolare non valida"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "impostazione dei permessi per %s"
+# (ndt) http://en.wikipedia.org/wiki/Collation
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Carattere di collazione non valido"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Nome classe del carattere non valida"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Backslash finale"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Riferimento all'indietro non valido"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "[ o [^ senza corrispondenza"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "( o \\( senza corrispondenza"
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "\\{ senza corrispondenza"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Contenuto di \\{\\} non valido"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Fine dell'intervallo non valida"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Memoria esaurita"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Espressione regolare precedente non valida"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Fine prematura dell'espressione regolare"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Espressione regolare troppo grande"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr ") o \\) senza corrispondenza"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Nessuna espressione regolare precedente"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[sSyY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "impostazione dei permessi per %s"
 
 # (ndt) ho preferito mettere tra parentesi il vero nome della costante del segnale, sono cose abbastanza tecniche e forse con un riferimento reale più comprensibili
 #
 # http://en.wikipedia.org/wiki/SIGHUP
-#~ msgid "Hangup"
-#~ msgstr "Chiusura"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Chiusura"
 
 # http://en.wikipedia.org/wiki/SIGINT_(POSIX)
-#~ msgid "Interrupt"
-#~ msgstr "Interruzione"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Interruzione"
 
 # http://en.wikipedia.org/wiki/SIGQUIT
-#~ msgid "Quit"
-#~ msgstr "Uscita (con core dump)"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Uscita (con core dump)"
 
 # http://en.wikipedia.org/wiki/SIGILL
-#~ msgid "Illegal instruction"
-#~ msgstr "Istruzione non consentita"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Istruzione non consentita"
 
 # http://en.wikipedia.org/wiki/Trap_(computing)
 # http://en.wikipedia.org/wiki/SIGTRAP
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Rilevato trace/breakpoint"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Rilevato trace/breakpoint"
 
 # http://en.wikipedia.org/wiki/SIGABRT
-#~ msgid "Aborted"
-#~ msgstr "Annullato"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Annullato"
 
 # http://en.wikipedia.org/wiki/SIGFPE
-#~ msgid "Floating point exception"
-#~ msgstr "Eccezione in virgola mobile"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Eccezione in virgola mobile"
 
-#~ msgid "Killed"
-#~ msgstr "Ucciso"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Ucciso"
 
 # http://en.wikipedia.org/wiki/Bus_error
 # http://en.wikipedia.org/wiki/SIGBUS
-#~ msgid "Bus error"
-#~ msgstr "Errore di bus"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Errore di bus"
 
 # http://en.wikipedia.org/wiki/Segmentation_fault
 # http://en.wikipedia.org/wiki/SIGSEGV
-#~ msgid "Segmentation fault"
-#~ msgstr "Errore di segmentazione"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Errore di segmentazione"
 
 # http://en.wikipedia.org/wiki/SIGPIPE
-#~ msgid "Broken pipe"
-#~ msgstr "Pipe interrotta"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Pipe interrotta"
 
 # (ndt) non so se convenga lasciarlo invariato... ma forse anche le altre...
 # http://en.wikipedia.org/wiki/SIGALRM
-#~ msgid "Alarm clock"
-#~ msgstr "Sveglia"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Sveglia"
 
 # http://en.wikipedia.org/wiki/SIGTERM
-#~ msgid "Terminated"
-#~ msgstr "Terminato"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Terminato"
 
 # http://en.wikipedia.org/wiki/SIGURG
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Condizione di I/O urgente"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Condizione di I/O urgente"
 
 # http://en.wikipedia.org/wiki/SIGSTOP
-#~ msgid "Stopped (signal)"
-#~ msgstr "Fermato"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Fermato"
 
 # http://en.wikipedia.org/wiki/SIGTSTP
-#~ msgid "Stopped"
-#~ msgstr "Fermato (da terminale)"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Fermato (da terminale)"
 
 # http://en.wikipedia.org/wiki/SIGCONT
-#~ msgid "Continued"
-#~ msgstr "Continuato"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Continuato"
 
 # http://en.wikipedia.org/wiki/SIGCHLD
-#~ msgid "Child exited"
-#~ msgstr "Processo figlio uscito"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Processo figlio uscito"
 
 # http://en.wikipedia.org/wiki/SIGTTIN
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Fermato per input tty"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Fermato per input tty"
 
 # http://en.wikipedia.org/wiki/SIGTTOU
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Fermato per output tty"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Fermato per output tty"
 
 # (ndt) questa pare non sia posix, wikipedia riporta la stessa di SIGABRT
-#~ msgid "I/O possible"
-#~ msgstr "I/O consentito"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "I/O consentito"
 
 # http://en.wikipedia.org/wiki/SIGXCPU
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Superato il limite di tempo CPU"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Superato il limite di tempo CPU"
 
 # http://en.wikipedia.org/wiki/SIGXFSZ
-#~ msgid "File size limit exceeded"
-#~ msgstr "Superato il limite di dimensione file"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Superato il limite di dimensione file"
 
 # http://en.wikipedia.org/wiki/SIGVTALRM
-#~ msgid "Virtual timer expired"
-#~ msgstr "Timer virtuale terminato"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Timer virtuale terminato"
 
 # http://en.wikipedia.org/wiki/SIGPROF
-#~ msgid "Profiling timer expired"
-#~ msgstr "Timer di profiling terminato"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Timer di profiling terminato"
 
 # http://en.wikipedia.org/wiki/SIGWINCH
-#~ msgid "Window changed"
-#~ msgstr "Finestra modificata"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Finestra modificata"
 
 # http://en.wikipedia.org/wiki/SIGUSR1
-#~ msgid "User defined signal 1"
-#~ msgstr "Segnale 1 definito dall'utente"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Segnale 1 definito dall'utente"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Segnale 2 definito dall'utente"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Segnale 2 definito dall'utente"
 
 # http://en.wikipedia.org/wiki/SIGEMT
-#~ msgid "EMT trap"
-#~ msgstr "Rilevato EMT"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Rilevato EMT"
 
 # http://en.wikipedia.org/wiki/SIGSYS
-#~ msgid "Bad system call"
-#~ msgstr "Chiamata di sistema errata"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Chiamata di sistema errata"
 
 # http://en.wikipedia.org/wiki/SIGSTKFLT
-#~ msgid "Stack fault"
-#~ msgstr "Errore sullo stack"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Errore sullo stack"
 
 # http://en.wikipedia.org/wiki/SIGINFO
-#~ msgid "Information request"
-#~ msgstr "Richiesta informazioni"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Richiesta informazioni"
 
 # http://en.wikipedia.org/wiki/SIGPWR
-#~ msgid "Power failure"
-#~ msgstr "Mancanza alimentazione elettrica"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Mancanza alimentazione elettrica"
 
 # http://en.wikipedia.org/wiki/SIGLOST
-#~ msgid "Resource lost"
-#~ msgstr "Risorsa persa"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Risorsa persa"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "errore nello scrivere su una pipe o un socket chiusi"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "errore nello scrivere su una pipe o un socket chiusi"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "impossibile creare la pipe"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "impossibile creare la pipe"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Segnale real-time %d"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Segnale real-time %d"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Segnale %d sconosciuto"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Segnale %d sconosciuto"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "funzione iconv non utilizzabile"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "funzione iconv non utilizzabile"
 
-#~ msgid "iconv function not available"
-#~ msgstr "funzione iconv non disponibile"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "funzione iconv non disponibile"
 
-#~ msgid "character out of range"
-#~ msgstr "carattere fuori dall'intervallo"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "carattere fuori dall'intervallo"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "impossibile convertire U+%04X nel set di caratteri locale"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "impossibile convertire U+%04X nel set di caratteri locale"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "impossibile convertire U+%04X nel set di caratteri locale: %s"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "impossibile convertire U+%04X nel set di caratteri locale: %s"
 
-#~ msgid "invalid user"
-#~ msgstr "utente non valido"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "utente non valido"
 
-#~ msgid "invalid group"
-#~ msgstr "gruppo non valido"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "gruppo non valido"
 
 # (ndt) evinta da un commento al codice:
 #
@@ -661,160 +872,247 @@ msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n"
 #    group specifiers or to NULL.  If U is not NULL, it is a newly
 #    allocated string.  */
 #
-#~ msgid "invalid spec"
-#~ msgstr "specificatore non valido"
-
-#~ msgid "unable to display error message"
-#~ msgstr "impossibile visualizzare il messaggio di errore"
-
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Pacchetto creato da %s (%s)\n"
-
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Pacchetto creato da %s\n"
-
-#~ msgid "(C)"
-#~ msgstr "©"
-
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Licenza GPLv3+: GNU GPL versione 3 o successiva <http://gnu.org/licenses/"
-#~ "gpl.html>.\n"
-#~ "Questo programma è software libero: siete liberi di modificarlo e "
-#~ "ridistribuirlo.\n"
-#~ "Non c'è ALCUNA GARANZIA, per quanto consentito dalle vigenti normative.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Scritto da %s.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Scritto da %s e %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Scritto da %s, %s e %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Scritto da %s, %s, %s\n"
-#~ "e %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Scritto da %s, %s, %s,\n"
-#~ "%s e %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Scritto da %s, %s, %s,\n"
-#~ "%s, %s e %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Scritto da %s, %s, %s,\n"
-#~ "%s, %s, %s e %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Scritto da %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "e %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Scritto da %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s e %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Scritto da %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s e altri.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Segnalare i bug a: %s\n"
-#~ "Segnalare i bug di traduzione a: <tp@lists.linux.it>\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Segnalare i bug di %s a: %s.\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "Sito web di %s: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "Sito web di %s: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Aiuto per l'utilizzo di software GNU: <http://www.gnu.org/gethelp/>\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle non riuscita"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "impossibile ripristinare fd %d: dup2 non riuscita"
-
-#~ msgid "%s subprocess"
-#~ msgstr "sottoprocesso %s"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "il sottoprocesso %s ha ricevuto un segnale %d fatale"
-
-#~ msgid "stdin"
-#~ msgstr "stdin"
-
-#~ msgid "stdout"
-#~ msgstr "stdout"
-
-#~ msgid "stderr"
-#~ msgstr "stderr"
-
-#~ msgid "unknown stream"
-#~ msgstr "stream sconosciuto"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "riapertura di %s in modalità %s non riuscita"
-
-#~ msgid "string comparison failed"
-#~ msgstr "confronto delle stringhe non riuscito"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Impostare LC_ALL='C' per aggirare il problema."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Le stringhe confrontate erano %s e %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "impossibile mostrare l'output formattato"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "specificatore non valido"
+
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "impossibile visualizzare il messaggio di errore"
+
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Pacchetto creato da %s (%s)\n"
+
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Pacchetto creato da %s\n"
+
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
+
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Licenza GPLv3+: GNU GPL versione 3 o successiva <http://gnu.org/licenses/gpl.html>.\n"
+"Questo programma è software libero: siete liberi di modificarlo e ridistribuirlo.\n"
+"Non c'è ALCUNA GARANZIA, per quanto consentito dalle vigenti normative.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Scritto da %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Scritto da %s e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Scritto da %s, %s e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Scritto da %s, %s, %s\n"
+"e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Scritto da %s, %s, %s,\n"
+"%s e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Scritto da %s, %s, %s,\n"
+"%s, %s e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Scritto da %s, %s, %s,\n"
+"%s, %s, %s e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Scritto da %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Scritto da %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s e %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Scritto da %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s e altri.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Segnalare i bug a: %s\n"
+"Segnalare i bug di traduzione a: <tp@lists.linux.it>\n"
+
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Segnalare i bug di %s a: %s.\n"
+
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Sito web di %s: <%s>\n"
+
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Sito web di %s: <http://www.gnu.org/software/%s/>\n"
+
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Aiuto per l'utilizzo di software GNU: <http://www.gnu.org/gethelp/>\n"
+
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle non riuscita"
+
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "impossibile ripristinare fd %d: dup2 non riuscita"
+
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "sottoprocesso %s"
+
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "il sottoprocesso %s ha ricevuto un segnale %d fatale"
+
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "stdin"
+
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "stdout"
+
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "stderr"
+
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "stream sconosciuto"
+
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "riapertura di %s in modalità %s non riuscita"
+
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "confronto delle stringhe non riuscito"
+
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Impostare LC_ALL='C' per aggirare il problema."
+
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Le stringhe confrontate erano %s e %s."
+
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "impossibile mostrare l'output formattato"
 
 # (ndt)
 # quello che viene sostituito pare sia:
@@ -825,11 +1123,17 @@ msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n"
 # invalid --option argument 'arg'
 #
 # (altre idee sono benvenute!)
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "l'argomento \"%3$s\" di %1$s%2$s non è valido"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "l'argomento \"%3$s\" di %1$s%2$s non è valido"
 
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "il suffisso nell'argomento \"%3$s\" di %1$s%2$s non è valido"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "il suffisso nell'argomento \"%3$s\" di %1$s%2$s non è valido"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "l'argomento \"%3$s\" di %1$s%2$s è troppo grande"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "l'argomento \"%3$s\" di %1$s%2$s è troppo grande"
diff --git a/gnulib/po/ja.po b/gnulib/po/ja.po
index 0ccdd1d6..2c73cfb9 100644
--- a/gnulib/po/ja.po
+++ b/gnulib/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-09-02 18:39+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -21,762 +21,1065 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "%2$s に対する引数 %1$s が間違っています"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "%2$s に対する引数 %1$s が曖昧です"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "有効な引数:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: %s の値は %s の値以下です"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT パラメータには値が必要です"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT パラメータは正の値でなければいけません"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: 不明な ARGP_HELP_FMT パラメータ"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT 中にごみがあります: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"長い形式のオプションで必須または任意の引数は、それに対応する短い形式のオプ"
-"ションでも同様に必須または任意です。"
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "長い形式のオプションで必須または任意の引数は、それに対応する短い形式のオプションでも同様に必須または任意です。"
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "使用法:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "または: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [OPTION...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "詳細は `%s --help' または `%s --usage' を実行して下さい。\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "バグを発見したら <%s> に報告して下さい。\n"
-"翻訳に関するバグは<translation-team-ja@lists.sourceforge.net>に報告してくださ"
-"い。\n"
+"翻訳に関するバグは<translation-team-ja@lists.sourceforge.net>に報告してください。\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "不明なシステムエラー"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "このヘルプを表示する"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "短い使用方法を表示する"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "名前"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "プログラム名を設定する"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SECS"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "SECS 秒でハング (デフォルト 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "プログラムのバージョンを表示する"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(プログラムエラー) 不明なバージョン!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: 引数が多すぎます\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(プログラムエラー) オプションは認識されているべきです!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: オプション '%s' は曖昧です:次のものが可能です:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "プログラムエラー"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: オプション '--%s' は引数を取ることができません\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "スタックオーバーフロー"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: オプション '%c%s' は引数を取ることができません\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "一時ディレクトリを作成できません。 $TMPDIR を設定してみてください"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: オプション '--%s' は引数が必要です\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "テンプレート \"%s\" を使用した一時ディレクトリを作成できません"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: オプション '--%s' を認識できません\n"
+msgid "cannot remove temporary file %s"
+msgstr "一時ファイル %s を削除できません"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: オプション '%c%s' を認識できません\n"
+msgid "cannot remove temporary directory %s"
+msgstr "一時ディレクトリ %s を削除できません"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: 無効なオプション -- '%c'\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "ファイルクローズエラー"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: オプションには引数が必要です -- '%c'\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "書き込みエラー"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: オプション '-W %s' は曖昧です\n"
+msgid "preserving permissions for %s"
+msgstr "%s のパーミッションを保存しています"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: オプション '-W %s' は引数を取ることができません\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "\"%s\"を読込むため開いている際にエラーが発生しました"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: オプション '-W %s' は引数が必要です\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "%2$s に対する引数 %1$s が間違っています"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "%2$s に対する引数 %1$s が曖昧です"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "有効な引数:"
-
-#~ msgid "program error"
-#~ msgstr "プログラムエラー"
-
-#~ msgid "stack overflow"
-#~ msgstr "スタックオーバーフロー"
-
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "一時ディレクトリを作成できません。 $TMPDIR を設定してみてください"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "テンプレート \"%s\" を使用した一時ディレクトリを作成できません"
-
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "一時ファイル %s を削除できません"
-
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "一時ディレクトリ %s を削除できません"
-
-#~ msgid "error closing file"
-#~ msgstr "ファイルクローズエラー"
-
-#~ msgid "write error"
-#~ msgstr "書き込みエラー"
-
-#~ msgid "preserving permissions for %s"
-#~ msgstr "%s のパーミッションを保存しています"
-
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "\"%s\"を読込むため開いている際にエラーが発生しました"
-
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "書込み用バックアップファイル\"%s\"を開くことができません"
-
-#~ msgid "error reading \"%s\""
-#~ msgstr "\"%s\"の読込み中にエラーが発生しました"
-
-#~ msgid "error writing \"%s\""
-#~ msgstr "\"%s\"の書込み中にエラーが発生しました"
-
-#~ msgid "error after reading \"%s\""
-#~ msgstr "\"%s\"の読込み後にエラーが発生しました"
-
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen()に失敗しました"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "書込み用バックアップファイル\"%s\"を開くことができません"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "C# コンパイラが見つりません。pnet をインストールしてみてください"
-
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "C# 仮想マシンが見つかりません。pnet をインストールしてみてください"
-
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s サブプロセスが失敗しました"
-
-#~ msgid "regular empty file"
-#~ msgstr "通常の空ファイル"
-
-#~ msgid "regular file"
-#~ msgstr "通常ファイル"
-
-#~ msgid "directory"
-#~ msgstr "ディレクトリ"
-
-#~ msgid "block special file"
-#~ msgstr "ブロックスペシャルファイル"
-
-#~ msgid "character special file"
-#~ msgstr "キャラクタスペシャルファイル"
-
-#~ msgid "fifo"
-#~ msgstr "fifo"
-
-#~ msgid "symbolic link"
-#~ msgstr "シンボリックリンク"
-
-#~ msgid "socket"
-#~ msgstr "ソケット"
-
-#~ msgid "message queue"
-#~ msgstr "メッセージキュー"
-
-#~ msgid "semaphore"
-#~ msgstr "セマフォ"
-
-#~ msgid "shared memory object"
-#~ msgstr "共有メモリオブジェクト"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "\"%s\"の読込み中にエラーが発生しました"
 
-#~ msgid "typed memory object"
-#~ msgstr "型付メモリオブジェクト"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "\"%s\"の書込み中にエラーが発生しました"
 
-#~ msgid "weird file"
-#~ msgstr "不明なファイル"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "\"%s\"の読込み後にエラーが発生しました"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "ホスト名に対する Address family がサポートされていません"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen()に失敗しました"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "名前解決に一時的に失敗しました"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "C# コンパイラが見つりません。pnet をインストールしてみてください"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "ai_flags に対する誤った値です"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "C# 仮想マシンが見つかりません。pnet をインストールしてみてください"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "名前解決でリカバリできない失敗が発生しました"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s サブプロセスが失敗しました"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family はサポートされていません"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "通常の空ファイル"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "メモリ配置に失敗しました"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "通常ファイル"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "ホスト名にアドレスが割り当てられていません"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "ディレクトリ"
 
-#~ msgid "Name or service not known"
-#~ msgstr "名前またはサービスが不明です"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "ブロックスペシャルファイル"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "ai_socktype に対して Servname がサポートされていません"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "キャラクタスペシャルファイル"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype はサポートされていません"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "System error"
-#~ msgstr "システムエラー"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "シンボリックリンク"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "引数バッファが小さすぎます"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "ソケット"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "要求された処理は実行中です"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "メッセージキュー"
 
-#~ msgid "Request canceled"
-#~ msgstr "要求がキャンセルされました"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "セマフォ"
 
-#~ msgid "Request not canceled"
-#~ msgstr "要求がキャンセルされませんでした"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "共有メモリオブジェクト"
 
-#~ msgid "All requests done"
-#~ msgstr "すべての要求が完了しました"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "型付メモリオブジェクト"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "シグナル割り込みが発生しました"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "不明なファイル"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "パラメーター文字列が正しくエンコードされていません"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "ホスト名に対する Address family がサポートされていません"
 
-#~ msgid "Unknown error"
-#~ msgstr "不明なエラー"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "名前解決に一時的に失敗しました"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "compile_java_class への source_version 引数が無効です"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "ai_flags に対する誤った値です"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "compile_java_class への target_version 引数が無効です"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "名前解決でリカバリできない失敗が発生しました"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "\"%s\" の作成に失敗しました"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family はサポートされていません"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "\"%s\" ファイルの書き込み中にエラーが発生しました"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "メモリ配置に失敗しました"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Java コンパイラが見つかりません。 gcj をインストールするか、または $JAVAC "
-#~ "を設定してみてください"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "ホスト名にアドレスが割り当てられていません"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Java 仮想マシンが見つかりません。 gij をインストールするか、または $JAVA "
-#~ "を設定してみてください"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "名前またはサービスが不明です"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s サブプロセス I/O エラー"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "ai_socktype に対して Servname がサポートされていません"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "%s のパーミッションを変更できません"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype はサポートされていません"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "ディレクトリ %s を作成できません"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "システムエラー"
 
-#~ msgid "memory exhausted"
-#~ msgstr "メモリを使い果たしました"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "引数バッファが小さすぎます"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "現在の作業ディレクトリを記録することができません"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "要求された処理は実行中です"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "初期作業ディレクトリに戻るのに失敗しました"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "要求がキャンセルされました"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "/dev/zeroを読込み用に開けません"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "要求がキャンセルされませんでした"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "読み込みスレッドの作成に失敗しました"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "すべての要求が完了しました"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "%s 子プロセスへ非ブロック I/O を設定できません"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "シグナル割り込みが発生しました"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "%s 子プロセスとの通信に失敗しました"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "パラメーター文字列が正しくエンコードされていません"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "%s 子プロセスへの書き込みに失敗しました"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "不明なエラー"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "%s 子プロセスからの読み込みに失敗しました"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: オプション '%s' は曖昧です:次のものが可能です:"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "子プロセス %s が終了コード %d で終了しました"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: オプション '--%s' は引数を取ることができません\n"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "スレッドの作成に失敗しました"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: オプション '%c%s' は引数を取ることができません\n"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "%s 子プロセスが終了コード %d で終了しました"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: オプション '--%s' は引数が必要です\n"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "Franc,ois Pinard"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: オプション '--%s' を認識できません\n"
 
-#~ msgid "`"
-#~ msgstr "`"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: オプション '%c%s' を認識できません\n"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: 無効なオプション -- '%c'\n"
 
-#~ msgid "Success"
-#~ msgstr "成功です"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: オプションには引数が必要です -- '%c'\n"
 
-#~ msgid "No match"
-#~ msgstr "一致しません"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: オプション '-W %s' は曖昧です\n"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "無効な正規表現です"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: オプション '-W %s' は引数を取ることができません\n"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "無効な照合文字です"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: オプション '-W %s' は引数が必要です\n"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "無効な文字クラス名です"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "compile_java_class への source_version 引数が無効です"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "終端のバックスラッシュ"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "compile_java_class への target_version 引数が無効です"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "無効な前方参照です"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "\"%s\" の作成に失敗しました"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "[ または [^ が不一致です"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "\"%s\" ファイルの書き込み中にエラーが発生しました"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "( または \\( が不一致です"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Java コンパイラが見つかりません。 gcj をインストールするか、または $JAVAC を設定してみてください"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "\\{ が不一致です"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Java 仮想マシンが見つかりません。 gij をインストールするか、または $JAVA を設定してみてください"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "\\{\\} の中身が無効です"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s サブプロセス I/O エラー"
 
-#~ msgid "Invalid range end"
-#~ msgstr "無効な範囲終了です"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "%s のパーミッションを変更できません"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "メモリを使い果たしました"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "ディレクトリ %s を作成できません"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "無効な前方正規表現です"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "メモリを使い果たしました"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "正規表現が途中で終了しました"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "現在の作業ディレクトリを記録することができません"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "正規表現が大きすぎます"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "初期作業ディレクトリに戻るのに失敗しました"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr ") または \\) が不一致です"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "/dev/zeroを読込み用に開けません"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "以前に正規表現がありません"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "読み込みスレッドの作成に失敗しました"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yY]"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "%s 子プロセスへ非ブロック I/O を設定できません"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "%s 子プロセスとの通信に失敗しました"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "%s のパーミッションを設定します"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "%s 子プロセスへの書き込みに失敗しました"
 
-#~ msgid "Hangup"
-#~ msgstr "Hangup"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "%s 子プロセスからの読み込みに失敗しました"
 
-#~ msgid "Interrupt"
-#~ msgstr "割り込み"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "子プロセス %s が終了コード %d で終了しました"
 
-#~ msgid "Quit"
-#~ msgstr "終了"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "スレッドの作成に失敗しました"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Illegal instruction"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s 子プロセスが終了コード %d で終了しました"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "Franc,ois Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "成功です"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "一致しません"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "無効な正規表現です"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "無効な照合文字です"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "無効な文字クラス名です"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "終端のバックスラッシュ"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "無効な前方参照です"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "[ または [^ が不一致です"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "( または \\( が不一致です"
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "\\{ が不一致です"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} の中身が無効です"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "無効な範囲終了です"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "メモリを使い果たしました"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "無効な前方正規表現です"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "正規表現が途中で終了しました"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "正規表現が大きすぎます"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr ") または \\) が不一致です"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "以前に正規表現がありません"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "%s のパーミッションを設定します"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Trace/breakpoint trap"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Hangup"
 
-#~ msgid "Aborted"
-#~ msgstr "中止"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "割り込み"
 
-#~ msgid "Floating point exception"
-#~ msgstr "浮動小数点例外"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "終了"
 
-#~ msgid "Killed"
-#~ msgstr "強制終了"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Illegal instruction"
 
-#~ msgid "Bus error"
-#~ msgstr "バスエラー"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Trace/breakpoint trap"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Segmentation fault"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "中止"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Broken pipe"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "浮動小数点例外"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Alarm clock"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "強制終了"
 
-#~ msgid "Terminated"
-#~ msgstr "Terminated"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "バスエラー"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "緊急 I/O 状態"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Segmentation fault"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "停止 (シグナル)"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Broken pipe"
 
-#~ msgid "Stopped"
-#~ msgstr "停止"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Alarm clock"
 
-#~ msgid "Continued"
-#~ msgstr "継続"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Terminated"
 
-#~ msgid "Child exited"
-#~ msgstr "子プロセス終了"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "緊急 I/O 状態"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "停止 (tty 入力)"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "停止 (シグナル)"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "停止 (tty 出力)"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "停止"
 
-#~ msgid "I/O possible"
-#~ msgstr "I/O 可能"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "継続"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "CPU時間制限を超過しました"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "子プロセス終了"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "ファイルサイズ制限を超過しました"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "停止 (tty 入力)"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "仮想タイマーが終了しました"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "停止 (tty 出力)"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "プロファイリングタイマーが終了しました"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "I/O 可能"
 
-#~ msgid "Window changed"
-#~ msgstr "Window が変更されました"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "CPU時間制限を超過しました"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "ユーザー定義シグナル1"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "ファイルサイズ制限を超過しました"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "ユーザー定義シグナル2"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "仮想タイマーが終了しました"
 
-#~ msgid "EMT trap"
-#~ msgstr "EMT トラップ"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "プロファイリングタイマーが終了しました"
 
-#~ msgid "Bad system call"
-#~ msgstr "間違ったシステムコール"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Window が変更されました"
 
-#~ msgid "Stack fault"
-#~ msgstr "スタックエラー"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "ユーザー定義シグナル1"
 
-#~ msgid "Information request"
-#~ msgstr "情報要求"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "ユーザー定義シグナル2"
 
-#~ msgid "Power failure"
-#~ msgstr "電源エラー"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "EMT トラップ"
 
-#~ msgid "Resource lost"
-#~ msgstr "リソースが無くなりました"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "間違ったシステムコール"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "閉じたパイプまたはソケットへの書き込みでエラーが発生しました"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "スタックエラー"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "パイプを作成できません"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "情報要求"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "リアルタイムシグナル %d"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "電源エラー"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "不明なシグナル %d"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "リソースが無くなりました"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv 関数が使えません"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "閉じたパイプまたはソケットへの書き込みでエラーが発生しました"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv 関数が有効ではありません"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "パイプを作成できません"
 
-#~ msgid "character out of range"
-#~ msgstr "範囲外の文字"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "リアルタイムシグナル %d"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "U+%04X をローカル文字セットに変換できません"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "不明なシグナル %d"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "U+%04X をローカル文字セットに変換できません: %s "
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "iconv 関数が使えません"
 
-#~ msgid "invalid user"
-#~ msgstr "無効なユーザ"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "iconv 関数が有効ではありません"
 
-#~ msgid "invalid group"
-#~ msgstr "無効なグループ"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "範囲外の文字"
 
-#~ msgid "invalid spec"
-#~ msgstr "無効な指定"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "U+%04X をローカル文字セットに変換できません"
 
-#~ msgid "unable to display error message"
-#~ msgstr "エラーメッセージを表示できません"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "U+%04X をローカル文字セットに変換できません: %s "
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "パッケージ作成者: %s (%s)\n"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "無効なユーザ"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "パッケージ作成者: %s\n"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "無効なグループ"
 
-#~ msgid "(C)"
-#~ msgstr "(C)"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "無効な指定"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "ライセンス GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/"
-#~ "gpl.html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "エラーメッセージを表示できません"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "作者 %s。\n"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "パッケージ作成者: %s (%s)\n"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "作者 %s および %s。\n"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "パッケージ作成者: %s\n"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "作者 %s、 %s、および %s。\n"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "(C)"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "作者 %s、 %s、 %s、\n"
-#~ "および %s。\n"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"ライセンス GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "作者 %s。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "作者 %s、 %s、 %s、\n"
-#~ "%s、および %s。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "作者 %s および %s。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "作者 %s、 %s、 %s、\n"
-#~ "%s、 %s、および %s。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "作者 %s、 %s、および %s。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "作者 %s、 %s、 %s、\n"
-#~ "%s、 %s、 %s、および %s。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"作者 %s、 %s、 %s、\n"
+"および %s。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "作者 %s、 %s、 %s、\n"
-#~ "%s、 %s、 %s、 %s、\n"
-#~ "および %s。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"作者 %s、 %s、 %s、\n"
+"%s、および %s。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "作者 %s、 %s、 %s、\n"
-#~ "%s、 %s、 %s、 %s、\n"
-#~ "%s、および %s。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"作者 %s、 %s、 %s、\n"
+"%s、 %s、および %s。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "作者 %s、 %s、 %s、\n"
-#~ "%s、 %s、 %s、 %s、\n"
-#~ "%s、 %s、 および他の方々。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"作者 %s、 %s、 %s、\n"
+"%s、 %s、 %s、および %s。\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "バグを発見したら <%s> に報告して下さい。\n"
-#~ "翻訳に関するバグは<translation-team-ja@lists.sourceforge.net>に報告してく"
-#~ "ださい。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"作者 %s、 %s、 %s、\n"
+"%s、 %s、 %s、 %s、\n"
+"および %s。\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"作者 %s、 %s、 %s、\n"
+"%s、 %s、 %s、 %s、\n"
+"%s、および %s。\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"作者 %s、 %s、 %s、\n"
+"%s、 %s、 %s、 %s、\n"
+"%s、 %s、 および他の方々。\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"バグを発見したら <%s> に報告して下さい。\n"
+"翻訳に関するバグは<translation-team-ja@lists.sourceforge.net>に報告してください。\n"
 
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "%s のバグは <%s> に報告してください。\n"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "%s のバグは <%s> に報告してください。\n"
 
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "%s のホームページ: <%s>\n"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s のホームページ: <%s>\n"
 
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "%s のホームページ: <http://www.gnu.org/software/%s/>\n"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s のホームページ: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "GNU ソフトウェアを使用する際の一般的なヘルプ: <http://www.gnu.org/gethelp/"
-#~ ">\n"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "GNU ソフトウェアを使用する際の一般的なヘルプ: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle に失敗しました"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle に失敗しました"
 
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "ファイル記述子 (fd) %d をリストアできません: dup2 に失敗しました"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ファイル記述子 (fd) %d をリストアできません: dup2 に失敗しました"
 
-#~ msgid "%s subprocess"
-#~ msgstr "%s 子プロセス"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "%s 子プロセス"
 
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s 子プロセスが致命的なシグナル %d を受信しました"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s 子プロセスが致命的なシグナル %d を受信しました"
 
-#~ msgid "stdin"
-#~ msgstr "標準入力"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "標準入力"
 
-#~ msgid "stdout"
-#~ msgstr "標準出力"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "標準出力"
 
-#~ msgid "stderr"
-#~ msgstr "標準エラー出力"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "標準エラー出力"
 
-#~ msgid "unknown stream"
-#~ msgstr "不明なストリーム"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "不明なストリーム"
 
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "%s をモード %s で再度開くことに失敗しました"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "%s をモード %s で再度開くことに失敗しました"
 
-#~ msgid "string comparison failed"
-#~ msgstr "文字列の比較に失敗しました"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "文字列の比較に失敗しました"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "問題を回避するために LC_ALL='C' を指定してください."
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "問題を回避するために LC_ALL='C' を指定してください."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "比較した文字列は %s と %s です."
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "比較した文字列は %s と %s です."
 
-#~ msgid "cannot perform formatted output"
-#~ msgstr "書式設定を行った出力を実行することができません"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "書式設定を行った出力を実行することができません"
 
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "引数 `%3$s' に対して %1$s%2$s が無効です"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "引数 `%3$s' に対して %1$s%2$s が無効です"
 
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "引数 `%3$s' に対して無効な接尾辞 %1$s%2$s です"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "引数 `%3$s' に対する %1$s%2$s が大きすぎます"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "引数 `%3$s' に対する %1$s%2$s が大きすぎます"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: 不正なオプション -- %c\n"
@@ -798,8 +1101,7 @@ msgstr "%s: オプション '-W %s' は引数が必要です\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
+#~ "This is free software.  You may redistribute copies of it under the terms of\n"
 #~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
 #~ "There is NO WARRANTY, to the extent permitted by law.\n"
 #~ "\n"
diff --git a/gnulib/po/ko.po b/gnulib/po/ko.po
index df0515ad..e219e4fd 100644
--- a/gnulib/po/ko.po
+++ b/gnulib/po/ko.po
@@ -7,424 +7,464 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU textutils 2.0.22\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2002-07-22 20:02+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "%2$s�� ���� �������� ���� %1$s"
 
-#: gnulib/argp-help.c:226
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "%2$s�� ���� �ָ��� ���� %1$s"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "�ùٸ� ���ڴ�:"
 
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
-
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
 msgstr "�� �ɼǿ��� �� �ʿ��� �μ��� ª�� �ɼǿ��� �� �ʿ��մϴ�.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "����: %s [<�ɼ�>] [<����>]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "�� ���� ������ ������ `%s --help' �Ͻʽÿ�.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "<%s>(��)�� ���׸� �˷� �ֽʽÿ�.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "�� �� ���� �ý��� ����"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "NAME"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:147
 #, fuzzy
-msgid "print program version"
+msgid "Print program version"
 msgstr "���α׷� ����"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "�μ��� �ʹ� ����"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+#: lib/c-stack.c:244
+msgid "program error"
+msgstr "���α׷� ����"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: `%s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
+#: lib/c-stack.c:245
+msgid "stack overflow"
+msgstr "���� �����÷ο�"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "���� ����"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "`%s'�� `%s'�� �̵��� �� �����ϴ�"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: `%s' �ɼ��� �μ��� �ʿ��մϴ�\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "`%s'�� `%s'�� �̵��� �� �����ϴ�"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: �ν��� �� ���� �ɼ� `--%s'\n"
+msgid "error reading \"%s\""
+msgstr "%s��(��) �д� ���� ���� �߻�"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: �ν��� �� ���� �ɼ� `%c%s'\n"
+msgid "error writing \"%s\""
+msgstr "%s�� ���� ���� ���� �߻�"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: �������� �ɼ� -- %c\n"
+msgid "error after reading \"%s\""
+msgstr "%s��(��) �д� ���� ���� �߻�"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: �� �ɼ��� �μ��� �ʿ��մϴ� -- %c\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "���� ���� ����"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: `-W %s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
+msgid "%s subprocess failed"
+msgstr "%s: �������� ����"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "�Ϲ� �� ����"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' �ɼ��� �μ��� �ʿ��մϴ�\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "�Ϲ� ����"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "%2$s�� ���� �������� ���� %1$s"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "���丮"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "%2$s�� ���� �ָ��� ���� %1$s"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "���� Ư�� ����"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "�ùٸ� ���ڴ�:"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "���� Ư�� ����"
 
-#~ msgid "program error"
-#~ msgstr "���α׷� ����"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "FIFO"
 
-#~ msgid "stack overflow"
-#~ msgstr "���� �����÷ο�"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "�ɺ��� ��ũ"
 
-#~ msgid "write error"
-#~ msgstr "���� ����"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "����"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "`%s'�� `%s'�� �̵��� �� �����ϴ�"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "�޼��� ť"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "`%s'�� `%s'�� �̵��� �� �����ϴ�"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "��������"
 
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "%s��(��) �д� ���� ���� �߻�"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "���� �޸� ������Ʈ"
 
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "%s�� ���� ���� ���� �߻�"
+msgid "typed memory object"
+msgstr "���� �޸� ������Ʈ"
 
-#, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "%s��(��) �д� ���� ���� �߻�"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "������ ����"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "���� ���� ����"
+msgid "Address family for hostname not supported"
+msgstr "fifo������ �������� �ʽ��ϴ�"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: �������� ����"
+msgid "ai_family not supported"
+msgstr "fifo������ �������� �ʽ��ϴ�"
 
-#~ msgid "regular empty file"
-#~ msgstr "�Ϲ� �� ����"
-
-#~ msgid "regular file"
-#~ msgstr "�Ϲ� ����"
-
-#~ msgid "directory"
-#~ msgstr "���丮"
-
-#~ msgid "block special file"
-#~ msgstr "���� Ư�� ����"
-
-#~ msgid "character special file"
-#~ msgstr "���� Ư�� ����"
-
-#~ msgid "fifo"
-#~ msgstr "FIFO"
+#: lib/gai_strerror.c:54
+#, fuzzy
+msgid "ai_socktype not supported"
+msgstr "fifo������ �������� �ʽ��ϴ�"
 
-#~ msgid "symbolic link"
-#~ msgstr "�ɺ��� ��ũ"
+#: lib/gai_strerror.c:55
+#, fuzzy
+msgid "System error"
+msgstr "���� ����"
 
-#~ msgid "socket"
-#~ msgstr "����"
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "�� �� ���� �ý��� ����"
 
-#~ msgid "message queue"
-#~ msgstr "�޼��� ť"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
 
-#~ msgid "semaphore"
-#~ msgstr "��������"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "���� �޸� ������Ʈ"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: `%c%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "���� �޸� ������Ʈ"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' �ɼ��� �μ��� �ʿ��մϴ�\n"
 
-#~ msgid "weird file"
-#~ msgstr "������ ����"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: �ν��� �� ���� �ɼ� `--%s'\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "fifo������ �������� �ʽ��ϴ�"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: �ν��� �� ���� �ɼ� `%c%s'\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "fifo������ �������� �ʽ��ϴ�"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: �߸��� �ɼ� -- %c\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "fifo������ �������� �ʽ��ϴ�"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: �������� �ɼ� -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "���� ����"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: �� �ɼ��� �μ��� �ʿ��մϴ� -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "�� �� ���� �ý��� ����"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: �߸��� �ɼ� -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
 
-#~ msgid "block size"
-#~ msgstr "���� ũ��"
+#: lib/human.c:486
+msgid "block size"
+msgstr "���� ũ��"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s��(��) ���������� ���丮�� �ƴմϴ�"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s��(��) ���������� ���丮�� �ƴմϴ�"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "%s�� ������ �׸���/Ȥ�� �׷��� �ٲ� �� �����ϴ�"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "%s�� ������ �׸���/Ȥ�� �׷��� �ٲ� �� �����ϴ�"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "%s ���丮�� ���� �� �����ϴ�"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "%s ���丮�� ���� �� �����ϴ�"
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "%s ���丮�� chdir�� �� �����ϴ�"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "%s ���丮�� chdir�� �� �����ϴ�"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "%s�� �㰡�� �ٲ� �� �����ϴ�"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "%s�� �㰡�� �ٲ� �� �����ϴ�"
 
-#~ msgid "memory exhausted"
-#~ msgstr "�޸𸮰� �ٴڳ�"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "�޸𸮰� �ٴڳ�"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "%s ���丮�� ���� �� �����ϴ�"
+msgid "unable to record current working directory"
+msgstr "%s ���丮�� ���� �� �����ϴ�"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "%s�� �㰡�� �ٲ� �� �����ϴ�"
+msgid "Failed to open /dev/zero for read"
+msgstr "%s�� �㰡�� �ٲ� �� �����ϴ�"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "%s ���丮�� ���� �� �����ϴ�"
-
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "'"
-#~ msgstr "'"
-
+msgid "cannot create pipe"
+msgstr "%s ���丮�� ���� �� �����ϴ�"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: �������� ���Խ�: %s"
+msgid "Invalid regular expression"
+msgstr "%s: �������� ���Խ�: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "�������� ���� Ŭ���� `%s'"
+msgid "Invalid character class name"
+msgstr "�������� ���� Ŭ���� `%s'"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "�޸𸮰� �ٴڳ�"
+msgid "Memory exhausted"
+msgstr "�޸𸮰� �ٴڳ�"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: �������� ���Խ�: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: �������� ���Խ�: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "���Խ� Ž���� ���� �߻�"
+msgid "Premature end of regular expression"
+msgstr "���Խ� Ž���� ���� �߻�"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: �������� ���Խ�: %s"
+msgid "Regular expression too big"
+msgstr "%s: �������� ���Խ�: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "���Խ� Ž���� ���� �߻�"
+msgid "No previous regular expression"
+msgstr "���Խ� Ž���� ���� �߻�"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yY]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[yY]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv �Լ��� ����� �� �����ϴ�"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "iconv �Լ��� ����� �� �����ϴ�"
 
 # not usable�� not available�� ���̴�?
-#~ msgid "iconv function not available"
-#~ msgstr "iconv �Լ��� ����� �� �����ϴ�"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "iconv �Լ��� ����� �� �����ϴ�"
 
-#~ msgid "character out of range"
-#~ msgstr "������ ��� ����"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "������ ��� ����"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "U+%04X��(��) ��Į ���ڼ����� ��ȯ�� �� �����ϴ�"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "U+%04X��(��) ��Į ���ڼ����� ��ȯ�� �� �����ϴ�"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "U+%04X��(��) ��Į ���ڼ����� ��ȯ�� �� �����ϴ�: %s"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "U+%04X��(��) ��Į ���ڼ����� ��ȯ�� �� �����ϴ�: %s"
 
-#~ msgid "invalid user"
-#~ msgstr "�߸��� �����"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "�߸��� �����"
 
-#~ msgid "invalid group"
-#~ msgstr "�߸��� �׷�"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "�߸��� �׷�"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "UID�� �α��� �׷��� �˾� �� �� �����ϴ�"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "UID�� �α��� �׷��� �˾� �� �� �����ϴ�"
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "�� ���α׷��� ���� ����Ʈ�����Դϴ�. ����Ʈ������ �Ǿ絵�ڴ� ���� \n"
-#~ "����Ʈ���� ����� ��ǥ�� GNU General Public License 2�� (�Ǵ� �� ���� \n"
-#~ "���� ���Ƿ� �����ؼ�), �� ������ ���� ���α׷��� �����ϰų� ������� \n"
-#~ "�� �ֽ��ϴ�.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "%s��(��) ��������ϴ�.\n"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"�� ���α׷��� ���� ����Ʈ�����Դϴ�. ����Ʈ������ �Ǿ絵�ڴ� ���� \n"
+"����Ʈ���� ����� ��ǥ�� GNU General Public License 2�� (�Ǵ� �� ���� \n"
+"���� ���Ƿ� �����ؼ�), �� ������ ���� ���α׷��� �����ϰų� ������� \n"
+"�� �ֽ��ϴ�.\n"
+"\n"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "%s��(��) ��������ϴ�.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "%s��(��) ��������ϴ�.\n"
 
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "%s��(��) ��������ϴ�.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "%s��(��) ��������ϴ�.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "%s��(��) ��������ϴ�.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "%s��(��) ��������ϴ�.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "%s��(��) ��������ϴ�.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "%s��(��) ��������ϴ�.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "%s��(��) ��������ϴ�.\n"
 
-#~ msgid "string comparison failed"
-#~ msgstr "���ڿ� �񱳰� �����߽��ϴ�"
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "���ڿ� �񱳰� �����߽��ϴ�"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "�� ������ ���� ������ LC_ALL='C'�Ͻʽÿ�."
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "�� ������ ���� ������ LC_ALL='C'�Ͻʽÿ�."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "���� ���ڿ��� %s��(��) %s�Դϴ�."
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "���� ���ڿ��� %s��(��) %s�Դϴ�."
diff --git a/gnulib/po/ms.po b/gnulib/po/ms.po
index 5a466f45..5e65cc06 100644
--- a/gnulib/po/ms.po
+++ b/gnulib/po/ms.po
@@ -6,41 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  coreutils 5.0.90\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2003-08-10 16:00+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
-"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "hujah tidak sah %s bagi %s"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "hujah ambiguous %s bagi %s"
 
-#: gnulib/argp-help.c:247
+#: lib/argmatch.c:157
 #, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Hujah sah adalah:"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -49,361 +38,413 @@ msgstr ""
 "Hujah mandatori kepada opsyen panjang andalah mandatori bagi opsyen pendek "
 "juga.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Pengunaan: %s [OPSYEN]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Cuba `%s --help' untuk maklumat lanjut .\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "Lapor pepijat ke <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Ralat sistem yang tidak diketahui"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "NAMA"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
+#: lib/argp-parse.c:619
+#, fuzzy, c-format
+msgid "%s: Too many arguments\n"
+msgstr "terlalu banyak hujah"
 
-#: gnulib/argp-parse.c:142
+#: lib/c-stack.c:244
 #, fuzzy
-msgid "print program version"
+msgid "program error"
 msgstr "ralat membaca"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "ralat menulis"
 
-#: gnulib/argp-parse.c:612
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: Too many arguments\n"
-msgstr "terlalu banyak hujah"
-
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+msgid "error while opening \"%s\" for reading"
+msgstr "tak dapat buka %s untuk dibaca"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opsyen `%s' adalah ambiguous\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "tak dapat buka %s untuk dibaca"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opsyen `--%s' tidak mengizinkan hujah\n"
+msgid "error reading \"%s\""
+msgstr "membaca %s"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opsyen `%c%s' tidak mengizinkan hujah\n"
+msgid "error writing \"%s\""
+msgstr "menulis %s"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opsyen  `%s' memerlukan hujah\n"
+msgid "error after reading \"%s\""
+msgstr "membaca %s"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: opensyen tidak dikenali `--%s'\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "pembukaan gagal"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: opensyen tidak dikenali `%c%s'\n"
+msgid "%s subprocess failed"
+msgstr "fail istimewa blok"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: opsyen tidak sah -- %c\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "fail kosong biasa"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opsyen memerlukan hujah -- %c\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "fail biasa"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opsyen `-W %s' adalah ambiguous\n"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "direktori"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opsyen `-W %s' tidak mengizinkan hujan\n"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "fail istimewa blok"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opsyen  `%s' memerlukan hujah\n"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "fail istimewa aksara"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "hujah tidak sah %s bagi %s"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "hujah ambiguous %s bagi %s"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "pautan simbolik"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Hujah sah adalah:"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "soket"
 
-#~ msgid "write error"
-#~ msgstr "ralat menulis"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "giliran mesej"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "tak dapat buka %s untuk dibaca"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "objek memori terkongsi"
 
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "tak dapat buka %s untuk dibaca"
+msgid "typed memory object"
+msgstr "objek memori terkongsi"
 
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "membaca %s"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "fail pelik"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "menulis %s"
+msgid "Address family for hostname not supported"
+msgstr "fail fifo tidak disokong"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "membaca %s"
+msgid "ai_family not supported"
+msgstr "fail fifo tidak disokong"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "pembukaan gagal"
+msgid "ai_socktype not supported"
+msgstr "fail fifo tidak disokong"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "fail istimewa blok"
-
-#~ msgid "regular empty file"
-#~ msgstr "fail kosong biasa"
-
-#~ msgid "regular file"
-#~ msgstr "fail biasa"
-
-#~ msgid "directory"
-#~ msgstr "direktori"
-
-#~ msgid "block special file"
-#~ msgstr "fail istimewa blok"
+msgid "System error"
+msgstr "ralat menulis"
 
-#~ msgid "character special file"
-#~ msgstr "fail istimewa aksara"
-
-#~ msgid "fifo"
-#~ msgstr "fifo"
-
-#~ msgid "symbolic link"
-#~ msgstr "pautan simbolik"
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "Ralat sistem yang tidak diketahui"
 
-#~ msgid "socket"
-#~ msgstr "soket"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opsyen `%s' adalah ambiguous\n"
 
-#~ msgid "message queue"
-#~ msgstr "giliran mesej"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opsyen `--%s' tidak mengizinkan hujah\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "objek memori terkongsi"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opsyen `%c%s' tidak mengizinkan hujah\n"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "objek memori terkongsi"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opsyen  `%s' memerlukan hujah\n"
 
-#~ msgid "weird file"
-#~ msgstr "fail pelik"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opensyen tidak dikenali `--%s'\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "fail fifo tidak disokong"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opensyen tidak dikenali `%c%s'\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "fail fifo tidak disokong"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opsyen tidak dibenarkan -- %c\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "fail fifo tidak disokong"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opsyen tidak sah -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "ralat menulis"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opsyen memerlukan hujah -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Ralat sistem yang tidak diketahui"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opsyen `-W %s' adalah ambiguous\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opsyen tidak dibenarkan -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opsyen `-W %s' tidak mengizinkan hujan\n"
 
-#~ msgid "block size"
-#~ msgstr "saiz blok"
+#: lib/human.c:486
+msgid "block size"
+msgstr "saiz blok"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s wujud tapi ianya bukan direktori"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s wujud tapi ianya bukan direktori"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "tak dapat menukar hakmilik dan/atau kumpulan %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "tak dapat menukar hakmilik dan/atau kumpulan %s"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "tak dapat mencipta direktori %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "tak dapat mencipta direktori %s"
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "tak dapat chdir ke direktori %s"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "tak dapat chdir ke direktori %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "tak dapat menukar keizinan %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "tak dapat menukar keizinan %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "memori keletihan"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "memori keletihan"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "gagal untuk kembali ke direktori kerja pemulaan"
+msgid "unable to record current working directory"
+msgstr "gagal untuk kembali ke direktori kerja pemulaan"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "gagal untuk kembali ke direktori kerja pemulaan"
+#: lib/openat-die.c:49
+msgid "failed to return to initial working directory"
+msgstr "gagal untuk kembali ke direktori kerja pemulaan"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "gagal mengekalkan  keizinan bagi %s"
+msgid "Failed to open /dev/zero for read"
+msgstr "gagal mengekalkan  keizinan bagi %s"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "tak boleh mencipta pautan %s"
-
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "'"
-#~ msgstr "`"
-
+msgid "cannot create pipe"
+msgstr "tak boleh mencipta pautan %s"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "`"
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: ungkapan biasa (regexp) tidak sah: %s"
+msgid "Invalid regular expression"
+msgstr "%s: ungkapan biasa (regexp) tidak sah: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "aksara tidak sah pada %s pada rentetan mod %s"
+msgid "Invalid character class name"
+msgstr "aksara tidak sah pada %s pada rentetan mod %s"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "memori keletihan"
+msgid "Memory exhausted"
+msgstr "memori keletihan"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: ungkapan biasa (regexp) tidak sah: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: ungkapan biasa (regexp) tidak sah: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "ralat pada carian ungkapan biasa (regexp)"
+msgid "Premature end of regular expression"
+msgstr "ralat pada carian ungkapan biasa (regexp)"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: ungkapan biasa (regexp) tidak sah: %s"
+msgid "Regular expression too big"
+msgstr "%s: ungkapan biasa (regexp) tidak sah: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "ralat pada carian ungkapan biasa (regexp)"
-
-#~ msgid "^[yY]"
-#~ msgstr "^[yY]"
+msgid "No previous regular expression"
+msgstr "ralat pada carian ungkapan biasa (regexp)"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[tT]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[yY]"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "fungsi iconv tak boleh digunakan"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[tT]"
 
-#~ msgid "iconv function not available"
-#~ msgstr "fungsi iconv tidak ada"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "fungsi iconv tak boleh digunakan"
 
-#~ msgid "character out of range"
-#~ msgstr "aksara di luar julat"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "fungsi iconv tidak ada"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "tak dapat menukar U+%04X ke set aksara lokal"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "aksara di luar julat"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "tak dapat menukar U+%04X ke set aksara lokal: %s"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "tak dapat menukar U+%04X ke set aksara lokal"
 
-#~ msgid "invalid user"
-#~ msgstr "pengguna tidak sah"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "tak dapat menukar U+%04X ke set aksara lokal: %s"
 
-#~ msgid "invalid group"
-#~ msgstr "kumpulan tidak sah"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "pengguna tidak sah"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "tak boleh mendapatkan kumpulan logmasuk untuk UID numerik"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "kumpulan tidak sah"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Ditulis oleh %s.\n"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "tak boleh mendapatkan kumpulan logmasuk untuk UID numerik"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Ditulis oleh %s.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Ditulis oleh %s.\n"
 
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Ditulis oleh %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Ditulis oleh %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "Ditulis oleh %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Ditulis oleh %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "Ditulis oleh %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Ditulis oleh %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Ditulis oleh %s.\n"
 
-#~ msgid "string comparison failed"
-#~ msgstr "perbandingan rentetan gagal"
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "perbandingan rentetan gagal"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Tetapkan LC_ALL='C' untuk mengatasi masalah."
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Tetapkan LC_ALL='C' untuk mengatasi masalah."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Rentetan dibandingkan adalah %s dan %s."
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Rentetan dibandingkan adalah %s dan %s."
diff --git a/gnulib/po/nb.po b/gnulib/po/nb.po
index 68b1a090..981388d9 100644
--- a/gnulib/po/nb.po
+++ b/gnulib/po/nb.po
@@ -6,41 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU textutils 2.0.20\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2002-01-27 21:35+0100\n"
 "Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
-"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "ugyldig argument %s for %s"
 
-#: gnulib/argp-help.c:226
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "flertydig argument %s for %s"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Gyldige argument er:"
 
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
-
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -48,362 +37,400 @@ msgid ""
 msgstr ""
 "Obligatoriske argmenter til lange flagg er obligatoriske ogs� for korte.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Bruk: %s [FLAGG] [FIL]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Pr�v med �%s --help� for mer informasjon.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "Rapport�r feil til <bug-textutils@gnu.org>."
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "NAME"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:147
 #, fuzzy
-msgid "print program version"
+msgid "Print program version"
 msgstr "lesefeil"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "for mange argumenter"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
-
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flagget �%s� er flertydig\n"
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flagget �--%s� trenger et argument\n"
-
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flagget �%c%s� trenger et argument\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flagget �%s� trenger et argument\n"
-
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: ukjent flagg �--%s�\n"
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "lesefeil"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: ukjent flagg �%c%s�\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "feil ved skriving"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ukjent flagg -- %c\n"
+msgid "error reading \"%s\""
+msgstr "feil ved lesing av %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flagget trenger et argument -- %c\n"
+msgid "error writing \"%s\""
+msgstr "feil ved skriving til %s"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flagget �-W %s� er flertydig\n"
+msgid "error after reading \"%s\""
+msgstr "feil ved lesing av %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flagget �-W %s� tillater ikke et argument\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "�pning av fil feilet"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flagget �%s� trenger et argument\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "ugyldig argument %s for %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "flertydig argument %s for %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Gyldige argument er:"
+msgid "%s subprocess failed"
+msgstr "%s: ugyldig m�nster"
 
+#: lib/file-type.c:43
 #, fuzzy
-#~ msgid "program error"
-#~ msgstr "lesefeil"
-
-#~ msgid "write error"
-#~ msgstr "feil ved skriving"
+msgid "regular empty file"
+msgstr "feil ved lesing"
 
+#: lib/file-type.c:43
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "feil ved lesing av %s"
+msgid "regular file"
+msgstr "feil ved lesing"
 
+#: lib/file-type.c:46
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "feil ved skriving til %s"
+msgid "directory"
+msgstr "%s eksisterer men er ikke en katalog"
 
+#: lib/file-type.c:49
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "feil ved lesing av %s"
+msgid "block special file"
+msgstr "blokkst�rrelse"
 
+#: lib/file-type.c:52
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "�pning av fil feilet"
+msgid "character special file"
+msgstr "tegn-posisjon er null"
 
+#: lib/file-type.c:58
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: ugyldig m�nster"
+msgid "symbolic link"
+msgstr "kan ikke utf�re ioctl p� �%s�"
 
+#: lib/file-type.c:75
 #, fuzzy
-#~ msgid "regular empty file"
-#~ msgstr "feil ved lesing"
+msgid "weird file"
+msgstr "feil ved lesing"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "regular file"
-#~ msgstr "feil ved lesing"
+msgid "ai_family not supported"
+msgstr "blokkst�rrelse"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "directory"
-#~ msgstr "%s eksisterer men er ikke en katalog"
+msgid "ai_socktype not supported"
+msgstr "blokkst�rrelse"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "block special file"
-#~ msgstr "blokkst�rrelse"
+msgid "System error"
+msgstr "feil ved skriving"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "character special file"
-#~ msgstr "tegn-posisjon er null"
+msgid "Unknown error"
+msgstr "Ukjent systemfeil"
 
-#, fuzzy
-#~ msgid "symbolic link"
-#~ msgstr "kan ikke utf�re ioctl p� �%s�"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagget �%s� er flertydig\n"
 
-#, fuzzy
-#~ msgid "weird file"
-#~ msgstr "feil ved lesing"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: flagget �--%s� trenger et argument\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "blokkst�rrelse"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: flagget �%c%s� trenger et argument\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "blokkst�rrelse"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagget �%s� trenger et argument\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "feil ved skriving"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent flagg �--%s�\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Ukjent systemfeil"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent flagg �%c%s�\n"
+
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ukjent flagg -- %c\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ukjent flagg -- %c\n"
+
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagget trenger et argument -- %c\n"
+
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagget �-W %s� er flertydig\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ukjent flagg -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: flagget �-W %s� tillater ikke et argument\n"
 
-#~ msgid "block size"
-#~ msgstr "blokkst�rrelse"
+#: lib/human.c:486
+msgid "block size"
+msgstr "blokkst�rrelse"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s eksisterer men er ikke en katalog"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s eksisterer men er ikke en katalog"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "kan ikke endre eier og/eller gruppe for %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "kan ikke endre eier og/eller gruppe for %s"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "kan ikke opprette katalog %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "kan ikke opprette katalog %s"
 
-#, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "kan ikke skifte til katalog, %s"
+#: lib/mkdir-p.c:240
+#, fuzzy, c-format
+msgid "cannot chdir to directory %s"
+msgstr "kan ikke skifte til katalog, %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "kan ikke endre rettigheter til %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "kan ikke endre rettigheter til %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "virtuelt minne oppbrukt"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "virtuelt minne oppbrukt"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "kan ikke opprette katalog %s"
+msgid "unable to record current working directory"
+msgstr "kan ikke opprette katalog %s"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "kan ikke endre rettigheter til %s"
+msgid "Failed to open /dev/zero for read"
+msgstr "kan ikke endre rettigheter til %s"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "kan ikke opprette katalog %s"
+msgid "cannot create pipe"
+msgstr "kan ikke opprette katalog %s"
 
-#~ msgid "`"
-#~ msgstr "�"
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "�"
 
-#~ msgid "'"
-#~ msgstr "�"
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "�"
 
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: ugyldig regul�rt uttrykk: %s"
+msgid "Invalid regular expression"
+msgstr "%s: ugyldig regul�rt uttrykk: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "ugyldig tegn-klasse �%s�"
+msgid "Invalid character class name"
+msgstr "ugyldig tegn-klasse �%s�"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "virtuelt minne oppbrukt"
+msgid "Memory exhausted"
+msgstr "virtuelt minne oppbrukt"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: ugyldig regul�rt uttrykk: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: ugyldig regul�rt uttrykk: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "feil i s�k med regul�rt uttrykk"
+msgid "Premature end of regular expression"
+msgstr "feil i s�k med regul�rt uttrykk"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: ugyldig regul�rt uttrykk: %s"
+msgid "Regular expression too big"
+msgstr "%s: ugyldig regul�rt uttrykk: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "feil i s�k med regul�rt uttrykk"
+msgid "No previous regular expression"
+msgstr "feil i s�k med regul�rt uttrykk"
 
+#: lib/rpmatch.c:70
 #, fuzzy
-#~ msgid "^[yY]"
-#~ msgstr "^[jJ]"
+msgid "^[yY]"
+msgstr "^[jJ]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
+#: lib/unicodeio.c:147
 #, fuzzy
-#~ msgid "iconv function not usable"
-#~ msgstr "kan ikke skrive ut U+%04X: iconv-funksjonen er ikke brukbar"
+msgid "iconv function not usable"
+msgstr "kan ikke skrive ut U+%04X: iconv-funksjonen er ikke brukbar"
 
+#: lib/unicodeio.c:149
 #, fuzzy
-#~ msgid "iconv function not available"
-#~ msgstr "kan ikke skrive ut U+%04X: iconv-funksjon er ikke tilgjengelig"
+msgid "iconv function not available"
+msgstr "kan ikke skrive ut U+%04X: iconv-funksjon er ikke tilgjengelig"
 
+#: lib/unicodeio.c:156
 #, fuzzy
-#~ msgid "character out of range"
-#~ msgstr "U+%04X: tegn utenfor tillatte verdier"
+msgid "character out of range"
+msgstr "U+%04X: tegn utenfor tillatte verdier"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "kan ikke konvertere U+%04X til lokalt tegnsett"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "kan ikke konvertere U+%04X til lokalt tegnsett"
 
-#, fuzzy
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "kan ikke konvertere U+%04X til lokalt tegnsett"
+#: lib/unicodeio.c:221
+#, fuzzy, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "kan ikke konvertere U+%04X til lokalt tegnsett"
 
-#~ msgid "invalid user"
-#~ msgstr "ugyldig bruker"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "ugyldig bruker"
 
-#~ msgid "invalid group"
-#~ msgstr "ugyldig gruppe"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "ugyldig gruppe"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "kan ikke finne login-gruppen til en numerisk bruker-ID"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "kan ikke finne login-gruppen til en numerisk bruker-ID"
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Dette programmet er fri programvare.  Du kan redistribueret det og/eller\n"
-#~ "modifisere det under betingelsene gitt av GNU General Public License som\n"
-#~ "distribuert av Free Software Foundation; enten versjon 2, eller (om du "
-#~ "vil)\n"
-#~ "en hvilken som helst senere versjon.\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Skrevet av %s.\n"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"Dette programmet er fri programvare.  Du kan redistribueret det og/eller\n"
+"modifisere det under betingelsene gitt av GNU General Public License som\n"
+"distribuert av Free Software Foundation; enten versjon 2, eller (om du vil)\n"
+"en hvilken som helst senere versjon.\n"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Skrevet av %s.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skrevet av %s.\n"
 
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Skrevet av %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Skrevet av %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "Skrevet av %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Skrevet av %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "Skrevet av %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Skrevet av %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Skrevet av %s.\n"
 
-#~ msgid "string comparison failed"
-#~ msgstr "strengsammenligning feilet"
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "strengsammenligning feilet"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Sett LC_ALL='C' for � omg� problemet."
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Sett LC_ALL='C' for � omg� problemet."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Strengene som ble sammenlignet var �%s� og �%s�."
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Strengene som ble sammenlignet var �%s� og �%s�."
diff --git a/gnulib/po/nl.po b/gnulib/po/nl.po
index 252594c7..323af026 100644
--- a/gnulib/po/nl.po
+++ b/gnulib/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib-3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-08-22 20:37+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -22,761 +22,1070 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "ongeldig argument %s van %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "argument %s van %s is niet eenduidig"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Geldige argumenten zijn:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: waarde voor '%s' is kleiner of gelijk aan %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: Parameter in ARGP_HELP_FMT vereist een waarde"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: Parameter in ARGP_HELP_FMT moet positief zijn"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Onbekende parameter in ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Rommel in ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
 msgstr ""
 "Een argument dat verplicht of optioneel is voor een lange optie, is dat\n"
 "ook voor de overeenkomstige korte optie."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Gebruik: "
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "     of: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [OPTIE...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Typ '%s --help' of '%s --usage' voor meer informatie.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "Rapporteer gebreken in het programma aan %s;\n"
 "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "deze hulptekst tonen"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "een korte gebruikssamenvatting tonen"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NAAM"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "de programmanaam instellen"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SECONDEN"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "dit aantal seconden pauzeren (standaard 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "programmaversie tonen"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "**Interne programmafout**: geen versie bekend!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Te veel argumenten\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "**Interne programmafout**: optie had herkend moeten worden!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "programmafout"
+
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "stack-overloop"
+
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "kan geen tijdelijke map vinden; zet $TMPDIR"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: optie '--%s' staat geen argument toe\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "kan met sjabloon '%s' geen tijdelijke map aanmaken"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: optie '%c%s' staat geen argument toe\n"
+msgid "cannot remove temporary file %s"
+msgstr "kan tijdelijk bestand '%s' niet verwijderen"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: optie '--%s' vereist een argument\n"
+msgid "cannot remove temporary directory %s"
+msgstr "kan tijdelijke map '%s' niet verwijderen"
+
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "fout bij sluiten van bestand"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "schrijffout"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: onbekende optie '--%s'\n"
+msgid "preserving permissions for %s"
+msgstr "toegangsrechten van '%s' worden behouden"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: onbekende optie '%c%s'\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "fout bij openen van '%s' voor lezen"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ongeldige optie -- '%c'\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "kan reservebestand '%s' niet openen voor schrijven"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:82
 #, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: optie vereist een argument -- '%c'\n"
+msgid "error reading \"%s\""
+msgstr "fout bij lezen van '%s'"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: optie '-W %s' is niet eenduidig\n"
+msgid "error writing \"%s\""
+msgstr "fout bij schrijven van '%s'"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:96 lib/copy-file.c:135
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: optie '-W %s' staat geen argument toe\n"
+msgid "error after reading \"%s\""
+msgstr "fout na lezen van '%s'"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: optie '-W %s' vereist een argument\n"
+msgid "fdopen() failed"
+msgstr "fdopen() is mislukt"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "ongeldig argument %s van %s"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "C#-compiler is niet gevonden; installeer 'pnet'"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "argument %s van %s is niet eenduidig"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "virtuele C#-machine is niet gevonden; installeer 'pnet'"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Geldige argumenten zijn:"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "subproces %s is mislukt"
 
-#~ msgid "program error"
-#~ msgstr "programmafout"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "leeg normaal bestand"
 
-#~ msgid "stack overflow"
-#~ msgstr "stack-overloop"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "normaal bestand"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "kan geen tijdelijke map vinden; zet $TMPDIR"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "map"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "kan met sjabloon '%s' geen tijdelijke map aanmaken"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "blok-apparaat"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "kan tijdelijk bestand '%s' niet verwijderen"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "byte-apparaat"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "kan tijdelijke map '%s' niet verwijderen"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "error closing file"
-#~ msgstr "fout bij sluiten van bestand"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "symbolische koppeling"
 
-#~ msgid "write error"
-#~ msgstr "schrijffout"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "socket"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "toegangsrechten van '%s' worden behouden"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "berichtenwachtrij"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "fout bij openen van '%s' voor lezen"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafoor"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "kan reservebestand '%s' niet openen voor schrijven"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "gedeeld geheugenobject"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "fout bij lezen van '%s'"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "zelfstandig geheugenobject"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "fout bij schrijven van '%s'"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "merkwaardig bestand"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "fout na lezen van '%s'"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Adresfamilie voor hostnaam wordt niet ondersteund"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() is mislukt"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Tijdelijk probleem in naamsherleiding"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "C#-compiler is niet gevonden; installeer 'pnet'"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Ongeldige waarde voor 'ai_flags'"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "virtuele C#-machine is niet gevonden; installeer 'pnet'"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Onherstelbaar probleem in naamsherleiding"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "subproces %s is mislukt"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "'ai_family' wordt niet ondersteund"
 
-#~ msgid "regular empty file"
-#~ msgstr "leeg normaal bestand"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Onvoldoende geheugen beschikbaar"
 
-#~ msgid "regular file"
-#~ msgstr "normaal bestand"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Aan hostnaam is geen adres verbonden"
 
-#~ msgid "directory"
-#~ msgstr "map"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Naam of dienst is niet bekend"
 
-#~ msgid "block special file"
-#~ msgstr "blok-apparaat"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Servicenaam wordt niet ondersteund voor 'ai_socktype'"
 
-#~ msgid "character special file"
-#~ msgstr "byte-apparaat"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "'ai_socktype' wordt niet ondersteund"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Systeemfout"
 
-#~ msgid "symbolic link"
-#~ msgstr "symbolische koppeling"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Argumentenbuffer is te klein"
 
-#~ msgid "socket"
-#~ msgstr "socket"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Bezig met verwerken van verzoek"
 
-#~ msgid "message queue"
-#~ msgstr "berichtenwachtrij"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Verzoek is geannuleerd"
 
-#~ msgid "semaphore"
-#~ msgstr "semafoor"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Verzoek is niet geannuleerd"
 
-#~ msgid "shared memory object"
-#~ msgstr "gedeeld geheugenobject"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Alle verzoeken zijn gedaan"
 
-#~ msgid "typed memory object"
-#~ msgstr "zelfstandig geheugenobject"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Onderbroken door een signaal"
 
-#~ msgid "weird file"
-#~ msgstr "merkwaardig bestand"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Parametertekst is niet juist gecodeerd"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Adresfamilie voor hostnaam wordt niet ondersteund"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Onbekende fout"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Tijdelijk probleem in naamsherleiding"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Ongeldige waarde voor 'ai_flags'"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: optie '--%s' staat geen argument toe\n"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Onherstelbaar probleem in naamsherleiding"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "'ai_family' wordt niet ondersteund"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: optie '--%s' vereist een argument\n"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Onvoldoende geheugen beschikbaar"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: onbekende optie '--%s'\n"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Aan hostnaam is geen adres verbonden"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: onbekende optie '%c%s'\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ongeldige optie -- '%c'\n"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Naam of dienst is niet bekend"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: optie vereist een argument -- '%c'\n"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Servicenaam wordt niet ondersteund voor 'ai_socktype'"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "'ai_socktype' wordt niet ondersteund"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: optie '-W %s' staat geen argument toe\n"
 
-#~ msgid "System error"
-#~ msgstr "Systeemfout"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: optie '-W %s' vereist een argument\n"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Argumentenbuffer is te klein"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "ongeldige waarde voor 'source_version' in compile_java_class()"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Bezig met verwerken van verzoek"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "ongeldige waarde voor 'target_version' in compile_java_class()"
 
-#~ msgid "Request canceled"
-#~ msgstr "Verzoek is geannuleerd"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "aanmaken van '%s' is mislukt"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Verzoek is niet geannuleerd"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "fout bij schrijven van bestand '%s'"
 
-#~ msgid "All requests done"
-#~ msgstr "Alle verzoeken zijn gedaan"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Java-compiler is niet gevonden; installeer 'gcj' of zet $JAVAC"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Onderbroken door een signaal"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Virtuele Java-machine is niet gevonden; installeer 'gcj' of zet $JAVA"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Parametertekst is niet juist gecodeerd"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "In-/uitvoerfout in subproces %s"
 
-#~ msgid "Unknown error"
-#~ msgstr "Onbekende fout"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "kan de toegangsrechten van %s niet veranderen"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "ongeldige waarde voor 'source_version' in compile_java_class()"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "kan map %s niet aanmaken"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "ongeldige waarde voor 'target_version' in compile_java_class()"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "onvoldoende geheugen beschikbaar"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "aanmaken van '%s' is mislukt"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "kan de huidige werkmap niet vastleggen"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "fout bij schrijven van bestand '%s'"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "kan niet terugkeren naar de oorspronkelijke werkmap"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr "Java-compiler is niet gevonden; installeer 'gcj' of zet $JAVAC"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Openen van /dev/zero voor lezen is mislukt"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Virtuele Java-machine is niet gevonden; installeer 'gcj' of zet $JAVA"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "Het aanmaken van een lees-thread is mislukt"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "In-/uitvoerfout in subproces %s"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "kan geen niet-blokkerende in-/uitvoer instellen naar subproces %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "kan de toegangsrechten van %s niet veranderen"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "communicatie met subproces %s is mislukt"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "kan map %s niet aanmaken"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "schrijven naar subproces %s is mislukt"
 
-#~ msgid "memory exhausted"
-#~ msgstr "onvoldoende geheugen beschikbaar"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "lezen uit subproces %s is mislukt"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "kan de huidige werkmap niet vastleggen"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "subproces %s is geëindigd met afsluitwaarde %d"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "kan niet terugkeren naar de oorspronkelijke werkmap"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "aanmaken van threads is mislukt"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Openen van /dev/zero voor lezen is mislukt"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "subproces %s is geëindigd met afsluitwaarde %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "‘"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "’"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Gelukt"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Geen overeenkomsten"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Ongeldige reguliere expressie"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Ongeldig samengesteld teken"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Ongeldige tekenklassenaam"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Backslash aan het eind"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Ongeldige terugverwijzing"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Ongepaarde [ of [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Ongepaarde ( of \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Ongepaarde \\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Ongeldige inhoud van \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Ongeldig bereikeinde"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Onvoldoende geheugen beschikbaar"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Ongeldige voorafgaande reguliere expressie"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Voortijdig einde van reguliere expressie"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Reguliere expressie is te groot"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Ongepaarde ) of \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Geen eerdere reguliere expressie"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[jJyY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "toegangsrechten van %s worden ingesteld"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "Het aanmaken van een lees-thread is mislukt"
+# Vroeger ging dit over het afsluiten van een modemverbinding,
+# tegenwoordig over het afsluiten van een pseudoterminal.
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Opgehangen"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "kan geen niet-blokkerende in-/uitvoer instellen naar subproces %s"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Onderbroken"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "communicatie met subproces %s is mislukt"
+# Verleden tijd, "Afgesloten", net als de andere actiesignaalnamen.
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Afgesloten"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "schrijven naar subproces %s is mislukt"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Ongeldige instructie"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "lezen uit subproces %s is mislukt"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Traceer/breekpunt-instructie"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "subproces %s is geëindigd met afsluitwaarde %d"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Afgebroken"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "aanmaken van threads is mislukt"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Drijvendekomma-berekeningsfout"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "subproces %s is geëindigd met afsluitwaarde %d"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Geëlimineerd"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "François Pinard"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Busfout"
 
-#~ msgid "`"
-#~ msgstr "‘"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Segmentatiefout"
 
-#~ msgid "'"
-#~ msgstr "’"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Gebroken pijp"
 
-#~ msgid "Success"
-#~ msgstr "Gelukt"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Wekker"
 
-#~ msgid "No match"
-#~ msgstr "Geen overeenkomsten"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Beëindigd"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Ongeldige reguliere expressie"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Urgente in-/uitvoertoestand"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Ongeldig samengesteld teken"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Gepauzeerd (signaal)"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Ongeldige tekenklassenaam"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Gepauzeerd"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Backslash aan het eind"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Doorgegaan"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Ongeldige terugverwijzing"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Dochter is afgesloten"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Ongepaarde [ of [^"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Gepauzeerd (terminalinvoer)"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Ongepaarde ( of \\("
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Gepauzeerd (terminaluitvoer)"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Ongepaarde \\{"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "In-/uitvoer is mogelijk"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Ongeldige inhoud van \\{\\}"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Limiet op processortijd is overschreden"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Ongeldig bereikeinde"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Limiet op bestandsgrootte is overschreden"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Onvoldoende geheugen beschikbaar"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Virtuele tijdopnemer is verlopen"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Ongeldige voorafgaande reguliere expressie"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Tijdopnemer voor analyse is verlopen"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Voortijdig einde van reguliere expressie"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Venster is veranderd"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Reguliere expressie is te groot"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Gebruikergedefinieerd signaal 1"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Ongepaarde ) of \\)"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Gebruikergedefinieerd signaal 2"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Geen eerdere reguliere expressie"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "EMT-instructie"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[jJyY]"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Onjuiste systeemaanroep"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Stack-fout"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "toegangsrechten van %s worden ingesteld"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Verzoek om informatie"
 
-# Vroeger ging dit over het afsluiten van een modemverbinding,
-# tegenwoordig over het afsluiten van een pseudoterminal.
-#~ msgid "Hangup"
-#~ msgstr "Opgehangen"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Stroomstoring"
 
-#~ msgid "Interrupt"
-#~ msgstr "Onderbroken"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Hulpbron verloren"
 
-# Verleden tijd, "Afgesloten", net als de andere actiesignaalnamen.
-#~ msgid "Quit"
-#~ msgstr "Afgesloten"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "fouten bij het schrijven naar een afgesloten 'pipe' of 'socket'"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Ongeldige instructie"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "kan geen pijp aanmaken"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Traceer/breekpunt-instructie"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Realtime-signaal %d"
 
-#~ msgid "Aborted"
-#~ msgstr "Afgebroken"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Onbekend signaal %d"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Drijvendekomma-berekeningsfout"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "de functie iconv() is onbruikbaar"
 
-#~ msgid "Killed"
-#~ msgstr "Geëlimineerd"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "de functie iconv() is niet beschikbaar"
 
-#~ msgid "Bus error"
-#~ msgstr "Busfout"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "teken ligt buiten het toegestane bereik"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Segmentatiefout"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "kan U+%04X niet converteren naar de lokale tekenset"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Gebroken pijp"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "kan U+%04X niet converteren naar de lokale tekenset: %s"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Wekker"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "ongeldige gebruiker"
 
-#~ msgid "Terminated"
-#~ msgstr "Beëindigd"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "ongeldige groep"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Urgente in-/uitvoertoestand"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "ongeldige aanduiding"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Gepauzeerd (signaal)"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "kan foutmelding niet tonen"
 
-#~ msgid "Stopped"
-#~ msgstr "Gepauzeerd"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "In pakketvorm gebracht door %s (%s)\n"
 
-#~ msgid "Continued"
-#~ msgstr "Doorgegaan"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "In pakketvorm gebracht door %s\n"
 
-#~ msgid "Child exited"
-#~ msgstr "Dochter is afgesloten"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Gepauzeerd (terminalinvoer)"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Dit is vrije software: u mag het vrijelijk wijzigen en verder verspreiden.\n"
+"De precieze licentie is GPL-3+: GNU General Public License versie 3 of later.\n"
+"Zie http://gnu.org/licenses/gpl.html voor de volledige (Engelse) tekst.\n"
+"Deze software kent GEEN GARANTIE, voor zover de wet dit toestaat.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Geschreven door %s.\n"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Gepauzeerd (terminaluitvoer)"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Geschreven door %s en %s.\n"
 
-#~ msgid "I/O possible"
-#~ msgstr "In-/uitvoer is mogelijk"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Geschreven door %s, %s en %s.\n"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Limiet op processortijd is overschreden"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Geschreven door %s, %s, %s\n"
+"en %s.\n"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Limiet op bestandsgrootte is overschreden"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Geschreven door %s, %s, %s,\n"
+"%s en %s.\n"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Virtuele tijdopnemer is verlopen"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Geschreven door %s, %s, %s,\n"
+"%s, %s en %s.\n"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Tijdopnemer voor analyse is verlopen"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Geschreven door %s, %s, %s,\n"
+"%s, %s, %s en %s.\n"
 
-#~ msgid "Window changed"
-#~ msgstr "Venster is veranderd"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Geschreven door %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Geschreven door %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s en %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Geschreven door %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s en anderen.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Rapporteer gebreken in het programma aan <%s>;\n"
+"meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Gebruikergedefinieerd signaal 1"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr ""
+"Rapporteer gebreken in het programma '%s' aan <%s>;\n"
+"meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Gebruikergedefinieerd signaal 2"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Webpagina van %s: <%s>\n"
 
-#~ msgid "EMT trap"
-#~ msgstr "EMT-instructie"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Webpagina van %s: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "Bad system call"
-#~ msgstr "Onjuiste systeemaanroep"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Stack-fout"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle() is mislukt"
 
-#~ msgid "Information request"
-#~ msgstr "Verzoek om informatie"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
 
-#~ msgid "Power failure"
-#~ msgstr "Stroomstoring"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "subproces %s"
 
-#~ msgid "Resource lost"
-#~ msgstr "Hulpbron verloren"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "subproces %s ontving het fatale signaal %d"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "fouten bij het schrijven naar een afgesloten 'pipe' of 'socket'"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "standaardinvoer"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "kan geen pijp aanmaken"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "standaarduitvoer"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Realtime-signaal %d"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "standaardfoutuitvoer"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Onbekend signaal %d"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "onbekende gegevensstroom"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "de functie iconv() is onbruikbaar"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "opnieuw openen van '%s' met modus %s is mislukt"
 
-#~ msgid "iconv function not available"
-#~ msgstr "de functie iconv() is niet beschikbaar"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "vergelijking van tekenreeksen is mislukt"
 
-#~ msgid "character out of range"
-#~ msgstr "teken ligt buiten het toegestane bereik"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Zet LC_ALL='C' om het probleem te omzeilen."
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "kan U+%04X niet converteren naar de lokale tekenset"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "De te vergelijken tekenreeksen waren %s en %s."
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "kan U+%04X niet converteren naar de lokale tekenset: %s"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "kan geen opgemaakte uitvoer aanmaken"
 
-#~ msgid "invalid user"
-#~ msgstr "ongeldige gebruiker"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "ongeldig argument '%3$s' van %1$s%2$s"
 
-#~ msgid "invalid group"
-#~ msgstr "ongeldige groep"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "ongeldig achtervoegsel in argument '%3$s' van %1$s%2$s"
 
-#~ msgid "invalid spec"
-#~ msgstr "ongeldige aanduiding"
-
-#~ msgid "unable to display error message"
-#~ msgstr "kan foutmelding niet tonen"
-
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "In pakketvorm gebracht door %s (%s)\n"
-
-#~ msgid "Packaged by %s\n"
-#~ msgstr "In pakketvorm gebracht door %s\n"
-
-#~ msgid "(C)"
-#~ msgstr "©"
-
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Dit is vrije software: u mag het vrijelijk wijzigen en verder "
-#~ "verspreiden.\n"
-#~ "De precieze licentie is GPL-3+: GNU General Public License versie 3 of "
-#~ "later.\n"
-#~ "Zie http://gnu.org/licenses/gpl.html voor de volledige (Engelse) tekst.\n"
-#~ "Deze software kent GEEN GARANTIE, voor zover de wet dit toestaat.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Geschreven door %s.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Geschreven door %s en %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Geschreven door %s, %s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Geschreven door %s, %s, %s\n"
-#~ "en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Geschreven door %s, %s, %s,\n"
-#~ "%s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Geschreven door %s, %s, %s,\n"
-#~ "%s, %s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Geschreven door %s, %s, %s,\n"
-#~ "%s, %s, %s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Geschreven door %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Geschreven door %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s en %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Geschreven door %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s en anderen.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Rapporteer gebreken in het programma aan <%s>;\n"
-#~ "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr ""
-#~ "Rapporteer gebreken in het programma '%s' aan <%s>;\n"
-#~ "meld fouten in de vertaling aan <vertaling@vrijschrift.org>.\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "Webpagina van %s: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "Webpagina van %s: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/"
-#~ ">\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle() is mislukt"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "kan bestandsdescriptor %d niet herstellen: dup2() is mislukt"
-
-#~ msgid "%s subprocess"
-#~ msgstr "subproces %s"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "subproces %s ontving het fatale signaal %d"
-
-#~ msgid "stdin"
-#~ msgstr "standaardinvoer"
-
-#~ msgid "stdout"
-#~ msgstr "standaarduitvoer"
-
-#~ msgid "stderr"
-#~ msgstr "standaardfoutuitvoer"
-
-#~ msgid "unknown stream"
-#~ msgstr "onbekende gegevensstroom"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "opnieuw openen van '%s' met modus %s is mislukt"
-
-#~ msgid "string comparison failed"
-#~ msgstr "vergelijking van tekenreeksen is mislukt"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Zet LC_ALL='C' om het probleem te omzeilen."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "De te vergelijken tekenreeksen waren %s en %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "kan geen opgemaakte uitvoer aanmaken"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "ongeldig argument '%3$s' van %1$s%2$s"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "ongeldig achtervoegsel in argument '%3$s' van %1$s%2$s"
-
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "argument '%3$s' van %1$s%2$s is te groot"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "argument '%3$s' van %1$s%2$s is te groot"
diff --git a/gnulib/po/pl.po b/gnulib/po/pl.po
index c54f34d9..97702c6f 100644
--- a/gnulib/po/pl.po
+++ b/gnulib/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-08-22 12:41+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -19,762 +19,1062 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "błędny argument %s opcji %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "niejednoznaczny argument %s opcji %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Prawidłowe argumenty to:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: wartość %s jest mniejsza lub równa %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: Parametr ARGP_HELP_FMT wymaga podania wartości"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: Parametr ARGP_HELP_FMT musi być dodatni"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Błędne dane w ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Argumenty obowiązkowe lub opcjonalne dla długich opcji są również "
-"obowiązkowe lub opcjonalne dla odpowiednich krótkich opcji."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Argumenty obowiązkowe lub opcjonalne dla długich opcji są również obowiązkowe lub opcjonalne dla odpowiednich krótkich opcji."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Składnia:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "    lub: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [OPCJA...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr ""
-"Polecenie `%s --help' lub `%s --usage' pozwoli uzyskać więcej informacji.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Polecenie `%s --help' lub `%s --usage' pozwoli uzyskać więcej informacji.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Prosimy zgłaszać błędy na adres %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Nieznany błąd systemowy"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "wyświetlenie tego tekstu pomocy"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "wyświetlenie krótkiej informacji o składni polecenia"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NAZWA"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "określenie nazwy programu"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEK"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "zatrzymanie na SEK sekund (domyślnie 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "wyświetlenie wersji programu"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(BŁĄD PROGRAMU) Nieznana wersja!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Za dużo argumentów\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(BŁĄD PROGRAMU) Opcja powinna zostać rozpoznana!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: opcja '%s' jest niejednoznaczna; możliwości:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "błąd programu"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: opcja '--%s' nie może mieć argumentów\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "przepełnienie stosu"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: opcja '%c%s' nie może mieć argumentów\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "nie można odnaleźć katalogu tymczasowego, można spróbować ustawić $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: opcja '--%s' musi mieć argument\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "nie można utworzyć katalogu typczasowego z użyciem szablonu \"%s\""
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nieznana opcja '--%s'\n"
+msgid "cannot remove temporary file %s"
+msgstr "nie można usunąć pliku tymczasowego %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nieznana opcja '%c%s'\n"
+msgid "cannot remove temporary directory %s"
+msgstr "nie można usunąć katalogu tymczasowego %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: błędna opcja -- '%c'\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "błąd podczas zamykania pliku"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "błąd zapisu"
+
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: opcja musi mieć argument -- '%c'\n"
+msgid "preserving permissions for %s"
+msgstr "zachowywanie uprawnień do %s"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: opcja '-W %s' jest niejednoznaczna\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "błąd podczas otwierania \"%s\" do odczytu"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: opcja '-W %s' nie może mieć argumentów\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "nie można otworzyć pliku zapasowego \"%s\" do zapisu"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:82
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: opcja '-W %s' musi mieć argument\n"
+msgid "error reading \"%s\""
+msgstr "błąd odczytu \"%s\""
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "błędny argument %s opcji %s"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "błąd zapisu \"%s\""
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "niejednoznaczny argument %s opcji %s"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "błąd po odczycie \"%s\""
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Prawidłowe argumenty to:"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() nie powiodło się"
 
-#~ msgid "program error"
-#~ msgstr "błąd programu"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "Nie znaleziono kompilatora C#, proszę spróbować zainstalować pnet"
 
-#~ msgid "stack overflow"
-#~ msgstr "przepełnienie stosu"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "Nie znaleziono maszyny wirtualnej C#, proszę spróbować zainstalować pnet"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "nie można odnaleźć katalogu tymczasowego, można spróbować ustawić $TMPDIR"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "podproces %s zawiódł"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "nie można utworzyć katalogu typczasowego z użyciem szablonu \"%s\""
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "pusty zwykły plik"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "nie można usunąć pliku tymczasowego %s"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "zwykły plik"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "nie można usunąć katalogu tymczasowego %s"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "katalog"
 
-#~ msgid "error closing file"
-#~ msgstr "błąd podczas zamykania pliku"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "blokowy plik specjalny"
 
-#~ msgid "write error"
-#~ msgstr "błąd zapisu"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "znakowy plik specjalny"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "zachowywanie uprawnień do %s"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "potok"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "błąd podczas otwierania \"%s\" do odczytu"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "dowiązanie symboliczne"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "nie można otworzyć pliku zapasowego \"%s\" do zapisu"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "gniazdo"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "błąd odczytu \"%s\""
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "kolejka komunikatów"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "błąd zapisu \"%s\""
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafor"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "błąd po odczycie \"%s\""
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "obiekt w pamięci współdzielonej"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() nie powiodło się"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "obiekt z typem w pamięci"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "Nie znaleziono kompilatora C#, proszę spróbować zainstalować pnet"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "dziwny plik"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr ""
-#~ "Nie znaleziono maszyny wirtualnej C#, proszę spróbować zainstalować pnet"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Rodzina adresów dla podanej nazwy hosta nie jest obsługiwana"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "podproces %s zawiódł"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Tymczasowy błąd rozwiązywania nazw"
 
-#~ msgid "regular empty file"
-#~ msgstr "pusty zwykły plik"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Błędna wartość ai_flags"
 
-#~ msgid "regular file"
-#~ msgstr "zwykły plik"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Nienaprawialny błąd w rozwiązywaniu nazw"
 
-#~ msgid "directory"
-#~ msgstr "katalog"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family zawiera nie obsługiwaną rodzinę protokołów"
 
-#~ msgid "block special file"
-#~ msgstr "blokowy plik specjalny"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Błąd przydzielania pamięci"
 
-#~ msgid "character special file"
-#~ msgstr "znakowy plik specjalny"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Brak adresu związanego z nazwą hosta"
 
-#~ msgid "fifo"
-#~ msgstr "potok"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Nieznana nazwa lub usługa"
 
-#~ msgid "symbolic link"
-#~ msgstr "dowiązanie symboliczne"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Usługa nie obsługiwana dla danego ai_socktype"
 
-#~ msgid "socket"
-#~ msgstr "gniazdo"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype zawiera nie obsługiwany typ gniazda"
 
-#~ msgid "message queue"
-#~ msgstr "kolejka komunikatów"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Błąd systemowy"
 
-#~ msgid "semaphore"
-#~ msgstr "semafor"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Bufor argumentu zbyt mały"
 
-#~ msgid "shared memory object"
-#~ msgstr "obiekt w pamięci współdzielonej"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Przetwarzanie żądania jest w toku"
 
-#~ msgid "typed memory object"
-#~ msgstr "obiekt z typem w pamięci"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Żądanie anulowane"
 
-#~ msgid "weird file"
-#~ msgstr "dziwny plik"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Żądanie nie anulowane"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Rodzina adresów dla podanej nazwy hosta nie jest obsługiwana"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Wszystkie żądania wykonane"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Tymczasowy błąd rozwiązywania nazw"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Przerwane przez sygnał"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Błędna wartość ai_flags"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Łańcuch parametru niepoprawnie zakodowany"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Nienaprawialny błąd w rozwiązywaniu nazw"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Nieznany błąd"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family zawiera nie obsługiwaną rodzinę protokołów"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: opcja '%s' jest niejednoznaczna; możliwości:"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Błąd przydzielania pamięci"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: opcja '--%s' nie może mieć argumentów\n"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Brak adresu związanego z nazwą hosta"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: opcja '%c%s' nie może mieć argumentów\n"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Nieznana nazwa lub usługa"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: opcja '--%s' musi mieć argument\n"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Usługa nie obsługiwana dla danego ai_socktype"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: nieznana opcja '--%s'\n"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype zawiera nie obsługiwany typ gniazda"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: nieznana opcja '%c%s'\n"
 
-#~ msgid "System error"
-#~ msgstr "Błąd systemowy"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: błędna opcja -- '%c'\n"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Bufor argumentu zbyt mały"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: opcja musi mieć argument -- '%c'\n"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Przetwarzanie żądania jest w toku"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: opcja '-W %s' jest niejednoznaczna\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Żądanie anulowane"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: opcja '-W %s' nie może mieć argumentów\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Żądanie nie anulowane"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: opcja '-W %s' musi mieć argument\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Wszystkie żądania wykonane"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "błędny argument source_version dla compile_java_class"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Przerwane przez sygnał"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "błędny argument target_version dla compile_java_class"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Łańcuch parametru niepoprawnie zakodowany"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "nie udało się utworzyć \"%s\""
 
-#~ msgid "Unknown error"
-#~ msgstr "Nieznany błąd"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "błąd podczas zapisu pliku \"%s\""
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "błędny argument source_version dla compile_java_class"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Nie znaleziono kompilatora Javy, proszę spróbować zainstalować gcj lub ustawić $JAVAC"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "błędny argument target_version dla compile_java_class"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Nie znaleziono maszyny wirtualnej Javy, proszę spróbować zainstalować gij lub ustawić $JAVA"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "nie udało się utworzyć \"%s\""
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "błąd we/wy podprocesu %s"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "błąd podczas zapisu pliku \"%s\""
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "nie można zmienić uprawnień do %s"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Nie znaleziono kompilatora Javy, proszę spróbować zainstalować gcj lub "
-#~ "ustawić $JAVAC"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "nie można utworzyć katalogu %s"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Nie znaleziono maszyny wirtualnej Javy, proszę spróbować zainstalować gij "
-#~ "lub ustawić $JAVA"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "pamięć wyczerpana"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "błąd we/wy podprocesu %s"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "nie udało się zapisać bieżącego katalogu roboczego"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "nie można zmienić uprawnień do %s"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "nie udało się wrócić do początkowego katalogu roboczego"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "nie można utworzyć katalogu %s"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Nie udało się otworzyć /dev/zero do odczytu"
 
-#~ msgid "memory exhausted"
-#~ msgstr "pamięć wyczerpana"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "tworzenie wątku czytającego nie powiodło sie"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "nie udało się zapisać bieżącego katalogu roboczego"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "nie można ustawić nieblokującego we/wy dla podprocesu %s"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "nie udało się wrócić do początkowego katalogu roboczego"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "komunikacja z podprocesem %s nie powiodła się"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Nie udało się otworzyć /dev/zero do odczytu"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "zapis do podprocesu %s nie powiódł się"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "tworzenie wątku czytającego nie powiodło sie"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "odczyt z podprocesu %s nie powiódł się"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "nie można ustawić nieblokującego we/wy dla podprocesu %s"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "podproces %s zakończył się z kodem wyjścia %d"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "komunikacja z podprocesem %s nie powiodła się"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "tworzenie wątków nie powiodło się"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "zapis do podprocesu %s nie powiódł się"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "podproces %s zakończył się kodem wyjścia %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Sukces"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Nic nie pasuje"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Błędne wyrażenie regularne"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Błędny znak sortowany"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Błędna nazwa klasy znaków"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Kończący znak `\\'"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Błędne odniesienie wstecz"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Niesparowane [ lub [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Niesparowane ( lub \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Niesparowane \\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Błędna zawartość \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Błędny koniec zakresu"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Pamięć wyczerpana"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Błędne poprzedzające wyrażenie regularne"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Przedwczesny koniec wyrażenia regularnego"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Wyrażenie regularne zbyt duże"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Niesparowane ) lub \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Brak poprzedniego wyrażenia regularnego"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yYtT]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "ustawianie uprawnień %s"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "odczyt z podprocesu %s nie powiódł się"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Rozłączenie"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "podproces %s zakończył się z kodem wyjścia %d"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Przerwanie"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "tworzenie wątków nie powiodło się"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Wyjście"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "podproces %s zakończył się kodem wyjścia %d"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Niedozwolona instrukcja"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "François Pinard"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Pułapka debuggera/breakpoint"
 
-#~ msgid "`"
-#~ msgstr "`"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Przerwano"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Błąd w obliczeniach zmiennoprzecinkowych"
 
-#~ msgid "Success"
-#~ msgstr "Sukces"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Unicestwiono"
 
-#~ msgid "No match"
-#~ msgstr "Nic nie pasuje"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Błąd szyny"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Błędne wyrażenie regularne"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Naruszenie ochrony pamięci"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Błędny znak sortowany"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Przerwany potok"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Błędna nazwa klasy znaków"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Budzik"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Kończący znak `\\'"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Zakończono"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Błędne odniesienie wstecz"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Nagły stan we/wy"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Niesparowane [ lub [^"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Zatrzymano (sygnał)"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Niesparowane ( lub \\("
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Zatrzymano"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Niesparowane \\{"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Kontynuacja"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Błędna zawartość \\{\\}"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Zakończenie procesu potomnego"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Błędny koniec zakresu"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Zatrzymano (wejście z tty)"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Pamięć wyczerpana"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Zatrzymano (wyjście na tty)"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Błędne poprzedzające wyrażenie regularne"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Możliwa operacja we/wy"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Przedwczesny koniec wyrażenia regularnego"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Przekroczony limit czasu procesora"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Wyrażenie regularne zbyt duże"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Przekroczony limit rozmiaru pliku"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Niesparowane ) lub \\)"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Upłynął czas stopera wirtualnego"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Brak poprzedniego wyrażenia regularnego"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Upłynął czas stopera profilującego"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yYtT]"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Okno zmienione"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Sygnał użytkownika 1"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "ustawianie uprawnień %s"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Sygnał użytkownika 2"
 
-#~ msgid "Hangup"
-#~ msgstr "Rozłączenie"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Pułapka EMT"
 
-#~ msgid "Interrupt"
-#~ msgstr "Przerwanie"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Błędne wywołanie systemowe"
 
-#~ msgid "Quit"
-#~ msgstr "Wyjście"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Błąd stosu"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Niedozwolona instrukcja"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Żądanie informacji"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Pułapka debuggera/breakpoint"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Awaria zasilania"
 
-#~ msgid "Aborted"
-#~ msgstr "Przerwano"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Utrata zasobów"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Błąd w obliczeniach zmiennoprzecinkowych"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "błąd zapisu do zamkniętego potoku lub gniazda"
 
-#~ msgid "Killed"
-#~ msgstr "Unicestwiono"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "nie można utworzyć potoku"
 
-#~ msgid "Bus error"
-#~ msgstr "Błąd szyny"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Sygnał czasu rzeczywistego %d"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Naruszenie ochrony pamięci"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Nieznany sygnał %d"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Przerwany potok"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "nie można użyć funkcji iconv"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Budzik"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "funkcja iconv nie jest dostępna"
 
-#~ msgid "Terminated"
-#~ msgstr "Zakończono"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "znak spoza zakresu"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Nagły stan we/wy"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "nie można przekształcić U+%04X do lokalnego zestawu znaków"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Zatrzymano (sygnał)"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "nie można przekształcić U+%04X do lokalnego zestawu znaków: %s"
 
-#~ msgid "Stopped"
-#~ msgstr "Zatrzymano"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "błędny użytkownik"
 
-#~ msgid "Continued"
-#~ msgstr "Kontynuacja"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "błędna grupa"
 
-#~ msgid "Child exited"
-#~ msgstr "Zakończenie procesu potomnego"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "błędna specyfikacja"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Zatrzymano (wejście z tty)"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "nie można wyświetlić komunikatu błędu"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Zatrzymano (wyjście na tty)"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Pakietujący: %s (%s)\n"
 
-#~ msgid "I/O possible"
-#~ msgstr "Możliwa operacja we/wy"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Pakietujący: %s\n"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Przekroczony limit czasu procesora"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "(C)"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Przekroczony limit rozmiaru pliku"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Licencja GPLv3+: GNU GPL wersja 3 lub późniejsza:\n"
+"<http://gnu.org/licenses/gpl.html>\n"
+"To jest oprogramowanie wolnodostępne: można je modyfikować i rozpowszechniać.\n"
+"Nie ma ŻADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Autor: %s.\n"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Upłynął czas stopera wirtualnego"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Autorzy: %s i %s.\n"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Upłynął czas stopera profilującego"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Autorzy: %s, %s i %s.\n"
 
-#~ msgid "Window changed"
-#~ msgstr "Okno zmienione"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Autorzy: %s, %s, %s\n"
+"i %s.\n"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Sygnał użytkownika 1"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Autorzy: %s, %s, %s,\n"
+"%s i %s.\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Sygnał użytkownika 2"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Autorzy: %s, %s, %s,\n"
+"%s, %s i %s.\n"
 
-#~ msgid "EMT trap"
-#~ msgstr "Pułapka EMT"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Autorzy: %s, %s, %s,\n"
+"%s, %s, %s i %s.\n"
 
-#~ msgid "Bad system call"
-#~ msgstr "Błędne wywołanie systemowe"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Autorzy: %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Autorzy: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s i %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Autorzy: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s i inni.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Prosimy zgłaszać błędy na adres <%s>.\n"
+"Błędy w tłumaczeniu prosimy zgłaszać na adres <translation-team-pl@lists.sourceforge.net>.\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Błąd stosu"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Błędy pakietującego (%s) prosimy zgłaszać na adres <%s>.\n"
 
-#~ msgid "Information request"
-#~ msgstr "Żądanie informacji"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Strona domowa pakietu %s: <%s>\n"
 
-#~ msgid "Power failure"
-#~ msgstr "Awaria zasilania"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Strona domowa pakietu %s: <http://www.gnu.org/software/%s/>.\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Utrata zasobów"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Ogólna pomoc przy używaniu oprogramowania GNU: <http://www.gnu.org/gethelp/>.\n"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "błąd zapisu do zamkniętego potoku lub gniazda"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle nie powiodło się"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "nie można utworzyć potoku"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "nie można odtworzyć fd %d: dup2 nie powiodło się"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Sygnał czasu rzeczywistego %d"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "podproces %s"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Nieznany sygnał %d"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "podproces %s dostał krytyczny sygnał %d"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "nie można użyć funkcji iconv"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "standardowego wejścia"
 
-#~ msgid "iconv function not available"
-#~ msgstr "funkcja iconv nie jest dostępna"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "standardowego wyjścia"
 
-#~ msgid "character out of range"
-#~ msgstr "znak spoza zakresu"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "standardowego wyjścia diagnostycznego"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "nie można przekształcić U+%04X do lokalnego zestawu znaków"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "nieznanego strumienia"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "nie można przekształcić U+%04X do lokalnego zestawu znaków: %s"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "nie udało się ponownie otworzyć %s w trybie %s"
 
-#~ msgid "invalid user"
-#~ msgstr "błędny użytkownik"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "nie udało się porównanie łańcuchów znaków"
 
-#~ msgid "invalid group"
-#~ msgstr "błędna grupa"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Ustaw LC_ALL='C' żeby obejść problem"
 
-#~ msgid "invalid spec"
-#~ msgstr "błędna specyfikacja"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Porównywane łańcuchy znaków do %s i %s."
 
-#~ msgid "unable to display error message"
-#~ msgstr "nie można wyświetlić komunikatu błędu"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "nie można sformatować wyjścia"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Pakietujący: %s (%s)\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "błędny argument %s%s opcji `%s'"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Pakietujący: %s\n"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "błędny przyrostek argumentu %s%s opcji `%s'"
 
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Licencja GPLv3+: GNU GPL wersja 3 lub późniejsza:\n"
-#~ "<http://gnu.org/licenses/gpl.html>\n"
-#~ "To jest oprogramowanie wolnodostępne: można je modyfikować i "
-#~ "rozpowszechniać.\n"
-#~ "Nie ma ŻADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Autor: %s.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Autorzy: %s i %s.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Autorzy: %s, %s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Autorzy: %s, %s, %s\n"
-#~ "i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Autorzy: %s, %s, %s,\n"
-#~ "%s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Autorzy: %s, %s, %s,\n"
-#~ "%s, %s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Autorzy: %s, %s, %s,\n"
-#~ "%s, %s, %s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Autorzy: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Autorzy: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s i %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Autorzy: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s i inni.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prosimy zgłaszać błędy na adres <%s>.\n"
-#~ "Błędy w tłumaczeniu prosimy zgłaszać na adres <translation-team-pl@lists."
-#~ "sourceforge.net>.\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Błędy pakietującego (%s) prosimy zgłaszać na adres <%s>.\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "Strona domowa pakietu %s: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "Strona domowa pakietu %s: <http://www.gnu.org/software/%s/>.\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Ogólna pomoc przy używaniu oprogramowania GNU: <http://www.gnu.org/"
-#~ "gethelp/>.\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle nie powiodło się"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "nie można odtworzyć fd %d: dup2 nie powiodło się"
-
-#~ msgid "%s subprocess"
-#~ msgstr "podproces %s"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "podproces %s dostał krytyczny sygnał %d"
-
-#~ msgid "stdin"
-#~ msgstr "standardowego wejścia"
-
-#~ msgid "stdout"
-#~ msgstr "standardowego wyjścia"
-
-#~ msgid "stderr"
-#~ msgstr "standardowego wyjścia diagnostycznego"
-
-#~ msgid "unknown stream"
-#~ msgstr "nieznanego strumienia"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "nie udało się ponownie otworzyć %s w trybie %s"
-
-#~ msgid "string comparison failed"
-#~ msgstr "nie udało się porównanie łańcuchów znaków"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Ustaw LC_ALL='C' żeby obejść problem"
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Porównywane łańcuchy znaków do %s i %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "nie można sformatować wyjścia"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "błędny argument %s%s opcji `%s'"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "błędny przyrostek argumentu %s%s opcji `%s'"
-
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "argument %s%s `%s' zbyt duży"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "argument %s%s `%s' zbyt duży"
diff --git a/gnulib/po/pt.po b/gnulib/po/pt.po
index 35d11439..dd4d2f43 100644
--- a/gnulib/po/pt.po
+++ b/gnulib/po/pt.po
@@ -6,347 +6,275 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sh-utils 1.12i\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 1996-11-08 20:03+0100\n"
 "Last-Translator: Ant�nio Jo�o Serras Rendas <arendas@mail.telepac.pt>\n"
 "Language-Team: Portugu�s <pt@li.org>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: gnulib/argp-help.c:147
-#, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
-
-#: gnulib/argp-help.c:235
-#, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
-
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
-
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
+#: lib/argmatch.c:137
+#, fuzzy, c-format
+msgid "invalid argument %s for %s"
+msgstr "argumento inv�lido `%s'"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
+#: lib/argmatch.c:138
+#, fuzzy, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "falta um argumento a `%s'"
 
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
+#: lib/argmatch.c:157
+#, fuzzy, c-format
+msgid "Valid arguments are:"
+msgstr "argumento inv�lido `%s'"
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Utiliza��o: %s [OP��O]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Tente `%s --help' para mais informa��o.\n"
 
-#: gnulib/argp-help.c:1711
-#, c-format
-msgid "Report bugs to %s.\n"
-msgstr ""
-
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 #, fuzzy
 msgid "Unknown system error"
 msgstr "operador bin�rio desconhecido"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "NAME"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:147
 #, fuzzy
-msgid "print program version"
+msgid "Print program version"
 msgstr "erro de leitura"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "demasiados argumentos\n"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
-
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr ""
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr ""
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "erro de leitura"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "demasiados argumentos\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "erro na escrita"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "op��o inv�lida `%s'"
+msgid "error while opening \"%s\" for reading"
+msgstr "n�o consigo mover `%s' para `%s'"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "op��o inv�lida `%s'"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "n�o consigo mover `%s' para `%s'"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "op��o inv�lida `%s'"
+msgid "error reading \"%s\""
+msgstr "%s: apagar directoria `%s'? "
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "demasiados argumentos\n"
-
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr ""
+msgid "error writing \"%s\""
+msgstr "%s: apagar directoria `%s'? "
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "demasiados argumentos\n"
-
-#, fuzzy
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "argumento inv�lido `%s'"
-
-#, fuzzy
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "falta um argumento a `%s'"
+msgid "error after reading \"%s\""
+msgstr "%s: apagar directoria `%s'? "
 
+#: lib/csharpcomp.c:273
 #, fuzzy
-#~ msgid "Valid arguments are:"
-#~ msgstr "argumento inv�lido `%s'"
+msgid "fdopen() failed"
+msgstr "ficheiros especiais de tipo bloco n�o suportados"
 
-#, fuzzy
-#~ msgid "program error"
-#~ msgstr "erro de leitura"
-
-#~ msgid "write error"
-#~ msgstr "erro na escrita"
-
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "n�o consigo mover `%s' para `%s'"
-
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "n�o consigo mover `%s' para `%s'"
-
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "%s: apagar directoria `%s'? "
-
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "%s: apagar directoria `%s'? "
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
+#, fuzzy, c-format
+msgid "%s subprocess failed"
+msgstr "op��o inv�lida `%s'"
 
+#: lib/file-type.c:43
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "%s: apagar directoria `%s'? "
+msgid "regular file"
+msgstr "`%s' n�o � um ficheiro normal"
 
+#: lib/file-type.c:46
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "ficheiros especiais de tipo bloco n�o suportados"
+msgid "directory"
+msgstr "`%s' n�o � uma directoria"
 
+#: lib/file-type.c:49
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "op��o inv�lida `%s'"
+msgid "block special file"
+msgstr "ficheiros especiais de tipo bloco n�o suportados"
 
+#: lib/file-type.c:52
 #, fuzzy
-#~ msgid "regular file"
-#~ msgstr "`%s' n�o � um ficheiro normal"
+msgid "character special file"
+msgstr "ficheiros especiais de tipo caracter n�o suportados"
 
+#: lib/file-type.c:58
 #, fuzzy
-#~ msgid "directory"
-#~ msgstr "`%s' n�o � uma directoria"
+msgid "symbolic link"
+msgstr "n�o consigo ler liga��o (link) simb�lica `%s'"
 
+#: lib/file-type.c:75
 #, fuzzy
-#~ msgid "block special file"
-#~ msgstr "ficheiros especiais de tipo bloco n�o suportados"
+msgid "weird file"
+msgstr "`%s' n�o � um ficheiro normal"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "character special file"
-#~ msgstr "ficheiros especiais de tipo caracter n�o suportados"
+msgid "Address family for hostname not supported"
+msgstr "ficheiros \"fifo\" n�o suportados"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "symbolic link"
-#~ msgstr "n�o consigo ler liga��o (link) simb�lica `%s'"
+msgid "ai_family not supported"
+msgstr "ficheiros \"fifo\" n�o suportados"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "weird file"
-#~ msgstr "`%s' n�o � um ficheiro normal"
+msgid "ai_socktype not supported"
+msgstr "ficheiros \"fifo\" n�o suportados"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "ficheiros \"fifo\" n�o suportados"
+msgid "System error"
+msgstr "erro na escrita"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "ficheiros \"fifo\" n�o suportados"
+msgid "Unknown error"
+msgstr "operador bin�rio desconhecido"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ficheiros \"fifo\" n�o suportados"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, fuzzy, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "op��o inv�lida `%s'"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "erro na escrita"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, fuzzy, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "op��o inv�lida `%s'"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "operador bin�rio desconhecido"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, fuzzy, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "op��o inv�lida `%s'"
 
-#, fuzzy
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "op��o inv�lida `%s'"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "op��o inv�lida `%s'"
 
+#: lib/human.c:486
 #, fuzzy
-#~ msgid "block size"
-#~ msgstr "tipo de ordena��o"
+msgid "block size"
+msgstr "tipo de ordena��o"
 
-#, fuzzy
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "`%s' n�o � uma directoria"
+#: lib/mkdir-p.c:106
+#, fuzzy, c-format
+msgid "%s exists but is not a directory"
+msgstr "`%s' n�o � uma directoria"
 
-#, fuzzy
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "aviso: n�o consigo mudar para a directoria %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, fuzzy, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "aviso: n�o consigo mudar para a directoria %s"
 
-#, fuzzy
-#~ msgid "cannot create directory %s"
-#~ msgstr "n�o consigo obter a directoria actual"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, fuzzy, c-format
+msgid "cannot create directory %s"
+msgstr "n�o consigo obter a directoria actual"
 
-#, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "aviso: n�o consigo mudar para a directoria %s"
+#: lib/mkdir-p.c:240
+#, fuzzy, c-format
+msgid "cannot chdir to directory %s"
+msgstr "aviso: n�o consigo mudar para a directoria %s"
 
-#, fuzzy
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "aviso: n�o consigo mudar para a directoria %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, fuzzy, c-format
+msgid "cannot change permissions of %s"
+msgstr "aviso: n�o consigo mudar para a directoria %s"
 
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
 #, fuzzy
-#~ msgid "memory exhausted"
-#~ msgstr "mem�ria virtual esgotada"
+msgid "memory exhausted"
+msgstr "mem�ria virtual esgotada"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "n�o consigo obter a directoria actual"
+msgid "unable to record current working directory"
+msgstr "n�o consigo obter a directoria actual"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "aviso: n�o consigo mudar para a directoria %s"
+msgid "Failed to open /dev/zero for read"
+msgstr "aviso: n�o consigo mudar para a directoria %s"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "n�o consigo obter a directoria actual"
+msgid "cannot create pipe"
+msgstr "n�o consigo obter a directoria actual"
 
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "op��o inv�lida `%s'"
+msgid "Invalid regular expression"
+msgstr "op��o inv�lida `%s'"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "data inv�lida `%s'"
+msgid "Invalid character class name"
+msgstr "data inv�lida `%s'"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "mem�ria virtual esgotada"
+msgid "Memory exhausted"
+msgstr "mem�ria virtual esgotada"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "op��o inv�lida `%s'"
+msgid "Invalid preceding regular expression"
+msgstr "op��o inv�lida `%s'"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "op��o inv�lida `%s'"
+msgid "Premature end of regular expression"
+msgstr "op��o inv�lida `%s'"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "op��o inv�lida `%s'"
+msgid "Regular expression too big"
+msgstr "op��o inv�lida `%s'"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "op��o inv�lida `%s'"
+msgid "No previous regular expression"
+msgstr "op��o inv�lida `%s'"
 
+#: lib/unicodeio.c:156
 #, fuzzy
-#~ msgid "character out of range"
-#~ msgstr "ficheiros especiais de tipo caracter n�o suportados"
+msgid "character out of range"
+msgstr "ficheiros especiais de tipo caracter n�o suportados"
 
+#: lib/userspec.c:110
 #, fuzzy
-#~ msgid "invalid user"
-#~ msgstr "\\%c: caracter de escape inv�lido"
+msgid "invalid user"
+msgstr "\\%c: caracter de escape inv�lido"
 
+#: lib/userspec.c:111
 #, fuzzy
-#~ msgid "invalid group"
-#~ msgstr "op��o inv�lida `%s'"
+msgid "invalid group"
+msgstr "op��o inv�lida `%s'"
 
-#, fuzzy
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "n�o consigo %s `%s' para `%s'"
+#: lib/xmemcoll.c:53
+#, fuzzy, c-format
+msgid "The strings compared were %s and %s."
+msgstr "n�o consigo %s `%s' para `%s'"
diff --git a/gnulib/po/pt_BR.po b/gnulib/po/pt_BR.po
index 36ccc7e8..b7ca00d3 100644
--- a/gnulib/po/pt_BR.po
+++ b/gnulib/po/pt_BR.po
@@ -8,41 +8,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.0\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2003-06-27 19:20-0300\n"
 "Last-Translator: Juan Carlos Castro y Castro <jcastro@vialink.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnulib/argp-help.c:147
+# , c-format
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "argumento inv�lido %s para '%s'"
 
-#: gnulib/argp-help.c:220
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "argumento amb�guo %s para `%s'"
 
-#: gnulib/argp-help.c:226
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Os argumentos v�lidos s�o:"
 
-#: gnulib/argp-help.c:235
-#, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
-
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
-
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -50,399 +40,448 @@ msgid ""
 msgstr ""
 "Argumentos obrigat�rios para op��es longas tamb�m o s�o para op��es curtas\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
 # , c-format
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Uso: %s [OP��O]...\n"
 
 # , c-format
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Tente `%s --help' para mais informa��o.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "Comunicar `bugs' para <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "NOME"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
-#, fuzzy
-msgid "print program version"
-msgstr "erro de leitura"
-
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "muitos argumentos\n"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "erro de leitura"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: op��o `%s' est� amb�gua\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "erro de escrita"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: op��o `--%s' n�o permite um argumento\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "n�o foi poss�vel abrir %s para leitura"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: op��o `%c%s' n�o permite um argumento\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "n�o foi poss�vel abrir %s para leitura"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+# , c-format
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: op��o `%s' requer um argumento\n"
+msgid "error reading \"%s\""
+msgstr "erro lendo %s"
 
 # , c-format
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: op��o desconhecida `-%s'\n"
+msgid "error writing \"%s\""
+msgstr "erro escrevendo %s"
 
 # , c-format
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: op��o desconhecida `%c%s'\n"
+msgid "error after reading \"%s\""
+msgstr "erro lendo %s"
+
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "erro abrindo arquivo"
 
 # , c-format
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: op��o inv�lida -- %c\n"
+msgid "%s subprocess failed"
+msgstr "%s: padr�o inv�lido"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: op��o requer um argumento --%c\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "arquivo comum vazio"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: op��o `-W %s' est� amb�gua\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "arquivo comum"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: op��o `-W %s' n�o permite um argumento\n"
+#: lib/file-type.c:46
+#, fuzzy
+msgid "directory"
+msgstr "Diret�rio: "
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: op��o `%s' requer um argumento\n"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "arquivo especial de bloco"
 
-# , c-format
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "argumento inv�lido %s para '%s'"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "arquivo especial caracter"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "argumento amb�guo %s para `%s'"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "Os argumentos v�lidos s�o:"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "link simb�lico"
 
-#~ msgid "write error"
-#~ msgstr "erro de escrita"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "socket"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "n�o foi poss�vel abrir %s para leitura"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "fila de mensagens"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "n�o foi poss�vel abrir %s para leitura"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "sem�foro"
 
-# , c-format
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "erro lendo %s"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "objeto de mem�ria compartilhada"
 
-# , c-format
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "erro escrevendo %s"
+msgid "typed memory object"
+msgstr "objeto de mem�ria compartilhada"
 
-# , c-format
-#, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "erro lendo %s"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "arquivo estranho"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "erro abrindo arquivo"
+msgid "Address family for hostname not supported"
+msgstr "arquivos \"fifo\" n�o suportados"
 
-# , c-format
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: padr�o inv�lido"
-
-#~ msgid "regular empty file"
-#~ msgstr "arquivo comum vazio"
-
-#~ msgid "regular file"
-#~ msgstr "arquivo comum"
+msgid "ai_family not supported"
+msgstr "arquivos \"fifo\" n�o suportados"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "directory"
-#~ msgstr "Diret�rio: "
-
-#~ msgid "block special file"
-#~ msgstr "arquivo especial de bloco"
-
-#~ msgid "character special file"
-#~ msgstr "arquivo especial caracter"
+msgid "ai_socktype not supported"
+msgstr "arquivos \"fifo\" n�o suportados"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
-
-#~ msgid "symbolic link"
-#~ msgstr "link simb�lico"
+#: lib/gai_strerror.c:55
+#, fuzzy
+msgid "System error"
+msgstr "erro de escrita"
 
-#~ msgid "socket"
-#~ msgstr "socket"
+#: lib/gai_strerror.c:74
+#, fuzzy
+msgid "Unknown error"
+msgstr "Erro de sistema desconhecido"
 
-#~ msgid "message queue"
-#~ msgstr "fila de mensagens"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: op��o `%s' est� amb�gua\n"
 
-#~ msgid "semaphore"
-#~ msgstr "sem�foro"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: op��o `--%s' n�o permite um argumento\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "objeto de mem�ria compartilhada"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: op��o `%c%s' n�o permite um argumento\n"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "objeto de mem�ria compartilhada"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: op��o `%s' requer um argumento\n"
 
-#~ msgid "weird file"
-#~ msgstr "arquivo estranho"
+# , c-format
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: op��o desconhecida `-%s'\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "arquivos \"fifo\" n�o suportados"
+# , c-format
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: op��o desconhecida `%c%s'\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "arquivos \"fifo\" n�o suportados"
+# , c-format
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: op��o inv�lida -- %c\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "arquivos \"fifo\" n�o suportados"
+# , c-format
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: op��o inv�lida -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "erro de escrita"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: op��o requer um argumento --%c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Erro de sistema desconhecido"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: op��o `-W %s' est� amb�gua\n"
 
-# , c-format
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: op��o inv�lida -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: op��o `-W %s' n�o permite um argumento\n"
 
-#~ msgid "block size"
-#~ msgstr "tamanho do bloco"
+#: lib/human.c:486
+msgid "block size"
+msgstr "tamanho do bloco"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s existe, mas n�o � um diret�rio"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s existe, mas n�o � um diret�rio"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "n�o pode substituir dono e/ou grupo de %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "n�o pode substituir dono e/ou grupo de %s"
 
 # , c-format
-#~ msgid "cannot create directory %s"
-#~ msgstr "n�o � poss�vel criar o diret�rio %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "n�o � poss�vel criar o diret�rio %s"
 
 # , c-format
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "imposs�vel mudar para diret�rio %s"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "imposs�vel mudar para diret�rio %s"
 
 # , c-format
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "n�o � poss�vel mudar permiss�es de %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "n�o � poss�vel mudar permiss�es de %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "mem�ria esgotada"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "mem�ria esgotada"
 
 # , c-format
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "n�o � poss�vel criar o diret�rio %s"
+msgid "unable to record current working directory"
+msgstr "n�o � poss�vel criar o diret�rio %s"
 
 # , c-format
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "falha ao preservar permiss�es para %s"
+msgid "Failed to open /dev/zero for read"
+msgstr "falha ao preservar permiss�es para %s"
 
 # , c-format
-#, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "imposs�vel criar link %s"
-
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
+#, fuzzy
+msgid "cannot create pipe"
+msgstr "imposs�vel criar link %s"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
 
 # , c-format
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: a express�o  regular n�o � v�lida: %s"
+msgid "Invalid regular expression"
+msgstr "%s: a express�o  regular n�o � v�lida: %s"
 
 # , c-format
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "classe de caracteres inv�lida `%s'"
+msgid "Invalid character class name"
+msgstr "classe de caracteres inv�lida `%s'"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "mem�ria esgotada"
+msgid "Memory exhausted"
+msgstr "mem�ria esgotada"
 
 # , c-format
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: a express�o  regular n�o � v�lida: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: a express�o  regular n�o � v�lida: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "erro na busca da express�o  regular"
+msgid "Premature end of regular expression"
+msgstr "erro na busca da express�o  regular"
 
 # , c-format
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: a express�o  regular n�o � v�lida: %s"
+msgid "Regular expression too big"
+msgstr "%s: a express�o  regular n�o � v�lida: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "erro na busca da express�o  regular"
+msgid "No previous regular expression"
+msgstr "erro na busca da express�o  regular"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yY]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[yY]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "fun��o iconv n�o utiliz�vel"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "fun��o iconv n�o utiliz�vel"
 
-#~ msgid "iconv function not available"
-#~ msgstr "fun��o iconv n�o dispon�vel"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "fun��o iconv n�o dispon�vel"
 
 # , c-format
-#~ msgid "character out of range"
-#~ msgstr "caractere fora de faixa"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "caractere fora de faixa"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "imposs�vel converter U+%04X para o conjunto local de caracteres"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "imposs�vel converter U+%04X para o conjunto local de caracteres"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "imposs�vel converter U+%04X para o conjunto local de caracteres: %s"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "imposs�vel converter U+%04X para o conjunto local de caracteres: %s"
 
-#~ msgid "invalid user"
-#~ msgstr "usu�rio inv�lido"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "usu�rio inv�lido"
 
-#~ msgid "invalid group"
-#~ msgstr "grupo inv�lido"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "grupo inv�lido"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "nao foi possivel obter um grupo e login de um UID numerico "
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "nao foi possivel obter um grupo e login de um UID numerico "
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Este programa � um software livre, voc� pode redistribu�-lo e/ou modific�-"
-#~ "lo\n"
-#~ "sobre os termos da licen�a p�blica geral GNU (GPL - General Public "
-#~ "License)\n"
-#~ "publicada pela Free Software Foundation, vers�o 2 ou posteriores.\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Escrito por %s.\n"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"Este programa � um software livre, voc� pode redistribu�-lo e/ou modific�-"
+"lo\n"
+"sobre os termos da licen�a p�blica geral GNU (GPL - General Public License)\n"
+"publicada pela Free Software Foundation, vers�o 2 ou posteriores.\n"
+"\n"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Escrito por %s.\n"
 
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Escrito por %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Escrito por %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "Escrito por %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Escrito por %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Escrito por %s.\n"
 
+#: lib/xmemcoll.c:50
 #, fuzzy
-#~ msgid "string comparison failed"
-#~ msgstr "falha no stat"
+msgid "string comparison failed"
+msgstr "falha no stat"
 
-#, fuzzy
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "n�o foi poss�vel criar o link %s"
+#: lib/xmemcoll.c:53
+#, fuzzy, c-format
+msgid "The strings compared were %s and %s."
+msgstr "n�o foi poss�vel criar o link %s"
diff --git a/gnulib/po/remove-potcdate.sin b/gnulib/po/remove-potcdate.sin
new file mode 100644
index 00000000..2436c49e
--- /dev/null
+++ b/gnulib/po/remove-potcdate.sin
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/gnulib/po/ro.po b/gnulib/po/ro.po
index 5d67c751..a503592a 100644
--- a/gnulib/po/ro.po
+++ b/gnulib/po/ro.po
@@ -6,42 +6,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.4\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2003-12-10 08:55+0200\n"
 "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: gnulib/argp-help.c:147
-#, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+#: lib/argmatch.c:137
+#, fuzzy, c-format
+msgid "invalid argument %s for %s"
+msgstr "nume etichet�(tag) invalid `%s' pentru `%s'"
 
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr "%.*s: parametrul ARGP_HELP_FMT necesit� o valoare"
+#: lib/argmatch.c:138
+#, fuzzy, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "lipse�te argumentul pentru %s"
 
-#: gnulib/argp-help.c:226
+#: lib/argmatch.c:157
 #, fuzzy, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
+msgid "Valid arguments are:"
+msgstr "argumentele if valide sunt: s | r | t"
+
+#: lib/argp-help.c:194
+#, c-format
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: parametrul ARGP_HELP_FMT necesit� o valoare"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:203
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Parametru ARGP_HELP_FMT necunoscut"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:215
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Gunoi(garbage) �n ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
@@ -50,245 +54,249 @@ msgstr ""
 "asemenea obligatorii sau op�ionale pentru toate op�iunile scurte "
 "corespunz�toare."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1581
 msgid "Usage:"
 msgstr "Folosire:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1585
 msgid "  or: "
 msgstr "  sau: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 msgid " [OPTION...]"
 msgstr " [OP�IUNE...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1624
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "�ncerca�i `%s --help' sau `%s --usage' pentru mai multe informa�ii.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Raporta�i bug-urile la %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 #, fuzzy
 msgid "Unknown system error"
 msgstr "tip de mesaj necunoscut"
 
-#: gnulib/argp-parse.c:81
-#, fuzzy
-msgid "give this help list"
+#: lib/argp-parse.c:82
+msgid "Give this help list"
 msgstr "Afi�eaz� aceast� list� de ajutor"
 
-#: gnulib/argp-parse.c:82
-#, fuzzy
-msgid "give a short usage message"
+#: lib/argp-parse.c:83
+msgid "Give a short usage message"
 msgstr "Afi�eaz� un mesaj de folosire scurt"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "NUME"
 
-#: gnulib/argp-parse.c:83
-#, fuzzy
-msgid "set the program name"
+#: lib/argp-parse.c:84
+msgid "Set the program name"
 msgstr "Seteaz� numele programului"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:85
 #, fuzzy
 msgid "SECS"
 msgstr "SECUNDE"
 
-#: gnulib/argp-parse.c:85
-#, fuzzy
-msgid "hang for SECS seconds (default 3600)"
+#: lib/argp-parse.c:86
+msgid "Hang for SECS seconds (default 3600)"
 msgstr "�ntrerupe(hang) pentru SECS secunde (implicit 3600)"
 
-#: gnulib/argp-parse.c:142
-#, fuzzy
-msgid "print program version"
+#: lib/argp-parse.c:147
+msgid "Print program version"
 msgstr "Afi�eaz� versiunea programului"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:163
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(EROARE DE PROGRAM) Nici o versiune cunoscut�!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Prea multe argumente\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:762
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(EROARE DE PROGRAM) Op�iunea ar fi trebuit recunoscut�!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: op�iunea `%s' este ambigu�\n"
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `--%s' nu permite argumente\n"
-
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `%c%s' nu permite argumente\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un argument\n"
-
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: op�iune necunoscut� `--%s'\n"
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "eroare de interval(range)"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: op�iune necunoscut� `%c%s'\n"
+#: lib/c-stack.c:245
+#, fuzzy
+msgid "stack overflow"
+msgstr "subrulare(underflow) a stivei(stack)"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: op�iune invalid� -- %c\n"
+#: lib/closeout.c:94
+#, fuzzy
+msgid "write error"
+msgstr "eroare regex"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: op�iunea necesit� un argument -- %c\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "nu se poate deschide fi�ierul de ie�ire(output) \"%s\": %s"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: op�iune `-W %s' este ambigu�\n"
+msgid "error reading \"%s\""
+msgstr "eroare la cititrea din fi�ierul de intrare(input): %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: op�iune `-W %s' nu permite argumente\n"
-
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un argument\n"
+msgid "error writing \"%s\""
+msgstr "eroare �n scrierea �n mailbox: %s"
 
+#: lib/csharpcomp.c:273
 #, fuzzy
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "nume etichet�(tag) invalid `%s' pentru `%s'"
+msgid "fdopen() failed"
+msgstr "fork e�uat"
 
+#: lib/file-type.c:64
 #, fuzzy
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "lipse�te argumentul pentru %s"
+msgid "message queue"
+msgstr "%d mesaj"
 
+#: lib/gai_strerror.c:50
 #, fuzzy
-#~ msgid "Valid arguments are:"
-#~ msgstr "argumentele if valide sunt: s | r | t"
+msgid "Memory allocation failure"
+msgstr "Opera�iune e�uat�"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "program error"
-#~ msgstr "eroare de interval(range)"
+msgid "System error"
+msgstr "eroare regex"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "stack overflow"
-#~ msgstr "subrulare(underflow) a stivei(stack)"
+msgid "Unknown error"
+msgstr "Escape necunoscut %s"
 
-#, fuzzy
-#~ msgid "write error"
-#~ msgstr "eroare regex"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "nu se poate deschide fi�ierul de ie�ire(output) \"%s\": %s"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `--%s' nu permite argumente\n"
 
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "eroare la cititrea din fi�ierul de intrare(input): %s"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `%c%s' nu permite argumente\n"
 
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "eroare �n scrierea �n mailbox: %s"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: op�iunea `%s' necesit� un argument\n"
 
-#, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "fork e�uat"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: op�iune necunoscut� `--%s'\n"
 
-#, fuzzy
-#~ msgid "message queue"
-#~ msgstr "%d mesaj"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: op�iune necunoscut� `%c%s'\n"
 
-#, fuzzy
-#~ msgid "Memory allocation failure"
-#~ msgstr "Opera�iune e�uat�"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: op�iune ilegal� -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "eroare regex"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: op�iune invalid� -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Escape necunoscut %s"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: op�iunea necesit� un argument -- %c\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: op�iune ilegal� -- %c\n"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: op�iune `-W %s' este ambigu�\n"
 
-#, fuzzy
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "nu se poate trece �n uid %lu: %m"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: op�iune `-W %s' nu permite argumente\n"
 
-#, fuzzy
-#~ msgid "cannot create directory %s"
-#~ msgstr "nu se poate crea iterator: %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, fuzzy, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "nu se poate trece �n uid %lu: %m"
 
-#, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "nu se poate crea iterator: %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, fuzzy, c-format
+msgid "cannot create directory %s"
+msgstr "nu se poate crea iterator: %s"
 
-#, fuzzy
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "Permisiuni gre�ite la %s. Seta�i 0600."
+#: lib/mkdir-p.c:240
+#, fuzzy, c-format
+msgid "cannot chdir to directory %s"
+msgstr "nu se poate crea iterator: %s"
+
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, fuzzy, c-format
+msgid "cannot change permissions of %s"
+msgstr "Permisiuni gre�ite la %s. Seta�i 0600."
 
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
 #, fuzzy
-#~ msgid "memory exhausted"
-#~ msgstr "Memorie plin�"
+msgid "memory exhausted"
+msgstr "Memorie plin�"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "nu se poate crea mailerul \"%s\""
+msgid "cannot create pipe"
+msgstr "nu se poate crea mailerul \"%s\""
 
-#~ msgid "Success"
-#~ msgstr "Succes"
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Succes"
 
+#: lib/regcomp.c:149
 #, fuzzy
-#~ msgid "Invalid back reference"
-#~ msgstr "Num�r invalid"
+msgid "Invalid back reference"
+msgstr "Num�r invalid"
 
+#: lib/regcomp.c:164
 #, fuzzy
-#~ msgid "Invalid range end"
-#~ msgstr "Tip de dat� invalid"
+msgid "Invalid range end"
+msgstr "Tip de dat� invalid"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Memorie plin�"
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Memorie plin�"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "Nu exist� fi�ier anterior"
+msgid "No previous regular expression"
+msgstr "Nu exist� fi�ier anterior"
 
+#: lib/userspec.c:110
 #, fuzzy
-#~ msgid "invalid user"
-#~ msgstr "Num�r invalid"
+msgid "invalid user"
+msgstr "Num�r invalid"
 
+#: lib/userspec.c:111
 #, fuzzy
-#~ msgid "invalid group"
-#~ msgstr "Deschide grup"
+msgid "invalid group"
+msgstr "Deschide grup"
 
+#: lib/xmemcoll.c:50
 #, fuzzy
-#~ msgid "string comparison failed"
-#~ msgstr "Autentificare e�uat�"
+msgid "string comparison failed"
+msgstr "Autentificare e�uat�"
diff --git a/gnulib/po/ru.po b/gnulib/po/ru.po
index 235f5cb2..dc59f803 100644
--- a/gnulib/po/ru.po
+++ b/gnulib/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-08-22 21:05+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -16,757 +16,1062 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "неверный аргумент %s для %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "неоднозначный аргумент %s для %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Верные аргументы:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: значение %s меньше или равно %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: параметр ARGP_HELP_FMT требует значения"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: значение параметра ARGP_HELP_FMT должно быть положительным"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: неизвестный параметр ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Мусор в ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Обязательные или необязательные аргументы к длинным именам параметров "
-"остаются таковыми и к соответствующим коротким параметрам."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Обязательные или необязательные аргументы к длинным именам параметров остаются таковыми и к соответствующим коротким параметрам."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Использование:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  или: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [ПАРАМЕТР...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr ""
-"Попробуйте «%s --help» или «%s --usage» для получения более подробного "
-"описания.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Попробуйте «%s --help» или «%s --usage» для получения более подробного описания.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Об ошибках сообщай по адресу %s.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Неизвестная системная ошибка"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "показать эту справку"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "показать короткую справку по использованию"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "ИМЯ"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "задать имя программы"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "СЕКУНД"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "остановиться на заданное число СЕКУНД (по умолчанию 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "показать номер версии программы"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ОШИБКА ПРОГРАММЫ) Версия неизвестна!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: слишком много аргументов\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ОШИБКА ПРОГРАММЫ) Параметр должен был быть распознан!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "программная ошибка"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: для параметра «--%s» аргумент не разрешён\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "переполнение стека"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: для параметра «%c%s» аргумент не разрешён\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "не удалось найти временный каталог, попробуйте задать $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: для параметра «--%s» требуется аргумент\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "не удалось создать временный каталог с помощью шаблона «%s»"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: нераспознанный параметр «--%s»\n"
+msgid "cannot remove temporary file %s"
+msgstr "не удалось удалить временный файл %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: нераспознанный параметр «%c%s»\n"
+msgid "cannot remove temporary directory %s"
+msgstr "не удалось удалить временный каталог %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: неправильный параметр -- «%c»\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "ошибка закрытия файла"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: для параметра требуется аргумент -- «%c»\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "ошибка записи"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: двусмысленный параметр «-W %s»\n"
+msgid "preserving permissions for %s"
+msgstr "сохраняются права доступа для %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: у параметра «-W %s» не может быть аргумента\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "ошибка при открытии «%s» для чтения"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: для параметра «-W %s» требуется аргумент\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "неверный аргумент %s для %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "неоднозначный аргумент %s для %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Верные аргументы:"
-
-#~ msgid "program error"
-#~ msgstr "программная ошибка"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "не удалось открыть файл резервной копии «%s» для записи"
 
-#~ msgid "stack overflow"
-#~ msgstr "переполнение стека"
-
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "не удалось найти временный каталог, попробуйте задать $TMPDIR"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "не удалось создать временный каталог с помощью шаблона «%s»"
-
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "не удалось удалить временный файл %s"
-
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "не удалось удалить временный каталог %s"
-
-#~ msgid "error closing file"
-#~ msgstr "ошибка закрытия файла"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "ошибка чтения «%s»"
 
-#~ msgid "write error"
-#~ msgstr "ошибка записи"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "ошибка записи «%s»"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "сохраняются права доступа для %s"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "ошибка после чтения «%s»"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "ошибка при открытии «%s» для чтения"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "ошибка при выполнении fdopen()"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "не удалось открыть файл резервной копии «%s» для записи"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "Не найден компилятор C#, попробуйте установить pnet"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "ошибка чтения «%s»"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "Не найдена виртуальная машина C#, попробуйте установить pnet"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "ошибка записи «%s»"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "подпроцесс %s завершился с ошибкой"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "ошибка после чтения «%s»"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "пустой обычный файл"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "ошибка при выполнении fdopen()"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "обычный файл"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "Не найден компилятор C#, попробуйте установить pnet"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "каталог"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "Не найдена виртуальная машина C#, попробуйте установить pnet"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "блочный специальный файл"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "подпроцесс %s завершился с ошибкой"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "символьный специальный файл"
 
-#~ msgid "regular empty file"
-#~ msgstr "пустой обычный файл"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "файл-очередь"
 
-#~ msgid "regular file"
-#~ msgstr "обычный файл"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "символьная ссылка"
 
-#~ msgid "directory"
-#~ msgstr "каталог"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "сокет"
 
-#~ msgid "block special file"
-#~ msgstr "блочный специальный файл"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "очередь сообщений"
 
-#~ msgid "character special file"
-#~ msgstr "символьный специальный файл"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "семафор"
 
-#~ msgid "fifo"
-#~ msgstr "файл-очередь"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "объект общей памяти"
 
-#~ msgid "symbolic link"
-#~ msgstr "символьная ссылка"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "объект типизированной памяти"
 
-#~ msgid "socket"
-#~ msgstr "сокет"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "странный файл"
 
-#~ msgid "message queue"
-#~ msgstr "очередь сообщений"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Адресное семейство не поддерживается для имени узла"
 
-#~ msgid "semaphore"
-#~ msgstr "семафор"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Временная ошибка при определении имени"
 
-#~ msgid "shared memory object"
-#~ msgstr "объект общей памяти"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Неверное значение для ai_flags"
 
-#~ msgid "typed memory object"
-#~ msgstr "объект типизированной памяти"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Невосстановимая ошибка при определении имени"
 
-#~ msgid "weird file"
-#~ msgstr "странный файл"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family не поддерживается"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Адресное семейство не поддерживается для имени узла"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Ошибка при выделении памяти"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Временная ошибка при определении имени"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "С именем узла не связано ни одного адреса"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Неверное значение для ai_flags"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Неизвестное имя или служба"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Невосстановимая ошибка при определении имени"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Servname не поддерживается для ai_socktype"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family не поддерживается"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype не поддерживается"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Ошибка при выделении памяти"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Системная ошибка"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "С именем узла не связано ни одного адреса"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Слишком маленький буфер, указанный в аргументе"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Неизвестное имя или служба"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Выполняется обработка запроса"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Servname не поддерживается для ai_socktype"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Запрос отменён"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype не поддерживается"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Запрос не отменён"
 
-#~ msgid "System error"
-#~ msgstr "Системная ошибка"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Все запросы выполнены"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Слишком маленький буфер, указанный в аргументе"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Прервано по сигналу"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Выполняется обработка запроса"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Строковый параметр неправильно закодирован"
 
-#~ msgid "Request canceled"
-#~ msgstr "Запрос отменён"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Запрос не отменён"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: двусмысленный параметр «%s»; возможные варианты:"
 
-#~ msgid "All requests done"
-#~ msgstr "Все запросы выполнены"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: для параметра «--%s» аргумент не разрешён\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Прервано по сигналу"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: для параметра «%c%s» аргумент не разрешён\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Строковый параметр неправильно закодирован"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: для параметра «--%s» требуется аргумент\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Неизвестная ошибка"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: нераспознанный параметр «--%s»\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "неверный аргумент source_version для compile_java_class"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: нераспознанный параметр «%c%s»\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "неверный аргумент target_version для compile_java_class"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: неправильный параметр -- «%c»\n"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "не удалось создать «%s»"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: для параметра требуется аргумент -- «%c»\n"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "ошибка записи в файл «%s»"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: двусмысленный параметр «-W %s»\n"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Не найден компилятор Java, попробуйте установить gcj или задать $JAVAC"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: у параметра «-W %s» не может быть аргумента\n"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Не найдена виртуальная машина Java, попробуйте установить gcj или задать "
-#~ "$JAVA"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: для параметра «-W %s» требуется аргумент\n"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "ошибка вв/вывода подпроцесса %s"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "неверный аргумент source_version для compile_java_class"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "невозможно изменить права доступа %s"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "неверный аргумент target_version для compile_java_class"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "невозможно создать каталог %s"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "не удалось создать «%s»"
 
-#~ msgid "memory exhausted"
-#~ msgstr "закончилась память"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "ошибка записи в файл «%s»"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "не удалось запомнить текущий рабочий каталог"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Не найден компилятор Java, попробуйте установить gcj или задать $JAVAC"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "не удалось вернуться в первоначальный рабочий каталог"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Не найдена виртуальная машина Java, попробуйте установить gcj или задать $JAVA"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Не удалось открыть /dev/zero на чтение"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "ошибка вв/вывода подпроцесса %s"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "не удалось создать нить для чтения"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "невозможно изменить права доступа %s"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "не удалось настроить неблокированный ввод-вывод в подпроцессе %s"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "невозможно создать каталог %s"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "не удалось связаться с подпроцессом %s"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "закончилась память"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "не удалось записать в подпроцесс %s"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "не удалось запомнить текущий рабочий каталог"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "не удалось прочитать из подпроцесса %s"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "не удалось вернуться в первоначальный рабочий каталог"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "подпроцесс %s завершился с кодом выхода %d"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Не удалось открыть /dev/zero на чтение"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "не удалось создать нити"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "не удалось создать нить для чтения"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "подпроцесс %s завершился с кодом выхода %d"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "не удалось настроить неблокированный ввод-вывод в подпроцессе %s"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "Френсис Пинард (Franc,ois Pinard)"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "не удалось связаться с подпроцессом %s"
 
-#~ msgid "`"
-#~ msgstr "«"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "не удалось записать в подпроцесс %s"
 
-#~ msgid "'"
-#~ msgstr "»"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "не удалось прочитать из подпроцесса %s"
 
-#~ msgid "Success"
-#~ msgstr "Успешно"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "подпроцесс %s завершился с кодом выхода %d"
 
-#~ msgid "No match"
-#~ msgstr "Нет совпадений"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "не удалось создать нити"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Неверное регулярное выражение"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "подпроцесс %s завершился с кодом выхода %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "Френсис Пинард (Franc,ois Pinard)"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "«"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "»"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Успешно"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Нет совпадений"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Неверное регулярное выражение"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Неверный символ сравнения"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Неверное имя класса символов"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Конечная обратная косая черта"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Неверная обратная ссылка"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Непарная [ или [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Непарная ( или \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Непарная \\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Недопустимое содержимое в \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Неверный конец диапазона"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Закончилась память"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Недопустимое предшествующее регулярное выражение"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Преждевременное завершение регулярного выражения"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Слишком большое регулярное выражение"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Непарная ) или \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Отсутствует предыдущее регулярное выражение"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[ДдYy]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[НнNn]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "задание прав доступа для %s"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Неверный символ сравнения"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Обрыв терминальной линии"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Неверное имя класса символов"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Прерывание"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Конечная обратная косая черта"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Аварийное прерывание"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Неверная обратная ссылка"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Недопустимая инструкция"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Непарная [ или [^"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Прерывание на контрольной точке"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Непарная ( или \\("
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Прервано"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Непарная \\{"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Ошибка операции с плавающей точкой"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Недопустимое содержимое в \\{\\}"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Уничтожение"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Неверный конец диапазона"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Ошибка шины"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Закончилась память"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Нарушение сегментирования"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Недопустимое предшествующее регулярное выражение"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Обрыв канала"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Преждевременное завершение регулярного выражения"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Сигнал по таймеру"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Слишком большое регулярное выражение"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Завершение"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Непарная ) или \\)"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Срочная операция ввода-вывода"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Отсутствует предыдущее регулярное выражение"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Останов (сигнал)"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[ДдYy]"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Останов"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[НнNn]"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Возобновление"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "задание прав доступа для %s"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Потомок завершил работу"
 
-#~ msgid "Hangup"
-#~ msgstr "Обрыв терминальной линии"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Останов (ввод с терминала)"
 
-#~ msgid "Interrupt"
-#~ msgstr "Прерывание"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Останов (вывод с терминала)"
 
-#~ msgid "Quit"
-#~ msgstr "Аварийное прерывание"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Возможен ввод-вывод"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Недопустимая инструкция"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Превышен предел по процессорному времени"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Прерывание на контрольной точке"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Превышен предел размера файла"
 
-#~ msgid "Aborted"
-#~ msgstr "Прервано"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Виртуальное время истекло"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Ошибка операции с плавающей точкой"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Время профилирования истекло"
 
-#~ msgid "Killed"
-#~ msgstr "Уничтожение"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Окно изменено"
 
-#~ msgid "Bus error"
-#~ msgstr "Ошибка шины"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Определяемый пользователем сигнал 1"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Нарушение сегментирования"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Определяемый пользователем сигнал 2"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Обрыв канала"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Ловушка EMT"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Сигнал по таймеру"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Неправильный системный вызов"
 
-#~ msgid "Terminated"
-#~ msgstr "Завершение"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Ошибка работы со стеком"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Срочная операция ввода-вывода"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Запрос информации"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Останов (сигнал)"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Отказ питания"
 
-#~ msgid "Stopped"
-#~ msgstr "Останов"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Ресурс потерян"
 
-#~ msgid "Continued"
-#~ msgstr "Возобновление"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "ошибка записи в закрытый канал или сокет"
 
-#~ msgid "Child exited"
-#~ msgstr "Потомок завершил работу"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "не удалось создать канал"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Останов (ввод с терминала)"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Сигнал реального времени %d"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Останов (вывод с терминала)"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Неизвестный сигнал %d"
 
-#~ msgid "I/O possible"
-#~ msgstr "Возможен ввод-вывод"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "функция iconv неприменима"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Превышен предел по процессорному времени"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "функция iconv недоступна"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Превышен предел размера файла"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "символ вне допустимого диапазона"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Виртуальное время истекло"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "невозможно преобразовать U+%04X в локальную кодировку"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Время профилирования истекло"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "невозможно преобразовать U+%04X в локальную кодировку: %s"
 
-#~ msgid "Window changed"
-#~ msgstr "Окно изменено"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "неверный пользователь"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Определяемый пользователем сигнал 1"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "неверная группа"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Определяемый пользователем сигнал 2"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "неверный spec"
 
-#~ msgid "EMT trap"
-#~ msgstr "Ловушка EMT"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "невозможно показать сообщение об ошибке"
 
-#~ msgid "Bad system call"
-#~ msgstr "Неправильный системный вызов"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Упакован %s (%s)\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Ошибка работы со стеком"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Упакован %s\n"
 
-#~ msgid "Information request"
-#~ msgstr "Запрос информации"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Power failure"
-#~ msgstr "Отказ питания"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl.html>.\n"
+"Это свободное ПО: вы можете продавать и распространять его.\n"
+"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Автор программы: %s.\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Ресурс потерян"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Авторы программы: %s и %s.\n"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "ошибка записи в закрытый канал или сокет"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Авторы программы: %s, %s и %s.\n"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "не удалось создать канал"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Авторы программы: %s, %s, %s\n"
+"и %s.\n"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Сигнал реального времени %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Авторы программы: %s, %s, %s,\n"
+"%s и %s.\n"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Неизвестный сигнал %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Авторы программы: %s, %s, %s,\n"
+"%s, %s и %s.\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "функция iconv неприменима"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Авторы программы: %s, %s, %s,\n"
+"%s, %s, %s и %s.\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "функция iconv недоступна"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Авторы программы: %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Авторы программы:  %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s и %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Авторы программы: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s и другие.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Об ошибках сообщайте по адресу: %s\n"
 
-#~ msgid "character out of range"
-#~ msgstr "символ вне допустимого диапазона"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Об ошибках в %s сообщайте по адресу: %s\n"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "невозможно преобразовать U+%04X в локальную кодировку"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Домашняя страница %s: <%s>\n"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "невозможно преобразовать U+%04X в локальную кодировку: %s"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Домашняя страница %s: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "invalid user"
-#~ msgstr "неверный пользователь"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Справка по работе с ПО GNU: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "invalid group"
-#~ msgstr "неверная группа"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle завершилась неудачно"
 
-#~ msgid "invalid spec"
-#~ msgstr "неверный spec"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "не удалось восстановить fd %d: dup2 завершилась неудачно"
 
-#~ msgid "unable to display error message"
-#~ msgstr "невозможно показать сообщение об ошибке"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "подпроцесс %s"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Упакован %s (%s)\n"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "подпроцесс %s получил сигнал завершения %d"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Упакован %s\n"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "stdin"
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "stdout"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Лицензия GPLv3+: GNU GPL версии 3 или новее <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "Это свободное ПО: вы можете продавать и распространять его.\n"
-#~ "Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
-#~ "\n"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "stderr"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Автор программы: %s.\n"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "неизвестный поток"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Авторы программы: %s и %s.\n"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "не удалось повторно открыть %s в режиме %s"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Авторы программы: %s, %s и %s.\n"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "сравнение строк завершилось неудачно"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Авторы программы: %s, %s, %s\n"
-#~ "и %s.\n"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Чтобы обойти эту проблему, установите LC_ALL='C'."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Авторы программы: %s, %s, %s,\n"
-#~ "%s и %s.\n"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Сравнивались строки %s %s."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Авторы программы: %s, %s, %s,\n"
-#~ "%s, %s и %s.\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "невозможно выполнить форматированный вывод"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Авторы программы: %s, %s, %s,\n"
-#~ "%s, %s, %s и %s.\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "неверный аргумент %s%s для «%s»"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Авторы программы: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Авторы программы:  %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s и %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Авторы программы: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s и другие.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Об ошибках сообщайте по адресу: %s\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Об ошибках в %s сообщайте по адресу: %s\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "Домашняя страница %s: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "Домашняя страница %s: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr "Справка по работе с ПО GNU: <http://www.gnu.org/gethelp/>\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle завершилась неудачно"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "не удалось восстановить fd %d: dup2 завершилась неудачно"
-
-#~ msgid "%s subprocess"
-#~ msgstr "подпроцесс %s"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "подпроцесс %s получил сигнал завершения %d"
-
-#~ msgid "stdin"
-#~ msgstr "stdin"
-
-#~ msgid "stdout"
-#~ msgstr "stdout"
-
-#~ msgid "stderr"
-#~ msgstr "stderr"
-
-#~ msgid "unknown stream"
-#~ msgstr "неизвестный поток"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "не удалось повторно открыть %s в режиме %s"
-
-#~ msgid "string comparison failed"
-#~ msgstr "сравнение строк завершилось неудачно"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Чтобы обойти эту проблему, установите LC_ALL='C'."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Сравнивались строки %s %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "невозможно выполнить форматированный вывод"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "неверный аргумент %s%s для «%s»"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "неверный суффикс %s%s в аргументе «%s»"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "неверный суффикс %s%s в аргументе «%s»"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "значение %s%s аргумента «%s» слишком велико"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "значение %s%s аргумента «%s» слишком велико"
diff --git a/gnulib/po/rw.po b/gnulib/po/rw.po
index 4ab5a20d..3d2d48a4 100644
--- a/gnulib/po/rw.po
+++ b/gnulib/po/rw.po
@@ -16,37 +16,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailutils 0.6\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
-"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
-#, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+#: lib/argmatch.c:137
+#, fuzzy, c-format
+msgid "invalid argument %s for %s"
+msgstr "Sibyo kugirango"
 
-#: gnulib/argp-help.c:220
+#: lib/argmatch.c:138
 #, fuzzy, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-"%.*Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
+msgid "ambiguous argument %s for %s"
+msgstr "kugirango"
+
+#: lib/argmatch.c:157
+#, fuzzy, c-format
+msgid "Valid arguments are:"
+msgstr "ingingo"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:194
 #, fuzzy, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
+msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr ""
 "%.*Project- Id- Version: basctl\n"
 "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
@@ -57,7 +53,7 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:203
 #, fuzzy, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr ""
@@ -70,12 +66,12 @@ msgstr ""
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:215
 #, fuzzy, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "in"
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -84,465 +80,559 @@ msgstr ""
 "Cyangwa Bitari ngombwa ingingo Kuri Amahitamo Cyangwa Bitari ngombwa "
 "kugirango Amahitamo"
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1581
 msgid "Usage:"
 msgstr "Ikoresha:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1585
 #, fuzzy
 msgid "  or: "
 msgstr "Cyangwa"
 
-#: gnulib/argp-help.c:1656
-msgid " [OPTION...]"
-msgstr ""
-
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Cyangwa kugirango Birenzeho Ibisobanuro"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Kuri"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 #, fuzzy
 msgid "Unknown system error"
 msgstr "Sisitemu Ikosa"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:82
 #, fuzzy
-msgid "give this help list"
+msgid "Give this help list"
 msgstr "iyi Ifashayobora Urutonde"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:83
 #, fuzzy
-msgid "give a short usage message"
+msgid "Give a short usage message"
 msgstr "a Ikoresha: Ubutumwa"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 #, fuzzy
 msgid "NAME"
 msgstr "Izina"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 #, fuzzy
-msgid "set the program name"
+msgid "Set the program name"
 msgstr "i Porogaramu Izina:"
 
 # offmgr/source\offapp\dialog\optgdlg.src:OFA_TP_MISC.FT_HELPAGENT_TIME_UNIT.text
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:85
 #, fuzzy
 msgid "SECS"
 msgstr "amasogonda"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:86
 #, fuzzy
-msgid "hang for SECS seconds (default 3600)"
+msgid "Hang for SECS seconds (default 3600)"
 msgstr "kugirango amasogonda Mburabuzi"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:147
 #, fuzzy
-msgid "print program version"
+msgid "Print program version"
 msgstr "Porogaramu Verisiyo"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:163
 #, fuzzy
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(Verisiyo"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "ingingo"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:762
 #, fuzzy
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(Verisiyo"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s:Ihitamo ni"
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
-
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s:Ihitamo"
-
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s:Ihitamo"
+# 4952
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "Ikosa ryo mu Isoma"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
-#, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s:Ihitamo"
+# svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_CLASS_WRITE.text
+#: lib/closeout.c:94
+#, fuzzy
+msgid "write error"
+msgstr "Kwandika ikosa"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s:Sibyo Ihitamo"
+msgid "error while opening \"%s\" for reading"
+msgstr "Gufungura kugirango"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s:Ihitamo"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "Gufungura kugirango"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s:Ihitamo ni"
+msgid "error reading \"%s\""
+msgstr "Ikosa"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
+msgid "error writing \"%s\""
+msgstr "Ikosa"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s:Ihitamo"
+msgid "error after reading \"%s\""
+msgstr "Ikosa"
 
+#: lib/csharpcomp.c:273
 #, fuzzy
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "Sibyo kugirango"
+msgid "fdopen() failed"
+msgstr "Gufungura Byanze"
 
-#, fuzzy
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "kugirango"
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
+#, fuzzy, c-format
+msgid "%s subprocess failed"
+msgstr "%s:Byanze"
 
+#: lib/file-type.c:43
 #, fuzzy
-#~ msgid "Valid arguments are:"
-#~ msgstr "ingingo"
+msgid "regular empty file"
+msgstr "Ibisanzwe ubusa IDOSIYE"
 
-# 4952
+#: lib/file-type.c:43
 #, fuzzy
-#~ msgid "program error"
-#~ msgstr "Ikosa ryo mu Isoma"
+msgid "regular file"
+msgstr "Ibisanzwe IDOSIYE"
 
-# svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_CLASS_WRITE.text
+# svtools/source\dialogs\filedlg2.src:STR_FILEDLG_DIR.text
+#: lib/file-type.c:46
 #, fuzzy
-#~ msgid "write error"
-#~ msgstr "Kwandika ikosa"
+msgid "directory"
+msgstr "Ububiko"
 
+#: lib/file-type.c:49
 #, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "Gufungura kugirango"
+msgid "block special file"
+msgstr "Funga Bidasanzwe IDOSIYE"
 
+#: lib/file-type.c:52
 #, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "Gufungura kugirango"
+msgid "character special file"
+msgstr "Inyuguti Bidasanzwe IDOSIYE"
 
+#: lib/file-type.c:58
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "Ikosa"
+msgid "symbolic link"
+msgstr "Ihuza"
 
+#: lib/file-type.c:64
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "Ikosa"
+msgid "message queue"
+msgstr "Ubutumwa Umurongo"
 
+#: lib/file-type.c:70
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "Ikosa"
+msgid "shared memory object"
+msgstr "Ububiko Igikoresho"
 
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "Gufungura Byanze"
+msgid "typed memory object"
+msgstr "Ububiko Igikoresho"
 
+#: lib/file-type.c:75
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s:Byanze"
+msgid "weird file"
+msgstr "IDOSIYE"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "regular empty file"
-#~ msgstr "Ibisanzwe ubusa IDOSIYE"
+msgid "Address family for hostname not supported"
+msgstr "Idosiye OYA"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "regular file"
-#~ msgstr "Ibisanzwe IDOSIYE"
+msgid "ai_family not supported"
+msgstr "Idosiye OYA"
 
-# svtools/source\dialogs\filedlg2.src:STR_FILEDLG_DIR.text
+#: lib/gai_strerror.c:50
 #, fuzzy
-#~ msgid "directory"
-#~ msgstr "Ububiko"
+msgid "Memory allocation failure"
+msgstr "Byanze"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "block special file"
-#~ msgstr "Funga Bidasanzwe IDOSIYE"
+msgid "ai_socktype not supported"
+msgstr "Idosiye OYA"
 
+# svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_CLASS_WRITE.text
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "character special file"
-#~ msgstr "Inyuguti Bidasanzwe IDOSIYE"
+msgid "System error"
+msgstr "Kwandika ikosa"
 
+#: lib/gai_strerror.c:59
 #, fuzzy
-#~ msgid "symbolic link"
-#~ msgstr "Ihuza"
+msgid "Request not canceled"
+msgstr "Ikintu OYA Byabonetse"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "message queue"
-#~ msgstr "Ubutumwa Umurongo"
+msgid "Unknown error"
+msgstr "Sisitemu Ikosa"
 
-#, fuzzy
-#~ msgid "shared memory object"
-#~ msgstr "Ububiko Igikoresho"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, fuzzy, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s:Ihitamo ni"
 
-#, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "Ububiko Igikoresho"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, fuzzy, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
 
-#, fuzzy
-#~ msgid "weird file"
-#~ msgstr "IDOSIYE"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, fuzzy, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Idosiye OYA"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, fuzzy, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s:Ihitamo"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "Idosiye OYA"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, fuzzy, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s:Ihitamo"
 
-#, fuzzy
-#~ msgid "Memory allocation failure"
-#~ msgstr "Byanze"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, fuzzy, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s:Ihitamo"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "Idosiye OYA"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, fuzzy, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s:Ihitamo"
 
-# svtools/source\misc\errtxt.src:RID_ERRHDL.ERRCODE_CLASS_WRITE.text
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "Kwandika ikosa"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, fuzzy, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s:Sibyo Ihitamo"
 
-#, fuzzy
-#~ msgid "Request not canceled"
-#~ msgstr "Ikintu OYA Byabonetse"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s:Ihitamo"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Sisitemu Ikosa"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, fuzzy, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s:Ihitamo ni"
 
-#, fuzzy
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s:Ihitamo"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, fuzzy, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
 
+#: lib/human.c:486
 #, fuzzy
-#~ msgid "block size"
-#~ msgstr "Funga Ingano"
+msgid "block size"
+msgstr "Funga Ingano"
 
-#, fuzzy
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%sni OYA a bushyinguro"
+#: lib/mkdir-p.c:106
+#, fuzzy, c-format
+msgid "%s exists but is not a directory"
+msgstr "%sni OYA a bushyinguro"
 
-#, fuzzy
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "Guhindura>> Na Cyangwa Itsinda Bya"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, fuzzy, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "Guhindura>> Na Cyangwa Itsinda Bya"
 
-#, fuzzy
-#~ msgid "cannot create directory %s"
-#~ msgstr "Kurema bushyinguro"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, fuzzy, c-format
+msgid "cannot create directory %s"
+msgstr "Kurema bushyinguro"
 
-#, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "Kuri bushyinguro"
+#: lib/mkdir-p.c:240
+#, fuzzy, c-format
+msgid "cannot chdir to directory %s"
+msgstr "Kuri bushyinguro"
 
-#, fuzzy
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "Guhindura>> Uruhushya Bya"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, fuzzy, c-format
+msgid "cannot change permissions of %s"
+msgstr "Guhindura>> Uruhushya Bya"
 
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
 #, fuzzy
-#~ msgid "memory exhausted"
-#~ msgstr "Ububiko"
+msgid "memory exhausted"
+msgstr "Ububiko"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "Kuri Icyabitswe KIGEZWEHO bushyinguro"
+msgid "unable to record current working directory"
+msgstr "Kuri Icyabitswe KIGEZWEHO bushyinguro"
 
+#: lib/openat-die.c:49
 #, fuzzy
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "Byanze Kuri Garuka Kuri bushyinguro"
+msgid "failed to return to initial working directory"
+msgstr "Byanze Kuri Garuka Kuri bushyinguro"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "%s:Byanze Kuri Gufungura kugirango"
+msgid "Failed to open /dev/zero for read"
+msgstr "%s:Byanze Kuri Gufungura kugirango"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "Kurema Ihuza"
+msgid "cannot create pipe"
+msgstr "Kurema Ihuza"
 
 # basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
 #, fuzzy
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "'"
-#~ msgstr "'"
-
-#~ msgid "Success"
-#~ msgstr "Ibyatunganye"
-
-#, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s:Sibyo Ibisanzwe imvugo"
-
-#, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "Sibyo Inyuguti ishuri"
-
-#, fuzzy
-#~ msgid "Invalid back reference"
-#~ msgstr "Umubare utari wo"
+msgid "`"
+msgstr "`"
 
-#, fuzzy
-#~ msgid "Invalid range end"
-#~ msgstr "Ipaji Urutonde"
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
 
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "Ububiko"
-
-#, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s:Sibyo Ibisanzwe imvugo"
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Ibyatunganye"
 
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Ikosa in Ibisanzwe imvugo Gushaka"
+msgid "Invalid regular expression"
+msgstr "%s:Sibyo Ibisanzwe imvugo"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s:Sibyo Ibisanzwe imvugo"
+msgid "Invalid character class name"
+msgstr "Sibyo Inyuguti ishuri"
 
+#: lib/regcomp.c:149
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "Ikosa in Ibisanzwe imvugo Gushaka"
+msgid "Invalid back reference"
+msgstr "Umubare utari wo"
 
+#: lib/regcomp.c:164
 #, fuzzy
-#~ msgid "iconv function not usable"
-#~ msgstr "Umumaro OYA"
+msgid "Invalid range end"
+msgstr "Ipaji Urutonde"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "iconv function not available"
-#~ msgstr "Umumaro OYA Bihari"
+msgid "Memory exhausted"
+msgstr "Ububiko"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "character out of range"
-#~ msgstr "Inyuguti Inyuma Bya Urutonde"
+msgid "Invalid preceding regular expression"
+msgstr "%s:Sibyo Ibisanzwe imvugo"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "GUHINDURA U Kuri Inyuguti Gushyiraho"
+msgid "Premature end of regular expression"
+msgstr "Ikosa in Ibisanzwe imvugo Gushaka"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "GUHINDURA U Kuri Inyuguti Gushyiraho"
+msgid "Regular expression too big"
+msgstr "%s:Sibyo Ibisanzwe imvugo"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "invalid user"
-#~ msgstr "Sibyo Ukoresha:"
+msgid "No previous regular expression"
+msgstr "Ikosa in Ibisanzwe imvugo Gushaka"
 
+#: lib/unicodeio.c:147
 #, fuzzy
-#~ msgid "invalid group"
-#~ msgstr "Sibyo Itsinda"
+msgid "iconv function not usable"
+msgstr "Umumaro OYA"
 
+#: lib/unicodeio.c:149
 #, fuzzy
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "Kubona i Ifashayinjira Itsinda Bya a Bikurikije umubare"
+msgid "iconv function not available"
+msgstr "Umumaro OYA Bihari"
 
+#: lib/unicodeio.c:156
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Porogaramu ni Kigenga Na Cyangwa i Bya i Nka Verisiyo 2. Cyangwa ku "
-#~ "Ihitamo Verisiyo"
+msgid "character out of range"
+msgstr "Inyuguti Inyuma Bya Urutonde"
 
-#, fuzzy
-#~ msgid "Written by %s.\n"
-#~ msgstr "ku"
+#: lib/unicodeio.c:219
+#, fuzzy, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "GUHINDURA U Kuri Inyuguti Gushyiraho"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "ku Na"
+#: lib/unicodeio.c:221
+#, fuzzy, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "GUHINDURA U Kuri Inyuguti Gushyiraho"
 
+#: lib/userspec.c:110
 #, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "ku Na"
+msgid "invalid user"
+msgstr "Sibyo Ukoresha:"
 
+#: lib/userspec.c:111
 #, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "ku Na"
+msgid "invalid group"
+msgstr "Sibyo Itsinda"
 
+#: lib/userspec.c:113
 #, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "ku Na"
+msgid "cannot get the login group of a numeric UID"
+msgstr "Kubona i Ifashayinjira Itsinda Bya a Bikurikije umubare"
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr "ku Na"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"Porogaramu ni Kigenga Na Cyangwa i Bya i Nka Verisiyo 2. Cyangwa ku Ihitamo "
+"Verisiyo"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr "ku Na"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, fuzzy, c-format
+msgid "Written by %s.\n"
+msgstr "ku"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "ku Na"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "ku Na"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "ku Na"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "ku Na"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr "ku Na Ibindi"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "ku Na"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "ku Na"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr "ku Na"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr "ku Na"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:130
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr "ku Na"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:138
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "ku Na"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:148
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr "ku Na Ibindi"
 
+#: lib/xmemcoll.c:50
 #, fuzzy
-#~ msgid "string comparison failed"
-#~ msgstr "Ikurikiranyanyuguti Byanze"
+msgid "string comparison failed"
+msgstr "Ikurikiranyanyuguti Byanze"
 
+#: lib/xmemcoll.c:51
 #, fuzzy
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Kuri Akazi i"
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Kuri Akazi i"
 
-#, fuzzy
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Ikurikiranyanyuguti Na"
+#: lib/xmemcoll.c:53
+#, fuzzy, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Ikurikiranyanyuguti Na"
diff --git a/gnulib/po/sk.po b/gnulib/po/sk.po
index ab1ec235..0913c3d1 100644
--- a/gnulib/po/sk.po
+++ b/gnulib/po/sk.po
@@ -6,65 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: textutils 2.0.14\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2001-06-08 22:10 +02:00\n"
 "Last-Translator: Stanislav Meduna <stano@trillian.eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: gnulib/argp-help.c:147
-#, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+#: lib/argmatch.c:137
+#, fuzzy, c-format
+msgid "invalid argument %s for %s"
+msgstr "chybn� argument %s pre `%s'"
 
-#: gnulib/argp-help.c:235
-#, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+#: lib/argmatch.c:138
+#, fuzzy, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "nejednozna�n� argument %s pre `%s'"
 
-#: gnulib/argp-help.c:247
+#: lib/argmatch.c:157
 #, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
-
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Platn� argumenty s�:"
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Pou�itie: %s [PREP�NA�] [S�BOR]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Viac inform�ci� z�skate pr�kazom `%s --help'.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
@@ -73,363 +48,406 @@ msgstr ""
 "anglicky), pripomienky k prekladu zasielajte na adresu <sk@li.org> "
 "(slovensky)."
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Nezn�ma syst�mov� chyba"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "NAME"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:147
 #, fuzzy
-msgid "print program version"
+msgid "Print program version"
 msgstr "chyba pri ��tan�"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "pr�li� ve�a argumentov"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
-
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: vo�ba `%s' nie je jednozna�n�\n"
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: prep�na� `--%s' nepovo�uje argument\n"
-
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: prep�na� `%c%s' nepovo�uje argument\n"
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "chyba pri ��tan�"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: prep�na� `%s' vy�aduje argument\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "chyba pri z�pise"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: nezn�my prep�na� `--%s'\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "nie je mo�n� otvori� %s pre ��tanie"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: nezn�my prep�na� `%c%s'\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "nie je mo�n� otvori� %s pre ��tanie"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: chybn� prep�na� -- %c\n"
+msgid "error reading \"%s\""
+msgstr "chyba pri ��tan� %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: prep�na� vy�aduje argument -- %c\n"
+msgid "error writing \"%s\""
+msgstr "chyba pri z�pise %s"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: prep�na� `-W %s' nie je jednozna�n�\n"
+msgid "error after reading \"%s\""
+msgstr "chyba pri ��tan� %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: prep�na� `-W %s' nepovo�uje argument\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "zlyhalo otvorenie"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: prep�na� `%s' vy�aduje argument\n"
+msgid "%s subprocess failed"
+msgstr "%s: chybn� vzor"
 
+#: lib/file-type.c:43
 #, fuzzy
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "chybn� argument %s pre `%s'"
+msgid "regular empty file"
+msgstr "zlyhalo ��tanie"
 
+#: lib/file-type.c:43
 #, fuzzy
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "nejednozna�n� argument %s pre `%s'"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Platn� argumenty s�:"
+msgid "regular file"
+msgstr "zlyhalo ��tanie"
 
+#: lib/file-type.c:46
 #, fuzzy
-#~ msgid "program error"
-#~ msgstr "chyba pri ��tan�"
-
-#~ msgid "write error"
-#~ msgstr "chyba pri z�pise"
+msgid "directory"
+msgstr "Adres�r: "
 
+#: lib/file-type.c:49
 #, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "nie je mo�n� otvori� %s pre ��tanie"
+msgid "block special file"
+msgstr "ve�kos� bloku"
 
+#: lib/file-type.c:52
 #, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "nie je mo�n� otvori� %s pre ��tanie"
+msgid "character special file"
+msgstr "poz�cia znaku je nula"
 
+#: lib/file-type.c:58
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "chyba pri ��tan� %s"
+msgid "symbolic link"
+msgstr "ioctl na `%s' nie je mo�n� vykona�"
 
+#: lib/file-type.c:75
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "chyba pri z�pise %s"
+msgid "weird file"
+msgstr "zlyhalo ��tanie"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "chyba pri ��tan� %s"
+msgid "Address family for hostname not supported"
+msgstr "tento syst�m nepodporuje r�ry"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "zlyhalo otvorenie"
+msgid "ai_family not supported"
+msgstr "tento syst�m nepodporuje r�ry"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: chybn� vzor"
+msgid "ai_socktype not supported"
+msgstr "tento syst�m nepodporuje r�ry"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "regular empty file"
-#~ msgstr "zlyhalo ��tanie"
+msgid "System error"
+msgstr "chyba pri z�pise"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "regular file"
-#~ msgstr "zlyhalo ��tanie"
+msgid "Unknown error"
+msgstr "Nezn�ma syst�mov� chyba"
 
-#, fuzzy
-#~ msgid "directory"
-#~ msgstr "Adres�r: "
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: vo�ba `%s' nie je jednozna�n�\n"
 
-#, fuzzy
-#~ msgid "block special file"
-#~ msgstr "ve�kos� bloku"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: prep�na� `--%s' nepovo�uje argument\n"
 
-#, fuzzy
-#~ msgid "character special file"
-#~ msgstr "poz�cia znaku je nula"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: prep�na� `%c%s' nepovo�uje argument\n"
 
-#, fuzzy
-#~ msgid "symbolic link"
-#~ msgstr "ioctl na `%s' nie je mo�n� vykona�"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: prep�na� `%s' vy�aduje argument\n"
 
-#, fuzzy
-#~ msgid "weird file"
-#~ msgstr "zlyhalo ��tanie"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nezn�my prep�na� `--%s'\n"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "tento syst�m nepodporuje r�ry"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nezn�my prep�na� `%c%s'\n"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "tento syst�m nepodporuje r�ry"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: nepovolen� prep�na� -- %c\n"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "tento syst�m nepodporuje r�ry"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: chybn� prep�na� -- %c\n"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "chyba pri z�pise"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: prep�na� vy�aduje argument -- %c\n"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Nezn�ma syst�mov� chyba"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: prep�na� `-W %s' nie je jednozna�n�\n"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: nepovolen� prep�na� -- %c\n"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: prep�na� `-W %s' nepovo�uje argument\n"
 
-#~ msgid "block size"
-#~ msgstr "ve�kos� bloku"
+#: lib/human.c:486
+msgid "block size"
+msgstr "ve�kos� bloku"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s existuje, ale nie je adres�rom"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s existuje, ale nie je adres�rom"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "nie je mo�n� zmeni� pou��vate�a a/alebo skupinu %s"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "nie je mo�n� zmeni� pou��vate�a a/alebo skupinu %s"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "nie je mo�n� vytvori� adres�r %s"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "nie je mo�n� vytvori� adres�r %s"
 
-#, fuzzy
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "nie je mo�n� vojs� do adres�ra, %s"
+#: lib/mkdir-p.c:240
+#, fuzzy, c-format
+msgid "cannot chdir to directory %s"
+msgstr "nie je mo�n� vojs� do adres�ra, %s"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "nie je mo�n� zmeni� pr�va %s"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "nie je mo�n� zmeni� pr�va %s"
 
-#~ msgid "memory exhausted"
-#~ msgstr "vy�erpan� pam�"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "vy�erpan� pam�"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "nie je mo�n� vytvori� adres�r %s"
+msgid "unable to record current working directory"
+msgstr "nie je mo�n� vytvori� adres�r %s"
 
+#: lib/pagealign_alloc.c:143
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "nie je mo�n� zmeni� pr�va %s"
+msgid "Failed to open /dev/zero for read"
+msgstr "nie je mo�n� zmeni� pr�va %s"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "nie je mo�n� vytvori� adres�r %s"
+msgid "cannot create pipe"
+msgstr "nie je mo�n� vytvori� adres�r %s"
 
-#~ msgid "`"
-#~ msgstr "`"
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
 
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: chybn� regul�rny v�raz: %s"
+msgid "Invalid regular expression"
+msgstr "%s: chybn� regul�rny v�raz: %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "chybn� trieda znaku `%s'"
+msgid "Invalid character class name"
+msgstr "chybn� trieda znaku `%s'"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "vy�erpan� pam�"
+msgid "Memory exhausted"
+msgstr "vy�erpan� pam�"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: chybn� regul�rny v�raz: %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: chybn� regul�rny v�raz: %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "chyba pri vyh�ad�van� pomocou regul�rneho v�razu"
+msgid "Premature end of regular expression"
+msgstr "chyba pri vyh�ad�van� pomocou regul�rneho v�razu"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: chybn� regul�rny v�raz: %s"
+msgid "Regular expression too big"
+msgstr "%s: chybn� regul�rny v�raz: %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "chyba pri vyh�ad�van� pomocou regul�rneho v�razu"
+msgid "No previous regular expression"
+msgstr "chyba pri vyh�ad�van� pomocou regul�rneho v�razu"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yYaA��]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[yYaA��]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
+#: lib/unicodeio.c:147
 #, fuzzy
-#~ msgid "iconv function not usable"
-#~ msgstr "nie je mo�n� vyp�sa� U+%04X: funkcia iconv nie je pou�ite�n�"
+msgid "iconv function not usable"
+msgstr "nie je mo�n� vyp�sa� U+%04X: funkcia iconv nie je pou�ite�n�"
 
+#: lib/unicodeio.c:149
 #, fuzzy
-#~ msgid "iconv function not available"
-#~ msgstr "nie je mo�n� vyp�sa� U+%04X: funkcia iconv nie je dostupn�"
+msgid "iconv function not available"
+msgstr "nie je mo�n� vyp�sa� U+%04X: funkcia iconv nie je dostupn�"
 
+#: lib/unicodeio.c:156
 #, fuzzy
-#~ msgid "character out of range"
-#~ msgstr "U+%04X: znak je mimo rozsah"
+msgid "character out of range"
+msgstr "U+%04X: znak je mimo rozsah"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "nie je mo�n� konvertova� U+%04X do lok�lnej znakovej sady"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "nie je mo�n� konvertova� U+%04X do lok�lnej znakovej sady"
 
-#, fuzzy
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "nie je mo�n� konvertova� U+%04X do lok�lnej znakovej sady"
+#: lib/unicodeio.c:221
+#, fuzzy, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "nie je mo�n� konvertova� U+%04X do lok�lnej znakovej sady"
 
-#~ msgid "invalid user"
-#~ msgstr "neplatn� pou��vate�"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "neplatn� pou��vate�"
 
-#~ msgid "invalid group"
-#~ msgstr "neplatn� skupina"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "neplatn� skupina"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "nie je mo�n� ur�i� skupinu ��seln�ho UID"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "nie je mo�n� ur�i� skupinu ��seln�ho UID"
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "  Tento program je vo�n� programov� vybavenie; m��ete ho ��ri� a "
-#~ "modifikova�\n"
-#~ "pod�a podmienok V�eobecnej verejnej licencie GNU, vyd�vanej Free "
-#~ "Software\n"
-#~ "Foundation; a to bu� verzie 2 tejto licencie alebo (pod�a v�ho "
-#~ "uv�enia),\n"
-#~ "ktorejko�vek neskor�ej verzie.\n"
-#~ "\n"
-#~ "  Tento program je roz�irovan� v n�deji, �e bude u�ito�n�, av�ak BEZ "
-#~ "AKEJKO�VEK\n"
-#~ "Z�RUKY; neposkytuj� sa ani odvoden� z�ruky PREDAJNOSTI alebo VHODNOSTI "
-#~ "PRE\n"
-#~ "NEJAK� KONKR�TNY ��EL. �a��ie podrobnosti n�jdete vo V�eobecnej verejnej\n"
-#~ "licencii GNU.\n"
-#~ "\n"
-#~ "  K�pia V�eobecnej verejnej licencie GNU mala by� dodan� spolu s t�mto\n"
-#~ "programom; pokia� sa tak nestalo, nap��te do Free Software Foundation, "
-#~ "Inc.,\n"
-#~ "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "Nap�sal %s.\n"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"  Tento program je vo�n� programov� vybavenie; m��ete ho ��ri� a "
+"modifikova�\n"
+"pod�a podmienok V�eobecnej verejnej licencie GNU, vyd�vanej Free Software\n"
+"Foundation; a to bu� verzie 2 tejto licencie alebo (pod�a v�ho uv�enia),\n"
+"ktorejko�vek neskor�ej verzie.\n"
+"\n"
+"  Tento program je roz�irovan� v n�deji, �e bude u�ito�n�, av�ak BEZ "
+"AKEJKO�VEK\n"
+"Z�RUKY; neposkytuj� sa ani odvoden� z�ruky PREDAJNOSTI alebo VHODNOSTI PRE\n"
+"NEJAK� KONKR�TNY ��EL. �a��ie podrobnosti n�jdete vo V�eobecnej verejnej\n"
+"licencii GNU.\n"
+"\n"
+"  K�pia V�eobecnej verejnej licencie GNU mala by� dodan� spolu s t�mto\n"
+"programom; pokia� sa tak nestalo, nap��te do Free Software Foundation, "
+"Inc.,\n"
+"59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#, fuzzy
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Nap�sal %s.\n"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Nap�sal %s.\n"
 
-#, fuzzy
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Nap�sal %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, fuzzy, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Nap�sal %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr "Nap�sal %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, fuzzy, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Nap�sal %s.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr "Nap�sal %s.\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr "Nap�sal %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, fuzzy, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr "Nap�sal %s.\n"
 
+#: lib/xmemcoll.c:50
 #, fuzzy
-#~ msgid "string comparison failed"
-#~ msgstr "zlyhal stat"
+msgid "string comparison failed"
+msgstr "zlyhal stat"
 
-#, fuzzy
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "nie je mo�n� vytvori� odkaz %s"
+#: lib/xmemcoll.c:53
+#, fuzzy, c-format
+msgid "The strings compared were %s and %s."
+msgstr "nie je mo�n� vytvori� odkaz %s"
diff --git a/gnulib/po/sl.po b/gnulib/po/sl.po
index f3e793c7..4779c7d4 100644
--- a/gnulib/po/sl.po
+++ b/gnulib/po/sl.po
@@ -1,595 +1,1096 @@
 # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNUlib.
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
-# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2007.
-# $Id: gnulib-1.1.sl.po,v 1.2 2007/10/16 07:56:20 peterlin Exp $
+# Copyright (C) 2005, 2007, 2009, 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnulib package.
+# Primož Peterlin <primozz.peterlin@gmail.com>, 2005, 2007, 2009, 2012.
+# $Id: gnulib-3.0.0.6062.a6b16.sl.po,v 1.5 2012/05/20 11:08:36 peterlin Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnulib 1.1\n"
+"Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
-"PO-Revision-Date: 2007-10-16 09:56+0200\n"
-"Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
+"PO-Revision-Date: 2012-05-20 13:08+0200\n"
+"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "neveljavni argument %s za %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "dvoumni argument %s za %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Veljavni argumenti so:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: vrednost %s je manjša ali enaka %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT parameter zahteva vrednost"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT parameter mora biti pozitiven"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Neznan parameter ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Smetje v ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Argumenti, ki so kot obvezni ali neobvezni navedeni pri dolgi obliki izbire, "
-"so obvezni ali neobvezni tudi pri odgovarjajočih kratkih oblikah izbire."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Argumenti, navedeni kot obvezni ali neobvezni pri dolgi obliki izbire, so obvezni ali neobvezni tudi pri vseh odgovarjajočih kratkih oblikah."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr " ali: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [IZBIRA...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Poskusite »%s --help« ali »%s --usage« za izčrpnejša navodila.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
-msgstr "Poročila o napakah javite na %s.\n"
+msgstr "Poročila o napakah: %s\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Neznana sistemska napaka"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "poda ta seznam pomoči"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "poda kratka navodila"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "IME"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "nastavi ime programa"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SEK"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "zastane za SEK sekund (privzeto 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "izpiše različico programa"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(PROGRAMSKA NAPAKA) Različice ni moč ugotoviti?!"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
-msgstr "%s: preveč argumentov\n"
+msgstr "%s: Preveč argumentov\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(PROGRAMSKA NAPAKA) Izbire bi morali prepoznati?!"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "napaka v programu"
+
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "prekoračitev sklada"
+
+#: lib/clean-temp.c:332
+#, c-format
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "začasnega imenika ni moč najti, poskusite nastaviti $TMPDIR"
+
+#: lib/clean-temp.c:346
+#, c-format
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "začasnega imenika z uporabo šablone \"%s\" ni mogoče ustvariti"
+
+#: lib/clean-temp.c:442
+#, c-format
+msgid "cannot remove temporary file %s"
+msgstr "začasne datoteke v %s ni mogoče odstraniti"
+
+#: lib/clean-temp.c:457
+#, c-format
+msgid "cannot remove temporary directory %s"
+msgstr "začasnega imenika %s ni mogoče odstraniti"
+
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "napaka pri zapiranju datoteke"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "napaka pri pisanju"
+
+#: lib/copy-acl.c:681
+#, c-format
+msgid "preserving permissions for %s"
+msgstr "ohranjena dovoljenja za %s"
+
+#: lib/copy-file.c:67
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "napaka pri odpiranju datoteke \"%s\" za branje"
+
+#: lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "varnostne kopije \"%s\" ni mogoče odpreti za pisanje"
+
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "napaka pri branju \"%s\""
+
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "napaka pri pisanju na \"%s\""
+
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "napaka po branju \"%s\""
+
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "klic fdopen() ni uspel"
+
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "prevajalnika za C# ni najti, namestite pnet"
+
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "virtualnega stroja C# ni najti, namestite pnet"
+
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "podproces %s ni uspel"
+
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "navadna prazna datoteka"
+
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "navadna datoteka"
+
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "imenik"
+
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "bločna enota"
+
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "znakovna enota"
+
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "FIFO"
+
+# ! INEXACT
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "simbolna povezava"
+
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "vtičnica"
+
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "vrsta sporočil"
+
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafor"
+
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "deljen pomnilniški predmet"
+
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "tipiziran pomnilniški predmet"
+
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "čudna datoteka"
+
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Družina naslovov za ime gostitelja ni podprta"
+
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Razreševanje imena začasno ni uspelo"
+
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Slaba vrednost ai_flags"
+
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Nepopravljiv neuspeh pri razreševanju imena"
+
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family ni podprt"
+
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Dodelitev pomnilnika ni uspela"
+
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Z imenom gostitelja ni povezan noben naslov"
+
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Ime ali storitev ni poznana"
+
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Servname ni podprt za ai_socktype"
+
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype ni podprt"
+
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Sistemska napaka"
+
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Medpomnilnik za argumente premajhen"
+
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Obdelava zahtevka v teku"
+
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Zahtevek preklican"
+
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Zahtevek ni preklican"
+
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Vsi zahtevki obdelani"
+
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Prekinjeno s signalom"
+
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Parametrični niz nepravilno kodiran"
+
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Neznana napaka"
+
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
 msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: izbira »%s« je dvoumna\n"
+msgstr "%s: izbira »%s« je dvoumna; možnosti:"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
 msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: izbira »%s« zahteva argument\n"
+msgstr "%s: izbira »--%s« zahteva argument\n"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: neprepoznana izbira »--%s«\n"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
-#, fuzzy, c-format
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: neprepoznana izbira »%c%s«\n"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: neveljavna izbira -- %c\n"
+msgstr "%s: neveljavna izbira -- '%c'\n"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: izbira zahteva argument -- %c\n"
+msgstr "%s: izbira zahteva argument -- '%c'\n"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: izbira »-W %s« je dvoumna\n"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
 msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: izbira »%s« zahteva argument\n"
+msgstr "%s: izbira »-W %s« zahteva argument\n"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "neveljaven argument %s za %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "dvoumen argument %s za %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Veljavni argumenti so:"
-
-#~ msgid "program error"
-#~ msgstr "napaka v programu"
-
-#~ msgid "stack overflow"
-#~ msgstr "prekoračitev sklada"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "neveljaven argument source_version za compile_java_class"
 
-#, fuzzy
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "imenika %s ni mogoče ustvariti"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "neveljaven argument target_version za compile_java_class"
 
-#, fuzzy
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "imenika %s ni mogoče ustvariti"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "ni mogoče ustvariti \"%s\""
 
-#, fuzzy
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "imenika %s ni mogoče ustvariti"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "napaka pri pisanju na datoteko \"%s\""
 
-#, fuzzy
-#~ msgid "error closing file"
-#~ msgstr "napaka pri pisanju v datoteko \"%s\""
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "prevajalnika za Javo ni najti, nastavite $JAVAC ali namestite gcj"
 
-#~ msgid "write error"
-#~ msgstr "napaka pri pisanju"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "virtualnega stroja za Javo ni najti, nastavite $JAVA ali namestite gij"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "napaka pri odpiranju datoteke \"%s\" za branje"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "V/I napaka podprocesa %s"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "varnostne datoteke \"%s\" ni mogoče odpreti za pisanje"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "dovoljenj %s ni mogoče spremeniti"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "napaka pri branju \"%s\""
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "imenika %s ni mogoče ustvariti"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "napaka pri pisanju na \"%s\""
+# ! INEXACT
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "zmanjkalo pomnilnika"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "napaka po branju \"%s\""
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "ni mogoče zabeležiti trenutnega delovnega imenika"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "klic fdopen() ni uspel"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "vrnitev v začetni delovni imenik ni uspela"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "prevajalnika za C# ni najti, namestite pnet"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Datoteke /dev/null ni uspelo odpreti za branje"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "virtualnega stroja C# ni najti, namestite pnet"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "niti za pisanje ni bilo mogoče ustvariti"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s podproces ni uspel"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "neblokiranega V/I za podproces %s ni mogoče nastaviti"
 
-#~ msgid "regular empty file"
-#~ msgstr "navadna prazna datoteka"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "komunikacija s podprocesom %s ni uspela"
 
-#~ msgid "regular file"
-#~ msgstr "navadna datoteka"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "pisanje na podproces %s ni uspelo"
 
-#~ msgid "directory"
-#~ msgstr "imenik"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "branje s podprocesa %s ni uspelo"
 
-#~ msgid "block special file"
-#~ msgstr "bločna enota"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "podproces %s se je zaključil z izhodno kodo %d"
 
-#~ msgid "character special file"
-#~ msgstr "znakovna enota"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "ustvarjanje niti ni uspelo"
 
-#~ msgid "fifo"
-#~ msgstr "FIFO"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s podproces se je zaključil z izhodno kodo %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "»"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "«"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Uspešno"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Brez zadetkov"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Neveljaven regularni izraz"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Neveljaven razvrščevalni znak"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Neveljavno ime razreda znakov"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Zaključna obratna poševnica"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Neveljaven povratni sklic"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Uklepaj [ ali [^ brez para"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Uklepaj ( ali \\( brez para"
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Uklepaj \\{ brez para"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Neveljavna vsebina \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Neveljaven konec razpona"
 
 # ! INEXACT
-#~ msgid "symbolic link"
-#~ msgstr "simbolna povezava"
-
-#~ msgid "socket"
-#~ msgstr "vtičnica"
-
-#~ msgid "message queue"
-#~ msgstr "vrsta sporočil"
-
-#~ msgid "semaphore"
-#~ msgstr "semafor"
-
-#~ msgid "shared memory object"
-#~ msgstr "deljen pomnilniški predmet"
-
-#~ msgid "typed memory object"
-#~ msgstr "tipiziran pomnilniški predmet"
-
-#~ msgid "weird file"
-#~ msgstr "čudna datoteka"
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Pomnilnik izčrpan"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Neveljaven predhodni regularni izraz"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Predčasen zaključek regularnega izraza"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Regularni izraz je preobsežen"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Zaklepaj ) ali \\) brez para"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Prejšnjega regularnega izraza ni"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[jJdD]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "nastavljena dovoljenja za %s"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Družina naslovov za ime gostitelja ni podprta"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Odklop"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Začasen neuspeh pri razreševanju imena"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Prekinitev"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Slaba vrednost ai_flags"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Končanje"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Nepopravljiv neuspeh pri razreševanju imena"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Nedovoljen ukaz"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family ni podprt"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Past"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Neuspeh pri dodelitvi pomnilnika"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Prekinjen"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Z imenom gostitelja ni povezan noben naslov"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Prekoračitev plavajoče vejice"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Ime ali storitev ni poznana"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Pobit"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Servname ni podprt za ai_socktype"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Napaka vodila"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype ni podprt"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Napaka segmentacije"
 
-#~ msgid "System error"
-#~ msgstr "Sistemska napaka"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Prekinjen cevovod"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Medpomnilnik za argumente je premajhen"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Budilka"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Obdelava zahtevka v teku"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Zaključen"
 
-#~ msgid "Request canceled"
-#~ msgstr "Zahtevek preklican"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Nujno V/I stanje"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Zahtevek ni preklican"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Ustavljen (signal)"
 
-#~ msgid "All requests done"
-#~ msgstr "Vsi zahtevki obdelani"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Ustavljen"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Prekinjeno s signalom"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Nadaljevan"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Parametrični niz nepravilno kodiran"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Izhod nasledniškega procesa"
 
-#~ msgid "Unknown error"
-#~ msgstr "Neznana napaka"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Ustavljen (vhod TTY)"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: nedovoljena izbira -- %c\n"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Ustavljen (izhod TTY)"
 
-#, fuzzy
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s podproces"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Mogoč V/I"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "neveljaven argument source_version za compile_java_class"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Presežena omejitev procesorskega časa"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "neveljaven argument target_version za compile_java_class"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Presežena omejitev dolžine datoteke"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "ustvarjanje \"%s\" ni uspelo"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Iztek virtualne štoparice"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "napaka pri pisanju v datoteko \"%s\""
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Iztek profilirne štoparice"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr "prevajalnika za Javo ni najti, nastavite $JAVAC ali namestite gcj"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Zamenjano okno"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "virtualnega stroja za Javo ni najti, nastavite $JAVA ali namestite gij"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Uporabniški signal 1"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "ni mogoče ustvariti cevovoda"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Uporabniški signal 2"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "ni mogoče zabeležiti trenutnega delovnega imenika"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Past EMT"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "vrnitev v začetni delovni imenik neuspešna"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Slab sistemski klic"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "dovoljenj %s ni mogoče spremeniti"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Napaka sklada"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "imenika %s ni mogoče ustvariti"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Informacijski zahtevek"
 
-# ! INEXACT
-#~ msgid "memory exhausted"
-#~ msgstr "zmanjkalo pomnilnika"
-
-#~ msgid "Success"
-#~ msgstr "Uspešno"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Izpad toka"
 
-#~ msgid "No match"
-#~ msgstr "Brez zadetkov"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Vir izgubljen"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Neveljaven regularni izraz"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "napaka pri pisanju na zaprt cevovod ali vtič"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Neveljaven razvrščevalni znak"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "ni mogoče ustvariti cevovoda"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Neveljavno ime razreda znakov"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Realnočasovni signal %d"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Sledeča obrnjena poševnica"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Neznani signal %d"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Neveljaven povratni sklic"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "funkcija iconv ne deluje"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Nezaključen [ ali [^"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "funkcija iconv ni na voljo"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Nezaključen ( ali \\("
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "koda znaka izven obsega"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Nezaključen \\{"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "znaka s kodo U+%04X ni mogoče pretvoriti v lokalni nabor znakov"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Neveljavna vsebina \\{\\}"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "znaka s kodo U+%04X ni moč pretvoriti v lokalni nabor znakov: %s"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Neveljaven konec razpon"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "neveljavno uporabniško ime"
 
-# ! INEXACT
-#~ msgid "Memory exhausted"
-#~ msgstr "Zmanjkalo pomnilnika"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "neveljavno ime skupine"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Neveljaven predhodni regularni izraz"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "neveljavna specifikacija"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Nepričakovan konec regularnega izraza"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "sporočila o napaki ni mogoče prikazati"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Regularni izraz je prevelik"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Priprava paketa: %s (%s)\n"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Odvečni ) ali \\)"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Priprava paketa: %s\n"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Manjkajoč predhodni regularni izraz"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Napaka pri odpiranju /dev/zero za branje"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"GPLv3+: GNU GPL, 3. izdaja ali poznejša <http://www.gnu.org/licenses/gpl.html>\n"
+"To je prosto programje; lahko ga redistribuirate in/ali spreminjate.\n"
+"Za izdelek ni NOBENEGA JAMSTVA, do z zakonom dovoljene meje.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Avtor(ica): %s.\n"
 
-#~ msgid "`"
-#~ msgstr "»"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Avtorja: %s in %s.\n"
 
-#~ msgid "'"
-#~ msgstr "«"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Avtorji: %s, %s in %s.\n"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[jJdD]"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Avtorji: %s, %s, %s\n"
+"in %s.\n"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Avtorji: %s, %s, %s,\n"
+"%s in %s.\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "funkcija iconv ne deluje"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Avtorji: %s, %s, %s,\n"
+"%s, %s in %s.\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "funkcija iconv ni na voljo"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Avtorji: %s, %s, %s,\n"
+"%s, %s, %s in %s.\n"
 
-#~ msgid "character out of range"
-#~ msgstr "koda znaka izven obsega"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Avtorji: %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"in %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Avtorji: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s in %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Avtorji: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s in drugi.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Poročila o napakah: %s\n"
+"Napake v prevodu sporočite na <translation-team-sl@lists.sourceforge.net>.\n"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "znaka s kodo U+%04X ni mogoče pretvoriti v lokalni nabor znakov"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr ""
+"Napake v programu %s sporočite na: %s\n"
+"Napake v prevodu sporočite na <translation-team-sl@lists.sourceforge.net>.\n"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "znaka s kodo U+%04X ni moč pretvoriti v lokalni nabor znakov: %s"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Domača stran %s: <%s>\n"
 
-#~ msgid "invalid user"
-#~ msgstr "neveljavno uporabniško ime"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Spletna stran %s: <http://www.gnu.org/software/%s/>.\n"
 
-#~ msgid "invalid group"
-#~ msgstr "neveljavno ime skupine"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Splošna pomoč za rabo programja GNU: <http://www.gnu.org/gethelp/>.\n"
 
-#~ msgid "invalid spec"
-#~ msgstr "neveljavna specifikacija"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "klic _open_osfhandle ni uspel"
 
-#, fuzzy
-#~ msgid "preserving permissions for %s"
-#~ msgstr "dovoljenj %s ni mogoče spremeniti"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ni mogoče obnoviti fd %d: klic dup2 ni uspel"
 
-#~ msgid "string comparison failed"
-#~ msgstr "primerjanje nizov ni uspelo"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "podproces %s"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Nastavite LC_ALL='C', da bi odpravili težavo."
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "podproces %s je prejel terminalni signal %d"
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Primerjana niza sta bila %s in %s."
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "standardni vhod"
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "standardni izhod"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GPLv3+: GNU GPL različica 3 ali kasnejše, http://gnu.org/licences/gpl."
-#~ "html\n"
-#~ "To je prost program; smete ga spreminjati in deliti z drugimi.\n"
-#~ "Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
-#~ "\n"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "standardna izhod za napake"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Avtor(ica): %s.\n"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "neznani tok"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Avtorja: %s in %s.\n"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "ponovno odpiranje %s v načinu %s ni uspelo"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Avtorji: %s, %s in %s.\n"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "primerjanje nizov ni uspelo"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Avtorji: %s, %s, %s\n"
-#~ "in %s.\n"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Nastavite LC_ALL='C', da bi odpravili težavo."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Avtorji: %s, %s, %s,\n"
-#~ "%s in %s.\n"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Primerjana niza sta bila %s in %s."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Avtorji: %s, %s, %s,\n"
-#~ "%s, %s in %s.\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "oblikovanega izpisa ni mogoče izvesti"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Avtorji: %s, %s, %s,\n"
-#~ "%s, %s, %s in %s.\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "neveljavni %s%s argument  »%s«"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Avtorji: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "in %s.\n"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "neveljavna pripona pri %s%s argumentu »%s«"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Avtorji: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s in %s.\n"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s: argument »%s« je prevelik"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Avtorji: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s in drugi.\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: nedovoljena izbira -- %c\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "Report bugs to <%s>.\n"
-#~ msgstr "Poročila o napakah javite na %s.\n"
-
-#, fuzzy
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "neveljaven argument %s za %s"
-
-#, fuzzy
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "neveljaven argument %s za %s"
-
-#, fuzzy
-#~ msgid "setting permissions for %s"
-#~ msgstr "dovoljenj %s ni mogoče spremeniti"
-
-#~ msgid "%s subprocess"
-#~ msgstr "%s podproces"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s podproces je prejel terminalni signal %d"
+#~ msgstr ""
+#~ "\n"
+#~ "Napake v programu sporočite na %s.\n"
+#~ "Napake v prevodu sporočite na <translation-team-sl@lists.sourceforge.net>.\n"
 
 #~ msgid "block size"
 #~ msgstr "velikost bloka"
@@ -609,8 +1110,7 @@ msgstr "%s: izbira »%s« zahteva argument\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
+#~ "This is free software.  You may redistribute copies of it under the terms of\n"
 #~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
 #~ "There is NO WARRANTY, to the extent permitted by law.\n"
 #~ "\n"
@@ -618,6 +1118,5 @@ msgstr "%s: izbira »%s« zahteva argument\n"
 #~ "\n"
 #~ "Ta program je prosta programska oprema; lahko ga redistribuirate in/ali\n"
 #~ "spreminjate po pogojih, določenih v »GNU General Public License«, \n"
-#~ "<http://www.gnu.org/licenses/gpl.html>. Za izdelek ni NOBENEGA JAMSTVA, "
-#~ "do\n"
+#~ "<http://www.gnu.org/licenses/gpl.html>. Za izdelek ni NOBENEGA JAMSTVA, do\n"
 #~ "z zakonom dovoljene meje.\n"
diff --git a/gnulib/po/sv.po b/gnulib/po/sv.po
index 9d222ed7..1f78c26b 100644
--- a/gnulib/po/sv.po
+++ b/gnulib/po/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-08-22 19:16+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -22,756 +22,1062 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "felaktigt argument %s till %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "tvetydigt argument %s till %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Giltiga argument är:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: värdet på %s är mindre än eller lika med %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT parametern kräver ett värde"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT parametern måste vara positiv"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Okänd ARGP_HELP_FMT-parameter"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Skräp i ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Obligatoriska eller valfria argument till långa flaggor är obligatoriska "
-"eller valfria även för motsvarande korta flaggor."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Obligatoriska eller valfria argument till långa flaggor är obligatoriska eller valfria även för motsvarande korta flaggor."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Användning:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "   eller:  "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [FLAGGA...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Försök med ”%s --help” eller ”%s --usage” för mer information.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "Rapportera fel till %s.\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "ge denna hjälplista"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "ge ett kort användningsmeddelande"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NAMN"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "ange programnamnet"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "S"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "häng i S sekunder (3600 som standard)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "skriv ut programversion"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(PROGRAMFEL) Ingen version känd!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: För många argument\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(PROGRAMFEL) Flaggan borde ha känts igen!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: flaggan ”%s” är tvetydig: möjligheter:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "programfel"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”--%s” tar inget argument\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "stackspill"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: flaggan ”%c%s” tar inget argument\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "kan inte hitta en temporärkatalog, försök sätta $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: flaggan ”--%s” kräver ett argument\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "kan inte skapa en temporärkatalog med användning av mallen ”%s”"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
+msgid "cannot remove temporary file %s"
+msgstr "kan inte ta bort temporärfil %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
+msgid "cannot remove temporary directory %s"
+msgstr "kan inte ta bort temporärkatalog %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: ogiltig flagga -- \"%c\"\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "fel när fil stängdes"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: flaggan kräver ett argument -- \"%c\"\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "skrivfel"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
+msgid "preserving permissions for %s"
+msgstr "bevarar rättigheter på %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "fel när ”%s” öppnades för läsning"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: flaggan ”-W %s” kräver ett argument\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "felaktigt argument %s till %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "tvetydigt argument %s till %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Giltiga argument är:"
-
-#~ msgid "program error"
-#~ msgstr "programfel"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "det går inte att öppna säkerthetskopiefil ”%s” för skrivning"
 
-#~ msgid "stack overflow"
-#~ msgstr "stackspill"
-
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "kan inte hitta en temporärkatalog, försök sätta $TMPDIR"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "fel vid läsning av ”%s”"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "kan inte skapa en temporärkatalog med användning av mallen ”%s”"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "fel vid skrivning av ”%s”"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "kan inte ta bort temporärfil %s"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "fel efter läsning av ”%s”"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "kan inte ta bort temporärkatalog %s"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() misslyckades"
 
-#~ msgid "error closing file"
-#~ msgstr "fel när fil stängdes"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "C#-kompilator hittades inte, försök installera pnet"
 
-#~ msgid "write error"
-#~ msgstr "skrivfel"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "virtuell C#-maskinen hittades inte, försök installera pnet"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "bevarar rättigheter på %s"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s-underprocess misslyckades"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "fel när ”%s” öppnades för läsning"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "tom normal fil"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "det går inte att öppna säkerthetskopiefil ”%s” för skrivning"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "normal fil"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "fel vid läsning av ”%s”"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "katalog"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "fel vid skrivning av ”%s”"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "blockspecialfil"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "fel efter läsning av ”%s”"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "teckenspecialfil"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() misslyckades"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "C#-kompilator hittades inte, försök installera pnet"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "symbolisk länk"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "virtuell C#-maskinen hittades inte, försök installera pnet"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "uttag (socket)"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s-underprocess misslyckades"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "meddelandekö"
 
-#~ msgid "regular empty file"
-#~ msgstr "tom normal fil"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "semafor"
 
-#~ msgid "regular file"
-#~ msgstr "normal fil"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "objekt av delat minne"
 
-#~ msgid "directory"
-#~ msgstr "katalog"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "objekt av typat minne"
 
-#~ msgid "block special file"
-#~ msgstr "blockspecialfil"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "konstig fil"
 
-#~ msgid "character special file"
-#~ msgstr "teckenspecialfil"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Adressfamiljen för värdnamnet stöds inte"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Tillfälligt fel i namnuppslagning"
 
-#~ msgid "symbolic link"
-#~ msgstr "symbolisk länk"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Felaktigt värde för ai_flags"
 
-#~ msgid "socket"
-#~ msgstr "uttag (socket)"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Oreparabelt fel i namnuppslagning"
 
-#~ msgid "message queue"
-#~ msgstr "meddelandekö"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family stöds inte"
 
-#~ msgid "semaphore"
-#~ msgstr "semafor"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Minnesallokeringsfel"
 
-#~ msgid "shared memory object"
-#~ msgstr "objekt av delat minne"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Ingen adress associerad med värdnamnet"
 
-#~ msgid "typed memory object"
-#~ msgstr "objekt av typat minne"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Namn eller tjänst inte känd"
 
-#~ msgid "weird file"
-#~ msgstr "konstig fil"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Servname stöds inte för ai_socktype"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Adressfamiljen för värdnamnet stöds inte"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype stöds inte"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Tillfälligt fel i namnuppslagning"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Systemfel"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Felaktigt värde för ai_flags"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Argumentbufferten för liten"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Oreparabelt fel i namnuppslagning"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Bearbetar pågående begäran"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family stöds inte"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Begäran annulerad"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Minnesallokeringsfel"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Begäran inte annulerad"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Ingen adress associerad med värdnamnet"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Alla begäran utförda"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Namn eller tjänst inte känd"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Avbruten av en signal"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Servname stöds inte för ai_socktype"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Parametersträng inte korrekt kodad"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype stöds inte"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Okänt fel"
 
-#~ msgid "System error"
-#~ msgstr "Systemfel"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: flaggan ”%s” är tvetydig: möjligheter:"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Argumentbufferten för liten"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: flaggan ”--%s” tar inget argument\n"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Bearbetar pågående begäran"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: flaggan ”%c%s” tar inget argument\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Begäran annulerad"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: flaggan ”--%s” kräver ett argument\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Begäran inte annulerad"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Alla begäran utförda"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Avbruten av en signal"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: ogiltig flagga -- \"%c\"\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Parametersträng inte korrekt kodad"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: flaggan kräver ett argument -- \"%c\"\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Okänt fel"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: flaggan \"-W %s\" är tvetydig\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "ogiltigt source_version-argument till compile_java_class"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "ogiltigt target_version-argument till compile_java_class"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: flaggan ”-W %s” kräver ett argument\n"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "det gick inte att skapa \"%s\""
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "ogiltigt source_version-argument till compile_java_class"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "fel vid skrivning av filen ”%s”"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "ogiltigt target_version-argument till compile_java_class"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Javakompilator hittades inte, försök installera gcj eller sätta $JAVAC"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "det gick inte att skapa \"%s\""
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Virtuell Javamaskin hittades inte, försök installera gij eller sätta $JAVA"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "fel vid skrivning av filen ”%s”"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s-underprocess I/O-fel"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Javakompilator hittades inte, försök installera gcj eller sätta $JAVAC"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "kan inte ändra rättigheter på %s"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Virtuell Javamaskin hittades inte, försök installera gij eller sätta $JAVA"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "kan inte skapa katalogen %s"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s-underprocess I/O-fel"
 
-#~ msgid "memory exhausted"
-#~ msgstr "minnet slut"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "kan inte ändra rättigheter på %s"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "kan inte notera aktuell arbetskatalog"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "kan inte skapa katalogen %s"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "kunde inte återvända till den ursprungliga arbetskatalogen"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "minnet slut"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Misslyckades att öppna /dev/zero för läsning"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "kan inte notera aktuell arbetskatalog"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "att skapa lästråd misslyckades"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "kunde inte återvända till den ursprungliga arbetskatalogen"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr ""
-#~ "det gick inte att sätta upp icke blockerande I/O till %s-underprocess"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Misslyckades att öppna /dev/zero för läsning"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "kommunikation med %s-underprocess misslyckades"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "att skapa lästråd misslyckades"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "skrivning till %s-underprocess misslyckades"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "det gick inte att sätta upp icke blockerande I/O till %s-underprocess"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "läsning från %s-underprocess misslyckades"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "kommunikation med %s-underprocess misslyckades"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "underprocess %s avslutad med slutstatus %d"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "skrivning till %s-underprocess misslyckades"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "att skapa trådar misslyckades"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "läsning från %s-underprocess misslyckades"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "%s-underprocess avslutad med slutstatus %d"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "underprocess %s avslutad med slutstatus %d"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "François Pinard"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "att skapa trådar misslyckades"
 
-#~ msgid "`"
-#~ msgstr "”"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "%s-underprocess avslutad med slutstatus %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "François Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "”"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "”"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Lyckades"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Ingen träff"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Felaktigt reguljärt uttryck"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Ogiltigt sorteringstecken"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Ogiltigt teckenklassnamn"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Avslutande bakstreck"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Ogiltig bakåtreferens"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Ensam [ eller [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Ensam ( eller \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Ensam \\\\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Ogiltigt innehåll i \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Ogiltigt intervallslut"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Minnet slut"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Felaktigt föregående reguljärt uttryck"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Förtida slut av reguljärt uttryck"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "För stort reguljärt uttryck"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Ensam ) eller \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Inget föregående reguljärt uttryck"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yYjJ]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "ändrar rättigheter på %s"
 
-#~ msgid "'"
-#~ msgstr "”"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Avringd"
 
-#~ msgid "Success"
-#~ msgstr "Lyckades"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Avbruten"
 
-#~ msgid "No match"
-#~ msgstr "Ingen träff"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Lämnad"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Felaktigt reguljärt uttryck"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Otillåten instruktion"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Ogiltigt sorteringstecken"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Spårnings-/brytpunktsfälla"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Ogiltigt teckenklassnamn"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Avbruten (abort)"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Avslutande bakstreck"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Flyttalsundantag"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Ogiltig bakåtreferens"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Dödad"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Ensam [ eller [^"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Bussfel"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Ensam ( eller \\("
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Segmenteringsfel"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Ensam \\\\{"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Brutet rör"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Ogiltigt innehåll i \\{\\}"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Alarmklocka"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Ogiltigt intervallslut"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Avslutad"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Minnet slut"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Brådskande I/O-situation"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Felaktigt föregående reguljärt uttryck"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Stoppad (signal)"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Förtida slut av reguljärt uttryck"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Stoppad"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "För stort reguljärt uttryck"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Återupptagen"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Ensam ) eller \\)"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Barn avslutade"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Inget föregående reguljärt uttryck"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Stoppad (terminalläsning)"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yYjJ]"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Stoppad (terminalskrivning)"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "I/O möjligt"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "ändrar rättigheter på %s"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Begränsning av CPU-tid överskriden"
 
-#~ msgid "Hangup"
-#~ msgstr "Avringd"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Begränsning av filstorlek överskriden"
 
-#~ msgid "Interrupt"
-#~ msgstr "Avbruten"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Alarmklocka - virtuell tid"
 
-#~ msgid "Quit"
-#~ msgstr "Lämnad"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Profileringsklocka"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Otillåten instruktion"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Ändrat fönster"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Spårnings-/brytpunktsfälla"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Användarsignal 1"
 
-#~ msgid "Aborted"
-#~ msgstr "Avbruten (abort)"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Användarsignal 2"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Flyttalsundantag"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Emulatorfälla"
 
-#~ msgid "Killed"
-#~ msgstr "Dödad"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Felaktigt systemanrop"
 
-#~ msgid "Bus error"
-#~ msgstr "Bussfel"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Stackfel"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Segmenteringsfel"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Informationsbegäran"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Brutet rör"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Strömavbrott"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Alarmklocka"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Förlorad resurs"
 
-#~ msgid "Terminated"
-#~ msgstr "Avslutad"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "fel vid skrivning till ett stängt rör eller uttag"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Brådskande I/O-situation"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "kan inte skapa rör"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Stoppad (signal)"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Realtidsignal %d"
 
-#~ msgid "Stopped"
-#~ msgstr "Stoppad"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Okänd signal %d"
 
-#~ msgid "Continued"
-#~ msgstr "Återupptagen"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "iconv-funktion inte användbar"
 
-#~ msgid "Child exited"
-#~ msgstr "Barn avslutade"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "iconv-funktion inte tillgänglig"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Stoppad (terminalläsning)"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "tecken utanför intervall"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Stoppad (terminalskrivning)"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "kan inte konvertera U+%04X till lokal teckenuppsättning"
 
-#~ msgid "I/O possible"
-#~ msgstr "I/O möjligt"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "kan inte konvertera U+%04X till lokal teckenuppsättning: %s"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Begränsning av CPU-tid överskriden"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "ogiltig användare"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Begränsning av filstorlek överskriden"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "ogiltig grupp"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Alarmklocka - virtuell tid"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "ogiltig specifikation"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Profileringsklocka"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "kan inte visa felmeddelande"
 
-#~ msgid "Window changed"
-#~ msgstr "Ändrat fönster"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Paketerat av %s (%s)\n"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Användarsignal 1"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Paketerat av %s\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Användarsignal 2"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "EMT trap"
-#~ msgstr "Emulatorfälla"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/gpl.html>.\n"
+"Detta är fri programvara: du får lov att ändra och vidaredistribuera den.\n"
+"Det finns INGEN GARANTI, så långt lagen tillåter.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Skrivet av %s.\n"
 
-#~ msgid "Bad system call"
-#~ msgstr "Felaktigt systemanrop"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Skrivet av %s och %s.\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Stackfel"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Skrivet av %s, %s och %s.\n"
 
-#~ msgid "Information request"
-#~ msgstr "Informationsbegäran"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Skrivet av %s, %s, %s\n"
+"och %s.\n"
 
-#~ msgid "Power failure"
-#~ msgstr "Strömavbrott"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Skrivet av %s, %s, %s,\n"
+"%s och %s.\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Förlorad resurs"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Skrivet av %s, %s, %s,\n"
+"%s, %s och %s.\n"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "fel vid skrivning till ett stängt rör eller uttag"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Skrivet av %s, %s, %s,\n"
+"%s, %s, %s och %s.\n"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "kan inte skapa rör"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Skrivet av %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"och %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Skrivet av %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s och %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Skrivet av %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s med flera.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Rapportera fel till: %s\n"
+"Skicka synpunkter på översättningen till: tp-sv@listor.tp-sv.se\n"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Realtidsignal %d"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Rapportera %s-fel till: %s\n"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Okänd signal %d"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s hemsida: <%s>\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv-funktion inte användbar"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s hemsida: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv-funktion inte tillgänglig"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Allmän hjälp med att använda GNU-program: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "character out of range"
-#~ msgstr "tecken utanför intervall"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle misslyckades"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "kan inte konvertera U+%04X till lokal teckenuppsättning"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan inte återställa fb %d: dup2 misslyckades"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "kan inte konvertera U+%04X till lokal teckenuppsättning: %s"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "%s-underprocess"
 
-#~ msgid "invalid user"
-#~ msgstr "ogiltig användare"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s-underprocess fick ödesdiger signal %d"
 
-#~ msgid "invalid group"
-#~ msgstr "ogiltig grupp"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "standard in"
 
-#~ msgid "invalid spec"
-#~ msgstr "ogiltig specifikation"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "standard ut"
 
-#~ msgid "unable to display error message"
-#~ msgstr "kan inte visa felmeddelande"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "standard fel"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Paketerat av %s (%s)\n"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "okänd ström"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Paketerat av %s\n"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "det gick inte att öppna om %s i läget %s"
 
-#~ msgid "(C)"
-#~ msgstr "©"
-
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/"
-#~ "gpl.html>.\n"
-#~ "Detta är fri programvara: du får lov att ändra och vidaredistribuera "
-#~ "den.\n"
-#~ "Det finns INGEN GARANTI, så långt lagen tillåter.\n"
-#~ "\n"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "strängjämförelse misslyckades"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Skrivet av %s.\n"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Sätt LC_ALL='C' för att gå runt problemet."
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Skrivet av %s och %s.\n"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "De jämförda strängarna var %s och %s."
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Skrivet av %s, %s och %s.\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "kan inte utföra formaterad utmatning"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Skrivet av %s, %s, %s\n"
-#~ "och %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Skrivet av %s, %s, %s,\n"
-#~ "%s och %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Skrivet av %s, %s, %s,\n"
-#~ "%s, %s och %s.\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "felaktigt %s%s-argument \"%s\""
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Skrivet av %s, %s, %s,\n"
-#~ "%s, %s, %s och %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Skrivet av %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "och %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Skrivet av %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s och %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Skrivet av %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s med flera.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Rapportera fel till: %s\n"
-#~ "Skicka synpunkter på översättningen till: tp-sv@listor.tp-sv.se\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Rapportera %s-fel till: %s\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "%s hemsida: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "%s hemsida: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Allmän hjälp med att använda GNU-program: <http://www.gnu.org/gethelp/>\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle misslyckades"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "kan inte återställa fb %d: dup2 misslyckades"
-
-#~ msgid "%s subprocess"
-#~ msgstr "%s-underprocess"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s-underprocess fick ödesdiger signal %d"
-
-#~ msgid "stdin"
-#~ msgstr "standard in"
-
-#~ msgid "stdout"
-#~ msgstr "standard ut"
-
-#~ msgid "stderr"
-#~ msgstr "standard fel"
-
-#~ msgid "unknown stream"
-#~ msgstr "okänd ström"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "det gick inte att öppna om %s i läget %s"
-
-#~ msgid "string comparison failed"
-#~ msgstr "strängjämförelse misslyckades"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Sätt LC_ALL='C' för att gå runt problemet."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "De jämförda strängarna var %s och %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "kan inte utföra formaterad utmatning"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "felaktigt %s%s-argument \"%s\""
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "felaktigt suffix i %s%s-argument \"%s\""
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "felaktigt suffix i %s%s-argument \"%s\""
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "%s%s argument \"%s\" är för stort"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s argument \"%s\" är för stort"
diff --git a/gnulib/po/tr.po b/gnulib/po/tr.po
index 83c6177e..81fe9ccc 100644
--- a/gnulib/po/tr.po
+++ b/gnulib/po/tr.po
@@ -9,44 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.3.0\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2005-03-14 04:17+0200\n"
 "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
-
-#: gnulib/argp-help.c:220
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "%s argümanı `%s' için geçersiz"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "%s argümanı `%s' için belirsiz"
 
-#: gnulib/argp-help.c:247
+#: lib/argmatch.c:157
 #, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "Geçerli argümanlar:"
 
 #
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
@@ -55,25 +44,17 @@ msgstr ""
 "Uzun seçenekler için zorunlu olan argümanlar kısa seçenekler için de "
 "zorunludur.\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "Kullanım: %s [SEÇENEK]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
@@ -81,411 +62,502 @@ msgstr ""
 "Yazılım hatalarını <%s> adresine,\n"
 "çeviri hatalarını <gnu-tr@belgeler.org> adresine bildirin.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatası"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "İSİM"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
-
-#: gnulib/argp-parse.c:142
-#, fuzzy
-msgid "print program version"
-msgstr "okuma hatası"
-
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
-
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:619
 #, fuzzy, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: çok fazla sağlama satırı"
 
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
-
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: `%s' seçeneği belirsiz\n"
-
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
-
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
-#, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: seçenek `%c%s' argümansız kullanılır\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
+#: lib/c-stack.c:244
+#, fuzzy
+msgid "program error"
+msgstr "okuma hatası"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: `--%s' seçeneği bilinmiyor\n"
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "yazma hatası"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "%s okumak için açılamadı"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: geçersiz seçenek -- %c\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "%s yazmak için açılamadı"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: seçenek bir argümanla kullanılır -- %c\n"
+msgid "error reading \"%s\""
+msgstr "%s'i okunurken hata"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' seçeneği belirsiz\n"
-
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n"
+msgid "error writing \"%s\""
+msgstr "%s'e yazarken hata"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "%s argümanı `%s' için geçersiz"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "%s argümanı `%s' için belirsiz"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Geçerli argümanlar:"
-
-#~ msgid "write error"
-#~ msgstr "yazma hatası"
-
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "%s okumak için açılamadı"
-
-#, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "%s yazmak için açılamadı"
-
-#, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "%s'i okunurken hata"
-
-#, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "%s'e yazarken hata"
+msgid "error after reading \"%s\""
+msgstr "%s'i okunurken hata"
 
+#: lib/csharpcomp.c:273
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "%s'i okunurken hata"
+msgid "fdopen() failed"
+msgstr "açma işlemi başarısız"
 
-#, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "açma işlemi başarısız"
-
-#, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s: arama (seek) başarısız"
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
+#, fuzzy, c-format
+msgid "%s subprocess failed"
+msgstr "%s: arama (seek) başarısız"
 
 #
-#~ msgid "regular empty file"
-#~ msgstr "normal boş dosya"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "normal boş dosya"
 
 #
-#~ msgid "regular file"
-#~ msgstr "normal dosya"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "normal dosya"
 
-#~ msgid "directory"
-#~ msgstr "dizin"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "dizin"
 
 #
-#~ msgid "block special file"
-#~ msgstr "blok özel dosyası"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "blok özel dosyası"
 
 #
-#~ msgid "character special file"
-#~ msgstr "karakter özel dosyası"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "karakter özel dosyası"
 
 #
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "symbolic link"
-#~ msgstr "sembolik bağ"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "sembolik bağ"
 
-#~ msgid "socket"
-#~ msgstr "soket"
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "soket"
 
-#~ msgid "message queue"
-#~ msgstr "ileti kuyruğu"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "ileti kuyruğu"
 
-#~ msgid "semaphore"
-#~ msgstr "semafor"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "semafor"
 
 #
-#~ msgid "shared memory object"
-#~ msgstr "paylaşımlı bellek nesnesi"
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "paylaşımlı bellek nesnesi"
 
 #
-#~ msgid "typed memory object"
-#~ msgstr "türlenmiş bellek nesnesi"
+#: lib/file-type.c:73
+msgid "typed memory object"
+msgstr "türlenmiş bellek nesnesi"
 
 #
-#~ msgid "weird file"
-#~ msgstr "garip dosya"
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "garip dosya"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "fifo dosyaları desteklenmiyor"
+msgid "Address family for hostname not supported"
+msgstr "fifo dosyaları desteklenmiyor"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "fifo dosyaları desteklenmiyor"
+msgid "ai_family not supported"
+msgstr "fifo dosyaları desteklenmiyor"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "fifo dosyaları desteklenmiyor"
+msgid "ai_socktype not supported"
+msgstr "fifo dosyaları desteklenmiyor"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "System error"
-#~ msgstr "yazma hatası"
+msgid "System error"
+msgstr "yazma hatası"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Bilinmeyen sistem hatası"
+msgid "Unknown error"
+msgstr "Bilinmeyen sistem hatası"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: kuraldışı seçenek -- %c\n"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' seçeneği belirsiz\n"
 
-#~ msgid "block size"
-#~ msgstr "blok uzunluğu"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' seçeneği argümansız kullanılır\n"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s var ama bir dizin değil"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: seçenek `%c%s' argümansız kullanılır\n"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "%s'in sahibi ve/veya grubu değiştirilemiyor"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "%s dizini oluşturulamıyor"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' seçeneği bilinmiyor\n"
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "%s dizinine geçilemedi"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' seçeneği bilinmiyor\n"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "%s'in erişim izinleri değiştirilemiyor"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldışı seçenek -- %c\n"
 
-#~ msgid "memory exhausted"
-#~ msgstr "bellek tükendi"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: geçersiz seçenek -- %c\n"
 
-#, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "openat: çalışılan dizini kaydedemedi"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: seçenek bir argümanla kullanılır -- %c\n"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "başlangıç çalışma dizinine geri dönülemedi"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' seçeneği belirsiz\n"
 
-#, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "%s: yazmak için açılamadı"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n"
 
+#: lib/human.c:486
+msgid "block size"
+msgstr "blok uzunluğu"
+
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s var ama bir dizin değil"
+
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "%s'in sahibi ve/veya grubu değiştirilemiyor"
+
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "%s dizini oluşturulamıyor"
+
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "%s dizinine geçilemedi"
+
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "%s'in erişim izinleri değiştirilemiyor"
+
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "bellek tükendi"
+
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "%s bağı oluşturulamadı"
+msgid "unable to record current working directory"
+msgstr "openat: çalışılan dizini kaydedemedi"
 
-#~ msgid "`"
-#~ msgstr "`"
+#: lib/openat-die.c:49
+msgid "failed to return to initial working directory"
+msgstr "başlangıç çalışma dizinine geri dönülemedi"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/pagealign_alloc.c:143
+#, fuzzy
+msgid "Failed to open /dev/zero for read"
+msgstr "%s: yazmak için açılamadı"
 
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
+#, fuzzy
+msgid "cannot create pipe"
+msgstr "%s bağı oluşturulamadı"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:137
 #, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s: geçersiz düzenli ifade(regular expression): %s"
+msgid "Invalid regular expression"
+msgstr "%s: geçersiz düzenli ifade(regular expression): %s"
 
+#: lib/regcomp.c:143
 #, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "geçersiz karakter sınıfı `%s'"
+msgid "Invalid character class name"
+msgstr "geçersiz karakter sınıfı `%s'"
 
+#: lib/regcomp.c:164
 #, fuzzy
-#~ msgid "Invalid range end"
-#~ msgstr "Geçersiz sayfa aralığı `%s'"
+msgid "Invalid range end"
+msgstr "Geçersiz sayfa aralığı `%s'"
 
+#: lib/regcomp.c:167
 #, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "bellek tükendi"
+msgid "Memory exhausted"
+msgstr "bellek tükendi"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s: geçersiz düzenli ifade(regular expression): %s"
+msgid "Invalid preceding regular expression"
+msgstr "%s: geçersiz düzenli ifade(regular expression): %s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
+msgid "Premature end of regular expression"
+msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s: geçersiz düzenli ifade(regular expression): %s"
+msgid "Regular expression too big"
+msgstr "%s: geçersiz düzenli ifade(regular expression): %s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
+msgid "No previous regular expression"
+msgstr "düzenli ifade (regular expression) aramasında hata oluştu"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[eE]"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[eE]"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[hH]"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[hH]"
 
 #
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv işlevi kullanılabilir değil"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "iconv işlevi kullanılabilir değil"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv işlevi yok"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "iconv işlevi yok"
 
-#~ msgid "character out of range"
-#~ msgstr "karakter kapsamdışı"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "karakter kapsamdışı"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor: %s"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "U+%04X yerel karakter kümesine dönüştürülemiyor: %s"
 
-#~ msgid "invalid user"
-#~ msgstr "kullanıcı geçersiz"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "kullanıcı geçersiz"
 
-#~ msgid "invalid group"
-#~ msgstr "grup geçersiz"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "grup geçersiz"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "bir sayısal kullanıcı-kimliğin grubu alınamıyor"
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "bir sayısal kullanıcı-kimliğin grubu alınamıyor"
 
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Bu, bir serbest yazılımdır; Free Software Foundation tarafından "
-#~ "yayınlanan\n"
-#~ "GNU Genel Kamu Lisansı, 2. sürüm (veya sizin seçiminize bağlı olarak) "
-#~ "daha üst \n"
-#~ "sürüm koşulları altında değişiklik yapabilir ve/veya yeniden "
-#~ "dağıtabilirsiniz. \n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "%s tarafından yazıldı.\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "%s ve %s tarafından yazıldı.\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "%s, %s ve %s tarafından yazıldı.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s \n"
-#~ "ve %s tarafından yazıldı.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s, %s \n"
-#~ "ve %s tarafından yazıldı.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s, %s, \n"
-#~ "%s ve %s tarafından yazıldı.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s, %s, \n"
-#~ "%s, %s ve %s tarafından yazıldı.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s, \n"
-#~ "%s, %s, %s, \n"
-#~ "%s ve %s tarafından yazıldı.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "%s, %s, %s, \n"
-#~ "%s, %s, %s, \n"
-#~ "%s, %s ve %s tarafından yazıldı.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "%s, %s, %s, \n"
-#~ "%s, %s, %s, \n"
-#~ "%s, %s, %s ve başkaları tarafından yazıldı.\n"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"Bu, bir serbest yazılımdır; Free Software Foundation tarafından yayınlanan\n"
+"GNU Genel Kamu Lisansı, 2. sürüm (veya sizin seçiminize bağlı olarak) daha "
+"üst \n"
+"sürüm koşulları altında değişiklik yapabilir ve/veya yeniden "
+"dağıtabilirsiniz. \n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "%s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "%s ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "%s, %s ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"%s, %s, %s \n"
+"ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"%s, %s, %s, %s \n"
+"ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"%s, %s, %s, %s, \n"
+"%s ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"%s, %s, %s, %s, \n"
+"%s, %s ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:130
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"%s, %s, %s, \n"
+"%s, %s, %s, \n"
+"%s ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:138
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"%s, %s, %s, \n"
+"%s, %s, %s, \n"
+"%s, %s ve %s tarafından yazıldı.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:148
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"%s, %s, %s, \n"
+"%s, %s, %s, \n"
+"%s, %s, %s ve başkaları tarafından yazıldı.\n"
 
 #
-#~ msgid "string comparison failed"
-#~ msgstr "dizge karşılaştırması başarısız"
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "dizge karşılaştırması başarısız"
 
 #
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Problemi devre dışı bırakmak için LC_ALL='C' tanımlayın."
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Problemi devre dışı bırakmak için LC_ALL='C' tanımlayın."
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Karşılaştırılan dizgeler %s ve %s idi."
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Karşılaştırılan dizgeler %s ve %s idi."
diff --git a/gnulib/po/uk.po b/gnulib/po/uk.po
index 43337227..f053eae7 100644
--- a/gnulib/po/uk.po
+++ b/gnulib/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
 "PO-Revision-Date: 2011-08-22 09:50+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,759 +16,1061 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.1\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "некоректний аргумент %s для %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "неоднозначний аргумент %s для %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Дозволені аргументи такі:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: значення %s є менше ніж або дорівнює %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: параметр ARGP_HELP_FMT вимагає значення"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: параметр ARGP_HELP_FMT має бути додатнім"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Невідомий параметр ARGP_HELP_FMT"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Хибні дані в ARGP_HELP_FMT: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Використання:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr " чи: "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [ПАРАМЕТР...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr ""
-"Спробуйте `%s --help' або `%s --usage' для отримання докладнішого опису.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Спробуйте `%s --help' або `%s --usage' для отримання докладнішого опису.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Про помилки звітуйте на <%s>.\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Невідома системна помилка"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "вивести цю довідку"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "вивести коротке повідомлення про використання"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "НАЗВА"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "встановити назву програми"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "СЕКУНДИ"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "зачекати вказану кількість секунд (типово 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "вивести версію програми"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Невідома версія!?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: забагато аргументів\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Параметр мала бути розпізнана!?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: параметр «%s» є неоднозначним, можливі варіанти:"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "помилка програми"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: параметр '--%s' не може мати аргументу\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "переповнення стосу"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: параметр '%c%s' не може мати аргументу\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "не вдається знайти тимчасовий каталог, спробуйте встановити $TMPDIR"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: для використання параметра «--%s» слід вказати аргумент\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "не вдається створити тимчасовий каталог використовуючи шаблон \"%s\""
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: невідомий параметр '--%s'\n"
+msgid "cannot remove temporary file %s"
+msgstr "не вдається усунути тимчасовий файл %s"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: невідомий параметр '%c%s'\n"
+msgid "cannot remove temporary directory %s"
+msgstr "не вдається усунути тимчасовий каталог %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: Некоректний параметр -- '%c'\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "помилка закриття файлу"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: параметр вимагає аргументу -- '%c'\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "помилка запису"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: параметр '-W %s' неоднозначний\n"
+msgid "preserving permissions for %s"
+msgstr "збереження прав доступу до %s"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-file.c:67
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: параметр '-W %s' не може мати аргументу\n"
+msgid "error while opening \"%s\" for reading"
+msgstr "помилка під час відкриття \"%s\" для читання"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
+#: lib/copy-file.c:74
 #, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: для використання параметра «-W %s» слід вказати аргумент\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "некоректний аргумент %s для %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "неоднозначний аргумент %s для %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Дозволені аргументи такі:"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "неможливо відкрити резервний файл \"%s\" для запису"
 
-#~ msgid "program error"
-#~ msgstr "помилка програми"
-
-#~ msgid "stack overflow"
-#~ msgstr "переповнення стосу"
-
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "не вдається знайти тимчасовий каталог, спробуйте встановити $TMPDIR"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr ""
-#~ "не вдається створити тимчасовий каталог використовуючи шаблон \"%s\""
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "помилка читання \"%s\""
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "не вдається усунути тимчасовий файл %s"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "помилка запису \"%s\""
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "не вдається усунути тимчасовий каталог %s"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "помилка після читання \"%s\""
 
-#~ msgid "error closing file"
-#~ msgstr "помилка закриття файлу"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "помилка fdopen()"
 
-#~ msgid "write error"
-#~ msgstr "помилка запису"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "не знайдено компілятора C#, спробуйте встановити pnet"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "збереження прав доступу до %s"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "не знайдено віртуальної машини C#, спробуйте встановити pnet"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "помилка під час відкриття \"%s\" для читання"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "нащадок %s зазнав невдачі"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "неможливо відкрити резервний файл \"%s\" для запису"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "звичайний порожній файл"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "помилка читання \"%s\""
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "звичайний файл"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "помилка запису \"%s\""
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "каталог"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "помилка після читання \"%s\""
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "спеціальний блоковий файл"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "помилка fdopen()"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "спеціальний символьний файл"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "не знайдено компілятора C#, спробуйте встановити pnet"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "не знайдено віртуальної машини C#, спробуйте встановити pnet"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "символьне посилання"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "нащадок %s зазнав невдачі"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "гніздо"
 
-#~ msgid "regular empty file"
-#~ msgstr "звичайний порожній файл"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "черга повідомлень"
 
-#~ msgid "regular file"
-#~ msgstr "звичайний файл"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "семафор"
 
-#~ msgid "directory"
-#~ msgstr "каталог"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "спільний об'єкт пам'яті"
 
-#~ msgid "block special file"
-#~ msgstr "спеціальний блоковий файл"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "типізований об'єкт пам'яті"
 
-#~ msgid "character special file"
-#~ msgstr "спеціальний символьний файл"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "дивний файл"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Родина адрес для назви вузла не підтримується"
 
-#~ msgid "symbolic link"
-#~ msgstr "символьне посилання"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Тимчасова помилка розв'язування назви вузла"
 
-#~ msgid "socket"
-#~ msgstr "гніздо"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Недійсне значення ai_flags"
 
-#~ msgid "message queue"
-#~ msgstr "черга повідомлень"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Невиправна помилка розв'язування назви вузла"
 
-#~ msgid "semaphore"
-#~ msgstr "семафор"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "ai_family не підтримується"
 
-#~ msgid "shared memory object"
-#~ msgstr "спільний об'єкт пам'яті"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Помилка розподілу пам'яті"
 
-#~ msgid "typed memory object"
-#~ msgstr "типізований об'єкт пам'яті"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "З цією назвою вузла не пов’язано жодної адреси"
 
-#~ msgid "weird file"
-#~ msgstr "дивний файл"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Невідоме ім'я або служба"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Родина адрес для назви вузла не підтримується"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Підтримки назв служб у ai_socktype не передбачено"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Тимчасова помилка розв'язування назви вузла"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "ai_socktype не підтримується"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Недійсне значення ai_flags"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Системна помилка"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Невиправна помилка розв'язування назви вузла"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Замалий буфер для аргументів"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "ai_family не підтримується"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Виконується обробка запиту"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Помилка розподілу пам'яті"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Запит скасовано"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "З цією назвою вузла не пов’язано жодної адреси"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Запит не скасовано"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Невідоме ім'я або служба"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Всі запити оброблено"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Підтримки назв служб у ai_socktype не передбачено"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "Переривання сигналом"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "ai_socktype не підтримується"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Неправильно закодований рядок параметра"
 
-#~ msgid "System error"
-#~ msgstr "Системна помилка"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Невідома помилка"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Замалий буфер для аргументів"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: параметр «%s» є неоднозначним, можливі варіанти:"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Виконується обробка запиту"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: параметр '--%s' не може мати аргументу\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Запит скасовано"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: параметр '%c%s' не може мати аргументу\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Запит не скасовано"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: для використання параметра «--%s» слід вказати аргумент\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Всі запити оброблено"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: невідомий параметр '--%s'\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "Переривання сигналом"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: невідомий параметр '%c%s'\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Неправильно закодований рядок параметра"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: Некоректний параметр -- '%c'\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Невідома помилка"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: параметр вимагає аргументу -- '%c'\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "недійсне значення аргументу source_version для compile_java_class"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: параметр '-W %s' неоднозначний\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "недійсне значення аргументу target_version для compile_java_class"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: параметр '-W %s' не може мати аргументу\n"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "не вдалося створити \"%s\""
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: для використання параметра «-W %s» слід вказати аргумент\n"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "помилка запису у файл \"%s\""
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "недійсне значення аргументу source_version для compile_java_class"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Не знайдено компілятора java, спробуйте встановити gcj або задати "
-#~ "значення $JAVAC"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "недійсне значення аргументу target_version для compile_java_class"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Не знайдено віртуальної машини java, спробуйте встановити gij або задати "
-#~ "значення $JAVA"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "не вдалося створити \"%s\""
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "помилка вводу-виводу нащадка %s"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "помилка запису у файл \"%s\""
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "не вдається змінити права доступу до %s"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Не знайдено компілятора java, спробуйте встановити gcj або задати значення $JAVAC"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "не вдається створити каталог %s"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Не знайдено віртуальної машини java, спробуйте встановити gij або задати значення $JAVA"
 
-#~ msgid "memory exhausted"
-#~ msgstr "пам'ять вичерпано"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "помилка вводу-виводу нащадка %s"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "не вдається змінити поточний каталог"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "не вдається змінити права доступу до %s"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "не вдається зберегти поточний каталог"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "не вдається створити каталог %s"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Не вдалося відкрити /dev/zero для читання"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "пам'ять вичерпано"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "не вдалося створити потік читання"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "не вдається змінити поточний каталог"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "не вдається встановити неблокуючий ввід-вивід з підпроцесом %s"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "не вдається зберегти поточний каталог"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "помилка зв'язку з підпроцесом %s"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Не вдалося відкрити /dev/zero для читання"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "помилка запису у підпроцес %s"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "не вдалося створити потік читання"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "помилка читання з підпроцесу %s"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "не вдається встановити неблокуючий ввід-вивід з підпроцесом %s"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "підпроцес %s закінчився кодом %d"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "помилка зв'язку з підпроцесом %s"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "помилка створення потоків"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "помилка запису у підпроцес %s"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "підпроцес %s закінчився кодом %d"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "помилка читання з підпроцесу %s"
 
-#~ msgid "Franc,ois Pinard"
-#~ msgstr "Franc,ois Pinard"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "підпроцес %s закінчився кодом %d"
 
-#~ msgid "`"
-#~ msgstr "`"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "помилка створення потоків"
 
-#~ msgid "'"
-#~ msgstr "'"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "підпроцес %s закінчився кодом %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "Franc,ois Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr "'"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Успіх"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Брак збігів"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Некоректний формальний вираз"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Некоректний об'єднувальний символ"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Некоректна назва класу символів"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Зворотна похила риска наприкінці виразу"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Недійсне зворотнє посилання"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Незакрита [ або [^"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Незакрита ( або \\("
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Незакрита \\{"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Некоректний вміст \\{\\}"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Некоректний кінець діапазону"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Пам'ять вичерпана"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Некоректний попередній формальний вираз"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Передчасне закінчення формального виразу"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Завеликий формальний вираз"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Неузгоджена ) або \\)"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Не вказано попереднього формального виразу"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yYтТ]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nNнН]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "встановлення прав доступу до %s"
 
-#~ msgid "Success"
-#~ msgstr "Успіх"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Відбій"
 
-#~ msgid "No match"
-#~ msgstr "Брак збігів"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Переривання"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Некоректний формальний вираз"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Закінчення"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Некоректний об'єднувальний символ"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Недійсна інструкція"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Некоректна назва класу символів"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Перехоплення трасування/контрольної точки"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Зворотна похила риска наприкінці виразу"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Аварійне завершення"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Недійсне зворотнє посилання"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Виняток операції з рухомою крапкою"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Незакрита [ або [^"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Знищено"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Незакрита ( або \\("
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Помилка шини"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Незакрита \\{"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Помилка сегментації"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Некоректний вміст \\{\\}"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Розімкнений конвеєр"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Некоректний кінець діапазону"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Таймер"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Пам'ять вичерпана"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Закінчено"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Некоректний попередній формальний вираз"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Екстрена ситуація вводу-виводу"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Передчасне закінчення формального виразу"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Припинення (сигнал)"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Завеликий формальний вираз"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Припинення"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Неузгоджена ) або \\)"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Продовження"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Не вказано попереднього формального виразу"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Нащадок завершився"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yYтТ]"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Припинення (ввід з консолі)"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nNнН]"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Припинення (вивід на консоль)"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "встановлення прав доступу до %s"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Можливий ввід-вивід"
 
-#~ msgid "Hangup"
-#~ msgstr "Відбій"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Перевищення ліміту часу ЦП"
 
-#~ msgid "Interrupt"
-#~ msgstr "Переривання"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Перевищення ліміту розміру файлів"
 
-#~ msgid "Quit"
-#~ msgstr "Закінчення"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Відлік віртуального таймера завершено"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Недійсна інструкція"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Відлік таймера профілювання завершено"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Перехоплення трасування/контрольної точки"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Вікно змінилося"
 
-#~ msgid "Aborted"
-#~ msgstr "Аварійне завершення"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Визначений користувачем сигнал 1"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Виняток операції з рухомою крапкою"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Визначений користувачем сигнал 2"
 
-#~ msgid "Killed"
-#~ msgstr "Знищено"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Пастка EMT"
 
-#~ msgid "Bus error"
-#~ msgstr "Помилка шини"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Некоректний системний виклик"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Помилка сегментації"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Збій стосу"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Розімкнений конвеєр"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Запит інформації"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Таймер"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Аварія живлення"
 
-#~ msgid "Terminated"
-#~ msgstr "Закінчено"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Втрата засобу"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Екстрена ситуація вводу-виводу"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "помилка запису у закритий конвеєр або гніздо"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Припинення (сигнал)"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "не вдається створити конвеєр"
 
-#~ msgid "Stopped"
-#~ msgstr "Припинення"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Сигнал реального часу %d"
 
-#~ msgid "Continued"
-#~ msgstr "Продовження"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Невідомий сигнал %d"
 
-#~ msgid "Child exited"
-#~ msgstr "Нащадок завершився"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "функція iconv непридатна до вжитку"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Припинення (ввід з консолі)"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "функція iconv недоступна"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Припинення (вивід на консоль)"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "символ поза діапазоном"
 
-#~ msgid "I/O possible"
-#~ msgstr "Можливий ввід-вивід"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "не вдається передати U+%04X у локальному зборі знаків"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Перевищення ліміту часу ЦП"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "не вдається передати U+%04X у локальному зборі знаків: %s"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Перевищення ліміту розміру файлів"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "Некоректний користувач"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Відлік віртуального таймера завершено"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "недійсна група"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Відлік таймера профілювання завершено"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "недійсна специфікація"
 
-#~ msgid "Window changed"
-#~ msgstr "Вікно змінилося"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "не вдається вивести повідомлення про помилку"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Визначений користувачем сигнал 1"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Пакет створив %s (%s)\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Визначений користувачем сигнал 2"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Пакет створив %s\n"
 
-#~ msgid "EMT trap"
-#~ msgstr "Пастка EMT"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Bad system call"
-#~ msgstr "Некоректний системний виклик"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"Ліцензія GPLv3+: GNU GPL версії 3 або пізнішої <http://gnu.org/licenses/gpl.html>\n"
+"Це вільне програмне забезпечення: ви можете змінювати та розповсюджувати його.\n"
+"Не надається ЖОДНИХ ГАРАНТІЙ в межах дозволених законодавством.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Автор: %s.\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Збій стосу"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Автори: %s та %s.\n"
 
-#~ msgid "Information request"
-#~ msgstr "Запит інформації"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Автори: %s, %s та %s.\n"
 
-#~ msgid "Power failure"
-#~ msgstr "Аварія живлення"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Автори: %s, %s, %s\n"
+"та %s.\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Втрата засобу"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Автори: %s, %s, %s\n"
+"%s, та %s.\n"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "помилка запису у закритий конвеєр або гніздо"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Автори: %s, %s, %s\n"
+"%s, %s та %s.\n"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "не вдається створити конвеєр"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Автори: %s, %s, %s\n"
+"%s, %s, %s та %s.\n"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Сигнал реального часу %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Автори: %s, %s, %s\n"
+"%s, %s, %s, %s та %s.\n"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Невідомий сигнал %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Автори: %s, %s, %s\n"
+"%s, %s, %s, %s,\n"
+"%s та %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Автори: %s, %s, %s\n"
+"%s, %s, %s, %s,\n"
+"%s, %s та інші.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Про помилки звітуйте на %s\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "функція iconv непридатна до вжитку"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Про помилки у програмі %s звітуйте на %s\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "функція iconv недоступна"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "домашня сторінка %s: <%s>\n"
 
-#~ msgid "character out of range"
-#~ msgstr "символ поза діапазоном"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "домашня сторінка %s: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "не вдається передати U+%04X у локальному зборі знаків"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Загальна допомога щодо використання ПО GNU: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "не вдається передати U+%04X у локальному зборі знаків: %s"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "помилка _open_osfhandle"
 
-#~ msgid "invalid user"
-#~ msgstr "Некоректний користувач"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "не вдається відновити дескриптор %d: помилка dup2"
 
-#~ msgid "invalid group"
-#~ msgstr "недійсна група"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "нащадок процесу %s"
 
-#~ msgid "invalid spec"
-#~ msgstr "недійсна специфікація"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "підпроцес %s отримав фатальний сигнал %d"
 
-#~ msgid "unable to display error message"
-#~ msgstr "не вдається вивести повідомлення про помилку"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "stdin"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Пакет створив %s (%s)\n"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "stdout"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Пакет створив %s\n"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "stderr"
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "невідомий потік"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ліцензія GPLv3+: GNU GPL версії 3 або пізнішої <http://gnu.org/licenses/"
-#~ "gpl.html>\n"
-#~ "Це вільне програмне забезпечення: ви можете змінювати та розповсюджувати "
-#~ "його.\n"
-#~ "Не надається ЖОДНИХ ГАРАНТІЙ в межах дозволених законодавством.\n"
-#~ "\n"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "не вдалося відкрити %s у режимі %s"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Автор: %s.\n"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "невдале порівняння рядків"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Автори: %s та %s.\n"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Встановити LC_ALL='C', щоб уникнути цієї помилки."
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Автори: %s, %s та %s.\n"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Порівнювалися рядки: \"%s\" та \"%s\"."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Автори: %s, %s, %s\n"
-#~ "та %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Автори: %s, %s, %s\n"
-#~ "%s, та %s.\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "неможливо здійснити форматований вивід"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Автори: %s, %s, %s\n"
-#~ "%s, %s та %s.\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "некоректний аргумент для %s%s: `%s'"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Автори: %s, %s, %s\n"
-#~ "%s, %s, %s та %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Автори: %s, %s, %s\n"
-#~ "%s, %s, %s, %s та %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Автори: %s, %s, %s\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s та %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Автори: %s, %s, %s\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s та інші.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Про помилки звітуйте на %s\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Про помилки у програмі %s звітуйте на %s\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "домашня сторінка %s: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "домашня сторінка %s: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Загальна допомога щодо використання ПО GNU: <http://www.gnu.org/gethelp/"
-#~ ">\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "помилка _open_osfhandle"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "не вдається відновити дескриптор %d: помилка dup2"
-
-#~ msgid "%s subprocess"
-#~ msgstr "нащадок процесу %s"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "підпроцес %s отримав фатальний сигнал %d"
-
-#~ msgid "stdin"
-#~ msgstr "stdin"
-
-#~ msgid "stdout"
-#~ msgstr "stdout"
-
-#~ msgid "stderr"
-#~ msgstr "stderr"
-
-#~ msgid "unknown stream"
-#~ msgstr "невідомий потік"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "не вдалося відкрити %s у режимі %s"
-
-#~ msgid "string comparison failed"
-#~ msgstr "невдале порівняння рядків"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Встановити LC_ALL='C', щоб уникнути цієї помилки."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Порівнювалися рядки: \"%s\" та \"%s\"."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "неможливо здійснити форматований вивід"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "некоректний аргумент для %s%s: `%s'"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "некоректний суфікс в аргументі для %s%s: `%s'"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "некоректний суфікс в аргументі для %s%s: `%s'"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "завеликий аргумент для %s%s: `%s'"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "завеликий аргумент для %s%s: `%s'"
diff --git a/gnulib/po/vi.po b/gnulib/po/vi.po
index 7c7d2055..763b9fc7 100644
--- a/gnulib/po/vi.po
+++ b/gnulib/po/vi.po
@@ -1,15 +1,16 @@
 # Vietnamese translation for GNU Lib.
-# Copyright © 2010 Free Software Foundation, Inc.
+# Copyright © 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnulib package.
 # Clytie Siddall <clytie@riverland.net.au>, 2006-2010.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnulib 2.0.0.3462.e9796\n"
+"Project-Id-Version: gnulib-3.0.0.6062.a6b16\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
-"PO-Revision-Date: 2010-03-06 20:21+0930\n"
-"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"POT-Creation-Date: 2011-08-19 13:43+0300\n"
+"PO-Revision-Date: 2012-03-30 14:47+0700\n"
+"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
@@ -17,759 +18,1063 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
+"X-Poedit-Language: Vietnamese\n"
+"X-Poedit-Country: VIET NAM\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "đối sô không hợp lệ %s cho %s"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "đối số mơ hồ %s cho %s"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "Các đối số hợp lệ:"
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: giá trị %s value nhỏ hơn hay bằng %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: tham số « ARGP_HELP_FMT » cần thiết giá trị"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: tham số « ARGP_HELP_FMT » phải là số dương"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Không biết tham số « ARGP_HELP_FMT »"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "Gặp rác trong « ARGP_HELP_FMT » : %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"Tất cả đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy "
-"chọn ngắn tương ứng."
+#: lib/argp-help.c:1246
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "Tất cả đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn ngắn tương ứng."
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1639
 msgid "Usage:"
 msgstr "Cách sử dụng:"
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1643
 msgid "  or: "
 msgstr "  hoặc "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1655
 msgid " [OPTION...]"
 msgstr " [TÙY_CHỌN...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
-msgstr ""
-"Hãy thử lệnh « %s --help » (trợ giúp) hay « %s --usage » (cách sử dụng) để "
-"xem thông tin thêm.\n"
+#: lib/argp-help.c:1682
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
+msgstr "Hãy thử lệnh « %s --help » (trợ giúp) hay « %s --usage » (cách sử dụng) để xem thông tin thêm.\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1710
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "Hãy thông báo lỗi cho %s\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1929 lib/error.c:185
 msgid "Unknown system error"
 msgstr "Gặp lỗi hệ thống lạ"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "hiển thị trợ giúp này"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "hiển thị thông điệp cách sử dụng ngắn"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "TÊN"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "đặt tên chương trình"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "GIÂY"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "treo trong vòng GIÂY giây (mặc định là 3600)"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "in ra phiên bản chương trình"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(LỖI CHƯƠNG TRÌNH) Không có phiên bản đã biết ?"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: Quá nhiều đối số\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(LỖI CHƯƠNG TRÌNH) Nên nhận biệt tùy chọn mà chưa?"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: tùy chọn « %s » vẫn mơ hồ\n"
+#: lib/c-stack.c:204 lib/c-stack.c:297
+msgid "program error"
+msgstr "lỗi chương trình"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
+#: lib/c-stack.c:205 lib/c-stack.c:298
+msgid "stack overflow"
+msgstr "tràn động"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:332
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: tùy chọn « %s » yêu cầu một đối số\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "không tìm thấy thư mục tạm thời, hãy thử đặt biến môi trường $TMPDIR"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:346
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: không nhận ra tùy chọn « --%s »\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "không thể tạo một thư mục tạm thời dùng mẫu « %s »"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:442
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
+msgid "cannot remove temporary file %s"
+msgstr "không thể gỡ bỏ tập tin tạm thời %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/clean-temp.c:457
 #, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: tùy chọn không hợp lệ -- « %c »\n"
+msgid "cannot remove temporary directory %s"
+msgstr "không thể gỡ bỏ thư mục tạm thời %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: tùy chọn yêu cầu một đối số -- « %c »\n"
+#: lib/closein.c:100
+msgid "error closing file"
+msgstr "lỗi đóng tập tin"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn « -W %s » vẫn mơ hồ\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "lỗi ghi"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-acl.c:681
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
-
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: tùy chọn « %s » yêu cầu một đối số\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "đối sô không hợp lệ %s cho %s"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "đối số mơ hồ %s cho %s"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "Các đối số hợp lệ:"
-
-#~ msgid "program error"
-#~ msgstr "lỗi chương trình"
+msgid "preserving permissions for %s"
+msgstr "đang bảo tồn quyền hạn cho %s"
 
-#~ msgid "stack overflow"
-#~ msgstr "tràn động"
+#: lib/copy-file.c:67
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "gặp lỗi khi mở « %s » để đọc"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr ""
-#~ "không tìm thấy thư mục tạm thời, hãy thử đặt biến môi trường $TMPDIR"
+#: lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "không thể mở tập tin sao lưu « %s » để ghi"
 
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "không thể tạo một thư mục tạm thời dùng mẫu « %s »"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "gặp lỗi khi đọc « %s»"
 
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "không thể gỡ bỏ tập tin tạm thời %s"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "gặp lỗi khi ghi « %s»"
 
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "không thể gỡ bỏ thư mục tạm thời %s"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "gặp lỗi sau khi đọc « %s»"
 
-#~ msgid "error closing file"
-#~ msgstr "lỗi đóng tập tin"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() bị lỗi"
 
-#~ msgid "write error"
-#~ msgstr "lỗi ghi"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "Không tìm thấy trình biên dịch C# nên thử cài đặt pnet"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "đang bảo tồn quyền hạn về %s"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "Không tìm thấy cơ chế ảo C# nên thử cài đặt pnet"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "gặp lỗi khi mở « %s » để ghi"
+#: lib/execute.c:189 lib/execute.c:262 lib/spawn-pipe.c:232
+#: lib/spawn-pipe.c:346 lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "Tiến trình con %s bị lỗi"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "không thể mở tập tin sao lưu « %s » để ghi"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "tập tin rỗng kiểu thường"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "gặp lỗi khi đọc « %s»"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "tập tin thông thường"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "gặp lỗi khi ghi « %s»"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "thư mục"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "gặp lỗi sau khi đọc « %s»"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "tập tin đặc biệt khối"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() bị lỗi"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "tập tin đặc biệt ký tự"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "Không tìm thấy trình biên dịch C# nên thử cài đặt pnet"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "fifo (vào trước, ra trước)"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "Không tìm thấy cơ chế ảo C# nên thử cài đặt pnet"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "liên kết tượng trưng"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "Tiến trình con %s bị lỗi"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "ổ cắm"
 
-#~ msgid "regular empty file"
-#~ msgstr "tập tin rỗng chuẩn"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "hàng đời thông điệp"
 
-#~ msgid "regular file"
-#~ msgstr "tập tin chuẩn"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "cờ hiệu"
 
-#~ msgid "directory"
-#~ msgstr "thư mục"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "đối tượng bộ nhớ dùng chung"
 
-#~ msgid "block special file"
-#~ msgstr "tập tin đặc biệt khối"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "đốí tượng bộ nhớ đánh kiểu"
 
-#~ msgid "character special file"
-#~ msgstr "tập tin đặc biệt ký tự"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "tập tin lạ"
 
-#~ msgid "fifo"
-#~ msgstr "fifo (vào trước, ra trước)"
+#: lib/gai_strerror.c:58
+msgid "Address family for hostname not supported"
+msgstr "Họ địa chỉ dành cho tên máy không được hỗ trợ"
 
-#~ msgid "symbolic link"
-#~ msgstr "liên kết tượng trưng"
+#: lib/gai_strerror.c:59
+msgid "Temporary failure in name resolution"
+msgstr "Tạm thời không thể quyết định tên"
 
-#~ msgid "socket"
-#~ msgstr "ổ cắm"
+#: lib/gai_strerror.c:60
+msgid "Bad value for ai_flags"
+msgstr "Giá trị sai đối với « ai_flags » (cờ)"
 
-#~ msgid "message queue"
-#~ msgstr "hàng đời thông điệp"
+#: lib/gai_strerror.c:61
+msgid "Non-recoverable failure in name resolution"
+msgstr "Lỗi không thể phục hồi khi quyết định tên"
 
-#~ msgid "semaphore"
-#~ msgstr "cờ hiệu"
+#: lib/gai_strerror.c:62
+msgid "ai_family not supported"
+msgstr "Không hỗ trợ « ai_family »"
 
-#~ msgid "shared memory object"
-#~ msgstr "đối tượng bộ nhớ dùng chung"
+#: lib/gai_strerror.c:63
+msgid "Memory allocation failure"
+msgstr "Lỗi cấp phát bộ nhớ"
 
-#~ msgid "typed memory object"
-#~ msgstr "đốí tượng bộ nhớ đánh kiểu"
+#: lib/gai_strerror.c:64
+msgid "No address associated with hostname"
+msgstr "Không có địa chỉ liên quan đến tên máy"
 
-#~ msgid "weird file"
-#~ msgstr "tập tin lạ"
+#: lib/gai_strerror.c:65
+msgid "Name or service not known"
+msgstr "Không nhận ra tên hay dịch vụ"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "Không hỗ trợ nhóm địa chỉ đối với tên máy"
+#: lib/gai_strerror.c:66
+msgid "Servname not supported for ai_socktype"
+msgstr "Không hỗ trợ tên máy phục vụ đối với « ai_socktype » (kiểu ổ cắm)"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "Tạm thời không thể quyết định tên"
+#: lib/gai_strerror.c:67
+msgid "ai_socktype not supported"
+msgstr "Không hỗ trợ « ai-socktype » (kiểu ổ cắm)"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "Giá trị sai đối với « ai_flags » (cờ)"
+#: lib/gai_strerror.c:68
+msgid "System error"
+msgstr "Lỗi hệ thống"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "Lỗi không thể phục hồi khi quyết định tên"
+#: lib/gai_strerror.c:69
+msgid "Argument buffer too small"
+msgstr "Vùng đệm đối số quá ngắn"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "Không hỗ trợ « ai_family »"
+#: lib/gai_strerror.c:71
+msgid "Processing request in progress"
+msgstr "Yêu cầu xử lý đang chạy"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "Lỗi cấp phát bộ nhớ"
+#: lib/gai_strerror.c:72
+msgid "Request canceled"
+msgstr "Yêu cầu bị thôi"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "Không có địa chỉ liên quan đến tên máy"
+#: lib/gai_strerror.c:73
+msgid "Request not canceled"
+msgstr "Chưa thôi yêu cầu"
 
-#~ msgid "Name or service not known"
-#~ msgstr "Không nhận ra tên hay dịch vụ"
+#: lib/gai_strerror.c:74
+msgid "All requests done"
+msgstr "Mọi yêu cầu hoàn tất"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "Không hỗ trợ tên máy phục vụ đối với « ai_socktype » (kiểu ổ cắm)"
+#: lib/gai_strerror.c:75
+msgid "Interrupted by a signal"
+msgstr "bị tín hiệu gián đoạn"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "Không hỗ trợ « ai-socktype » (kiểu ổ cắm)"
+#: lib/gai_strerror.c:76
+msgid "Parameter string not correctly encoded"
+msgstr "Chuỗi tham số không phải được mã hóa đúng"
 
-#~ msgid "System error"
-#~ msgstr "Lỗi hệ thống"
+#: lib/gai_strerror.c:88
+msgid "Unknown error"
+msgstr "Gặp lỗi không rõ"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "Vùng đệm đối số quá ngắn"
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: tùy chọn '%s' chưa rõ ràng; khả năng là:"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "Yêu cầu xử lý đang chạy"
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#~ msgid "Request canceled"
-#~ msgstr "Yêu cầu bị thôi"
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#~ msgid "Request not canceled"
-#~ msgstr "Chưa thôi yêu cầu"
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: tùy chọn '--%s' yêu cầu một đối số\n"
 
-#~ msgid "All requests done"
-#~ msgstr "Mọi yêu cầu hoàn tất"
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "bị tín hiệu gián đoạn"
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "Chuỗi tham số không phải được mã hóa đúng"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: tùy chọn không hợp lệ -- « %c »\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "Gặp lỗi không rõ"
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: tùy chọn yêu cầu một đối số -- « %c »\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr ""
-#~ "đối số phiên bản nguồn « source_version » không hợp lệ đối với hạn Java "
-#~ "biên dịch « compile_java_class »"
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: tùy chọn « -W %s » vẫn mơ hồ\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr ""
-#~ "đối số phiên bản đích « source_version » không hợp lệ đối với hạn Java "
-#~ "biên dịch « compile_java_class »"
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "lỗi tạo « %s »"
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: tùy chọn '-W %s' yêu cầu một đối số\n"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "gặp lỗi khi ghi tập tin « %s»"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "đối số phiên bản nguồn « source_version » không hợp lệ đối với hạn Java biên dịch « compile_java_class »"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr ""
-#~ "Không tìm thấy trình biên dịch Java nên thử cài đặt trình « gcj » hoặc "
-#~ "đặt biến môi trường « $JAVAC »."
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "đối số phiên bản đích « source_version » không hợp lệ đối với hạn Java biên dịch « compile_java_class »"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr ""
-#~ "Không tìm thấy cơ chế ảo Java nên thử cài đặt trình « gcj » hoặc đặt biến "
-#~ "môi trường « $JAVAC »."
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "lỗi tạo « %s »"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "Lỗi V/R tiến trình phụ %s"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "gặp lỗi khi ghi tập tin « %s»"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "không thể thay đổi quyền hạn của %s"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "Không tìm thấy trình biên dịch Java nên thử cài đặt trình « gcj » hoặc đặt biến môi trường « $JAVAC »."
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "không thể tạo thư mục %s"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "Không tìm thấy cơ chế ảo Java nên thử cài đặt trình « gcj » hoặc đặt biến môi trường « $JAVAC »."
 
-#~ msgid "memory exhausted"
-#~ msgstr "hết bộ nhớ hoàn toàn"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "Lỗi V/R tiến trình phụ %s"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "không thể ghi lưu thư mục làm việc hiện thời"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "không thể thay đổi quyền hạn của %s"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "chưa trở về thư mục làm việc ban đầu"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "không thể tạo thư mục %s"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "Lỗi mở thiết bị « /dev/zero  » để đọc"
+#: lib/obstack.c:413 lib/obstack.c:415 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "hết bộ nhớ hoàn toàn"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "lỗi tạo nhánh đọc"
+#: lib/openat-die.c:38
+#, c-format
+msgid "unable to record current working directory"
+msgstr "không thể ghi lưu thư mục làm việc hiện thời"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "không thể thiết lập V/R không chặn đối với tiến trình con %s"
+#: lib/openat-die.c:57
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "chưa trở về thư mục làm việc ban đầu"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "lỗi liên lạc với tiến trình con %s"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "Lỗi mở thiết bị « /dev/zero  » để đọc"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "lỗi ghi vào tiến trình con %s"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "lỗi tạo nhánh đọc"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "lỗi đọc từ tiến trình con %s"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "không thể thiết lập V/R không chặn đối với tiến trình con %s"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "lỗi liên lạc với tiến trình con %s"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "lỗi tạo nhánh"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:374
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "lỗi ghi vào tiến trình con %s"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "lỗi đọc từ tiến trình con %s"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "không thể tạo ống dẫn"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
 
-#~ msgid "`"
-#~ msgstr "« "
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "lỗi tạo nhánh"
 
-#~ msgid "'"
-#~ msgstr " »"
+#: lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
+
+#. This is a proper name. See the gettext manual, section Names.
+#: lib/propername.c:309
+msgid "Franc,ois Pinard"
+msgstr "Franc,ois Pinard"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:271
+msgid "`"
+msgstr "« "
+
+#: lib/quotearg.c:272
+msgid "'"
+msgstr " »"
+
+#: lib/regcomp.c:131
+msgid "Success"
+msgstr "Thành công"
+
+#: lib/regcomp.c:134
+msgid "No match"
+msgstr "Không khớp"
+
+#: lib/regcomp.c:137
+msgid "Invalid regular expression"
+msgstr "Biểu thức chính quy không hợp lệ"
+
+#: lib/regcomp.c:140
+msgid "Invalid collation character"
+msgstr "Ký tự đối chiếu không hợp lệ"
+
+#: lib/regcomp.c:143
+msgid "Invalid character class name"
+msgstr "Tên loại ký tự không hợp lệ"
+
+#: lib/regcomp.c:146
+msgid "Trailing backslash"
+msgstr "Có xuyệc ngược theo sau"
+
+#: lib/regcomp.c:149
+msgid "Invalid back reference"
+msgstr "Tham chiếu ngược không hợp lệ"
+
+#: lib/regcomp.c:152
+msgid "Unmatched [ or [^"
+msgstr "Chưa khớp ký tự « [ » hay « [^ »"
+
+#: lib/regcomp.c:155
+msgid "Unmatched ( or \\("
+msgstr "Chưa khớp ký tự « ( » hay « \\( »"
+
+#: lib/regcomp.c:158
+msgid "Unmatched \\{"
+msgstr "Chưa khớp ký tự « \\{ »"
+
+#: lib/regcomp.c:161
+msgid "Invalid content of \\{\\}"
+msgstr "Nội dụng « \\{\\} » không hợp lệ"
+
+#: lib/regcomp.c:164
+msgid "Invalid range end"
+msgstr "Kết thúc phạm vi không hợp lệ"
+
+#: lib/regcomp.c:167
+msgid "Memory exhausted"
+msgstr "Hết bộ nhớ hoàn toàn"
+
+#: lib/regcomp.c:170
+msgid "Invalid preceding regular expression"
+msgstr "Biểu thức chính quy đi trước không hợp lệ"
+
+#: lib/regcomp.c:173
+msgid "Premature end of regular expression"
+msgstr "Biểu thức chính quy kết thúc quá sớm"
+
+#: lib/regcomp.c:176
+msgid "Regular expression too big"
+msgstr "Biểu thức chính quy quá lớn"
+
+#: lib/regcomp.c:179
+msgid "Unmatched ) or \\)"
+msgstr "Chưa khớp ký tự « ) » hay « \\) »"
+
+#: lib/regcomp.c:700
+msgid "No previous regular expression"
+msgstr "Không có biểu thức chính quy đi trước"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[cC]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[kK]"
+
+#: lib/set-mode-acl.c:678
+#, c-format
+msgid "setting permissions for %s"
+msgstr "đang đặt quyền hạn về %s"
 
-#~ msgid "Success"
-#~ msgstr "Thành công"
+#: lib/siglist.h:31
+msgid "Hangup"
+msgstr "Ngừng nói"
 
-#~ msgid "No match"
-#~ msgstr "Không khớp"
+#: lib/siglist.h:34
+msgid "Interrupt"
+msgstr "Ngắt"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "Biểu thức chính quy không hợp lệ"
+#: lib/siglist.h:37
+msgid "Quit"
+msgstr "Thoát"
 
-#~ msgid "Invalid collation character"
-#~ msgstr "Ký tự đối chiếu không hợp lệ"
+#: lib/siglist.h:40
+msgid "Illegal instruction"
+msgstr "Câu lệnh sai"
 
-#~ msgid "Invalid character class name"
-#~ msgstr "Tên loại ký tự không hợp lệ"
+#: lib/siglist.h:43
+msgid "Trace/breakpoint trap"
+msgstr "Bẫy vết/điểm ngắt"
 
-#~ msgid "Trailing backslash"
-#~ msgstr "Có xuyệc ngược theo sau"
+#: lib/siglist.h:46
+msgid "Aborted"
+msgstr "Bị hủy bỏ"
 
-#~ msgid "Invalid back reference"
-#~ msgstr "Tham chiếu ngược không hợp lệ"
+#: lib/siglist.h:49
+msgid "Floating point exception"
+msgstr "Ngoại lệ điểm phù động"
 
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "Chưa khớp ký tự « [ » hay « [^ »"
+#: lib/siglist.h:52
+msgid "Killed"
+msgstr "Bị buộc kết thúc"
 
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "Chưa khớp ký tự « ( » hay « \\( »"
+#: lib/siglist.h:55
+msgid "Bus error"
+msgstr "Lỗi mạch nối"
 
-#~ msgid "Unmatched \\{"
-#~ msgstr "Chưa khớp ký tự « \\{ »"
+#: lib/siglist.h:58
+msgid "Segmentation fault"
+msgstr "Lỗi phân đoạn"
 
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "Nội dụng « \\{\\} » không hợp lệ"
+#: lib/siglist.h:61
+msgid "Broken pipe"
+msgstr "Ống dẫn bị ngắt"
 
-#~ msgid "Invalid range end"
-#~ msgstr "Kết thúc phạm vi không hợp lệ"
+#: lib/siglist.h:64
+msgid "Alarm clock"
+msgstr "Đồng hồ báo động"
 
-#~ msgid "Memory exhausted"
-#~ msgstr "Hết bộ nhớ hoàn toàn"
+#: lib/siglist.h:67
+msgid "Terminated"
+msgstr "Bị chấm dứt"
 
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "Biểu thức chính quy đi trước không hợp lệ"
+#: lib/siglist.h:70
+msgid "Urgent I/O condition"
+msgstr "Điều kiện V/R khẩn"
 
-#~ msgid "Premature end of regular expression"
-#~ msgstr "Biểu thức chính quy kết thúc quá sớm"
+#: lib/siglist.h:73
+msgid "Stopped (signal)"
+msgstr "Bị ngừng (ký hiệu)"
 
-#~ msgid "Regular expression too big"
-#~ msgstr "Biểu thức chính quy quá lớn"
+#: lib/siglist.h:76
+msgid "Stopped"
+msgstr "Bị ngừng"
 
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr "Chưa khớp ký tự « ) » hay « \\) »"
+#: lib/siglist.h:79
+msgid "Continued"
+msgstr "Đã tiếp tục"
 
-#~ msgid "No previous regular expression"
-#~ msgstr "Không có biểu thức chính quy đi trước"
+#: lib/siglist.h:82
+msgid "Child exited"
+msgstr "Tiến trình con đã thoát"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[cC]"
+#: lib/siglist.h:85
+msgid "Stopped (tty input)"
+msgstr "Bị ngừng (đầu vào TTY)"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[kK]"
+#: lib/siglist.h:88
+msgid "Stopped (tty output)"
+msgstr "Bị ngừng (đầu ra TTY)"
 
-#~ msgid "setting permissions for %s"
-#~ msgstr "đang đặt quyền hạn về %s"
+#: lib/siglist.h:91
+msgid "I/O possible"
+msgstr "Có thể V/R"
 
-#~ msgid "Hangup"
-#~ msgstr "Ngừng nói"
+#: lib/siglist.h:94
+msgid "CPU time limit exceeded"
+msgstr "Vượt quá thời hạn CPU"
 
-#~ msgid "Interrupt"
-#~ msgstr "Ngắt"
+#: lib/siglist.h:97
+msgid "File size limit exceeded"
+msgstr "Vượt quá giới hạn kích cỡ tập tin"
 
-#~ msgid "Quit"
-#~ msgstr "Thoát"
+#: lib/siglist.h:100
+msgid "Virtual timer expired"
+msgstr "Hàm đếm thời gian ảo đã hết hạn"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "Câu lệnh sai"
+#: lib/siglist.h:103
+msgid "Profiling timer expired"
+msgstr "Hàm đếm thời gian đo hiệu năng sử dụng đã hết hạn"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "Bẫy vết/điểm ngắt"
+#: lib/siglist.h:106
+msgid "Window changed"
+msgstr "Cửa sổ bị thay đổi"
 
-#~ msgid "Aborted"
-#~ msgstr "Bị hủy bỏ"
+#: lib/siglist.h:109
+msgid "User defined signal 1"
+msgstr "Tín hiệu do người dùng xác định 1"
 
-#~ msgid "Floating point exception"
-#~ msgstr "Ngoại lệ điểm phù động"
+#: lib/siglist.h:112
+msgid "User defined signal 2"
+msgstr "Tín hiệu do người dùng xác định 2"
 
-#~ msgid "Killed"
-#~ msgstr "Bị buộc kết thúc"
+#: lib/siglist.h:117
+msgid "EMT trap"
+msgstr "Bẫy EMT"
 
-#~ msgid "Bus error"
-#~ msgstr "Lỗi mạch nối"
+#: lib/siglist.h:120
+msgid "Bad system call"
+msgstr "Sai gọi hệ thống"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "Lỗi phân đoạn"
+#: lib/siglist.h:123
+msgid "Stack fault"
+msgstr "Lỗi đống"
 
-#~ msgid "Broken pipe"
-#~ msgstr "Ống dẫn bị ngắt"
+#: lib/siglist.h:126
+msgid "Information request"
+msgstr "Yêu cầu thông tin"
 
-#~ msgid "Alarm clock"
-#~ msgstr "Đồng hồ báo động"
+#: lib/siglist.h:128
+msgid "Power failure"
+msgstr "Bị cúp điện đột ngột"
 
-#~ msgid "Terminated"
-#~ msgstr "Bị chấm dứt"
+#: lib/siglist.h:131
+msgid "Resource lost"
+msgstr "Tài nguyên bị mất"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "Điều kiện V/R khẩn"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "lỗi ghi vào một đường ống hay ổ cắm bị đóng"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "Bị ngừng (ký hiệu)"
+#: lib/spawn-pipe.c:138 lib/spawn-pipe.c:141 lib/spawn-pipe.c:262
+#: lib/spawn-pipe.c:265
+#, c-format
+msgid "cannot create pipe"
+msgstr "không thể tạo ống dẫn"
 
-#~ msgid "Stopped"
-#~ msgstr "Bị ngừng"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "Tín hiệu thời gian thật %d"
 
-#~ msgid "Continued"
-#~ msgstr "Đã tiếp tục"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "Không rõ tín hiệu %d"
 
-#~ msgid "Child exited"
-#~ msgstr "Tiến trình con đã thoát"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "hàm iconv vô ích"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "Bị ngừng (đầu vào TTY)"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "không có hàm iconv"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "Bị ngừng (đầu ra TTY)"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "Ký tự ở ngoại phạm vi"
 
-#~ msgid "I/O possible"
-#~ msgstr "Có thể V/R"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "không thể chuyển đổi U+%04X sang bộ ký tự địa phương"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "Vượt quá thời hạn CPU"
+#: lib/unicodeio.c:184
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "không thể chuyển đổi U+%04X sang bộ ký tự địa phương: %s"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "Vượt quá giới hạn kích cỡ tập tin"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "người dùng không hợp lệ"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "Hàm đếm thời gian ảo đã hết hạn"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "nhóm không hợp lệ"
 
-#~ msgid "Profiling timer expired"
-#~ msgstr "Hàm đếm thời gian đo hiệu năng sử dụng đã hết hạn"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "đặc tả không hợp lệ"
 
-#~ msgid "Window changed"
-#~ msgstr "Cửa sổ bị thay đổi"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "không thể hiển thị thông điệp lỗi"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "Tín hiệu do người dùng xác định 1"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "Gói đóng bởi %s (%s)\n"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "Tín hiệu do người dùng xác định 2"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "Gói đóng bởi %s\n"
 
-#~ msgid "EMT trap"
-#~ msgstr "Bẫy EMT"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "©"
 
-#~ msgid "Bad system call"
-#~ msgstr "Sai gọi hệ thống"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"GPLv3+: Giấy Phép Công Cộng GNU, phiên bản 3 hay sau <http://gnu.org/licenses/gpl.html>\n"
+"Đây là phần mềm tự do : bạn có quyền thay đổi và phát hành lại nó.\n"
+"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "Tác giả: %s.\n"
 
-#~ msgid "Stack fault"
-#~ msgstr "Lỗi đống"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "Tác giả: %s và %s.\n"
 
-#~ msgid "Information request"
-#~ msgstr "Yêu cầu thông tin"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "Tác giả: %s, %s, và %s.\n"
 
-#~ msgid "Power failure"
-#~ msgstr "Bị cúp điện đột ngột"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Tác giả: %s, %s, %s,\n"
+"và %s.\n"
 
-#~ msgid "Resource lost"
-#~ msgstr "Tài nguyên bị mất"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Tác giả: %s, %s, %s,\n"
+"%s, và %s.\n"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "lỗi ghi vào một đường ống hay ổ cắm bị đóng"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"Tác gia: %s, %s, %s,\n"
+"%s, %s, và %s.\n"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "Tín hiệu thời gian thật %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"Tác giả: %s, %s, %s,\n"
+"%s, %s, %s, và %s.\n"
 
-#~ msgid "Unknown signal %d"
-#~ msgstr "Không rõ tín hiệu %d"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"Tác giả: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"và %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"Tác giả: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, và %s.\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"Tác giả: %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, và các người khác.\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"Hãy thông báo lỗi nào cho : %s\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "hàm iconv vô ích"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "Hãy thông báo lỗi %s nào cho : %s\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "không có hàm iconv"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "Trang chủ %s: <%s>\n"
 
-#~ msgid "character out of range"
-#~ msgstr "Ký tự ở ngoại phạm vi"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "Trang chủ %s: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "không thể chuyển đổi U+%04X sang bộ ký tự địa phương"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "Trợ giúp chung về cách sử dụng phần mềm GNU: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "không thể chuyển đổi U+%04X sang bộ ký tự địa phương: %s"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle bị lỗi"
 
-#~ msgid "invalid user"
-#~ msgstr "người dùng không hợp lệ"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "không thể phục hồi bộ mô tả tập tin %d: « dup2 » bị lỗi"
 
-#~ msgid "invalid group"
-#~ msgstr "nhóm không hợp lệ"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "Tiến trình con %s"
 
-#~ msgid "invalid spec"
-#~ msgstr "đặc tả không hợp lệ"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "Tiến trình con %s đã nhận tín hiệu nghiêm trọng %d"
 
-#~ msgid "unable to display error message"
-#~ msgstr "không thể hiển thị thông điệp lỗi"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "đầu vào tiêu chuẩn"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "Gói đóng bởi %s (%s)\n"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "đầu ra tiêu chuẩn"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "Gói đóng bởi %s\n"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "đầu lỗi tiêu chuẩn"
 
-#~ msgid "(C)"
-#~ msgstr "©"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "không nhận ra luồng"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "GPLv3+: Giấy Phép Công Cộng GNU, phiên bản 3 hay sau <http://gnu.org/"
-#~ "licenses/gpl.html>\n"
-#~ "Đây là phần mềm tự do : bạn có quyền thay đổi và phát hành lại nó.\n"
-#~ "KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
-#~ "\n"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "lỗi mở lại %s với chế độ %s"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "Tác giả: %s.\n"
+#: lib/xmemcoll.c:39
+#, c-format
+msgid "string comparison failed"
+msgstr "lỗi so sánh chuỗi"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "Tác giả: %s và %s.\n"
+#: lib/xmemcoll.c:40
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "Hãy lập « LC_ALL='C' » để chỉnh sửa vấn đề đó."
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "Tác giả: %s, %s, và %s.\n"
+#: lib/xmemcoll.c:42
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "Hai chuỗi được so sánh là %s và %s."
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Tác giả: %s, %s, %s,\n"
-#~ "và %s.\n"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "không thể thực hiện kết xuất có định dạng"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Tác giả: %s, %s, %s,\n"
-#~ "%s, và %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Tác gia: %s, %s, %s,\n"
-#~ "%s, %s, và %s.\n"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "đối số %s%s không hợp lệ « %s »"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "Tác giả: %s, %s, %s,\n"
-#~ "%s, %s, %s, và %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "Tác giả: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "và %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "Tác giả: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, và %s.\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "Tác giả: %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, và các người khác.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Hãy thông báo lỗi nào cho : %s\n"
-
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "Hãy thông báo lỗi %s nào cho : %s\n"
-
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "Trang chủ %s: <%s>\n"
-
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "Trang chủ %s: <http://www.gnu.org/software/%s/>\n"
-
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr ""
-#~ "Trợ giúp chung về cách sử dụng phần mềm GNU: <http://www.gnu.org/gethelp/"
-#~ ">\n"
-
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle bị lỗi"
-
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "không thể phục hồi bộ mô tả tập tin %d: « dup2 » bị lỗi"
-
-#~ msgid "%s subprocess"
-#~ msgstr "Tiến trình con %s"
-
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "Tiến trình con %s đã nhận tín hiệu nghiêm trọng %d"
-
-#~ msgid "stdin"
-#~ msgstr "đầu vào tiêu chuẩn"
-
-#~ msgid "stdout"
-#~ msgstr "đầu ra tiêu chuẩn"
-
-#~ msgid "stderr"
-#~ msgstr "đầu lỗi tiêu chuẩn"
-
-#~ msgid "unknown stream"
-#~ msgstr "không nhận ra luồng"
-
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "lỗi mở lại %s với chế độ %s"
-
-#~ msgid "string comparison failed"
-#~ msgstr "lỗi so sánh chuỗi"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "Hãy lập « LC_ALL='C' » để chỉnh sửa vấn đề đó."
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "Hai chuỗi được so sánh là %s và %s."
-
-#~ msgid "cannot perform formatted output"
-#~ msgstr "không thể thực hiện kết xuất có định dạng"
-
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "đối số %s%s không hợp lệ « %s »"
-
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "hậu tố không hợp lệ trong đối số %s%s « %s »"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "hậu tố không hợp lệ trong đối số %s%s « %s »"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "Đối số %s%s « %s » quá lớn"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "Đối số %s%s « %s » quá lớn"
diff --git a/gnulib/po/zh_CN.po b/gnulib/po/zh_CN.po
index 62dc7da5..c18c2d19 100644
--- a/gnulib/po/zh_CN.po
+++ b/gnulib/po/zh_CN.po
@@ -10,760 +10,1062 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnulib 2.0.0.3462.e9796\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2010-02-22 12:32+0200\n"
 "PO-Revision-Date: 2010-02-26 09:54+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:133
+#, c-format
+msgid "invalid argument %s for %s"
+msgstr "%2$s 的参数 %1$s 无效"
+
+#: lib/argmatch.c:134
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr "%2$s 的参数 %1$s 有歧义"
+
+#: lib/argmatch.c:153
+#, c-format
+msgid "Valid arguments are:"
+msgstr "有效的参数为："
+
+#: lib/argp-help.c:147
 #, c-format
 msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
 msgstr "ARGP_HELP_FMT: %s 的值小于或等于 %s"
 
-#: gnulib/argp-help.c:220
+#: lib/argp-help.c:220
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT 参数需要一个值"
 
-#: gnulib/argp-help.c:226
+#: lib/argp-help.c:226
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
 msgstr "%.*s: ARGP_HELP_FMT 参数必须为正值"
 
-#: gnulib/argp-help.c:235
+#: lib/argp-help.c:235
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: 未知的 ARGP_HELP_FMT 参数"
 
-#: gnulib/argp-help.c:247
+#: lib/argp-help.c:247
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT 中的无效参数: %s"
 
-#: gnulib/argp-help.c:1247
-msgid ""
-"Mandatory or optional arguments to long options are also mandatory or "
-"optional for any corresponding short options."
-msgstr ""
-"选项完整形式所必须用的或是可选的参数，在使用选项缩写形式时也是必须的或是可选"
-"的。"
+#: lib/argp-help.c:1244
+msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+msgstr "选项完整形式所必须用的或是可选的参数，在使用选项缩写形式时也是必须的或是可选的。"
 
-#: gnulib/argp-help.c:1640
+#: lib/argp-help.c:1637
 msgid "Usage:"
 msgstr "用法："
 
-#: gnulib/argp-help.c:1644
+#: lib/argp-help.c:1641
 msgid "  or: "
 msgstr "  或者： "
 
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1653
 msgid " [OPTION...]"
 msgstr "[选项...]"
 
-#: gnulib/argp-help.c:1683
-#, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+#: lib/argp-help.c:1680
+#, c-format
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "请尝试执行“%s --help”或“%s --usage”来获取更多信息。\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1708
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "请向 %s 报告错误。\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1927 lib/error.c:153
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib/argp-parse.c:81
+#: lib/argp-parse.c:81
 msgid "give this help list"
 msgstr "显示此帮助列表"
 
-#: gnulib/argp-parse.c:82
+#: lib/argp-parse.c:82
 msgid "give a short usage message"
 msgstr "显示一份简洁的用法信息"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "NAME"
 msgstr "NAME"
 
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:83
 msgid "set the program name"
 msgstr "设定程序名称"
 
-#: gnulib/argp-parse.c:84
+#: lib/argp-parse.c:84
 msgid "SECS"
 msgstr "SECS"
 
-#: gnulib/argp-parse.c:85
+#: lib/argp-parse.c:85
 msgid "hang for SECS seconds (default 3600)"
 msgstr "挂起 SECS 秒（默认 3600 秒）"
 
-#: gnulib/argp-parse.c:142
+#: lib/argp-parse.c:142
 msgid "print program version"
 msgstr "打印程序版本"
 
-#: gnulib/argp-parse.c:159
+#: lib/argp-parse.c:158
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "（程序错误）未知版本！？"
 
-#: gnulib/argp-parse.c:612
+#: lib/argp-parse.c:611
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s：参数太多\n"
 
-#: gnulib/argp-parse.c:755
+#: lib/argp-parse.c:754
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "（程序错误）未知的选项！？"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
-#, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s: 选项\"%s\"歧义\n"
+#: lib/c-stack.c:196 lib/c-stack.c:309
+msgid "program error"
+msgstr "程序错误"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: 选项\"--%s\"不要参数\n"
+#: lib/c-stack.c:197 lib/c-stack.c:310
+msgid "stack overflow"
+msgstr "堆栈溢出"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/clean-temp.c:335
 #, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s: 选项\"%c%s\"不要参数\n"
-
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
-#, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s: 选项\"%s\"必须带参数\n"
+msgid "cannot find a temporary directory, try setting $TMPDIR"
+msgstr "无法找到一个临时目录，请尝试设置 $TMPDIR 环境变量"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
+#: lib/clean-temp.c:349
 #, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: 无法识别的选项\"--%s\"\n"
+msgid "cannot create a temporary directory using template \"%s\""
+msgstr "无法以模板“%s”创建一个临时目录"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/clean-temp.c:445
 #, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: 无法识别的选项\"%c%s\"\n"
+msgid "cannot remove temporary file %s"
+msgstr "无法删除临时文件 %s"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
+#: lib/clean-temp.c:460
 #, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: 无效选项 -- \"%c\"\n"
+msgid "cannot remove temporary directory %s"
+msgstr "无法删除临时目录 %s"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: 选项需要参数 -- \"%c\"\n"
+#: lib/closein.c:99
+msgid "error closing file"
+msgstr "关闭文件时发生错误"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: 选项\"-W %s\"有歧义\n"
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "写入错误"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
+#: lib/copy-acl.c:547
 #, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: 选项\"-W %s\"不要带参数\n"
-
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s: 选项\"%s\"必须带参数\n"
-
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "%2$s 的参数 %1$s 无效"
-
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "%2$s 的参数 %1$s 有歧义"
-
-#~ msgid "Valid arguments are:"
-#~ msgstr "有效的参数为："
-
-#~ msgid "program error"
-#~ msgstr "程序错误"
-
-#~ msgid "stack overflow"
-#~ msgstr "堆栈溢出"
+msgid "preserving permissions for %s"
+msgstr "保留 %s 的权限"
 
-#~ msgid "cannot find a temporary directory, try setting $TMPDIR"
-#~ msgstr "无法找到一个临时目录，请尝试设置 $TMPDIR 环境变量"
-
-#~ msgid "cannot create a temporary directory using template \"%s\""
-#~ msgstr "无法以模板“%s”创建一个临时目录"
-
-#~ msgid "cannot remove temporary file %s"
-#~ msgstr "无法删除临时文件 %s"
-
-#~ msgid "cannot remove temporary directory %s"
-#~ msgstr "无法删除临时目录 %s"
+#: lib/copy-file.c:67
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "打开“%s”读取数据时发生错误"
 
-#~ msgid "error closing file"
-#~ msgstr "关闭文件时发生错误"
+#: lib/copy-file.c:74
+#, c-format
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "无法打开备份文件“%s”写入数据"
 
-#~ msgid "write error"
-#~ msgstr "写入错误"
+#: lib/copy-file.c:82
+#, c-format
+msgid "error reading \"%s\""
+msgstr "读入“%s”时错误"
 
-#~ msgid "preserving permissions for %s"
-#~ msgstr "保留 %s 的权限"
+#: lib/copy-file.c:87 lib/copy-file.c:94 lib/copy-file.c:133
+#, c-format
+msgid "error writing \"%s\""
+msgstr "写入“%s”时错误"
 
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "打开“%s”读取数据时发生错误"
+#: lib/copy-file.c:96 lib/copy-file.c:135
+#, c-format
+msgid "error after reading \"%s\""
+msgstr "读入“%s”后错误"
 
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "无法打开备份文件“%s”写入数据"
+#: lib/csharpcomp.c:310 lib/javaversion.c:76
+#, c-format
+msgid "fdopen() failed"
+msgstr "fdopen() 错误"
 
-#~ msgid "error reading \"%s\""
-#~ msgstr "读入“%s”时错误"
+#: lib/csharpcomp.c:571
+#, c-format
+msgid "C# compiler not found, try installing pnet"
+msgstr "未找到 C# 编译器，尝试安装 pnet"
 
-#~ msgid "error writing \"%s\""
-#~ msgstr "写入“%s”时错误"
+#: lib/csharpexec.c:343
+#, c-format
+msgid "C# virtual machine not found, try installing pnet"
+msgstr "未找到 C# 虚拟机，尝试安装 pnet"
 
-#~ msgid "error after reading \"%s\""
-#~ msgstr "读入“%s”后错误"
+#: lib/execute.c:189 lib/execute.c:262 lib/pipe.c:229 lib/pipe.c:342
+#: lib/wait-process.c:282 lib/wait-process.c:356
+#, c-format
+msgid "%s subprocess failed"
+msgstr "%s 子进程错误"
 
-#~ msgid "fdopen() failed"
-#~ msgstr "fdopen() 错误"
+#: lib/file-type.c:38
+msgid "regular empty file"
+msgstr "一般空文件"
 
-#~ msgid "C# compiler not found, try installing pnet"
-#~ msgstr "未找到 C# 编译器，尝试安装 pnet"
+#: lib/file-type.c:38
+msgid "regular file"
+msgstr "一般文件"
 
-#~ msgid "C# virtual machine not found, try installing pnet"
-#~ msgstr "未找到 C# 虚拟机，尝试安装 pnet"
+#: lib/file-type.c:41
+msgid "directory"
+msgstr "目录"
 
-#~ msgid "%s subprocess failed"
-#~ msgstr "%s 子进程错误"
+#: lib/file-type.c:44
+msgid "block special file"
+msgstr "块特殊文件"
 
-#~ msgid "regular empty file"
-#~ msgstr "一般空文件"
+#: lib/file-type.c:47
+msgid "character special file"
+msgstr "字符特殊文件"
 
-#~ msgid "regular file"
-#~ msgstr "一般文件"
+#: lib/file-type.c:50
+msgid "fifo"
+msgstr "先进先出"
 
-#~ msgid "directory"
-#~ msgstr "目录"
+#: lib/file-type.c:53
+msgid "symbolic link"
+msgstr "符号链接"
 
-#~ msgid "block special file"
-#~ msgstr "块特殊文件"
+#: lib/file-type.c:56
+msgid "socket"
+msgstr "套接字"
 
-#~ msgid "character special file"
-#~ msgstr "字符特殊文件"
+#: lib/file-type.c:59
+msgid "message queue"
+msgstr "消息队列"
 
-#~ msgid "fifo"
-#~ msgstr "先进先出"
+#: lib/file-type.c:62
+msgid "semaphore"
+msgstr "信号量"
 
-#~ msgid "symbolic link"
-#~ msgstr "符号链接"
+#: lib/file-type.c:65
+msgid "shared memory object"
+msgstr "共享内存对象"
 
-#~ msgid "socket"
-#~ msgstr "套接字"
+#: lib/file-type.c:68
+msgid "typed memory object"
+msgstr "标准内存对象"
 
-#~ msgid "message queue"
-#~ msgstr "消息队列"
+#: lib/file-type.c:70
+msgid "weird file"
+msgstr "古怪文件"
 
-#~ msgid "semaphore"
-#~ msgstr "信号量"
+#: lib/gai_strerror.c:42
+msgid "Address family for hostname not supported"
+msgstr "不支持主机名的地址族"
 
-#~ msgid "shared memory object"
-#~ msgstr "共享内存对象"
+#: lib/gai_strerror.c:43
+msgid "Temporary failure in name resolution"
+msgstr "名称解析时发生临时错误"
 
-#~ msgid "typed memory object"
-#~ msgstr "标准内存对象"
+#: lib/gai_strerror.c:44
+msgid "Bad value for ai_flags"
+msgstr "ai_flags 的值错误"
 
-#~ msgid "weird file"
-#~ msgstr "古怪文件"
+#: lib/gai_strerror.c:45
+msgid "Non-recoverable failure in name resolution"
+msgstr "名称解析时发生不可恢复的错误"
 
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "不支持主机名的地址族"
+#: lib/gai_strerror.c:46
+msgid "ai_family not supported"
+msgstr "不支持 ai_family"
 
-#~ msgid "Temporary failure in name resolution"
-#~ msgstr "名称解析时发生临时错误"
+#: lib/gai_strerror.c:47
+msgid "Memory allocation failure"
+msgstr "内存分配错误"
 
-#~ msgid "Bad value for ai_flags"
-#~ msgstr "ai_flags 的值错误"
+#: lib/gai_strerror.c:48
+msgid "No address associated with hostname"
+msgstr "主机名未分配到地址"
 
-#~ msgid "Non-recoverable failure in name resolution"
-#~ msgstr "名称解析时发生不可恢复的错误"
+#: lib/gai_strerror.c:49
+msgid "Name or service not known"
+msgstr "未知的名称或服务"
 
-#~ msgid "ai_family not supported"
-#~ msgstr "不支持 ai_family"
+#: lib/gai_strerror.c:50
+msgid "Servname not supported for ai_socktype"
+msgstr "ai_socktype 不支持的服务名"
 
-#~ msgid "Memory allocation failure"
-#~ msgstr "内存分配错误"
+#: lib/gai_strerror.c:51
+msgid "ai_socktype not supported"
+msgstr "不支持 ai_socktype"
 
-#~ msgid "No address associated with hostname"
-#~ msgstr "主机名未分配到地址"
+#: lib/gai_strerror.c:52
+msgid "System error"
+msgstr "系统错误"
 
-#~ msgid "Name or service not known"
-#~ msgstr "未知的名称或服务"
+#: lib/gai_strerror.c:53
+msgid "Argument buffer too small"
+msgstr "参数缓冲区太小"
 
-#~ msgid "Servname not supported for ai_socktype"
-#~ msgstr "ai_socktype 不支持的服务名"
+#: lib/gai_strerror.c:55
+msgid "Processing request in progress"
+msgstr "正在处理进程的请求"
 
-#~ msgid "ai_socktype not supported"
-#~ msgstr "不支持 ai_socktype"
+#: lib/gai_strerror.c:56
+msgid "Request canceled"
+msgstr "请求已取消"
 
-#~ msgid "System error"
-#~ msgstr "系统错误"
+#: lib/gai_strerror.c:57
+msgid "Request not canceled"
+msgstr "请求未取消"
 
-#~ msgid "Argument buffer too small"
-#~ msgstr "参数缓冲区太小"
+#: lib/gai_strerror.c:58
+msgid "All requests done"
+msgstr "已处理所有请求"
 
-#~ msgid "Processing request in progress"
-#~ msgstr "正在处理进程的请求"
+#: lib/gai_strerror.c:59
+msgid "Interrupted by a signal"
+msgstr "被一个信号中断"
 
-#~ msgid "Request canceled"
-#~ msgstr "请求已取消"
+#: lib/gai_strerror.c:60
+msgid "Parameter string not correctly encoded"
+msgstr "参数字符串未正确编码"
 
-#~ msgid "Request not canceled"
-#~ msgstr "请求未取消"
+#: lib/gai_strerror.c:72
+msgid "Unknown error"
+msgstr "未知错误"
 
-#~ msgid "All requests done"
-#~ msgstr "已处理所有请求"
+#: lib/getopt.c:529 lib/getopt.c:545
+#, c-format
+msgid "%s: option '%s' is ambiguous\n"
+msgstr "%s: 选项\"%s\"歧义\n"
 
-#~ msgid "Interrupted by a signal"
-#~ msgstr "被一个信号中断"
+#: lib/getopt.c:578 lib/getopt.c:582
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: 选项\"--%s\"不要参数\n"
 
-#~ msgid "Parameter string not correctly encoded"
-#~ msgstr "参数字符串未正确编码"
+#: lib/getopt.c:591 lib/getopt.c:596
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: 选项\"%c%s\"不要参数\n"
 
-#~ msgid "Unknown error"
-#~ msgstr "未知错误"
+#: lib/getopt.c:639 lib/getopt.c:658 lib/getopt.c:961 lib/getopt.c:980
+#, c-format
+msgid "%s: option '%s' requires an argument\n"
+msgstr "%s: 选项\"%s\"必须带参数\n"
 
-#~ msgid "invalid source_version argument to compile_java_class"
-#~ msgstr "compile_java_class 的 source_version 参数无效"
+#: lib/getopt.c:696 lib/getopt.c:699
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: 无法识别的选项\"--%s\"\n"
 
-#~ msgid "invalid target_version argument to compile_java_class"
-#~ msgstr "compile_java_class 的 target_version 参数无效"
+#: lib/getopt.c:707 lib/getopt.c:710
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: 无法识别的选项\"%c%s\"\n"
 
-#~ msgid "failed to create \"%s\""
-#~ msgstr "无法创建“%s”"
+#: lib/getopt.c:759 lib/getopt.c:762
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: 无效选项 -- \"%c\"\n"
 
-#~ msgid "error while writing \"%s\" file"
-#~ msgstr "正在写入“%s”文件时发生错误"
+#: lib/getopt.c:812 lib/getopt.c:829 lib/getopt.c:1032 lib/getopt.c:1050
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: 选项需要参数 -- \"%c\"\n"
 
-#~ msgid "Java compiler not found, try installing gcj or set $JAVAC"
-#~ msgstr "未找到 Java 编译器，尝试安装 gcj 或是设置 $JAVAC"
+#: lib/getopt.c:882 lib/getopt.c:898
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: 选项\"-W %s\"有歧义\n"
 
-#~ msgid "Java virtual machine not found, try installing gij or set $JAVA"
-#~ msgstr "未找到 Java 虚拟机，尝试安装 gij 或是设置 $JAVA"
+#: lib/getopt.c:922 lib/getopt.c:940
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: 选项\"-W %s\"不要带参数\n"
 
-#~ msgid "%s subprocess I/O error"
-#~ msgstr "%s 子进程输入/输出错误"
+#: lib/javacomp.c:126 lib/javacomp.c:140 lib/javacomp.c:156
+#, c-format
+msgid "invalid source_version argument to compile_java_class"
+msgstr "compile_java_class 的 source_version 参数无效"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "无法更改 %s 的权限"
+#: lib/javacomp.c:171 lib/javacomp.c:192
+#, c-format
+msgid "invalid target_version argument to compile_java_class"
+msgstr "compile_java_class 的 target_version 参数无效"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "无法创建目录 %s"
+#: lib/javacomp.c:503
+#, c-format
+msgid "failed to create \"%s\""
+msgstr "无法创建“%s”"
 
-#~ msgid "memory exhausted"
-#~ msgstr "内存用尽"
+#: lib/javacomp.c:510
+#, c-format
+msgid "error while writing \"%s\" file"
+msgstr "正在写入“%s”文件时发生错误"
 
-#~ msgid "unable to record current working directory"
-#~ msgstr "无法记录当前工作的目录"
+#: lib/javacomp.c:2343
+#, c-format
+msgid "Java compiler not found, try installing gcj or set $JAVAC"
+msgstr "未找到 Java 编译器，尝试安装 gcj 或是设置 $JAVAC"
 
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "返回到初始工作目录失败"
+#: lib/javaexec.c:417
+#, c-format
+msgid "Java virtual machine not found, try installing gij or set $JAVA"
+msgstr "未找到 Java 虚拟机，尝试安装 gij 或是设置 $JAVA"
 
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "无法以读方式打开 /dev/zero"
+#: lib/javaversion.c:84
+#, c-format
+msgid "%s subprocess I/O error"
+msgstr "%s 子进程输入/输出错误"
 
-#~ msgid "creation of reading thread failed"
-#~ msgstr "读线程创建错误"
+#: lib/mkdir-p.c:196
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "无法更改 %s 的权限"
 
-#~ msgid "cannot set up nonblocking I/O to %s subprocess"
-#~ msgstr "无法为 %s 子进程设置非阻塞性 I/O"
+#: lib/mkdir-p.c:206
+#, c-format
+msgid "cannot create directory %s"
+msgstr "无法创建目录 %s"
 
-#~ msgid "communication with %s subprocess failed"
-#~ msgstr "与 %s 子进程通讯错误"
+#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 lib/xsetenv.c:37
+#, c-format
+msgid "memory exhausted"
+msgstr "内存用尽"
 
-#~ msgid "write to %s subprocess failed"
-#~ msgstr "写入 %s 子进程错误"
+#: lib/openat-die.c:34
+#, c-format
+msgid "unable to record current working directory"
+msgstr "无法记录当前工作的目录"
 
-#~ msgid "read from %s subprocess failed"
-#~ msgstr "读取 %s 子进程错误"
+#: lib/openat-die.c:52
+#, c-format
+msgid "failed to return to initial working directory"
+msgstr "返回到初始工作目录失败"
 
-#~ msgid "subprocess %s terminated with exit code %d"
-#~ msgstr "子进程 %s 由退出码 %d 终止"
+#: lib/pagealign_alloc.c:139
+#, c-format
+msgid "Failed to open /dev/zero for read"
+msgstr "无法以读方式打开 /dev/zero"
 
-#~ msgid "creation of threads failed"
-#~ msgstr "线程创建失败"
+#: lib/pipe-filter-gi.c:152
+#, c-format
+msgid "creation of reading thread failed"
+msgstr "读线程创建错误"
 
-#~ msgid "%s subprocess terminated with exit code %d"
-#~ msgstr "子进程 %s 由退出码 %d 终止"
+#: lib/pipe-filter-gi.c:257 lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr "无法为 %s 子进程设置非阻塞性 I/O"
 
-#~ msgid "cannot create pipe"
-#~ msgstr "无法创建管道"
+#: lib/pipe-filter-gi.c:329 lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr "与 %s 子进程通讯错误"
 
-#~ msgid "`"
-#~ msgstr "“"
+#: lib/pipe-filter-gi.c:359 lib/pipe-filter-ii.c:224 lib/pipe-filter-ii.c:359
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr "写入 %s 子进程错误"
 
-#~ msgid "'"
-#~ msgstr "”"
+#: lib/pipe-filter-gi.c:399 lib/pipe-filter-ii.c:245 lib/pipe-filter-ii.c:396
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr "读取 %s 子进程错误"
 
-#~ msgid "Success"
-#~ msgstr "成功"
+#: lib/pipe-filter-gi.c:452
+#, c-format
+msgid "subprocess %s terminated with exit code %d"
+msgstr "子进程 %s 由退出码 %d 终止"
 
-#~ msgid "No match"
-#~ msgstr "不匹配"
+#: lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr "线程创建失败"
 
-#~ msgid "Invalid regular expression"
-#~ msgstr "正则表达式无效"
+#: lib/pipe-filter-ii.c:428
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr "子进程 %s 由退出码 %d 终止"
 
+#: lib/pipe.c:137 lib/pipe.c:140 lib/pipe.c:258 lib/pipe.c:261
+#, c-format
+msgid "cannot create pipe"
+msgstr "无法创建管道"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:272
+msgid "`"
+msgstr "“"
+
+#: lib/quotearg.c:273
+msgid "'"
+msgstr "”"
+
+#: lib/regcomp.c:132
+msgid "Success"
+msgstr "成功"
+
+#: lib/regcomp.c:135
+msgid "No match"
+msgstr "不匹配"
+
+#: lib/regcomp.c:138
+msgid "Invalid regular expression"
+msgstr "正则表达式无效"
+
+#: lib/regcomp.c:141
 #, fuzzy
-#~ msgid "Invalid collation character"
-#~ msgstr "无效的重组字符"
-
-#~ msgid "Invalid character class name"
-#~ msgstr "无效的字符类名"
-
-#~ msgid "Trailing backslash"
-#~ msgstr "多余的反斜杠"
-
-#~ msgid "Invalid back reference"
-#~ msgstr "无效的向后索引"
-
-#~ msgid "Unmatched [ or [^"
-#~ msgstr "[ 或 [^ 不匹配"
-
-#~ msgid "Unmatched ( or \\("
-#~ msgstr "( 或 \\( 不匹配"
-
-#~ msgid "Unmatched \\{"
-#~ msgstr "\\{ 不匹配"
-
-#~ msgid "Invalid content of \\{\\}"
-#~ msgstr "\\{\\} 的内容无效"
-
-#~ msgid "Invalid range end"
-#~ msgstr "无效的范围结尾"
-
-#~ msgid "Memory exhausted"
-#~ msgstr "内存用尽"
-
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "前置的正则表达式无效"
-
-#~ msgid "Premature end of regular expression"
-#~ msgstr "正则表达式结尾过早"
-
-#~ msgid "Regular expression too big"
-#~ msgstr "正则表达式太大"
-
-#~ msgid "Unmatched ) or \\)"
-#~ msgstr ") 或 \\) 不匹配"
-
-#~ msgid "No previous regular expression"
-#~ msgstr "没有前次正则表达式"
-
-#~ msgid "^[yY]"
-#~ msgstr "^[yY]"
-
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
-
-#~ msgid "setting permissions for %s"
-#~ msgstr "设置 %s 的权限"
+msgid "Invalid collation character"
+msgstr "无效的重组字符"
+
+#: lib/regcomp.c:144
+msgid "Invalid character class name"
+msgstr "无效的字符类名"
+
+#: lib/regcomp.c:147
+msgid "Trailing backslash"
+msgstr "多余的反斜杠"
+
+#: lib/regcomp.c:150
+msgid "Invalid back reference"
+msgstr "无效的向后索引"
+
+#: lib/regcomp.c:153
+msgid "Unmatched [ or [^"
+msgstr "[ 或 [^ 不匹配"
+
+#: lib/regcomp.c:156
+msgid "Unmatched ( or \\("
+msgstr "( 或 \\( 不匹配"
+
+#: lib/regcomp.c:159
+msgid "Unmatched \\{"
+msgstr "\\{ 不匹配"
+
+#: lib/regcomp.c:162
+msgid "Invalid content of \\{\\}"
+msgstr "\\{\\} 的内容无效"
+
+#: lib/regcomp.c:165
+msgid "Invalid range end"
+msgstr "无效的范围结尾"
+
+#: lib/regcomp.c:168
+msgid "Memory exhausted"
+msgstr "内存用尽"
+
+#: lib/regcomp.c:171
+msgid "Invalid preceding regular expression"
+msgstr "前置的正则表达式无效"
+
+#: lib/regcomp.c:174
+msgid "Premature end of regular expression"
+msgstr "正则表达式结尾过早"
+
+#: lib/regcomp.c:177
+msgid "Regular expression too big"
+msgstr "正则表达式太大"
+
+#: lib/regcomp.c:180
+msgid "Unmatched ) or \\)"
+msgstr ") 或 \\) 不匹配"
+
+#: lib/regcomp.c:701
+msgid "No previous regular expression"
+msgstr "没有前次正则表达式"
+
+#. TRANSLATORS: A regular expression testing for an affirmative answer
+#. (english: "yes").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^yesexpr='
+#: lib/rpmatch.c:147
+msgid "^[yY]"
+msgstr "^[yY]"
+
+#. TRANSLATORS: A regular expression testing for a negative answer
+#. (english: "no").  Testing the first character may be sufficient.
+#. Take care to consider upper and lower case.
+#. To enquire the regular expression that your system uses for this
+#. purpose, you can use the command
+#. locale -k LC_MESSAGES | grep '^noexpr='
+#: lib/rpmatch.c:160
+msgid "^[nN]"
+msgstr "^[nN]"
+
+#: lib/set-mode-acl.c:591
+#, c-format
+msgid "setting permissions for %s"
+msgstr "设置 %s 的权限"
 
-#~ msgid "Hangup"
-#~ msgstr "挂起"
+#: lib/siglist.h:29
+msgid "Hangup"
+msgstr "挂起"
 
-#~ msgid "Interrupt"
-#~ msgstr "中断"
+#: lib/siglist.h:32
+msgid "Interrupt"
+msgstr "中断"
 
-#~ msgid "Quit"
-#~ msgstr "退出"
+#: lib/siglist.h:35
+msgid "Quit"
+msgstr "退出"
 
-#~ msgid "Illegal instruction"
-#~ msgstr "非法指令"
+#: lib/siglist.h:38
+msgid "Illegal instruction"
+msgstr "非法指令"
 
-#~ msgid "Trace/breakpoint trap"
-#~ msgstr "跟踪(断点)"
+#: lib/siglist.h:41
+msgid "Trace/breakpoint trap"
+msgstr "跟踪(断点)"
 
-#~ msgid "Aborted"
-#~ msgstr "取消"
+#: lib/siglist.h:44
+msgid "Aborted"
+msgstr "取消"
 
-#~ msgid "Floating point exception"
-#~ msgstr "浮点溢出"
+#: lib/siglist.h:47
+msgid "Floating point exception"
+msgstr "浮点溢出"
 
-#~ msgid "Killed"
-#~ msgstr "强行终止"
+#: lib/siglist.h:50
+msgid "Killed"
+msgstr "强行终止"
 
-#~ msgid "Bus error"
-#~ msgstr "总线错误"
+#: lib/siglist.h:53
+msgid "Bus error"
+msgstr "总线错误"
 
-#~ msgid "Segmentation fault"
-#~ msgstr "段错误"
+#: lib/siglist.h:56
+msgid "Segmentation fault"
+msgstr "段错误"
 
-#~ msgid "Broken pipe"
-#~ msgstr "管道断开"
+#: lib/siglist.h:59
+msgid "Broken pipe"
+msgstr "管道断开"
 
-#~ msgid "Alarm clock"
-#~ msgstr "时钟警报"
+#: lib/siglist.h:62
+msgid "Alarm clock"
+msgstr "时钟警报"
 
-#~ msgid "Terminated"
-#~ msgstr "被终止"
+#: lib/siglist.h:65
+msgid "Terminated"
+msgstr "被终止"
 
-#~ msgid "Urgent I/O condition"
-#~ msgstr "I/O 条件不足"
+#: lib/siglist.h:68
+msgid "Urgent I/O condition"
+msgstr "I/O 条件不足"
 
-#~ msgid "Stopped (signal)"
-#~ msgstr "被停止(通过信号)"
+#: lib/siglist.h:71
+msgid "Stopped (signal)"
+msgstr "被停止(通过信号)"
 
-#~ msgid "Stopped"
-#~ msgstr "被停止"
+#: lib/siglist.h:74
+msgid "Stopped"
+msgstr "被停止"
 
-#~ msgid "Continued"
-#~ msgstr "继续"
+#: lib/siglist.h:77
+msgid "Continued"
+msgstr "继续"
 
-#~ msgid "Child exited"
-#~ msgstr "子进程退出"
+#: lib/siglist.h:80
+msgid "Child exited"
+msgstr "子进程退出"
 
-#~ msgid "Stopped (tty input)"
-#~ msgstr "被停止(tty 输入)"
+#: lib/siglist.h:83
+msgid "Stopped (tty input)"
+msgstr "被停止(tty 输入)"
 
-#~ msgid "Stopped (tty output)"
-#~ msgstr "被停止(tty 输出)"
+#: lib/siglist.h:86
+msgid "Stopped (tty output)"
+msgstr "被停止(tty 输出)"
 
-#~ msgid "I/O possible"
-#~ msgstr "I/O 可能"
+#: lib/siglist.h:89
+msgid "I/O possible"
+msgstr "I/O 可能"
 
-#~ msgid "CPU time limit exceeded"
-#~ msgstr "超出CPU 时间限制"
+#: lib/siglist.h:92
+msgid "CPU time limit exceeded"
+msgstr "超出CPU 时间限制"
 
-#~ msgid "File size limit exceeded"
-#~ msgstr "超出文件大小限制"
+#: lib/siglist.h:95
+msgid "File size limit exceeded"
+msgstr "超出文件大小限制"
 
-#~ msgid "Virtual timer expired"
-#~ msgstr "虚拟计时器过期"
+#: lib/siglist.h:98
+msgid "Virtual timer expired"
+msgstr "虚拟计时器过期"
 
+#: lib/siglist.h:101
 #, fuzzy
-#~ msgid "Profiling timer expired"
-#~ msgstr "数据计时器过期"
+msgid "Profiling timer expired"
+msgstr "数据计时器过期"
 
-#~ msgid "Window changed"
-#~ msgstr "窗口改变"
+#: lib/siglist.h:104
+msgid "Window changed"
+msgstr "窗口改变"
 
-#~ msgid "User defined signal 1"
-#~ msgstr "用户自定义信号 1"
+#: lib/siglist.h:107
+msgid "User defined signal 1"
+msgstr "用户自定义信号 1"
 
-#~ msgid "User defined signal 2"
-#~ msgstr "用户自定义信号 2"
+#: lib/siglist.h:110
+msgid "User defined signal 2"
+msgstr "用户自定义信号 2"
 
-#~ msgid "EMT trap"
-#~ msgstr "仿真程序陷阱"
+#: lib/siglist.h:115
+msgid "EMT trap"
+msgstr "仿真程序陷阱"
 
-#~ msgid "Bad system call"
-#~ msgstr "错误的系统调用"
+#: lib/siglist.h:118
+msgid "Bad system call"
+msgstr "错误的系统调用"
 
-#~ msgid "Stack fault"
-#~ msgstr "堆栈错误"
+#: lib/siglist.h:121
+msgid "Stack fault"
+msgstr "堆栈错误"
 
-#~ msgid "Information request"
-#~ msgstr "信息请求"
+#: lib/siglist.h:124
+msgid "Information request"
+msgstr "信息请求"
 
-#~ msgid "Power failure"
-#~ msgstr "电力问题"
+#: lib/siglist.h:126
+msgid "Power failure"
+msgstr "电力问题"
 
-#~ msgid "Resource lost"
-#~ msgstr "资源丢失"
+#: lib/siglist.h:129
+msgid "Resource lost"
+msgstr "资源丢失"
 
-#~ msgid "error writing to a closed pipe or socket"
-#~ msgstr "写入一个已关闭的管道或套接字时发生错误"
+#: lib/sigpipe-die.c:37
+msgid "error writing to a closed pipe or socket"
+msgstr "写入一个已关闭的管道或套接字时发生错误"
 
-#~ msgid "Real-time signal %d"
-#~ msgstr "实时信号 %d"
-
-#~ msgid "Unknown signal %d"
-#~ msgstr "未知信号 %d"
-
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv 函数无法使用"
-
-#~ msgid "iconv function not available"
-#~ msgstr "iconv 函数不存在"
-
-#~ msgid "character out of range"
-#~ msgstr "字符值超出可接受的范围以外"
+#: lib/strsignal.c:110
+#, c-format
+msgid "Real-time signal %d"
+msgstr "实时信号 %d"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "无法将 U+%04X 转换至用户的字符集"
+#: lib/strsignal.c:114
+#, c-format
+msgid "Unknown signal %d"
+msgstr "未知信号 %d"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "无法将 U+%04X 转换至用户的字符集：%s"
+#: lib/unicodeio.c:103
+msgid "iconv function not usable"
+msgstr "iconv 函数无法使用"
 
-#~ msgid "invalid user"
-#~ msgstr "无效的用户"
+#: lib/unicodeio.c:105
+msgid "iconv function not available"
+msgstr "iconv 函数不存在"
 
-#~ msgid "invalid group"
-#~ msgstr "无效的组"
+#: lib/unicodeio.c:112
+msgid "character out of range"
+msgstr "字符值超出可接受的范围以外"
 
-#~ msgid "invalid spec"
-#~ msgstr "无效的 spec"
+#: lib/unicodeio.c:180
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "无法将 U+%04X 转换至用户的字符集"
 
-#~ msgid "unable to display error message"
-#~ msgstr "无法显示错误信息"
+#: lib/unicodeio.c:182
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "无法将 U+%04X 转换至用户的字符集：%s"
 
-#~ msgid "Packaged by %s (%s)\n"
-#~ msgstr "由 %s (%s) 打包\n"
+#: lib/userspec.c:106
+msgid "invalid user"
+msgstr "无效的用户"
 
-#~ msgid "Packaged by %s\n"
-#~ msgstr "由 %s 打包\n"
+#: lib/userspec.c:107
+msgid "invalid group"
+msgstr "无效的组"
 
-#~ msgid "(C)"
-#~ msgstr "(C)"
+#: lib/userspec.c:108
+msgid "invalid spec"
+msgstr "无效的 spec"
 
-#~ msgid ""
-#~ "\n"
-#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl."
-#~ "html>.\n"
-#~ "This is free software: you are free to change and redistribute it.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "授权协议 GPLv3+: GNU GPL 版本 3 或更新版本 <http://gnu.org/licenses/gpl."
-#~ "html>\n"
-#~ "这是自由软件：您可以自由的更改并重新发布它。\n"
-#~ "在法律允许的范围内，没有任何担保。\n"
-#~ "\n"
+#: lib/verror.c:73
+#, c-format
+msgid "unable to display error message"
+msgstr "无法显示错误信息"
 
-#~ msgid "Written by %s.\n"
-#~ msgstr "由 %s 编写。\n"
+#: lib/version-etc.c:74
+#, c-format
+msgid "Packaged by %s (%s)\n"
+msgstr "由 %s (%s) 打包\n"
 
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "由 %s 和 %s 编写。\n"
+#: lib/version-etc.c:77
+#, c-format
+msgid "Packaged by %s\n"
+msgstr "由 %s 打包\n"
 
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "由 %s、%s 和 %s 编写。\n"
+#. TRANSLATORS: Translate "(C)" to the copyright symbol
+#. (C-in-a-circle), if this symbol is available in the user's
+#. locale.  Otherwise, do not translate "(C)"; leave it as-is.
+#: lib/version-etc.c:84
+msgid "(C)"
+msgstr "(C)"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "由 %s、%s、%s 和\n"
-#~ "%s 编写。\n"
+#: lib/version-etc.c:86
+msgid ""
+"\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"\n"
+"授权协议 GPLv3+: GNU GPL 版本 3 或更新版本 <http://gnu.org/licenses/gpl.html>\n"
+"这是自由软件：您可以自由的更改并重新发布它。\n"
+"在法律允许的范围内，没有任何担保。\n"
+"\n"
+
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:102
+#, c-format
+msgid "Written by %s.\n"
+msgstr "由 %s 编写。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s、%s、%s、\n"
-#~ "%s 和 %s 编写。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:106
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "由 %s 和 %s 编写。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s、%s、%s、\n"
-#~ "%s、%s 和 %s 编写。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:110
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "由 %s、%s 和 %s 编写。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s、%s、%s、\n"
-#~ "%s、%s、%s 和 %s 编写。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:117
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"由 %s、%s、%s 和\n"
+"%s 编写。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "由 %s、%s、%s、\n"
-#~ "%s、%s、%s、%s\n"
-#~ "和 %s 编写。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:124
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s 和 %s 编写。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s、%s、%s、\n"
-#~ "%s、%s、%s、%s、\n"
-#~ "%s、和 %s 编写。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:131
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s 和 %s 编写。\n"
 
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "由 %s、%s、%s、\n"
-#~ "%s、%s、%s、%s、\n"
-#~ "%s、%s、和其他人编写。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:139
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s、%s 和 %s 编写。\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "Report bugs to: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "请向 %s 报告错误。向 <i18n-zh@googlegroups.com> 报告翻译错误。\n"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:147
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s、%s、%s\n"
+"和 %s 编写。\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:156
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s、%s、%s、\n"
+"%s、和 %s 编写。\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:167
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"由 %s、%s、%s、\n"
+"%s、%s、%s、%s、\n"
+"%s、%s、和其他人编写。\n"
+
+#. TRANSLATORS: The placeholder indicates the bug-reporting address
+#. for this package.  Please add _another line_ saying
+#. "Report translation bugs to <...>\n" with the address for translation
+#. bugs (typically your translation team's web or email address).
+#: lib/version-etc.c:245
+#, c-format
+msgid ""
+"\n"
+"Report bugs to: %s\n"
+msgstr ""
+"\n"
+"请向 %s 报告错误。向 <i18n-zh@googlegroups.com> 报告翻译错误。\n"
 
-#~ msgid "Report %s bugs to: %s\n"
-#~ msgstr "将 %s 错误报告给: %s\n"
+#: lib/version-etc.c:247
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "将 %s 错误报告给: %s\n"
 
-#~ msgid "%s home page: <%s>\n"
-#~ msgstr "%s 主页: <%s>\n"
+#: lib/version-etc.c:251
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s 主页: <%s>\n"
 
-#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
-#~ msgstr "%s 主页: <http://www.gnu.org/software/%s/>\n"
+#: lib/version-etc.c:253
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s 主页: <http://www.gnu.org/software/%s/>\n"
 
-#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
-#~ msgstr "GNU 软件的通用帮助: <http://www.gnu.org/gethelp/>\n"
+#: lib/version-etc.c:256
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "GNU 软件的通用帮助: <http://www.gnu.org/gethelp/>\n"
 
-#~ msgid "_open_osfhandle failed"
-#~ msgstr "_open_osfhandle 失败"
+#: lib/w32spawn.h:40
+#, c-format
+msgid "_open_osfhandle failed"
+msgstr "_open_osfhandle 失败"
 
-#~ msgid "cannot restore fd %d: dup2 failed"
-#~ msgstr "无法恢复文件描述符 %d: dup2 失败"
+#: lib/w32spawn.h:81
+#, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "无法恢复文件描述符 %d: dup2 失败"
 
-#~ msgid "%s subprocess"
-#~ msgstr "%s 子进程"
+#: lib/wait-process.c:223 lib/wait-process.c:255 lib/wait-process.c:317
+#, c-format
+msgid "%s subprocess"
+msgstr "%s 子进程"
 
-#~ msgid "%s subprocess got fatal signal %d"
-#~ msgstr "%s 子进程获得终结信号 %d"
+#: lib/wait-process.c:274 lib/wait-process.c:346
+#, c-format
+msgid "%s subprocess got fatal signal %d"
+msgstr "%s 子进程获得终结信号 %d"
 
-#~ msgid "stdin"
-#~ msgstr "标准输入"
+#: lib/xfreopen.c:35
+msgid "stdin"
+msgstr "标准输入"
 
-#~ msgid "stdout"
-#~ msgstr "标准输出"
+#: lib/xfreopen.c:36
+msgid "stdout"
+msgstr "标准输出"
 
-#~ msgid "stderr"
-#~ msgstr "标准错误输出"
+#: lib/xfreopen.c:37
+msgid "stderr"
+msgstr "标准错误输出"
 
-#~ msgid "unknown stream"
-#~ msgstr "未知的流"
+#: lib/xfreopen.c:38
+msgid "unknown stream"
+msgstr "未知的流"
 
-#~ msgid "failed to reopen %s with mode %s"
-#~ msgstr "无法以 %2$s 模式重新打开 %1$s"
+#: lib/xfreopen.c:39
+#, c-format
+msgid "failed to reopen %s with mode %s"
+msgstr "无法以 %2$s 模式重新打开 %1$s"
 
-#~ msgid "string comparison failed"
-#~ msgstr "字符串比较出现错误"
+#: lib/xmemcoll.c:48
+#, c-format
+msgid "string comparison failed"
+msgstr "字符串比较出现错误"
 
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "请设定 LC_ALL='C' 避免问题出现。"
+#: lib/xmemcoll.c:49
+#, c-format
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "请设定 LC_ALL='C' 避免问题出现。"
 
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "要比较的字符串为 %s 和 %s。"
+#: lib/xmemcoll.c:51
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "要比较的字符串为 %s 和 %s。"
 
-#~ msgid "cannot perform formatted output"
-#~ msgstr "无法执行格式化输出"
+#: lib/xprintf.c:50 lib/xprintf.c:76
+#, c-format
+msgid "cannot perform formatted output"
+msgstr "无法执行格式化输出"
 
-#~ msgid "invalid %s%s argument `%s'"
-#~ msgstr "%s%s 参数‘%s’无效"
+#: lib/xstrtol-error.c:63
+#, c-format
+msgid "invalid %s%s argument `%s'"
+msgstr "%s%s 参数‘%s’无效"
 
-#~ msgid "invalid suffix in %s%s argument `%s'"
-#~ msgstr "%s%s 参数‘%s’的后缀无效"
+#: lib/xstrtol-error.c:68
+#, c-format
+msgid "invalid suffix in %s%s argument `%s'"
+msgstr "%s%s 参数‘%s’的后缀无效"
 
-#~ msgid "%s%s argument `%s' too large"
-#~ msgstr "%s%s 参数‘%s’太长"
+#: lib/xstrtol-error.c:72
+#, c-format
+msgid "%s%s argument `%s' too large"
+msgstr "%s%s 参数‘%s’太长"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s：非法选项 -- %c\n"
diff --git a/gnulib/po/zh_TW.po b/gnulib/po/zh_TW.po
index 2590fca7..c5e43b23 100644
--- a/gnulib/po/zh_TW.po
+++ b/gnulib/po/zh_TW.po
@@ -13,466 +13,539 @@ msgid ""
 msgstr ""
 "Project-Id-Version: coreutils 5.3.0\n"
 "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n"
-"POT-Creation-Date: 2012-01-21 15:16+0300\n"
+"POT-Creation-Date: 2005-09-30 17:42+0300\n"
 "PO-Revision-Date: 2005-07-02 04:13+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: gnulib/argp-help.c:147
+#: lib/argmatch.c:137
 #, c-format
-msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
-msgstr ""
+msgid "invalid argument %s for %s"
+msgstr "%2$s的參數%1$s無效"
 
-#: gnulib/argp-help.c:220
+#: lib/argmatch.c:138
 #, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
-msgstr ""
-
-#: gnulib/argp-help.c:226
-#, c-format
-msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
-msgstr ""
+msgid "ambiguous argument %s for %s"
+msgstr "%2$s的參數%1$s不明確"
 
-#: gnulib/argp-help.c:235
+#: lib/argmatch.c:157
 #, c-format
-msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
-msgstr ""
-
-#: gnulib/argp-help.c:247
-#, c-format
-msgid "Garbage in ARGP_HELP_FMT: %s"
-msgstr ""
+msgid "Valid arguments are:"
+msgstr "有效的參數為："
 
-#: gnulib/argp-help.c:1247
+#: lib/argp-help.c:1194
 #, fuzzy
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
 msgstr "長選項必須用的參數在使用短選項時也是必須的。\n"
 
-#: gnulib/argp-help.c:1640
-msgid "Usage:"
-msgstr ""
-
-#: gnulib/argp-help.c:1644
-msgid "  or: "
-msgstr ""
-
-#: gnulib/argp-help.c:1656
+#: lib/argp-help.c:1597
 #, fuzzy
 msgid " [OPTION...]"
 msgstr "用法：%s [選項] [檔案]...\n"
 
-#: gnulib/argp-help.c:1683
+#: lib/argp-help.c:1624
 #, fuzzy, c-format
-msgid "Try '%s --help' or '%s --usage' for more information.\n"
+msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "請嘗試執行‘%s --help’來獲取更多資訊。\n"
 
-#: gnulib/argp-help.c:1711
+#: lib/argp-help.c:1652
 #, fuzzy, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 "\n"
 "請向 <%s> 回報錯誤。\n"
 
-#: gnulib/argp-help.c:1930
+#: lib/argp-help.c:1872 lib/error.c:121
 msgid "Unknown system error"
 msgstr "不明的系統錯誤"
 
-#: gnulib/argp-parse.c:81
-msgid "give this help list"
-msgstr ""
-
-#: gnulib/argp-parse.c:82
-msgid "give a short usage message"
-msgstr ""
-
-#: gnulib/argp-parse.c:83
+#: lib/argp-parse.c:84
 msgid "NAME"
 msgstr "名稱"
 
-#: gnulib/argp-parse.c:83
-msgid "set the program name"
-msgstr ""
-
-#: gnulib/argp-parse.c:84
-msgid "SECS"
-msgstr ""
-
-#: gnulib/argp-parse.c:85
-msgid "hang for SECS seconds (default 3600)"
-msgstr ""
+#: lib/argp-parse.c:619
+#, fuzzy, c-format
+msgid "%s: Too many arguments\n"
+msgstr "%s：找不到正確格式的 %s 總和檢查值"
 
-#: gnulib/argp-parse.c:142
+#: lib/c-stack.c:244
 #, fuzzy
-msgid "print program version"
+msgid "program error"
 msgstr "讀取時發生錯誤"
 
-#: gnulib/argp-parse.c:159
-msgid "(PROGRAM ERROR) No version known!?"
-msgstr ""
+#: lib/closeout.c:94
+msgid "write error"
+msgstr "寫入時發生錯誤"
 
-#: gnulib/argp-parse.c:612
+#: lib/copy-file.c:65
 #, fuzzy, c-format
-msgid "%s: Too many arguments\n"
-msgstr "%s：找不到正確格式的 %s 總和檢查值"
-
-#: gnulib/argp-parse.c:755
-msgid "(PROGRAM ERROR) Option should have been recognized!?"
-msgstr ""
+msgid "error while opening \"%s\" for reading"
+msgstr "無法開啟 %s 來讀取資料"
 
-#: gnulib/getopt.c:547 gnulib/getopt.c:576
+#: lib/copy-file.c:72
 #, fuzzy, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
-msgstr "%s：選項‘%s’不明確\n"
+msgid "cannot open backup file \"%s\" for writing"
+msgstr "無法開啟%s來讀取資料"
 
-#: gnulib/getopt.c:624 gnulib/getopt.c:628
+#: lib/copy-file.c:80
 #, fuzzy, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s：選項‘--%s’不可配合參數使用\n"
+msgid "error reading \"%s\""
+msgstr "讀取 %s 時發生錯誤"
 
-#: gnulib/getopt.c:637 gnulib/getopt.c:642
+#: lib/copy-file.c:85 lib/copy-file.c:89
 #, fuzzy, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
-msgstr "%s：選項‘%c%s’不可配合參數使用\n"
+msgid "error writing \"%s\""
+msgstr "寫入 %s 時發生錯誤"
 
-#: gnulib/getopt.c:685 gnulib/getopt.c:704
+#: lib/copy-file.c:91
 #, fuzzy, c-format
-msgid "%s: option '--%s' requires an argument\n"
-msgstr "%s：選項‘%s’需要參數\n"
+msgid "error after reading \"%s\""
+msgstr "讀取 %s 時發生錯誤"
 
-#: gnulib/getopt.c:742 gnulib/getopt.c:745
-#, fuzzy, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s：無法識別的選項‘--%s’\n"
+#: lib/csharpcomp.c:273
+#, fuzzy
+msgid "fdopen() failed"
+msgstr "開啟時發生錯誤"
 
-#: gnulib/getopt.c:753 gnulib/getopt.c:756
+#: lib/execute.c:186 lib/execute.c:262 lib/execute.c:304 lib/pipe.c:231
+#: lib/pipe.c:349 lib/pipe.c:409 lib/wait-process.c:336 lib/wait-process.c:403
 #, fuzzy, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s：無法識別的選項‘%c%s’\n"
+msgid "%s subprocess failed"
+msgstr "關閉時發生錯誤"
 
-#: gnulib/getopt.c:805 gnulib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- '%c'\n"
-msgstr "%s：無效的選項 ─ %c\n"
+#: lib/file-type.c:43
+msgid "regular empty file"
+msgstr "普通空白檔案"
 
-#: gnulib/getopt.c:861 gnulib/getopt.c:878 gnulib/getopt.c:1088
-#: gnulib/getopt.c:1106
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s：選項需要參數 ─ %c\n"
+#: lib/file-type.c:43
+msgid "regular file"
+msgstr "普通檔案"
 
-#: gnulib/getopt.c:934 gnulib/getopt.c:950
-#, fuzzy, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s：選項‘-W %s’不明確\n"
+#: lib/file-type.c:46
+msgid "directory"
+msgstr "目錄"
 
-#: gnulib/getopt.c:974 gnulib/getopt.c:992
-#, fuzzy, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s：選項‘-W %s’不可配合參數使用\n"
+#: lib/file-type.c:49
+msgid "block special file"
+msgstr "區塊特殊檔案"
 
-#: gnulib/getopt.c:1013 gnulib/getopt.c:1031
-#, fuzzy, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：選項‘%s’需要參數\n"
+#: lib/file-type.c:52
+msgid "character special file"
+msgstr "字元特殊檔案"
 
-#~ msgid "invalid argument %s for %s"
-#~ msgstr "%2$s的參數%1$s無效"
+#: lib/file-type.c:55
+msgid "fifo"
+msgstr "fifo"
 
-#~ msgid "ambiguous argument %s for %s"
-#~ msgstr "%2$s的參數%1$s不明確"
+#: lib/file-type.c:58
+msgid "symbolic link"
+msgstr "符號連結"
 
-#~ msgid "Valid arguments are:"
-#~ msgstr "有效的參數為："
+#: lib/file-type.c:61
+msgid "socket"
+msgstr "socket"
 
-#~ msgid "write error"
-#~ msgstr "寫入時發生錯誤"
+#: lib/file-type.c:64
+msgid "message queue"
+msgstr "訊息佇列"
 
-#, fuzzy
-#~ msgid "error while opening \"%s\" for reading"
-#~ msgstr "無法開啟 %s 來讀取資料"
+#: lib/file-type.c:67
+msgid "semaphore"
+msgstr "semaphore"
 
+#: lib/file-type.c:70
+msgid "shared memory object"
+msgstr "共用記憶體物件"
+
+#: lib/file-type.c:73
 #, fuzzy
-#~ msgid "cannot open backup file \"%s\" for writing"
-#~ msgstr "無法開啟%s來讀取資料"
+msgid "typed memory object"
+msgstr "共用記憶體物件"
+
+#: lib/file-type.c:75
+msgid "weird file"
+msgstr "不正常的檔案"
 
+#: lib/gai_strerror.c:45
 #, fuzzy
-#~ msgid "error reading \"%s\""
-#~ msgstr "讀取 %s 時發生錯誤"
+msgid "Address family for hostname not supported"
+msgstr "不支援 FIFO 檔案"
 
+#: lib/gai_strerror.c:49
 #, fuzzy
-#~ msgid "error writing \"%s\""
-#~ msgstr "寫入 %s 時發生錯誤"
+msgid "ai_family not supported"
+msgstr "不支援 FIFO 檔案"
 
+#: lib/gai_strerror.c:54
 #, fuzzy
-#~ msgid "error after reading \"%s\""
-#~ msgstr "讀取 %s 時發生錯誤"
+msgid "ai_socktype not supported"
+msgstr "不支援 FIFO 檔案"
 
+#: lib/gai_strerror.c:55
 #, fuzzy
-#~ msgid "fdopen() failed"
-#~ msgstr "開啟時發生錯誤"
+msgid "System error"
+msgstr "寫入時發生錯誤"
 
+#: lib/gai_strerror.c:74
 #, fuzzy
-#~ msgid "%s subprocess failed"
-#~ msgstr "關閉時發生錯誤"
+msgid "Unknown error"
+msgstr "不明的系統錯誤"
 
-#~ msgid "regular empty file"
-#~ msgstr "普通空白檔案"
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s：選項‘%s’不明確\n"
 
-#~ msgid "regular file"
-#~ msgstr "普通檔案"
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s：選項‘--%s’不可配合參數使用\n"
 
-#~ msgid "directory"
-#~ msgstr "目錄"
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s：選項‘%c%s’不可配合參數使用\n"
 
-#~ msgid "block special file"
-#~ msgstr "區塊特殊檔案"
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s：選項‘%s’需要參數\n"
 
-#~ msgid "character special file"
-#~ msgstr "字元特殊檔案"
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s：無法識別的選項‘--%s’\n"
 
-#~ msgid "fifo"
-#~ msgstr "fifo"
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s：無法識別的選項‘%c%s’\n"
 
-#~ msgid "symbolic link"
-#~ msgstr "符號連結"
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s：不合法的選項 ─ %c\n"
 
-#~ msgid "socket"
-#~ msgstr "socket"
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s：無效的選項 ─ %c\n"
 
-#~ msgid "message queue"
-#~ msgstr "訊息佇列"
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s：選項需要參數 ─ %c\n"
 
-#~ msgid "semaphore"
-#~ msgstr "semaphore"
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s：選項‘-W %s’不明確\n"
 
-#~ msgid "shared memory object"
-#~ msgstr "共用記憶體物件"
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s：選項‘-W %s’不可配合參數使用\n"
 
+#: lib/human.c:486
 #, fuzzy
-#~ msgid "typed memory object"
-#~ msgstr "共用記憶體物件"
-
-#~ msgid "weird file"
-#~ msgstr "不正常的檔案"
+msgid "block size"
+msgstr "區塊特殊檔案"
 
-#, fuzzy
-#~ msgid "Address family for hostname not supported"
-#~ msgstr "不支援 FIFO 檔案"
+#: lib/mkdir-p.c:106
+#, c-format
+msgid "%s exists but is not a directory"
+msgstr "%s已存在但不是目錄"
 
-#, fuzzy
-#~ msgid "ai_family not supported"
-#~ msgstr "不支援 FIFO 檔案"
+#: lib/mkdir-p.c:203 lib/mkdir-p.c:294
+#, c-format
+msgid "cannot change owner and/or group of %s"
+msgstr "無法更改%s的擁有者和/或所屬群組"
 
-#, fuzzy
-#~ msgid "ai_socktype not supported"
-#~ msgstr "不支援 FIFO 檔案"
+#: lib/mkdir-p.c:229 lib/mkdir-p.c:266
+#, c-format
+msgid "cannot create directory %s"
+msgstr "無法建立目錄%s"
 
-#, fuzzy
-#~ msgid "System error"
-#~ msgstr "寫入時發生錯誤"
+#: lib/mkdir-p.c:240
+#, c-format
+msgid "cannot chdir to directory %s"
+msgstr "無法進入%s目錄"
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "不明的系統錯誤"
+#: lib/mkdir-p.c:307 lib/mkdir-p.c:332
+#, c-format
+msgid "cannot change permissions of %s"
+msgstr "無法更改%s的權限"
 
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s：不合法的選項 ─ %c\n"
+#: lib/obstack.c:438 lib/obstack.c:441 lib/xalloc-die.c:38 lib/xsetenv.c:40
+msgid "memory exhausted"
+msgstr "記憶體耗盡"
 
+#: lib/openat-die.c:36
 #, fuzzy
-#~ msgid "block size"
-#~ msgstr "區塊特殊檔案"
+msgid "unable to record current working directory"
+msgstr "無法建立目錄%s"
 
-#~ msgid "%s exists but is not a directory"
-#~ msgstr "%s已存在但不是目錄"
+#: lib/openat-die.c:49
+#, fuzzy
+msgid "failed to return to initial working directory"
+msgstr "無法建立目錄%s"
 
-#~ msgid "cannot change owner and/or group of %s"
-#~ msgstr "無法更改%s的擁有者和/或所屬群組"
+#: lib/pagealign_alloc.c:143
+#, fuzzy
+msgid "Failed to open /dev/zero for read"
+msgstr "%s：無法開啟來寫入資料"
 
-#~ msgid "cannot create directory %s"
-#~ msgstr "無法建立目錄%s"
+#: lib/pipe.c:157 lib/pipe.c:160 lib/pipe.c:264 lib/pipe.c:267
+#, fuzzy
+msgid "cannot create pipe"
+msgstr "無法建立 %s 鏈結"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. MARK).  A British English Unicode locale should instead
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#.
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:245
+msgid "`"
+msgstr "‘"
+
+#: lib/quotearg.c:246
+msgid "'"
+msgstr "’"
+
+#: lib/regcomp.c:137
+#, fuzzy
+msgid "Invalid regular expression"
+msgstr "%s：無效的正規表示式：%s"
 
-#~ msgid "cannot chdir to directory %s"
-#~ msgstr "無法進入%s目錄"
+#: lib/regcomp.c:143
+#, fuzzy
+msgid "Invalid character class name"
+msgstr "無效的字元種類‘%s’"
 
-#~ msgid "cannot change permissions of %s"
-#~ msgstr "無法更改%s的權限"
+#: lib/regcomp.c:164
+#, fuzzy
+msgid "Invalid range end"
+msgstr "無效的類型‘%s’"
 
-#~ msgid "memory exhausted"
-#~ msgstr "記憶體耗盡"
+#: lib/regcomp.c:167
+#, fuzzy
+msgid "Memory exhausted"
+msgstr "記憶體耗盡"
 
+#: lib/regcomp.c:170
 #, fuzzy
-#~ msgid "unable to record current working directory"
-#~ msgstr "無法建立目錄%s"
+msgid "Invalid preceding regular expression"
+msgstr "%s：無效的正規表示式：%s"
 
+#: lib/regcomp.c:173
 #, fuzzy
-#~ msgid "failed to return to initial working directory"
-#~ msgstr "無法建立目錄%s"
+msgid "Premature end of regular expression"
+msgstr "在正規運算式搜尋時發生錯誤"
 
+#: lib/regcomp.c:176
 #, fuzzy
-#~ msgid "Failed to open /dev/zero for read"
-#~ msgstr "%s：無法開啟來寫入資料"
+msgid "Regular expression too big"
+msgstr "%s：無效的正規表示式：%s"
 
+#: lib/regcomp.c:659
 #, fuzzy
-#~ msgid "cannot create pipe"
-#~ msgstr "無法建立 %s 鏈結"
+msgid "No previous regular expression"
+msgstr "在正規運算式搜尋時發生錯誤"
 
-#~ msgid "`"
-#~ msgstr "‘"
+#: lib/rpmatch.c:70
+msgid "^[yY]"
+msgstr "^[yY]"
 
-#~ msgid "'"
-#~ msgstr "’"
+#: lib/rpmatch.c:73
+msgid "^[nN]"
+msgstr "^[nN]"
 
-#, fuzzy
-#~ msgid "Invalid regular expression"
-#~ msgstr "%s：無效的正規表示式：%s"
+#: lib/unicodeio.c:147
+msgid "iconv function not usable"
+msgstr "iconv 功能無法使用"
 
-#, fuzzy
-#~ msgid "Invalid character class name"
-#~ msgstr "無效的字元種類‘%s’"
+#: lib/unicodeio.c:149
+msgid "iconv function not available"
+msgstr "iconv 功能不存在"
 
-#, fuzzy
-#~ msgid "Invalid range end"
-#~ msgstr "無效的類型‘%s’"
+#: lib/unicodeio.c:156
+msgid "character out of range"
+msgstr "字元值超出可接受的範圍以外"
 
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "記憶體耗盡"
+#: lib/unicodeio.c:219
+#, c-format
+msgid "cannot convert U+%04X to local character set"
+msgstr "無法將 U+%04X 轉換至使用者的字元集"
 
-#, fuzzy
-#~ msgid "Invalid preceding regular expression"
-#~ msgstr "%s：無效的正規表示式：%s"
+#: lib/unicodeio.c:221
+#, c-format
+msgid "cannot convert U+%04X to local character set: %s"
+msgstr "無法將 U+%04X 轉換至使用者的字元集：%s"
 
-#, fuzzy
-#~ msgid "Premature end of regular expression"
-#~ msgstr "在正規運算式搜尋時發生錯誤"
+#: lib/userspec.c:110
+msgid "invalid user"
+msgstr "無效的使用者"
 
-#, fuzzy
-#~ msgid "Regular expression too big"
-#~ msgstr "%s：無效的正規表示式：%s"
+#: lib/userspec.c:111
+msgid "invalid group"
+msgstr "無效的群組"
 
+#: lib/userspec.c:113
+msgid "cannot get the login group of a numeric UID"
+msgstr "無法取得 UID 數值所代表的登入群組"
+
+#: lib/version-etc.c:74
 #, fuzzy
-#~ msgid "No previous regular expression"
-#~ msgstr "在正規運算式搜尋時發生錯誤"
+msgid ""
+"\n"
+"This is free software.  You may redistribute copies of it under the terms "
+"of\n"
+"the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+msgstr ""
+"本程式是自由軟體；你可以根據 Free Software Foundation 所公佈的 GNU\n"
+"General Public License 第二版或(自由選擇)較新的版本中的條款去重新\n"
+"散佈及/或修改本軟體。\n"
+"\n"
 
-#~ msgid "^[yY]"
-#~ msgstr "^[yY]"
+#. TRANSLATORS: %s denotes an author name.
+#: lib/version-etc.c:90
+#, c-format
+msgid "Written by %s.\n"
+msgstr "由 %s 編寫。\n"
 
-#~ msgid "^[nN]"
-#~ msgstr "^[nN]"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:94
+#, c-format
+msgid "Written by %s and %s.\n"
+msgstr "由 %s 和 %s 編寫。\n"
 
-#~ msgid "iconv function not usable"
-#~ msgstr "iconv 功能無法使用"
+#. TRANSLATORS: Each %s denotes an author name.
+#: lib/version-etc.c:98
+#, c-format
+msgid "Written by %s, %s, and %s.\n"
+msgstr "由 %s, %s 和 %s 編寫。\n"
 
-#~ msgid "iconv function not available"
-#~ msgstr "iconv 功能不存在"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:104
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"由 %s, %s, %s\n"
+"和 %s 編寫。\n"
 
-#~ msgid "character out of range"
-#~ msgstr "字元值超出可接受的範圍以外"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:110
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"由 %s, %s, %s,\n"
+"%s 和 %s 編寫。\n"
 
-#~ msgid "cannot convert U+%04X to local character set"
-#~ msgstr "無法將 U+%04X 轉換至使用者的字元集"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:116
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, and %s.\n"
+msgstr ""
+"由 %s, %s, %s,\n"
+"%s, %s 和 %s 編寫。\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:123
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, and %s.\n"
+msgstr ""
+"由 %s, %s, %s, %s,\n"
+"%s, %s 和 %s 編寫。\n"
 
-#~ msgid "cannot convert U+%04X to local character set: %s"
-#~ msgstr "無法將 U+%04X 轉換至使用者的字元集：%s"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:130
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"and %s.\n"
+msgstr ""
+"由 %s, %s, %s, %s,\n"
+"%s, %s, %s 和 %s 編寫。\n"
 
-#~ msgid "invalid user"
-#~ msgstr "無效的使用者"
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:138
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, and %s.\n"
+msgstr ""
+"由 %s, %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"和 %s 編寫。\n"
+
+#. TRANSLATORS: Each %s denotes an author name.
+#. You can use line breaks, estimating that each author name occupies
+#. ca. 16 screen columns and that a screen line has ca. 80 columns.
+#: lib/version-etc.c:148
+#, c-format
+msgid ""
+"Written by %s, %s, %s,\n"
+"%s, %s, %s, %s,\n"
+"%s, %s, and others.\n"
+msgstr ""
+"由 %s, %s, %s, %s,\n"
+"%s, %s, %s, %s\n"
+"和 %s 等等編寫。\n"
 
-#~ msgid "invalid group"
-#~ msgstr "無效的群組"
+#: lib/xmemcoll.c:50
+msgid "string comparison failed"
+msgstr "字串比較出現錯誤"
 
-#~ msgid "cannot get the login group of a numeric UID"
-#~ msgstr "無法取得 UID 數值所代表的登入群組"
+#: lib/xmemcoll.c:51
+msgid "Set LC_ALL='C' to work around the problem."
+msgstr "請設定 LC_ALL='C' 避免問題出現。"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "This is free software.  You may redistribute copies of it under the terms "
-#~ "of\n"
-#~ "the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"
-#~ "There is NO WARRANTY, to the extent permitted by law.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "本程式是自由軟體；你可以根據 Free Software Foundation 所公佈的 GNU\n"
-#~ "General Public License 第二版或(自由選擇)較新的版本中的條款去重新\n"
-#~ "散佈及/或修改本軟體。\n"
-#~ "\n"
-
-#~ msgid "Written by %s.\n"
-#~ msgstr "由 %s 編寫。\n"
-
-#~ msgid "Written by %s and %s.\n"
-#~ msgstr "由 %s 和 %s 編寫。\n"
-
-#~ msgid "Written by %s, %s, and %s.\n"
-#~ msgstr "由 %s, %s 和 %s 編寫。\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "由 %s, %s, %s\n"
-#~ "和 %s 編寫。\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s, %s, %s,\n"
-#~ "%s 和 %s 編寫。\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s, %s, %s,\n"
-#~ "%s, %s 和 %s 編寫。\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s, %s, %s, %s,\n"
-#~ "%s, %s 和 %s 編寫。\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "and %s.\n"
-#~ msgstr ""
-#~ "由 %s, %s, %s, %s,\n"
-#~ "%s, %s, %s 和 %s 編寫。\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, and %s.\n"
-#~ msgstr ""
-#~ "由 %s, %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "和 %s 編寫。\n"
-
-#~ msgid ""
-#~ "Written by %s, %s, %s,\n"
-#~ "%s, %s, %s, %s,\n"
-#~ "%s, %s, and others.\n"
-#~ msgstr ""
-#~ "由 %s, %s, %s, %s,\n"
-#~ "%s, %s, %s, %s\n"
-#~ "和 %s 等等編寫。\n"
-
-#~ msgid "string comparison failed"
-#~ msgstr "字串比較出現錯誤"
-
-#~ msgid "Set LC_ALL='C' to work around the problem."
-#~ msgstr "請設定 LC_ALL='C' 避免問題出現。"
-
-#~ msgid "The strings compared were %s and %s."
-#~ msgstr "要比較的字串為%s及%s。"
+#: lib/xmemcoll.c:53
+#, c-format
+msgid "The strings compared were %s and %s."
+msgstr "要比較的字串為%s及%s。"