Update 020_debian.patch to v0.5.3+git20151119

- Add zh_CN and zh_TW translations (closes: #804732)

1 files changed, 2046 insertions, 93 deletions

diff --git a/debian/patches/020_debian.patch b/debian/patches/020_debian.patch
index feac350..b007dad 100644
--- a/debian/patches/020_debian.patch
+++ b/debian/patches/020_debian.patch
@@ -1,5 +1,5 @@
 Description: Git master branch of Debian's w3m
-Origin: http://anonscm.debian.org/cgit/collab-maint/w3m.git
+Origin: https://anonscm.debian.org/cgit/collab-maint/w3m.git
 
 diff --git a/Bonus/goodict.cgi b/Bonus/goodict.cgi
 index 8f443c1..5fb6581 100755
@@ -60,10 +60,40 @@ index 8f443c1..5fb6581 100755
  	$input = "w3m-control: GOTO_LINK";
  }
 diff --git a/ChangeLog b/ChangeLog
-index 88358ef..3556b40 100644
+index 88358ef..9a7447e 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,814 @@
+@@ -1,3 +1,844 @@
++2015-11-19  Tatsuya Kinoshita  <tats@debian.org>
++
++	* fm.h: Accept cookies by default.
++
++	* fm.h: Set argv_is_url to 1 by default.
++	Bug-Arch: https://bugs.archlinux.org/task/47102
++
++2015-11-18  Tatsuya Kinoshita  <tats@debian.org>
++
++	* config.guess, config.sub:
++	Update config.* with autotools-dev 20150820.1.
++
++2015-11-11  Mingye Wang (Arthur2e5)  <arthur200126@gmail.com>
++
++	* po/LINGUAS, po/zh_CN.po, po/zh_TW.po:
++	Add zh_CN and zh_TW translations.
++	Please note that the zh_TW translation is machine-converted using
++	OpenCC from zh_CN, and needs to be further polished by actual zh_TW
++	speakers.
++	Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804732#10
++
++2015-10-24  BwackNinja  <BwackNinja@gmail.com>
++
++	* w3mimg/x11/x11_w3mimg.c:
++	Fix handling visuals and colormaps incorrectly.
++	cf. https://github.com/hut/ranger/issues/86
++	Origin: https://gist.github.com/BwackNinja/60a344730170f9ce2163
++	Bug-Arch: https://bugs.archlinux.org/task/46836
++	Bug: https://sourceforge.net/p/w3m/patches/72/
++
 +2015-10-10  Tatsuya Kinoshita  <tats@debian.org>
 +
 +	* cookie.c: Remove incomplete special_domain tests.
@@ -1357,7 +1387,7 @@ index 5afc26a..3b2352a 100644
      unlink(buf->savecache);
      buf->savecache = NULL;
 diff --git a/config.guess b/config.guess
-index 51fab47..1f5c50c 100755
+index 51fab47..1659250 100755
 --- a/config.guess
 +++ b/config.guess
 @@ -1,13 +1,12 @@
@@ -1365,10 +1395,10 @@ index 51fab47..1f5c50c 100755
  # Attempt to guess a canonical system name.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   Copyright 1992-2014 Free Software Foundation, Inc.
++#   Copyright 1992-2015 Free Software Foundation, Inc.
  
 -timestamp='2004-03-12'
-+timestamp='2014-03-23'
++timestamp='2015-08-20'
  
  # 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
@@ -1397,7 +1427,7 @@ index 51fab47..1f5c50c 100755
 +# program.  This Exception is an additional permission under section 7
 +# of the GNU General Public License, version 3 ("GPLv3").
 +#
-+# Originally written by Per Bothner.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
  #
 -# This script attempts to guess a canonical system name similar to
 -# config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -1407,7 +1437,7 @@ index 51fab47..1f5c50c 100755
  #
 -# The plan is that this can be called by configure scripts if you
 -# don't specify an explicit build system type.
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
 +
  
  me=`echo "$0" | sed -e 's,.*/,,'`
@@ -1418,7 +1448,7 @@ index 51fab47..1f5c50c 100755
  Originally written by Per Bothner.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
-+Copyright 1992-2014 Free Software Foundation, Inc.
++Copyright 1992-2015 Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1490,16 +1520,34 @@ index 51fab47..1f5c50c 100755
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
  	# switched to ELF, *-*-netbsd* would select the old
  	# object file format.  This provides both forward
