Adding upstream version 0.5.3

2011-05-04 16:41:45 +09:00
parent 6db339b3d7
commit 5397d09e58
169 changed files with 53188 additions and 11048 deletions
--- a/po/CVS/Entries
+++ b/po/CVS/Entries
@@ -0,0 +1,16 @@
+/.cvsignore/1.2/Thu Sep 25 18:35:43 2003//
+/LINGUAS/1.1/Wed Sep 24 18:35:06 2003//
+/POTFILES.in/1.2/Wed Sep 24 18:35:06 2003//
+/boldquot.sed/1.1/Tue Sep 23 18:42:25 2003//
+/en@boldquot.header/1.1/Tue Sep 23 18:42:25 2003//
+/en@quot.header/1.1/Tue Sep 23 18:42:25 2003//
+/insert-header.sin/1.1/Tue Sep 23 18:42:25 2003//
+/quot.sed/1.1/Tue Sep 23 18:42:25 2003//
+/remove-potcdate.sin/1.1/Tue Sep 23 18:42:25 2003//
+/Makevars/1.2/Tue Jan  4 09:22:28 2011//
+/ChangeLog/1.2/Tue Jan  4 12:39:29 2011//
+/Makefile.in.in/1.3/Tue Jan  4 12:39:29 2011//
+/Rules-quot/1.2/Tue Jan  4 12:39:29 2011//
+/ja.po/1.14/Sat Jan 15 04:29:58 2011//
+/w3m.pot/1.14/Sat Jan 15 02:20:26 2011//
+D
--- a/po/CVS/Repository
+++ b/po/CVS/Repository
@@ -0,0 +1 @@
+w3m/po
--- a/po/CVS/Root
+++ b/po/CVS/Root
@@ -0,0 +1 @@
+:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-04  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.18.1.
+	* Rules-quot: Upgrade to gettext-0.18.1.
+
 2003-09-24  gettextize  <bug-gnu-gettext@gnu.org>

 	* Makefile.in.in: New file, from gettext-0.12.1.
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2003 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# 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
@@ -7,9 +7,13 @@
 # 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@
@@ -22,17 +26,36 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po

 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)

-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# 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
@@ -45,7 +68,7 @@ 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 $(DOMAIN).pot stamp-po \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)

@@ -56,7 +79,7 @@ CATALOGS = @CATALOGS@
 # Makevars gets inserted here. (Don't remove this line!)

 .SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update

 .po.mo:
 	@echo "$(MSGFMT) -c -o $@ $<"; \
@@ -65,19 +88,32 @@ CATALOGS = @CATALOGS@
 .po.gmo:
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+	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: check-macro-version 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,
@@ -87,10 +123,13 @@ all-no:
 # $(POFILES) has been designed to not touch files that don't need to be
 # changed.
 stamp-po: $(srcdir)/$(DOMAIN).pot
-	test -z "$(CATALOGS)" || $(MAKE) $(CATALOGS)
-	@echo "touch stamp-po"
-	@echo timestamp > stamp-poT
-	@mv stamp-poT stamp-po
+	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
@@ -99,11 +138,34 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # 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
-	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
+	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 && \
@@ -129,16 +191,27 @@ $(srcdir)/$(DOMAIN).pot:
 # 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$$//'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
