Merge with master

doc/Makefile

@@ -92,9 +92,9 @@ install-doc: all-docs update-man install
 
 update-man: man
 	@$(if $(MAN_DOCS), \
-		$(call ncmd,installdata,elinks.1,man/man1/elinks.1.in); \
+		$(call ncmd,installdata,elinks.1,$(srcdir)man/man1/elinks.1.in); \
-		$(call ncmd,installdata,elinkskeys.5,man/man5/); \
+		$(call ncmd,installdata,elinkskeys.5,$(srcdir)man/man5/); \
-		$(call ncmd,installdata,elinks.conf.5,man/man5/))
+		$(call ncmd,installdata,elinks.conf.5,$(srcdir)man/man5/))
 
 clean-local:
 	@$(RM) -r api $(TXT_DOCS_NOINSTALL) $(MAN_DOCS) $(HTML_DOCS) $(HTML_DOCS_NOINSTALL) $(PDF_DOCS) *.tmp *.xml
@@ -165,11 +165,24 @@ asciidoc_dep = sed -n 's/[{]builddir}//g;s@include::\(.*\)\[.*@$@: $< \1@p' < $<
 -include .deps/*.asciidoc
 
 # Do a little post-processing of man pages. Inserting title headers and date.
+# - Change SYNOPSIS to OVERVIEW in elinkskeys.5 (but not in elinks.1).
+#   SYNOPSIS isn't supposed to contain running text.  But AsciiDoc
+#   7.1.2 complains "ERROR: elinkskeys.5.txt: line 10: second section
+#   must be named SYNOPSIS" so we can't change this in  elinkskeys.5.txt.
+# - Write backslash as "\e" not "\\", but be careful not to replace
+#   double-backslashes that actually mean something else.  This is
+#   apparently a bug in db2man, which xmlto runs.
+# Run all the hacks together in one sed command so that we get the right
+# exit code if there is an error somewhere in the middle.
 MAN_DATE = $(shell date -I)
 man_desc = `sed -n 's/:Description:\s*\(.*\)/\1/p' < $(srcdir)$(subst .xml,.txt,$(<F))`
-man_hack = sed "s/^\(\.TH \"ELINKS[^\"]*\" [0-9] \).*/\1\"$(1)\" \"$(MAN_DATE)\" \"$(1)\"/" < $@ | \
+man_hack = sed -e "s/^\(\.TH \"ELINKS[^\"]*\" [0-9] \).*/\1\"$(1)\" \"$(MAN_DATE)\" \"$(1)\"/" \
-	   sed "s/@squote@/\\\\'/g" > $@.tmp && mv $@.tmp $@
+	       -e 's/\\\\\\\\ /\\e\\e /' \
-
+	       -e 's/\(\\fI\)\\\\\(\\fR\)/\1\\e\2/' \
+	       -e "s/@squote@/\\\\'/g" \
+	       $(if $(findstring elinkskeys.5,$(<F)),-e 's/^\.SH "SYNOPSIS"$$/.SH "OVERVIEW"/') \
+	       $(2) < $@ > $@.tmp \
+	   && mv $@.tmp $@
 
 #############################################################################
 # Build recipies

doc/man/man1/elinks.1.in

@@ -17,7 +17,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "ELINKS" 1 "The Elinks text-browser" "2006-06-12" "The Elinks text-browser"
+.TH "ELINKS" 1 "The Elinks text-browser" "2007-01-06" "The Elinks text-browser"
 .SH NAME
 elinks \- lynx-like alternative character mode WWW browser
 .SH "SYNOPSIS"

doc/man/man5/elinks.conf.5

@@ -17,7 +17,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "ELINKS.CONF" 5 "ELinks configuration file" "2006-06-12" "ELinks configuration file"
+.TH "ELINKS.CONF" 5 "ELinks configuration file" "2007-01-06" "ELinks configuration file"
 .SH NAME
 elinks.conf \- ELinks configuration file
 .SH "SYNOPSIS"