-@@ -158,6 +175,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -151,22 +168,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+ 	sysctl="sysctl -n hw.machine_arch"
+-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
++	    /sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || \
++	    echo unknown)`
+ 	case "${UNAME_MACHINE_ARCH}" in
+ 	    armeb) machine=armeb-unknown ;;
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
  	    sh3eb) machine=sh-unknown ;;
 +	    sh5el) machine=sh5le-unknown ;;
++	    earmv*)
++		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
++		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
++		machine=${arch}${endian}-unknown
++		;;
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
-@@ -166,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 	# to ELF recently, or will in the future.
+ 	case "${UNAME_MACHINE_ARCH}" in
+-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 -			| grep __ELF__ >/dev/null
@@ -1507,19 +1555,34 @@ index 51fab47..1f5c50c 100755
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -176,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -176,7 +201,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  		fi
  		;;
  	    *)
 -	        os=netbsd
 +		os=netbsd
++		;;
++	esac
++	# Determine ABI tags.
++	case "${UNAME_MACHINE_ARCH}" in
++	    earm*)
++		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
++		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
  		;;
  	esac
  	# The OS release
-@@ -196,71 +214,34 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -189,78 +221,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ 		release='-gnu'
+ 		;;
+ 	    *)
+-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ 		;;
+ 	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
  	# contains redundant information, the shorter form:
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
+-	echo "${machine}-${os}${release}"
 -	exit 0 ;;
 -    amd64:OpenBSD:*:*)
 -	echo x86_64-unknown-openbsd${UNAME_RELEASE}
@@ -1566,6 +1629,7 @@ index 51fab47..1f5c50c 100755
 -    wgrisc:OpenBSD:*:*)
 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
++	echo "${machine}-${os}${release}${abi}"
 +	exit ;;
 +    *:Bitrig:*:*)
 +	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -1593,6 +1657,9 @@ index 51fab47..1f5c50c 100755
  	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
++    *:Sortix:*:*)
++	echo ${UNAME_MACHINE}-unknown-sortix
++	exit ;;
      alpha:OSF1:*:*)
  	case $UNAME_RELEASE in
  	*4.0)
@@ -1604,7 +1671,7 @@ index 51fab47..1f5c50c 100755
  		;;
  	esac
  	# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -306,40 +287,46 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -306,40 +304,46 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -1665,7 +1732,7 @@ index 51fab47..1f5c50c 100755
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -347,32 +334,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -347,32 +351,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	else
  		echo pyramid-pyramid-bsd
  	fi
@@ -1728,7 +1795,7 @@ index 51fab47..1f5c50c 100755
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
-@@ -381,10 +387,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -381,10 +404,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -1741,7 +1808,7 @@ index 51fab47..1f5c50c 100755
      sun*:*:4.2BSD:*)
  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -396,10 +402,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -396,10 +419,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
@@ -1754,7 +1821,7 @@ index 51fab47..1f5c50c 100755
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
-@@ -409,41 +415,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -409,41 +432,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      # MiNT.  But MiNT is downward compatible to TOS, so this should
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
@@ -1813,7 +1880,7 @@ index 51fab47..1f5c50c 100755
      mips:*:*:UMIPS | mips:*:*:RISCos)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -467,35 +473,36 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -467,35 +490,36 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
  	  exit (-1);
  	}
  EOF
@@ -1863,7 +1930,7 @@ index 51fab47..1f5c50c 100755
  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
  	then
  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -508,29 +515,29 @@ EOF
+@@ -508,29 +532,29 @@ EOF
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
@@ -1902,7 +1969,7 @@ index 51fab47..1f5c50c 100755
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
-@@ -538,7 +545,7 @@ EOF
+@@ -538,7 +562,7 @@ EOF
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
@@ -1911,7 +1978,7 @@ index 51fab47..1f5c50c 100755
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  		eval $set_cc_for_build
-@@ -553,15 +560,19 @@ EOF
+@@ -553,49 +577,54 @@ EOF
  			exit(0);
  			}
  EOF
@@ -1935,7 +2002,15 @@ index 51fab47..1f5c50c 100755
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -574,28 +585,28 @@ EOF
+ 	else
+ 		IBM_ARCH=powerpc
+ 	fi
+-	if [ -x /usr/bin/oslevel ] ; then
+-		IBM_REV=`/usr/bin/oslevel`
++	if [ -x /usr/bin/lslpp ] ; then
++		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ 	else
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
@@ -1972,7 +2047,7 @@ index 51fab47..1f5c50c 100755
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
-@@ -604,52 +615,52 @@ EOF
+@@ -604,52 +633,52 @@ EOF
  	    9000/[678][0-9][0-9])
  		if [ -x /usr/bin/getconf ]; then
  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -2064,7 +2139,7 @@ index 51fab47..1f5c50c 100755
  EOF
  		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
  		    test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -657,9 +668,19 @@ EOF
+@@ -657,9 +686,19 @@ EOF
  	esac
  	if [ ${HP_ARCH} = "hppa2.0w" ]
  	then
@@ -2087,7 +2162,7 @@ index 51fab47..1f5c50c 100755
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -667,11 +688,11 @@ EOF
+@@ -667,11 +706,11 @@ EOF
  	    fi
  	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -2101,7 +2176,7 @@ index 51fab47..1f5c50c 100755
      3050*:HI-UX:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
-@@ -699,340 +720,345 @@ EOF
+@@ -699,340 +738,348 @@ EOF
  	  exit (0);
  	}
  EOF
@@ -2386,6 +2461,9 @@ index 51fab47..1f5c50c 100755
 +    crisv32:Linux:*:*)
 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 +	exit ;;
++    e2k:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
 +    frv:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
@@ -2599,7 +2677,7 @@ index 51fab47..1f5c50c 100755
 -	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 -	;;
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 +	exit ;;
 +    xtensa*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -2655,7 +2733,7 @@ index 51fab47..1f5c50c 100755
      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
  	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -1040,15 +1066,16 @@ EOF
+@@ -1040,15 +1087,16 @@ EOF
  	else
  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
@@ -2675,7 +2753,7 @@ index 51fab47..1f5c50c 100755
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1066,73 +1093,86 @@ EOF
+@@ -1066,73 +1114,86 @@ EOF
  	else
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
@@ -2789,7 +2867,7 @@ index 51fab47..1f5c50c 100755
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1140,68 +1180,109 @@ EOF
+@@ -1140,68 +1201,109 @@ EOF
  	else
  		echo ns32k-sni-sysv
  	fi
@@ -2925,7 +3003,7 @@ index 51fab47..1f5c50c 100755
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
  	UNAME_PROCESSOR=`uname -p`
  	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1209,22 +1290,28 @@ EOF
+@@ -1209,22 +1311,28 @@ EOF
  		UNAME_MACHINE=pc
  	fi
  	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
@@ -2960,7 +3038,7 @@ index 51fab47..1f5c50c 100755
      *:Plan9:*:*)
  	# "uname -m" is not consistent, so use $cputype instead. 386
  	# is converted to i386 for consistency with other x86
-@@ -1235,183 +1322,55 @@ EOF
+@@ -1235,183 +1343,55 @@ EOF
  	    UNAME_MACHINE="$cputype"
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
@@ -3176,7 +3254,7 @@ index 51fab47..1f5c50c 100755
  cat >&2 <<EOF
  $0: unable to guess system type
  
-@@ -1419,7 +1378,9 @@ This script, last modified $timestamp, has failed to recognize
+@@ -1419,7 +1399,9 @@ This script, last modified $timestamp, has failed to recognize
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -3220,7 +3298,7 @@ index 2f41eed..3b575e4 100644
  #define DEFAULT_TERM	"dosansi"
  #else
 diff --git a/config.sub b/config.sub
-index ba33103..bba4efb 100755
+index ba33103..1acc966 100755
 --- a/config.sub
 +++ b/config.sub
 @@ -1,42 +1,40 @@
@@ -3228,10 +3306,10 @@ index ba33103..bba4efb 100755
  # Configuration validation subroutine script.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   Copyright 1992-2014 Free Software Foundation, Inc.
++#   Copyright 1992-2015 Free Software Foundation, Inc.
  
 -timestamp='2004-03-12'
-+timestamp='2014-09-11'
++timestamp='2015-08-20'
  
 -# This file is (in principle) common to ALL GNU software.
 -# The presence of a machine in this file suggests that SOME GNU software
@@ -3272,7 +3350,7 @@ index ba33103..bba4efb 100755
 -# Please send patches to <config-patches@gnu.org>.  Submit a context
 -# diff and a properly formatted ChangeLog entry.
 +
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
++# Please send patches to <config-patches@gnu.org>.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
@@ -3291,7 +3369,7 @@ index ba33103..bba4efb 100755
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
-+Copyright 1992-2014 Free Software Foundation, Inc.
++Copyright 1992-2015 Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -3327,7 +3405,7 @@ index ba33103..bba4efb 100755
 -  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+  knetbsd*-gnu* | netbsd*-gnu* | \
++  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
 +  kopensolaris*-gnu* | \
 +  storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
@@ -3400,7 +3478,7 @@ index ba33103..bba4efb 100755
  	-lynx*)
  		os=-lynxos
  		;;
-@@ -227,57 +248,109 @@ case $basic_machine in
+@@ -227,57 +248,114 @@ case $basic_machine in
  	# Some are omitted here because they have special meanings below.
  	1750a | 580 \
  	| a29k \
@@ -3413,13 +3491,14 @@ index ba33103..bba4efb 100755
 +	| arc | arceb \
 +	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 +	| avr | avr32 \
++	| ba \
 +	| be32 | be64 \
 +	| bfin \
 +	| c4x | c8051 | clipper \
  	| d10v | d30v | dlx | dsp16xx \
 -	| fr30 | frv \
-+	| epiphany \
-+	| fido | fr30 | frv \
++	| e2k | epiphany \
++	| fido | fr30 | frv | ft32 \
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| hexagon \
  	| i370 | i860 | i960 | ia64 \
@@ -3469,7 +3548,7 @@ index ba33103..bba4efb 100755
 +	| riscv32 | riscv64 \
 +	| rl78 | rx \
 +	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
 -	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 -	| strongarm \
@@ -3481,6 +3560,7 @@ index ba33103..bba4efb 100755
 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +	| ubicom32 \
 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
++	| visium \
  	| we32k \
 -	| x86 | xscale | xstormy16 | xtensa \
 -	| z8k)
@@ -3499,6 +3579,9 @@ index ba33103..bba4efb 100755
 +	c6x)
 +		basic_machine=tic6x-unknown
 +		;;
++	leon|leon[3-9])
++		basic_machine=sparc-$basic_machine
++		;;
 +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
  		basic_machine=$basic_machine-unknown
  		os=-none
@@ -3526,7 +3609,7 @@ index ba33103..bba4efb 100755
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -293,59 +366,86 @@ case $basic_machine in
+@@ -293,59 +371,89 @@ case $basic_machine in
  	# Recognize the basic CPU types with company name.
  	580-* \
  	| a29k-* \
@@ -3541,13 +3624,15 @@ index ba33103..bba4efb 100755
 -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 -	| clipper-* | cydra-* \
 +	| avr-* | avr32-* \
++	| ba-* \
 +	| be32-* | be64-* \
 +	| bfin-* | bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 +	| c8051-* | clipper-* | craynv-* | cydra-* \
  	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
+-	| elxsi-* \
 -	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| e2k-* | elxsi-* \
 +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
  	| h8300-* | h8500-* \
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -3601,6 +3686,7 @@ index ba33103..bba4efb 100755
  	| pyramid-* \
 -	| romp-* | rs6000-* \
 -	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| riscv32-* | riscv64-* \
 +	| rl78-* | romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
@@ -3609,7 +3695,7 @@ index ba33103..bba4efb 100755
 -	| tahoe-* | thumb-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 +	| tahoe-* \
  	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tile*-* \
@@ -3618,6 +3704,7 @@ index ba33103..bba4efb 100755
 +	| ubicom32-* \
 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 +	| vax-* \
++	| visium-* \
  	| we32k-* \
 -	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
 -	| xtensa-* \
@@ -3633,7 +3720,7 @@ index ba33103..bba4efb 100755
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -363,7 +463,7 @@ case $basic_machine in
+@@ -363,7 +471,7 @@ case $basic_machine in
  		basic_machine=a29k-amd
  		os=-udi
  		;;
@@ -3642,7 +3729,7 @@ index ba33103..bba4efb 100755
  		basic_machine=abacus-unknown
  		;;
  	adobe68k)
-@@ -409,6 +509,10 @@ case $basic_machine in
+@@ -409,6 +517,13 @@ case $basic_machine in
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -3650,10 +3737,13 @@ index ba33103..bba4efb 100755
 +		basic_machine=i386-pc
 +		os=-aros
 +		;;
++        asmjs)
++		basic_machine=asmjs-unknown
++		;;
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -417,10 +521,35 @@ case $basic_machine in
+@@ -417,10 +532,35 @@ case $basic_machine in
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -3689,7 +3779,7 @@ index ba33103..bba4efb 100755
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -445,13 +574,20 @@ case $basic_machine in
+@@ -445,13 +585,20 @@ case $basic_machine in
  		basic_machine=j90-cray
  		os=-unicos
  		;;
@@ -3712,7 +3802,7 @@ index ba33103..bba4efb 100755
  	cris | cris-* | etrax*)
  		basic_machine=cris-axis
  		;;
-@@ -481,6 +617,14 @@ case $basic_machine in
+@@ -481,6 +628,14 @@ case $basic_machine in
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -3727,7 +3817,7 @@ index ba33103..bba4efb 100755
  	dpx20 | dpx20-*)
  		basic_machine=rs6000-bull
  		os=-bosx
-@@ -592,7 +736,6 @@ case $basic_machine in
+@@ -592,7 +747,6 @@ case $basic_machine in
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		;;
@@ -3735,10 +3825,13 @@ index ba33103..bba4efb 100755
  	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
-@@ -631,6 +774,14 @@ case $basic_machine in
+@@ -631,6 +785,17 @@ case $basic_machine in
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
++	leon-*|leon[3-9]-*)
++		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
++		;;
 +	m68knommu)
 +		basic_machine=m68k-unknown
 +		os=-linux
@@ -3750,7 +3843,7 @@ index ba33103..bba4efb 100755
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -642,10 +793,21 @@ case $basic_machine in
+@@ -642,10 +807,21 @@ case $basic_machine in
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
@@ -3773,7 +3866,7 @@ index ba33103..bba4efb 100755
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -659,10 +821,6 @@ case $basic_machine in
+@@ -659,10 +835,6 @@ case $basic_machine in
  	mips3*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
@@ -3784,7 +3877,7 @@ index ba33103..bba4efb 100755
  	monitor)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -671,14 +829,29 @@ case $basic_machine in
+@@ -671,14 +843,29 @@ case $basic_machine in
  		basic_machine=powerpc-unknown
  		os=-morphos
  		;;
@@ -3814,7 +3907,7 @@ index ba33103..bba4efb 100755
  	ncr3000)
  		basic_machine=i486-ncr
  		os=-sysv4
-@@ -743,9 +916,11 @@ case $basic_machine in
+@@ -743,9 +930,11 @@ case $basic_machine in
  	np1)
  		basic_machine=np1-gould
  		;;
@@ -3829,7 +3922,7 @@ index ba33103..bba4efb 100755
  		;;
  	nsr-tandem)
  		basic_machine=nsr-tandem
-@@ -754,9 +929,8 @@ case $basic_machine in
+@@ -754,9 +943,8 @@ case $basic_machine in
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
@@ -3840,7 +3933,7 @@ index ba33103..bba4efb 100755
  		;;
  	os400)
  		basic_machine=powerpc-ibm
-@@ -778,6 +952,14 @@ case $basic_machine in
+@@ -778,6 +966,14 @@ case $basic_machine in
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -3855,7 +3948,7 @@ index ba33103..bba4efb 100755
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -787,6 +969,12 @@ case $basic_machine in
+@@ -787,6 +983,12 @@ case $basic_machine in
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -3868,7 +3961,7 @@ index ba33103..bba4efb 100755
  	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
-@@ -816,9 +1004,10 @@ case $basic_machine in
+@@ -816,9 +1018,10 @@ case $basic_machine in
  		;;
  	power)	basic_machine=power-ibm
  		;;
@@ -3881,7 +3974,7 @@ index ba33103..bba4efb 100755
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
-@@ -843,6 +1032,14 @@ case $basic_machine in
+@@ -843,6 +1046,14 @@ case $basic_machine in
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
@@ -3896,7 +3989,7 @@ index ba33103..bba4efb 100755
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -869,6 +1066,10 @@ case $basic_machine in
+@@ -869,6 +1080,10 @@ case $basic_machine in
  	sb1el)
  		basic_machine=mipsisa64sb1el-unknown
  		;;
@@ -3907,7 +4000,7 @@ index ba33103..bba4efb 100755
  	sei)
  		basic_machine=mips-sei
  		os=-seiux
-@@ -880,6 +1081,9 @@ case $basic_machine in
+@@ -880,6 +1095,9 @@ case $basic_machine in
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -3917,7 +4010,7 @@ index ba33103..bba4efb 100755
  	sh64)
  		basic_machine=sh64-unknown
  		;;
-@@ -901,6 +1105,9 @@ case $basic_machine in
+@@ -901,6 +1119,9 @@ case $basic_machine in
  		basic_machine=i860-stratus
  		os=-sysv4
  		;;
@@ -3927,7 +4020,7 @@ index ba33103..bba4efb 100755
  	sun2)
  		basic_machine=m68000-sun
  		;;
-@@ -957,17 +1164,9 @@ case $basic_machine in
+@@ -957,17 +1178,9 @@ case $basic_machine in
  		basic_machine=t90-cray
  		os=-unicos
  		;;
@@ -3948,7 +4041,7 @@ index ba33103..bba4efb 100755
  		;;
  	tx39)
  		basic_machine=mipstx39-unknown
-@@ -1029,9 +1228,16 @@ case $basic_machine in
+@@ -1029,9 +1242,16 @@ case $basic_machine in
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
@@ -3965,7 +4058,7 @@ index ba33103..bba4efb 100755
  	ymp)
  		basic_machine=ymp-cray
  		os=-unicos
-@@ -1040,6 +1246,10 @@ case $basic_machine in
+@@ -1040,6 +1260,10 @@ case $basic_machine in
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -3976,7 +4069,7 @@ index ba33103..bba4efb 100755
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1059,6 +1269,9 @@ case $basic_machine in
+@@ -1059,6 +1283,9 @@ case $basic_machine in
  	romp)
  		basic_machine=romp-ibm
  		;;
@@ -3986,7 +4079,7 @@ index ba33103..bba4efb 100755
  	rs6000)
  		basic_machine=rs6000-ibm
  		;;
-@@ -1075,13 +1288,10 @@ case $basic_machine in
+@@ -1075,13 +1302,10 @@ case $basic_machine in
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -4002,7 +4095,7 @@ index ba33103..bba4efb 100755
  		basic_machine=sparc-sun
  		;;
  	cydra)
-@@ -1125,9 +1335,12 @@ esac
+@@ -1125,9 +1349,12 @@ esac
  if [ x"$os" != x"" ]
  then
  case $os in
@@ -4017,7 +4110,7 @@ index ba33103..bba4efb 100755
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1148,26 +1361,31 @@ case $os in
+@@ -1148,26 +1375,31 @@ case $os in
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -4028,7 +4121,7 @@ index ba33103..bba4efb 100755
 +	      | -sym* | -kopensolaris* | -plan9* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 -	      | -aos* \
-+	      | -aos* | -aros* \
++	      | -aos* | -aros* | -cloudabi* | -sortix* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 -	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
@@ -4057,7 +4150,7 @@ index ba33103..bba4efb 100755
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1185,7 +1403,7 @@ case $os in
+@@ -1185,7 +1417,7 @@ case $os in
  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -4066,7 +4159,7 @@ index ba33103..bba4efb 100755
  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
-@@ -1206,7 +1424,7 @@ case $os in
+@@ -1206,7 +1438,7 @@ case $os in
  	-opened*)
  		os=-openedition
  		;;
@@ -4075,7 +4168,7 @@ index ba33103..bba4efb 100755
  		os=-os400
  		;;
  	-wince*)
-@@ -1255,7 +1473,7 @@ case $os in
+@@ -1255,7 +1487,7 @@ case $os in
  	-sinix*)
  		os=-sysv4
  		;;
@@ -4084,7 +4177,7 @@ index ba33103..bba4efb 100755
  		os=-tpf
  		;;
  	-triton*)
-@@ -1291,8 +1509,13 @@ case $os in
+@@ -1291,8 +1523,13 @@ case $os in
  	-aros*)
  		os=-aros
  		;;
@@ -4100,7 +4193,7 @@ index ba33103..bba4efb 100755
  		;;
  	-none)
  		;;
-@@ -1316,6 +1539,12 @@ else
+@@ -1316,6 +1553,12 @@ else
  # system, and we'll never get to this point.
  
  case $basic_machine in
@@ -4113,7 +4206,7 @@ index ba33103..bba4efb 100755
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1325,9 +1554,24 @@ case $basic_machine in
+@@ -1325,9 +1568,24 @@ case $basic_machine in
  	arm*-semi)
  		os=-aout
  		;;
@@ -4141,7 +4234,7 @@ index ba33103..bba4efb 100755
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
-@@ -1346,13 +1590,13 @@ case $basic_machine in
+@@ -1346,13 +1604,13 @@ case $basic_machine in
  		;;
  	m68000-sun)
  		os=-sunos3
@@ -4158,7 +4251,7 @@ index ba33103..bba4efb 100755
  	mips*-cisco)
  		os=-elf
  		;;
-@@ -1371,9 +1615,15 @@ case $basic_machine in
+@@ -1371,9 +1629,15 @@ case $basic_machine in
  	*-be)
  		os=-beos
  		;;
@@ -4174,7 +4267,7 @@ index ba33103..bba4efb 100755
  	*-wec)
  		os=-proelf
  		;;
-@@ -1476,7 +1726,7 @@ case $basic_machine in
+@@ -1476,7 +1740,7 @@ case $basic_machine in
  			-sunos*)
  				vendor=sun
  				;;
@@ -4183,7 +4276,7 @@ index ba33103..bba4efb 100755
  				vendor=ibm
  				;;
  			-beos*)
-@@ -1539,7 +1789,7 @@ case $basic_machine in
+@@ -1539,7 +1803,7 @@ case $basic_machine in
  esac
  
  echo $basic_machine$os
@@ -6646,7 +6739,7 @@ index 567d41e..9d1dc9a 100644
  	}
  	ungetc(c, fp);
 diff --git a/fm.h b/fm.h
-index 8378939..37098a0 100644
+index 8378939..f4194ee 100644
 --- a/fm.h
 +++ b/fm.h
 @@ -76,6 +76,7 @@ typedef int wc_ces;	/* XXX: not used */
@@ -6724,6 +6817,15 @@ index 8378939..37098a0 100644
      char fontstat[FONTSTAT_SIZE];
      char fontstat_stack[FONT_STACK_SIZE][FONTSTAT_SIZE];
      int fontstat_sp;
+@@ -802,7 +824,7 @@ global char PermitSaveToPipe init(FALSE);
+ global char DecodeCTE init(FALSE);
+ global char AutoUncompress init(FALSE);
+ global char PreserveTimestamp init(TRUE);
+-global char ArgvIsURL init(FALSE);
++global char ArgvIsURL init(TRUE);
+ global char MetaRefresh init(FALSE);
+ 
+ global char fmInitialized init(FALSE);
 @@ -874,6 +896,9 @@ global char *index_file init(NULL);
  
  global char *CurrentDir;
@@ -6764,6 +6866,19 @@ index 8378939..37098a0 100644
  extern char *graph_symbol[];
  extern char *graph2_symbol[];
  extern int symbol_width;
+@@ -1113,9 +1141,9 @@ global MouseAction mouse_action;
+ 
+ #ifdef USE_COOKIE
+ global int default_use_cookie init(TRUE);
+-global int use_cookie init(FALSE);
+-global int show_cookie init(TRUE);
+-global int accept_cookie init(FALSE);
++global int use_cookie init(TRUE);
++global int show_cookie init(FALSE);
++global int accept_cookie init(TRUE);
+ #define ACCEPT_BAD_COOKIE_DISCARD	0
+ #define ACCEPT_BAD_COOKIE_ACCEPT	1
+ #define ACCEPT_BAD_COOKIE_ASK		2
 @@ -1135,7 +1163,7 @@ global int view_unseenobject init(TRUE);
  #endif
  
@@ -9868,13 +9983,13 @@ index 6b627d2..3435f9f 100644
               hidden=TRUE;
               break;
 diff --git a/po/LINGUAS b/po/LINGUAS
-index 1489115..ade7ca2 100644
+index 1489115..ddd267b 100644
 --- a/po/LINGUAS
 +++ b/po/LINGUAS
 @@ -1,2 +1,2 @@
  # Set of available languages.
 -ja
-+ja de
++ja de zh_CN zh_TW
 diff --git a/po/Makevars b/po/Makevars
 index 2f57810..a60a09d 100644
 --- a/po/Makevars
@@ -12846,6 +12961,1802 @@ index e164b1e..b277bb9 100644
 +#: rc.c:1220
  msgid "en;q=1.0"
  msgstr ""
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+new file mode 100644
+index 0000000..a9215c0
+--- /dev/null
++++ b/po/zh_CN.po
+@@ -0,0 +1,892 @@
++# zh_CN translation for w3m
++# Copyright (C) YEAR THE w3m'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the w3m package.
++# Junde Yi <lmy441900@gmail.com>, 2014.
++# Mingcong Bai <jeffbai@aosc.xyz>, 2014.
++# liushuyu <liushuyu_011@126.com>, 2014.
++# Xingda Zheng <icenowy@outlook.com>, 2014.
++# Mingye Wang (Arthur2e5) <arthur200126@gmail.com>, 2014, 2015.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: w3m 0.5.3\n"
++"Report-Msgid-Bugs-To: satodai@w3m.jp\n"
++"POT-Creation-Date: 2015-04-29 16:18+0900\n"
++"PO-Revision-Date: 2015-11-10 18:58-0500\n"
++"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
++"Language-Team: AOSC zh_CN <aosc@members.fsf.org>\n"
++"Language: zh_CN\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 1.8.6\n"
++"Plural-Forms: nplurals=1; plural=0;\n"
++
++#: menu.c:267
++msgid " Back         (b) "
++msgstr " 后退         (b) "
++
++#: menu.c:268
++msgid " Select Buffer(s) "
++msgstr " 选择缓冲区       "
++
++#: menu.c:270
++msgid " Select Tab   (t) "
++msgstr " 选择标签     (t) "
++
++#: menu.c:272
++msgid " View Source  (v) "
++msgstr " 查看源码     (v) "
++
++#: menu.c:273
++msgid " Edit Source  (e) "
++msgstr " 修改源码     (e) "
++
++#: menu.c:274
++msgid " Save Source  (S) "
++msgstr " 保存源码     (S) "
++
++#: menu.c:275
++msgid " Reload       (r) "
++msgstr " 重新载入     (r) "
++
++#: menu.c:276 menu.c:283 menu.c:287
++msgid " ---------------- "
++msgstr " ---------------- "
++
++#: menu.c:277
++msgid " Go Link      (a) "
++msgstr " 转到链接     (a) "
++
++#: menu.c:278
++msgid "   on New Tab (n) "
++msgstr "   在新标签   (n) "
++
++#: menu.c:279
++msgid " Save Link    (A) "
++msgstr " 保存链接     (A) "
++
++#: menu.c:280
++msgid " View Image   (i) "
++msgstr " 查看图片     (i) "
++
++#: menu.c:281
++msgid " Save Image   (I) "
++msgstr " 保存图片     (I) "
++
++#: menu.c:282
++msgid " View Frame   (f) "
++msgstr " 查看框架     (f) "
++
++#: menu.c:284
++msgid " Bookmark     (B) "
++msgstr " 书签         (B) "
++
++#: menu.c:285
++msgid " Help         (h) "
++msgstr " 帮助         (h) "
++
++#: menu.c:286
++msgid " Option       (o) "
++msgstr " 选项         (o) "
++
++#: menu.c:288
++msgid " Quit         (q) "
++msgstr " 退出         (q) "
++
++#: rc.c:62
++msgid "External Viewer Setup"
++msgstr "外部查看器设置"
++
++#: rc.c:63
++msgid "Tab width in characters"
++msgstr "文字中的 TAB 宽度"
++
++#: rc.c:64
++msgid "Indent for HTML rendering"
++msgstr "用于 HTML 渲染"
++
++#: rc.c:65
++msgid "Number of pixels per character (4.0...32.0)"
++msgstr "每字体大小的像素值 (4.0...32.0)"
++
++#: rc.c:66
++msgid "Number of pixels per line (4.0...64.0)"
++msgstr "每行的像素数 (4.0...64.0)"
++
++#: rc.c:67
++msgid "Number of remembered lines when used as a pager"
++msgstr "当作为分页器使用时记忆的行数"
++
++#: rc.c:68
++msgid "Use URL history"
++msgstr "使用 URL 历史记录"
++
++#: rc.c:69
++msgid "Number of remembered URL"
++msgstr "记录的 URL 数量"
++
++#: rc.c:70
++msgid "Save URL history"
++msgstr "保存 URL 历史"
++
++#: rc.c:71
++msgid "Render frames automatically"
++msgstr "自动渲染框架"
++
++#: rc.c:72
++msgid "Treat argument without scheme as URL"
++msgstr "将无格式的参数看作 URL"
++
++#: rc.c:73
++msgid "Use _self as default target"
++msgstr "将自身作为默认目标 (_S)"
++
++#: rc.c:74
++msgid "Open link on new tab if target is _blank or _new"
++msgstr "如果目标为空 (_b) 或新建 (_n) 在新标签打开页面"
++
++#: rc.c:75
++msgid "Open download list panel on new tab"
++msgstr "打开下载列表面板于新标签"
++
++#: rc.c:76
++msgid "Display link URL automatically"
++msgstr "自动显示链接 URL"
++
++#: rc.c:77
++msgid "Display link numbers"
++msgstr "显示链接编号"
++
++#: rc.c:78
++msgid "Display decoded URL"
++msgstr "显示解码后的 URL"
++
++#: rc.c:79
++msgid "Display current line number"
++msgstr "显示当前行数"
++
++#: rc.c:80
++msgid "Display inline images"
++msgstr "显示内联图像"
++
++#: rc.c:81
++msgid "Display pseudo-ALTs for inline images with no ALT or TITLE string"
++msgstr "为不带有 ALT 或 TITLE 字串的内联图像显示伪 ALT"
++
++#: rc.c:83
++msgid "Load inline images automatically"
++msgstr "自动载入行内图像"
++
++#: rc.c:84
++msgid "Maximum processes for parallel image loading"
++msgstr "多线程图像加载的最大进程数"
++
++#: rc.c:85
++msgid "Use external image viewer"
++msgstr "使用外部图片查看器"
++
++#: rc.c:86
++msgid "Scale of image (%)"
++msgstr "图像比例尺 (%)"
++
++#: rc.c:87
++msgid "External command to display image"
++msgstr "用于显示图像的外部命令"
++
++#: rc.c:88
++msgid "Use link list of image map"
++msgstr "使用图像映射的链接列表"
++
++#: rc.c:90
++msgid "Display file names in multi-column format"
++msgstr "以多列格式显示文件名"
++
++#: rc.c:91
++msgid "Use ASCII equivalents to display entities"
++msgstr "使用对应的 ASCII 编码来显示实体 "
++
++#: rc.c:92
++msgid "Character type for border of table and menu"
++msgstr "表格和菜单边框的字符类型"
++
++#: rc.c:93
++msgid "Display table borders, ignore value of BORDER"
++msgstr "显示表格边框，忽略 BORDER 数值"
++
++#: rc.c:94
++msgid "Fold lines in TEXTAREA"
++msgstr "在文本区 (TEXTAREA) 中折叠行"
++
++#: rc.c:95
++msgid "Display INS, DEL, S and STRIKE element"
++msgstr "显示 INS, DEL, S 及 STRIKE 元素"
++
++#: rc.c:96
++msgid "Display with color"
++msgstr "使用带颜色的显示"
++
++#: rc.c:97
++msgid "Color of normal character"
++msgstr "一般文字颜色"
++
++#: rc.c:98
++msgid "Color of anchor"
++msgstr "链接文字颜色"
++
++#: rc.c:99
++msgid "Color of image link"
++msgstr "图片链接颜色"
++
++#: rc.c:100
++msgid "Color of form"
++msgstr "表格颜色"
++
++#: rc.c:101
++msgid "Enable coloring of active link"
++msgstr "为活动链接开启上色"
++
++#: rc.c:102
++msgid "Color of currently active link"
++msgstr "当前活动链接的颜色"
++
++#: rc.c:103
++msgid "Use visited link color"
++msgstr "为访问过的链接上色"
++
++#: rc.c:104
++msgid "Color of visited link"
++msgstr "已访问链接颜色"
++
++#: rc.c:105
++msgid "Color of background"
++msgstr "背景色"
++
++#: rc.c:106
++msgid "Color of mark"
++msgstr "标记颜色"
++
++#: rc.c:107
++msgid "Use proxy"
++msgstr "使用代理服务器"
++
++#: rc.c:108
++msgid "URL of HTTP proxy host"
++msgstr "HTTP 代理主机地址"
++
++#: rc.c:110
++msgid "URL of HTTPS proxy host"
++msgstr "HTTPS 代理主机地址"
++
++#: rc.c:113
++msgid "URL of GOPHER proxy host"
++msgstr "GOPHER 代理主机地址"
++
++#: rc.c:115
++msgid "URL of FTP proxy host"
++msgstr "FTP 代理主机地址"
++
++#: rc.c:116
++msgid "Domains to be accessed directly (no proxy)"
++msgstr "直接访问而不是用代理服务器访问的 URL"
++
++#: rc.c:117
++msgid "Check noproxy by network address"
++msgstr "根据网络地址检查 noproxy"
++
++#: rc.c:118
++msgid "Disable cache"
++msgstr "禁用缓存"
++
++#: rc.c:120
++msgid "News server"
++msgstr "新闻服务器"
++
++#: rc.c:121
++msgid "Mode of news server"
++msgstr "新闻服务器模式"
++
++#: rc.c:122
++msgid "Number of news messages"
++msgstr "新闻消息的数量"
++
++#: rc.c:124
++msgid "Order of name resolution"
++msgstr "名称解析顺序"
++
++#: rc.c:125
++msgid "Directory corresponding to / (document root)"
++msgstr "对应 / 的目录 (文档根目录)"
++
++#: rc.c:126
++msgid "Directory corresponding to /~user"
++msgstr "对应 /~user 的目录"
++
++#: rc.c:127
++msgid "Directory corresponding to /cgi-bin"
++msgstr "对应 /cgi-bin 的目录"
++
++#: rc.c:128
++msgid "Confirm when quitting with q"
++msgstr "使用 q 键退出时请求确认"
++
++#: rc.c:129
++msgid "Close tab if buffer is last when back"
++msgstr "在返回时缓冲区还是以前状态就关闭标签页"
++
++#: rc.c:131
++msgid "Enable mark operations"
++msgstr "启用标记操作"
++
++#: rc.c:133
++msgid "Enable Emacs-style line editing"
++msgstr "启用 Emacs 风格的行编辑"
++
++#: rc.c:134
++msgid "Enable vi-like numeric prefix"
++msgstr "启动 vi 式的数字跳转"
++
++#: rc.c:135
++msgid "Move cursor to top line when going to label"
++msgstr "当移动到标签时将光标移到最顶行"
++
++#: rc.c:136
++msgid "Move cursor to top line when moving to next page"
++msgstr "当转到下一页时将光标移到最顶行"
++
++#: rc.c:137
++msgid "Fold lines of plain text file"
++msgstr "对纯文本文件实行行折叠"
++
++#: rc.c:138
++msgid "Show line numbers"
++msgstr "显示行号"
++
++#: rc.c:139
++msgid "Show search string"
++msgstr "显示搜索字符串"
++
++#: rc.c:140
++msgid "List of mime.types files"
++msgstr "mime.type 文件列表"
++
++#: rc.c:141
++msgid "List of mailcap files"
++msgstr "mailcap 文件列表"
++
++#: rc.c:142
++msgid "List of urimethodmap files"
++msgstr "urlmethodmap 文件列表"
++
++#: rc.c:143
++msgid "Editor"
++msgstr "编辑器"
++
++#: rc.c:144
++msgid "Mailer"
++msgstr "发送者"
++
++#: rc.c:145
++msgid "How to call Mailer for mailto URLs with options"
++msgstr "启动 mailto 地址时调用电子邮件程序的方式和参数"
++
++#: rc.c:146
++msgid "External Browser"
++msgstr "外部浏览器"
++
++#: rc.c:147
++msgid "Second External Browser"
++msgstr "第二外部浏览器 "
++
++#: rc.c:148
++msgid "Third External Browser"
++msgstr "第三外部浏览器"
++
++#: rc.c:149
++msgid "Disable secret file security check"
++msgstr "关闭秘密文件安全检查"
++
++#: rc.c:150
++msgid "Password file"
++msgstr "密码文件"
++
++#: rc.c:151
++msgid "File for setting form on loading"
++msgstr "设置窗口加载时的文件"
++
++#: rc.c:152
++msgid "File for preferences for each site"
++msgstr "各个站点的首选项文件"
++
++#: rc.c:153
++msgid "Password for anonymous FTP (your mail address)"
++msgstr "匿名FTP密码（您的邮箱地址）"
++
++#: rc.c:154
++msgid "Generate domain part of password for FTP"
++msgstr "为 FTP 生成密码的域部分"
++
++#: rc.c:155
++msgid "User-Agent identification string"
++msgstr "User-Agent 串"
++
++#: rc.c:156
++msgid "Accept-Encoding header"
++msgstr "接受的编码 (Accept-Encoding) 报头"
++
++#: rc.c:157
++msgid "Accept header"
++msgstr "接受 (Accept) 报头"
++
++#: rc.c:158
++msgid "Accept-Language header"
++msgstr "接受的语言 (Accept-Language) 报头"
++
++#: rc.c:159
++msgid "Treat URL-like strings as links in all pages"
++msgstr "将所有页面中类似于 URL 的字符串当做链接"
++
++#: rc.c:160
++msgid "Wrap search"
++msgstr "包装搜索结果"
++
++#: rc.c:161
++msgid "Display unseen objects (e.g. bgimage tag)"
++msgstr "显示看不到的对象 （例如，bdimage标签）"
++
++#: rc.c:162
++msgid "Uncompress compressed data automatically when downloading"
++msgstr "在下载时自动解压被压缩的数据"
++
++#: rc.c:164
++msgid "Run external viewer in a separate session"
++msgstr "在另一个会话中运行外部查看器"
++
++#: rc.c:166
++msgid "Run external viewer in the background"
++msgstr "在后台运行外部查看器"
++
++#: rc.c:168
++msgid "Use external program for directory listing"
++msgstr "使用外部程序列出目录"
++
++#: rc.c:169
++msgid "URL of directory listing command"
++msgstr "目录列表命令的网址"
++
++#: rc.c:171
++msgid "Enable dictionary lookup through CGI"
++msgstr "启用基于 CGI 的词典查询"
++
++#: rc.c:172
++msgid "URL of dictionary lookup command"
++msgstr "字典查找命令的网址"
++
++#: rc.c:174
++msgid "Display link name for images lacking ALT"
++msgstr "对缺少 ALT 的图片显示链接名称"
++
++#: rc.c:175
++msgid "Index file for directories"
++msgstr "目录的索引文件"
++
++#: rc.c:176
++msgid "Prepend http:// to URL automatically"
++msgstr "自动在 URL 前加入 http://"
++
++#: rc.c:177
++msgid "Default value for open-URL command"
++msgstr "打开网址命令的默认值"
++
++#: rc.c:178
++msgid "Decode Content-Transfer-Encoding when saving"
++msgstr "保存时对内容传输编码信息 (Content-Transfer-Encoding) 进行解码"
++
++#: rc.c:179
++msgid "Preserve timestamp when saving"
++msgstr "在保存时保留时间戳"
++
++#: rc.c:181
++msgid "Enable mouse"
++msgstr "启用鼠标"
++
++#: rc.c:182
++msgid "Scroll in reverse direction of mouse drag"
++msgstr "向鼠标拖动的反方向滚动"
++
++#: rc.c:183
++msgid "Behavior of wheel scroll speed"
++msgstr "滚轮滚动速度行为"
++
++#: rc.c:184
++msgid "(A only)Scroll by # (%) of screen"
++msgstr "(仅 A) 每次滚动 # (%) 的屏幕高度"
++
++#: rc.c:185
++msgid "(B only)Scroll by # lines"
++msgstr "(仅 B) 每次滚动 # 行"
++
++#: rc.c:187
++msgid "Free memory of undisplayed buffers"
++msgstr "释放未显示缓存的存储"
++
++#: rc.c:188
++msgid "Suppress `Referer:' header"
++msgstr "禁止 'Referer:' 文件头"
++
++#: rc.c:189
++msgid "Search case-insensitively"
++msgstr "搜索不区分大小写"
++
++#: rc.c:190
++msgid "Use LESSOPEN"
++msgstr "使用 LESSOPEN"
++
++#: rc.c:193
++msgid "Perform SSL server verification"
++msgstr "进行 SSL 服务器检查"
++
++#: rc.c:194
++msgid "PEM encoded certificate file of client"
++msgstr "客户端的 PEM 编码证书文件"
++
++#: rc.c:195
++msgid "PEM encoded private key file of client"
++msgstr "客户端的 PEM 编码私钥文件"
++
++#: rc.c:196
++msgid "Path to directory for PEM encoded certificates of CAs"
++msgstr "PEM 编码 CA 证书目录的路径"
++
++#: rc.c:197
++msgid "File consisting of PEM encoded certificates of CAs"
++msgstr "包含 PEM 编码 CA 证书的文件"
++
++#: rc.c:199
++msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)"
++msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t:TLSv1)"
++
++#: rc.c:202
++msgid "Enable cookie processing"
++msgstr "开启 Cookie 处理"
++
++#: rc.c:203
++msgid "Print a message when receiving a cookie"
++msgstr "在接收一个 Cookie 时显示一个消息"
++
++#: rc.c:204
++msgid "Accept cookies"
++msgstr "接受 Cookies"
++
++#: rc.c:205
++msgid "Action to be taken on invalid cookie"
++msgstr "对无效 Cookies 进行的操作"
++
++#: rc.c:206
++msgid "Domains to reject cookies from"
++msgstr "拒绝如下域的 Cookies"
++
++#: rc.c:207
++msgid "Domains to accept cookies from"
++msgstr "接受如下域的 Cookies"
++
++#: rc.c:208
++msgid "Domains to avoid [wrong number of dots]"
++msgstr "避免访问的域 [错误的点数]"
++
++#: rc.c:210
++msgid "Number of redirections to follow"
++msgstr "跟随的重定向数量"
++
++#: rc.c:211
++msgid "Enable processing of meta-refresh tag"
++msgstr "开启 meta-refresh 标签处理"
++
++#: rc.c:214
++msgid "Enable Migemo (Roma-ji search)"
++msgstr "开启 Migemo (罗马字搜索)"
++
++#: rc.c:215
++msgid "Migemo command"
++msgstr "Migemo 命令"
++
++#: rc.c:219
++msgid "Display charset"
++msgstr "显示字符集"
++
++#: rc.c:220
++msgid "Default document charset"
++msgstr "默认文档字符集"
++
++#: rc.c:221
++msgid "Automatic charset detect when loading"
++msgstr "在载入时进行自动字符集探测"
++
++#: rc.c:222
++msgid "System charset"
++msgstr "系统字符集"
++
++#: rc.c:223
++msgid "System charset follows locale(LC_CTYPE)"
++msgstr "根据系统设置 (LC_CTYPE) 选定系统字符集"
++
++#: rc.c:224
++msgid "Output halfdump with display charset"
++msgstr "使用显示字符集输出 halfdump"
++
++#: rc.c:225
++msgid "Use multi column characters"
++msgstr "使用多列字符"
++
++#: rc.c:226
++msgid "Use combining characters"
++msgstr "使用合并字符"
++
++#: rc.c:227
++msgid "Use double width for some Unicode characters"
++msgstr "使 Unicode 字符使用双重宽度"
++
++#: rc.c:228
++msgid "Use Unicode language tags"
++msgstr "使用 Unicode 语言标签"
++
++#: rc.c:229
++msgid "Charset conversion using Unicode map"
++msgstr "使用 Unicode 映射进行字符集转换"
++
++#: rc.c:230
++msgid "Charset conversion when loading"
++msgstr "在载入时进行字符集转换"
++
++#: rc.c:231
++msgid "Adjust search string for document charset"
++msgstr "调整文档字符集的搜索字串"
++
++#: rc.c:232
++msgid "Fix character width when conversion"
++msgstr "在转换时固定字符宽度"
++
++#: rc.c:233
++msgid "Use GB 12345 Unicode map instead of GB 2312's"
++msgstr "使用 GB 12345 Unicode 映射而非 GB 2312"
++
++#: rc.c:234
++msgid "Use JIS X 0201 Roman for ISO-2022-JP"
++msgstr "使用 JIS X 0201 罗马字母于 ISO-2022-JP"
++
++#: rc.c:235
++msgid "Use JIS C 6226:1978 for ISO-2022-JP"
++msgstr "使用 JIS C 6226:1978 于 ISO-2022-JP"
++
++#: rc.c:236
++msgid "Use JIS X 0201 Katakana"
++msgstr "使用 JIS X 0201 片假名"
++
++#: rc.c:237
++msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
++msgstr "使用 JIS X 0212:1990 (补充汉字)"
++
++#: rc.c:238
++msgid "Use JIS X 0213:2000 (2000JIS)"
++msgstr "使用 JIS X 0213:2000 (2000JIS)"
++
++#: rc.c:239
++msgid "Strict ISO-2022-JP/KR/CN"
++msgstr "严格 ISO-2022-JP/KR/CN"
++
++#: rc.c:240
++msgid "Treat 4 bytes char. of GB18030 as Unicode"
++msgstr "视 GB18030 编码的 4 字节字符为 Unicode"
++
++#: rc.c:241
++msgid "Simple Preserve space"
++msgstr "简单的保留空间"
++
++#: rc.c:244
++msgid "keymap file"
++msgstr "键盘映射文件"
++
++#: rc.c:261
++msgid "black"
++msgstr "黑色"
++
++#: rc.c:262
++msgid "red"
++msgstr "红色"
++
++#: rc.c:263
++msgid "green"
++msgstr "绿色"
++
++#: rc.c:264
++msgid "yellow"
++msgstr "黄色"
++
++#: rc.c:265
++msgid "blue"
++msgstr "蓝色"
++
++#: rc.c:266
++msgid "magenta"
++msgstr "品红"
++
++#: rc.c:267
++msgid "cyan"
++msgstr "青色"
++
++#: rc.c:268
++msgid "white"
++msgstr "白色"
++
++#: rc.c:269
++msgid "terminal"
++msgstr "终端"
++
++#: rc.c:288
++msgid "none"
++msgstr "无"
++
++#: rc.c:289
++msgid "current URL"
++msgstr "当前 URL"
++
++#: rc.c:290
++msgid "link URL"
++msgstr "链接 URL"
++
++#: rc.c:295
++msgid "simple"
++msgstr "简单"
++
++#: rc.c:296
++msgid "use tag"
++msgstr "使用标签"
++
++#: rc.c:297
++msgid "fontify"
++msgstr ""
++
++#: rc.c:303
++msgid "A:relative to screen height"
++msgstr "A:相对于屏幕高度"
++
++#: rc.c:304
++msgid "B:fixed speed"
++msgstr "B:固定速度"
++
++#: rc.c:311
++msgid "unspecified"
++msgstr "未指定"
++
++#: rc.c:312
++msgid "inet inet6"
++msgstr ""
++
++#: rc.c:313
++msgid "inet6 inet"
++msgstr ""
++
++#: rc.c:314
++msgid "inet only"
++msgstr "仅 inet"
++
++#: rc.c:315
++msgid "inet6 only"
++msgstr "仅 inet6"
++
++#: rc.c:322
++msgid "discard"
++msgstr "丢弃"
++
++#: rc.c:324
++msgid "accept"
++msgstr "接受"
++
++#: rc.c:326
++msgid "ask"
++msgstr "询问"
++
++#: rc.c:333
++msgid "use internal mailer instead"
++msgstr "使用内建邮件发送器"
++
++#: rc.c:335
++msgid "ignore options and use only the address"
++msgstr "忽略选项而只使用地址"
++
++#: rc.c:336
++msgid "use full mailto URL"
++msgstr "使用整个 mailto URL"
++
++#: rc.c:345
++msgid "OFF"
++msgstr "关"
++
++#: rc.c:346
++msgid "Only ISO 2022"
++msgstr "仅 ISO 2022"
++
++#: rc.c:347
++msgid "ON"
++msgstr "开"
++
++#: rc.c:353
++msgid "ASCII"
++msgstr "ASCII"
++
++#: rc.c:354
++msgid "charset specific"
++msgstr "字符集特定"
++
++#: rc.c:355
++msgid "DEC special graphics"
++msgstr "DEC 特殊图像"
++
++#: rc.c:722
++msgid "Display Settings"
++msgstr "显示设置"
++
++#: rc.c:724
++msgid "Color Settings"
++msgstr "颜色设置"
++
++#: rc.c:726
++msgid "Miscellaneous Settings"
++msgstr "杂项设置"
++
++#: rc.c:727
++msgid "Directory Settings"
++msgstr "目录设置"
++
++#: rc.c:728
++msgid "External Program Settings"
++msgstr "外部程序设置"
++
++#: rc.c:729
++msgid "Network Settings"
++msgstr "网络设置"
++
++#: rc.c:730
++msgid "Proxy Settings"
++msgstr "代理设置"
++
++#: rc.c:732
++msgid "SSL Settings"
++msgstr "SSL 设置"
++
++#: rc.c:735
++msgid "Cookie Settings"
++msgstr "Cookie 设置"
++
++#: rc.c:738
++msgid "Charset Settings"
++msgstr "字符集设置"
++
++#. TRANSLATORS:
++#. * AcceptLang default: this is used in Accept-Language: HTTP request
++#. * header. For example, ja.po should translate it as
++#. * "ja;q=1.0, en;q=0.5" like that.
++#.
++#: rc.c:1220
++msgid "en;q=1.0"
++msgstr "zh-CN;q=1.0, zh-Hans;q=0.9, zh;q=0.8, en;q=0.6"
+diff --git a/po/zh_TW.po b/po/zh_TW.po
+new file mode 100644
+index 0000000..40cae87
+--- /dev/null
++++ b/po/zh_TW.po
+@@ -0,0 +1,892 @@
++# zh_TW translation for w3m, machine converted
++# Copyright (C) YEAR THE w3m'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the w3m package.
++# Junde Yi <lmy441900@gmail.com>, 2014.
++# Mingcong Bai <jeffbai@aosc.xyz>, 2014.
++# liushuyu <liushuyu_011@126.com>, 2014.
++# Xingda Zheng <icenowy@outlook.com>, 2014.
++# Mingye Wang (Arthur2e5) <arthur200126@gmail.com>, 2014, 2015.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: w3m 0.5.3\n"
++"Report-Msgid-Bugs-To: satodai@w3m.jp\n"
++"POT-Creation-Date: 2015-04-29 16:18+0900\n"
++"PO-Revision-Date: 2015-11-10 18:58-0500\n"
++"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
++"Language-Team: AOSC zh_TW fuzzy <aosc@members.fsf.org>\n"
++"Language: zh_TW\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 1.8.6\n"
++"Plural-Forms: nplurals=1; plural=0;\n"
++
++#: menu.c:267
++msgid " Back         (b) "
++msgstr " 後退         (b) "
++
++#: menu.c:268
++msgid " Select Buffer(s) "
++msgstr " 選擇緩衝區       "
++
++#: menu.c:270
++msgid " Select Tab   (t) "
++msgstr " 選擇標籤     (t) "
++
++#: menu.c:272
++msgid " View Source  (v) "
++msgstr " 檢視源碼     (v) "
++
++#: menu.c:273
++msgid " Edit Source  (e) "
++msgstr " 修改源碼     (e) "
++
++#: menu.c:274
++msgid " Save Source  (S) "
++msgstr " 儲存源碼     (S) "
++
++#: menu.c:275
++msgid " Reload       (r) "
++msgstr " 重新載入     (r) "
++
++#: menu.c:276 menu.c:283 menu.c:287
++msgid " ---------------- "
++msgstr " ---------------- "
++
++#: menu.c:277
++msgid " Go Link      (a) "
++msgstr " 轉到連結     (a) "
++
++#: menu.c:278
++msgid "   on New Tab (n) "
++msgstr "   在新標籤   (n) "
++
++#: menu.c:279
++msgid " Save Link    (A) "
++msgstr " 儲存連結     (A) "
++
++#: menu.c:280
++msgid " View Image   (i) "
++msgstr " 檢視圖片     (i) "
++
++#: menu.c:281
++msgid " Save Image   (I) "
++msgstr " 儲存圖片     (I) "
++
++#: menu.c:282
++msgid " View Frame   (f) "
++msgstr " 檢視框架     (f) "
++
++#: menu.c:284
++msgid " Bookmark     (B) "
++msgstr " 書籤         (B) "
++
++#: menu.c:285
++msgid " Help         (h) "
++msgstr " 幫助         (h) "
++
++#: menu.c:286
++msgid " Option       (o) "
++msgstr " 選項         (o) "
++
++#: menu.c:288
++msgid " Quit         (q) "
++msgstr " 退出         (q) "
++
++#: rc.c:62
++msgid "External Viewer Setup"
++msgstr "外部檢視器設定"
++
++#: rc.c:63
++msgid "Tab width in characters"
++msgstr "文字中的 TAB 寬度"
++
++#: rc.c:64
++msgid "Indent for HTML rendering"
++msgstr "用於 HTML 渲染"
++
++#: rc.c:65
++msgid "Number of pixels per character (4.0...32.0)"
++msgstr "每字型大小的畫素值 (4.0...32.0)"
++
++#: rc.c:66
++msgid "Number of pixels per line (4.0...64.0)"
++msgstr "每行的畫素數 (4.0...64.0)"
++
++#: rc.c:67
++msgid "Number of remembered lines when used as a pager"
++msgstr "當作為分頁器使用時記憶的行數"
++
++#: rc.c:68
++msgid "Use URL history"
++msgstr "使用 URL 歷史記錄"
++
++#: rc.c:69
++msgid "Number of remembered URL"
++msgstr "記錄的 URL 數量"
++
++#: rc.c:70
++msgid "Save URL history"
++msgstr "儲存 URL 歷史"
++
++#: rc.c:71
++msgid "Render frames automatically"
++msgstr "自動渲染框架"
++
++#: rc.c:72
++msgid "Treat argument without scheme as URL"
++msgstr "將無格式的參數看作 URL"
++
++#: rc.c:73
++msgid "Use _self as default target"
++msgstr "將自身作為預設目標 (_S)"
++
++#: rc.c:74
++msgid "Open link on new tab if target is _blank or _new"
++msgstr "如果目標為空 (_b) 或新建 (_n) 在新標籤開啟頁面"
++
++#: rc.c:75
++msgid "Open download list panel on new tab"
++msgstr "開啟下載列表面板於新標籤"
++
++#: rc.c:76
++msgid "Display link URL automatically"
++msgstr "自動顯示連結 URL"
++
++#: rc.c:77
++msgid "Display link numbers"
++msgstr "顯示連結編號"
++
++#: rc.c:78
++msgid "Display decoded URL"
++msgstr "顯示解碼後的 URL"
++
++#: rc.c:79
++msgid "Display current line number"
++msgstr "顯示當前行數"
++
++#: rc.c:80
++msgid "Display inline images"
++msgstr "顯示內聯影象"
++
++#: rc.c:81
++msgid "Display pseudo-ALTs for inline images with no ALT or TITLE string"
++msgstr "為不帶有 ALT 或 TITLE 字串的內聯影象顯示偽 ALT"
++
++#: rc.c:83
++msgid "Load inline images automatically"
++msgstr "自動載入行內影象"
++
++#: rc.c:84
++msgid "Maximum processes for parallel image loading"
++msgstr "多執行緒影象載入的最大程序數"
++
++#: rc.c:85
++msgid "Use external image viewer"
++msgstr "使用外部圖片檢視器"
++
++#: rc.c:86
++msgid "Scale of image (%)"
++msgstr "影象比例尺 (%)"
++
++#: rc.c:87
++msgid "External command to display image"
++msgstr "用於顯示影象的外部命令"
++
++#: rc.c:88
++msgid "Use link list of image map"
++msgstr "使用影象對映的連結列表"
++
++#: rc.c:90
++msgid "Display file names in multi-column format"
++msgstr "以多列格式顯示檔名"
++
++#: rc.c:91
++msgid "Use ASCII equivalents to display entities"
++msgstr "使用對應的 ASCII 編碼來顯示實體 "
++
++#: rc.c:92
++msgid "Character type for border of table and menu"
++msgstr "表格和選單邊框的字元類型"
++
++#: rc.c:93
++msgid "Display table borders, ignore value of BORDER"
++msgstr "顯示錶格邊框，忽略 BORDER 數值"
++
++#: rc.c:94
++msgid "Fold lines in TEXTAREA"
++msgstr "在文字區 (TEXTAREA) 中摺疊行"
++
++#: rc.c:95
++msgid "Display INS, DEL, S and STRIKE element"
++msgstr "顯示 INS, DEL, S 及 STRIKE 元素"
++
++#: rc.c:96
++msgid "Display with color"
++msgstr "使用帶顏色的顯示"
++
++#: rc.c:97
++msgid "Color of normal character"
++msgstr "一般文字顏色"
++
++#: rc.c:98
++msgid "Color of anchor"
++msgstr "連結文字顏色"
++
++#: rc.c:99
++msgid "Color of image link"
++msgstr "圖片連結顏色"
++
++#: rc.c:100
++msgid "Color of form"
++msgstr "表格顏色"
++
++#: rc.c:101
++msgid "Enable coloring of active link"
++msgstr "為活動連結開啟上色"
++
++#: rc.c:102
++msgid "Color of currently active link"
++msgstr "當前活動連結的顏色"
++
++#: rc.c:103
++msgid "Use visited link color"
++msgstr "為訪問過的連結上色"
++
++#: rc.c:104
++msgid "Color of visited link"
++msgstr "已訪問連結顏色"
++
++#: rc.c:105
++msgid "Color of background"
++msgstr "背景色"
++
++#: rc.c:106
++msgid "Color of mark"
++msgstr "標記顏色"
++
++#: rc.c:107
++msgid "Use proxy"
++msgstr "使用代理伺服器"
++
++#: rc.c:108
++msgid "URL of HTTP proxy host"
++msgstr "HTTP 代理主機地址"
++
++#: rc.c:110
++msgid "URL of HTTPS proxy host"
++msgstr "HTTPS 代理主機地址"
++
++#: rc.c:113
++msgid "URL of GOPHER proxy host"
++msgstr "GOPHER 代理主機地址"
++
++#: rc.c:115
++msgid "URL of FTP proxy host"
++msgstr "FTP 代理主機地址"
++
++#: rc.c:116
++msgid "Domains to be accessed directly (no proxy)"
++msgstr "直接訪問而不是用代理伺服器訪問的 URL"
++
++#: rc.c:117
++msgid "Check noproxy by network address"
++msgstr "根據網路地址檢查 noproxy"
++
++#: rc.c:118
++msgid "Disable cache"
++msgstr "禁用快取"
++
++#: rc.c:120
++msgid "News server"
++msgstr "新聞伺服器"
++
++#: rc.c:121
++msgid "Mode of news server"
++msgstr "新聞伺服器模式"
++
++#: rc.c:122
++msgid "Number of news messages"
++msgstr "新聞訊息的數量"
++
++#: rc.c:124
++msgid "Order of name resolution"
++msgstr "名稱解析順序"
++
++#: rc.c:125
++msgid "Directory corresponding to / (document root)"
++msgstr "對應 / 的目錄 (文件根目錄)"
++
++#: rc.c:126
++msgid "Directory corresponding to /~user"
++msgstr "對應 /~user 的目錄"
++
++#: rc.c:127
++msgid "Directory corresponding to /cgi-bin"
++msgstr "對應 /cgi-bin 的目錄"
++
++#: rc.c:128
++msgid "Confirm when quitting with q"
++msgstr "使用 q 鍵退出時請求確認"
++
++#: rc.c:129
++msgid "Close tab if buffer is last when back"
++msgstr "在返回時緩衝區還是以前狀態就關閉標籤頁"
++
++#: rc.c:131
++msgid "Enable mark operations"
++msgstr "啟用標記操作"
++
++#: rc.c:133
++msgid "Enable Emacs-style line editing"
++msgstr "啟用 Emacs 風格的行編輯"
++
++#: rc.c:134
++msgid "Enable vi-like numeric prefix"
++msgstr "啟動 vi 式的數字跳轉"
++
++#: rc.c:135
++msgid "Move cursor to top line when going to label"
++msgstr "當移動到標籤時將游標移到最頂行"
++
++#: rc.c:136
++msgid "Move cursor to top line when moving to next page"
++msgstr "當轉到下一頁時將游標移到最頂行"
++
++#: rc.c:137
++msgid "Fold lines of plain text file"
++msgstr "對純文字檔案實行行摺疊"
++
++#: rc.c:138
++msgid "Show line numbers"
++msgstr "顯示行號"
++
++#: rc.c:139
++msgid "Show search string"
++msgstr "顯示搜尋字元串"
++
++#: rc.c:140
++msgid "List of mime.types files"
++msgstr "mime.type 檔案列表"
++
++#: rc.c:141
++msgid "List of mailcap files"
++msgstr "mailcap 檔案列表"
++
++#: rc.c:142
++msgid "List of urimethodmap files"
++msgstr "urlmethodmap 檔案列表"
++
++#: rc.c:143
++msgid "Editor"
++msgstr "編輯器"
++
++#: rc.c:144
++msgid "Mailer"
++msgstr "傳送者"
++
++#: rc.c:145
++msgid "How to call Mailer for mailto URLs with options"
++msgstr "啟動 mailto 地址時呼叫電子郵件程式的方式和參數"
++
++#: rc.c:146
++msgid "External Browser"
++msgstr "外部瀏覽器"
++
++#: rc.c:147
++msgid "Second External Browser"
++msgstr "第二外部瀏覽器 "
++
++#: rc.c:148
++msgid "Third External Browser"
++msgstr "第三外部瀏覽器"
++
++#: rc.c:149
++msgid "Disable secret file security check"
++msgstr "關閉祕密檔案安全檢查"
++
++#: rc.c:150
++msgid "Password file"
++msgstr "密碼檔案"
++
++#: rc.c:151
++msgid "File for setting form on loading"
++msgstr "設定視窗載入時的檔案"
++
++#: rc.c:152
++msgid "File for preferences for each site"
++msgstr "各個站點的首選項檔案"
++
++#: rc.c:153
++msgid "Password for anonymous FTP (your mail address)"
++msgstr "匿名FTP密碼（您的郵箱地址）"
++
++#: rc.c:154
++msgid "Generate domain part of password for FTP"
++msgstr "為 FTP 生成密碼的域部分"
++
++#: rc.c:155
++msgid "User-Agent identification string"
++msgstr "User-Agent 串"
++
++#: rc.c:156
++msgid "Accept-Encoding header"
++msgstr "接受的編碼 (Accept-Encoding) 報頭"
++
++#: rc.c:157
++msgid "Accept header"
++msgstr "接受 (Accept) 報頭"
++
++#: rc.c:158
++msgid "Accept-Language header"
++msgstr "接受的語言 (Accept-Language) 報頭"
++
++#: rc.c:159
++msgid "Treat URL-like strings as links in all pages"
++msgstr "將所有頁面中類似於 URL 的字元串當做連結"
++
++#: rc.c:160
++msgid "Wrap search"
++msgstr "包裝搜尋結果"
++
++#: rc.c:161
++msgid "Display unseen objects (e.g. bgimage tag)"
++msgstr "顯示看不到的物件 （例如，bdimage標籤）"
++
++#: rc.c:162
++msgid "Uncompress compressed data automatically when downloading"
++msgstr "在下載時自動解壓被壓縮的資料"
++
++#: rc.c:164
++msgid "Run external viewer in a separate session"
++msgstr "在另一個會話中執行外部檢視器"
++
++#: rc.c:166
++msgid "Run external viewer in the background"
++msgstr "在後臺執行外部檢視器"
++
++#: rc.c:168
++msgid "Use external program for directory listing"
++msgstr "使用外部程式列出目錄"
++
++#: rc.c:169
++msgid "URL of directory listing command"
++msgstr "目錄列表命令的網址"
++
++#: rc.c:171
++msgid "Enable dictionary lookup through CGI"
++msgstr "啟用基於 CGI 的詞典查詢"
++
++#: rc.c:172
++msgid "URL of dictionary lookup command"
++msgstr "字典查詢命令的網址"
++
++#: rc.c:174
++msgid "Display link name for images lacking ALT"
++msgstr "對缺少 ALT 的圖片顯示連結名稱"
++
++#: rc.c:175
++msgid "Index file for directories"
++msgstr "目錄的索引檔案"
++
++#: rc.c:176
++msgid "Prepend http:// to URL automatically"
++msgstr "自動在 URL 前加入 http://"
++
++#: rc.c:177
++msgid "Default value for open-URL command"
++msgstr "開啟網址命令的預設值"
++
++#: rc.c:178
++msgid "Decode Content-Transfer-Encoding when saving"
++msgstr "儲存時對內容傳輸編碼資訊 (Content-Transfer-Encoding) 進行解碼"
++
++#: rc.c:179
++msgid "Preserve timestamp when saving"
++msgstr "在儲存時保留時間戳"
++
++#: rc.c:181
++msgid "Enable mouse"
++msgstr "啟用滑鼠"
++
++#: rc.c:182
++msgid "Scroll in reverse direction of mouse drag"
++msgstr "向滑鼠拖動的反方向滾動"
++
++#: rc.c:183
++msgid "Behavior of wheel scroll speed"
++msgstr "滾輪滾動速度行為"
++
++#: rc.c:184
++msgid "(A only)Scroll by # (%) of screen"
++msgstr "(僅 A) 每次滾動 # (%) 的螢幕高度"
++
++#: rc.c:185
++msgid "(B only)Scroll by # lines"
++msgstr "(僅 B) 每次滾動 # 行"
++
++#: rc.c:187
++msgid "Free memory of undisplayed buffers"
++msgstr "釋放未顯示快取的儲存"
++
++#: rc.c:188
++msgid "Suppress `Referer:' header"
++msgstr "禁止 'Referer:' 檔案頭"
++
++#: rc.c:189
++msgid "Search case-insensitively"
++msgstr "搜尋不區分大小寫"
++
++#: rc.c:190
++msgid "Use LESSOPEN"
++msgstr "使用 LESSOPEN"
++
++#: rc.c:193
++msgid "Perform SSL server verification"
++msgstr "進行 SSL 伺服器檢查"
++
++#: rc.c:194
++msgid "PEM encoded certificate file of client"
++msgstr "客戶端的 PEM 編碼證書檔案"
++
++#: rc.c:195
++msgid "PEM encoded private key file of client"
++msgstr "客戶端的 PEM 編碼私鑰檔案"
++
++#: rc.c:196
++msgid "Path to directory for PEM encoded certificates of CAs"
++msgstr "PEM 編碼 CA 證書目錄的路徑"
++
++#: rc.c:197
++msgid "File consisting of PEM encoded certificates of CAs"
++msgstr "包含 PEM 編碼 CA 證書的檔案"
++
++#: rc.c:199
++msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)"
++msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t:TLSv1)"
++
++#: rc.c:202
++msgid "Enable cookie processing"
++msgstr "開啟 Cookie 處理"
++
++#: rc.c:203
++msgid "Print a message when receiving a cookie"
++msgstr "在接收一個 Cookie 時顯示一個訊息"
++
++#: rc.c:204
++msgid "Accept cookies"
++msgstr "接受 Cookies"
++
++#: rc.c:205
++msgid "Action to be taken on invalid cookie"
++msgstr "對無效 Cookies 進行的操作"
++
++#: rc.c:206
++msgid "Domains to reject cookies from"
++msgstr "拒絕如下域的 Cookies"
++
++#: rc.c:207
++msgid "Domains to accept cookies from"
++msgstr "接受如下域的 Cookies"
++
++#: rc.c:208
++msgid "Domains to avoid [wrong number of dots]"
++msgstr "避免訪問的域 [錯誤的點數]"
++
++#: rc.c:210
++msgid "Number of redirections to follow"
++msgstr "跟隨的重定向數量"
++
++#: rc.c:211
++msgid "Enable processing of meta-refresh tag"
++msgstr "開啟 meta-refresh 標籤處理"
++
++#: rc.c:214
++msgid "Enable Migemo (Roma-ji search)"
++msgstr "開啟 Migemo (羅馬字搜尋)"
++
++#: rc.c:215
++msgid "Migemo command"
++msgstr "Migemo 命令"
++
++#: rc.c:219
++msgid "Display charset"
++msgstr "顯示字符集"
++
++#: rc.c:220
++msgid "Default document charset"
++msgstr "預設文件字符集"
++
++#: rc.c:221
++msgid "Automatic charset detect when loading"
++msgstr "在載入時進行自動字符集探測"
++
++#: rc.c:222
++msgid "System charset"
++msgstr "系統字符集"
++
++#: rc.c:223
++msgid "System charset follows locale(LC_CTYPE)"
++msgstr "根據系統設定 (LC_CTYPE) 選定系統字符集"
++
++#: rc.c:224
++msgid "Output halfdump with display charset"
++msgstr "使用顯示字符集輸出 halfdump"
++
++#: rc.c:225
++msgid "Use multi column characters"
++msgstr "使用多列字元"
++
++#: rc.c:226
++msgid "Use combining characters"
++msgstr "使用合併字元"
++
++#: rc.c:227
++msgid "Use double width for some Unicode characters"
++msgstr "使 Unicode 字元使用雙重寬度"
++
++#: rc.c:228
++msgid "Use Unicode language tags"
++msgstr "使用 Unicode 語言標籤"
++
++#: rc.c:229
++msgid "Charset conversion using Unicode map"
++msgstr "使用 Unicode 對映進行字符集轉換"
++
++#: rc.c:230
++msgid "Charset conversion when loading"
++msgstr "在載入時進行字符集轉換"
++
++#: rc.c:231
++msgid "Adjust search string for document charset"
++msgstr "調整文件字符集的搜尋字串"
++
++#: rc.c:232
++msgid "Fix character width when conversion"
++msgstr "在轉換時固定字元寬度"
++
++#: rc.c:233
++msgid "Use GB 12345 Unicode map instead of GB 2312's"
++msgstr "使用 GB 12345 Unicode 對映而非 GB 2312"
++
++#: rc.c:234
++msgid "Use JIS X 0201 Roman for ISO-2022-JP"
++msgstr "使用 JIS X 0201 羅馬字母於 ISO-2022-JP"
++
++#: rc.c:235
++msgid "Use JIS C 6226:1978 for ISO-2022-JP"
++msgstr "使用 JIS C 6226:1978 於 ISO-2022-JP"
++
++#: rc.c:236
++msgid "Use JIS X 0201 Katakana"
++msgstr "使用 JIS X 0201 片假名"
++
++#: rc.c:237
++msgid "Use JIS X 0212:1990 (Supplemental Kanji)"
++msgstr "使用 JIS X 0212:1990 (補充漢字)"
++
++#: rc.c:238
++msgid "Use JIS X 0213:2000 (2000JIS)"
++msgstr "使用 JIS X 0213:2000 (2000JIS)"
++
++#: rc.c:239
++msgid "Strict ISO-2022-JP/KR/CN"
++msgstr "嚴格 ISO-2022-JP/KR/CN"
++
++#: rc.c:240
++msgid "Treat 4 bytes char. of GB18030 as Unicode"
++msgstr "視 GB18030 編碼的 4 位元組字元為 Unicode"
++
++#: rc.c:241
++msgid "Simple Preserve space"
++msgstr "簡單的保留空間"
++
++#: rc.c:244
++msgid "keymap file"
++msgstr "鍵盤對映檔案"
++
++#: rc.c:261
++msgid "black"
++msgstr "黑色"
++
++#: rc.c:262
++msgid "red"
++msgstr "紅色"
++
++#: rc.c:263
++msgid "green"
++msgstr "綠色"
++
++#: rc.c:264
++msgid "yellow"
++msgstr "黃色"
++
++#: rc.c:265
++msgid "blue"
++msgstr "藍色"
++
++#: rc.c:266
++msgid "magenta"
++msgstr "品紅"
++
++#: rc.c:267
++msgid "cyan"
++msgstr "青色"
++
++#: rc.c:268
++msgid "white"
++msgstr "白色"
++
++#: rc.c:269
++msgid "terminal"
++msgstr "終端"
++
++#: rc.c:288
++msgid "none"
++msgstr "無"
++
++#: rc.c:289
++msgid "current URL"
++msgstr "當前 URL"
++
++#: rc.c:290
++msgid "link URL"
++msgstr "連結 URL"
++
++#: rc.c:295
++msgid "simple"
++msgstr "簡單"
++
++#: rc.c:296
++msgid "use tag"
++msgstr "使用標籤"
++
++#: rc.c:297
++msgid "fontify"
++msgstr ""
++
++#: rc.c:303
++msgid "A:relative to screen height"
++msgstr "A:相對於螢幕高度"
++
++#: rc.c:304
++msgid "B:fixed speed"
++msgstr "B:固定速度"
++
++#: rc.c:311
++msgid "unspecified"
++msgstr "未指定"
++
++#: rc.c:312
++msgid "inet inet6"
++msgstr ""
++
++#: rc.c:313
++msgid "inet6 inet"
++msgstr ""
++
++#: rc.c:314
++msgid "inet only"
++msgstr "僅 inet"
++
++#: rc.c:315
++msgid "inet6 only"
++msgstr "僅 inet6"
++
++#: rc.c:322
++msgid "discard"
++msgstr "丟棄"
++
++#: rc.c:324
++msgid "accept"
++msgstr "接受"
++
++#: rc.c:326
++msgid "ask"
++msgstr "詢問"
++
++#: rc.c:333
++msgid "use internal mailer instead"
++msgstr "使用內建郵件傳送器"
++
++#: rc.c:335
++msgid "ignore options and use only the address"
++msgstr "忽略選項而只使用地址"
++
++#: rc.c:336
++msgid "use full mailto URL"
++msgstr "使用整個 mailto URL"
++
++#: rc.c:345
++msgid "OFF"
++msgstr "關"
++
++#: rc.c:346
++msgid "Only ISO 2022"
++msgstr "僅 ISO 2022"
++
++#: rc.c:347
++msgid "ON"
++msgstr "開"
++
++#: rc.c:353
++msgid "ASCII"
++msgstr "ASCII"
++
++#: rc.c:354
++msgid "charset specific"
++msgstr "字符集特定"
++
++#: rc.c:355
++msgid "DEC special graphics"
++msgstr "DEC 特殊影象"
++
++#: rc.c:722
++msgid "Display Settings"
++msgstr "顯示設定"
++
++#: rc.c:724
++msgid "Color Settings"
++msgstr "顏色設定"
++
++#: rc.c:726
++msgid "Miscellaneous Settings"
++msgstr "雜項設定"
++
++#: rc.c:727
++msgid "Directory Settings"
++msgstr "目錄設定"
++
++#: rc.c:728
++msgid "External Program Settings"
++msgstr "外部程式設定"
++
++#: rc.c:729
++msgid "Network Settings"
++msgstr "網路設定"
++
++#: rc.c:730
++msgid "Proxy Settings"
++msgstr "代理設定"
++
++#: rc.c:732
++msgid "SSL Settings"
++msgstr "SSL 設定"
++
++#: rc.c:735
++msgid "Cookie Settings"
++msgstr "Cookie 設定"
++
++#: rc.c:738
++msgid "Charset Settings"
++msgstr "字符集設定"
++
++#. TRANSLATORS:
++#. * AcceptLang default: this is used in Accept-Language: HTTP request
++#. * header. For example, ja.po should translate it as
++#. * "ja;q=1.0, en;q=0.5" like that.
++#.
++#: rc.c:1220
++msgid "en;q=1.0"
++msgstr "zh-TW;q=1.0, zh-Hants;q=0.9, zh;q=0.8, en;q=0.6"
 diff --git a/proto.h b/proto.h
 index f8a7345..0d8beb5 100644
 --- a/proto.h