+	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 \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  for file in $(DISTFILES.common) Makevars.template; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -151,13 +224,12 @@ install-data: install-data-@USE_NLS@
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(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"; \
@@ -197,19 +269,18 @@ installdirs: installdirs-exec installdirs-data
 installdirs-exec:
 installdirs-data: installdirs-data-@USE_NLS@
 	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
 installdirs-data-no:
 installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  $(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 \
@@ -284,11 +355,14 @@ dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+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; \
@@ -300,9 +374,9 @@ dist2: $(DISTFILES)
 	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
 	  if test -f $$file; then \
-	    cp -p $$file $(distdir); \
+	    cp -p $$file $(distdir) || exit 1; \
 	  else \
-	    cp -p $(srcdir)/$$file $(distdir); \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
 	  fi; \
 	done

@@ -311,6 +385,13 @@ update-po: Makefile
 	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:
@@ -319,9 +400,15 @@ update-po: Makefile
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
-	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	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 \
@@ -342,10 +429,13 @@ $(DUMMYPOFILES):
 update-gmo: Makefile $(GMOFILES)
 	@:

-Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
+# 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) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories

 force:

--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -4,6 +4,11 @@ DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.heade

 .SUFFIXES: .insert-header .po-update-en

+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
 en@quot.po-update: en@quot.po-update-en
 en@boldquot.po-update: en@boldquot.po-update-en

@@ -15,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-update-en
 	ll=`echo $$lang | sed -e 's/@.*//'`; \
 	LC_ALL=C; export LC_ALL; \
 	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
 	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/w3m.pot
+++ b/po/w3m.pot
@@ -6,12 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: w3m 0.5.3\n"
 "Report-Msgid-Bugs-To: satodai@w3m.jp\n"
-"POT-Creation-Date: 2007-05-28 19:49+0900\n"
+"POT-Creation-Date: 2010-08-20 18:44+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -149,674 +150,722 @@ msgid "Display link URL automatically"
 msgstr ""

 #: rc.c:75
-msgid "Display decoded URL"
+msgid "Display link numbers"
 msgstr ""

 #: rc.c:76
-msgid "Display current line number"
+msgid "Display decoded URL"
 msgstr ""

 #: rc.c:77
+msgid "Display current line number"
+msgstr ""
+
+#: rc.c:78
 msgid "Display inline images"
 msgstr ""

 #: rc.c:79
-msgid "Load inline images automatically"
-msgstr ""
-
-#: rc.c:80
-msgid "Maximum processes for parallel image loading"
+msgid "Display pseudo-ALTs for inline images with no ALT or TITLE string"
 msgstr ""

 #: rc.c:81
-msgid "Use external image viewer"
+msgid "Load inline images automatically"
 msgstr ""

 #: rc.c:82
-msgid "Scale of image (%)"
+msgid "Maximum processes for parallel image loading"
 msgstr ""

 #: rc.c:83
-msgid "External command to display image"
+msgid "Use external image viewer"
 msgstr ""

 #: rc.c:84
-msgid "Use link list of image map"
+msgid "Scale of image (%)"
+msgstr ""
+
+#: rc.c:85
+msgid "External command to display image"
 msgstr ""

 #: rc.c:86
-msgid "Display file names in multi-column format"
-msgstr ""
-
-#: rc.c:87
-msgid "Use ASCII equivalents to display entities"
+msgid "Use link list of image map"
 msgstr ""

 #: rc.c:88
-msgid "Use graphic char for border of table and menu"
+msgid "Display file names in multi-column format"
 msgstr ""

 #: rc.c:89
-msgid "Fold lines in TEXTAREA"
+msgid "Use ASCII equivalents to display entities"
 msgstr ""

 #: rc.c:90
-msgid "Display INS, DEL, S and STRIKE element"
+msgid "Character type for border of table and menu"
 msgstr ""

 #: rc.c:91
-msgid "Display with color"
+msgid "Fold lines in TEXTAREA"
 msgstr ""

 #: rc.c:92
-msgid "Color of normal character"
+msgid "Display INS, DEL, S and STRIKE element"
 msgstr ""

 #: rc.c:93
-msgid "Color of anchor"
+msgid "Display with color"
 msgstr ""

 #: rc.c:94
-msgid "Color of image link"
+msgid "Color of normal character"
 msgstr ""

 #: rc.c:95
-msgid "Color of form"
+msgid "Color of anchor"
 msgstr ""

 #: rc.c:96
-msgid "Enable coloring of active link"
+msgid "Color of image link"
 msgstr ""

 #: rc.c:97
-msgid "Color of currently active link"
+msgid "Color of form"
 msgstr ""

 #: rc.c:98
-msgid "Use visited link color"
+msgid "Enable coloring of active link"
 msgstr ""

 #: rc.c:99
-msgid "Color of visited link"
+msgid "Color of currently active link"
 msgstr ""

 #: rc.c:100
-msgid "Color of background"
+msgid "Use visited link color"
 msgstr ""

 #: rc.c:101
-msgid "Color of mark"
+msgid "Color of visited link"
 msgstr ""

 #: rc.c:102
-msgid "Use proxy"
+msgid "Color of background"
 msgstr ""

 #: rc.c:103
-msgid "URL of HTTP proxy host"
+msgid "Color of mark"
+msgstr ""
+
+#: rc.c:104
+msgid "Use proxy"
 msgstr ""

 #: rc.c:105
+msgid "URL of HTTP proxy host"
+msgstr ""
+
+#: rc.c:107
 msgid "URL of HTTPS proxy host"
 msgstr ""

-#: rc.c:108
+#: rc.c:110
 msgid "URL of GOPHER proxy host"
 msgstr ""

-#: rc.c:110
+#: rc.c:112
 msgid "URL of FTP proxy host"
 msgstr ""

-#: rc.c:111
+#: rc.c:113
 msgid "Domains to be accessed directly (no proxy)"
 msgstr ""

-#: rc.c:112
+#: rc.c:114
 msgid "Check noproxy by network address"
 msgstr ""

-#: rc.c:113
+#: rc.c:115
 msgid "Disable cache"
 msgstr ""

-#: rc.c:115
+#: rc.c:117
 msgid "News server"
 msgstr ""

-#: rc.c:116
+#: rc.c:118
 msgid "Mode of news server"
 msgstr ""

-#: rc.c:117
+#: rc.c:119
 msgid "Number of news messages"
 msgstr ""

-#: rc.c:119
+#: rc.c:121
 msgid "Order of name resolution"
 msgstr ""

-#: rc.c:120
+#: rc.c:122
 msgid "Directory corresponding to / (document root)"
 msgstr ""

-#: rc.c:121
+#: rc.c:123
 msgid "Directory corresponding to /~user"
 msgstr ""

-#: rc.c:122
+#: rc.c:124
 msgid "Directory corresponding to /cgi-bin"
 msgstr ""

-#: rc.c:123
+#: rc.c:125
 msgid "Confirm when quitting with q"
 msgstr ""

-#: rc.c:124
+#: rc.c:126
 msgid "Close tab if buffer is last when back"
 msgstr ""

-#: rc.c:126
+#: rc.c:128
 msgid "Enable mark operations"
 msgstr ""

-#: rc.c:128
+#: rc.c:130
 msgid "Enable Emacs-style line editing"
 msgstr ""

-#: rc.c:129
+#: rc.c:131
 msgid "Enable vi-like numeric prefix"
 msgstr ""

-#: rc.c:130
+#: rc.c:132
 msgid "Move cursor to top line when going to label"
 msgstr ""

-#: rc.c:131
+#: rc.c:133
 msgid "Move cursor to top line when moving to next page"
 msgstr ""

-#: rc.c:132
+#: rc.c:134
 msgid "Fold lines of plain text file"
 msgstr ""

-#: rc.c:133
+#: rc.c:135
 msgid "Show line numbers"
 msgstr ""

-#: rc.c:134
+#: rc.c:136
 msgid "Show search string"
 msgstr ""

-#: rc.c:135
+#: rc.c:137
 msgid "List of mime.types files"
 msgstr ""

-#: rc.c:136
+#: rc.c:138
 msgid "List of mailcap files"
 msgstr ""

-#: rc.c:137
+#: rc.c:139
 msgid "List of urimethodmap files"
 msgstr ""

-#: rc.c:138
+#: rc.c:140
 msgid "Editor"
 msgstr ""

-#: rc.c:139
+#: rc.c:141
 msgid "Mailer"
 msgstr ""

-#: rc.c:140
-msgid "External Browser"
-msgstr ""
-
-#: rc.c:141
-msgid "Second External Browser"
-msgstr ""
-
 #: rc.c:142
-msgid "Third External Browser"
+msgid "How to call Mailer for mailto URLs with options"
 msgstr ""

 #: rc.c:143
-msgid "Disable secret file security check"
+msgid "External Browser"
 msgstr ""

 #: rc.c:144
-msgid "Password file"
+msgid "Second External Browser"
 msgstr ""

 #: rc.c:145
-msgid "File for setting form on loading"
+msgid "Third External Browser"
 msgstr ""

 #: rc.c:146
-msgid "Password for anonymous FTP (your mail address)"
+msgid "Disable secret file security check"
 msgstr ""

 #: rc.c:147
-msgid "Generate domain part of password for FTP"
+msgid "Password file"
 msgstr ""

 #: rc.c:148
-msgid "User-Agent identification string"
+msgid "File for setting form on loading"
 msgstr ""

 #: rc.c:149
-msgid "Accept-Encoding header"
+msgid "Password for anonymous FTP (your mail address)"
 msgstr ""

 #: rc.c:150
-msgid "Accept header"
+msgid "Generate domain part of password for FTP"
 msgstr ""

 #: rc.c:151
-msgid "Accept-Language header"
+msgid "User-Agent identification string"
 msgstr ""

 #: rc.c:152
-msgid "Treat URL-like strings as links in all pages"
+msgid "Accept-Encoding header"
 msgstr ""

 #: rc.c:153
-msgid "Wrap search"
+msgid "Accept header"
 msgstr ""

 #: rc.c:154
-msgid "Display unseen objects (e.g. bgimage tag)"
+msgid "Accept-Language header"
 msgstr ""

 #: rc.c:155
-msgid "Uncompress compressed data automatically when downloading"
+msgid "Treat URL-like strings as links in all pages"
+msgstr ""
+
+#: rc.c:156
+msgid "Wrap search"
 msgstr ""

 #: rc.c:157
+msgid "Display unseen objects (e.g. bgimage tag)"
+msgstr ""
+
+#: rc.c:158
+msgid "Uncompress compressed data automatically when downloading"
+msgstr ""
+
+#: rc.c:160
 msgid "Run external viewer in a separate session"
 msgstr ""

-#: rc.c:159
+#: rc.c:162
 msgid "Run external viewer in the background"
 msgstr ""

-#: rc.c:161
+#: rc.c:164
 msgid "Use external program for directory listing"
 msgstr ""

-#: rc.c:162
+#: rc.c:165
 msgid "URL of directory listing command"
 msgstr ""

-#: rc.c:164
+#: rc.c:167
 msgid "Enable dictionary lookup through CGI"
 msgstr ""

-#: rc.c:165
+#: rc.c:168
 msgid "URL of dictionary lookup command"
 msgstr ""

-#: rc.c:167
+#: rc.c:170
 msgid "Display link name for images lacking ALT"
 msgstr ""

-#: rc.c:168
+#: rc.c:171
 msgid "Index file for directories"
 msgstr ""

-#: rc.c:169
+#: rc.c:172
 msgid "Prepend http:// to URL automatically"
 msgstr ""

-#: rc.c:170
+#: rc.c:173
 msgid "Default value for open-URL command"
 msgstr ""

-#: rc.c:171
+#: rc.c:174
 msgid "Decode Content-Transfer-Encoding when saving"
 msgstr ""

-#: rc.c:172
+#: rc.c:175
 msgid "Preserve timestamp when saving"
 msgstr ""

-#: rc.c:174
+#: rc.c:177
 msgid "Enable mouse"
 msgstr ""

-#: rc.c:175
+#: rc.c:178
 msgid "Scroll in reverse direction of mouse drag"
 msgstr ""

-#: rc.c:176
+#: rc.c:179
 msgid "Behavior of wheel scroll speed"
 msgstr ""

-#: rc.c:177
+#: rc.c:180
 msgid "(A only)Scroll by # (%) of screen"
 msgstr ""

-#: rc.c:178
+#: rc.c:181
 msgid "(B only)Scroll by # lines"
 msgstr ""

-#: rc.c:180
+#: rc.c:183
 msgid "Free memory of undisplayed buffers"
 msgstr ""

-#: rc.c:181
+#: rc.c:184
 msgid "Suppress `Referer:' header"
 msgstr ""

-#: rc.c:182
+#: rc.c:185
 msgid "Search case-insensitively"
 msgstr ""

-#: rc.c:183
+#: rc.c:186
 msgid "Use LESSOPEN"
 msgstr ""

-#: rc.c:186
+#: rc.c:189
 msgid "Perform SSL server verification"
 msgstr ""

-#: rc.c:187
+#: rc.c:190
 msgid "PEM encoded certificate file of client"
 msgstr ""

-#: rc.c:188
+#: rc.c:191
 msgid "PEM encoded private key file of client"
 msgstr ""

-#: rc.c:189
+#: rc.c:192
 msgid "Path to directory for PEM encoded certificates of CAs"
 msgstr ""

-#: rc.c:190
+#: rc.c:193
 msgid "File consisting of PEM encoded certificates of CAs"
 msgstr ""

-#: rc.c:192
+#: rc.c:195
 msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)"
 msgstr ""

-#: rc.c:195
+#: rc.c:198
 msgid "Enable cookie processing"
 msgstr ""

-#: rc.c:196
+#: rc.c:199
 msgid "Print a message when receiving a cookie"
 msgstr ""

-#: rc.c:197
+#: rc.c:200
 msgid "Accept cookies"
 msgstr ""

-#: rc.c:198
+#: rc.c:201
 msgid "Action to be taken on invalid cookie"
 msgstr ""

-#: rc.c:199
+#: rc.c:202
 msgid "Domains to reject cookies from"
 msgstr ""

-#: rc.c:200
+#: rc.c:203
 msgid "Domains to accept cookies from"
 msgstr ""

-#: rc.c:202
-msgid "Number of redirections to follow"
-msgstr ""
-
-#: rc.c:203
-msgid "Enable processing of meta-refresh tag"
+#: rc.c:204
+msgid "Domains to avoid [wrong number of dots]"
 msgstr ""

 #: rc.c:206
-msgid "Enable Migemo (Roma-ji search)"
+msgid "Number of redirections to follow"
 msgstr ""

 #: rc.c:207
-msgid "Migemo command"
+msgid "Enable processing of meta-refresh tag"
+msgstr ""
+
+#: rc.c:210
+msgid "Enable Migemo (Roma-ji search)"
 msgstr ""

 #: rc.c:211
-msgid "Display charset"
-msgstr ""
-
-#: rc.c:212
-msgid "Default document charset"
-msgstr ""
-
-#: rc.c:213
-msgid "Automatic charset detect when loading"
-msgstr ""
-
-#: rc.c:214
-msgid "System charset"
+msgid "Migemo command"
 msgstr ""

 #: rc.c:215
-msgid "System charset follows locale(LC_CTYPE)"
+msgid "Display charset"
 msgstr ""

 #: rc.c:216
-msgid "Output halfdump with display charset"
+msgid "Default document charset"
 msgstr ""

 #: rc.c:217
-msgid "Use multi column characters"
+msgid "Automatic charset detect when loading"
 msgstr ""

 #: rc.c:218
-msgid "Use combining characters"
+msgid "System charset"
 msgstr ""

 #: rc.c:219
-msgid "Use Unicode language tags"
+msgid "System charset follows locale(LC_CTYPE)"
 msgstr ""

 #: rc.c:220
-msgid "Charset conversion using Unicode map"
+msgid "Output halfdump with display charset"
 msgstr ""

 #: rc.c:221
-msgid "Charset conversion when loading"
+msgid "Use multi column characters"
 msgstr ""

 #: rc.c:222
-msgid "Adjust search string for document charset"
+msgid "Use combining characters"
 msgstr ""

 #: rc.c:223
-msgid "Fix character width when conversion"
+msgid "Use double width for some Unicode characters"
 msgstr ""

 #: rc.c:224
-msgid "Use GB 12345 Unicode map instead of GB 2312's"
+msgid "Use Unicode language tags"
 msgstr ""

 #: rc.c:225
-msgid "Use JIS X 0201 Roman for ISO-2022-JP"
+msgid "Charset conversion using Unicode map"
 msgstr ""

 #: rc.c:226
-msgid "Use JIS C 6226:1978 for ISO-2022-JP"
+msgid "Charset conversion when loading"
 msgstr ""

 #: rc.c:227
-msgid "Use JIS X 0201 Katakana"
+msgid "Adjust search string for document charset"
 msgstr ""

 #: rc.c:228
-msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
+msgid "Fix character width when conversion"
 msgstr ""

 #: rc.c:229
-msgid "Use JIS X 0213:2000 (2000JIS)"
+msgid "Use GB 12345 Unicode map instead of GB 2312's"
 msgstr ""

 #: rc.c:230
-msgid "Strict ISO-2022-JP/KR/CN"
+msgid "Use JIS X 0201 Roman for ISO-2022-JP"
 msgstr ""

 #: rc.c:231
-msgid "Treat 4 bytes char. of GB18030 as Unicode"
+msgid "Use JIS C 6226:1978 for ISO-2022-JP"
+msgstr ""
+
+#: rc.c:232
+msgid "Use JIS X 0201 Katakana"
+msgstr ""
+
+#: rc.c:233
+msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
 msgstr ""

 #: rc.c:234
+msgid "Use JIS X 0213:2000 (2000JIS)"
+msgstr ""
+
+#: rc.c:235
+msgid "Strict ISO-2022-JP/KR/CN"
+msgstr ""
+
+#: rc.c:236
+msgid "Treat 4 bytes char. of GB18030 as Unicode"
+msgstr ""
+
+#: rc.c:237
+msgid "Simple Preserve space"
+msgstr ""
+
+#: rc.c:240
 msgid "keymap file"
 msgstr ""

-#: rc.c:251
+#: rc.c:257
 msgid "black"
 msgstr ""

-#: rc.c:252
+#: rc.c:258
 msgid "red"
 msgstr ""

-#: rc.c:253
+#: rc.c:259
 msgid "green"
 msgstr ""

-#: rc.c:254
+#: rc.c:260
 msgid "yellow"
 msgstr ""

-#: rc.c:255
+#: rc.c:261
 msgid "blue"
 msgstr ""

-#: rc.c:256
+#: rc.c:262
 msgid "magenta"
 msgstr ""

-#: rc.c:257
+#: rc.c:263
 msgid "cyan"
 msgstr ""

-#: rc.c:258
+#: rc.c:264
 msgid "white"
 msgstr ""

-#: rc.c:259
+#: rc.c:265
 msgid "terminal"
 msgstr ""

-#: rc.c:278
+#: rc.c:284
 msgid "none"
 msgstr ""

-#: rc.c:279
+#: rc.c:285
 msgid "current URL"
 msgstr ""

-#: rc.c:280
+#: rc.c:286
 msgid "link URL"
 msgstr ""

-#: rc.c:285
+#: rc.c:291
 msgid "simple"
 msgstr ""

-#: rc.c:286
+#: rc.c:292
 msgid "use tag"
 msgstr ""

-#: rc.c:287
+#: rc.c:293
 msgid "fontify"
 msgstr ""

-#: rc.c:293
+#: rc.c:299
 msgid "A:relative to screen height"
 msgstr ""

-#: rc.c:294
+#: rc.c:300
 msgid "B:fixed speed"
 msgstr ""

-#: rc.c:301
+#: rc.c:307
 msgid "unspecified"
 msgstr ""

-#: rc.c:302
+#: rc.c:308
 msgid "inet inet6"
 msgstr ""

-#: rc.c:303
+#: rc.c:309
 msgid "inet6 inet"
 msgstr ""

-#: rc.c:304
+#: rc.c:310
 msgid "inet only"
 msgstr ""

-#: rc.c:305
+#: rc.c:311
 msgid "inet6 only"
 msgstr ""

-#: rc.c:312
+#: rc.c:318
 msgid "discard"
 msgstr ""

-#: rc.c:314
+#: rc.c:320
 msgid "accept"
 msgstr ""

-#: rc.c:316
+#: rc.c:322
 msgid "ask"
 msgstr ""

-#: rc.c:326
+#: rc.c:329
+msgid "use internal mailer instead"
+msgstr ""
+
+#: rc.c:331
+msgid "ignore options and use only the address"
+msgstr ""
+
+#: rc.c:332
+msgid "use full mailto URL"
+msgstr ""
+
+#: rc.c:341
 msgid "OFF"
 msgstr ""

-#: rc.c:327
+#: rc.c:342
 msgid "Only ISO 2022"
 msgstr ""

-#: rc.c:328
+#: rc.c:343
 msgid "ON"
 msgstr ""

-#: rc.c:679
+#: rc.c:349
+msgid "ASCII"
+msgstr ""
+
+#: rc.c:350
+msgid "charset specific"
+msgstr ""
+
+#: rc.c:351
+msgid "DEC special graphics"
+msgstr ""
+
+#: rc.c:714
 msgid "Display Settings"
 msgstr ""

-#: rc.c:681
+#: rc.c:716
 msgid "Color Settings"
 msgstr ""

-#: rc.c:683
+#: rc.c:718
 msgid "Miscellaneous Settings"
 msgstr ""

-#: rc.c:684
+#: rc.c:719
 msgid "Directory Settings"
 msgstr ""

-#: rc.c:685
+#: rc.c:720
 msgid "External Program Settings"
 msgstr ""

-#: rc.c:686
+#: rc.c:721
 msgid "Network Settings"
 msgstr ""

-#: rc.c:687
+#: rc.c:722
 msgid "Proxy Settings"
 msgstr ""

-#: rc.c:689
+#: rc.c:724
 msgid "SSL Settings"
 msgstr ""

-#: rc.c:692
+#: rc.c:727
 msgid "Cookie Settings"
 msgstr ""

-#: rc.c:695
+#: rc.c:730
 msgid "Charset Settings"
 msgstr ""

@@ -825,6 +874,6 @@ msgstr ""
 #. * header. For example, ja.po should translate it as
 #. * "ja;q=1.0, en;q=0.5" like that.
 #.
-#: rc.c:1169
+#: rc.c:1209
 msgid "en;q=1.0"
 msgstr ""
				`@@ -0,0 +1 @@`
				`:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m`