@@ -77,7 +77,7 @@ File format for bookmarks (affects both reading and saving):
 0: is the default native \fIELinks\fR format
 .TP
 \(bu
-1: is XBEL universal XML bookmarks format (NO NATIONAL CHARS SUPPORT!)
+1: is XBEL universal XML bookmarks format (\fIELinks\fR bug 153: NO NATIONAL CHARS SUPPORT!)
 .LP
 .RE
 .IP
@@ -194,11 +194,11 @@ Number of tries to establish a connection\&. Zero means try forever\&.
 
 .TP
 connection\&.try_ipv4 [0|1] (default: 1)
-Whether to try to connect to a host over IPv4\&. Note that if connection\&.try_ipv6 is enabled too, it takes precedence\&. And better do not touch this at all unless you are sure what are you doing\&. Note that you can also force a given protocol to be used on a per\-connection basis by using an URL in the style of i\&.e\&. http4://elinks\&.or\&.cz/\&.
+Whether to try to connect to a host over IPv4\&. Note that if connection\&.try_ipv6 is enabled too, it takes precedence\&. And better do not touch this at all unless you are sure what are you doing\&. Note that you can also force a given protocol to be used on a per\-connection basis by using an URL in the style of e\&.g\&. http4://elinks\&.cz/\&.
 
 .TP
 connection\&.try_ipv6 [0|1] (default: 1)
-Whether to try to connect to a host over IPv6\&. Note that you can also force a given protocol to be used on a per\-connection basis by using an URL in the style of i\&.e\&. http6://elinks\&.or\&.cz/\&.
+Whether to try to connect to a host over IPv6\&. Note that you can also force a given protocol to be used on a per\-connection basis by using an URL in the style of e\&.g\&. http6://elinks\&.cz/\&.
 
 .TP
 connection\&.unrestartable_receive_timeout <num> (default: 600)
@@ -634,6 +634,10 @@ Cache even redirects sent by server (usually thru HTTP by a 302 HTTP code and a
 document\&.cache\&.ignore_cache_control [0|1] (default: 1)
 Ignore Cache\-Control and Pragma server headers\&. When set, the document is cached even with 'Cache\-Control: no\-cache'\&.
 
+.TP
+document\&.cache\&.revalidation_interval <num> (default: \-1)
+Period that a cache entry is considered to be up\-to\-date\&. When a document is loaded and this interval has elapsed since the document was initially loaded or most recently revalidated with the server, the server will be checked in case there is a more up\-to\-date version of the document\&.
+
 .TP
 document\&.codepage
 Charset options\&.
@@ -778,7 +782,7 @@ Codepage used in dump output\&. 'System' stands for a codepage determined by a s
 
 .TP
 document\&.dump\&.color_mode <num> (default: \-1)
-Color mode for dumps:
+Color mode for dumps\&. Some modes may have been disabled at compile time\&. The Setup \-> Terminal options dialog lists the modes supported by this executable\&. If you select an unsupported mode, \fIELinks\fR uses 16 colors\&. The color modes are:
 
 .RS
 .TP 3
@@ -792,7 +796,13 @@ Color mode for dumps:
 1: is 16 color mode
 .TP
 \(bu
-2: is 256 color mode
+2: is 88 color mode
+.TP
+\(bu
+3: is 256 color mode
+.TP
+\(bu
+4: is true color mode
 .LP
 .RE
 .IP
@@ -921,7 +931,7 @@ Compress successive empty lines to only one in displayed text\&.
 
 .TP
 document\&.uri_passing
-Rules for passing URIs to external commands\&. When one rule is defined the link and tab menu will have a menu item that makes it possible to pass the the link, frame or tab URI to an external command\&. If several rules are defined the link and tab menu will have a submenu of items for each rule\&. Note, this is mostly useful for launching graphical viewers, since there is not support for releasing the terminal while the command runs\&. The action and submenus are also available by binding keys to the frame\-external\-command, the link\-external\-command, and the tab\-external\-command actions\&.
+Rules for passing URIs to external commands\&. When one rule is defined the link and tab menu will have a menu item that makes it possible to pass the the link, frame or tab URI to an external command\&. If several rules are defined the link and tab menu will have a submenu of items for each rule\&. Note, this is mostly useful for launching graphical viewers, since there is no support for releasing the terminal while the command runs\&. The action and submenus are also available by binding keys to the frame\-external\-command, the link\-external\-command, and the tab\-external\-command actions\&.
 
 .TP
 document\&.uri_passing\&._template_ <str> (default: "")
@@ -932,7 +942,7 @@ ecmascript
 ECMAScript options\&.
 
 .TP
-ecmascript\&.enable [0|1] (default: 1)
+ecmascript\&.enable [0|1] (default: 0)
 Whether to run those scripts inside of documents\&.
 
 .TP
@@ -1378,14 +1388,6 @@ Enable dumb prefixes \- simple URI abbreviations which can be written to the Got
 protocol\&.rewrite\&.enable\-smart [0|1] (default: 1)
 Enable smart prefixes \- URI templates triggered by writing given abbreviation to the Goto URL dialog followed by a list of arguments from which the actual URI is composed \- i\&.e\&. 'gg:search keywords' or \fIgn search keywords for news\fR\&.
 
-.TP
-protocol\&.smb
-SAMBA specific options\&.
-
-.TP
-protocol\&.smb\&.credentials <str> (default: "")
-Credentials file passed to smbclient via \-A option\&.
-
 .TP
 protocol\&.user
 User protocols\&. Options in this tree specify external handlers for the appropriate protocols\&. Ie\&. protocol\&.user\&.mailto\&.unix\&.
@@ -1440,7 +1442,7 @@ Switch fonts when drawing lines, enabling both local characters and lines workin
 
 .TP
 terminal\&._template_\&.utf_8_io [0|1] (default: 0)
-Enable I/O in UTF8 for Unicode terminals\&. Note that currently, only the subset of UTF8 according to terminal codepage is used\&.
+Enable I/O in UTF\-8 for Unicode terminals\&. Note that currently, only the subset of UTF\-8 according to terminal codepage is used\&. \fIELinks\fR ignores this option if the terminal codepage is UTF\-8\&.
 
 .TP
 terminal\&._template_\&.restrict_852 [0|1] (default: 0)
@@ -1452,7 +1454,7 @@ Move cursor to bottom right corner when done drawing\&. This is particularly use
 
 .TP
 terminal\&._template_\&.colors <num> (default: 0)
-The color mode controls what colors are used and how they are output to the terminal\&. The color modes are:
+The color mode controls what colors are used and how they are output to the terminal\&. Some modes may have been disabled at compile time\&. The Setup \-> Terminal options dialog lists the modes supported by this executable\&. If you select an unsupported mode, \fIELinks\fR uses 16 colors\&. The color modes are:
 
 .RS
 .TP 3
@@ -1463,14 +1465,20 @@ The color mode controls what colors are used and how they are output to the term
 1: is 16 color mode, uses the common ANSI colors
 .TP
 \(bu
-2: is 256 color mode, uses XTerm RGB codes
+2: is 88 color mode, uses XTerm RGB codes
+.TP
+\(bu
+3: is 256 color mode, uses XTerm RGB codes
+.TP
+\(bu
+4: is true color mode, uses konsole RGB codes
 .LP
 .RE
 .IP
 
 .TP
-terminal\&._template_\&.transparency [0|1] (default: 1)
+terminal\&._template_\&.transparency [0|1] (default: 0)
-If we should not set the background to black\&. This is particularly useful when we have a terminal (typically in some windowing environment) with a background image or a transparent background \- it will be visible in \fIELinks\fR as well\&. Note that this option makes sense only when colors are enabled\&.
+If we should not set the background to black\&. This is particularly useful when we have a terminal (typically in some windowing environment) with a background image or a transparent background \- it will be visible in \fIELinks\fR as well (but \fIELinks\fR document color handling will still assume the background is black so if you have a bright background you might experience contrast problems)\&. Note that this option makes sense only when colors are enabled\&.
 
 .TP
 terminal\&._template_\&.underline [0|1] (default: 0)

doc/man/man5/elinkskeys.5

@@ -17,10 +17,10 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "ELINKSKEYS" 5 "ELinks keybindings" "2006-06-12" "ELinks keybindings"
+.TH "ELINKSKEYS" 5 "ELinks keybindings" "2007-01-06" "ELinks keybindings"
 .SH NAME
 elinkskeys \- keybindings for ELinks
-.SH "SYNOPSIS"
+.SH "OVERVIEW"
 
 
 Information on how to configure keybinding and overview of the default keybindings\&.
@@ -87,7 +87,7 @@ bind "main" "," = "lua\-console"
 Valid keys are: alphanumeric characters, punctuation, \fIEnter\fR, \fIBackspace\fR, \fITab\fR, \fIEscape\fR, \fILeft\fR, \fIRight\fR, \fIUp\fR, \fIDown\fR, \fIInsert\fR, \fIDelete\fR, \fIHome\fR, \fIEnd\fR, \fIPageUp\fR, \fIPageDown\fR, \fIF1\fR to \fIF12\fR\&.
 
 
-Some keys will need to be quoted or escaped\&. For example, space can be written as " " (quote space quote), and the quote itself as \\" (backslash quote)\&. Backslash can be written as \\\\ (double backslash)\&.
+Some keys will need to be quoted or escaped\&. For example, space can be written as " " (quote space quote), and the quote itself as \\" (backslash quote)\&. Backslash can be written as \e\e (double backslash)\&.
 
 .SH "KEYMAP ACTIONS"
 
@@ -607,10 +607,22 @@ Delete to beginning of line\&.
 kill\-to\-eol
 Delete to end of line\&.
 
+.TP
+kill\-word\-back
+Delete backwards to start of word\&.
+
 .TP
 left
 Move the cursor left\&.
 
+.TP
+move\-backward\-word
+Move cursor before current word\&.
+
+.TP
+move\-forward\-word
+Move cursor after current word\&.
+
 .TP
 next\-item
 Move to the next item\&.
@@ -806,7 +818,7 @@ Open download manager (\fIdownload\-manager\fR)
 
 .TP
 \fIE\fR
-Open \\"Go to URL\\" dialog box containing the current link URL (\fIgoto\-url\-current\-link\fR)
+Open "Go to URL" dialog box containing the current link URL (\fIgoto\-url\-current\-link\fR)
 
 .TP
 \fICtrl\-E\fR
@@ -822,7 +834,7 @@ Move downwards by a page (\fImove\-page\-down\fR)
 
 .TP
 \fIG\fR
-Open \\"Go to URL\\" dialog box containing the current URL (\fIgoto\-url\-current\fR)
+Open "Go to URL" dialog box containing the current URL (\fIgoto\-url\-current\fR)
 
 .TP
 \fIH\fR
@@ -881,7 +893,7 @@ Scroll left (\fIscroll\-left\fR)
 Go at a specified mark (\fImark\-goto\fR)
 
 .TP
-\fI\\\fR
+\fI\e\fR
 Toggle rendering page as HTML / plain text (\fItoggle\-html\-plain\fR)
 
 .TP
@@ -914,7 +926,7 @@ Maximize the current frame (\fIframe\-maximize\fR)
 
 .TP
 \fIg\fR
-Open \\"Go to URL\\" dialog box (\fIgoto\-url\fR)
+Open "Go to URL" dialog box (\fIgoto\-url\fR)
 
 .TP
 \fIh\fR
@@ -1060,6 +1072,10 @@ Move to the next frame (\fIframe\-next\fR)
 \fIAlt\-Tab\fR
 Move to the previous frame (\fIframe\-prev\fR)
 
+.TP
+\fITab\fR
+Move to the previous frame (\fIframe\-prev\fR)
+
 .TP
 \fIUp\fR
 Move to the previous link (\fImove\-link\-prev\fR)
@@ -1078,6 +1094,10 @@ Go to the last line of the buffer (\fIend\-of\-buffer\fR)
 \fICtrl\-A\fR
 Go to the start of the page/line (\fIhome\fR)
 
+.TP
+\fIAlt\-b\fR
+Move cursor before current word (\fImove\-backward\-word\fR)
+
 .TP
 \fICtrl\-D\fR
 Delete character under cursor (\fIdelete\fR)
@@ -1086,6 +1106,10 @@ Delete character under cursor (\fIdelete\fR)
 \fICtrl\-E\fR
 Go to the end of the page/line (\fIend\fR)
 
+.TP
+\fIAlt\-f\fR
+Move cursor after current word (\fImove\-forward\-word\fR)
+
 .TP
 \fICtrl\-H\fR
 Delete character in front of the cursor (\fIbackspace\fR)
@@ -1130,6 +1154,10 @@ Attempt to auto\-complete the input (\fIauto\-complete\fR)
 \fICtrl\-X\fR
 Delete text from clipboard (\fIcut\-clipboard\fR)
 
+.TP
+\fIAlt\-Backspace\fR
+Delete backwards to start of word (\fIkill\-word\-back\fR)
+
 .TP
 \fIBackspace\fR
 Delete character in front of the cursor (\fIbackspace\fR)
@@ -1182,6 +1210,10 @@ Move to the next item (\fInext\-item\fR)
 \fIAlt\-Tab\fR
 Move to the previous item (\fIprevious\-item\fR)
 
+.TP
+\fITab\fR
+Move to the previous item (\fIprevious\-item\fR)
+
 .TP
 \fIUp\fR
 Move cursor upwards (\fIup\fR)
@@ -1312,6 +1344,10 @@ Move to the next item (\fInext\-item\fR)
 \fIAlt\-Tab\fR
 Move to the previous item (\fIprevious\-item\fR)
 
+.TP
+\fITab\fR
+Move to the previous item (\fIprevious\-item\fR)
+
 .TP
 \fIUp\fR
 Move cursor upwards (\fIup\fR)

doc/tools/keys2doc

@@ -78,8 +78,11 @@ print_keymap_defaults()
 		key=$(echo "$entry" | sed "s/\(KBD_[^,]*\|'.*'\),.*/\1/")
 		modifier=$(echo "$entry" | sed "s/.*KBD_MOD_\([A-Z_]*\).*/\1/")
 		action=$(echo "$entry" | sed "s/.*,.*\(ACT_$KEYMAP\)_\([A-Z_]*\).*/\2/")
+		# If there are backslashed quotes, remove the backslashes.
+		# (This is not needed in print_keymap_actions because
+		# there the "read" command consumes the backslashes.)
 		action=$(grep " $action," "$CONFIGDIR/actions-$keymap.inc" \
-			| sed "s/.*\"\([^\"]*\)\".*N__(\"\(.*\)\").*/\2 ('\1')/")
+			| sed "s/.*\"\([^\"]*\)\".*N__(\"\(.*\)\").*/\2 ('\1')/;s/\\\\\"/\"/g")
 
 		case "$key" in
 		KBD_*)

po/de.po

@@ -4,14 +4,15 @@
 # Josef 'Jupp' Schugt <jupp@gmx.de>, 2003
 # Karsten 'kuser' Schölzel <kuser@gmx.de>
 # Thomas Fuchs <tfoxYOUKNOWgmx.de>
+# Jens Seidel <jensseidel@users.sf.net>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.9.CVS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-02-19 00:03+0100\n"
-"PO-Revision-Date: 2004-08-15 17:19+0200\n"
+"PO-Revision-Date: 2005-06-14 20:52+0200\n"
-"Last-Translator: Thomas Fuchs <tfoxYOUKNOWgmx.de>\n"
+"Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
@@ -1298,7 +1299,7 @@ msgstr ""
 
 #: src/config/cmdline.c:666
 msgid "Name of directory with configuration file"
-msgstr "Name des Verzeichnises mit der Konfigurations-Datei"
+msgstr "Name des Verzeichnisses mit der Konfigurations-Datei"
 
 #: src/config/cmdline.c:668
 #, fuzzy
@@ -1477,7 +1478,7 @@ msgstr ""
 
 #: src/config/cmdline.c:750
 msgid "Run as separate instance"
-msgstr "Starte als seperater Prozess"
+msgstr "Starte als separater Prozess"
 
 #: src/config/cmdline.c:752
 #, fuzzy
@@ -1487,7 +1488,7 @@ msgid ""
 "(bookmarks, history, etc.) are written to the disk when this\n"
 "option is used. See also -touch-files."
 msgstr ""
-"Starte ELinks als seperate Instanz und verbinde nicht zu einer\n"
+"Starte ELinks als separate Instanz und verbinde nicht zu einer\n"
 "laufenden Instanz. Beachte, dass normalerweise keine Statusdateien\n"
 "(Lesezeichen, Verlauf, usw.) geschrieben werden, wenn diese Option\n"
 "benutzt wird. Siehe auch -touch-files."
@@ -2384,11 +2385,11 @@ msgstr ""
 
 #: src/config/options.inc:234
 msgid "Image link prefix"
-msgstr "Prefix von Links zu Bildern"
+msgstr "Präfix von Links zu Bildern"
 
 #: src/config/options.inc:236
 msgid "Prefix string to use to mark image links."
-msgstr "Prefix, um Links zu Bildern zu kennzeichnen."
+msgstr "Präfix, um Links zu Bildern zu kennzeichnen."
 
 #: src/config/options.inc:238
 msgid "Image link suffix"
@@ -2598,7 +2599,7 @@ msgid ""
 "1 means if document.browse.links.numbering = 1\n"
 "2 means always"
 msgstr ""
-"Ziffertasten wählen Links aus und bezeichnen keine Kommandoprefixe.\n"
+"Ziffertasten wählen Links aus und bezeichnen keine Kommandopräfixe.\n"
 "Diese Option hat drei Zustände:\n"
 "0 niemals\n"
 "1 wenn document.browse.links.numbering = 1\n"
@@ -2648,7 +2649,7 @@ msgid ""
 "right is pressed and no prefix was given."
 msgstr ""
 "Anzahl der zu rollenden Zeilen, wenn eine mit scroll-up oder scroll-\n"
-"down verbundene Taste gedrückt und kein Prefix angegeben wurde."
+"down verbundene Taste gedrückt und kein Präfix angegeben wurde."
 
 #: src/config/options.inc:366
 msgid "Extended horizontal scrolling"
@@ -2683,7 +2684,7 @@ msgid ""
 "down is pressed and no prefix was given."
 msgstr ""
 "Anzahl der zu rollenden Zeilen, wenn eine mit scroll-up oder scroll-\n"
-"down verbundene Taste gedrückt und kein Prefix angegeben wurde."
+"down verbundene Taste gedrückt und kein Präfix angegeben wurde."
 
 #: src/config/options.inc:383
 msgid "Searching"
@@ -2695,7 +2696,7 @@ msgstr "Optionen f
 
 #: src/config/options.inc:387
 msgid "Case sensitivity"
-msgstr "Groß-/Kleinscreibung beachten"
+msgstr "Groß-/Kleinschreibung beachten"
 
 #: src/config/options.inc:389
 msgid ""
@@ -4630,7 +4631,7 @@ msgstr "Hintergrund"
 #: src/dialogs/download.c:246
 #, fuzzy
 msgid "Background with ~notify"
-msgstr "Im Hintergund mit Benachrichtigung"
+msgstr "Im Hintergrund mit Benachrichtigung"
 
 #. accelerator_context(display_download, src/dialogs/download.c:download_buttons)
 #: src/dialogs/download.c:253 src/dialogs/download.c:481
@@ -4836,12 +4837,12 @@ msgstr "Linknummer eingeben"
 #: src/dialogs/info.c:239
 #, fuzzy
 msgid "master terminal"
-msgstr "Terminalgrösse ändern"
+msgstr "Terminalgröße ändern"
 
 #: src/dialogs/info.c:241
 #, fuzzy
 msgid "slave terminal"
-msgstr "Terminalgrösse ändern"
+msgstr "Terminalgröße ändern"
 
 #: src/dialogs/info.c:245
 #, fuzzy, c-format
@@ -5027,7 +5028,7 @@ msgstr "~Starte Shell"
 #. accelerator_context(src/dialogs/menu.c:file_menu)
 #: src/dialogs/menu.c:388
 msgid "Resize t~erminal"
-msgstr "Terminalgrösse ~ändern"
+msgstr "Terminalgröße ~ändern"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu)
 #: src/dialogs/menu.c:406
@@ -5334,7 +5335,7 @@ msgstr "256 Farben"
 
 #: src/dialogs/options.c:286
 msgid "Resize terminal"
-msgstr "Terminalgrösse ändern"
+msgstr "Terminalgröße ändern"
 
 #: src/dialogs/options.c:289
 #, fuzzy
@@ -7768,14 +7769,14 @@ msgid ""
 "arguments to them like search engine keywords."
 msgstr ""
 "Regeln um URIs zu verändern, die im Gehe-zu-Dialog eingegeben werden.\n"
-"Hiermit ist es möglich, Prefixe zu definieren, die bei Eingabe im\n"
+"Hiermit ist es möglich, Präfixe zu definieren, die bei Eingabe im\n"
-"Gehe-zu-Dialog expandiert werden. Die Prefixe können einfach sein,\n"
+"Gehe-zu-Dialog expandiert werden. Die Präfixe können einfach sein,\n"
 "das heißt sie verhalten sich wie URI-Abkürzungen, oder komplex sein,\n"
 "dann können Argumente angegeben werden wie zum Beispiel Suchbegriffe."
 
 #: src/protocol/rewrite/rewrite.c:53
 msgid "Enable dumb prefixes"
-msgstr "Einfache Prefixe aktivieren"
+msgstr "Einfache Präfixe aktivieren"
 
 #: src/protocol/rewrite/rewrite.c:55
 #, fuzzy
@@ -7785,14 +7786,14 @@ msgid ""
 "if you write 'elinks' there, you are directed to\n"
 "http://elinks.cz/."
 msgstr ""
-"Aktiviert einfache Prefixe. Dabei handelt es sich um URI Abkürzungen,\n"
+"Aktiviert einfache Präfixe. Dabei handelt es sich um URI-Abkürzungen,\n"
 "die in den Gehe-Zu-URL-Dialog geschrieben werden anstelle der \n"
 "aktuellen URI. Z.B. kann man dort 'elinks' eingeben und wird auf\n"
 "http://elinks.or.cz/ umgeleitet."
 
 #: src/protocol/rewrite/rewrite.c:60
 msgid "Enable smart prefixes"
-msgstr "Komplexe Prefixe aktivieren"
+msgstr "Komplexe Präfixe aktivieren"
 
 #: src/protocol/rewrite/rewrite.c:62
 msgid ""
@@ -7801,18 +7802,18 @@ msgid ""
 "of arguments from which the actual URI is composed - i.e.\n"
 "'gg:search keywords' or 'gn search keywords for news'."
 msgstr ""
-"Aktiviert komplexe Prefixe. Dabei handelt es sich um Abkürzungen\n"
+"Aktiviert komplexe Präfixe. Dabei handelt es sich um Abkürzungen\n"
 "für URI-Schablonen, die gefolgt von einer Liste von Argumenten\n"
 "in den Gehe-zu-Dialog eingegeben werden und aus denen die Ziel-URL\n"
 "zusammengesetzt wird. Z.B. 'gg Suchwörter' oder 'gn Suchwörter für News'."
 
 #: src/protocol/rewrite/rewrite.c:67
 msgid "Dumb Prefixes"
-msgstr "Einfache Prefixe"
+msgstr "Einfache Präfixe"
 
 #: src/protocol/rewrite/rewrite.c:69
 msgid "Dumb prefixes, see enable-dumb description for details."
-msgstr "Einfach Prefixe, siehe enable-dump-Beschreibung für Details."
+msgstr "Einfach Präfixe, siehe enable-dump-Beschreibung für Details."
 
 #: src/protocol/rewrite/rewrite.c:74
 #, fuzzy, no-c-format
@@ -7821,17 +7822,17 @@ msgid ""
 "%c in the string means the current URL\n"
 "%% in the string means '%'"
 msgstr ""
-"Ersatz-URI für dieses einfache Prefix.\n"
+"Ersatz-URI für dieses einfache Präfix.\n"
 "%c in der Zeichenkette bedeutet die aktuelle URL\n"
 "%% in der Zeichenkette bedeutet '%'"
 
 #: src/protocol/rewrite/rewrite.c:78
 msgid "Smart Prefixes"
-msgstr "Komplexe Prefixe"
+msgstr "Komplexe Präfixe"
 
 #: src/protocol/rewrite/rewrite.c:80
 msgid "Smart prefixes, see enable-smart description for details."
-msgstr "Komplexe Prefixe, siehe enable-smart-Besschreibung für Details."
+msgstr "Komplexe Präfixe, siehe enable-smart-Beschreibung für Details."
 
 #: src/protocol/rewrite/rewrite.c:87
 #, fuzzy, no-c-format
@@ -7842,9 +7843,9 @@ msgid ""
 "%0,%1,...,%9 means argument 0, 1, ..., 9\n"
 "%% in the string means '%'"
 msgstr ""
-"Ersatz-URI für dieses komplexe Prefix.\n"
+"Ersatz-URI für dieses komplexe Präfix.\n"
 "%c in der Zeichenkette bedeutet die aktuelle URL\n"
-"%s in der Zeichenkette bedeutet das gesamte Argument dieses Prefixes\n"
+"%s in der Zeichenkette bedeutet das gesamte Argument dieses Präfixes\n"
 "%0,%1,...,%9 in der Zeichenkette bedeutet Argument 0, 1, ..., 9\n"
 "%% in der Zeichenkette bedeutet '%'"
 
@@ -8114,7 +8115,7 @@ msgid ""
 "for any inconvience caused."
 msgstr ""
 "Der Wert der Option config.saving_style ist de facto veraltet. Die "
-"Algorithmen für das Speichern der Konfiguartion haben sich im Vergleich zu "
+"Algorithmen für das Speichern der Konfiguration haben sich im Vergleich zu "
 "deiner letzten ELinks-Version verändert. Jetzt werden nur noch diejenigen "
 "Optionen gespeichert, die sich geändert haben, anstatt aller Optionen. Dies "
 "vereinfacht unsere Situation, wenn eine Option einen ungültigen Wert hat "
@@ -8586,8 +8587,8 @@ msgstr "Fehler beim Schreiben in Datei"
 #~ "Prefix: Shift, Ctrl, Alt\n"
 #~ "Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,..."
 #~ msgstr ""
-#~ "Geben Sie Tastendrücke in dieser Form ein: [Prefix-]Taste\n"
+#~ "Geben Sie Tastendrücke in dieser Form ein: [Präfix-]Taste\n"
-#~ "Prefix: Shift, Ctrl, Alt\n"
+#~ "Präfix: Shift, Ctrl, Alt\n"
 #~ "Taste: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,..."
 
 #, fuzzy

src/config/options.inc

@@ -643,17 +643,23 @@ static struct option_info config_options_info[] = {
 
 	INIT_OPT_INT("document.dump", N_("Color mode"),
 		"color_mode", 0, -1, COLOR_MODES - 1, -1,
-		N_("Color mode for dumps:\n"
+		/* The list of modes must be at the end of this string
+		 * because AsciiDoc 7.1.2 does not support continuing
+		 * an outer list entry after an inner list.
+		 * TRANSLATORS: This restriction applies only to the
+		 * "en" (English) translation.  (See doc/Makefile.)  */
+		N_("Color mode for dumps.\n"
+		"Some modes may have been disabled at compile time. "
+		"The Setup -> Terminal options dialog lists the modes "
+		"supported by this executable. If you select an "
+		"unsupported mode, ELinks uses 16 colors.\n"
+		"The color modes are:\n"
 		"-1 is standard dump mode\n"
 		"0 is mono mode\n"
 		"1 is 16 color mode\n"
 		"2 is 88 color mode\n"
 		"3 is 256 color mode\n"
-		"4 is true color mode\n"
+		"4 is true color mode")),
-		"Some of these may have been disabled at compile time. "
-		"The Setup -> Terminal options dialog lists the modes "
-		"supported by this executable. If you select an "
-		"unsupported mode, ELinks uses 16 colors.")),
 
 	INIT_OPT_STRING("document.dump", N_("Footer"),
 		"footer", 0, "",
@@ -858,17 +864,23 @@ static struct option_info config_options_info[] = {
 
 	INIT_OPT_INT("terminal._template_", N_("Color mode"),
 		"colors", 0, 0, COLOR_MODES - 1, 0,
+		/* The list of modes must be at the end of this string
+		 * because AsciiDoc 7.1.2 does not support continuing
+		 * an outer list entry after an inner list.
+		 * TRANSLATORS: This restriction applies only to the
+		 * "en" (English) translation.  (See doc/Makefile.)  */
 		N_("The color mode controls what colors are used and how they are "
-		"output to the terminal. The color modes are:\n"
+		"output to the terminal.\n"
+		"Some modes may have been disabled at compile time. "
+		"The Setup -> Terminal options dialog lists the modes "
+		"supported by this executable. If you select an "
+		"unsupported mode, ELinks uses 16 colors.\n"
+		"The color modes are:\n"
 		"0 is mono mode, only 2 colors are used\n"
 		"1 is 16 color mode, uses the common ANSI colors\n"
 		"2 is 88 color mode, uses XTerm RGB codes\n"
 		"3 is 256 color mode, uses XTerm RGB codes\n"
-		"4 is true color mode, uses konsole RGB codes.\n"
+		"4 is true color mode, uses konsole RGB codes")),
-		"Some of these may have been disabled at compile time. "
-		"The Setup -> Terminal options dialog lists the modes "
-		"supported by this executable. If you select an "
-		"unsupported mode, ELinks uses 16 colors.")),
 
 	INIT_OPT_BOOL("terminal._template_", N_("Transparency"),
 		"transparency", 0, 0,

src/viewer/dump/dump.c

@@ -397,33 +397,34 @@ add_document_to_string(struct string *string, struct document *document)
 	goto end;
 utf8:
 	for (y = 0; y < document->height; y++) {
-		struct screen_char *pos = document->data[y].chars;
 		int white = 0;
 		int x;
 
 		for (x = 0; x < document->data[y].length; x++) {
+			struct screen_char *pos = &document->data[y].chars[x];
 			unicode_val_T data = pos->data;
 			unsigned int frame = (pos->attr & SCREEN_ATTR_FRAME);
 
 			if (!isscreensafe(data)) {
 				white++;
 				continue;
-			} else if (frame && data >= 176 && data < 224) {
+			} else {
-				data = frame_dumb[data - 176];
+				if (frame && data >= 176 && data < 224)
+					data = frame_dumb[data - 176];
 
 				if (data <= ' ') {
 					/* Count spaces. */
 					white++;
+				} else if (data == UCS_NO_CHAR) {
+					/* This is the second cell of
+					 * a double-cell character.  */
 				} else {
 					/* Print spaces if any. */
 					if (white) {
 						add_xchar_to_string(string, ' ', white);
 						white = 0;
 					}
-					if (frame)
+					add_to_string(string, encode_utf8(data));
-						add_char_to_string(string, data);
-					else
-						add_to_string(string, encode_utf8(data));
 				}
 			}
 		}