@@ -15102,7 +17013,7 @@ index d3ae5a9..fb323f5 100644
  	goto error;
      }
 diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c
-index f5be4a8..bc8d0aa 100644
+index f5be4a8..7eafa76 100644
 --- a/w3mimg/x11/x11_w3mimg.c
 +++ b/w3mimg/x11/x11_w3mimg.c
 @@ -14,7 +14,7 @@
@@ -15147,7 +17058,49 @@ index f5be4a8..bc8d0aa 100644
  	xi->imageGC = XCreateGC(xi->display, xi->parent, 0, NULL);
  	if (!xi->imageGC)
  	    return 0;
-@@ -653,9 +658,11 @@ x11_get_image_size(w3mimg_op * self, W3MImage * img, char *fname, int *w,
+@@ -214,9 +219,12 @@ x11_set_background(w3mimg_op * self, char *background)
+ 	Pixmap p;
+ 	GC gc;
+ 	XImage *i;
++	XWindowAttributes attr;
++
++	XGetWindowAttributes(xi->display, xi->window, &attr);
+ 
+ 	p = XCreatePixmap(xi->display, xi->window, 1, 1,
+-			  DefaultDepth(xi->display, 0));
++			  attr.depth);
+ 	gc = XCreateGC(xi->display, xi->window, 0, NULL);
+ 	if (!p || !gc)
+ 	    exit(1);		/* XXX */
+@@ -328,6 +336,7 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
+     ImlibImage *im;
+ #elif defined(USE_IMLIB2)
+     Imlib_Image im;
++    XWindowAttributes attr;
+ #elif defined(USE_GDKPIXBUF)
+     GdkPixbufAnimation *animation;
+     int j, iw, ih, n, frame_num, delay = -1, max_anim;
+@@ -374,15 +383,16 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
+ 	w = imlib_image_get_width();
+     if (h <= 0)
+ 	h = imlib_image_get_height();
++    XGetWindowAttributes(xi->display, xi->window, &attr);
+     img->pixmap = (void *)XCreatePixmap(xi->display, xi->parent, w, h,
+-					DefaultDepth(xi->display, 0));
++					attr.depth);
+     if (!img->pixmap)
+ 	return 0;
+     XSetForeground(xi->display, xi->imageGC, xi->background_pixel);
+     XFillRectangle(xi->display, (Pixmap) img->pixmap, xi->imageGC, 0, 0, w, h);
+     imlib_context_set_display(xi->display);
+-    imlib_context_set_visual(DefaultVisual(xi->display, 0));
+-    imlib_context_set_colormap(DefaultColormap(xi->display, 0));
++    imlib_context_set_visual(attr.visual);
++    imlib_context_set_colormap(attr.colormap);
+     imlib_context_set_drawable((Drawable) img->pixmap);
+     imlib_render_image_on_drawable_at_size(0, 0, w, h);
+     imlib_free_image();
+@@ -653,9 +663,11 @@ x11_get_image_size(w3mimg_op * self, W3MImage * img, char *fname, int *w,
  
      if (self == NULL)
  	return 0;
@@ -15159,7 +17112,7 @@ index f5be4a8..bc8d0aa 100644
  
  #if defined(USE_IMLIB)
      im = Imlib_load_image(xi->id, fname);
-@@ -755,6 +762,9 @@ w3mimg_x11open()
+@@ -755,6 +767,9 @@ w3mimg_x11open()
  	return NULL;
      memset(wop, 0, sizeof(w3mimg_op));
  
@@ -15169,7 +17122,7 @@ index f5be4a8..bc8d0aa 100644
      xi = (struct x11_info *)malloc(sizeof(struct x11_info));
      if (xi == NULL)
  	goto error;
-@@ -807,6 +817,7 @@ w3mimg_x11open()
+@@ -807,6 +822,7 @@ w3mimg_x11open()
  
      wop->priv = xi;