From 0b99fa70ca9d0f976655e61adee1a5eebacc0734 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah.masters@gmail.com>
Date: Tue, 10 Jun 2008 06:41:34 +0000
Subject: [PATCH 01/43] Bug 620: Reset form fields to default values on reload

Do not retain changed values in form fields when the user reloads.  Doing
so can be confusing or even cause data-loss when new default values are
specified in the updated document.  For example, when editing an article on
Wikipedia, one loads the edit page for the article, makes and submits
changes, goes back to the edit page to make further modifications, and
reloads to get the new article text.  Before this change, reloading the
edit page would not update the textarea on the page with the new article
source, which can lead one (and has led me) to make changes to the original
version of the article by accident.

This fixes bug 620.
(cherry picked from commit 9e1e94bee0da92a9b753e211f798b22e93713e95)
---
 src/document/renderer.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/document/renderer.c b/src/document/renderer.c
index 021b9427..4708430c 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -36,6 +36,7 @@
 #include "util/error.h"
 #include "util/memory.h"
 #include "util/string.h"
+#include "viewer/text/form.h"
 #include "viewer/text/view.h"
 #include "viewer/text/vs.h"
 
@@ -334,6 +335,11 @@ render_document(struct view_state *vs, struct document_view *doc_view,
 		if (!document) return;
 		doc_view->document = document;
 
+		if (doc_view->session
+		    && doc_view->session->reloadlevel > CACHE_MODE_NORMAL)
+			while (vs->form_info_len)
+				mem_free_if(vs->form_info[--vs->form_info_len].value);
+
 		shrink_memory(0);
 
 		render_encoded_document(cached, document);

From 28d2c6ef9ac954c0c74e778c5c82db2914bbcc46 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 15 Jun 2008 23:07:58 +0300
Subject: [PATCH 02/43] NEWS update, from elinks-0.11 and otherwise

---
 NEWS | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 373d1520..8f8c1fb1 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ To be released as ELinks 0.12.0.
 
 //////////////////////////////////////////////////////////////////////
 This list now contains all the important changes from ELinks 0.11.0 to
-ELinks 0.12.GIT (4672bad9c73321019c1a2a7695761b8188bd1a8f) and related
+ELinks 0.12.GIT (0b99fa70ca9d0f976655e61adee1a5eebacc0734) and related
 bug numbers.  Each section is sorted by severity and grouped by topic.
 
 The list no doubt includes several changes that are not really
@@ -225,6 +225,8 @@ have already been considered.
     justify_line
   - bug 1015: incompatible pointer type for PyString_AsStringAndSize
   - bug 917: Going to unopened /dev/fd/ kills select_loop
+  - critical bug 976: ELinks crashes while browsing samba shares if
+    debuglevel = 1 in smb.conf
 * Already backported to a previous release but not listed there:
   - (enhancement) Activate link only when onClick returns true.
     Fixed bug 786 in ELinks 0.11.2.
@@ -327,6 +329,7 @@ To be released as 0.11.4.
 * bug 939: fix FSP directory listing (some compiler options left it empty)
 * bug 978: Python's webbrowser.open_new_tab(URL) works since now
 * bug 1012: compile with -fno-strict-overflow or -fwrapv if available
+* bug 1014: fix incompatible pointer type in Perl_sys_init3 call
 * minor bug 54, Debian bug 338402: don't force the terminal to 8 bits
   with no parity, and don't disable XON/XOFF flow control either
 * minor bug 951 in user SMJS: garbage-collect SMJS objects on 'File ->

From ed17eb18dfa45ed6f5271129fd52cc5c52b17a0f Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 17 Jun 2008 00:25:59 +0300
Subject: [PATCH 03/43] Bug 1016: Avoid JSFunctionSpec. (cherry picked from
 commit 6bfaa7ca8df63a5c19381be722c7b0bba7980b39)

Conflicts:

	src/ecmascript/spidermonkey/form.c
	src/scripting/smjs/elinks_object.c
---
 NEWS                                   |  2 +
 src/ecmascript/spidermonkey.c          | 42 +++++++++---------
 src/ecmascript/spidermonkey/Makefile   |  2 +-
 src/ecmascript/spidermonkey/document.c |  2 +-
 src/ecmascript/spidermonkey/document.h |  2 +-
 src/ecmascript/spidermonkey/form.c     | 15 ++++---
 src/ecmascript/spidermonkey/form.h     |  2 +-
 src/ecmascript/spidermonkey/location.c |  4 +-
 src/ecmascript/spidermonkey/location.h |  4 +-
 src/ecmascript/spidermonkey/util.c     | 60 ++++++++++++++++++++++++++
 src/ecmascript/spidermonkey/util.h     | 25 +++++++++++
 src/ecmascript/spidermonkey/window.c   |  2 +-
 src/ecmascript/spidermonkey/window.h   |  2 +-
 src/scripting/smjs/elinks_object.c     | 27 ++++++++----
 14 files changed, 144 insertions(+), 47 deletions(-)
 create mode 100644 src/ecmascript/spidermonkey/util.c

diff --git a/NEWS b/NEWS
index 8f8c1fb1..01f604bc 100644
--- a/NEWS
+++ b/NEWS
@@ -311,6 +311,8 @@ To be released as 0.11.4.
 * critical bug 945: don't crash if a Lua script calls e.g. error(nil)
 * critical bug 1003: don't crash if a smart URI rewrite template gets
   too few parameters
+* critical bug 1016: avoid JSFunctionSpec for better compatibility
+  across versions of SpiderMonkey
 * major bug 956: don't reuse pointers to SpiderMonkey objects that may
   have been collected as garbage.  This fix causes bug 954.
 * CVE-2007-2027: check if the program path contains "src/" before
diff --git a/src/ecmascript/spidermonkey.c b/src/ecmascript/spidermonkey.c
index 84d5e06c..6dae8009 100644
--- a/src/ecmascript/spidermonkey.c
+++ b/src/ecmascript/spidermonkey.c
@@ -183,32 +183,32 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
 	}
 	JS_InitStandardClasses(ctx, window_obj);
 	JS_DefineProperties(ctx, window_obj, (JSPropertySpec *) window_props);
-	JS_DefineFunctions(ctx, window_obj, (JSFunctionSpec *) window_funcs);
+	spidermonkey_DefineFunctions(ctx, window_obj, window_funcs);
 	JS_SetPrivate(ctx, window_obj, interpreter->vs); /* to @window_class */
 
-	document_obj = JS_InitClass(ctx, window_obj, NULL,
-				    (JSClass *) &document_class, NULL, 0,
-				    (JSPropertySpec *) document_props,
-				    (JSFunctionSpec *) document_funcs,
-				    NULL, NULL);
+	document_obj = spidermonkey_InitClass(ctx, window_obj, NULL,
+					      (JSClass *) &document_class, NULL, 0,
+					      (JSPropertySpec *) document_props,
+					      document_funcs,
+					      NULL, NULL);
 
-	forms_obj = JS_InitClass(ctx, document_obj, NULL,
-				    (JSClass *) &forms_class, NULL, 0,
-				    (JSPropertySpec *) forms_props,
-				    (JSFunctionSpec *) forms_funcs,
-				    NULL, NULL);
+	forms_obj = spidermonkey_InitClass(ctx, document_obj, NULL,
+					   (JSClass *) &forms_class, NULL, 0,
+					   (JSPropertySpec *) forms_props,
+					   forms_funcs,
+					   NULL, NULL);
 
-	history_obj = JS_InitClass(ctx, window_obj, NULL,
-				    (JSClass *) &history_class, NULL, 0,
-				    (JSPropertySpec *) NULL,
-				    (JSFunctionSpec *) history_funcs,
-				    NULL, NULL);
+	history_obj = spidermonkey_InitClass(ctx, window_obj, NULL,
+					     (JSClass *) &history_class, NULL, 0,
+					     (JSPropertySpec *) NULL,
+					     history_funcs,
+					     NULL, NULL);
 
-	location_obj = JS_InitClass(ctx, window_obj, NULL,
-				    (JSClass *) &location_class, NULL, 0,
-				    (JSPropertySpec *) location_props,
-				    (JSFunctionSpec *) location_funcs,
-				    NULL, NULL);
+	location_obj = spidermonkey_InitClass(ctx, window_obj, NULL,
+					      (JSClass *) &location_class, NULL, 0,
+					      (JSPropertySpec *) location_props,
+					      location_funcs,
+					      NULL, NULL);
 
 	menubar_obj = JS_InitClass(ctx, window_obj, NULL,
 				   (JSClass *) &menubar_class, NULL, 0,
diff --git a/src/ecmascript/spidermonkey/Makefile b/src/ecmascript/spidermonkey/Makefile
index f1c0fef3..4f07d9bf 100644
--- a/src/ecmascript/spidermonkey/Makefile
+++ b/src/ecmascript/spidermonkey/Makefile
@@ -2,6 +2,6 @@ top_builddir=../../..
 include $(top_builddir)/Makefile.config
 INCLUDES += $(SPIDERMONKEY_CFLAGS)
 
-OBJS = document.o form.o location.o navigator.o unibar.o window.o
+OBJS = document.o form.o location.o navigator.o unibar.o util.o window.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/ecmascript/spidermonkey/document.c b/src/ecmascript/spidermonkey/document.c
index 3e3ed6a8..1aa32828 100644
--- a/src/ecmascript/spidermonkey/document.c
+++ b/src/ecmascript/spidermonkey/document.c
@@ -245,7 +245,7 @@ document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 static JSBool document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 static JSBool document_writeln(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
-const JSFunctionSpec document_funcs[] = {
+const spidermonkeyFunctionSpec document_funcs[] = {
 	{ "write",		document_write,		1 },
 	{ "writeln",		document_writeln,	1 },
 	{ NULL }
diff --git a/src/ecmascript/spidermonkey/document.h b/src/ecmascript/spidermonkey/document.h
index d0fffeda..9cb80f31 100644
--- a/src/ecmascript/spidermonkey/document.h
+++ b/src/ecmascript/spidermonkey/document.h
@@ -5,7 +5,7 @@
 #include "ecmascript/spidermonkey/util.h"
 
 extern const JSClass document_class;
-extern const JSFunctionSpec document_funcs[];
+extern const spidermonkeyFunctionSpec document_funcs[];
 extern const JSPropertySpec document_props[];
 
 #endif
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index db2f7b22..1e2eded1 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -133,7 +133,7 @@ static JSBool input_click(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv
 static JSBool input_focus(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 static JSBool input_select(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
-static const JSFunctionSpec input_funcs[] = {
+static const spidermonkeyFunctionSpec input_funcs[] = {
 	{ "blur",	input_blur,	0 },
 	{ "click",	input_click,	0 },
 	{ "focus",	input_focus,	0 },
@@ -567,7 +567,7 @@ get_input_object(JSContext *ctx, JSObject *jsform, long number)
 	JSObject *jsinput = JS_NewObject(ctx, (JSClass *) &input_class, NULL, jsform);
 
 	JS_DefineProperties(ctx, jsinput, (JSPropertySpec *) input_props);
-	JS_DefineFunctions(ctx, jsinput, (JSFunctionSpec *) input_funcs);
+	spidermonkey_DefineFunctions(ctx, jsinput, input_funcs);
 	JS_SetReservedSlot(ctx, jsinput, JSRS_INPUT_FSINDEX, INT_TO_JSVAL(number));
 	return jsinput;;
 }
@@ -616,7 +616,7 @@ static const JSClass form_elements_class = {
 static JSBool form_elements_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 static JSBool form_elements_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
-static const JSFunctionSpec form_elements_funcs[] = {
+static const spidermonkeyFunctionSpec form_elements_funcs[] = {
 	{ "item",		form_elements_item,		1 },
 	{ "namedItem",		form_elements_namedItem,	1 },
 	{ NULL }
@@ -855,7 +855,7 @@ static const JSPropertySpec form_props[] = {
 static JSBool form_reset(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 static JSBool form_submit(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
-static const JSFunctionSpec form_funcs[] = {
+static const spidermonkeyFunctionSpec form_funcs[] = {
 	{ "reset",	form_reset,	0 },
 	{ "submit",	form_submit,	0 },
 	{ NULL }
@@ -933,7 +933,8 @@ form_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 		JSObject *jsform_elems = JS_NewObject(ctx, (JSClass *) &form_elements_class, NULL, obj);
 
 		JS_DefineProperties(ctx, jsform_elems, (JSPropertySpec *) form_elements_props);
-		JS_DefineFunctions(ctx, jsform_elems, (JSFunctionSpec *) form_elements_funcs);
+		spidermonkey_DefineFunctions(ctx, jsform_elems,
+					     form_elements_funcs);
 		object_to_jsval(ctx, vp, jsform_elems);
 		/* SM will cache this property value for us so we create this
 		 * just once per form. */
@@ -1162,7 +1163,7 @@ get_form_object(JSContext *ctx, JSObject *jsdoc, struct form_view *fv)
 	JSObject *jsform = JS_NewObject(ctx, (JSClass *) &form_class, NULL, jsdoc);
 
 	JS_DefineProperties(ctx, jsform, (JSPropertySpec *) form_props);
-	JS_DefineFunctions(ctx, jsform, (JSFunctionSpec *) form_funcs);
+	spidermonkey_DefineFunctions(ctx, jsform, form_funcs);
 	JS_SetPrivate(ctx, jsform, fv); /* to @form_class */
 	fv->ecmascript_obj = jsform;
 	return fv->ecmascript_obj;
@@ -1181,7 +1182,7 @@ const JSClass forms_class = {
 static JSBool forms_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 static JSBool forms_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
-const JSFunctionSpec forms_funcs[] = {
+const spidermonkeyFunctionSpec forms_funcs[] = {
 	{ "item",		forms_item,		1 },
 	{ "namedItem",		forms_namedItem,	1 },
 	{ NULL }
diff --git a/src/ecmascript/spidermonkey/form.h b/src/ecmascript/spidermonkey/form.h
index 4a24332c..eaa4d391 100644
--- a/src/ecmascript/spidermonkey/form.h
+++ b/src/ecmascript/spidermonkey/form.h
@@ -7,7 +7,7 @@
 struct form_view;
 
 extern const JSClass forms_class;
-extern const JSFunctionSpec forms_funcs[];
+extern const spidermonkeyFunctionSpec forms_funcs[];
 extern const JSPropertySpec forms_props[];
 
 JSObject *get_form_object(JSContext *ctx, JSObject *jsdoc, struct form_view *fv);
diff --git a/src/ecmascript/spidermonkey/location.c b/src/ecmascript/spidermonkey/location.c
index f16df025..dd5b40b0 100644
--- a/src/ecmascript/spidermonkey/location.c
+++ b/src/ecmascript/spidermonkey/location.c
@@ -57,7 +57,7 @@ const JSClass history_class = {
 	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
 };
 
-const JSFunctionSpec history_funcs[] = {
+const spidermonkeyFunctionSpec history_funcs[] = {
 	{ "back",		history_back,		0 },
 	{ "forward",		history_forward,	0 },
 	{ "go",			history_go,		1 },
@@ -224,7 +224,7 @@ location_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 static JSBool location_toString(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
-const JSFunctionSpec location_funcs[] = {
+const spidermonkeyFunctionSpec location_funcs[] = {
 	{ "toString",		location_toString,	0 },
 	{ "toLocaleString",	location_toString,	0 },
 	{ NULL }
diff --git a/src/ecmascript/spidermonkey/location.h b/src/ecmascript/spidermonkey/location.h
index 340c4cd4..864eca38 100644
--- a/src/ecmascript/spidermonkey/location.h
+++ b/src/ecmascript/spidermonkey/location.h
@@ -7,10 +7,10 @@
 struct document_view;
 
 extern const JSClass history_class;
-extern const JSFunctionSpec history_funcs[];
+extern const spidermonkeyFunctionSpec history_funcs[];
 
 extern const JSClass location_class;
-extern const JSFunctionSpec location_funcs[];
+extern const spidermonkeyFunctionSpec location_funcs[];
 extern const JSPropertySpec location_props[];
 
 void location_goto(struct document_view *doc_view, unsigned char *url);
diff --git a/src/ecmascript/spidermonkey/util.c b/src/ecmascript/spidermonkey/util.c
new file mode 100644
index 00000000..ccddbcd3
--- /dev/null
+++ b/src/ecmascript/spidermonkey/util.c
@@ -0,0 +1,60 @@
+/* Better compatibility across versions of SpiderMonkey. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "elinks.h"
+
+#include "ecmascript/spidermonkey/util.h"
+
+/** An ELinks-specific replacement for JS_DefineFunctions().
+ *
+ * @relates spidermonkeyFunctionSpec */
+JSBool
+spidermonkey_DefineFunctions(JSContext *cx, JSObject *obj,
+			     const spidermonkeyFunctionSpec *fs)
+{
+	for (; fs->name; fs++) {
+		if (!JS_DefineFunction(cx, obj, fs->name, fs->call,
+				       fs->nargs, 0))
+			return JS_FALSE;
+	}
+	return JS_TRUE;
+}
+
+/** An ELinks-specific replacement for JS_InitClass().
+ *
+ * @relates spidermonkeyFunctionSpec */
+JSObject *
+spidermonkey_InitClass(JSContext *cx, JSObject *obj,
+		       JSObject *parent_proto, JSClass *clasp,
+		       JSNative constructor, uintN nargs,
+		       JSPropertySpec *ps,
+		       const spidermonkeyFunctionSpec *fs,
+		       JSPropertySpec *static_ps,
+		       const spidermonkeyFunctionSpec *static_fs)
+{
+	JSObject *proto = JS_InitClass(cx, obj, parent_proto, clasp,
+				       constructor, nargs,
+				       ps, NULL, static_ps, NULL);
+
+	if (proto == NULL)
+		return NULL;
+
+	if (fs) {
+		if (!spidermonkey_DefineFunctions(cx, proto, fs))
+			return NULL;
+	}
+
+	if (static_fs) {
+		JSObject *cons_obj = JS_GetConstructor(cx, proto);
+
+		if (cons_obj == NULL)
+			return NULL;
+		if (!spidermonkey_DefineFunctions(cx, cons_obj, static_fs))
+			return NULL;
+	}
+
+	return proto;
+}
diff --git a/src/ecmascript/spidermonkey/util.h b/src/ecmascript/spidermonkey/util.h
index 22793da0..a9f955eb 100644
--- a/src/ecmascript/spidermonkey/util.h
+++ b/src/ecmascript/spidermonkey/util.h
@@ -99,4 +99,29 @@ jsval_to_string(JSContext *ctx, jsval *vp)
 	return empty_string_or_(JS_GetStringBytes(JS_ValueToString(ctx, val)));
 }
 
+/** An ELinks-specific replacement for JSFunctionSpec.
+ *
+ * Bug 1016: In SpiderMonkey 1.7 bundled with XULRunner 1.8, jsapi.h
+ * defines JSFunctionSpec in different ways depending on whether
+ * MOZILLA_1_8_BRANCH is defined, and there is no obvious way for
+ * ELinks to check whether MOZILLA_1_8_BRANCH was defined when the
+ * library was built.  Avoid the unstable JSFunctionSpec definitions
+ * and use this ELinks-specific structure instead.  */
+typedef struct spidermonkeyFunctionSpec {
+	const char *name;
+	JSNative call;
+	uint8 nargs;
+	/* ELinks does not use "flags" and "extra" so omit them here.  */
+} spidermonkeyFunctionSpec;
+
+JSBool spidermonkey_DefineFunctions(JSContext *cx, JSObject *obj,
+				    const spidermonkeyFunctionSpec *fs);
+JSObject *spidermonkey_InitClass(JSContext *cx, JSObject *obj,
+				 JSObject *parent_proto, JSClass *clasp,
+				 JSNative constructor, uintN nargs,
+				 JSPropertySpec *ps,
+				 const spidermonkeyFunctionSpec *fs,
+				 JSPropertySpec *static_ps,
+				 const spidermonkeyFunctionSpec *static_fs);
+
 #endif
diff --git a/src/ecmascript/spidermonkey/window.c b/src/ecmascript/spidermonkey/window.c
index 1e5cba6a..a08b9e8e 100644
--- a/src/ecmascript/spidermonkey/window.c
+++ b/src/ecmascript/spidermonkey/window.c
@@ -302,7 +302,7 @@ static JSBool window_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *arg
 static JSBool window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 static JSBool window_setTimeout(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 
-const JSFunctionSpec window_funcs[] = {
+const spidermonkeyFunctionSpec window_funcs[] = {
 	{ "alert",	window_alert,		1 },
 	{ "open",	window_open,		3 },
 	{ "setTimeout",	window_setTimeout,	2 },
diff --git a/src/ecmascript/spidermonkey/window.h b/src/ecmascript/spidermonkey/window.h
index 346346f6..283dc495 100644
--- a/src/ecmascript/spidermonkey/window.h
+++ b/src/ecmascript/spidermonkey/window.h
@@ -6,6 +6,6 @@
 
 extern const JSClass window_class;
 extern const JSPropertySpec window_props[];
-extern const JSFunctionSpec window_funcs[];
+extern const spidermonkeyFunctionSpec window_funcs[];
 
 #endif
diff --git a/src/scripting/smjs/elinks_object.c b/src/scripting/smjs/elinks_object.c
index 55d7a297..0a78fac6 100644
--- a/src/scripting/smjs/elinks_object.c
+++ b/src/scripting/smjs/elinks_object.c
@@ -69,7 +69,7 @@ elinks_set_location(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 	return JS_TRUE;
 }
 
-/* @elinks_funcs{"alert"} */
+/* function "alert" in the object returned by smjs_get_elinks_object() */
 static JSBool
 elinks_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
@@ -90,7 +90,7 @@ elinks_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
 	return JS_TRUE;
 }
 
-/* @elinks_funcs{"execute"} */
+/* function "execute" in the object returned by smjs_get_elinks_object() */
 static JSBool
 elinks_execute(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
@@ -117,12 +117,6 @@ static const JSClass elinks_class = {
 	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
 };
 
-static const JSFunctionSpec elinks_funcs[] = {
-	{ "alert",	elinks_alert,		1 },
-	{ "execute",	elinks_execute,		1 },
-	{ NULL }
-};
-
 static JSObject *
 smjs_get_elinks_object(void)
 {
@@ -133,7 +127,22 @@ smjs_get_elinks_object(void)
 
 	jsobj = JS_InitClass(smjs_ctx, smjs_global_object, NULL,
 	                     (JSClass *) &elinks_class, NULL, 0, NULL,
-	                     (JSFunctionSpec *) elinks_funcs, NULL, NULL);
+	                     (JSFunctionSpec *) NULL, NULL, NULL);
+
+	/* Bug 1016: In SpiderMonkey 1.7 bundled with XULRunner 1.8,
+	 * jsapi.h defines JSFunctionSpec in different ways depending
+	 * on whether MOZILLA_1_8_BRANCH is defined, and there is no
+	 * obvious way for ELinks to check whether MOZILLA_1_8_BRANCH
+	 * was defined when the library was built.  Avoid the unstable
+	 * JSFunctionSpec definitions and instead use JS_DefineFunction
+	 * directly.
+	 *
+	 * In elinks/src/ecmascript/spidermonkey/, there is an
+	 * ELinks-specific replacement for JSFunctionSpec; however, to
+	 * keep the modules independent, elinks/src/scripting/smjs/
+	 * does not use that.  */
+	JS_DefineFunction(smjs_ctx, jsobj, "alert", elinks_alert, 1, 0);
+	JS_DefineFunction(smjs_ctx, jsobj, "execute", elinks_execute, 1, 0);
 
 	JS_DefineProperty(smjs_ctx, jsobj, "location", JSVAL_NULL,
 	                  elinks_get_location, elinks_set_location,

From 1bd98053b02bbf0f72e4f3d9eedc083c8c8fb3df Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 21 Jun 2008 00:19:15 +0200
Subject: [PATCH 04/43] Fix memory leak in the DOM configuration module

... by making the (only) user (which is the RSS renderer) responsible
allocation of the dom_config structure.
---
 src/document/dom/renderer.c |  3 ++-
 src/dom/configuration.c     | 12 +++---------
 src/dom/configuration.h     |  3 ++-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 30171b4f..92c66642 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -1022,6 +1022,7 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 {
 	unsigned char *head = empty_string_or_(cached->head);
 	struct dom_renderer renderer;
+	struct dom_config config;
 	struct conv_table *convert_table;
 	struct sgml_parser *parser;
  	enum sgml_parser_type parser_type;
@@ -1060,7 +1061,7 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 	} else if (renderer.doctype == SGML_DOCTYPE_RSS) {
 		add_dom_stack_context(&parser->stack, &renderer,
 				      &dom_rss_renderer_context_info);
-		add_dom_config_normalizer(&parser->stack, RSS_CONFIG_FLAGS);
+		add_dom_config_normalizer(&parser->stack, &config, RSS_CONFIG_FLAGS);
 	}
 
 	/* FIXME: When rendering this way we don't really care about the code.
diff --git a/src/dom/configuration.c b/src/dom/configuration.c
index fa933610..e722ebf7 100644
--- a/src/dom/configuration.c
+++ b/src/dom/configuration.c
@@ -224,7 +224,6 @@ dom_normalize_node_end(struct dom_stack *stack, struct dom_node *node, void *dat
 		break;
 
 	case DOM_NODE_DOCUMENT:
-		mem_free(config);
 		break;
 
 	default:
@@ -285,20 +284,15 @@ static struct dom_stack_context_info dom_config_normalizer_context = {
 };
 
 struct dom_config *
-add_dom_config_normalizer(struct dom_stack *stack, enum dom_config_flag flags)
+add_dom_config_normalizer(struct dom_stack *stack, struct dom_config *config, 
+			  enum dom_config_flag flags)
 {
-	struct dom_config *config;
-
-	config = mem_calloc(1, sizeof(*config));
-	if (!config) return NULL;
-
+	memset(config, 0, sizeof(*config));
 	config->flags = flags;
 
 	if (add_dom_stack_context(stack, config, &dom_config_normalizer_context))
 		return config;
 
-	mem_free(config);
-
 	return NULL;
 }
 
diff --git a/src/dom/configuration.h b/src/dom/configuration.h
index f86898bf..2661cbf5 100644
--- a/src/dom/configuration.h
+++ b/src/dom/configuration.h
@@ -86,7 +86,8 @@ struct dom_config {
 };
 
 struct dom_config *
-add_dom_config_normalizer(struct dom_stack *stack, enum dom_config_flag flags);
+add_dom_config_normalizer(struct dom_stack *stack, struct dom_config *config,
+			  enum dom_config_flag flags);
 
 enum dom_config_flag
 parse_dom_config(unsigned char *flaglist, unsigned char separator);

From e0ffe6667728f6cfd35209ce472cf0fe8fbfc9cf Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 21 Jun 2008 01:48:18 +0300
Subject: [PATCH 05/43] NEWS: 0.11.4 released, 674 and 770 fixed, 451 bogus

---
 NEWS | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/NEWS b/NEWS
index 01f604bc..c6a1046a 100644
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,8 @@ Miscellaneous:
   decompression, and add deflate and LZMA (requires LZMA Utils)
 * major bug 503: various fixes in parsing and updating of elinks.conf
 * Debian bug 257762: turn terminal transparency off by default
+* bug 770: when the user chooses to resume an HTTP download, abort the
+  automatically started one and start a new one with the right range
 * bug 724: better parsing of escape sequences and control
   sequences from the terminal
 * bug 948: fix wrong UTF-8 output after the charset menu was used
@@ -175,10 +177,6 @@ The following changes should be removed from NEWS before ELinks 0.12.0
 is released.  They are currently listed here just to show that they
 have already been considered.
 
-* Not clear whether the bugs have been fixed:
-  - (bugfix 674) Reproduceable crashes while trying to unsubscribe
-    from a community on Orkut
-  - (bugfix 770) Download resuming simply restarts the download
 * Only partially fixed bugs:
   - (bugfix 764) int/long type punning in options
   - (bugfix 890) Change colors 0-15 to match xterm defaults.
@@ -299,10 +297,10 @@ have already been considered.
   * Really retry forever when connection.retries = 0
 //////////////////////////////////////////////////////////////////////
 
-ELinks 0.11.4rc1.GIT now:
--------------------------
+ELinks 0.11.4:
+--------------
 
-To be released as 0.11.4.
+Released on 2008-06-20.
 
 * critical bug 755: fix crashes due to dangling pointers to struct
   form_state
@@ -313,8 +311,8 @@ To be released as 0.11.4.
   too few parameters
 * critical bug 1016: avoid JSFunctionSpec for better compatibility
   across versions of SpiderMonkey
-* major bug 956: don't reuse pointers to SpiderMonkey objects that may
-  have been collected as garbage.  This fix causes bug 954.
+* critical bugs 674, 956: don't reuse pointers to SpiderMonkey objects
+  that may have been collected as garbage.  This fix causes bug 954.
 * CVE-2007-2027: check if the program path contains "src/" before
   using ../po files
 * important Debian bug 380347: prevent a buffer overflow in entity_cache
@@ -322,7 +320,6 @@ To be released as 0.11.4.
 * major bug 788: don't read STRLEN n_a, which isn't initialized by
   POPpx of Perl v5.8.8 and later
 * fix query parsing in file: URIs for local CGI (was broken in 0.11.3)
-* bug 451: fix incompatible pointer type in PERL_SYS_INIT3 call
 * bug 691: don't look up bogus IPv4 addresses based on characters of a
   hostname
 * bug 712: GnuTLS works on https://www-s.uiuc.edu/[]
@@ -361,15 +358,6 @@ To be released as 0.11.4.
 * minor build bug 960: fix errors in loadmsgcat.c if mmap() exists but
   munmap() doesn't
 
-//////////////////////////////////////////////////////////////////////
-The following changes should be removed from NEWS before ELinks 0.11.4
-is released.  They are currently listed here just to show that they
-have already been considered.
-
-* Fixed bugs that were not in previous versions:
-  - bug 975: fix int/size_t pointer type mismatch in Perl interface
-//////////////////////////////////////////////////////////////////////
-
 ELinks 0.11.3:
 --------------
 

From 7e7cf3940a8657505b1baba65dc8e7235afd8671 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 30 Jun 2008 20:04:23 +0300
Subject: [PATCH 06/43] SITES: delete or replace dead links

The RISC OS Unix Porting Project has apparently moved its webpage
to <http://www.riscos.info/packages/SectionIndex.html#Browser>,
but ELinks is no longer listed there.

ftp.fu-berlin.de still has multiple copies of Links, but they seem to
be part of operating systems like NetBSD or Ubuntu; nothing there
looks like a mirror of the Links download site.

Final-Recipient: rfc822; listar@linuxfromscratch.org
Action: failed
Status: 5.0.0
Diagnostic-Code: X-Postfix; host smtp.linuxfromscratch.org[216.171.237.234]
    said: 550 5.1.1 <listar@linuxfromscratch.org>: Recipient address rejected:
    User unknown in local recipient table (in reply to RCPT TO command)
---
 SITES | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/SITES b/SITES
index 1f5ce17f..4978d177 100644
--- a/SITES
+++ b/SITES
@@ -5,16 +5,11 @@ Fan sites:
 	http://starshine.org/xteddy/thomas/elinks/ (tips'n'tricks)
 
 DEBs:
-	http://packages.debian.org/testing/web/elinks.html
-	http://packages.debian.org/unstable/web/elinks.html
+	http://packages.debian.org/search?keywords=elinks
 
 RPMs:
 	http://rpmfind.net/linux/rpm2html/search.php?query=elinks
 
-RISC OS binaries:
-	http://www.riscos.info/unix/indexes/browser.html
-
-
 GIT root:
 	http://elinks.cz/elinks.git
 	git+ssh://pasky.or.cz/srv/git/elinks.git (only for developers)
@@ -23,7 +18,6 @@ Mailing list:
 	http://elinks.cz/community.html#mailinglist
 	elinks-users@linuxfromscratch.org (user discussion, announcements)
 	elinks-dev@linuxfromscratch.org (weird development and sorcery talks)
-	listar@linuxfromscratch.org (Subject: subscribe elinks-users)
 
 
 If you want to see the original Links as well, try:
@@ -33,11 +27,9 @@ Primary site:
 
 Mirrors:
 	http://links.sourceforge.net/download/
-	ftp://ftp.fu-berlin.de/unix/network/www/links/
 
 DEBs:
-	http://packages.debian.org/stable/web/links.html
-	http://packages.debian.org/unstable/web/links.html
+	http://packages.debian.org/search?keywords=links
 
 RPMs:
 	http://rpmfind.net/linux/rpm2html/search.php?query=links

From 80aa801e6a33856030b6bc76bd5fca6de6112c8e Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 30 Jun 2008 16:14:49 +0300
Subject: [PATCH 07/43] mkdist: avoid echo

According to SUSv3, "New applications are encouraged to use printf
instead of echo."
---
 contrib/mkdist | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/contrib/mkdist b/contrib/mkdist
index 0c8d8d1d..301ae1ed 100755
--- a/contrib/mkdist
+++ b/contrib/mkdist
@@ -20,10 +20,12 @@
 
 # set -x
 
-echo "-------------------------------------------------"
-echo "Date: $(date)"
-echo "Args: $*"
-echo "-------------------------------------------------"
+cat <<EOF
+-------------------------------------------------
+Date: $(date)
+Args: $*
+-------------------------------------------------
+EOF
 
 # Variables used in this script:
 # $GIT_DIR     = option -g GIT_DIR; passed in environment to Git
@@ -55,30 +57,30 @@ do
 	(d)	docdir=$OPTARG ;;
 	(o)	outdir=$OPTARG ;;
 	("?")	exit 1 ;;
-	(*)	echo >&2 "$0:$LINENO: bug found"
+	(*)	printf >&2 "%s:%d: bug found\n" "$0" "$LINENO"
 		exit 1 ;;
     esac
 done
 
 if [ $OPTIND -le $# ]
 then
-    echo >&2 "$0: too many non-option arguments"
+    printf >&2 "%s: too many non-option arguments\n" "$0"
     exit 1
 fi
 
 if [ -z "$GIT_DIR" ]
 then
-    echo >&2 "$0: Must specify -g GIT_DIR option"
+    printf >&2 "%s: Must specify -g GIT_DIR option\n" "$0"
     exit 1
 fi
 if [ -z "$outdir" ]
 then
-    echo >&2 "$0: Must specify -o OUTDIR option"
+    printf >&2 "%s: Must specify -o OUTDIR option\n" "$0"
     exit 1
 fi
 if [ -z "$rev" ]
 then
-    echo >&2 "$0: Must specify -r REVISION option"
+    printf >&2 "%s: Must specify -r REVISION option\n" "$0"
     exit 1
 fi
 if [ -z "$label" ]

From 6e3011b29a9126ecb438a148d95952895b86125c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 30 Jun 2008 17:45:35 +0300
Subject: [PATCH 08/43] mkdist: use git instead of cogito

<http://git.or.cz/cogito/> says Cogito is deprecated and unmaintained.
---
 contrib/mkdist | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/mkdist b/contrib/mkdist
index 301ae1ed..fd993e58 100755
--- a/contrib/mkdist
+++ b/contrib/mkdist
@@ -88,7 +88,7 @@ then
     label=$rev
 fi
 
-commit=$(GIT_DIR=$GIT_DIR cg-object-id -c "$rev") || exit 1
+commit=$(git --git-dir="$GIT_DIR" rev-parse --verify "$rev^{commit}") || exit 1
 
 if [ "$snap" ]
 then
@@ -104,7 +104,8 @@ tmpdir=$(mktemp -d -t elinks-dist-XXXXXXXX) || exit 1
 # To make it easier to compare build logs, put the source first in an
 # "elinks" directory, and only move to "$tartopdir" when finished.
 
-GIT_DIR=$GIT_DIR cg-export -r "$rev" -- "$tmpdir/elinks"
+git --git-dir="$GIT_DIR" archive --format=tar --prefix="elinks/" "$rev" |
+	(cd -- "$tmpdir" && tar -xf -)
 mkdir -- "$tmpdir/elinks/.git"
 printf "%s\n" "$commit" > "$tmpdir/elinks/.git/HEAD"
 

From 2338d9124a07c95b778770e9a13c07f0eed7487c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 30 Jun 2008 19:41:14 +0300
Subject: [PATCH 09/43] mkdist: build documentation unless -d given

The documentation has version numbers in a few places and it's easier
to get those right this way than by building it elsewhere before
running mkdist.  This change slows down mkdist but ccache can mitigate
some of that and snapshots use prebuilt documentation anyway.
---
 contrib/mkdist | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/mkdist b/contrib/mkdist
index fd993e58..244a54e5 100755
--- a/contrib/mkdist
+++ b/contrib/mkdist
@@ -114,7 +114,9 @@ printf "%s\n" "$commit" > "$tmpdir/elinks/.git/HEAD"
  ./autogen.sh
  mkdir build
  cd build
- ../configure
+ # Enable lots of features so that their options will appear in elinks
+ # --config-help and doc/html/elinks.conf.5.html.
+ ../configure --enable-bittorrent --enable-cgi --enable-fsp --enable-nntp
  make -C po
  mv po/*.gmo ../po/
  mv contrib/elinks.spec ../contrib/
@@ -125,6 +127,11 @@ if [ -n "$docdir" ]; then
 	cp -r -- "$docdir"/*.html* "$tmpdir/elinks/doc/html/"
 	# mkdir doc/pdf
 	# cp "$docdir"/*.pdf doc/pdf
+else
+	make -C "$tmpdir/elinks/build"
+	make -C "$tmpdir/elinks/build/doc" html
+	mkdir -- "$tmpdir/elinks/doc/html"
+	mv -- "$tmpdir/elinks/build/doc"/*.html* "$tmpdir/elinks/doc/html/"
 fi
 
 rm -rf -- "$tmpdir/elinks/build"

From 57c2e9e9baafccf49621a9f508742fe83af5f7f8 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 1 Jul 2008 02:17:51 +0300
Subject: [PATCH 10/43] Remove Cogito from ChangeLog and INSTALL too

Git does not appear to have anything like cg clone -s, which makes the
clone in the current directory rather than in a new directory.  It
seems possible to work around that with:

git clone --bare http://elinks.cz/elinks.git .git
git --git-dir=.git config core.bare false
git reset --hard
git clean -f
git checkout elinks-0.12

but that's already so complex that I think it'll be easier to just
remove the whole directory and clone to a new one.

The whole concept of first downloading a snapshot and then updating
that from version control comes from the time when ELinks was in CVS.
It made sense then because CVS could download deltas based on the data
in the CVS subdirectories contained in the snapshots.  However, Git
wants to get the whole history and does not benefit from having the
files of a single commit available in advance.
---
 ChangeLog |  2 +-
 INSTALL   | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 132d6ef7..6e63b9b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 The ChangeLog file has been removed. You can get the equivalent information
 by doing
 
-	$ cg log
+	$ git log
 
 in a checked out GIT tree, or using the gitweb interface available at:
 
diff --git a/INSTALL b/INSTALL
index 39ed5e34..1b83312c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,19 +11,14 @@ ECMAScript (that's JavaScript) support.
 
 ##########
 
-  In order to check out the latest tree from GIT (using Cogito):
+  In order to check out the latest tree from GIT:
 
-	$ cg clone check_file_SITES_for_value_of_this
+	$ git clone check_file_SITES_for_value_of_this
 	$ cd elinks
 
   To update your existing tree to the latest GIT version, do:
 
-	$ cg update
-
-  If you downloaded a nightly snapshot, and want to check out the latest tree
-from GIT in it, use the command:
-
-	$ cg clone -s check_file_SITES_for_value_of_this
+	$ git pull
 
   Note that if you obtained the sources directly from GIT, you NEED to run
 ./autogen.sh!  (It should be enough to do it once - however, if you have build

From ac7d17352a8d7db9e41af533917504ce95cb56b1 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 1 Jul 2008 02:21:46 +0300
Subject: [PATCH 11/43] INSTALL: autoconf-2.13 has not been supported for a
 while

---
 INSTALL | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index 1b83312c..4c17001f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -23,9 +23,8 @@ ECMAScript (that's JavaScript) support.
   Note that if you obtained the sources directly from GIT, you NEED to run
 ./autogen.sh!  (It should be enough to do it once - however, if you have build
 problems, try running this first.) Also, you obviously need GNU make and
-autoconf installed on your system (note that autoconf-2.13 is supported, newer
-ones may cause problems thanks to the autoconf developers who don't know how to
-maintain backwards compatibility).  Otherwise, you have to use the nightly GIT
+autoconf installed on your system (for the supported versions of autoconf,
+see AC_PREREQ in configure.in).  Otherwise, you have to use the nightly GIT
 snapshot - you don't need to do this there.
 
 

From 9b7de0a039871305023e20ae022bf10e72362424 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 1 Jul 2008 02:50:27 +0300
Subject: [PATCH 12/43] mkdist: create git-commit-id instead of .git/HEAD

.git/HEAD in elinks-0.12pre1.tar.gz broke git-import-orig in Debian's
git-buildpackage 0.4.33:

$ git init
Initialized empty Git repository in .git/
$ git-import-orig ~/src/elinks-seek/elinks-0.12pre1.tar.gz
Upstream version is 0.12pre1
Initial import of '/home/Kalle/src/elinks-seek/elinks-0.12pre1.tar.gz' ...
fatal: bad object HEAD
Traceback (most recent call last):
  File "/usr/bin/git-import-orig", line 243, in <module>
    sys.exit(main(sys.argv))
  File "/usr/bin/git-import-orig", line 201, in main
    import_upstream_tree(repo, orig_dir, version, options.filters, verbose=not is_empty)
  File "/usr/bin/git-import-orig", line 65, in import_upstream_tree
    if replace_source_tree(repo, src_dir, filters, verbose=True):
  File "/var/lib/python-support/python2.5/gbp/git_utils.py", line 145, in replace_source_tree
    return not repo.is_clean()[0]
  File "/var/lib/python-support/python2.5/gbp/git_utils.py", line 78, in is_clean
    if out[0].startswith('#') and out[1].strip().startswith(clean_msg):
IndexError: list index out of range

So let's try with a "git-commit-id" file outside of .git/ instead.
I also considered ".git-commit-id" but that could give the impression
that Git itself reads the file for some purpose.
---
 contrib/mkdist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mkdist b/contrib/mkdist
index 244a54e5..3c56dd79 100755
--- a/contrib/mkdist
+++ b/contrib/mkdist
@@ -107,7 +107,7 @@ tmpdir=$(mktemp -d -t elinks-dist-XXXXXXXX) || exit 1
 git --git-dir="$GIT_DIR" archive --format=tar --prefix="elinks/" "$rev" |
 	(cd -- "$tmpdir" && tar -xf -)
 mkdir -- "$tmpdir/elinks/.git"
-printf "%s\n" "$commit" > "$tmpdir/elinks/.git/HEAD"
+printf "%s\n" "$commit" > "$tmpdir/elinks/git-commit-id"
 
 (set -e
  cd -- "$tmpdir/elinks"

From d2a263ad4fd505be3117caef5f2708873355b37e Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 29 Jun 2008 14:10:12 +0300
Subject: [PATCH 13/43] NEWS: remove commented-out sections

---
 NEWS | 136 -----------------------------------------------------------
 1 file changed, 136 deletions(-)

diff --git a/NEWS b/NEWS
index c6a1046a..1a925696 100644
--- a/NEWS
+++ b/NEWS
@@ -10,17 +10,6 @@ ELinks 0.12.GIT now:
 
 To be released as ELinks 0.12.0.
 
-//////////////////////////////////////////////////////////////////////
-This list now contains all the important changes from ELinks 0.11.0 to
-ELinks 0.12.GIT (0b99fa70ca9d0f976655e61adee1a5eebacc0734) and related
-bug numbers.  Each section is sorted by severity and grouped by topic.
-
-The list no doubt includes several changes that are not really
-important enough.  Please move them to the separate "should be removed
-from NEWS" list below, or coalesce several changes into one entry (but
-do list all bug numbers).
-//////////////////////////////////////////////////////////////////////
-
 Notable new features:
 
 * enhancement 822: UTF-8 as terminal charset, not merely UTF-8 I/O
@@ -172,131 +161,6 @@ Changes in the experimental SGML/DOM implementation:
 * enhancement: incremental parsing
 * and more.
 
-//////////////////////////////////////////////////////////////////////
-The following changes should be removed from NEWS before ELinks 0.12.0
-is released.  They are currently listed here just to show that they
-have already been considered.
-
-* Only partially fixed bugs:
-  - (bugfix 764) int/long type punning in options
-  - (bugfix 890) Change colors 0-15 to match xterm defaults.
-    The bug report also requests asking xterm to report its palette,
-    but that part will be delayed to 0.13 or later.
-  - (bugfix 784) attributes corrupt character entity references if
-    terminal charset != document charset
-* Fixed bugs that were not in previous versions:
-  - (bugfix) Fix a crash when adding a server in the cookie manager.
-  - (bugfix) cookies: "Add Server" ignores "cookies.accept_policy".
-  - (bugfix) Fix data: protocol.
-  - (bugfix 747) Properly deselect the main menu instead of crashing
-  - (bugfix 778) ELinks crashes on binary files when
-    document.plain.display_links is set
-  - (bugfix 782) UTF-8 buffer overwritten while in use
-  - (bugfix) switch_to_tab: Prevent "tab number out of range"
-    assertion failure.
-  - (bugfix) Fixed about:
-  - (bugfix 821) I cannot enter national characters in dialog boxes
-  - (bugfix 834) Gzip decompression doesn't work
-  - (bugfix) Fix out-of-bound access to the quote_char buffer
-  - (bugfix 827) Crash with term charset set to Unicode and UTF-8 I/O
-    disabled
-  - (bugfix 826) too small table for double-cell characters
-  - (bugfix 902) crash: "overflow detected realloc()" in realloc_line
-  - (bugfix 912) wrong color in one cell of an HTML input field
-  - (bugfix 835) Text in textarea is unaffected by horizontal
-    scrolling of document in UTF-8 mode
-  - (bugfix 823) Big textarea is too slow with CONFIG_UTF8
-  - (bugfix 754) Pressing ESC do not pop up main menu anymore.
-  - (bugfix 794) tab-close-all-but-current crashes
-  - (bugfix 781) document->buf can overflow with UTF-8 enabled
-  - (bugfix 882) C1 controls pass through to the terminal if written
-    as entity references
-  - (bugfix 935) Yes and No buttons override the bottom border of the
-    dialog.
-  - (bugfix in SEE) Use frame->name instead of target avoiding
-    possible segfault.
-  - (bugfix 957) crash within js_Interpret: cx->fp points to freed
-    memory
-  - (bugfix 920) assertion priority >= prev_priority failed: queue is
-    not sorted
-  - (bugfix 968) assertion width > 0 failed in copy_chars called from
-    justify_line
-  - bug 1015: incompatible pointer type for PyString_AsStringAndSize
-  - bug 917: Going to unopened /dev/fd/ kills select_loop
-  - critical bug 976: ELinks crashes while browsing samba shares if
-    debuglevel = 1 in smb.conf
-* Already backported to a previous release but not listed there:
-  - (enhancement) Activate link only when onClick returns true.
-    Fixed bug 786 in ELinks 0.11.2.
-  - when the configure script cleans old object files, this no longer
-    causes it to loop.  Commit 564b67883b189a05839bcd2a30d8d4c6eb89c66d
-    in ELinks 0.11.1.
-  - don't include <sys/param.h> for MIN and MAX because it may interfere with
-    CONFIG_IPV6 on Linux.  Commit 63797ae9b331efd91be27512bd9d5b2e2ff74741
-    in ELinks 0.11.1.
-  - Debian bug 400872: include <sys/types.h> for off_t.
-    (Related to bug 936 but not the same.)
-    Commit 135a79a3c309af36cf963f1d3c34b07f296fa2f7 in ELinks 0.11.3.
-  - bug 107: recognize "localhost" in file: URIs.  Cannot reproduce in
-    earlier versions.
-  - fix compilation under gcc 4.x. Backported from gentoo portage.
-    Commit bcabd8b7951f3319199811088e607501296ee573 in ELinks 0.11.3.
-  - enhancement: avoid compilation of vernum.c in 'make install'
-  - bug 991: quote spaces in file names passed to external handlers
-* Reverted changes:
-  - (new feature) document.write, reverted in
-    2c087e52e74528a720621186b91880463e039d50
-  - (enhancement) restore Linux console mode (UTF-8 or not), reverted
-    in 10d72cae7eafa6b90db1c8f303deb200555734c2
-  - (enhancement) wcwidth, reverted in
-    d050cb67aa37390ab938b0a308c7541f19578506
-  - (new feature) Let plain text change colors with ESC [ 31 m or
-    similar control sequences, reverted in
-    2a6125e3d0407b588eb286d4d0ff5c98c23ebda9
-  - (enhancement) Support for pasting from GNU screen clipboard,
-    reverted in 763f03f146cc1391b303c8074556f0ddea1e3c7a
-  - enhancement 121: if a mailcap entry indicates 'copiousoutput',
-    ELinks itself acts as a pager
-* Unimportant changes: 
-  - (enhancement) If select fails, save its errno.
-  - (bugfix) Use PF_* instead of AF_* as first parameter of socket(2).
-    (commits 8b7657deaf6037736d0abe88bae1865fec55fe93 in 0.12.GIT
-    and d9b56bad7d528a87376768572c2601c57d8afb02 in 0.11.0.GIT)
-  - (bugfix) Better error handling in save_form_data_to_file and
-    save_textarea_file.
-    (commit 6bdc34cfbcade0c25922c1ad96c753cc7d1c9949 and nearby)
-  - (bugfix) Do not call toupper with potentially out-of-range values.
-    (commit 9e30ee631ced843f26a264c351cfa1716e7e1941)
-  - (bugfix) If ELinks logs debug information to a file, it now opens
-    that in binary mode.  (commit 4ced25779dca68c0e15ce1e695ce191b536bb05d)
-  - (bugfix) Kill the ESC timer when blocking the terminal.
-    (commit 539f756438fca4264ab937b2ccfba2351e916a16)
-  - (bugfix) Don't claim that the authentication is for HTTP.
-    (commit ef2f6383c6f0bed576e6f69030eacc4931b42a27)
-  - (enhancement) Reject invalid UTF-8 input from documents and
-    terminals
-  - (bugfix) Decode UTF-8 only from bytes, not from codes of special
-    keys.
-  - (enhancement) "Resize terminal" tries to use the window size
-    increment.
-  - (bugfix) Subprocess forked for SIGTSTP calls _exit, not exit.
-  - (enhancement) Tell the user how to move bookmarks.
-  - (enhancement) Localization updates.  For this to be important, we
-    should at least list the languages.
-  - (enhancement) Ctrl+characters don't trigger hotkeys in menus and
-    dialogs.
-  - (bitrot) Fix two warnings on Mac OS X.
-  * don't use cmp -b, which FreeBSD doesn't support.  This is commit
-    7a5f699a88c5fc89c510854b04702c16c30ece5a in src/dom/test/ which
-    is run only by "make test" rather than "make".
-  * support much longer locale-specific timestamps when formatting a
-    directory listing.  LC_TIME=fi_FI.UTF-8 now works.  Let's treat
-    this as part of the UTF-8 support.
-  * enhancement in user SMJS: elinks.alert no longer displays as an
-    "error"
-  * Really retry forever when connection.retries = 0
-//////////////////////////////////////////////////////////////////////
-
 ELinks 0.11.4:
 --------------
 

From c0ef72117d689b1a88f0b0377c652ae1615c62ce Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 1 Jul 2008 03:11:44 +0300
Subject: [PATCH 14/43] ELinks 0.12pre1

---
 NEWS                       |   6 +-
 configure.in               |   2 +-
 doc/man/man1/elinks.1.in   |   8 +-
 doc/man/man5/elinks.conf.5 |   8 +-
 doc/man/man5/elinkskeys.5  |   6 +-
 po/af.po                   | 573 ++++++++++++++++++----------------
 po/be.po                   | 599 +++++++++++++++++++-----------------
 po/bg.po                   | 607 +++++++++++++++++++------------------
 po/ca.po                   | 599 +++++++++++++++++++-----------------
 po/cs.po                   | 583 +++++++++++++++++++----------------
 po/da.po                   | 589 ++++++++++++++++++-----------------
 po/de.po                   | 580 +++++++++++++++++++----------------
 po/el.po                   | 599 +++++++++++++++++++-----------------
 po/es.po                   | 599 +++++++++++++++++++-----------------
 po/et.po                   | 599 +++++++++++++++++++-----------------
 po/fi.po                   | 576 ++++++++++++++++++-----------------
 po/fr.po                   |  83 +++--
 po/gl.po                   | 599 +++++++++++++++++++-----------------
 po/hr.po                   | 599 +++++++++++++++++++-----------------
 po/hu.po                   | 586 ++++++++++++++++++-----------------
 po/id.po                   | 599 +++++++++++++++++++-----------------
 po/is.po                   | 599 +++++++++++++++++++-----------------
 po/it.po                   | 581 ++++++++++++++++++-----------------
 po/lt.po                   | 599 +++++++++++++++++++-----------------
 po/nb.po                   | 599 +++++++++++++++++++-----------------
 po/nl.po                   | 599 +++++++++++++++++++-----------------
 po/pl.po                   | 337 ++++++++++----------
 po/pt.po                   | 599 +++++++++++++++++++-----------------
 po/pt_BR.po                | 599 +++++++++++++++++++-----------------
 po/ro.po                   | 599 +++++++++++++++++++-----------------
 po/ru.po                   | 599 +++++++++++++++++++-----------------
 po/sk.po                   | 576 +++++++++++++++++++----------------
 po/sr.po                   | 589 ++++++++++++++++++-----------------
 po/sv.po                   | 599 +++++++++++++++++++-----------------
 po/tr.po                   | 599 +++++++++++++++++++-----------------
 po/uk.po                   | 573 +++++++++++++++++-----------------
 36 files changed, 9342 insertions(+), 8303 deletions(-)

diff --git a/NEWS b/NEWS
index 1a925696..2338c679 100644
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,8 @@ You can see the complete list of recent changes, bugfixes and new features
 in the http://repo.or.cz/w/elinks.git[gitweb interface]. See the ChangeLog
 file for details.
 
-ELinks 0.12.GIT now:
---------------------
-
-To be released as ELinks 0.12.0.
+ELinks 0.12pre1:
+----------------
 
 Notable new features:
 
diff --git a/configure.in b/configure.in
index 7d32730f..a98cff93 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ AC_CONFIG_SRCDIR([src/main/main.c])
 AC_CONFIG_AUX_DIR(config)
 
 PACKAGE=elinks
-VERSION=0.12.GIT
+VERSION=0.12pre1
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version])
diff --git a/doc/man/man1/elinks.1.in b/doc/man/man1/elinks.1.in
index 3b0a5564..f82d52ba 100644
--- a/doc/man/man1/elinks.1.in
+++ b/doc/man/man1/elinks.1.in
@@ -1,11 +1,11 @@
 .\"     Title: elinks
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\"      Date: 05/03/2008
+.\"      Date: 07/01/2008
 .\"    Manual: The Elinks text-browser
-.\"    Source: ELinks 0.12.GIT
+.\"    Source: ELinks 0.12pre1
 .\"
-.TH "ELINKS" "1" "05/03/2008" "ELinks 0.12.GIT" "The Elinks text\-browser"
+.TH "ELINKS" "1" "07/01/2008" "ELinks 0.12pre1" "The Elinks text\-browser"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -263,7 +263,7 @@ Print
 ELinks
 version information and exit.
 .RE
-Generated using output from ELinks version 0.12.GIT.
+Generated using output from ELinks version 0.12pre1.
 .sp
 .SH "ENVIRONMENT VARIABLES"
 .PP
diff --git a/doc/man/man5/elinks.conf.5 b/doc/man/man5/elinks.conf.5
index 650aa1ae..a1586c59 100644
--- a/doc/man/man5/elinks.conf.5
+++ b/doc/man/man5/elinks.conf.5
@@ -1,11 +1,11 @@
 .\"     Title: elinks.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\"      Date: 05/03/2008
+.\"      Date: 07/01/2008
 .\"    Manual: ELinks configuration file
-.\"    Source: ELinks 0.12.GIT
+.\"    Source: ELinks 0.12pre1
 .\"
-.TH "ELINKS.CONF" "5" "05/03/2008" "ELinks 0.12.GIT" "ELinks configuration file"
+.TH "ELINKS.CONF" "5" "07/01/2008" "ELinks 0.12pre1" "ELinks configuration file"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -49,7 +49,7 @@ set protocol.user.mailto.unix = "mutt %h \-s \e"%s\e""
 .fi
 .RE
 .SH "OPTIONS"
-Generated using output from ELinks version 0.12.GIT.
+Generated using output from ELinks version 0.12pre1.
 .sp
 .SS "bookmarks (Bookmarks)"
 Bookmark options.
diff --git a/doc/man/man5/elinkskeys.5 b/doc/man/man5/elinkskeys.5
index 4d9304f6..fc3f6a4e 100644
--- a/doc/man/man5/elinkskeys.5
+++ b/doc/man/man5/elinkskeys.5
@@ -1,11 +1,11 @@
 .\"     Title: elinkskeys
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\"      Date: 03/08/2008
+.\"      Date: 06/30/2008
 .\"    Manual: ELinks keybindings
-.\"    Source: ELinks 0.12.GIT
+.\"    Source: ELinks 0.12pre1
 .\"
-.TH "ELINKSKEYS" "5" "03/08/2008" "ELinks 0.12.GIT" "ELinks keybindings"
+.TH "ELINKSKEYS" "5" "06/30/2008" "ELinks 0.12pre1" "ELinks keybindings"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
diff --git a/po/af.po b/po/af.po
index aa91d4d0..3ca172f1 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2006-09-25 17:13+0200\n"
 "Last-Translator: Friedel Wolff <fwolff@translate.org.za>\n"
 "Language-Team: <translate-discuss-af@translate.sourceforge.net>\n"
@@ -24,7 +24,7 @@ msgstr "Sluit"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -37,7 +37,7 @@ msgstr "Druk spasie om hierdie gids te laat oopvou."
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -154,7 +154,7 @@ msgstr "Soekstring '%s' nie gevind nie"
 msgid "Name"
 msgstr "Naam"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Slegte getal"
 
@@ -178,10 +178,10 @@ msgstr "Leƫ string word nie toegelaat nie"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 msgid "~Cancel"
 msgstr "~Kanseleer"
@@ -239,7 +239,7 @@ msgid "LED indicators"
 msgstr "LED-aanwysers"
 
 #: src/bfu/leds.c:306
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "What the different LEDs indicate:\n"
 "\n"
@@ -247,7 +247,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -550,15 +550,15 @@ msgstr "Gelaaide grootte"
 msgid "Content type"
 msgstr "Inhoudtipe"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Laas gewysig"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Enkodering"
 
@@ -566,7 +566,7 @@ msgstr "Enkodering"
 msgid "Flags"
 msgstr "Vlae"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "onvolledig"
 
@@ -737,7 +737,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr ""
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr ""
@@ -943,247 +943,267 @@ msgid "Move cursor left"
 msgstr ""
 
 #: src/config/actions-main.inc:57
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr ""
 
 #: src/config/actions-main.inc:58
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr ""
 
 #: src/config/actions-main.inc:59
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr ""
 
 #: src/config/actions-main.inc:60
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr ""
 
 #: src/config/actions-main.inc:61
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr ""
 
 #: src/config/actions-main.inc:62
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr ""
 
 #: src/config/actions-main.inc:63
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr ""
 
 #: src/config/actions-main.inc:64
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr ""
 
 #: src/config/actions-main.inc:65
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr ""
 
 #: src/config/actions-main.inc:66
-msgid "Move one link up"
+msgid "Move to the next link"
 msgstr ""
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
-msgid "Move downwards by a page"
+#: src/config/actions-main.inc:67
+msgid "Move to the previous link"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
-msgid "Move upwards by a page"
+#: src/config/actions-main.inc:68
+msgid "Move one link right"
 msgstr ""
 
 #: src/config/actions-main.inc:69
+msgid "Move one link right or to the next link"
+msgstr ""
+
+#: src/config/actions-main.inc:70
+msgid "Move one link up"
+msgstr ""
+
+#: src/config/actions-main.inc:71
+msgid "Move to the previous line with a link"
+msgstr ""
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
+msgid "Move downwards by a page"
+msgstr ""
+
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
+msgid "Move upwards by a page"
+msgstr ""
+
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "Open die huidige skakel in 'n nuwe oortjie"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 msgid "Open the current link in a new tab in the background"
 msgstr "Open die huidige skakel in 'n nuwe agtergrondoortjie"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "Open die huidige skakel in 'n nuwe venster"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Open 'n nuwe oortjie"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 msgid "Open a new tab in the background"
 msgstr "Open 'n nuwe agtergrondoortjie"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Open 'n nuwe venster"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr ""
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr ""
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr ""
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr ""
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 msgid "Re-render the current page"
 msgstr ""
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr ""
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr ""
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr ""
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr ""
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Stoor keuses"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "Stoor URL as"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr ""
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr ""
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr ""
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr ""
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr ""
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Sluit oortjie"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Sluit alle oortjies behalwe die huidige een"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr ""
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 msgid "Move the current tab to the left"
 msgstr ""
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 msgid "Move the current tab to the right"
 msgstr ""
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Volgende oortjie"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Vorige oortjie"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 msgid "Open the terminal resize dialog"
 msgstr ""
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "Wissel die vertoon van skakels na prente"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 msgid "Toggle mouse handling"
 msgstr ""
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "Wissel die vertoon van skakelnommers"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 msgid "Toggle wrapping of text"
 msgstr ""
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr ""
 
@@ -1253,56 +1273,56 @@ msgstr ""
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(verstek: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(verstek: \"%s\")"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(verstek: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 msgid "Configuration options"
 msgstr "Opstellingkeuses"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr "Gebruik: elinks [KEUSE]... [URL]..."
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 msgid "Options"
 msgstr "Keuses"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 msgid "Internal consistency error"
 msgstr ""
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1310,30 +1330,30 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr ""
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1341,91 +1361,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1434,57 +1454,57 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr ""
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1492,43 +1512,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1547,11 +1567,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1569,19 +1589,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1589,11 +1609,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1602,15 +1622,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1618,7 +1638,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1629,7 +1649,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1637,18 +1657,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1774,7 +1794,7 @@ msgstr "Kan nie 'n keuse hier byvoeg nie."
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 msgid "Sa~ve"
 msgstr "Stoo~r"
 
@@ -2032,7 +2052,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2041,7 +2061,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2053,7 +2073,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2418,11 +2438,12 @@ msgid "Use tabindex"
 msgstr "Gebruik TABINDEX"
 
 #: src/config/options.inc:326
+#, fuzzy
 msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 "Of die TABINDEX-volgorde gebruik moet word.\n"
 "Die TABINDEX-atribuut in HTML-elemente spesifiseer\n"
@@ -2471,7 +2492,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2560,7 +2581,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2659,9 +2680,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2671,7 +2692,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2843,7 +2864,8 @@ msgid "Ensure contrast"
 msgstr "Verseker kontras"
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+#, fuzzy
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Maak seker dat die voor- en agtergrondkleure nooit die selfde is nie."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -2923,8 +2945,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr ""
 
@@ -3063,7 +3086,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Wys superskrif (as ^iets)."
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3161,9 +3184,10 @@ msgid "Save interval"
 msgstr "Stoorinterval"
 
 #: src/config/options.inc:786
+#, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 "Interval waarna die stoor van veranderde inligtinglĆŖers\n"
 "in ~/.elinks geaktiveer moet word (sekondes; 0 deaktiveer)"
@@ -3726,7 +3750,7 @@ msgstr ""
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3736,7 +3760,7 @@ msgstr ""
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3813,7 +3837,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3825,7 +3849,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Taal"
 
@@ -3962,60 +3987,68 @@ msgstr ""
 msgid "Read error"
 msgstr "Leesfout"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Bools"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Heelgetal"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "Lang heelgegetal"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "String"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<str>"
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr ""
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<taal>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Kleur"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<kleur|#rrggbb>"
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "Spesiaal"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Gids"
 
@@ -4099,7 +4132,8 @@ msgid "Saving"
 msgstr "Stoor"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+#, fuzzy
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr "Of koekies van/na die skyf gelaai/gestoor moet word."
 
 #: src/cookies/cookies.c:121
@@ -4172,7 +4206,7 @@ msgid "~Reject"
 msgstr "~Keur af"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Bediener"
 
@@ -4288,40 +4322,40 @@ msgstr "Skakel se laaste besoektyd"
 msgid "Link title (from history)"
 msgstr "Skakeltitel (vanuit geskiedenis)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr ""
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ignoreer bedienerinstelling"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Laaste besoektyd"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Kopinligting"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 msgid "Internal header info"
 msgstr "Interne kopinligting"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Geen kopinligting."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Aflaai"
 
@@ -4397,7 +4431,7 @@ msgid "Download manager"
 msgstr "Aflaaibestuurder"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr "Ex-modus"
 
@@ -4606,7 +4640,8 @@ msgstr "~Boekmerk dokument"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Wissel ~html/gewoon"
 
 #. accelerator_context(tab_menu)
@@ -5753,30 +5788,31 @@ msgstr ""
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr ""
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -5835,7 +5871,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -5856,19 +5892,19 @@ msgstr ""
 msgid "Delete extension %s -> %s?"
 msgstr ""
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Uitbreiding"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Uitbreiding(s)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr ""
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Geen uitbreidings"
 
@@ -6008,7 +6044,7 @@ msgstr ""
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Interne fout"
@@ -6139,7 +6175,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6650,7 +6686,7 @@ msgstr "LĆŖers"
 msgid "Comment"
 msgstr "Kommentaar"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -6823,7 +6859,7 @@ msgstr "Wat wil u doen met die lĆŖer '%s'?"
 msgid "Information about the torrent"
 msgstr ""
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Hoe gemaak?"
 
@@ -6833,12 +6869,12 @@ msgid "Down~load"
 msgstr "~Laai af"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 msgid "~Display"
 msgstr "~Vertoon"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr "Wys ~kop"
 
@@ -6867,40 +6903,40 @@ msgstr ""
 msgid "CGI"
 msgstr "CGI"
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Plaaslike lĆŖers"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr ""
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -6908,7 +6944,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "LĆŖer"
 
@@ -7179,11 +7215,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7348,10 +7384,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7495,12 +7531,12 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "ECMAScript"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Aflaaifout"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -7509,7 +7545,7 @@ msgstr ""
 "Kon nie lĆŖer '%s' skep nie:\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7520,16 +7556,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' is 'n gids."
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "LĆŖer bestaan"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7545,54 +7581,50 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr "~Stoor onder die alternatiewe naam"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr "~Oorskryf die oorspronklike naam"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr "~Hervat die aflaai van die oorspronklike lĆŖer"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Onbekende soort"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Wat wil u doen met die lĆŖer '%s' (soort: %s%s%s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Wat wil u doen met die lĆŖer '%s' (soort: %s%s%s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Program ('%' sal vervang word met die lĆŖernaam)"
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr "Die afvoer van die program sal in die oortjie gewys word"
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 msgid "Block the terminal"
 msgstr "Blok die terminaal"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr "Die lĆŖer sal met die program '%s' oopgemaak word."
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 msgid "~Open"
 msgstr "~Open"
 
@@ -7607,13 +7639,13 @@ msgstr "Waarskuwing"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7621,12 +7653,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7707,7 +7739,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr ""
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8065,19 +8097,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Gaan na skakel"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Tik skakelnommer in"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Fout met stoor"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Fout met die skryf na die lĆŖer"
 
@@ -8091,3 +8123,6 @@ msgstr "Titel"
 #: src/viewer/viewer.c:25
 msgid "Viewer"
 msgstr "Bekykprogram"
+
+#~ msgid "The output of the program will be shown in the tab"
+#~ msgstr "Die afvoer van die program sal in die oortjie gewys word"
diff --git a/po/be.po b/po/be.po
index 31de5fff..512b51f9 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Yevgeny Gromov <yevgeny@tut.by>\n"
 "Language-Team: Belarusian <i18n@tut.by>\n"
@@ -21,7 +21,7 @@ msgstr "
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "¶ĪĘĮ"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -158,7 +158,7 @@ msgstr "
 msgid "Name"
 msgstr "¶ĶŃ"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "īŃŠŅĮצĢŲĪŁ Ģ¦Ė"
 
@@ -182,10 +182,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -251,7 +251,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -563,15 +563,15 @@ msgstr ""
 msgid "Content type"
 msgstr "ōŁŠ ÄĮĖÕĶÅĪŌĮ"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "įŠĻŪĪŃŃ ĶĮģʦĖĮĆŁŃ"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "ūŁĘŅ SSL"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "ėĮÄŚ¦ŅĻ®ĖĮ"
 
@@ -579,7 +579,7 @@ msgstr "
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ĪÅ ĆĮĢĖĮĶ"
 
@@ -764,7 +764,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -997,283 +997,308 @@ msgstr "
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "šĮŹĆ¦ ŠĮ ÓŠĮÓŁĢĆŁ"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "ėÕŅÓĮŅ ŠŅĮĶĮ×ÕĒĻĢŲĪ¦ĖĮĶ"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "õ ĘĻĪÅ"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "ėĮĶĮĪÄĪŁ ŅĮÄĻĖ"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 #, fuzzy
 msgid "Open options manager"
 msgstr "ķÜĪÜÄÖÜŅ ŠĮŅĮĶÅŌŅĮ®"
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "žĮĖĮĪĪÅ ŠĮĆ×ŃŅÄÖÜĪĪŃ ŠÅŅĮĪĮĖ¦ŅĮ×ĮĪĪŃ"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "šŅĮĒĢŃÄŚÅĆŲ צÄĮŅŁÓ"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "óĖĮŽĮĆŲ צÄĮŅŁÓ"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "žĮĖĮĪĪÅ ŠĮĆ×ŃŅÄÖÜĪĪŃ ŠÅŅĮĪĮĖ¦ŅĮ×ĮĪĪŃ"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "šŅĮĒĢŃÄŚÅĆŲ צÄĮŅŁÓ"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "óĖĮŽĮĆŲ צÄĮŅŁÓ"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "śĮČĮ×ĮĆŲ ĪĮÓŌŅĻŹĖ¦"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "śĮČĮ×ĮĆŲ URL ŃĖ"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "šĻŪÕĖ ŌÜĖÓŌĮ"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "šĻŪÕĖ ŌÜĖÓŌĮ"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "īĮÓŌŅĻŹĖ¦ ŌÜŅĶ¦ĪĮĢĮ"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "šĮÓĢĮĆŲ ĘĻŅĶÕ"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "šĮÓĢĮĆŲ ĘĻŅĶÕ ¦ ŠÅŅĮŚĮĒŅÕŚ¦ĆŲ"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "śĮĖŅŁĆŲ"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "óĖĮŽĮĆŲ צÄĮŅŁÓ"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "įÄĖŅŁĆŲ Õ ĪĻףĶ ĮĖĪÅ"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "ņĮĪÅŹ ŠĻŪÕĖÕ ĪÅ ĀŁĢĻ"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "īĮÓŌŅĻŹĖ¦ ŌÜŅĶ¦ĪĮĢĮ"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "šÅŅĮĖĢĄŽŁĆŲ HTML/ŌÜĖÓŌ"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "šÅŅĮĖĢĄŽŁĆŲ HTML/ŌÜĖÓŌ"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "šŅĮĒĢŃÄŚÅĆŲ צÄĮŅŁÓ"
@@ -1349,60 +1374,60 @@ msgstr "
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 #, fuzzy
 msgid "Template option folder"
 msgstr "÷ŁÄĮĢ¦ĆŲ ŠĮŅĮĶÅŌŅ"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "śĢÕŽÜĪĪŃ®"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "śĮČĮ×ĮĆŲ ĪĮÓŌŅĻŹĖ¦"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "õĪÕŌŅĮĪĮŃ ŠĮĶŁĢĖĮ"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1410,31 +1435,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "šĮÓĢĮĆŲ ĘĻŅĶÕ"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1442,91 +1467,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1535,58 +1560,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "īÅ ®ĖĮŚĮĪĮ ŠŅĮĒŅĮĶĮ ÄĢŃ"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1594,43 +1619,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1649,11 +1674,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1671,19 +1696,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1691,11 +1716,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1704,15 +1729,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1731,7 +1756,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1739,18 +1764,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1875,7 +1900,7 @@ msgstr "
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "śĮČĮ×ĮĆŲ"
@@ -2147,7 +2172,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2156,7 +2181,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2168,7 +2193,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2537,7 +2562,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2582,7 +2607,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2676,7 +2701,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2780,9 +2805,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2792,7 +2817,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2968,7 +2993,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3051,8 +3076,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "ėĻÄĮ×ĮŃ ÓŌĮŅĻĪĖĮ"
 
@@ -3206,7 +3232,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3309,7 +3335,7 @@ msgstr "
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3901,7 +3927,7 @@ msgstr "
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3912,7 +3938,7 @@ msgstr "
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3993,7 +4019,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -4005,7 +4031,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "ķĻ×Į"
 
@@ -4150,62 +4177,70 @@ msgstr ""
 msgid "Read error"
 msgstr "šĮĶŁĢĖĮ ŚĮČĮ×ĮĪĪŃ"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "ĢĮĒ¦ŽĪŁ"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "ĆÜĢŁ Ģ¦Ė"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "ÄĻ®Ē¦ ĆÜĢŁ Ģ¦Ė"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "ŅĮÄĻĖ"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "ėĻÄĮ×ĮŃ ÓŌĮŅĻĪĖĮ"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "ķĻ×Į"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "ėĻĢÅŅ"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "šĮŠĖĮ"
 
@@ -4276,7 +4311,7 @@ msgid "Saving"
 msgstr "Õ ÓŃŅÜÄĪÅĶ"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4352,7 +4387,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "óÅŅ×ÅŅ"
 
@@ -4482,41 +4517,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "ŠŅŁĪŃŌĮ"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "¦ĒĪĻŅŁŅĮ×ĮĆŲ ĪĮÓŌŅĻŹĖ¦ ÓÅŅ×ÅŅĮ"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "äĮŌĮ"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "įŠĻŪĪ¦ Ś×ĮŅĻŌ"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "īÅ×ŃÄĻĶĮ"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "¶ĪĘĮ ŠŅĮ ŚĮĒĮĢĻ×ĮĖ"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "¶ĪĘĮ ŠŅĮ ŚĮĒĮĢĻ×ĮĖ"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "śĮĖĮŽĖĮ"
 
@@ -4600,7 +4635,7 @@ msgid "Download manager"
 msgstr "óĖĮŽĮĆŲ צÄĮŅŁÓ"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4806,7 +4841,8 @@ msgstr "
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "šÅŅĮĖĢĄŽŁĆŲ HTML/ŌÜĖÓŌ"
 
 #. accelerator_context(tab_menu)
@@ -6017,31 +6053,32 @@ msgstr "
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "ņĮÓŪŁŅÜĪĪ¦ ĘĮŹĢĮ®"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6100,7 +6137,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6121,19 +6158,19 @@ msgstr "
 msgid "Delete extension %s -> %s?"
 msgstr "÷ŁÄĮĢ¦ĆŲ ŅĮÓŪŁŅÜĪĪÅ"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "ņĮÓŪŁŅÜĪĪÅ"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "ņĮÓŪŁŅÜĪĪ¦"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "ōŁŠ ŚĶÅÓŌÕ"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "īŃĶĮ ŅĮÓŪŁŅÜĪĪŃ®"
 
@@ -6278,7 +6315,7 @@ msgstr "
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "õĪÕŌŅĮĪĮŃ ŠĮĶŁĢĖĮ"
@@ -6412,7 +6449,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6954,7 +6991,7 @@ msgstr "
 msgid "Comment"
 msgstr "ÄĮĖÕĶÅĪŌĮ®"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7137,7 +7174,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "óĖĮŽĮĆŲ צÄĮŅŁÓ"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "ūŌĻ ŅĮĀ¦ĆŲ?"
 
@@ -7148,13 +7185,13 @@ msgid "Down~load"
 msgstr "śĮĖĮŽĖĮ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "šĮĖĮŚĮĆŲ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7185,42 +7222,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "ĘĮŹĢĮ®"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "īŃĶĮ ŅĮÓŪŁŅÜĪĪŃ®"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7228,7 +7265,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "ęĮŹĢ"
@@ -7501,11 +7538,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7673,10 +7710,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7821,19 +7858,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "įŠ¦ÓĮĪĪÅ"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "šĮĶŁĢĖĮ ŚĮĖĮŽĖ¦"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "īÅĶĮĒŽŁĶĮ ŚĮŠ¦ÓĮĆŲ Õ ĘĮŹĢ"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7841,17 +7878,17 @@ msgid ""
 "%s"
 msgstr "šĮĶŁĢĖĮ ŚĮĖĮŽĖ¦"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "ņĮÓŪŁŅÜĪĪ¦ ĘĮŹĢĮ®"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7862,55 +7899,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "īÅ×ŃÄĻĶŁ ŌŁŠ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "ōÜŅĶ¦ĪĮĢ BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "įÄĖŅŁĆŲ"
@@ -7926,13 +7959,13 @@ msgstr "
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7940,12 +7973,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8017,7 +8050,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "īÅĶĮĒŽŁĶĮ ŚĮŠ¦ÓĮĆŲ Õ ĘĮŹĢ"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8397,19 +8430,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "šĮŹĆ¦ ŠĮ ÓŠĮÓŁĢĆŁ"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "õ×ŃÄŚ¦ĆÅ ĪÕĶĮŅ ÓŠĮÓŁĢĖ¦"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "šĮĶŁĢĖĮ ŚĮČĮ×ĮĪĪŃ"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "šĮÓŁĢĖĮ ŚĮŠ¦ÓÕ ® ĘĮŹĢ"
 
diff --git a/po/bg.po b/po/bg.po
index 31e4295e..961a2caa 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Dimitar Dimitrov <mitaka_ddd@yahoo.com>\n"
 "Language-Team: Bulgarian <bg-team@bash.info>\n"
@@ -25,7 +25,7 @@ msgstr "
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Čķōīšģąöč’"
 
@@ -38,7 +38,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -174,7 +174,7 @@ msgstr "
 msgid "Name"
 msgstr "Čģå"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Ķåāąėčäķī ÷čńėī"
 
@@ -198,10 +198,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -267,7 +267,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -587,15 +587,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Ņčļśņ ķą äīźóģåķņą å"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Ļīńėåäķą ģīäčōčźąöč’"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "SSL ųčōśš"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Źīäčšąķå"
 
@@ -603,7 +603,7 @@ msgstr "
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ķåēąāśšųåķ"
 
@@ -797,7 +797,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Įėīźīā źóšńīš"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -1028,282 +1028,307 @@ msgstr "
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
-msgstr "Įėīźīā źóšńīš"
+msgid "Move cursor to the start of the line"
+msgstr "Īņčäč ā ķą÷ąėīņī ķą ńņšąķčöąņą/šåäą"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Įėīźīā źóšńīš"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
+msgid "Move cursor up"
+msgstr "Įėīźīā źóšńīš"
+
+#: src/config/actions-main.inc:60
+#, fuzzy
 msgid "Move to the end of the document"
 msgstr "Īņčäč ā źšą’ ķą ńņšąķčöąņą/šåäą"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 #, fuzzy
 msgid "Move to the start of the document"
 msgstr "Īņčäč ā ķą÷ąėīņī ķą ńņšąķčöąņą/šåäą"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 #, fuzzy
 msgid "Move one link down"
 msgstr "Įėīźīā źóšńīš"
 
-#: src/config/actions-main.inc:62
-#, fuzzy
-msgid "Move one link left"
-msgstr "Įėīźīā źóšńīš"
-
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Įėīźīā źóšńīš"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Įėīźīā źóšńīš"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Įėīźīā źóšńīš"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Įėīźīā źóšńīš"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Įėīźīā źóšńīš"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Įėīźīā źóšńīš"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Įėīźīā źóšńīš"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Īņāīšč āšśēźą"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Įėīźīā źóšńīš"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Īņāīšč ā ķīā ļšīēīšåö"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Īņāīšč ā ķīā ļšīēīšåö"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Īņāīšč ā ķīā ļšīēīšåö"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Īņāīšč ā ķīā ļšīēīšåö"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Āśā ōīķīā šåęčģ"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Īņāīšč ā ķīā ļšīēīšåö"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Źīģąķäåķ šåä"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Īņāīšč óļšąāėåķčåņī ķą ķąńņšīéźčņå"
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Ī÷ąźāą ńå ļīņāšśęäåķčå ķą ļšåļšąłąķåņī"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Ļīźąęč čēīįšąęåķčå"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Ļšåģåńņč źóšńīšą ķąäīėó"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Ī÷ąźāą ńå ļīņāšśęäåķčå ķą ļšåļšąłąķåņī"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Ļīźąęč čēīįšąęåķčå"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Ļšåģåńņč źóšńīšą ķąäīėó"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "Ēąļąēč ķąńņšīéźčņå"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Ēąļąēč URL źąņī"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Ņśšńåķå ķą ņåźńņ"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Ņśšńåķå ķą ņåźńņ"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Ķąńņšīéźč ķą ņåšģčķąėą"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Ļīņāśšäč ōīšģóė’š"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Ļīņāśšäč ōīšģóė’š č ļšåēąšåäč"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Ēąņāīšč"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Ļšåģåńņč źóšńīšą ķąäīėó"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Īņāīšč Ōąéė ģåķžņī"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Īņāīšč ā ķīā ļšīēīšåö"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Īņāīšč ā ķīā ļšīēīšåö"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Ķ’ģą ļšåäčųķī ņśšńåķå"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Ķąńņšīéźč ķą ņåšģčķąėą"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Ļšåāźėž÷č HTML/ņåźńņ"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Ļšåāźėž÷č HTML/ņåźńņ"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Ļīźąęč čēīįšąęåķčå"
@@ -1379,59 +1404,59 @@ msgstr "
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Āšśēźą(č)"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Ēąļąēč ķąńņšīéźčņå"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Āśņšåųķą ćšåųźą"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1439,31 +1464,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Ļīņāśšäč ōīšģóė’š"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1471,91 +1496,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1564,58 +1589,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Ķå å ļīńī÷åķą ļšīćšąģą ēą"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1623,43 +1648,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1678,11 +1703,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1700,19 +1725,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1720,11 +1745,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1733,15 +1758,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1749,7 +1774,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1760,7 +1785,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1768,18 +1793,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1905,7 +1930,7 @@ msgstr "
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Ēąļąēāąķå"
@@ -2177,7 +2202,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2186,7 +2211,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2198,7 +2223,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2566,7 +2591,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2611,7 +2636,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2705,7 +2730,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2810,9 +2835,9 @@ msgstr "
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2822,7 +2847,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2998,7 +3023,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3081,8 +3106,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Źīäčšąķå"
 
@@ -3235,7 +3261,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3338,7 +3364,7 @@ msgstr "
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3929,7 +3955,7 @@ msgstr "
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3940,7 +3966,7 @@ msgstr "
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -4020,7 +4046,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -4032,7 +4058,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4177,62 +4204,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Ćšåųźą ļšč ēąļąēāąķå"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Źīäčšąķå"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Åēčź"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Öā’ņ"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4303,7 +4338,7 @@ msgid "Saving"
 msgstr "ńšåäķī"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4379,7 +4414,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Ńåšāśš"
 
@@ -4521,41 +4556,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "ļščåņī"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "čćķīščšąķå ķą ķąńņšīéźčņå ķą ńśšāśšą"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Äąņą"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Āšåģå ķą ļīńėåäķī ļīńåłåķčå"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Ķå ńå ēķąå"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Čķōīšģąöč’ ķą ēąćėąāķąņą ÷ąńņ"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Čķōīšģąöč’ ķą ēąćėąāķąņą ÷ąńņ"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Ńāąėč (äšśļķč, čēņåćėč)"
 
@@ -4647,7 +4682,7 @@ msgid "Download manager"
 msgstr "Ńāąėč čēīįšąęåķčå"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4862,7 +4897,8 @@ msgstr "
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Ļšåāźėž÷č HTML/ņåźńņ"
 
 #. accelerator_context(tab_menu)
@@ -6084,31 +6120,32 @@ msgstr "
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Ōąéėīāč šąēųčšåķč’"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6167,7 +6204,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6188,19 +6225,19 @@ msgstr "
 msgid "Delete extension %s -> %s?"
 msgstr "Čēņščé šąēųčšåķčå"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Šąēųčšåķčå"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Šąēųčšåķčå(’)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Ņčļ ķą ńśäśšęąķčåņī"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Ķ’ģą šąēųčšåķč’"
 
@@ -6345,7 +6382,7 @@ msgstr "
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Āśņšåųķą ćšåųźą"
@@ -6478,7 +6515,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -7025,7 +7062,7 @@ msgstr "
 msgid "Comment"
 msgstr "äīźóģåķņč"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7210,7 +7247,7 @@ msgstr "HTTP 100 (???)"
 msgid "Information about the torrent"
 msgstr "Ļšåģåńņč źóšńīšą ķąäīėó"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Źąźāī äą ļšąā’?"
 
@@ -7221,13 +7258,13 @@ msgid "Down~load"
 msgstr "Ńāąėč (äšśļķč, čēņåćėč)"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Ļīźąēāąķå"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7258,42 +7295,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "ōąéėą"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Ķ’ģą šąēųčšåķč’"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7301,7 +7338,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "Ōąéė"
@@ -7572,11 +7609,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7745,10 +7782,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7894,19 +7931,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "Īļčńąķčå"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Ćšåųźą ļšč ńāąė’ķå"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Ķå ģīęå äą ńå ļčųå āśā ōąéė"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7914,17 +7951,17 @@ msgid ""
 "%s"
 msgstr "Ćšåųźą ļšč ńāąė’ķå"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Ōąéėīāč šąēųčšåķč’"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7935,57 +7972,53 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 #, fuzzy
 msgid "~Overwrite the original file"
 msgstr "Ēąļčųč ļīä äšóćī čģå"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 #, fuzzy
 msgid "~Resume download of the original file"
 msgstr "Ļšīäśėęč ņåćėåķåņī ķą īščćčķąėķč’ ōąéė"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Ķåļīēķąņ ņčļ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, fuzzy, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "HTTP 100 (???)"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "HTTP 100 (???)"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "BeOS ņåšģčķąė"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Īņāīšč"
@@ -8001,13 +8034,13 @@ msgstr "
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -8015,12 +8048,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8096,7 +8129,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Ķå ģīęå äą ńå ļčųå āśā ōąéė"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8474,19 +8507,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Īņāīšč āšśēźą"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Āśāåäåņå ķīģåš ķą āšśēźą"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Ćšåųźą ļšč ēąļąēāąķå"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Ćšåųźą ļšč ēąļčń āśā ōąéė"
 
diff --git a/po/ca.po b/po/ca.po
index 339a3454..6756b07e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Carles Sadurnķ Anguita <isard@ctv.es>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -21,7 +21,7 @@ msgstr "Tancar"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Informació"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "No s'ha trobat la cadena"
 msgid "Name"
 msgstr "Nom"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Nombre incorrecte"
 
@@ -181,10 +181,10 @@ msgstr "No s'hi permeten cadenes buides"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "El contingut és"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Śltima modificació"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "incomplet"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "cursor de bloc"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "cursor de bloc"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "cursor de bloc"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "cursor de bloc"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "cursor de bloc"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "cursor de bloc"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Anar a l'enllaē"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "cursor de bloc"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Segon pla"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~OS shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Esperant confirmació per a la redirecció"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Veure ~imatge"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Descarregar imat~ge"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Esperant confirmació per a la redirecció"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Veure ~imatge"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Descarregar imat~ge"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "Desar opcions"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Anomenar la ~URL i desar-la"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Cercar text"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Cercar text"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opcions del terminal"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Enviar formulari"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Trametre formulari i ~descarregar"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Tancar"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Descarregar imat~ge"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Obrir en una finestra nova"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "No hi ha recerca prčvia"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opcions del terminal"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Canviar ~html/text"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Canviar ~html/text"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Veure ~imatge"
@@ -1339,59 +1364,59 @@ msgstr "Sense marcs"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Connexions"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Desar opcions"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Error intern"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Enviar formulari"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "No hi ha cap programa especificat per a"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Desar"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Pągina de codis"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "Error mentre desava"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "Llista"
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "Llista"
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Error mentre desava"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Pągina de codis"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Idioma"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Color"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "mitją"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Servidor"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "suposat"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Ignora la indicació del servidor"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Capēaleres"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Capēaleres"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Descarregar"
 
@@ -4570,7 +4605,7 @@ msgid "Download manager"
 msgstr "Descarregar imat~ge"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4783,7 +4818,8 @@ msgstr "documents"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Canviar ~html/text"
 
 #. accelerator_context(tab_menu)
@@ -5985,31 +6021,32 @@ msgstr "Cap programa"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "~Extensions de fitxers"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6068,7 +6105,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6089,19 +6126,19 @@ msgstr "Esborrar extensions"
 msgid "Delete extension %s -> %s?"
 msgstr "Esborrar extensions"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Extensió"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Extensions"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tipus de contingut"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "No hi ha extensions"
 
@@ -6246,7 +6283,7 @@ msgstr "Excepci
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Error intern"
@@ -6379,7 +6416,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6920,7 +6957,7 @@ msgstr "~Fitxer"
 msgid "Comment"
 msgstr "documents"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7103,7 +7140,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Descarregar imat~ge"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Quč en fem?"
 
@@ -7114,13 +7151,13 @@ msgid "Down~load"
 msgstr "Descarregar"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Mostrar"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7151,42 +7188,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "fitxers"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "No hi ha extensions"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7194,7 +7231,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Fitxer"
@@ -7463,11 +7500,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7635,10 +7672,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7781,19 +7818,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Error de descąrrega"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "No s'ha pogut crear el fitxer"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7801,17 +7838,17 @@ msgid ""
 "%s"
 msgstr "Error mentre descarregava"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "~Extensions de fitxers"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7822,55 +7859,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tipus desconegut"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Terminal ~BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Obrir"
@@ -7886,13 +7919,13 @@ msgstr "Alerta"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7900,12 +7933,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7978,7 +8011,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "No s'ha pogut crear el fitxer"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8355,19 +8388,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Anar a l'enllaē"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Introduļu nśmero d'enllaē"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Error mentre desava"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Error mentre escrivia el fitxer"
 
diff --git a/po/cs.po b/po/cs.po
index 10a3b433..1cd51823 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2005-01-04 00:42+0100\n"
 "Last-Translator: Petr Baudis <pasky@ucw.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.souceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr "Zav
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Informace"
 
@@ -34,7 +34,7 @@ msgstr "Zm
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -154,7 +154,7 @@ msgstr "Nena
 msgid "Name"
 msgstr "Nįzev"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "©patné čķslo"
 
@@ -178,10 +178,10 @@ msgstr "Napi
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -246,7 +246,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -555,15 +555,15 @@ msgstr "Sou
 msgid "Content type"
 msgstr "Typ obsahu"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Poslednķ zmģna"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "SSL ¹ifra"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Kódovįnķ"
 
@@ -571,7 +571,7 @@ msgstr "K
 msgid "Flags"
 msgstr "Pųķznaky"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "neśplnż"
 
@@ -746,7 +746,7 @@ msgstr "Vlo
 msgid "Move to the previous item"
 msgstr "Pųesunout se na pųedchozķ polo¾ku"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Pųekresli terminįl"
@@ -955,250 +955,275 @@ msgid "Move cursor left"
 msgstr "Posunout kurzor doleva"
 
 #: src/config/actions-main.inc:57
+#, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "Jķt na začįtek ųįdky či strįnky"
+
+#: src/config/actions-main.inc:58
 msgid "Move cursor right"
 msgstr "Posunout kurzot doprava"
 
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 msgid "Move cursor up"
 msgstr "Pųesunout kurzor smģrem nahoru"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 msgid "Move to the end of the document"
 msgstr "Jķt na konec dokumentu"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 msgid "Move to the start of the document"
 msgstr "Jķt na začįtek dokumentu"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 msgid "Move one link down"
 msgstr "Pųesunout se o odkaz nķ¾e"
 
-#: src/config/actions-main.inc:62
-msgid "Move one link left"
-msgstr "Pųesunout se o odkaz vlevo"
-
 #: src/config/actions-main.inc:63
-msgid "Move to the next link"
+#, fuzzy
+msgid "Move to the next line with a link"
 msgstr "Pųesunout se na nįsledujķcķ odkaz"
 
 #: src/config/actions-main.inc:64
+msgid "Move one link left"
+msgstr "Pųesunout se o odkaz vlevo"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "Pųesunout se na pųedchozķ odkaz"
+
+#: src/config/actions-main.inc:66
+msgid "Move to the next link"
+msgstr "Pųesunout se na nįsledujķcķ odkaz"
+
+#: src/config/actions-main.inc:67
 msgid "Move to the previous link"
 msgstr "Pųesunout se na pųedchozķ odkaz"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 msgid "Move one link right"
 msgstr "Pųesunout se o odkaz vpravo"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Pųesunout se na nįsledujķcķ odkaz"
+
+#: src/config/actions-main.inc:70
 msgid "Move one link up"
 msgstr "Pųesunout se o odkaz vż¹e"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Pųesunout se na pųedchozķ odkaz"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "Pųesunout se o strįnku nķ¾e"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "Pųesunout se o strįnku vż¹e"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "Otevųķt odkaz v novém tabu"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Otevųķt odkaz v novém tabu na pozadķ"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "Otevųķt odkaz v novém oknģ"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Otevųķt novż tab"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Otevųķt novż tab na pozadķ"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Otevųķt nové okno"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr "OS shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Sprįvce nastavenķ"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "Otevųķt dialog potvrzujķcķ ukončenķ ELinksu"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "Skončit bez ptanķ"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "Obnovit současnou strįnku"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 msgid "Re-render the current page"
 msgstr "Pųekreslit současnou strįnku"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "Zresetovat formulįų do płvodnķho stavu"
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr "Zobrazenķ informacķ o pou¾itżch zdrojķch"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr "Vypsat aktuįlnķ dokument ve zdrojové podobģ"
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr "Ulo¾it aktuįlnķ dokument ve zformįtované podobģ"
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Ulo¾it nastavenķ"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "Ulo¾ URL pod jménem"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "Posun v textu dolł"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "Posun v textu doleva"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "Posun v textu doprava"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "Posun v textu nahoru"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "Hledįnķ textu"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "Zpģtné hledįnķ textu"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr "Interaktivnķ hledįnķ v textu odkazł"
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr "Interaktivnķ hledįnķ v textu"
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr "Interaktivnķ zpģtné hledįnķ v textu"
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "Nastavenķ terminįlu"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr "Odeslat formulįų"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr "Odeslat formulįų a obnovit vżslednou strįnku"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Zavųķt tab"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Zavųķt v¹echny kromģ tohohle"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr "Pųedat URI aktuįlnķho tabu externķmu pųķkazu"
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "Otevųķt kontextové menu tabu"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 msgid "Move the current tab to the left"
 msgstr "Pųesunout současnż tab doleva"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 msgid "Move the current tab to the right"
 msgstr "Pųesunout současnż tab doprava"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Dal¹ķ tab"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Pųedchozķ tab"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 msgid "Open the terminal resize dialog"
 msgstr "Otevųķt okno zmģny velikosti terminįlu"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr "Pųepnout pou¾ķvįnķ kaskįdovżch stylł (CSS)"
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "Pųepnout zobrazovįnķ odkazł na obrįzky"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr "Pųepnout zobrazovįnķ tabulek"
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr "Pou¾ķvat barvy dokumentu"
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr "Pųepnout zobrazenķ strįnky jako HTML nebo čistż text"
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Pųepnout uklįdįnķ"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "Pųepnout čķslovįnķ odkazł"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr "Pųepnout slučovįnķ prįzdnżch ųįdkł"
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 msgid "Toggle wrapping of text"
 msgstr "Pųepnout zalamovįnķ textu"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr "Zobrazit obrįzek"
 
@@ -1270,57 +1295,57 @@ msgstr "Chyb
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr "Metoda v uvedeném -remote pųķkazu nenķ podporovįna"
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr "©ablonovį slo¾ka"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(vżchozķ: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(vżchozķ: \"%s\")"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr "(alias pro %s)"
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(vżchozķ: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 msgid "Configuration options"
 msgstr "Konfiguračnķ volby"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 #, fuzzy
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr "Pou¾itķ: elinks [PŲEPĶNAČ]... [URL]"
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 msgid "Options"
 msgstr "Nastavenķ"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 msgid "Internal consistency error"
 msgstr "Chyba vnitųnķ inkonzistence"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "Omezenķ na anonymnķ re¾im."
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 #, fuzzy
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
@@ -1333,30 +1358,30 @@ msgstr ""
 "jsou značnģ omezeny mo¾nosti zmģn konfigurace a jsou znemo¾nģny\n"
 "dal¹ķ potenciįlnģ nebezpečné akce."
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Automatické odeslįnķ prvnķho formulįųe"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr "Jdi a ode¹li prvnķ formulįų, na kterż narazķ¹ na danżch URL."
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr "Naklonovįnķ internķch sezenķ s danżm ID"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "Jméno adresįųe s konfiguračnķm souborem"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1368,22 +1393,22 @@ msgstr ""
 "cestu, jinak se pųedpoklįdį, ¾e je relativnķ k va¹emu domovskému\n"
 "adresįųi."
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 #, fuzzy
 msgid "Print default configuration file to stdout"
 msgstr "Zobrazenķ nįpovģdy pro konfiguračnķ volby"
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "Jméno konfiguračnķho souboru"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
@@ -1393,72 +1418,72 @@ msgstr ""
 "nastavenķ a bude se tam i zpģt zapisovat. Jméno by mģlo bżt relativnķ k\n"
 "parametru config-dir."
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "Zobrazenķ nįpovģdy pro konfiguračnķ volby"
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr "Zobrazenķ nįpovģdy pro konfiguračnķ volby a ukončenķ progrmau."
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr "Pųedpoklįdanż MIME typ pro neznįmé dokumenty"
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr "Vżchozķ MIME typ, kterż bych mģl pųedpoklįdat u neznįmżch dokumentł."
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr "Ignorovat u¾ivatelské nastavenķ klįves"
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr "Vypsįnķ zformįtované verze daného URL na standardnķ vżstup"
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr "Vypsįnķ zformįtované verze daného URL na standardnķ vżstup"
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "Kódovį strįnka, ve které by mģl bżt prezentovįn vżstup -dump"
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr "Kódovį strįnka pou¾itį pųi formįtovįnķ dump vżstupu."
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 #, fuzzy
 msgid "Color mode used with -dump"
 msgstr "Kódovį strįnka, ve které by mģl bżt prezentovįn vżstup -dump"
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 #, fuzzy
 msgid "Color mode used with -dump."
 msgstr "Kódovį strįnka, ve které by mģl bżt prezentovįn vżstup -dump"
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "©ķųka dokumentu zformįtovaného pomocķ -dump"
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "©ķųka vżstupu parametru -dump."
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr "Vyhodnocenķ daného konfiguračnķho pųķkazu"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1470,11 +1495,11 @@ msgstr ""
 "\t-eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr "Interpretuj dokumenty neznįmżch typł jako HTML"
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 #, fuzzy
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
@@ -1484,46 +1509,46 @@ msgstr ""
 "Tato volba ųekne ELinksu, aby pųedpoklįdal, ¾e soubory, které uvidķ, jsou\n"
 "v HTML. Tento parametr je ekvivalentnķ -default-mime-type text/html."
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "Zobrazenķ nįpovģdy a ukončenķ programu"
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "Zobrazenķ nįpovģdy a ukončenķ programu."
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "Povolit pouze mķstnķ spojenķ"
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "Zobrazenķ detailnķ nįpovģdy a ukončenķ programu"
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr "Zobrazenķ detailnķ nįpovģdy a ukončenķ programu."
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "Vyhledįnķ specifikovaného hostitele"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr "Vyhledį daného hostitele a vypķ¹e v¹echny IP adresy zji¹tģné pųes DNS."
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "Spu¹tģnķ oddģlené instance programu"
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1535,22 +1560,22 @@ msgstr ""
 "zapisovat ¾įdné konfiguračnķ soubory (ani bookmarky, historii apod.).\n"
 "Viz také parametr -touch-files."
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr "Nepou¾ķvat soubory v ~/.elinks"
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr "Nečķslovat odkazy v dump vżstupu"
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 #, fuzzy
 msgid ""
 "Prevents printing of link number in dump output.\n"
@@ -1560,11 +1585,11 @@ msgstr ""
 "pųi -dump vżstupu; to bylo vżchozķ chovįnķ a¾ do 0.5pre12. Mģjte na pamģti,\n"
 "¾e se tento parametr tżkį jen a pouze --dump."
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr "Nezobrazovat seznam odkazł v dump vżstupu"
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 #, fuzzy
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
@@ -1575,11 +1600,11 @@ msgstr ""
 "pųi -dump vżstupu; to bylo vżchozķ chovįnķ a¾ do 0.5pre12. Mģjte na pamģti,\n"
 "¾e se tento parametr tżkį jen a pouze --dump."
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "Ovlįdįnķ ji¾ spu¹tģného ELinksu"
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1598,11 +1623,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr "Pųipojenķ do skupiny sezenķ s danżm ID"
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1633,20 +1658,20 @@ msgstr ""
 "nebudou na disk uklįdįny ¾įdné konfiguračnķ soubory - viz parametr\n"
 "-touch-files."
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr "Vypsat danou URL ve zdrojové podobģ na standardnķ vżstup"
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr "Vypsat danż dokument ve zdrojové podobģ na standardnķ vżstup."
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 "Pou¾ķvat soubory v ~/.elinks i pųi spu¹tģnķ s -no-connect/-session-ring"
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1657,11 +1682,11 @@ msgstr ""
 "apod.) budou uklįdįny na disk i v pųķpadģ, ¾e byl pou¾it parametr\n"
 "-no-connect či -session-ring. Jinak nemį tento parametr ¾įdnż vżznam."
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr "Vypisovįnķ dodatečnżch informacķ"
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1670,15 +1695,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Vypsįnķ informace o verzi programu a jeho ukončenķ"
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "Vypsįnķ informace o verzi programu a jeho ukončenķ."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1691,7 +1716,7 @@ msgstr ""
 "## hodnoty voleb a ve¹keré va¹e formįtovįnķ, vlastnķ komentįųe a tak\n"
 "## dįle budou ponechįny tak, jak jsou.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgstr ""
 "## includujete, nepočķtį se jako chybģjķcķ! Ve¹keré va¹e formįtovįnķ,\n"
 "## vlastnķ komentįųe a tak dįle budou ponechįny tak, jak jsou.\n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1721,7 +1746,7 @@ msgstr ""
 "## poka¾dé, kdy¾ uklįdįte nastavenķ pųes u¾ivatelské rozhranķ. A s va¹ķm\n"
 "## vlastnķm formįtovįnķm a komentįųema se mł¾ete jķt klouzat.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1731,11 +1756,11 @@ msgstr ""
 "## mł¾ete to ovlivnit zmģnou volby config.saving_style. No tak, nejsme\n"
 "## nakonec docela fajn?\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "Automaticky ulo¾ené nastavenķ\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Automaticky ulo¾ené klįvesové vazby\n"
 
@@ -1864,7 +1889,7 @@ msgstr "Do t
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Ulo¾it"
@@ -2165,7 +2190,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2174,7 +2199,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2186,7 +2211,7 @@ msgstr "P
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2575,7 +2600,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2625,8 +2650,9 @@ msgstr "Zacyklen
 
 #. 0
 #: src/config/options.inc:353
+#, fuzzy
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Pųi stisku klįvesy 'dolł' na poslednķm odkazu se pųesuņ na prvnķ odkaz\n"
@@ -2730,8 +2756,9 @@ msgid "Show search hit top or bottom dialogs"
 msgstr "Zobrazovat upozornģnķ o vyhledįvįnķ, které dosįhlo začįtku dokumentu"
 
 #: src/config/options.inc:403
+#, fuzzy
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 "Zdalipak ukazovat upozornģnķ, kdy¾ vyhledįvįnķ dosįhne začįtku nebo\n"
@@ -2847,12 +2874,13 @@ msgid "Cache information about redirects"
 msgstr "Pamatovat si informaci o pųesmģrovįnķch"
 
 #: src/config/options.inc:462
+#, fuzzy
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2862,7 +2890,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -3052,7 +3080,7 @@ msgstr "Zajistit kontrast"
 
 #: src/config/options.inc:587
 #, fuzzy
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Zaji¹»uje, ¾e barva popųedķ a pozadķ nebude nikdy stejnį."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3153,8 +3181,9 @@ msgstr "Dump v
 msgid "Dump output options."
 msgstr "Nastavenķ dump vżstupu."
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Kódovį strįnka"
 
@@ -3302,7 +3331,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Zobrazovat dolnķ indexy (jako ^index)."
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+#, fuzzy
+msgid "Rendering of HTML link element"
 msgstr "Zobrazovįnķ HTML elementu \"link\" (speciįlnķch odkazł)"
 
 #: src/config/options.inc:723
@@ -3418,9 +3448,10 @@ msgid "Save interval"
 msgstr "Interval automatického uklįdįnķ"
 
 #: src/config/options.inc:786
+#, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 "Interval, ve kterém budou na disk zapisovįny informačnķ soubory\n"
 "v ~/.elinks, pokud se od poslednķho zapsįnķ na disk nģjak zmģnila\n"
@@ -4037,9 +4068,10 @@ msgid "Underline menu hotkeys"
 msgstr "Podtrhįvat horké klįvesy v menu"
 
 #: src/config/options.inc:1184
+#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Určuje, zdalipak podtrhįvat v meņįtkįch horké klįvesy, abychom je lépe\n"
 "vidģli. To ov¹em funguje pouze, pokud terminįl podporuje podtrhįvįnķ."
@@ -4049,9 +4081,10 @@ msgid "Underline button shortcuts"
 msgstr "Podtrhįvat horké klįvesy tlačķtek"
 
 #: src/config/options.inc:1189
+#, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Určuje, zdalipak podtrhįvat na tlačķtkįch horké klįvesy, abychom je lépe\n"
 "vidģli. To ov¹em funguje pouze, pokud terminįl podporuje podtrhįvįnķ."
@@ -4146,8 +4179,9 @@ msgid "Wrap-around tabs cycling"
 msgstr "Cyklické pųechįzenķ mezi taby"
 
 #: src/config/options.inc:1241
+#, fuzzy
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Pųi pųesunu z poslednķho tabu dįle doprava pųeskočit na prvnķ tab a naopak."
@@ -4160,7 +4194,8 @@ msgstr "Potvrzov
 msgid "When closing a tab show confirmation dialog."
 msgstr "Zobrazit pųi zavķrįnķ tabu potvrzovacķ dialog."
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Jazyk"
 
@@ -4319,60 +4354,68 @@ msgstr ""
 msgid "Read error"
 msgstr "Chyba pųi čtenķ"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Boolean"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Čķslo"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr "<čķslo>"
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "Velké čķslo"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Ųetģzec"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<ųetģzec>"
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<znakovį sada>"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<jazyk>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Barva"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<barva|#rrggbb>"
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "Speciįlnķ"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr "Alias"
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Slo¾ka"
 
@@ -4456,7 +4499,8 @@ msgid "Saving"
 msgstr "Uklįdįnķ"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+#, fuzzy
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr "Zdalipak by se mģly cookies nahrįvat a uklįdat na disk."
 
 #: src/cookies/cookies.c:121
@@ -4532,7 +4576,7 @@ msgid "~Reject"
 msgstr "Odmķtnout"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4653,41 +4697,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr "Titulek odkazu (z historie)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "pųedpoklįdįm"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ignoruju informaci ze serveru"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Čas poslednķ nįv¹tģvy"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "neznįmż"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Informace o hlavičce"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Nedostal jsem ¾įdnou hlavičku."
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Nedostal jsem ¾įdnou hlavičku."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Stahovįnķ"
 
@@ -4767,7 +4811,7 @@ msgid "Download manager"
 msgstr "Sprįvce downloadł"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4980,7 +5024,8 @@ msgstr "Bookmark~nout dokument"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Pųepnout htm~l/plain"
 
 #. accelerator_context(tab_menu)
@@ -6147,35 +6192,36 @@ msgid "Program"
 msgstr "Program"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Externķ prohlķ¾eč pro tento typ souboru. V tomto ųetģzci bude '%' nahrazeno\n"
 "jménem souboru."
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Asociace pųķpon souborł"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr "Asociace mezi pųķponou souboru a jeho MIME typem."
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr "MIME typ odpovķdajķcķ této pųķponģ (mķsto '.' se pou¾ķvį '*')."
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "Konfiguračnķ systém"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6250,7 +6296,7 @@ msgstr "Soubory \"mimetypes\""
 #, fuzzy
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 "Nastavenķ tżkajķcķ se podpory souborł \"mimetypes\". Tyto soubory se\n"
@@ -6274,19 +6320,19 @@ msgstr "Smazat p
 msgid "Delete extension %s -> %s?"
 msgstr "Smazat pųķponu %s -> %s?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Pųķpona"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Pųķpona(y)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Typ"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "®įdnż pųķpony"
 
@@ -6440,7 +6486,7 @@ msgstr "Chyba v socketu"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Vnitųnķ chyba"
@@ -6574,7 +6620,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -7113,7 +7159,7 @@ msgstr "Soubory:"
 msgid "Comment"
 msgstr "Komentįųe"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7301,7 +7347,7 @@ msgstr "Cht
 msgid "Information about the torrent"
 msgstr "Zobrazenķ informacķ o současné strįnce"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Co mįm podle tebe dģlat?"
 
@@ -7312,13 +7358,13 @@ msgid "Down~load"
 msgstr "Stahovįnķ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Zobrazit"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 #, fuzzy
 msgid "Show ~header"
 msgstr "Zobrazit hlavičku"
@@ -7348,19 +7394,19 @@ msgstr "Zdalipak se maj
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Lokįlnķ soubory"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Nastavenķ prochįzenķ souborového systému."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Povolit načķtįnķ speciįlnķch souborł"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7369,23 +7415,24 @@ msgstr ""
 "Povolit čtenķ ze speciįlnķch souborł? (NEBEZPEČNÉ - čtenķ ze souborł\n"
 "jako /dev/urandom či /dev/zero zpłsobķ pravdģpodobnģ značné problémy!)"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Zobrazovat ve vżpisech adresįųł skryté soubory"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
+#, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 "Pokud je tato volba vypnuta, soubory, začķnajķcķ tečkou,\n"
 "nebudou ve vżpisech lokįlnķch adresįųł uvedeny."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "Zkou¹et pųķpony rłznżch kódovįnķ"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7397,7 +7444,7 @@ msgstr ""
 "kódovįnķch."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "Soubor"
 
@@ -7704,11 +7751,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "Mģnķ identifikaci prohlķ¾eče (hlavičku User-Agent). To je identifikačnķ\n"
 "ųetģzec, kterż je odeslįn HTTP serveru pųi ¾įdosti o nģjakż dokument.\n"
@@ -7904,10 +7951,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -8064,12 +8111,12 @@ msgstr "Varov
 msgid "Spidermonkey ECMAScript"
 msgstr "ECMAScript (JavaScript)"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Chyba pųi downloadu"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8078,7 +8125,7 @@ msgstr ""
 "U¾ zase nemł¾u vytvoųit soubor '%s':\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8089,16 +8136,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' je adresįų."
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Soubor existuje"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8114,58 +8161,54 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 #, fuzzy
 msgid "Sa~ve under the alternative name"
 msgstr "Ulo¾it pod nįhradnķm jménem"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 #, fuzzy
 msgid "~Overwrite the original file"
 msgstr "Pųepsat płvodnķ soubor"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 #, fuzzy
 msgid "~Resume download of the original file"
 msgstr "Obnovit stahovįnķ płvodnķho souboru"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Neznįmż typ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, fuzzy, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Chtģl bys zobrazit soubor '%s' (typ: %s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Chtģl bys zobrazit soubor '%s' (typ: %s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Zablokovat terminįl"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Otevųķt"
@@ -8180,14 +8223,15 @@ msgid "Warning"
 msgstr "Upozornģnķ"
 
 #: src/session/session.c:751
+#, fuzzy
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 "Volba protocol.http.user_agent obsahuje prįzdnż ųetģzec - v minulosti to "
 "byla implicitnķ hodnota, kterį byla automaticky nahrazena standardnķm "
@@ -8199,16 +8243,17 @@ msgstr ""
 "Omlouvįm se za zpłsobené nepųķjemnosti."
 
 #: src/session/session.c:770
+#, fuzzy
 msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 "Mį¹ nastavenu volbu config.saving_style na de fakto zastaralou hodnotu. "
 "Algoritmy, které pou¾ķvįm pųi uklįdįnķ konfiguračnķho souboru, se od tvého "
@@ -8294,7 +8339,7 @@ msgstr "
 msgid "Could not read event: %d (%s)"
 msgstr "Nemł¾u pųečķst udįlost: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "Načetl jsem z itrm pųķli¹ mnoho bytł!"
@@ -8659,19 +8704,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Bģ¾ na link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Zadej čķslo linku"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Chyba pųi uklįdįnķ"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Chyba pųi zįpisu do souboru"
 
diff --git a/po/da.po b/po/da.po
index d5011b5b..720a54ce 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.10.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2005-06-12 02:00+0200\n"
 "Last-Translator: Jonas Fonseca <fonseca@diku.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -22,7 +22,7 @@ msgstr "Luk"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -35,7 +35,7 @@ msgstr "Tast mellemrum for at 
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -152,7 +152,7 @@ msgstr "S
 msgid "Name"
 msgstr "Navn"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Ugyldigt tal"
 
@@ -176,10 +176,10 @@ msgstr "Tom tekststreng ikke tilladt"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 msgid "~Cancel"
 msgstr "A~nnullér"
@@ -237,7 +237,7 @@ msgid "LED indicators"
 msgstr "LED-indikatorer"
 
 #: src/bfu/leds.c:306
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "What the different LEDs indicate:\n"
 "\n"
@@ -245,7 +245,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -569,15 +569,15 @@ msgstr "Indl
 msgid "Content type"
 msgstr "Content-Type"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Sidst opdateret"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "SSL-chiffer"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Kodning"
 
@@ -585,7 +585,7 @@ msgstr "Kodning"
 msgid "Flags"
 msgstr "Flag"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ufuldstęndig"
 
@@ -758,7 +758,7 @@ msgstr "Kopi
 msgid "Move to the previous item"
 msgstr "Flyt til forrige element"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Genopfrisk skęrm"
@@ -965,247 +965,272 @@ msgid "Move cursor left"
 msgstr "Flyt markųr til venstre"
 
 #: src/config/actions-main.inc:57
+#, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "Gå til begyndelsen af siden/linjen"
+
+#: src/config/actions-main.inc:58
 msgid "Move cursor right"
 msgstr "Flyt markųren til hųjre"
 
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 msgid "Move cursor up"
 msgstr "Flyt markųr op"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 msgid "Move to the end of the document"
 msgstr "Flyt markųren til slutningen af dokument"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 msgid "Move to the start of the document"
 msgstr "Flyt markųren til begyndelsen af dokument"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 msgid "Move one link down"
 msgstr "Flyt et link ned"
 
-#: src/config/actions-main.inc:62
-msgid "Move one link left"
-msgstr "Flyt et link til venstre"
-
 #: src/config/actions-main.inc:63
-msgid "Move to the next link"
+#, fuzzy
+msgid "Move to the next line with a link"
 msgstr "Flyt til nęste link"
 
 #: src/config/actions-main.inc:64
+msgid "Move one link left"
+msgstr "Flyt et link til venstre"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "Flyt til forrige link"
+
+#: src/config/actions-main.inc:66
+msgid "Move to the next link"
+msgstr "Flyt til nęste link"
+
+#: src/config/actions-main.inc:67
 msgid "Move to the previous link"
 msgstr "Flyt til forrige link"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 msgid "Move one link right"
 msgstr "Flyt et link til hųjre"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Flyt til nęste link"
+
+#: src/config/actions-main.inc:70
 msgid "Move one link up"
 msgstr "Flyt et link op"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Flyt til forrige link"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "Flyt en side ned"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "Flyt en side op"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "Åbn det aktuelle link i et nyt faneblad"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 msgid "Open the current link in a new tab in the background"
 msgstr "Åbn det aktuelle link i et nyt baggrundsfaneblad"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "Åbn det aktuelle link i et nyt vindue"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Åbn et nyt faneblad"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 msgid "Open a new tab in the background"
 msgstr "Åbn et nyt faneblad i baggrunden"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Åbn i nyt vindue"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr "Åbn en kommandofortolker"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Åbn opsętningshåndtering"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "Åbn en dialog for at bekręfte afslutning"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "Afslut uden bekręftelse"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "Genindlęs den aktuelle side"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 msgid "Re-render the current page"
 msgstr "Gentegn den aktuelle side"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "Nulstil formularfelter til deres oprindelige vęrdier"
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr "Vis information om ressourceforbrug"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr "Gem det aktuelle dokuments kildetekst"
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr "Gem aktuelle dokument i formateret form"
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Gem indstillinger"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "Gem adresse som"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "Rul ned"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "Rul til venstre"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "Rul til hųjre"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "Rul op"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "Sųg efter tekstmųnster"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "Sųg bagud efter tekstmųnster"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr "Tast og find linktekst"
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr "Sųg i dokument med tast og find"
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr "Sųg baglęns i dokument med tast og find"
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "Vis dialog med terminalindstillinger"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr "Indsend formular"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr "Indsend formular og genindlęs"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Luk faneblad"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Luk alle faneblade på nęr det aktuelle"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr "Videregiv adressen for det aktuelle faneblad til ekstern program"
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "Åbn fanebladsmenuen"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 msgid "Move the current tab to the left"
 msgstr "Flyt det aktuelle faneblad til venstre"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 msgid "Move the current tab to the right"
 msgstr "Flyt det aktuelle faneblad til hųjre"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Nęste faneblad"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Forrige faneblad"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 msgid "Open the terminal resize dialog"
 msgstr "Vis dialog til ęndring af terminalstųrrelse"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr "Slå gengivelse ved brug af CSS fra/til"
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "Slå visning af billedlinks fra/til"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr "Slå tabelgengivelse fra/til"
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr "Skift mellem brug af definerede dokumentfarver"
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr "Skift mellem gengivelse som HTML / kildetekst"
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 msgid "Toggle mouse handling"
 msgstr "Slå musehåndtering fra/til"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "Slå visning af linknummerering fra/til"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr "Slå visning af komprimerede blanke linjer fra/til"
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 msgid "Toggle wrapping of text"
 msgstr "Slå tekstombrydning fra/til"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr "Vis det aktuelle billede"
 
@@ -1277,56 +1302,56 @@ msgstr "Rapportering af manglende fragment"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr "Fjernmetode ikke understųttet"
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr "Mappe med skabelonindstillinger"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(standard: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(standard: \"%s\")"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr "(alias for %s)"
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(standard: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 msgid "Configuration options"
 msgstr "Opsętningsindstillinger"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr "Brug: elinks [INDSTILLING]... [ADRESSE]..."
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 msgid "Internal consistency error"
 msgstr "Intern fejl"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "Begręns til anonyme brugere"
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1338,21 +1363,21 @@ msgstr ""
 "fremvisere er tilladt, men brugeren kan ikke tilfųje eller ęndre i\n"
 "opsętningen af hvilke fremvisere der bruges ved hvilke filtyper."
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Indsend fųrste formular automatisk"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr "Indsend automatisk den fųrste formular i de givne adresser."
 
 # rettet "ID" til fęlleskųn, men måske er det et ID-nummer og så er din
 # bedre, men i så fald burde vi kalde det ID-nummer og ikke bare ID.
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr "Kloning af intern session med et givent id-nummer"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
@@ -1362,11 +1387,11 @@ msgstr ""
 "Det givne id-nummer henviser til information som den nye instans\n"
 "baseres på. Dette programargument bųr ikke benyttes."
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "Navn på katalog med opsętningsfil"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1378,11 +1403,11 @@ msgstr ""
 "begynder med en \"/\" bliver den opfattet som absolut. Ellers\n"
 "antages den at vęre relativ i forhold til dit hjemmekatalog."
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr "Udskriv standard opsętningsfil til standarduddata"
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
@@ -1390,11 +1415,11 @@ msgstr ""
 "Udskriv en opsętningsfil med indstillinger sat til de\n"
 "indbyggede standardvęrdier til standarduddata."
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "Navn på opsętningsfil"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
@@ -1403,27 +1428,27 @@ msgstr ""
 "Navn på opsętningsfil som alle indstillinger skrives til. Den bųr\n"
 "angives relativt i forhold til opsętningskataloget."
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "Udskriv hjęlp til opsętningsindstillinger"
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr "Udskriv hjęlp til opsętningsindstillinger og afslut."
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr "MIME-typen som antages for dokumenter af ukendt type"
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr "Forvalgt MIME-type for dokumenter af ukendt type."
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr "Ignorér brugerdefinerede tasteturgenveje"
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
@@ -1433,47 +1458,47 @@ msgstr ""
 "blive ignoreret. Dette tvinger brug af standard tasteturgenveje\n"
 "og vil nulstille brugerdefinerede genveje ved gemning."
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 "Udskriv tekstformaterede versioner af de givne adresser til standarduddata"
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 "Udskriv tekstformaterede versioner af de givne adresser til standarduddata."
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "Tegnkodningstabel brugt med -dump"
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr "Tegnkodningstabel brugt i uddata fra -dump."
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 #, fuzzy
 msgid "Color mode used with -dump"
 msgstr "Tegnkodningstabel brugt med -dump"
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 #, fuzzy
 msgid "Color mode used with -dump."
 msgstr "Tegnkodningstabel brugt med -dump"
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "Bredde på dokumenter formateret med -dump"
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "Bredde på uddata fra -dump."
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr "Evaluér angiven opsętningsindstilling"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1486,11 +1511,11 @@ msgstr ""
 "\t-eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr "Fortolk dokumenter af ukendt type som HTML"
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
@@ -1500,19 +1525,19 @@ msgstr ""
 "når ELinks bruges som ekstern fremviser fra e-postprogrammer.\n"
 "Modsvarer kommandolinje-parameteren -default-mime-type text/html."
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "Udskriv brugervejledning og afslut"
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "Udskriv brugervejledning og afslut."
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "Tillad kun lokale forbindelser"
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
@@ -1522,29 +1547,29 @@ msgstr ""
 "oprette forbindelse til servere med lokale netadresser\n"
 "(dvs. 127.0.0.1). Ingen forbindelser til fjernservere er tilladt."
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "Udskriv detaljeret brugervejledning og afslut"
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr "Udskriv detaljeret brugervejledning og afslut."
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "Kontakt den specificerede vęrtsmaskine"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 "Kontakt den specificerede vęrtsmaskine og udskriv alle IP-adresser\n"
 "fundet ved DNS-opslag."
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "Kųr som separat session"
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1555,11 +1580,11 @@ msgstr ""
 "at ingen sessionstilknyttede filer (bogmęrker, historik osv.) bliver\n"
 "skrevet til disken når denne indstilling bruges. Se også -touch-files."
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr "Brug ikke filer i ~/.elinks"
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
@@ -1569,11 +1594,11 @@ msgstr ""
 "opsętningskatalog (~/.elinks). Dette tvinger brug af standardvęrdier\n"
 "for indstillinger og slår skrivning af kųreselstids-tilstandsfiler fra."
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr "Undlad at nummerere links i uddata fra -dump"
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
@@ -1581,11 +1606,11 @@ msgstr ""
 "Deaktiverer nummerering af links i uddata fra -dump.\n"
 "Bemęrk at at dette kun påvirker -dump og ikke andet."
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr "Undlad at udskrive linkadresser i uddata fra -dump"
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
@@ -1594,11 +1619,11 @@ msgstr ""
 "Deaktiverer udskrivning af linkadresser i uddata fra -dump.\n"
 "Bemęrk at at dette kun påvirker -dump og ikke andet."
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "Kontrollér en allerede kųrende ELinks"
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1632,11 +1657,11 @@ msgstr ""
 "\tinfoBox(text)             : vis tekst i et dialogvindue\n"
 "\txfeDoCommand(openBrowser) : åbn nyt terminalvindue"
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr "Forbind til sessionskreds med angiven ID"
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1667,20 +1692,20 @@ msgstr ""
 "Bemęrk i den forbindelse også at filer med oplysning om kųrselstilstand\n"
 "ikke bliver skrevet til disk med -no-connect. Se også -touch-files."
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr "Udskriv kildeteksten for givne adresser til standarduddata"
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr "Udskriv kildeteksten for givne adresser til standarduddata."
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 "Opret filer i ~/.elinks når Elinks startes med -no-connect/-session-ring"
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1692,11 +1717,11 @@ msgstr ""
 "Indstillingen har kun effekt hvis den bruges i forbindelse med\n"
 "en af de ovennęvnte indstillinger."
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr "Verbositetsniveau"
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1710,15 +1735,15 @@ msgstr ""
 "\t1 betyder vis kritiske fejl og advarsler\n"
 "\t1 betyder vis alle beskeder"
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Udskriv versionsinformation og afslut"
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "Udskriv versionsnummer på ELinks og afslut."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1731,7 +1756,7 @@ msgstr ""
 "## og din egen formatering, dine egne kommentarer osv. vil blive bevaret\n"
 "## uęndret.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1750,7 +1775,7 @@ msgstr ""
 "## din egen formatering, dine egne kommentarer osv. vil blive bevaret\n"
 "## uęndret.\n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1762,7 +1787,7 @@ msgstr ""
 "## gemmes interaktivt inde fra Elinks. Dette bevirker også at din egen\n"
 "## formatering og dine egne kommentarer går tabt, så pas på.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1772,11 +1797,11 @@ msgstr ""
 "## kan du modvirke det ved at ęndre indstillingen config.saving_style\n"
 "## Du kan da ikke sige at vi ikke er flinke?\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "Automatisk gemte indstillinger\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Automatisk gemte tastetildelinger\n"
 
@@ -1907,7 +1932,7 @@ msgstr "Indstillinger kan ikke tilf
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 msgid "Sa~ve"
 msgstr "~Gem"
 
@@ -2201,7 +2226,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Angiver om tilslutning til vęrtsmaskine skal ske via IPv4.\n"
@@ -2217,7 +2242,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Angiver om tilslutning til vęrtsmaskine skal ske via IPv4.\n"
@@ -2234,7 +2259,7 @@ msgstr "Pr
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 "Angiver om tilslutning til vęrtsmaskine skal ske via IPv6.\n"
@@ -2649,11 +2674,12 @@ msgid "Use tabindex"
 msgstr "Anvend tabindex"
 
 #: src/config/options.inc:326
+#, fuzzy
 msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 "Angiver om links navigeres ved brug af tabindex angivet orden.\n"
 "TABINDEX-attributten i HTML-elementer angiver hvilken rękkefųlge\n"
@@ -2709,8 +2735,9 @@ msgstr "Bund/top navigeringscyklus for links"
 
 #. 0
 #: src/config/options.inc:353
+#, fuzzy
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Når der tastes \"pil ned\" på det sidste link, hop da til\n"
@@ -2813,8 +2840,9 @@ msgid "Show search hit top or bottom dialogs"
 msgstr "Vis dialoger hvis sųgning rammer top eller bund"
 
 #: src/config/options.inc:403
+#, fuzzy
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 "Om en dialogboks skal vises der underretter bruger om at\n"
@@ -2939,12 +2967,13 @@ msgid "Cache information about redirects"
 msgstr "Gem informationer om omdirigeringer i cachen"
 
 #: src/config/options.inc:462
+#, fuzzy
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2954,7 +2983,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -3166,7 +3195,8 @@ msgid "Ensure contrast"
 msgstr "Sųrg for kontrast"
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+#, fuzzy
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Sikrer at bag- og forgrundsfarver aldrig er ens."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3264,8 +3294,9 @@ msgstr "Dump-uddata"
 msgid "Dump output options."
 msgstr "Indstillinger for dump-uddata."
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Tegnkodningstabel"
 
@@ -3413,7 +3444,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Vis matematisk overskrift (<sup> tag) som ^overskrift."
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+#, fuzzy
+msgid "Rendering of HTML link element"
 msgstr "Gengivelse af HTML-links"
 
 #: src/config/options.inc:723
@@ -3533,9 +3565,10 @@ msgid "Save interval"
 msgstr "Gemningsinterval"
 
 #: src/config/options.inc:786
+#, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 "Interval i sekunder for skrivning af informationsfiler i ~/.elinks\n"
 "(hvis ęndret) til disk. En vęrdi af 0 deaktiverer."
@@ -4155,9 +4188,10 @@ msgid "Underline menu hotkeys"
 msgstr "Understreg hurtigtaster i menu"
 
 #: src/config/options.inc:1184
+#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Vęlg om hurtigtaster i menuer skal understreges for at\n"
 "gųre dem mere synlige. Kręver at terminalen understųtter\n"
@@ -4168,9 +4202,10 @@ msgid "Underline button shortcuts"
 msgstr "Understreg knap-genvejstaster"
 
 #: src/config/options.inc:1189
+#, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Vęlg om genvejstaster for knapper skal understreges for at\n"
 "gųre dem mere synlige. Kręver at terminalen understųtter\n"
@@ -4267,8 +4302,9 @@ msgid "Wrap-around tabs cycling"
 msgstr "Side til side navigeringscyklus for faneblade"
 
 #: src/config/options.inc:1241
+#, fuzzy
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Når der flyttes til hųjre fra det sidste faneblad, hop da til\n"
@@ -4282,7 +4318,8 @@ msgstr "Bekr
 msgid "When closing a tab show confirmation dialog."
 msgstr "Vis bekręftelsesdialog ved lukning af faneblad."
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Sprog"
 
@@ -4444,60 +4481,68 @@ msgstr ""
 msgid "Read error"
 msgstr "Lęsefejl"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Boolsk"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Heltal"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr "<nr>"
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "Stort heltal"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Tekststreng"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<str>"
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<tegnkodningstabel>"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<sprog>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Farve"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<farve|#rrggbb>"
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "Speciel"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr "Alias"
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Katalog"
 
@@ -4581,7 +4626,8 @@ msgid "Saving"
 msgstr "Gemning"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+#, fuzzy
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr "Om cookier skal indlęses fra og gemmes på disken."
 
 #: src/cookies/cookies.c:121
@@ -4655,7 +4701,7 @@ msgid "~Reject"
 msgstr "~Afvis"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4774,40 +4820,40 @@ msgstr "Sidste bes
 msgid "Link title (from history)"
 msgstr "Linktitel (fra historik)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "antaget"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Ignorerer serverindstilling"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Sidste besųgstidpunkt"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Serverinformation om side"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 msgid "Internal header info"
 msgstr "Intern serverinformation om side"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Ingen serverinformation om side."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Download"
 
@@ -4883,7 +4929,7 @@ msgid "Download manager"
 msgstr "Downloadhåndtering"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr "Kommandotilstand"
 
@@ -5091,7 +5137,8 @@ msgstr "Tilf
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "~Skift mellem HTML/tekst"
 
 #. accelerator_context(tab_menu)
@@ -6283,35 +6330,36 @@ msgid "Program"
 msgstr "Program"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Ekstern fremviser for denne filtype. Et '%' i denne tekststreng vil\n"
 "blive erstattet af et filnavn."
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Programhåndtering efter filendelse"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr "Sammenkędning af MIME-type og filendelse."
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr "MIME-type for denne filendelse (\"*\" bruges i stedet for \".\")."
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "Opsętningsssystem"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6379,9 +6427,10 @@ msgid "Mimetypes files"
 msgstr "Mimetypes-filer"
 
 #: src/mime/backend/mimetypes.c:48
+#, fuzzy
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 "Indstilinger for mime.types filer. Disse filer kan anvendes til\n"
@@ -6407,19 +6456,19 @@ msgstr "Slet filendelse"
 msgid "Delete extension %s -> %s?"
 msgstr "Slet filendelse %s -> %s?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Filendelse"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Filendelse(r)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Ingen filendelser"
 
@@ -6571,7 +6620,7 @@ msgstr "Sokkelfejl"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Intern fejl"
@@ -6717,7 +6766,8 @@ msgstr ""
 "NNTPSERVER."
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+#, fuzzy
+msgid "Server hung up for some reason"
 msgstr "Serveren afbrųd forbindelsen af en eller anden grund"
 
 #: src/network/state.c:102
@@ -7248,7 +7298,7 @@ msgstr "Filer"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7421,7 +7471,7 @@ msgstr "Hvad vil du g
 msgid "Information about the torrent"
 msgstr "Information om torrent-filen"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Hvad skal der ske med filen?"
 
@@ -7431,12 +7481,12 @@ msgid "Down~load"
 msgstr "Down~load"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 msgid "~Display"
 msgstr "~Vis"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr "Vis ~protokolhoved"
 
@@ -7465,19 +7515,19 @@ msgstr "Om udf
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Indstillinger for visning af lokale filer."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Tillad lęsning af specielle filer"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7486,23 +7536,24 @@ msgstr ""
 "Tillad lęsning af ikke-regulęre filer? Dette kan vęre RISIKABELT -\n"
 "lęsning fra /dev/urandom eller /dev/zero kan spolere dit humųr!"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Vis skjulte filer i katalogoversigter"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
+#, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 "Hvis deaktiveret, vil filer med navne der starter\n"
 "med et punktum blive skjult i katalogoversigter."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "Forsųg kendte filendelser for indkodning"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7514,7 +7565,7 @@ msgstr ""
 "understųttes."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "Fil"
 
@@ -7826,11 +7877,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "Angiver det anvendte brugeragent identifikationsstreng, som sendes\n"
 "til HTTP servere, når et dokument forespųrges. Symbolet 'textmode'\n"
@@ -8043,10 +8094,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 "Standard omskrivningsskabelon som bruges når en streng indtastet\n"
 "i \"Gå til\"-dialogboks ikke ligner en URI eller et filnavn (dvs.\n"
@@ -8209,12 +8260,12 @@ msgstr "JavaScript advarsel"
 msgid "Spidermonkey ECMAScript"
 msgstr "ECMAScript"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Downloadfejl"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8223,7 +8274,7 @@ msgstr ""
 "Kunne ikke oprette filen \"%s\":\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8234,16 +8285,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' er et katalog."
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Fil eksisterer"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8259,54 +8310,50 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr "Gem under det ~alternative navn"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr "~Overskriv originalfilen"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr "~Genoptag overfųrsel af originalfilen"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Ukendt type"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Hvad vil du gųre med filen \"%s\" (type: %s%s%s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Hvad vil du gųre med filen \"%s\" (type: %s%s%s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Program (\"%\" vil blive erstattet med filnavnet)"
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 msgid "Block the terminal"
 msgstr "Bloker terminalen"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr "Filen vil blive åbnet med programmet \"%s\"."
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 msgid "~Open"
 msgstr "~Åbn"
 
@@ -8320,14 +8367,15 @@ msgid "Warning"
 msgstr "Advarsel"
 
 #: src/session/session.c:751
+#, fuzzy
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 "Vęrdien for protocol.http.user_agent er tom. Standardindstillingen er at "
 "sende en ELinks User-Agent-linje. Den nuvęrende tomme vęrdi betyder at "
@@ -8337,16 +8385,17 @@ msgstr ""
 "opsętningsfil. Sidstnęvnte anbefales."
 
 #: src/session/session.c:770
+#, fuzzy
 msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 "Indstillingen config.saving_style er sat til en vęrdi som reelt er foręldet. "
 "Den algoritme som ELinks bruger til at gemme opsętningen er blevet ęndret "
@@ -8435,7 +8484,7 @@ msgstr "Ugyldig h
 msgid "Could not read event: %d (%s)"
 msgstr "Kunne ikke lęse hęndelse: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "Lęste for mange bytes fra itrm!"
@@ -8796,19 +8845,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Gå til link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Skriv nummer på link"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Fejl ved skrivning"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
diff --git a/po/de.po b/po/de.po
index 858053f1..fcc51e28 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.9.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2005-06-14 20:52+0200\n"
 "Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n"
 "Language-Team: German <de@li.org>\n"
@@ -25,7 +25,7 @@ msgstr "Schlie
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -38,7 +38,7 @@ msgstr "Dr
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -158,7 +158,7 @@ msgstr "Zeichenfolge '%s' konnte nicht gefunden werden"
 msgid "Name"
 msgstr "Name"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Fehlerhafte Zahl"
 
@@ -182,10 +182,10 @@ msgstr "Zeichenfolge darf nicht leer sein"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -253,7 +253,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -560,15 +560,15 @@ msgstr "Gr
 msgid "Content type"
 msgstr "Content-Type"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "SSL-Verschlüsselung"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Kodierung"
 
@@ -576,7 +576,7 @@ msgstr "Kodierung"
 msgid "Flags"
 msgstr "Schalter"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "unvollständig"
 
@@ -751,7 +751,7 @@ msgstr "Text aus der Zwischenablage einf
 msgid "Move to the previous item"
 msgstr "Wechsel zum vorherigen Eintrag"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Terminal neu zeichnen"
@@ -959,253 +959,278 @@ msgid "Move cursor left"
 msgstr "Bewege den Cursor nach links"
 
 #: src/config/actions-main.inc:57
+#, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "Gehe zum Anfang der Seite/Zeile"
+
+#: src/config/actions-main.inc:58
 msgid "Move cursor right"
 msgstr "Bewege den Cursor nach rechts"
 
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 msgid "Move cursor up"
 msgstr "Bewege den Cursor nach oben"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 msgid "Move to the end of the document"
 msgstr "Gehe zum Ende des Dokuments"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 msgid "Move to the start of the document"
 msgstr "Gehe zum Anfang des Dokuments"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 msgid "Move one link down"
 msgstr "Um einen Link nach oben bewegen"
 
-#: src/config/actions-main.inc:62
-msgid "Move one link left"
-msgstr "Um einen Link nach links bewegen"
-
 #: src/config/actions-main.inc:63
-msgid "Move to the next link"
+#, fuzzy
+msgid "Move to the next line with a link"
 msgstr "Gehe zum nächsten Link"
 
 #: src/config/actions-main.inc:64
+msgid "Move one link left"
+msgstr "Um einen Link nach links bewegen"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "Gehe zum vorherigen Link"
+
+#: src/config/actions-main.inc:66
+msgid "Move to the next link"
+msgstr "Gehe zum nächsten Link"
+
+#: src/config/actions-main.inc:67
 msgid "Move to the previous link"
 msgstr "Gehe zum vorherigen Link"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 msgid "Move one link right"
 msgstr "Um einen Link nach rechts bewegen"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Gehe zum nächsten Link"
+
+#: src/config/actions-main.inc:70
 msgid "Move one link up"
 msgstr "Um einen Link nach oben bewegen"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Gehe zum vorherigen Link"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "Um eine Seite nach unten bewegen"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "Um eine Seite nach oben bewegen"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "Öffne den aktuellen Link in einer neuen Ansicht"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Öffne den aktuellen Link in einer neuen Ansicht im Hintergrund"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "Öffne den aktuellen Link in einem neuem Fenster"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Öffne eine neue Ansicht"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Öffne eine neue Ansicht im Hintergrund"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Öffne ein neues Fenster"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr "Starte eine Shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Öffne Optionsmanager"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "Öffne Bestätigungsdialog beim Beenden"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "Beende ohne weitere Bestätigung"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "Lade die aktuelle Seite erneut"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 msgid "Re-render the current page"
 msgstr "Aktuelle Seite erneut rendern"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "Formular-Felder auf ihre Anfangswerte zurücksetzen "
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr "Zeige Informationen zu den aktuell benutzen Ressourcen an"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr "Speichere den Quelltext des aktuellen HTML-Dokuments"
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr "Das aktuelle Dokoment formatiert abspeichern"
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Optionen speichern"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "URL speichern unter"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "Nach unten rollen"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "Nach links rollen"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "Nach rechts rollen"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "Nach oben rollen"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "Suche nach einem Textmuster"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "Suche rückwärts nach einem Textmuster"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr "Suche Link-Text durch Eintippen von Zeichen der Such-Zeichenkette"
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr "Durchsuche Dokument durch Eintippen von Zeichen der Such-Zeichenkette"
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 "Durchsuche Dokument rückwärts durch Eintippen von Zeichen der Such-"
 "Zeichenkette"
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "Terminaleinstellungen anzeigen"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr "Formular senden"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr "Formular senden und neu laden"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Ansicht schließen"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Alle Ansichten außer der aktuellen schließen"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr "Die URI der aktuellen Ansicht an ein externes Programm delegieren"
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "Öffne das Ansichten-Menü"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 msgid "Move the current tab to the left"
 msgstr "Verschiebe die aktuellen Ansicht nach links"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 msgid "Move the current tab to the right"
 msgstr "Verschiebe die aktuellen Ansicht nach rechts"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Nächste Ansicht"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Vorherige Ansicht"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Terminaleinstellungen anzeigen"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr "Benutze CSS zur Darstellung ein/aus"
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "Umschalten der Darstellung von Links zu Bildern"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr "Umschalten der Darstellung von Tabellen"
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr "Umschalten der Benutzung von dokument-spezifischen Farben"
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr "Umschalten der Darstellung der Seite als HTML / einfacher Text"
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Speichern umschalten"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "Umschalten  der Darstellung von Nummern neben Links"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr "Umschalten der Zusammenfassung von leeren Zeilen bei einfachem Text"
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 msgid "Toggle wrapping of text"
 msgstr "Text-Umbruch ein/aus"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr "Aktuelles Bild anzeigen"
 
@@ -1278,58 +1303,58 @@ msgstr "Fehlendes Fragment"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr "Nicht unterstützte Remote-Methode"
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr "Vorlage für Optionen-Ordner"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Konfigurations-Optionen."
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Konfigurations-System"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 msgid "Internal consistency error"
 msgstr "Interner Konsistenz-Fehler"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "Auf den anonymen Modus beschränken"
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 #, fuzzy
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
@@ -1343,32 +1368,32 @@ msgstr ""
 "Die Ausführung von Betrachtern ist erlaubt, jedoch können\n"
 "keine Verknüpfungen hinzugefügt oder verändert werden."
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Erstes Formular automatisch senden"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 #, fuzzy
 msgid "Automatically submit the first form in the given URLs."
 msgstr "Sende das erste Formular über das du stolperst."
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 #, fuzzy
 msgid "Clone internal session with given ID"
 msgstr "Erzeuge die Sitzung mit gegebener ID"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "Name des Verzeichnisses mit der Konfigurations-Datei"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 #, fuzzy
 msgid ""
 "Path of the directory ELinks will read and write its\n"
@@ -1381,22 +1406,22 @@ msgstr ""
 "absoluter Pfad benutzt. Sonst wird angenommen, dass er relativ\n"
 "zum Heimat-Verzeichnis ist."
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 #, fuzzy
 msgid "Print default configuration file to stdout"
 msgstr "Hilfe zu Konfigurations-Optionen ausgeben"
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "Konfigurations-Datei"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 #, fuzzy
 msgid ""
 "Name of the configuration file that all configuration\n"
@@ -1406,30 +1431,30 @@ msgstr ""
 "Name der Konfigurations-Datei, in der die Konfiguration\n"
 "stehen soll. Dieser sollte relativ zu config-dir sein."
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "Hilfe zu Konfigurations-Optionen ausgeben"
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 #, fuzzy
 msgid "Print help for configuration options and exit."
 msgstr "Hilfe zu Konfigurations-Optionen ausgeben und beenden."
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 #, fuzzy
 msgid "MIME type assumed for unknown document types"
 msgstr "Angenommener MIME-Typ für Dokumente"
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 #, fuzzy
 msgid "The default MIME type used for documents of unknown type."
 msgstr "Angenommener MIME-Typ für Dokumente mit unbekannten Typ."
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr "Ignoriere benutzer-definierte Tastenbelegungen"
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 #, fuzzy
 msgid ""
 "When set, all keybindings from configuration files will be\n"
@@ -1441,53 +1466,53 @@ msgstr ""
 "Tastenbelegungen und wird beim Speichern die benutzer-definierten\n"
 "zurücksetzen."
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 #, fuzzy
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 "Schreibe die formatierte Darstellung der gegebenen URL auf die "
 "Standardausgabe"
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 #, fuzzy
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 "Schreibe die formatierte Darstellung der gegebenen URL auf die "
 "Standardausgabe"
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "Mit -dump zu benutzender Zeichensatz"
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 #, fuzzy
 msgid "Codepage used when formatting dump output."
 msgstr "Zeichensatz, der für die Ausgabe (dump) benutzt wird."
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 #, fuzzy
 msgid "Color mode used with -dump"
 msgstr "Mit -dump zu benutzender Zeichensatz"
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 #, fuzzy
 msgid "Color mode used with -dump."
 msgstr "Mit -dump zu benutzender Zeichensatz"
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "Breite des mit -dump formatierten Dokuments"
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "Breite der Ausgabe von -dump."
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 #, fuzzy
 msgid "Evaluate configuration file directive"
 msgstr "Gegebene Konfigurations-Option auswerten"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 #, fuzzy
 msgid ""
 "Specify configuration file directives on the command-line\n"
@@ -1499,12 +1524,12 @@ msgstr ""
 "  -eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 #, fuzzy
 msgid "Interpret documents of unknown types as HTML"
 msgstr "Angenommener MIME-Typ für Dokumente mit unbekannten Typ."
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 #, fuzzy
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
@@ -1514,19 +1539,19 @@ msgstr ""
 "Mit dieser Option nimmt ELinks an, dass die Dateien in HTML sind.\n"
 "Dies ist äquivalent zu -default-mime-type text/html."
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "Hilfe ausgeben und beenden"
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "Hilfe ausgeben und beenden."
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "Erlaube nur lokale Verbindungen"
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 #, fuzzy
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
@@ -1537,27 +1562,27 @@ msgstr ""
 "(zb. 127.0.0.1) aufnehmen kann. Verhindert jede Verbindung zu \n"
 "entfernten Servern."
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "Ausführliche Hilfe ausgeben und beenden"
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr "Ausführliche Hilfe ausgeben und beenden."
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "Suche den angegebenen Hostnamen"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "Starte als separater Prozess"
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 #, fuzzy
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
@@ -1570,24 +1595,24 @@ msgstr ""
 "(Lesezeichen, Verlauf, usw.) geschrieben werden, wenn diese Option\n"
 "benutzt wird. Siehe auch -touch-files."
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 #, fuzzy
 msgid "Disable use of files in ~/.elinks"
 msgstr "Benutze keine Dateien in ~/.elinks"
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 #, fuzzy
 msgid "Disable link numbering in dump output"
 msgstr "Links in der Ausgabe (dump) nicht nummerieren"
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 #, fuzzy
 msgid ""
 "Prevents printing of link number in dump output.\n"
@@ -1596,12 +1621,12 @@ msgstr ""
 "Verhindert das Anhängen einer Link-Liste (URIs) in der Ausgabe (dump).\n"
 "Beachten Sie, dass dies nur -dump betrifft, nichts anderes."
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 #, fuzzy
 msgid "Disable printing of link references in dump output"
 msgstr "Keine Link-Liste an die Ausgabe (dump) anhängen"
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 #, fuzzy
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
@@ -1611,11 +1636,11 @@ msgstr ""
 "Verhindert das Anhängen einer Link-Liste (URIs) in der Ausgabe (dump).\n"
 "Beachten Sie, dass dies nur -dump betrifft, nichts anderes."
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "Steuere eine bereit laufende Instanz von ELinks"
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 #, fuzzy
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
@@ -1649,11 +1674,11 @@ msgstr ""
 "  addBookmark(URL)          -- speichere URL als Lesezeichen ab\n"
 "  xfeDoCommand(openBrowser) -- öffne neues Fenster"
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr "Verbinde zu den Sitzungen mit gegebener ID"
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1686,22 +1711,22 @@ msgstr ""
 "geschrieben werden, wenn diese Option benutzt wird.\n"
 "Siehe auch -touch-files."
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 #, fuzzy
 msgid "Print the source of given URLs to stdout"
 msgstr "Schreibe den Quelltext der gegebenen URL auf die Standardausgabe"
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 #, fuzzy
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 "Schreibe den Quelltext des gegebenen HTML-Dokuments auf die Standardausgabe."
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr "Benutze Dateien in ~/.elinks mit -no-connect/-session-ring"
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 #, fuzzy
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
@@ -1714,11 +1739,11 @@ msgstr ""
 "-session-ring angegeben wurde. Diese Option hat keinen Effekt,\n"
 "wenn keine dieser beiden Optionen angegeben wurde."
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr "Plapper-Pegel (Fehler-Meldungs-Dichte)"
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 #, fuzzy
 msgid ""
 "The verbose level controls what messages are shown at\n"
@@ -1733,15 +1758,15 @@ msgstr ""
 "\\t1 ernste Fehler und Warnungen\n"
 "\\t2 alle Meldungen\n"
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Versions-Informationen ausgeben und beenden"
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "ELinks Versions-Informationen ausgeben und beenden."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1754,7 +1779,7 @@ msgstr ""
 "## nur die Werte der Optionen geändert werden. Die gesamte Formatierung,\n"
 "## eigene Kommentare usw. bleiben erhalten.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1773,7 +1798,7 @@ msgstr ""
 "## fehlend betrachtet. Die gesamte Formatierung,\n"
 "## eigene Kommentare usw. bleiben erhalten.\n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1785,7 +1810,7 @@ msgstr ""
 "## wenn man die Optionen mittels Benutzerschnittstelle abspeichert, und\n"
 "## jegliche Formatierung, Kommentare usw. gehen verloren, also Vorsicht.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1795,11 +1820,11 @@ msgstr ""
 "## dann kannst du natürlich die Option confi.saving_style ändern.\n"
 "## Nun, sind wir am Ende nicht doch freundliche Typen?\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "Automatisch gespeicherte Optionen\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Automatisch gespeicherte Tastenbelegungen\n"
 
@@ -1928,7 +1953,7 @@ msgstr "Hier kann keine Option hinzugef
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Speichern"
@@ -2228,7 +2253,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2237,7 +2262,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2249,7 +2274,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2652,7 +2677,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2701,8 +2726,9 @@ msgstr "Zyklischer Link-Wechsel"
 
 #. 0
 #: src/config/options.inc:353
+#, fuzzy
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Drückt man auf dem letzten Link nach unten, so springt man auf den\n"
@@ -2803,8 +2829,9 @@ msgid "Show search hit top or bottom dialogs"
 msgstr "Dialog anzeigen bei Suche an Dokumentanfang oder -ende"
 
 #: src/config/options.inc:403
+#, fuzzy
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 "Diese Option gibt an, ob ein Fenster angezeigt wird, wenn man bei\n"
@@ -2924,12 +2951,13 @@ msgid "Cache information about redirects"
 msgstr "Cache-Informationen über Weiterleitungen"
 
 #: src/config/options.inc:462
+#, fuzzy
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2939,7 +2967,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -3135,7 +3163,7 @@ msgstr "Kontrast sicherstellen"
 
 #: src/config/options.inc:587
 #, fuzzy
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Stellt sicher, dass Hinter- und Vordergrundfarbe nie gleich sind."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3238,8 +3266,9 @@ msgstr "Ausgabe (dump)"
 msgid "Dump output options."
 msgstr "Optionen für die Ausgabe (dump)."
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Zeichensatz"
 
@@ -3391,7 +3420,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Exponenten anzeigen (als ^Exponent)."
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+#, fuzzy
+msgid "Rendering of HTML link element"
 msgstr "Darstellung des HTML Link-Elements"
 
 #: src/config/options.inc:723
@@ -3508,9 +3538,10 @@ msgid "Save interval"
 msgstr "Speicher-Intervall"
 
 #: src/config/options.inc:786
+#, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 "Intervall, in dem die Informations-Dateien in ~/.elinks geschrieben\n"
 "werden, wenn sich etwas verändert hat (in Sekunden; 0 bedeutet\n"
@@ -4135,9 +4166,10 @@ msgid "Underline menu hotkeys"
 msgstr "Zugriffstasten unterstreichen"
 
 #: src/config/options.inc:1184
+#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Zugriffstasten unterstreichen, damit sie in Menüs auffälliger sind.\n"
 "Hierfür müssen Unterstreichungen für das Terminal eingeschaltet sein."
@@ -4151,7 +4183,7 @@ msgstr "Zugriffstasten unterstreichen"
 #, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Zugriffstasten unterstreichen, damit sie in Menüs auffälliger sind.\n"
 "Hierfür müssen Unterstreichungen für das Terminal eingeschaltet sein."
@@ -4255,8 +4287,9 @@ msgid "Wrap-around tabs cycling"
 msgstr "Zyklischer Ansichten-Wechsel"
 
 #: src/config/options.inc:1241
+#, fuzzy
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Wenn man sich von der letzten Ansicht nach rechts bewegt, so landet\n"
@@ -4270,7 +4303,8 @@ msgstr "Ansicht-Schlie
 msgid "When closing a tab show confirmation dialog."
 msgstr "Öffne Bestätigungsdialog beim Schließen einer Ansicht."
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Sprache"
 
@@ -4435,60 +4469,68 @@ msgstr ""
 msgid "Read error"
 msgstr "Fehler beim Lesen"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Wahrheitswert"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Ganze Zahl"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr "<Nummer>"
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "Longint"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Zeichenfolge"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<Zeichenkette>"
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<Zeichensatz>"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<Sprache>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Farbe"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<Farbe|#rrggbb>"
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "speziell"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr "Alias"
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Ordner"
 
@@ -4571,7 +4613,7 @@ msgid "Saving"
 msgstr "Speichere"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4647,7 +4689,7 @@ msgid "~Reject"
 msgstr "Abweisen"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4768,41 +4810,41 @@ msgstr "Zeitpunkt des letzten Aufruf des Links"
 msgid "Link title (from history)"
 msgstr "Linktitel (aus dem Verlauf)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "angenommen"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Servervorgabe ignoriert"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Letzer Besuch"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "~Headerinfo"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Künstliche Header-Informationen"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Keine Header-Informationen"
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Download"
 
@@ -4882,7 +4924,7 @@ msgid "Download manager"
 msgstr "Downloadverwaltung"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -5093,7 +5135,8 @@ msgstr "Dokument zu Lesezeichen hinzuf
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Umschaltung HTML/~Quelltext"
 
 #. accelerator_context(tab_menu)
@@ -6292,23 +6335,24 @@ msgid "Program"
 msgstr "Programm"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Externer Betrachter für diesen Datei-Typ. Ein '%' in der Zeichkette\n"
 "wird durch den Dateinamen ersetzt."
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Verknüpfungen zu Dateiendungen"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr "Dateiendung <-> MIME-Typ Verknüpfung."
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
@@ -6317,12 +6361,12 @@ msgstr ""
 "'.' benutzt)."
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "Konfigurations-System"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6396,7 +6440,7 @@ msgstr "Mime-Typen-Dateien"
 #, fuzzy
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 "Optionen für Mime-Typen-Dateien. Diese Dateien können benutzt,\n"
@@ -6419,19 +6463,19 @@ msgstr "Erweiterung l
 msgid "Delete extension %s -> %s?"
 msgstr "Erweiterung %s -> %s löschen?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Erweiterung"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Erweiterung(en)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "keine Erweiterung"
 
@@ -6586,7 +6630,7 @@ msgstr "Socket-Exception"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Interner Fehler"
@@ -6727,7 +6771,7 @@ msgstr ""
 "oder die Umgebungsvariable NNTPSERVER."
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -7266,7 +7310,7 @@ msgstr "Datei"
 msgid "Comment"
 msgstr "Kommentare"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7454,7 +7498,7 @@ msgstr "Soll die Datei '%s' (Typ: %s) angezeigt werden?"
 msgid "Information about the torrent"
 msgstr "Zeige Informationen zur aktuellen Seite"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Treffen Sie Ihre Wahl."
 
@@ -7465,13 +7509,13 @@ msgid "Down~load"
 msgstr "Download"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Anzeigen"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 #, fuzzy
 msgid "Show ~header"
 msgstr "Vorlagen zeigen"
@@ -7503,19 +7547,19 @@ msgstr "Gibt an, ob lokale CGI-Skripts ausgef
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Lokale Datei"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Spezifische Optionen für den Zugriff auf lokale Dateien."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Lesen von speziellen Dateien erlauben"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 #, fuzzy
 msgid ""
 "Whether to allow reading from non-regular files.\n"
@@ -7525,25 +7569,25 @@ msgstr ""
 "Lesen von speziellen Dateien erlauben? (GEFÄHRLICH - von\n"
 "/dev/urandom oder /dev/zero zu lesen, kann dir den Tag ruinieren!)"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Versteckte in Verzeichnis-Auflistungen anzeigen"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 #, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 "Versteckte in Verzeichnis-Auflistungen anzeigen?\n"
 "Wenn diese Option falsch ist, werden Dateien, die mit einem Punkt beginnen,\n"
 "in Auflistungen von lokalen Verzeichnissen nicht angezeigt."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "Versuche Endungen von Kodierungen"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7555,7 +7599,7 @@ msgstr ""
 "den unterstützten Kodierungen ab."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Datei"
@@ -7869,11 +7913,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "Ändert die User-Agent-ID. Das ist die Identifikation, die\n"
 "zum HTTP-Server gesendet wird, wenn ein Dokument angefragt wird.\n"
@@ -8084,10 +8128,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -8246,12 +8290,12 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "Skripte"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Downloadfehler"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8260,7 +8304,7 @@ msgstr ""
 "Konnte die Datei '%s' nicht anlegen:\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8271,16 +8315,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' ist ein Verzeichnis"
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Datei existiert"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8296,58 +8340,54 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 #, fuzzy
 msgid "Sa~ve under the alternative name"
 msgstr "Speicher mit dem alternativen Namen"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 #, fuzzy
 msgid "~Overwrite the original file"
 msgstr "Überschreibe die Originaldatei"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 #, fuzzy
 msgid "~Resume download of the original file"
 msgstr "Nehme Download der Originaldatei wieder auf"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Unbekannter Typ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, fuzzy, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Soll die Datei '%s' (Typ: %s) angezeigt werden?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Soll die Datei '%s' (Typ: %s) angezeigt werden?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Bildschirm blockieren"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Öffnen"
@@ -8362,14 +8402,15 @@ msgid "Warning"
 msgstr "Warnung"
 
 #: src/session/session.c:751
+#, fuzzy
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 "Die Zeichenkette in protocol.http.user_agent ist leer - in der Vergangenheit "
 "war diese die Voreinstellung, die durch einen voreingestellte ELinks "
@@ -8382,16 +8423,17 @@ msgstr ""
 "Unannehmlichkeiten."
 
 #: src/session/session.c:770
+#, fuzzy
 msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 "Der Wert der Option config.saving_style ist de facto veraltet. Die "
 "Algorithmen für das Speichern der Konfiguration haben sich im Vergleich zu "
@@ -8476,7 +8518,7 @@ msgstr "Ung
 msgid "Could not read event: %d (%s)"
 msgstr "Konnte Ereignis nicht lesen: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8842,19 +8884,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Link öffnen"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Linknummer eingeben"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Fehler beim Speichern"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben in Datei"
 
diff --git a/po/el.po b/po/el.po
index 766a0486..b7acb3b9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -22,7 +22,7 @@ msgstr "
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Šėēńļöļńßåņ"
 
@@ -35,7 +35,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -158,7 +158,7 @@ msgstr "
 msgid "Name"
 msgstr "¼ķļģį"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Ģē Żćźõńļņ įńéčģüņ"
 
@@ -182,10 +182,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -251,7 +251,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -560,15 +560,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Ōļ åßäļņ šåńéå÷ļģŻķļõ åßķįé"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Ōåėåõōįßį ōńļšļšļßēóē"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -576,7 +576,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "įóõģšėŽńłōļ"
 
@@ -761,7 +761,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -989,282 +989,307 @@ msgstr "
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "ŠŽćįéķå óōļ óżķäåóģļ"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "ÄńļģŻįņ ģļńöŽņ ģšėļź"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "ŠįńįóźŽķéļ"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Öėļéüņ Ė.Ó."
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "ĮķįģļķŽ åšéāåāįßłóēņ åšįķįäéåżčõķóēņ"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "ÅģöÜķéóē åéźüķįņ"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Ģåōįöüńōłóē åéźüķįņ"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "ĮķįģļķŽ åšéāåāįßłóēņ åšįķįäéåżčõķóēņ"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "ÅģöÜķéóē åéźüķįņ"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Ģåōįöüńōłóē åéźüķįņ"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "Įšļ莟åõóē åšéėļćžķ"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Įšļ莟åõóē URL łņ"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "ĮķįęŽōēóē źåéģŻķļõ"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "ĮķįęŽōēóē źåéģŻķļõ"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "ÅšéėļćŻņ ōåńģįōéźļż"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "ĮšļóōļėŽ öüńģįņ"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "ĮšļóōļėŽ öüńģįņ źįé ģåōįöüńōłóē"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Źėåßóéģļ"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Ģåōįöüńōłóē åéźüķįņ"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "¶ķļéćģį óå ķŻļ šįńÜčõńļ"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Äåķ õšÜń÷åé šńļēćļżģåķē įķįęŽōēóē"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "ÅšéėļćŻņ ōåńģįōéźļż"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "ÅķķįėįćŽ HTML/įšėü"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "ÅķķįėįćŽ HTML/įšėü"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "ÅģöÜķéóē åéźüķįņ"
@@ -1340,59 +1365,59 @@ msgstr "
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "ÓõķäŻóåéņ"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Įšļ莟åõóē åšéėļćžķ"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Åółōåńéźü óöÜėģį"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1400,31 +1425,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "ĮšļóōļėŽ öüńģįņ"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1432,91 +1457,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1525,58 +1550,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Äåķ źįčļńßóōēźå šńüćńįģģį ćéį"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1584,43 +1609,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1639,11 +1664,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1661,19 +1686,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1681,11 +1706,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1694,15 +1719,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1710,7 +1735,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1721,7 +1746,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1729,18 +1754,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1864,7 +1889,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Įšļ莟åõóē"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Źłäéźļóåėßäį"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "ÓöÜėģį įšļ莟åõóēņ"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Źłäéźļóåėßäį"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Ćėžóóį"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "×ńžģį"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "ģ.ü."
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "ÅīõšēńåōēōŽņ"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "õšļķļļåßōå"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "įćķüēóē ńżčģéóēņ åīõšēńåōēōŽ"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Ēģåńļģēķßį"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Šėēńļöļńßåņ źåöįėßäįņ"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Šėēńļöļńßåņ źåöįėßäįņ"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Ģåōįöüńōłóē"
 
@@ -4572,7 +4607,7 @@ msgid "Download manager"
 msgstr "Ģåōįöüńōłóē åéźüķįņ"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4787,7 +4822,8 @@ msgstr "
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "ÅķķįėįćŽ HTML/įšėü"
 
 #. accelerator_context(tab_menu)
@@ -5989,31 +6025,32 @@ msgstr "
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "ŹįōįėŽīåéņ įń÷åßłķ"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6072,7 +6109,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6093,19 +6130,19 @@ msgstr "
 msgid "Delete extension %s -> %s?"
 msgstr "ÄéįćńįöŽ źįōÜėēīēņ"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "ŹįōÜėēīē"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "ÅšŻźōįóē(Üóåéņ)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Åßäļņ-Šåńéå÷ļģŻķļõ"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "׳ńßņ źįōįėŽīåéņ"
 
@@ -6252,7 +6289,7 @@ msgstr "
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Åółōåńéźü óöÜėģį"
@@ -6385,7 +6422,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6926,7 +6963,7 @@ msgstr "
 msgid "Comment"
 msgstr "Żććńįöį"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7109,7 +7146,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Ģåōįöüńōłóē åéźüķįņ"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Ōß čŻėåōå ķį źÜķåōå;"
 
@@ -7120,13 +7157,13 @@ msgid "Down~load"
 msgstr "Ģåōįöüńōłóē"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "ÅģöÜķéóē"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7157,42 +7194,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "įń÷åßį"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "׳ńßņ źįōįėŽīåéņ"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7200,7 +7237,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "Įń÷åßļ"
@@ -7469,11 +7506,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7641,10 +7678,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7787,19 +7824,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "ÓöÜėģį ģåōįöüńōłóēņ"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Įäżķįōē ē äēģéļõńćßį įń÷åßļõ"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7807,17 +7844,17 @@ msgid ""
 "%s"
 msgstr "ÓöÜėģį ģåōįöüńōłóēņ"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "ŹįōįėŽīåéņ įń÷åßłķ"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7828,55 +7865,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "¶ćķłóōļ åßäļņ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Ōåńģįōéźü BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "¶ķļéćģį"
@@ -7892,13 +7925,13 @@ msgstr "
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7906,12 +7939,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7985,7 +8018,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Įäżķįōē ē äēģéļõńćßį įń÷åßļõ"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8362,19 +8395,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "ŠŽćįéķå óōļ óżķäåóģļ"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "ÅéóÜćåōå įńéčģü óõķäŻóģļõ"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "ÓöÜėģį įšļ莟åõóēņ"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "ÓöÜėģį åććńįöŽņ óå įń÷åßļ"
 
diff --git a/po/es.po b/po/es.po
index c9410051..aaf26196 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: David Mediavilla <r96x6a79yki40001@sneakemail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -22,7 +22,7 @@ msgstr "Cerrar"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Información"
 
@@ -35,7 +35,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -159,7 +159,7 @@ msgstr "Cadena no encontrada"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Nśmero no vįlido"
 
@@ -183,10 +183,10 @@ msgstr "No se permite dejar el campo vac
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -252,7 +252,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -564,15 +564,15 @@ msgstr ""
 msgid "Content type"
 msgstr "El tipo de contenido es"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Śltima modificación"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "Cifrado SSL"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Compresión"
 
@@ -580,7 +580,7 @@ msgstr "Compresi
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "incompleto"
 
@@ -765,7 +765,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "El cursor es un bloque"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -998,283 +998,308 @@ msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "El cursor es un bloque"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "El cursor es un bloque"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "El cursor es un bloque"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "El cursor es un bloque"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "El cursor es un bloque"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Ir a enlace"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "El cursor es un bloque"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "2ŗ plano"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Shell del S~O"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 #, fuzzy
 msgid "Open options manager"
 msgstr "Gestor de opciones"
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Esperando confirmación para la redirección"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Ver ~imagen"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Descargar ima~gen"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Esperando confirmación para la redirección"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Ver ~imagen"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Descargar ima~gen"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Grabar opciones"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Grabar ~URL como..."
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Texto buscado"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Texto buscado"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opciones de terminal..."
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "~Enviar formulario"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Enviar formulario y ~recargar"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Cerrar"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Descargar ima~gen"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "~Abrir en nueva ventana"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "No hay busqueda anterior"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opciones de terminal..."
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Mostrar tķtulo <-> URL"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Mostrar tķtulo <-> URL"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Ver ~imagen"
@@ -1350,59 +1375,59 @@ msgstr "No usar recuadros"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Conexiones"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Grabar opciones"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Error interno"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1410,31 +1435,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "~Enviar formulario"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1442,91 +1467,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1535,58 +1560,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "No hay programa especificado para"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1594,43 +1619,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1649,11 +1674,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1671,19 +1696,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1691,11 +1716,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1704,15 +1729,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1731,7 +1756,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1739,18 +1764,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1874,7 +1899,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Grabar"
@@ -2142,7 +2167,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2151,7 +2176,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2163,7 +2188,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2531,7 +2556,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2576,7 +2601,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2670,7 +2695,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2774,9 +2799,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2786,7 +2811,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2962,7 +2987,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3045,8 +3070,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Pįgina de códigos"
 
@@ -3199,7 +3225,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3302,7 +3328,7 @@ msgstr "Error al grabar"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3893,7 +3919,7 @@ msgstr "Campo de selecci
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3904,7 +3930,7 @@ msgstr "Campo de selecci
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3985,7 +4011,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3997,7 +4023,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4142,62 +4169,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Error al grabar"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Pįgina de códigos"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "~Idioma"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Color"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4268,7 +4303,7 @@ msgid "Saving"
 msgstr "media"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4344,7 +4379,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Servidor"
 
@@ -4476,41 +4511,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "supuesta"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "sin respetar al servidor"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Fecha"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Śltima visita"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Información de cabecera"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Información de cabecera"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Descargar"
 
@@ -4594,7 +4629,7 @@ msgid "Download manager"
 msgstr "Descargar ima~gen"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4807,7 +4842,8 @@ msgstr "documentos"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "HTML ~fuente <-> interpretado"
 
 #. accelerator_context(tab_menu)
@@ -6018,31 +6054,32 @@ msgstr "Sin programa"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "~Extensiones de fichero"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6101,7 +6138,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6122,19 +6159,19 @@ msgstr "Eliminar extensi
 msgid "Delete extension %s -> %s?"
 msgstr "Eliminar extensión"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Extensión"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Extensiones"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tipo de contenido"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "No hay extensiones"
 
@@ -6279,7 +6316,7 @@ msgstr "Excepci
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Error interno"
@@ -6412,7 +6449,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6954,7 +6991,7 @@ msgstr "~Fichero"
 msgid "Comment"
 msgstr "documentos"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7137,7 +7174,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Descargar ima~gen"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "æQué hago?"
 
@@ -7148,13 +7185,13 @@ msgid "Down~load"
 msgstr "Descargar"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Ver en ELinks"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7185,42 +7222,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "ficheros"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "No hay extensiones"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7228,7 +7265,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Fichero"
@@ -7499,11 +7536,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7672,10 +7709,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7821,19 +7858,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "Descripción"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Error de descarga"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "No puedo escribir en el fichero"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7841,17 +7878,17 @@ msgid ""
 "%s"
 msgstr "Error de descarga"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "~Extensiones de fichero"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7862,55 +7899,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tipo desconocido"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Terminal ~BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Abrir con otro programa"
@@ -7926,13 +7959,13 @@ msgstr "Atenci
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7940,12 +7973,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8019,7 +8052,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "No puedo escribir en el fichero"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8397,19 +8430,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Ir a enlace"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Introduzca nŗ de enlace"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Error al grabar"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Error escribiendo en el fichero"
 
diff --git a/po/et.po b/po/et.po
index 6cc546ca..d9d91a0e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Taniel Kirikal <taniel@colleduc.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -21,7 +21,7 @@ msgstr "Sulge"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Otsitav s
 msgid "Name"
 msgstr "Nimi"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Vale number"
 
@@ -181,10 +181,10 @@ msgstr "T
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Sisu tüüp on"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Viimati muudetud"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "pooleli"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Plokk kursor"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Plokk kursor"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Plokk kursor"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Plokk kursor"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Plokk kursor"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Plokk kursor"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Mine lingile"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Plokk kursor"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Taustale"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~Opsüsteemi käsurida"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Ootan edasisuunamise kinnitust"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Nä~ita pilti"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Laadi alla pilt"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Ootan edasisuunamise kinnitust"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Nä~ita pilti"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Laadi alla pilt"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Salvesta parameetrid"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Salvesta ~URL"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Tekstiotsing"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Tekstiotsing"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Terminali seaded"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "E~sita vorm"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Esita vorm ja laadi alla"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Sulge"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Laadi alla pilt"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Ava uues aknas"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Eelnev otsing puudub"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Terminali seaded"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Vaata ~html lähtekoodi"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Vaata ~html lähtekoodi"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Nä~ita pilti"
@@ -1339,59 +1364,59 @@ msgstr "Pole paane"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Ühendused"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Salvesta parameetrid"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Sisemine viga"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "E~sita vorm"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Pole programmi märgitud"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Salvesta"
@@ -2130,7 +2155,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2139,7 +2164,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2151,7 +2176,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2519,7 +2544,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2564,7 +2589,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2656,7 +2681,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2760,9 +2785,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2772,7 +2797,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2947,7 +2972,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3029,8 +3054,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Kooditabel"
 
@@ -3182,7 +3208,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3285,7 +3311,7 @@ msgstr "Salvestamise viga"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3875,7 +3901,7 @@ msgstr "M
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3886,7 +3912,7 @@ msgstr "M
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3966,7 +3992,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3978,7 +4004,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4122,62 +4149,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Salvestamise viga"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Kooditabel"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Kee~l"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Värviline"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4248,7 +4283,7 @@ msgid "Saving"
 msgstr "keskm."
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4324,7 +4359,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4451,41 +4486,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "eeldatud"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ignoreeri serveri eelistused"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Kuupäev"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Päise info"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Päise info"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Alla laadimine"
 
@@ -4569,7 +4604,7 @@ msgid "Download manager"
 msgstr "Laadi alla pilt"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4784,7 +4819,8 @@ msgstr "documents"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Vaata ~html lähtekoodi"
 
 #. accelerator_context(tab_menu)
@@ -5986,31 +6022,32 @@ msgstr "Pole programmi"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Faililai~endid"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6069,7 +6106,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6090,19 +6127,19 @@ msgstr "Kustutada laiend"
 msgid "Delete extension %s -> %s?"
 msgstr "Kustutada laiend"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Laiend"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Laiend(id)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Sisu Tüüp"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Laiendid puuduvad"
 
@@ -6249,7 +6286,7 @@ msgstr "Sokli viga"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Sisemine viga"
@@ -6382,7 +6419,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6923,7 +6960,7 @@ msgstr "~Fail"
 msgid "Comment"
 msgstr "documents"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7106,7 +7143,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Laadi alla pilt"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Mida teha?"
 
@@ -7117,13 +7154,13 @@ msgid "Down~load"
 msgstr "Alla laadimine"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Näita"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7154,42 +7191,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "faile"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Laiendid puuduvad"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7197,7 +7234,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Fail"
@@ -7466,11 +7503,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7638,10 +7675,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7784,19 +7821,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Alla laadimise viga"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Ei suuda kirjutada faili"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7804,17 +7841,17 @@ msgid ""
 "%s"
 msgstr "Viga alla laadimisel"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Faililai~endid"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7825,55 +7862,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tundmatu tüüp"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS-i terminal"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Ava"
@@ -7889,13 +7922,13 @@ msgstr "Hoiatus"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7903,12 +7936,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7982,7 +8015,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Ei suuda kirjutada faili"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8359,19 +8392,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Mine lingile"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Sisesta lingi number"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Salvestamise viga"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Viga faili kirjutamisel"
 
diff --git a/po/fi.po b/po/fi.po
index d31d6fbd..d7189dd7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2006-09-03 13:49+0300\n"
 "Last-Translator: Kalle Olavi Niemitalo <kon@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr "Sulje"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Tieto"
 
@@ -35,7 +35,7 @@ msgstr "Voit laventaa kansion painamalla v
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -154,7 +154,7 @@ msgstr "Etsitty
 msgid "Name"
 msgstr "Nimi"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Ei luku"
 
@@ -181,10 +181,10 @@ msgstr "Tyhj
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -586,15 +586,15 @@ msgstr "Ladattu koko"
 msgid "Content type"
 msgstr "Sisällön tyyppi"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Viimeksi muokattu"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "SSL-salakirjoitusmenetelmä"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Koodaus"
 
@@ -603,7 +603,7 @@ msgid "Flags"
 msgstr "Liput"
 
 # "vajaa", "kesken"?
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "epätäydellinen"
 
@@ -782,7 +782,7 @@ msgstr "Liit
 msgid "Move to the previous item"
 msgstr "Siirry edelliseen kohtaan"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Piirrä pääte uudestaan"
@@ -996,259 +996,284 @@ msgstr "Siirr
 msgid "Move cursor left"
 msgstr "Siirrä kohdistinta vasemmalle"
 
-# Toisaalla on "Move the cursor right"; miten eronnee tästä?
 #: src/config/actions-main.inc:57
+#, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "Mene sivun/rivin alkuun"
+
+# Toisaalla on "Move the cursor right"; miten eronnee tästä?
+#: src/config/actions-main.inc:58
 msgid "Move cursor right"
 msgstr "Siirrä kohdistinta oikealle"
 
 # Toisaalla on "Move cursor upwards"; miten eronnee tästä?
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 msgid "Move cursor up"
 msgstr "Siirrä kohdistinta ylös"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 msgid "Move to the end of the document"
 msgstr "Siirry dokumentin loppuun"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 msgid "Move to the start of the document"
 msgstr "Siirry dokumentin alkuun"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 msgid "Move one link down"
 msgstr "Siirry yksi linkki alemmas"
 
-#: src/config/actions-main.inc:62
-msgid "Move one link left"
-msgstr "Siirry yksi linkki vasemmalle"
-
 #: src/config/actions-main.inc:63
-msgid "Move to the next link"
+#, fuzzy
+msgid "Move to the next line with a link"
 msgstr "Siirry seuraavaan linkkiin"
 
 #: src/config/actions-main.inc:64
+msgid "Move one link left"
+msgstr "Siirry yksi linkki vasemmalle"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "Siirry edelliseen linkkiin"
+
+#: src/config/actions-main.inc:66
+msgid "Move to the next link"
+msgstr "Siirry seuraavaan linkkiin"
+
+#: src/config/actions-main.inc:67
 msgid "Move to the previous link"
 msgstr "Siirry edelliseen linkkiin"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 msgid "Move one link right"
 msgstr "Siirry yksi linkki oikealle"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Siirry seuraavaan linkkiin"
+
+#: src/config/actions-main.inc:70
 msgid "Move one link up"
 msgstr "Siirry yksi linkki ylemmäs"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Siirry edelliseen linkkiin"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "Siirry sivun verran alemmas"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "Siirry sivun verran ylemmäs"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "Avaa nykyinen linkki uuteen välilehteen"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 msgid "Open the current link in a new tab in the background"
 msgstr "Avaa nykyinen linkki uuteen välilehteen taustalla"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "Avaa nykyinen linkki uuteen ikkunaan"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Avaa uusi välilehti"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 msgid "Open a new tab in the background"
 msgstr "Avaa uusi välilehti taustalla"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Avaa uusi ikkuna"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Käyttöjärjestelmä"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Avaa asetusten hallinta"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr ""
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "Lopeta kysymättä varmistusta"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "Lataa nykyinen sivu uudestaan"
 
 # Toisaalla on "Sa~ve formatted document".
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 msgid "Re-render the current page"
 msgstr "Muotoile nykyinen sivu uudestaan"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "Palauta lomakkeen kohtiin niiden alkuarvot"
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 #, fuzzy
 msgid "Show information about the currently used resources"
 msgstr "Näytä tietoja käytetyistä ..."
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr "Tallenna nykyinen dokumentti lähdekoodina"
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr "Tallenna nykyinen dokumentti muotoiltuna"
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Tallenna asetukset"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "Tallenna URL nimellä"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "Vieritä alas"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "Vieritä vasemmalle"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "Vieritä oikealle"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "Vieritä ylös"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Etsi tekstiä"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Etsi tekstiä taaksepäin"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "Näytä Pääteasetukset-ikkuna"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Lähetä lomake"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Lähetä lomake ja lataa"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Sulje kaikki välilehdet paitsi nykyinen"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr "Anna nykyisen välilehden URI ulkoiselle komennolle"
 
 # "välilehtivalikko" kuulostaa kuin siitä valittaisiin välilehti.
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "Avaa välilehden valikko"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 msgid "Move the current tab to the left"
 msgstr "Siirrä nykyistä välilehteä vasemmalle"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 msgid "Move the current tab to the right"
 msgstr "Siirrä nykyistä välilehteä oikealle"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Seuraava välilehti"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Edellinen välilehti"
 
 # Toisaalla on "Resize t~erminal".
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 msgid "Open the terminal resize dialog"
 msgstr "Avaa \"Aseta päätteen koko\" -ikkuna"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 msgid "Toggle mouse handling"
 msgstr ""
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 msgid "Toggle wrapping of text"
 msgstr ""
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Näytä kuva"
@@ -1320,59 +1345,59 @@ msgstr "Ei kehyksi
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(oletus: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(oletus: \"%s\")"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(oletus: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Yhteydet"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr "Käyttö: elinks [VALITSIN]... [URL]..."
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Sisäinen virhe"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1381,31 +1406,31 @@ msgid ""
 msgstr ""
 
 # "automaattisesti" olisi kovin pitkä.
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Lähetä ensimmäinen lomake heti"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 #, fuzzy
 msgid "Clone internal session with given ID"
 msgstr "Kloonaa istunto, jolla on annettu ID"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "Asetustiedoston sisältävän hakemiston nimi"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1413,94 +1438,94 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "Asetustiedoston nimi"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
 # "ja poistu"?
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 #, fuzzy
 msgid "Print help for configuration options and exit."
 msgstr "Näytä versiotiedot ja lopeta"
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr "Sivuuta käyttäjän tekemät näppäinsidonnat"
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 #, fuzzy
 msgid "Evaluate configuration file directive"
 msgstr "Asetustiedoston nimi"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1509,34 +1534,34 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 #, fuzzy
 msgid "Interpret documents of unknown types as HTML"
 msgstr "Oleta tiedoston olevan HTML:ää"
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "Salli vain paikalliset yhteydet"
 
 # src/network/socket.c (check_if_local_address4) sallii yhteyden, jos se
 # on osoitteeseen 127.0.0.0/8 tai jonkin paikallisen verkkosovittimen
 # osoitteeseen.
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
@@ -1546,28 +1571,28 @@ msgstr ""
 "paikallisissa osoitteissa (mm. 127.0.0.1) toimiviin palvelimiin.\n"
 "Yhteyksiä etäpalvelimiin ei sallita."
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Ei ohjelmaa osoitettu"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1575,12 +1600,12 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr "Estä hakemiston ~/.elinks käyttö"
 
 # <fonseca> You can still alter option values but there is no way to save them.
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
@@ -1590,32 +1615,32 @@ msgstr ""
 "asetushakemistossa (~/.elinks). Pakottaa oletusasetukset käyttöön\n"
 "ja estää tallentamasta ohjelman tilaa tiedostoihin."
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr "Estä linkkien numerointi dump-tulosteessa"
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "Ohjaa käynnissä olevaa ELinksiä"
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1634,11 +1659,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1656,19 +1681,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1676,11 +1701,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1690,16 +1715,16 @@ msgid ""
 msgstr ""
 
 # "ja poistu"?
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Näytä versiotiedot ja lopeta"
 
 # "ja poistu"?
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "Näytä ELinksin versiotiedot ja lopeta."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1711,7 +1736,7 @@ msgstr ""
 "## ELinks muokkaa tätä tiedostoa mutta muuttaa vain asetusten\n"
 "## arvot; kaikki muotoilusi, huomautuksesi yms. jäävät ennalleen.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1722,7 +1747,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1735,18 +1760,18 @@ msgstr ""
 "## jolloin kaikki tekemäsi muotoilut ja lisäämäsi huomautukset\n"
 "## katoavat, joten pidä varasi.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Automaattisesti tallennetut näppäinsidonnat\n"
 
@@ -1874,7 +1899,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 msgid "Sa~ve"
 msgstr "~Tallenna"
 
@@ -2150,13 +2175,14 @@ msgid "Try IPv4 when connecting"
 msgstr "Yritä yhteyttä IPv4:llä"
 
 #: src/config/options.inc:100
+#, fuzzy
 msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Note that if connection.try_ipv6 is enabled too,\n"
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Yrittääkö ottaa isäntään yhteyttä IPv4:llä.\n"
@@ -2168,11 +2194,12 @@ msgstr ""
 "esim. \"http4://elinks.cz/\"-muotoista URL:ää."
 
 #: src/config/options.inc:110
+#, fuzzy
 msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Yrittääkö ottaa isäntään yhteyttä IPv4:llä.\n"
@@ -2186,10 +2213,11 @@ msgid "Try IPv6 when connecting"
 msgstr "Yritä yhteyttä IPv6:lla"
 
 #: src/config/options.inc:120
+#, fuzzy
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 "Yrittääkö ottaa isäntään yhteyttä IPv6:lla.\n"
@@ -2554,7 +2582,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2600,7 +2628,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2691,7 +2719,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2790,9 +2818,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2802,7 +2830,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2976,7 +3004,7 @@ msgstr ""
 
 #: src/config/options.inc:587
 #, fuzzy
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Varmistaa etteivät tausta- ja edustavärit koskaan ole samat."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3057,8 +3085,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Merkistö"
 
@@ -3204,7 +3233,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3305,7 +3334,7 @@ msgstr "Tallennusv
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3889,7 +3918,7 @@ msgstr "Alleviivaa pikan
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3900,7 +3929,7 @@ msgstr "Valitse kentt
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3980,7 +4009,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3992,7 +4021,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4136,61 +4166,69 @@ msgstr ""
 msgid "Read error"
 msgstr "Talletusvirhe"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Merkistö"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<kieli>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Väri"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Kansio"
 
@@ -4258,7 +4296,7 @@ msgid "Saving"
 msgstr "Tallennus"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4329,7 +4367,7 @@ msgid "~Reject"
 msgstr "~Estä"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Palvelin"
 
@@ -4446,41 +4484,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr "Linkin otsikko (historiasta)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "oletettu"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "hylkää palvelinasetukset"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Päiväys"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Otsikkotieto"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Otsikkotieto"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Lataa"
 
@@ -4558,7 +4596,7 @@ msgid "Download manager"
 msgstr "Latausten hallinta"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4761,7 +4799,8 @@ msgstr "~Kirjanmerkki dokumentista"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Vaihda ~HTML/tavallinen"
 
 #. accelerator_context(tab_menu)
@@ -5904,35 +5943,36 @@ msgid "Program"
 msgstr "Ohjelma"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Ulkoinen katseluohjelma tälle tiedostotyypille. Merkkijonossa oleva\n"
 "%-merkki korvataan tiedoston nimellä."
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Tiedostopäätteiden kytkennät"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "Asetusjärjestelmä"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -5991,7 +6031,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6012,19 +6052,19 @@ msgstr "Poista tiedostop
 msgid "Delete extension %s -> %s?"
 msgstr "Poista tiedostopääte"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Tiedostopääte"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Tiedostopäätteet"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Sisältötyyppi"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Ei tiedostopäätteitä"
 
@@ -6168,7 +6208,7 @@ msgstr "T
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Sisäinen virhe"
@@ -6301,7 +6341,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6827,7 +6867,7 @@ msgstr "Tiedostot"
 msgid "Comment"
 msgstr "Kommentti"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7012,7 +7052,7 @@ msgstr "Mit
 msgid "Information about the torrent"
 msgstr "Näytä tietoja nykyisestä sivusta"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Mitä tehdä?"
 
@@ -7022,12 +7062,12 @@ msgid "Down~load"
 msgstr "~Lataa"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 msgid "~Display"
 msgstr "~Näytä"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr "Näytä ~otsake"
 
@@ -7056,19 +7096,19 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Anna lukea erikoistiedostoja"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7078,22 +7118,22 @@ msgstr ""
 # Unixissa tiedosto on piilossa, jos sen nimi alkaa pisteellä.
 # Tiedostoa ei siis voi piilottaa muuttamatta sen nimeä.
 # Siksi tässä ei ole "piilotetut tiedostot".
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Näytä piilotiedostot hakemistolistauksissa"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Ei tiedostopäätteitä"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7101,7 +7141,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "Tiedosto"
 
@@ -7375,11 +7415,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7546,10 +7586,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7693,12 +7733,12 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "ECMAScript"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Vastaanottovirhe"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -7707,7 +7747,7 @@ msgstr ""
 "Tiedostoa \"%s\" ei voi perustaa:\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7718,16 +7758,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "\"%s\" on hakemisto."
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Tiedosto on olemassa"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7743,55 +7783,51 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr "~Tallenna vaihtoehtoisella nimellä"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr "~Kirjoita alkuperäisen tiedoston päälle"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr "~Jatka alkuperäisen tiedoston latausta"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tuntematon tyyppi"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Mitä haluat tehdä tiedostolla \"%s\" (tyyppi: %s%s%s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Mitä haluat tehdä tiedostolla \"%s\" (tyyppi: %s%s%s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Ohjelma (\"%\" korvataan tiedoston nimellä)"
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Varaa pääte"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr "Tiedosto avataan ohjelmalla \"%s\"."
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 msgid "~Open"
 msgstr "~Avaa"
 
@@ -7806,13 +7842,13 @@ msgstr "Varoitus"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7820,12 +7856,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7904,7 +7940,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Tiedostoon kirjoitus epäonnistui"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8272,19 +8308,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Valitse linkki"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Valitse linkkinumero"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Talletusvirhe"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Virhe tiedostoon kirjoittaessa"
 
diff --git a/po/fr.po b/po/fr.po
index c9b3ef74..ef6e2f95 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 22:26+0100\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2008-03-25 22:30+0100\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
@@ -152,7 +152,7 @@ msgstr "Cha
 msgid "Name"
 msgstr "Nom"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Nombre incorrect"
 
@@ -179,7 +179,7 @@ msgstr "Cha
 #: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1243
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 msgid "~Cancel"
 msgstr "~Annuler"
@@ -1937,7 +1937,7 @@ msgstr "Impossible d'ajouter une option ici."
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1227
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 msgid "Sa~ve"
 msgstr "Enre~gistrer"
 
@@ -4864,7 +4864,7 @@ msgid "No header info."
 msgstr "Aucune information d'en-tźte."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Téléchargement"
 
@@ -6370,7 +6370,7 @@ msgid "Option system"
 msgstr "Systčme de configuration"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:685
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6631,7 +6631,7 @@ msgstr "Exception socket"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Erreur interne"
@@ -7359,7 +7359,7 @@ msgstr "Fichiers"
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7532,7 +7532,7 @@ msgstr "Que voulez-vous faire avec le fichier '%s' ?"
 msgid "Information about the torrent"
 msgstr "Informations sur le torrent"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1124
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Que faire ?"
 
@@ -7542,12 +7542,12 @@ msgid "Down~load"
 msgstr "Té~lécharger"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1233
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 msgid "~Display"
 msgstr "A~fficher"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1237
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr "~Montrer les en-tźtes"
 
@@ -7577,19 +7577,19 @@ msgstr "Ex
 msgid "CGI"
 msgstr "CGI"
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Fichiers locaux"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Options pour la navigation locale."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Autoriser la lecture des fichiers spéciaux"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7599,11 +7599,11 @@ msgstr ""
 "Notez que cela peut źtre dangereux; lire /dev/urandom\n"
 "ou /dev/zero peut ruiner votre journée !"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Montrer les fichiers cachés"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
 "hidden in local directory listings."
@@ -7612,11 +7612,11 @@ msgstr ""
 "seront cachés lors de la visualisation du contenu d'un répertoire\n"
 "local."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "Deviner l'extension des fichiers encodés"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7627,7 +7627,7 @@ msgstr ""
 "'un_nom.gz'); cela dépend des encodages supportés."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "File"
 
@@ -8317,12 +8317,12 @@ msgstr "Alerte script utilisateur"
 msgid "Spidermonkey ECMAScript"
 msgstr "Spidermonkey ECMAScript"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Erreur de téléchargement"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8331,7 +8331,7 @@ msgstr ""
 "Impossible de créer le fichier '%s':\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8342,16 +8342,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' est un répertoire."
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Fichier existant"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8367,54 +8367,50 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr "Sau~ver sous un nom alternatif"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr "Ecraser le fichier ~original"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr "~Reprendre le téléchargement du fichier original"
 
-#: src/session/download.c:1127
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Type inconnu"
 
-#: src/session/download.c:1152
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Que voulez-vous faire avec le fichier '%s' (type: %s%s%s) ?"
 
-#: src/session/download.c:1155
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Que voulez-vous faire avec le fichier (type: %s%s%s) ?"
 
-#: src/session/download.c:1183
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Programme ('%' sera remplacé par le nom du fichier)"
 
-#: src/session/download.c:1188
-msgid "The output of the program will be shown in the tab"
-msgstr "La sortie du programme sera montrée dans l'onglet"
-
-#: src/session/download.c:1192
+#: src/session/download.c:1169
 msgid "Block the terminal"
 msgstr "Bloquer le terminal"
 
-#: src/session/download.c:1199
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr "Le fichier sera ouvert avec le programme '%s'."
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1220
+#: src/session/download.c:1196
 msgid "~Open"
 msgstr "~Ouvrir"
 
@@ -8549,7 +8545,7 @@ msgstr "Mauvais 
 msgid "Could not read event: %d (%s)"
 msgstr "Impossible de lire l'évčnement: %d (%s)"
 
-#: src/terminal/kbd.c:1186
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "Trop d'octets lus en provenance de itrm!"
@@ -8938,6 +8934,9 @@ msgstr "Chronom
 msgid "Viewer"
 msgstr "Visionneur"
 
+#~ msgid "The output of the program will be shown in the tab"
+#~ msgstr "La sortie du programme sera montrée dans l'onglet"
+
 #~ msgid ""
 #~ "Whether to try to connect to a host over IPv4.\n"
 #~ "Note that if connection.try_ipv6 is enabled too,\n"
diff --git a/po/gl.po b/po/gl.po
index 921f337e..8783f0ac 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Alberto Garcķa <berto@gpul.org>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -21,7 +21,7 @@ msgstr "Pechar"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Información"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Non se atopou a cadea de b
 msgid "Name"
 msgstr "Nome"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Nśmero non vįlido"
 
@@ -181,10 +181,10 @@ msgstr "Non se permite unha cadea baleira"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "O tipo de contido é"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Ultima modificación"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "incompleto"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Cursor de bloque"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Cursor de bloque"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Cursor de bloque"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Cursor de bloque"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Cursor de bloque"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Cursor de bloque"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Ir a ligazón"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Cursor de bloque"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "2ŗ plano"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Intérprete de ~comandos do S.O."
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Agardando pola confirmación da redirección"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "~Ver imaxe"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Descargar ~imaxe"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Agardando pola confirmación da redirección"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "~Ver imaxe"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Descargar ~imaxe"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Gardar opcións"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Gardar ~URL como"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Buscar texto"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Buscar texto"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opcións de terminal"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Enviar formulario"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Enviar formulario e ~descargar"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Pechar"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Descargar ~imaxe"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Abrir en nova fiestra"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Non hai bśsqueda anterior"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opcións de terminal"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "~Cambiar HTML/texto plano"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "~Cambiar HTML/texto plano"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "~Ver imaxe"
@@ -1339,59 +1364,59 @@ msgstr "Sen marcos"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Conexións"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Gardar opcións"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Erro interno"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Enviar formulario"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Sen programa especificado para"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Gardar"
@@ -2130,7 +2155,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2139,7 +2164,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2151,7 +2176,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2519,7 +2544,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2564,7 +2589,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2656,7 +2681,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2760,9 +2785,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2772,7 +2797,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2947,7 +2972,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3029,8 +3054,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Tįboa de códigos"
 
@@ -3182,7 +3208,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3285,7 +3311,7 @@ msgstr "Erro 
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3875,7 +3901,7 @@ msgstr "Campo de selecci
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3886,7 +3912,7 @@ msgstr "Campo de selecci
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3966,7 +3992,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3978,7 +4004,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4122,62 +4149,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Erro ó gardar"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Tįboa de códigos"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Lingua"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Cor"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4248,7 +4283,7 @@ msgid "Saving"
 msgstr "media"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4324,7 +4359,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Servidor"
 
@@ -4451,41 +4486,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "asumido"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ignorando configuración do servidor"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Información das cabeceiras"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Información das cabeceiras"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Descargar"
 
@@ -4569,7 +4604,7 @@ msgid "Download manager"
 msgstr "Descargar ~imaxe"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4782,7 +4817,8 @@ msgstr "documentos"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "~Cambiar HTML/texto plano"
 
 #. accelerator_context(tab_menu)
@@ -5984,31 +6020,32 @@ msgstr "Sen programa"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "~Extensións de ficheiros"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6067,7 +6104,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6088,19 +6125,19 @@ msgstr "Eliminar extensi
 msgid "Delete extension %s -> %s?"
 msgstr "Eliminar extensión"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Extensión"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Extensión(s)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tipo de contido"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Sen extensións"
 
@@ -6247,7 +6284,7 @@ msgstr "Excepci
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Erro interno"
@@ -6380,7 +6417,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6921,7 +6958,7 @@ msgstr "~Ficheiro"
 msgid "Comment"
 msgstr "documentos"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7104,7 +7141,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Descargar ~imaxe"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "æQué fago?"
 
@@ -7115,13 +7152,13 @@ msgid "Down~load"
 msgstr "Descargar"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Mostrar"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7152,42 +7189,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "ficheiros"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Sen extensións"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7195,7 +7232,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Ficheiro"
@@ -7464,11 +7501,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7636,10 +7673,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7782,19 +7819,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Erro de descarga"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Non se puido crear o ficheiro"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7802,17 +7839,17 @@ msgid ""
 "%s"
 msgstr "Erro descargando"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "~Extensións de ficheiros"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7823,55 +7860,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tipo descońecido"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Terminal de ~BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Abrir"
@@ -7887,13 +7920,13 @@ msgstr "Aviso"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7901,12 +7934,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7980,7 +8013,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Non se puido crear o ficheiro"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8357,19 +8390,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Ir a ligazón"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Introduce nŗ de ligazón"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Erro ó gardar"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Erro escribindo a ficheiro"
 
diff --git a/po/hr.po b/po/hr.po
index e67a0e98..f973afb3 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -21,7 +21,7 @@ msgstr "Zatvori"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Podaci"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Nije na
 msgid "Name"
 msgstr "Ime"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Neispravan broj"
 
@@ -181,10 +181,10 @@ msgstr "Prazni niz znakova nije dozvoljen"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Tip sadr¾aja je"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Zadnja promjena"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "nedovr¹eno"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Blok kursor"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Blok kursor"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Blok kursor"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Blok kursor"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Blok kursor"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Blok kursor"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Idi na link"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Blok kursor"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Pozadina"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~OS ljuska"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Čekam podatke o redirekciji"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Prika¾i sliku"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Skini sliku"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Čekam podatke o redirekciji"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Prika¾i sliku"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Skini sliku"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Sačuvaj opcije"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Spremi ~URL kao"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Tra¾i tekst"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Tra¾i tekst"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opcije terminala"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Po¹alji formular"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Po¹alji formular i preuzmi"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Zatvori"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Skini sliku"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Otvori u novom prozoru"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Nije bilo prethodnog tra¾enja"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opcije terminala"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Mijenjaj ~html/obični tekst"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Mijenjaj ~html/obični tekst"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Prika¾i sliku"
@@ -1339,59 +1364,59 @@ msgstr "Nema okvira"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Veze"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Sačuvaj opcije"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Interna gre¹ka"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Po¹alji formular"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Nema programa za"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Spremi"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Kodna stranica"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "Gre
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "Odaberi polje"
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "Odaberi polje"
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Gre¹ka pri spremanju"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Kodna stranica"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "~Jezik"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Boja"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "prosjek"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "pretpostavljeno"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "zanemarujem postavke servera"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Podaci o zaglavlju"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Podaci o zaglavlju"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Preuzmi"
 
@@ -4570,7 +4605,7 @@ msgid "Download manager"
 msgstr "Skini sliku"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4782,7 +4817,8 @@ msgstr "dokumenti"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Mijenjaj ~html/obični tekst"
 
 #. accelerator_context(tab_menu)
@@ -5984,31 +6020,32 @@ msgstr "Nema programa"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Nastavci ~datoteka"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6067,7 +6104,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6088,19 +6125,19 @@ msgstr "Izbri
 msgid "Delete extension %s -> %s?"
 msgstr "Izbri¹i nastavak"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Nastavak"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Nastavak(ci)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tip sadr¾aja"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr ""
 
@@ -6245,7 +6282,7 @@ msgstr "Socket gre
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Interna gre¹ka"
@@ -6378,7 +6415,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6919,7 +6956,7 @@ msgstr "~Datoteka"
 msgid "Comment"
 msgstr "dokumenti"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7102,7 +7139,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Skini sliku"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "©to napraviti?"
 
@@ -7113,13 +7150,13 @@ msgid "Down~load"
 msgstr "Preuzmi"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Prika¾i"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7150,42 +7187,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "datoteke"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Nastavci ~datoteka"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7193,7 +7230,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Datoteka"
@@ -7462,11 +7499,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7634,10 +7671,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7780,19 +7817,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Gre¹ka pri skidanju podatka"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Nisam mogao stvoriti datoteku"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7800,17 +7837,17 @@ msgid ""
 "%s"
 msgstr "Gre¹ka pri preuzimanju"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Nastavci ~datoteka"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7821,55 +7858,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Nepoznati tip"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS terminal"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Otvoriti"
@@ -7885,13 +7918,13 @@ msgstr "Upozorenje"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7899,12 +7932,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7978,7 +8011,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Nisam mogao stvoriti datoteku"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8355,19 +8388,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Idi na link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Unesi broj linka"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Gre¹ka pri spremanju"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Gre¹ka pri pisanju u file"
 
diff --git a/po/hu.po b/po/hu.po
index 68937120..3669dfe6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2005-10-11 19:06+0000\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -27,7 +27,7 @@ msgstr "Bez
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Informįció"
 
@@ -40,7 +40,7 @@ msgstr "A mappa kinyit
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Keresett sz
 msgid "Name"
 msgstr "Név"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Hibįs szįm"
 
@@ -181,10 +181,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 msgid "~Cancel"
 msgstr "~Mégsem"
@@ -242,7 +242,7 @@ msgid "LED indicators"
 msgstr "LED įllapotjelzõk"
 
 #: src/bfu/leds.c:306
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "What the different LEDs indicate:\n"
 "\n"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -577,15 +577,15 @@ msgstr "Bet
 msgid "Content type"
 msgstr "Tartalom tķpus"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Utolsó módosķtįs"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "SSL algoritmus"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Kódolįs"
 
@@ -593,7 +593,7 @@ msgstr "K
 msgid "Flags"
 msgstr "Flag-ek"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "sikertelen"
 
@@ -767,7 +767,7 @@ msgstr "Sz
 msgid "Move to the previous item"
 msgstr "Ugrįs az elõzõ elemre"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Terminįl śjrarajzolįsa"
@@ -975,248 +975,273 @@ msgid "Move cursor left"
 msgstr "Kurzor mozgatįsa balra"
 
 #: src/config/actions-main.inc:57
+#, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "Ugrįs az oldal/sor elejére"
+
+#: src/config/actions-main.inc:58
 msgid "Move cursor right"
 msgstr "Kurzor mozgatįsa jobbra"
 
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 msgid "Move cursor up"
 msgstr "A kurzor mozgatįsa felfelé"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 msgid "Move to the end of the document"
 msgstr "Ugrįs a dokumentum végére"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 msgid "Move to the start of the document"
 msgstr "Ugrįs a dokumentum elejére"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 msgid "Move one link down"
 msgstr "Ugrįs egy linkkel feljebb"
 
-#: src/config/actions-main.inc:62
-msgid "Move one link left"
-msgstr "Ugrįs egy linkkel feljebb"
-
 #: src/config/actions-main.inc:63
-msgid "Move to the next link"
+#, fuzzy
+msgid "Move to the next line with a link"
 msgstr "Ugrįs a következõ linkre"
 
 #: src/config/actions-main.inc:64
+msgid "Move one link left"
+msgstr "Ugrįs egy linkkel feljebb"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "Ugrįs az elõzõ linkre"
+
+#: src/config/actions-main.inc:66
+msgid "Move to the next link"
+msgstr "Ugrįs a következõ linkre"
+
+#: src/config/actions-main.inc:67
 msgid "Move to the previous link"
 msgstr "Ugrįs az elõzõ linkre"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 msgid "Move one link right"
 msgstr "Ugrįs egy linkkel jobbra"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Ugrįs a következõ linkre"
+
+#: src/config/actions-main.inc:70
 msgid "Move one link up"
 msgstr "Ugrįs egy linkkel feljebb"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Ugrįs az elõzõ linkre"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "Ugrįs egy oldallal lentebb"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "Ugrįs egy oldallal feljebb"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "A kijelölt link megnyitįsa śj fülre"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 msgid "Open the current link in a new tab in the background"
 msgstr "A kijelölt link megnyitįsa a hįttérben, śj fülre"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "A kijelölt link megnyitįsa śj ablakban"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Śj ~fül megnyitįsa"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 msgid "Open a new tab in the background"
 msgstr "Śj fül megnyitįsa a hįttérben"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Śj ablak megnyitįsa"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr "Parancssor megnyitįsa"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Beįllķtįskezelõ"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "Kilépést megerõsķtõ dialógusablak megnyitįsa"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "Kilépés rįkérdezés nélkül"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "Az aktuįlis lap śjratöltése"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 msgid "Re-render the current page"
 msgstr "Az aktuįlis lap śjrarajzolįsa"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "Az ūrlap mezõinek beįllķtįsa kezdeti értékükre"
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr "Erõforrįs Informįciók megjelenķtése"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr "Az aktuįlis oldal mentése forrįs formįban"
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr "Az aktuįlis oldal mentése forrįs formįban."
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Beįllķtįsok menté~se"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "~URL mentése mįsként"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "Görgetés lefelé"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "Görgetés balra"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "Görgetés jobbra"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "Görgetés felfelé"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "Szöveg keresése"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "Szöveg keresése visszafelé"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr "Link keresése gépeléssel"
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr "Szöveg keresése gépeléssel"
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr "Szöveg keresése gépeléssel visszafelé"
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "Terminįl beįllķtįsi ablak megnyitįsa"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr "Ūrlap elküldése"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr "Ūrlap elküldése, és az oldal śjratöltése"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Böngészõfül bezįrįsa"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Minden fül bezįrįsa, kivéve az aktuįlisat"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr "Az aktuįlis fül URI-jįnak įtadįsa külsõ programnak"
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "A fülek menüjének megnyitįsa"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 msgid "Move the current tab to the left"
 msgstr "Az aktuįlis fül mozgatįsa balra"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 msgid "Move the current tab to the right"
 msgstr "Az aktuįlis fül mozgatįsa jobbra"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Következõ böngészõfül"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Elõzõ böngészõfül"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 msgid "Open the terminal resize dialog"
 msgstr "Terminįl įtméretezési ablak megnyitįsa"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr "Az CSS megjelenķtésének be/kikapcsolįsa"
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "A képekre mutató linkek megjelenķtésének vįltogatįsa"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr "A tįblįzatok megjelenķtésének vįltogatįsa"
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr "A dokumentum įltal elõķrt szķnek hasznįlatįnak vįltogatįsa"
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr "Az oldal HTML / normįl szövegkent való megjelenķtésének vįltogatįsa"
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Mentés be/ki"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "A linkek sorszįmozįsįnak vįltogatįsa"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr "Az üres sorok összevonįsįnak vįltogatįsa"
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 msgid "Toggle wrapping of text"
 msgstr "A sortörések vįltogatįsa"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr "A kijelölt kép megtekintése"
 
@@ -1288,57 +1313,57 @@ msgstr "Hi
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr "Tįvoli metódus nem tįmogatott"
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(alapértelmezett: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(alapértelmezett: \"%s\")"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr "(įlnév ehhez: %s)"
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(alapértelmezett: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 msgid "Configuration options"
 msgstr "Konfigurįciós beįllķtįsok"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 #, fuzzy
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr "Hasznįlat: elinks [OPCIÓK]... [URL]"
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 msgid "Options"
 msgstr "Opciók"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 msgid "Internal consistency error"
 msgstr "Belsõ kozisztencia hiba"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "Korlįtozott üzemmód"
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1350,19 +1375,19 @@ msgstr ""
 "A külsõ megjelenķtõprogramok mūködnek, de a hozzįrendelési\n"
 "tįblįhoz nem lehet hozzįadni śj bejegyzést."
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Az elsõ ūrlap automatikus küldése"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr "Az elsõnek megtalįlt ūrlap automatikus küldése a megadott URL-re."
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr "Klónozza a megadott azonosķtóval futó példįnyt"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
@@ -1373,11 +1398,11 @@ msgstr ""
 "létrehozįsįhoz.\n"
 "Ritkįn hasznįlt opció."
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "A konfigurįciós fįjlt tartalmazó könyvtįr neve"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1389,11 +1414,11 @@ msgstr ""
 "Ha az śtvonal '/' jellel kezdõdik, akkor abszolśt elérési śtvonalként,\n"
 "egyébként pedig a HOMEkönyvtįrhoz képest relatķvan kerül értelmezésre."
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr "Az alapértelmezett konfigurįciósįllomįny kiķrįsa stdoutra"
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
@@ -1401,11 +1426,11 @@ msgstr ""
 "Az alapértelmezett konfigurįciósįllomįny kiķrįsa stdoutra\n"
 "alapbeįllķtįsokkal."
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "A konfigurįciós fįjl neve"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
@@ -1415,28 +1440,28 @@ msgstr ""
 "tartalmazza, relatķvan megadva a konfigurįciós\n"
 "könyvtįrhoz képest."
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "Segķtség megjelenķtése a beįllķtįsokhoz"
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr "Segķtség megjelenķtése a beįllķtįsokhoz, és kilépés."
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr "Az ismeretlen dokumentumokhoz hasznįlt MIME tķpus"
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr "Az ismeretlen dokumentumok alapértelmezett MIME tķpusa."
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 "A felhasznįló įltal definiįlt billentyūkombinįciók figyelmen kķvül hagyįsa"
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
@@ -1447,46 +1472,46 @@ msgstr ""
 "az alapértelmezett, és mentéskor megsemmisülnek\n"
 "az egyedi kombinįciók."
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr "A megadott URL formįzott vįltozatįnak kiķrįsa stdout-ra"
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 "A megadott URL formįzott normįl szöveges vįltozatįnak kiķrįsa stdout-ra."
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "Kódlap a kiķrįshoz"
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr "A kiķrįshoz hasznįlt kódlap."
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 #, fuzzy
 msgid "Color mode used with -dump"
 msgstr "Kódlap a kiķrįshoz"
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 #, fuzzy
 msgid "Color mode used with -dump."
 msgstr "Kódlap a kiķrįshoz"
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "A dokumentum szélessége -dump-al formįzva"
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "A dokumentum szélessége -dump-al formįzva."
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr "Az adott konfigurįciós beįllķtįs kiértékelése"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1499,11 +1524,11 @@ msgstr ""
 "pl: -eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr "Az ismeretlen dokumentumok HTML-ként való kezelése"
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
@@ -1515,19 +1540,19 @@ msgstr ""
 "(pl. levelezõprogram).Ez a beįllķtįs megfelel a default-mime-type text/html-"
 "nek."
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "Felhasznįlói segédlet kiirįsa, és kilépés"
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "Felhasznįlói segédlet kiirįsa, és kilépés."
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "Csak helyi kapcsolatok engedélyezése"
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
@@ -1536,29 +1561,29 @@ msgstr ""
 "Az ELinks hįlózati kapcsolatainak korlįtozįsa helyi IP cķmekre,\n"
 "(pl.: 127.0.0.1), és ezzel a tįvoli kapcsolatok megakadįlyozįsa."
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "Részletes felhasznįlói segédlet kiirįsa, és kilépés"
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr "Részletes felhasznįlói segédlet kiirįsa, és kilépés."
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "A megadott host névfeloldįsa"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 "A megadott host cķmének feloldįsa, és az összes DNS įltal\n"
 "visszaadott IP cķm megjelenķtése."
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "Futįs különįlló módban"
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1570,11 +1595,11 @@ msgstr ""
 "könyvjelzõ, lįtogatott lapok listįja, stb. Lįsd még a\n"
 "\"-touch-files\" opciót."
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr "Ne hasznįlja a ~/.elinks könyvtįrban lévõ fįjlokat"
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
@@ -1585,11 +1610,11 @@ msgstr ""
 "opciók lesznek érvényben, és nem lehet beįllķtįsokat menteni,\n"
 "valamint nem jönnek létre futįs közben įtmeneti įllomįnyok."
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr "Ne szįmozza a linkeket a kiķrt fįjlban"
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
@@ -1598,11 +1623,11 @@ msgstr ""
 " Megjegyzés: Ez az opció csak a -dump įltal mentett\n"
 "fįjlokra vonatkozik."
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr "Ne ķrjon link hivatkozįsokat a mentett fįjlokba"
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
@@ -1611,11 +1636,11 @@ msgstr ""
 "Ne ķrjon link hivatkozįsokat (URI-ket) a mentett fįjlokba.\n"
 "Megjegyzés: Ez az opció csak a -dump įltal mentett fįjlokra vonatkozik."
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "Egy futó ELinks példįny vezérlése"
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 #, fuzzy
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
@@ -1647,12 +1672,12 @@ msgstr ""
 "\taddBookmark(URL)          -- URL felvétele a könyvjelzõkhöz\n"
 "\txfeDoCommand(openBrowser) -- śj ablak megnyitįsa"
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 "Csatlakozįs az ELinks belsõ adatmegosztó hįlózatįhoz megadott azonosķtóval."
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1679,21 +1704,21 @@ msgstr ""
 "programon, és tesztelni szeretnéd. Ha azt szeretnéd hogy minden ELinks\n"
 "példįny szeparįltan induljon, akkor ehelyett hasznįld a -no-connect opciót."
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr "A megadott URL forrįskódjįnak stdout-ra ķrįsa"
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr "A megadott HTML dokumentum stdout-ra ķrįsa forrįs formįban."
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 "Az ~/.elinks könyvtįrban lévõ įllomįnyok ķrhatók -no-connect/-session-ring\n"
 "opciók esetén"
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1704,11 +1729,11 @@ msgstr ""
 "ķrhatók -no-connect/-session-ring opciók hasznįlata mellett is. Az opció\n"
 "hatįstalan, ha nem a fenti parancsokkal hasznįljuk."
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr "Üzenetek részletessége"
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1722,15 +1747,15 @@ msgstr ""
 "\t1 a sślyos hibaüzenetek, és a figyelmeztetések is jelenjenek meg\n"
 "\t2 az összes üzenet jelenjen meg"
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Veriószįm kiķrįsa, és kilépés"
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "Elinks veriószįm kiķrįsa, es kilépés."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1741,7 +1766,7 @@ msgstr ""
 "## Ha az ELinksbõl mented a beįllķtįsokat, csak az értékek vįltoznak,\n"
 "## minden įltalad szerkesztett formįzįs vagy megjegyzés megmarad.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1758,7 +1783,7 @@ msgstr ""
 "## a fįljban, de egy ez a fįlj hivatkozik egy mįsikra amiben szerepel,\n"
 "## akkor nem szįmķt hiįnyzónak opciónak.\n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1769,7 +1794,7 @@ msgstr ""
 "## de ha az ELinksbõl mented a beįllķtįsokat, felülķródnak, és a\n"
 "## formįzįsod, megjegyzéseid elveszhetnek.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1778,11 +1803,11 @@ msgstr ""
 "## Ha nem szereted ahogyan az ELinks megvįltoztatja ezt a fįjlt,\n"
 "## įllķtsd a config.saving_style opciót.\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "Automatikusan mentett beįllķtįsok\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Automatikusan mentett billentyūparancsok\n"
 
@@ -1910,7 +1935,7 @@ msgstr "Ide nem lehet be
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 msgid "Sa~ve"
 msgstr "Menté~s"
 
@@ -2201,7 +2226,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Az IPv4 protokoll hasznįlata a kapcsolódįshoz.\n"
@@ -2217,7 +2242,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Az IPv4 protokoll hasznįlata a kapcsolódįshoz.\n"
@@ -2235,7 +2260,7 @@ msgstr "Kapcsol
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 "Az IPv6 protokoll hasznįlata a kapcsolódįshoz.\n"
@@ -2642,11 +2667,12 @@ msgid "Use tabindex"
 msgstr "A \"tabindex\" attribśtum hasznįlata"
 
 #: src/config/options.inc:326
+#, fuzzy
 msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 "Navigįció a tabindex įltal megadott sorrend szerint.\n"
 "A HTML elemek TABINDEX attribśtuma meghatįrozza hogy\n"
@@ -2703,8 +2729,9 @@ msgstr "Linkek kiv
 
 #. 0
 #: src/config/options.inc:353
+#, fuzzy
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Ha az utolsó linken lefelé nyilat nyomsz, ugorjon az elsõre, és fordķtva."
@@ -2805,8 +2832,9 @@ msgid "Show search hit top or bottom dialogs"
 msgstr "A keresés dialógusablakai"
 
 #: src/config/options.inc:403
+#, fuzzy
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 "Mutasson-e dialógusablakot ha a keresés elérte a dokumentum aljįt\n"
@@ -2921,9 +2949,9 @@ msgstr "Az 
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2933,7 +2961,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -3109,7 +3137,8 @@ msgid "Ensure contrast"
 msgstr "A kontraszt biztosķtįsa"
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+#, fuzzy
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 "Gondoskodik róla, hogy a hįttérszķn és a betūszķn sose legyen egyforma."
 
@@ -3209,8 +3238,9 @@ msgstr "Form
 msgid "Dump output options."
 msgstr "Formįzott dokumentum kiķrįsįnak beįllķtįsai."
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Kódlap"
 
@@ -3359,7 +3389,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Felsõindexek megjelenķtése (^ jelöléssel)."
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+#, fuzzy
+msgid "Rendering of HTML link element"
 msgstr "A HTML linkek megjelenķtése"
 
 #: src/config/options.inc:723
@@ -3476,9 +3507,10 @@ msgid "Save interval"
 msgstr "Mentés idõköze"
 
 #: src/config/options.inc:786
+#, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 "Ennyi idõnként menti a lemezre a ~/.elinks informįciós įllomįnyai ha "
 "vįltoztak\n"
@@ -4097,9 +4129,10 @@ msgid "Underline menu hotkeys"
 msgstr "A menükben lévõ gyorsbillentyūk alįhśzįsa"
 
 #: src/config/options.inc:1184
+#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "A menükben lévõ gyorsbillentyūk alįhśzįsa, ķgy azok jobban\n"
 "lįtszanak. A hasznįlt terminįlnak tįmogatnia kell az alįhśzįst."
@@ -4109,9 +4142,10 @@ msgid "Underline button shortcuts"
 msgstr "A nyomógombokon lévõ gyorsbillentyūk alįhśzįsa"
 
 #: src/config/options.inc:1189
+#, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "A nyomógombokon lévõ gyorsbillentyūk alįhśzįsa, ķgy azok jobban\n"
 "lįtszanak. A hasznįlt terminįlnak tįmogatnia kell az alįhśzįst."
@@ -4204,8 +4238,9 @@ msgid "Wrap-around tabs cycling"
 msgstr "Fülek lapozįsa körbe"
 
 #: src/config/options.inc:1241
+#, fuzzy
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr "Ha az utolsó fülön tovįbb lapozunk, ugorjon az elsõre, és fordķtva."
 
@@ -4217,7 +4252,8 @@ msgstr "F
 msgid "When closing a tab show confirmation dialog."
 msgstr "Fül bezįrįsįt megerõsķtõ dialógusablak megnyitįsa."
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Nyelv"
 
@@ -4383,60 +4419,68 @@ msgstr ""
 msgid "Read error"
 msgstr "Olvasįsi hiba"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Logikai tķpus"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Integer"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr "<szįm>"
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "Longint"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Szöveg"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<szöveg>"
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<kódlap>"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<nyelv>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Szķn"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<color|#rrggbb>"
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "Speciįlis"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Mappa"
 
@@ -4521,7 +4565,7 @@ msgid "Saving"
 msgstr "Mentés"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4594,7 +4638,7 @@ msgid "~Reject"
 msgstr "~Visszautasķtįs"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Kiszolgįló"
 
@@ -4713,40 +4757,40 @@ msgstr "A link utols
 msgid "Link title (from history)"
 msgstr "A link cķme (a lįtogatott lapok listįjįból)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "feltételezett"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "kiszolgįló beįllķtįs figyelmen kķvül hagyįsa"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Dįtum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Utolsó lįtogatįs ideje"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Fejléc informįció"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 msgid "Internal header info"
 msgstr "Belsõ fejléc infó."
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Nincs fejléc infó."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Letöltés"
 
@@ -4822,7 +4866,7 @@ msgid "Download manager"
 msgstr "Letöltéskezelõ"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -5026,7 +5070,8 @@ msgstr "Az aktu
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Vįltįs ~html/forrįs között"
 
 #. accelerator_context(tab_menu)
@@ -6206,23 +6251,24 @@ msgid "Program"
 msgstr "Program"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Külsõ megjelenķtõ ehhez a fįjltķpushoz. '%' ebben a sztringben\n"
 "a fįljnévre cserélõdik."
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Fįjl kiterjesztés hozzįrendelések"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr "Kiterjesztés <-> MIME tķpus hozzįrendelés."
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
@@ -6231,12 +6277,12 @@ msgstr ""
 "'*'-ot kell hasznįlni itt)."
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "Konfigurįciós rendszer"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6303,9 +6349,10 @@ msgid "Mimetypes files"
 msgstr "Mimetype fįjlok"
 
 #: src/mime/backend/mimetypes.c:48
+#, fuzzy
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 "A mimetype kezeléssel kapcsolatos beįllķtįsok. A mimetype fįljokat\n"
@@ -6330,19 +6377,19 @@ msgstr "Kiterjeszt
 msgid "Delete extension %s -> %s?"
 msgstr "Kiterjesztés törlése: %s -> %s?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Kiterjesztések"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Kiterjesztés(ek)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tartalom tķpus(ok)"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Nincs kiterjesztés"
 
@@ -6498,7 +6545,7 @@ msgstr "Csatorna elhagy
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Belsõ hiba"
@@ -6639,7 +6686,7 @@ msgstr ""
 "környezeti vįltozó értékét."
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -7182,7 +7229,7 @@ msgstr "
 msgid "Comment"
 msgstr "Megjegyzések"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7359,7 +7406,7 @@ msgstr "Mit tegy
 msgid "Information about the torrent"
 msgstr "Informįció az aktuįlis oldalról"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Mit tegyünk?"
 
@@ -7370,12 +7417,12 @@ msgid "Down~load"
 msgstr "Letöltés"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 msgid "~Display"
 msgstr "Meg~jelenķtés"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr "Fejlé~c megjelenķtése"
 
@@ -7406,19 +7453,19 @@ msgstr "A helyi CGI scriptek futtat
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Helyi fįjlok"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Lokįlis böngészéssel kapcsolatos beįllķtįsok."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Nem regulįris fįljok olvasįsa"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7428,24 +7475,25 @@ msgstr ""
 "Megjegyzés: Pl a /dev/urandom vagy /dev/zero olvasįsa nem vįrt\n"
 "következményekkel jįrhat!"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Rejtett fįljok megjelenķtése"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
+#, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 "Rejtett fįljok megjelenķtése a listįban?\n"
 "Ha ki van kapcsolva, akkor a ponttal kezdõdõ nevū fįljok nem jelennek\n"
 "meg a lokįlis könyvtįrlistįkban."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "Tķpusfüggõ fįjlnévkiterjesztések hasznįlata"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7456,7 +7504,7 @@ msgstr ""
 "'filename.gz) is megkiséreljük megnyitni."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "~Fįjl"
 
@@ -7763,11 +7811,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "A User Agent beįllķtįs megvįltoztatįsa. Ez egy azonosķtó karaktersor,\n"
 "amit a böngészõ küld a HTTP kiszolgįlónak, ha az egy oldalt kér le.\n"
@@ -7965,10 +8013,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -8125,12 +8173,12 @@ msgstr "JavaScript figyelmeztet
 msgid "Spidermonkey ECMAScript"
 msgstr "ECMAScript"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Hiba a letöltésben"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8139,7 +8187,7 @@ msgstr ""
 "Hiba a fįjlba irįs közben: '%s': \n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8150,16 +8198,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' könytįr."
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "A fįjl létezik"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8175,54 +8223,50 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr "Mentés mįs né~ven"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr "Az eredeti fįjl f~elülķrįsa"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr "A letöltés ~folytatįsa"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Ismeretlen fįjlformįtum"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Mit tegyünk a '%s' fįjllal? (tķpus: %s%s%s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Mit tegyünk a '%s' fįjllal? (tķpus: %s%s%s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Program (a '%' jel helyére a fįjlnév helyettesķtõdik be)"
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 msgid "Block the terminal"
 msgstr "Terminįl zįrolįsa"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr "A fįjlt a '%s' programmal fogjuk megnyitni."
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 msgid "~Open"
 msgstr "Me~gnyitįs"
 
@@ -8236,14 +8280,15 @@ msgid "Warning"
 msgstr "Figyelem"
 
 #: src/session/session.c:751
+#, fuzzy
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 "Üresen hagytad a protocol.http.user_agent beįllķtįst. Ezelõtt ide "
 "behelyettesķtésre került az alapértelmezett ELinks azonosķtó. Jelenleg ķgy "
@@ -8252,16 +8297,17 @@ msgstr ""
 "įllomįnyból! Ha kitörlöd, korrekt alapbeįllķtįs lép életbe."
 
 #: src/session/session.c:770
+#, fuzzy
 msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 "A option config.saving_style opciód elavult értékre van beįllķtva.\n"
 "Az ELinks konfigurįció mentési algoritmusa megvįltozott, mįr csak azok\n"
@@ -8347,7 +8393,7 @@ msgstr "Hibas esem
 msgid "Could not read event: %d (%s)"
 msgstr "Nem lehet olvasni az eseményt: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "Tśl sok byte érkezett az itrm utįn!"
@@ -8709,19 +8755,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Ugrįs linkre"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Ird be a link szįmįt"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Mentési hiba"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Hiba a fįjl irįsa közben"
 
diff --git a/po/id.po b/po/id.po
index c4d5b66c..0d4f29da 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Muhamad Faizal <faizal@mfaizal.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr "Selesai"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Kata yang dicari ngga ketemu"
 msgid "Name"
 msgstr "Nama"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Salah angka"
 
@@ -181,10 +181,10 @@ msgstr "Tidak boleh string kosong"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Content type "
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Terakhir kali dimodifikasi"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "blom lengkap"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Blok cursor"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Blok cursor"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Blok cursor"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Blok cursor"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Blok cursor"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Blok cursor"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Pilih link"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Blok cursor"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Background"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~OS shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Menunggu konfirmasi redirect"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Tamp~ilkan image"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Download ima~ge"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Menunggu konfirmasi redirect"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Tamp~ilkan image"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Download ima~ge"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Simpan opsi"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Simpan ~URL"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Cari teks"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Cari teks"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opsi terminal"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Kirim form"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Kirim form ~dan download"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Selesai"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Download ima~ge"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Buka di jendela baru"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Ngga ada pencarian sebelumnya"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opsi terminal"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Ganti ~html/teks"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Ganti ~html/teks"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Tamp~ilkan image"
@@ -1339,59 +1364,59 @@ msgstr "Ngga make frame"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Koneksi"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Simpan opsi"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Kesalahan internal"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Kirim form"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Ngga ada program yang dispesifikasikan untuk"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Simpan"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Codepage"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "Kesalahan penyimpanan"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "Pilihan"
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "Pilihan"
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Kesalahan penyimpanan"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Codepage"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Bahasa"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Warna"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "rata-rata"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "diperkirakan"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Cuekin konfigurasi dari server"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Tanggal"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Info header"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Info header"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Download"
 
@@ -4571,7 +4606,7 @@ msgid "Download manager"
 msgstr "Download ima~ge"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4785,7 +4820,8 @@ msgstr "dokumen"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Ganti ~html/teks"
 
 #. accelerator_context(tab_menu)
@@ -5987,31 +6023,32 @@ msgstr "Ngga ada program"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "~Ekstensi file"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6070,7 +6107,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6091,19 +6128,19 @@ msgstr "Hapus ekstensi"
 msgid "Delete extension %s -> %s?"
 msgstr "Hapus ekstensi"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Ekstensi"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Ekstensi"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Ngga ada ekstensi"
 
@@ -6249,7 +6286,7 @@ msgstr "Kesalahan socket"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Kesalahan internal"
@@ -6382,7 +6419,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6923,7 +6960,7 @@ msgstr "~File"
 msgid "Comment"
 msgstr "dokumen"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7106,7 +7143,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Download ima~ge"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Apa yang harus dilakukan?"
 
@@ -7117,13 +7154,13 @@ msgid "Down~load"
 msgstr "Download"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Tampilkan"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7154,42 +7191,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "file"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Ngga ada ekstensi"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7197,7 +7234,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~File"
@@ -7466,11 +7503,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7638,10 +7675,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7784,19 +7821,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Download gagal"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Ngga bisa buat file"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7804,17 +7841,17 @@ msgid ""
 "%s"
 msgstr "Ngga bisa download"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "~Ekstensi file"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7825,55 +7862,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tipe ngga dikenal"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Terminal a la ~BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Buka"
@@ -7889,13 +7922,13 @@ msgstr "Awas"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7903,12 +7936,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7981,7 +8014,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Ngga bisa buat file"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8358,19 +8391,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Pilih link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Masukkan nomor link"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Kesalahan penyimpanan"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Kesalahan menulis ke file"
 
diff --git a/po/is.po b/po/is.po
index d3cf0339..58e9bb17 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Armon Red <armon@islandia.is>\n"
 "Language-Team: Icelandic <kde-isl@mmedia.is>\n"
@@ -21,7 +21,7 @@ msgstr "Loka"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Upplżsingar"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Leitarstrengur ekki fundinn"
 msgid "Name"
 msgstr "Nafn"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Ógild tala"
 
@@ -181,10 +181,10 @@ msgstr "T
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Innihaldsgerš er"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Seinast breytt"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "óklįraš"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Blokkarbendill"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Blokkarbendill"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Blokkarbendill"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Blokkarbendill"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Blokkarbendill"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Blokkarbendill"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Opna tengil"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Blokkarbendill"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Bakgrunnur"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Kerfisske~l"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Bķš eftir stašfestingu endurkasts"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "~Skoša mynd"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Hlaša nišur ~mynd"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Bķš eftir stašfestingu endurkasts"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "~Skoša mynd"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Hlaša nišur ~mynd"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "V~ista stillingar"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Vis~ta slóš sem"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Leita aš texta"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Leita aš texta"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Stillingar skeljar"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Senda form"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Sen~da form og hlaša nišur"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Loka"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Hlaša nišur ~mynd"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Opna ķ nżjum glugga"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Engin fyrri leit"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Stillingar skeljar"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Skipta į milli ~html/texta"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Skipta į milli ~html/texta"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "~Skoša mynd"
@@ -1339,59 +1364,59 @@ msgstr "Engir rammar"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Tengingar"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "V~ista stillingar"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Innri villa"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Senda form"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Ekkert forrit skilgreint fyrir"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Vista"
@@ -2130,7 +2155,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2139,7 +2164,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2151,7 +2176,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2519,7 +2544,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2564,7 +2589,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2656,7 +2681,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2760,9 +2785,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2772,7 +2797,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2947,7 +2972,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3029,8 +3054,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Lyklasett"
 
@@ -3182,7 +3208,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3285,7 +3311,7 @@ msgstr "Vistunarvilla"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3875,7 +3901,7 @@ msgstr "Einvalsreitur"
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3886,7 +3912,7 @@ msgstr "Einvalsreitur"
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3966,7 +3992,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3978,7 +4004,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4122,62 +4149,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Vistunarvilla"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Lyklasett"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "~Tungumįl"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Litur"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4248,7 +4283,7 @@ msgid "Saving"
 msgstr "mešalt"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4324,7 +4359,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Mišlari"
 
@@ -4451,41 +4486,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "gert rįš fyrir"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "hunsa stillingar mišlara"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Dagsetning"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr ""
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Innri villa"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Nišurhlaša"
 
@@ -4569,7 +4604,7 @@ msgid "Download manager"
 msgstr "Hlaša nišur ~mynd"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4782,7 +4817,8 @@ msgstr "skj
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Skipta į milli ~html/texta"
 
 #. accelerator_context(tab_menu)
@@ -5984,31 +6020,32 @@ msgstr "Ekkert forrit"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Skrįar~endingar"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6067,7 +6104,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6088,19 +6125,19 @@ msgstr "Ey
 msgid "Delete extension %s -> %s?"
 msgstr "Eyša skrįarendingu"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Skrįarending"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Skrįarendingar"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Innihaldstegund"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Engar skrįarendingar"
 
@@ -6246,7 +6283,7 @@ msgstr "Villa 
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Innri villa"
@@ -6379,7 +6416,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6919,7 +6956,7 @@ msgstr "~Skr
 msgid "Comment"
 msgstr "skjöl"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7102,7 +7139,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Hlaša nišur ~mynd"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Hvaš skal gera?"
 
@@ -7113,13 +7150,13 @@ msgid "Down~load"
 msgstr "Nišurhlaša"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Sjį"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7150,42 +7187,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "skrįr"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Engar skrįarendingar"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7193,7 +7230,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Skrį"
@@ -7462,11 +7499,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7634,10 +7671,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7780,19 +7817,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "nišurhlešsluvilla"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Gat ekki skrifaš ķ skrį"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7800,17 +7837,17 @@ msgid ""
 "%s"
 msgstr "Villa viš nišurhlešslu"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Skrįar~endingar"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7821,55 +7858,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Óžekkt gerš"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS skel"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Opna"
@@ -7885,13 +7918,13 @@ msgstr "Vi
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7899,12 +7932,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7977,7 +8010,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Gat ekki skrifaš ķ skrį"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8354,19 +8387,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Opna tengil"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Innsetning tenglanśmer"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Vistunarvilla"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Villa viš ritun skrįar"
 
diff --git a/po/it.po b/po/it.po
index 36ebf940..9e85482f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-07-21 00:32+0200\n"
 "Last-Translator: Fabio Bonelli <fabiobonelli@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -22,7 +22,7 @@ msgstr "Chiudi"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -35,7 +35,7 @@ msgstr "Premere spazio per espandere questa cartella."
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -155,7 +155,7 @@ msgstr "Stringa '%s' non trovata"
 msgid "Name"
 msgstr "Nome"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Numero errato"
 
@@ -179,10 +179,10 @@ msgstr "Stringa vuota non consentita"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -251,7 +251,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -568,15 +568,15 @@ msgstr "Dimensione caricata"
 msgid "Content type"
 msgstr "Content-Type"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Ultima modifica"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "Ciper SSL"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Codifica"
 
@@ -584,7 +584,7 @@ msgstr "Codifica"
 msgid "Flags"
 msgstr "Flag"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "incompleto"
 
@@ -764,7 +764,7 @@ msgstr "Incolla testo dalla clipboard"
 msgid "Move to the previous item"
 msgstr "Passa al frame precedente"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Ridisegna terminale"
@@ -979,268 +979,293 @@ msgstr "Sposta il cursore a sinistra"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "Vai all'inizio della pagina/riga"
+
+#: src/config/actions-main.inc:58
+#, fuzzy
 msgid "Move cursor right"
 msgstr "Sposta il cursore a destra"
 
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 #, fuzzy
 msgid "Move cursor up"
 msgstr "Sposta il cursore in alto"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 #, fuzzy
 msgid "Move to the end of the document"
 msgstr "Vai alla fine della pagina/riga"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 #, fuzzy
 msgid "Move to the start of the document"
 msgstr "Vai all'inizio della pagina/riga"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 #, fuzzy
 msgid "Move one link down"
 msgstr "Spostati in alto di una pagina"
 
-#: src/config/actions-main.inc:62
-#, fuzzy
-msgid "Move one link left"
-msgstr "Spostati in alto di una pagina"
-
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Passa all'elemento successivo"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
+msgid "Move one link left"
+msgstr "Spostati in alto di una pagina"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "Passa al frame precedente"
+
+#: src/config/actions-main.inc:66
+#, fuzzy
+msgid "Move to the next link"
+msgstr "Passa all'elemento successivo"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
 msgid "Move to the previous link"
 msgstr "Passa al frame precedente"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 #, fuzzy
 msgid "Move one link right"
 msgstr "Sposta il cursore a destra"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Passa all'elemento successivo"
+
+#: src/config/actions-main.inc:70
 #, fuzzy
 msgid "Move one link up"
 msgstr "Spostati in alto di una pagina"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Passa al frame precedente"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "Spostati in basso di una pagina"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "Spostati in alto di una pagina"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "Apri collegamento corrente in una nuova scheda"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Apri collegamento corrente in una nuova scheda in background"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "Apri collegamento corrente in una nuova finestra"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Apri nuova scheda"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Nuova scheda in background"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Apri nuova finestra"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr "Apri una shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Gestore opzioni"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "Apri la conferma di uscita"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "Esci senza conferma"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "Ricarica la pagina corrente"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 #, fuzzy
 msgid "Re-render the current page"
 msgstr "Ricarica la pagina corrente"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "Azzera i campi nei form al loro valore iniziale"
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr "Mostra informazioni sulle risorse in uso"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 #, fuzzy
 msgid "Save the current document in source form"
 msgstr "Scrive il sorgente del documento HTML sullo stdout."
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr ""
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Salva opzioni"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "Salva URL come"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "Scorri verso il basso"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "Scorri a sinistra"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "Scorri a destra"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "Scorri verso l'alto"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "Cerca testo"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "Cerca testo all'indietro"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr "Cerca testo nei collegamenti mentre scrivi"
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 #, fuzzy
 msgid "Search document text by typing ahead"
 msgstr "Cerca testo nei collegamenti mentre scrivi"
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 #, fuzzy
 msgid "Search document text backwards by typing ahead"
 msgstr "Cerca testo nei collegamenti mentre scrivi"
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "Mosta la finestra di dialogo delle opzioni terminale"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr "Invia form"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr "Invia form e ricarica"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Chiudi scheda"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Chiudi tutte tranne quella corrente"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "Apri il menu delle schede"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Apri collegamento corrente in una nuova scheda"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Apri collegamento corrente in una nuova scheda"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Prossima scheda"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Scheda precedente"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Mosta la finestra di dialogo delle opzioni terminale"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 #, fuzzy
 msgid "Toggle rendering of page using CSS"
 msgstr "Abilita/disabilita il rendering delle tabelle"
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "Mostra collegamenti alle immagini"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr "Abilita/disabilita il rendering delle tabelle"
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr "Usa colori specificati nel documento"
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr "Cambia tra rendering della pagina in HTML o testo"
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Abilita/Disabilita salvataggio"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "Abilita/disabilita i collegamenti numerati"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr "Abilita/disabilita la compressione delle righe vuote"
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Abilita/disabilita il rendering delle tabelle"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr "Visualizza immagine corrente"
 
@@ -1312,62 +1337,62 @@ msgstr "Cornice menu"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr "Cartella di opzioni template"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(predefinito: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(predefinito: \"%s\")"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr "(alias per %s)"
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(predefinito: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Opzioni di configurazione:\n"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 #, fuzzy
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 "Uso: elinks [OPZIONE]... [URL]\n"
 "\n"
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Opzioni:\n"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Errore interno"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "Si limita alla modalitą anonima"
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 #, fuzzy
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
@@ -1380,32 +1405,32 @@ msgstr ""
 "visualizzatori č consentita, ma l'utente non puņ aggiungere o modificare\n"
 "voci nella tabella delle associazioni."
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Autoinvia primo form"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 #, fuzzy
 msgid "Automatically submit the first form in the given URLs."
 msgstr "Sottometti il primo form che incontri."
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 #, fuzzy
 msgid "Clone internal session with given ID"
 msgstr "Clona la sessione con l'ID dato"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "Nome della directori con il file di configurazione"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 #, fuzzy
 msgid ""
 "Path of the directory ELinks will read and write its\n"
@@ -1418,22 +1443,22 @@ msgstr ""
 "percorso inizia con un '/' č usato un percorso assoluto. Altrimenti\n"
 "si assume essere relativo alla propria HOME directory."
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 #, fuzzy
 msgid "Print default configuration file to stdout"
 msgstr "Stampa l'aiuto per le opzioni di configurazione"
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "Nome del file di configurazione"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 #, fuzzy
 msgid ""
 "Name of the configuration file that all configuration\n"
@@ -1444,79 +1469,79 @@ msgstr ""
 "tutta la configurazione sarą scritta. Deve essere relativo\n"
 "alla directory di configurazione."
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "Stampa l'aiuto per le opzioni di configurazione"
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 #, fuzzy
 msgid "Print help for configuration options and exit."
 msgstr "Stampa l'aiuto per le opzioni di configurazione ed esce."
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 #, fuzzy
 msgid "MIME type assumed for unknown document types"
 msgstr "Tipo MIME da assumere per i documenti"
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 #, fuzzy
 msgid "The default MIME type used for documents of unknown type."
 msgstr "Tipo MIME predefinito da assumere per documenti di tipo sconosciuto."
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 #, fuzzy
 msgid "Print formatted versions of given URLs to stdout"
 msgstr "Scrive la versione formattata dell'URL dato sullo stdout"
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 #, fuzzy
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr "Scrive la versione formattata dell'URL dato sullo stdout"
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "Codepage da usare con -dump"
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 #, fuzzy
 msgid "Codepage used when formatting dump output."
 msgstr "Codepage usata nell'output."
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 #, fuzzy
 msgid "Color mode used with -dump"
 msgstr "Codepage da usare con -dump"
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 #, fuzzy
 msgid "Color mode used with -dump."
 msgstr "Codepage da usare con -dump"
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "Larghezza del documento formattato con -dump"
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "Larghezza dell'output con dump"
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 #, fuzzy
 msgid "Evaluate configuration file directive"
 msgstr "Valuta l'opzione di configurazione data"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 #, fuzzy
 msgid ""
 "Specify configuration file directives on the command-line\n"
@@ -1529,12 +1554,12 @@ msgstr ""
 "  -eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 #, fuzzy
 msgid "Interpret documents of unknown types as HTML"
 msgstr "Tipo MIME predefinito da assumere per documenti di tipo sconosciuto."
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 #, fuzzy
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
@@ -1544,19 +1569,19 @@ msgstr ""
 "Questo fa assumere a ELinks che i file che vede siano HTML. Questo č\n"
 "equivalente a -default-mime-type text/html."
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "Stampa l'aiuto sull'uso ed esce"
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "Stampa l'aiuto sull'uso ed esce."
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "Permette solo connessioni locali"
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 #, fuzzy
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
@@ -1567,27 +1592,27 @@ msgstr ""
 "locali (ie. 127.0.0.1), questo preverrą connessioni a server\n"
 "remoti."
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "Stampa l'aiuto dettagliato sull'uso ed esce"
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr "Stampa l'aiuto dettagliato sull'uso ed esce."
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "Look up dell'host specificato"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "Avvia come istanza separata"
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 #, fuzzy
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
@@ -1600,24 +1625,24 @@ msgstr ""
 "runtime (segnalibri, cronologia e cosģ via) viene scritto su disco\n"
 "quando si usa questa opzione. Si veda -touch-files."
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 #, fuzzy
 msgid "Disable use of files in ~/.elinks"
 msgstr "Non usare i file in ~/.elinks"
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 #, fuzzy
 msgid "Disable link numbering in dump output"
 msgstr "Non numerare collegamenti nell'output di -dump"
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 #, fuzzy
 msgid ""
 "Prevents printing of link number in dump output.\n"
@@ -1628,12 +1653,12 @@ msgstr ""
 "il comportamento predefinito fino alla versione 0.5pre12. Notare che\n"
 "questo ha effetto solo con -dump, nient'altro."
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 #, fuzzy
 msgid "Disable printing of link references in dump output"
 msgstr "Non numerare collegamenti nell'output di -dump"
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 #, fuzzy
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
@@ -1645,11 +1670,11 @@ msgstr ""
 "il comportamento predefinito fino alla versione 0.5pre12. Notare che\n"
 "questo ha effetto solo con -dump, nient'altro."
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "Controlla una istanza di ELinks in esecuzione"
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1668,11 +1693,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr "Connetti alla sessione con il dato ID"
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1710,22 +1735,22 @@ msgstr ""
 "scritto\n"
 "sul disco quando si usa questa opzione. Si veda anche -touch-files."
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 #, fuzzy
 msgid "Print the source of given URLs to stdout"
 msgstr "Scrive il sorgente dell'URL fornita sullo stdout"
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 #, fuzzy
 msgid "Print given URLs in source form to stdout."
 msgstr "Scrive il sorgente del documento HTML sullo stdout."
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 "Modifica file in ~/.elinks quando eseguito con -no-connect/-session-ring"
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 #, fuzzy
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
@@ -1738,11 +1763,11 @@ msgstr ""
 "anche quando si usano -no-connect o -session-ring; non ha effetto\n"
 "se non č usato in combinazione con una di queste opzioni."
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr "Livello di verbositą"
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1751,15 +1776,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Stampa informazioni sulla versione ed esce"
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "Mostra la versione di ELinks ed esce."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1772,7 +1797,7 @@ msgstr ""
 "## saranno modificati solo i valori delle opzioni, tutta la formattazione,\n"
 "## i tuoi commenti, ecc. sarą mantenuta cosģ com'č.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1791,7 +1816,7 @@ msgstr ""
 "## mancante. Nota che tutta la formattazione, i tuoi commenti, ecc. saranno\n"
 "## mantenuti.\n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1803,7 +1828,7 @@ msgstr ""
 "## da ELinks quando si salvano le opzioni attraverso l'interfaccia\n"
 "## grafica e la formattazione e i commenti verranno quindi persi.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1814,11 +1839,11 @@ msgstr ""
 "saving_style.\n"
 "## Dai, siamo dei bravi ragazzi dopo tutto.\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "Opzioni salvate automaticamente\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Associazioni di tasti salvate automaticamente\n"
 
@@ -1946,7 +1971,7 @@ msgstr "Non si pu
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Salva"
@@ -2246,7 +2271,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2255,7 +2280,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2267,7 +2292,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2660,7 +2685,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2710,8 +2735,9 @@ msgstr "Cicla i collegamenti (ultimo->primo)"
 
 #. 0
 #: src/config/options.inc:353
+#, fuzzy
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Quando si preme 'gił' sull'ultimo collegamento, salta al primo e\n"
@@ -2820,8 +2846,9 @@ msgstr ""
 "Mostra le finestre di dialogo quando la ricerca raggiunge l'inizio o la fine"
 
 #: src/config/options.inc:403
+#, fuzzy
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 "Imposta se mostrare una finestra di dialogo quando la ricerca raggiunge\n"
@@ -2942,12 +2969,13 @@ msgid "Cache information about redirects"
 msgstr "Fai cache delle informazioni sui redirect"
 
 #: src/config/options.inc:462
+#, fuzzy
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2957,7 +2985,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -3153,7 +3181,7 @@ msgstr "Assicura contrasto"
 
 #: src/config/options.inc:587
 #, fuzzy
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Si assicura che il colore di sfondo e del testo non sia mai uguale."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3256,8 +3284,9 @@ msgstr "Output"
 msgid "Dump output options."
 msgstr "Opzioni di dump."
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Codepage"
 
@@ -3409,7 +3438,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Mostra apici (come ^apici)."
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+#, fuzzy
+msgid "Rendering of HTML link element"
 msgstr "Rendering dell'elemento HTML 'link'"
 
 #: src/config/options.inc:723
@@ -3529,7 +3559,7 @@ msgstr "Intervallo per l'autosalvataggio"
 #, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 "Intervallo di tempo che trascorre tra le scritture della\n"
 "cronologia su disco se č cambiata (in secondi, 0 per disabilitare)"
@@ -4144,9 +4174,10 @@ msgid "Underline menu hotkeys"
 msgstr "Sottolinea acceleratori"
 
 #: src/config/options.inc:1184
+#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Imposta la sottolineatura delle scorciatoie nei menu per renderle\n"
 "maggiormente visibili. Richiede che la sottolineature sia abilitata\n"
@@ -4161,7 +4192,7 @@ msgstr "Sottolinea acceleratori"
 #, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Imposta la sottolineatura delle scorciatoie nei menu per renderle\n"
 "maggiormente visibili. Richiede che la sottolineature sia abilitata\n"
@@ -4259,8 +4290,9 @@ msgid "Wrap-around tabs cycling"
 msgstr "Cicla schede (ultima->prima)"
 
 #: src/config/options.inc:1241
+#, fuzzy
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Quando ci si sposta a destra dall'ultima scheda, salta alla prima e\n"
@@ -4274,7 +4306,8 @@ msgstr "Conferma chiusura delle schede"
 msgid "When closing a tab show confirmation dialog."
 msgstr "Mostrare la finestra di conferma quando si chiude una scheda. "
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Lingua"
 
@@ -4438,60 +4471,68 @@ msgstr ""
 msgid "Read error"
 msgstr "Errore in lettura"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Booleano"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Intero"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr "<num>"
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "Longint"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Stringa"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<str>"
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<codepage>"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<lingua>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Colore"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<colore|#rrggbb>"
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "Speciale"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr "Alias"
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Cartella"
 
@@ -4574,7 +4615,7 @@ msgid "Saving"
 msgstr "Salvataggio"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4650,7 +4691,7 @@ msgid "~Reject"
 msgstr "Respingi"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4777,41 +4818,41 @@ msgstr "Orario ultima visita al collegamento"
 msgid "Link title (from history)"
 msgstr "Titolo collegamento (dalla cronologia)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "assunta"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ignoro le impostazioni del server"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Orario ultima visita"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Info Header"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Nessuna informazione sugli header."
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Nessuna informazione sugli header."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Download"
 
@@ -4893,7 +4934,7 @@ msgid "Download manager"
 msgstr "Gestore download"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -5104,7 +5145,8 @@ msgstr "~Aggiungi ai segnalibri"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Inverti ~html/plain"
 
 #. accelerator_context(tab_menu)
@@ -6302,23 +6344,24 @@ msgid "Program"
 msgstr "Programma"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Visualizzatore esterno per questo tipo di file. In questa stringa '%'\n"
 "sarą sostituito dal nome del file."
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Associazioni estensioni file"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr "Associazione Estensione <-> Tipo MIME."
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
@@ -6327,12 +6370,12 @@ msgstr ""
 "al posto di '.')."
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "Sistema di configurazione"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6407,7 +6450,7 @@ msgstr "Tipi file MIME"
 #, fuzzy
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 "Opzioni per il supporto di file tipi MIME. I file tipi MIME\n"
@@ -6431,19 +6474,19 @@ msgstr "Cancella estensione"
 msgid "Delete extension %s -> %s?"
 msgstr "Eliminare estensione %s?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Estensione"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Estensione(i)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Nessuna estensione"
 
@@ -6597,7 +6640,7 @@ msgstr "Eccezione in socket"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Errore interno"
@@ -6734,7 +6777,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -7281,7 +7324,7 @@ msgstr "~File"
 msgid "Comment"
 msgstr "Commenti"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7469,7 +7512,7 @@ msgstr "Vuoi mostrare il file '%s' (tipo: %s)?"
 msgid "Information about the torrent"
 msgstr "Mostra informazioni sulla pagina corrente"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Cosa fare?"
 
@@ -7480,13 +7523,13 @@ msgid "Down~load"
 msgstr "Download"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Visualizza"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 #, fuzzy
 msgid "Show ~header"
 msgstr "Mostra template"
@@ -7517,19 +7560,19 @@ msgstr "Abilita esecuzione degli script CGI locali."
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "File locali"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Opzioni specifiche per la navigazione locale."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Consenti la lettura di file speciali"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 #, fuzzy
 msgid ""
 "Whether to allow reading from non-regular files.\n"
@@ -7539,25 +7582,25 @@ msgstr ""
 "Consenti la lettura di file non regolari? (PERICOLOSO - leggere\n"
 "/dev/urandom o /dev/zero ti puoi rovinare la giornata!)"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Mostra file nascosti"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 #, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 "Mostra i file nascosti nella lista delle directory?\n"
 "Se impostata a falso, i file con nome che inizia con un punto\n"
 "saranno nascosti dalla lista delle directory."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "Prova estensioni per le codifiche"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7568,7 +7611,7 @@ msgstr ""
 "(ad esempio 'nomefile.gz'); dipende dalle codifiche supportate."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~File"
@@ -7873,11 +7916,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "Cambia l'ID User Agent. Significa la stringa di identificazione\n"
 "inviata al server HTTP nel richiedere un documento.\n"
@@ -8072,10 +8115,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -8234,12 +8277,12 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "Scripting"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Errore download"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8248,7 +8291,7 @@ msgstr ""
 "Impossibile creare il file '%s':\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8259,16 +8302,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Il file esiste"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8284,58 +8327,54 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 #, fuzzy
 msgid "Sa~ve under the alternative name"
 msgstr "Salva con un nome alternativo"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 #, fuzzy
 msgid "~Overwrite the original file"
 msgstr "Sovrascrivi il file originale"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 #, fuzzy
 msgid "~Resume download of the original file"
 msgstr "Riprendi download del file originale"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tipo sconosciuto"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, fuzzy, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Vuoi mostrare il file '%s' (tipo: %s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Vuoi mostrare il file '%s' (tipo: %s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Blocca terminale"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Apri"
@@ -8350,14 +8389,15 @@ msgid "Warning"
 msgstr "Attenzione"
 
 #: src/session/session.c:751
+#, fuzzy
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 "Hai una stringa vuota in protocol.http.user_agent - questo era il valore "
 "predefinito in passato, sostituito dalla stringa User-Agent predefinita di "
@@ -8369,16 +8409,17 @@ msgstr ""
 "qualsiasi inconveniente causato."
 
 #: src/session/session.c:770
+#, fuzzy
 msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 "Hai l'opzione config.saving_style impostata a un valore obsoleto. Gli "
 "algoritmi di salvataggio della configurazione di ELinks sono stati cambiati "
@@ -8460,7 +8501,7 @@ msgstr "Evento %d errato"
 msgid "Could not read event: %d (%s)"
 msgstr "Impossibile leggere l'evento: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "Troppi byte letti da itrm!"
@@ -8829,19 +8870,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Vai al collegamento"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Inserisci il numero del collegamento"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Errore salvataggio"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Errore scrittura del file"
 
diff --git a/po/lt.po b/po/lt.po
index 86d562d4..1ea3d2de 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Aurimas Mikalauskas <inner@dammit.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -23,7 +23,7 @@ msgstr "U
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Informaciją"
 
@@ -36,7 +36,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -159,7 +159,7 @@ msgstr "Paie
 msgid "Name"
 msgstr "Vardas"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Netinkamas skaičius"
 
@@ -183,10 +183,10 @@ msgstr "Eilut
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -252,7 +252,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -561,15 +561,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Turinio tipas yra"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Paskutinį kartą koreguota"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -577,7 +577,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "nebaigta"
 
@@ -762,7 +762,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Blokuoti žymeklį"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -990,282 +990,307 @@ msgstr "Blokuoti 
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Blokuoti žymeklį"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Blokuoti žymeklį"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Blokuoti žymeklį"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Blokuoti žymeklį"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Blokuoti žymeklį"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Eiti pagal nuorodą"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Blokuoti žymeklį"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Fonas"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Kons~olė"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Laukiam permetimo patvirtinimo"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Paž~iūrėti paveiklsėlį"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Parsiųsti paveikslėlį"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Laukiam permetimo patvirtinimo"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Paž~iūrėti paveiklsėlį"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Parsiųsti paveikslėlį"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "Iš~saugoti pakeitimus"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Išdaugoti adresą kaip.."
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Ieškok teksto"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Ieškok teksto"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Terminalo opcijos"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Patvirinti formą"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Patvirinti formą ir parsiųsti"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Uždaryti"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Parsiųsti paveikslėlį"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Atidaryti naujame lange"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Prieš tai nieko neieškota"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Terminalo opcijos"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Pakeisti ~html/plain"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Pakeisti ~html/plain"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Paž~iūrėti paveiklsėlį"
@@ -1341,59 +1366,59 @@ msgstr "Nenaudoti r
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Prisijungimai"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Iš~saugoti pakeitimus"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Vidinė klaida"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1401,31 +1426,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Patvirinti formą"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1433,91 +1458,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1526,58 +1551,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Nėr programos"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1585,43 +1610,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1640,11 +1665,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1662,19 +1687,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1682,11 +1707,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1695,15 +1720,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1711,7 +1736,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1722,7 +1747,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1730,18 +1755,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1865,7 +1890,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Išsaugoti"
@@ -2132,7 +2157,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2141,7 +2166,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2153,7 +2178,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2521,7 +2546,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2566,7 +2591,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2658,7 +2683,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2762,9 +2787,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2774,7 +2799,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2949,7 +2974,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3031,8 +3056,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "koduotė"
 
@@ -3184,7 +3210,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3287,7 +3313,7 @@ msgstr "I
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3877,7 +3903,7 @@ msgstr "Pa
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3888,7 +3914,7 @@ msgstr "Pa
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3968,7 +3994,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3980,7 +4006,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4124,62 +4151,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Išsaugojimo klaida"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "koduotė"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Ka~lba"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Spalvos"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4250,7 +4285,7 @@ msgid "Saving"
 msgstr "vid."
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4326,7 +4361,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Serveris"
 
@@ -4453,41 +4488,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "priskirtas"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ignoruojam serverio nurodymą"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr ""
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Vidinė klaida"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Parsisiųsk"
 
@@ -4571,7 +4606,7 @@ msgid "Download manager"
 msgstr "Parsiųsti paveikslėlį"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4784,7 +4819,8 @@ msgstr "dokumentai"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Pakeisti ~html/plain"
 
 #. accelerator_context(tab_menu)
@@ -5985,31 +6021,32 @@ msgstr "N
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Failų plėtiniai"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6068,7 +6105,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6089,19 +6126,19 @@ msgstr "I
 msgid "Delete extension %s -> %s?"
 msgstr "Ištrinti plėtinį"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Plėtinys"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Priesaga(os)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Turinio-Tipas"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Nėra plėtinių"
 
@@ -6247,7 +6284,7 @@ msgstr "Soket'o i
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Vidinė klaida"
@@ -6380,7 +6417,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6920,7 +6957,7 @@ msgstr "~Byla"
 msgid "Comment"
 msgstr "dokumentai"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7103,7 +7140,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Parsiųsti paveikslėlį"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Ką daryti?"
 
@@ -7114,13 +7151,13 @@ msgid "Down~load"
 msgstr "Parsisiųsk"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Parodyti"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7151,42 +7188,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "failai"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Nėra plėtinių"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7194,7 +7231,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Byla"
@@ -7463,11 +7500,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7635,10 +7672,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7781,19 +7818,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Siuntimo klaida"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Negaliu įrašyti į failą"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7801,17 +7838,17 @@ msgid ""
 "%s"
 msgstr "Siuntimo klaida"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Failų plėtiniai"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7822,55 +7859,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Nežinomas tipas"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS terminalas"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Atidaryti"
@@ -7886,13 +7919,13 @@ msgstr "
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7900,12 +7933,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7979,7 +8012,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Negaliu įrašyti į failą"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8356,19 +8389,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Eiti pagal nuorodą"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Įvesk nuorodos numerį"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Išsaugojimo klaida"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Klaida bandant įrašyti į failą"
 
diff --git a/po/nb.po b/po/nb.po
index 0fe48572..b1a7bfed 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Simen Graaten <simeng@slarkware.com>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -21,7 +21,7 @@ msgstr "Lukk"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "S
 msgid "Name"
 msgstr "Navn"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Feil nummer"
 
@@ -181,10 +181,10 @@ msgstr "Tom tekststreng er ikke tillatt"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Innholdstype er"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Sist oppdatert"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ufullstendig"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Hel markųr"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Hel mark
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Hel markųr"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Hel markųr"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Hel markųr"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Hel markųr"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Hel markųr"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Gå til lenke"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Hel markųr"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Bakgrunn"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Kommand~olinjen"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Venter på bekreftelse av omdirigering"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "V~is bilde"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Hent bilde"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Venter på bekreftelse av omdirigering"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "V~is bilde"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Hent bilde"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "Lagre inn~stillinger"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Lagre ~URL som"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Sųk etter tekst"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Sųk etter tekst"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Terminal-innstillinger"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "~Send skjemaet"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Sen~d skjemaet og overfųr fil"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Lukk"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Hent bilde"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Åpne i nytt vindu"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Ingen tidligere sųk"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Terminal-innstillinger"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Bytt i mellom ~HTML/tekst"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Bytt i mellom ~HTML/tekst"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "V~is bilde"
@@ -1339,59 +1364,59 @@ msgstr "Ingen rammer"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Forbindelser"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Lagre inn~stillinger"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Intern feil"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "~Send skjemaet"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Ingen program er tilordnet"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Lagre"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Tegnsett"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "Feil ved lagring"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "Velg felt"
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "Velg felt"
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Feil ved lagring"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Tegnsett"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Språk"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Farger"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "gjennomsnittlig"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "antatt"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Ignorer tjener-innstillinger"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Dato"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Info om dokumenthode"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Info om dokumenthode"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Last ned"
 
@@ -4570,7 +4605,7 @@ msgid "Download manager"
 msgstr "Hent bilde"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4782,7 +4817,8 @@ msgstr "dokumenter"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Bytt i mellom ~HTML/tekst"
 
 #. accelerator_context(tab_menu)
@@ -5984,31 +6020,32 @@ msgstr "Ingen program"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Fil-~etternavn"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6067,7 +6104,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6088,19 +6125,19 @@ msgstr "Slett fil-etternavn"
 msgid "Delete extension %s -> %s?"
 msgstr "Slett fil-etternavn"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Fil-etternavn"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Fil-etternavn"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Innholdtype"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr ""
 
@@ -6245,7 +6282,7 @@ msgstr "Sokkel-feil"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Intern feil"
@@ -6378,7 +6415,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6919,7 +6956,7 @@ msgstr "~Fil"
 msgid "Comment"
 msgstr "dokumenter"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7102,7 +7139,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Hent bilde"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Hva skal jeg gjųre?"
 
@@ -7113,13 +7150,13 @@ msgid "Down~load"
 msgstr "Last ned"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Vis"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7150,42 +7187,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "filer"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Fil-~etternavn"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7193,7 +7230,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Fil"
@@ -7462,11 +7499,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7634,10 +7671,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7780,19 +7817,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Overfųringsfeil"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Kunne ikke skrive til fil"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7800,17 +7837,17 @@ msgid ""
 "%s"
 msgstr "Feil ved overfųring av"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Fil-~etternavn"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7821,55 +7858,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Ukjent type"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS-terminal"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Åpne"
@@ -7885,13 +7918,13 @@ msgstr "Advarsel"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7899,12 +7932,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7976,7 +8009,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Kunne ikke skrive til fil"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8353,19 +8386,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Gå til lenke"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Skriv nummer på lenke"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Feil ved lagring"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
diff --git a/po/nl.po b/po/nl.po
index 31e64504..eb6ce3dd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Stefan de Groot <stefan@nllinux.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -21,7 +21,7 @@ msgstr "Sluiten"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Zoekstring niet gevonden"
 msgid "Name"
 msgstr "Naam"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Onjuist nummer"
 
@@ -181,10 +181,10 @@ msgstr "Lege string niet toegestaan"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Content type is"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Laatst gewijzigd"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "incompleet"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Blokkeer cursor"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Blokkeer cursor"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Blokkeer cursor"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Blokkeer cursor"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Blokkeer cursor"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Blokkeer cursor"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Ga naar link"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Blokkeer cursor"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Achtergrond"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~OS shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Wachten voor indirecte bevestiging"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Bek~ijk afbeelding"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Download afbeeldin~g"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Wachten voor indirecte bevestiging"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Bek~ijk afbeelding"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Download afbeeldin~g"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "Options op~slaan"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Sla ~URL op als"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Zoeken naar tekst"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Zoeken naar tekst"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Terminal opties"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Verzenden formulier"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Verzenden formulier en ~download"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Sluiten"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Download afbeeldin~g"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Openen in nieuw venster"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Geen vorige zoekactie"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Terminal opties"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Verwisselen ~html/plain"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Verwisselen ~html/plain"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Bek~ijk afbeelding"
@@ -1339,59 +1364,59 @@ msgstr "Geen frames"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Verbindingen"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Options op~slaan"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Interne fout"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Verzenden formulier"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Geen programma gespecificieerd voor"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Opslaan"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Codepage"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "Fout bij opslaan"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "Selecteer veld"
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "Selecteer veld"
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Fout bij opslaan"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Codepage"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Taa~l"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Kleur"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "gem"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "geveinsd"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "negeer server instelling"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Hoofd info"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Hoofd info"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Download"
 
@@ -4570,7 +4605,7 @@ msgid "Download manager"
 msgstr "Download afbeeldin~g"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4783,7 +4818,8 @@ msgstr "documenten"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Verwisselen ~html/plain"
 
 #. accelerator_context(tab_menu)
@@ -5985,31 +6021,32 @@ msgstr "Geen programma"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Bestands ~extensie"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6068,7 +6105,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6089,19 +6126,19 @@ msgstr "Verwijder extensie"
 msgid "Delete extension %s -> %s?"
 msgstr "Verwijder extensie"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Extensie"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Extentie(s)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Geen extensies"
 
@@ -6247,7 +6284,7 @@ msgstr "Socket uitzondering"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Interne fout"
@@ -6380,7 +6417,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6921,7 +6958,7 @@ msgstr "Bestand"
 msgid "Comment"
 msgstr "documenten"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7104,7 +7141,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Download afbeeldin~g"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Wat wil je doen?"
 
@@ -7115,13 +7152,13 @@ msgid "Down~load"
 msgstr "Download"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Weergeven"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7152,42 +7189,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "bestanden"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Geen extensies"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7195,7 +7232,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "Bestand"
@@ -7464,11 +7501,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7636,10 +7673,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7782,19 +7819,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Download fout"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Kan bestand niet aanmaken"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7802,17 +7839,17 @@ msgid ""
 "%s"
 msgstr "Fout met downloaden"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Bestands ~extensie"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7823,55 +7860,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Onbekend type"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS terminal"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Openen"
@@ -7887,13 +7920,13 @@ msgstr "Waarschuwing"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7901,12 +7934,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7980,7 +8013,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Kan bestand niet aanmaken"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8357,19 +8390,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Ga naar link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Voer in link nummer"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Fout bij opslaan"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Schrijffout bij opslaan"
 
diff --git a/po/pl.po b/po/pl.po
index 74ad3649..1c861873 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-29 18:58+0100\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2008-03-29 19:30+0100\n"
 "Last-Translator: Witold Filipczyk <witekfl@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -28,7 +28,7 @@ msgstr "Zamknij"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Informacja"
 
@@ -41,7 +41,7 @@ msgstr "Wciśnij spację by rozwinąć ten folder."
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -158,7 +158,7 @@ msgstr "Nie znaleziono wyrażenia '%s'"
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Nieprawidłowa liczba"
 
@@ -182,10 +182,10 @@ msgstr "Musisz wpisać jakieś wyrażenie"
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 msgid "~Cancel"
 msgstr "~Anuluj"
@@ -586,15 +586,15 @@ msgstr "Rozmiar załadowanych dokumentĆ³w"
 msgid "Content type"
 msgstr "Typ zawartości"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Ostatnia zmiana"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "Szyfr SSL"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Kompresja"
 
@@ -602,7 +602,7 @@ msgstr "Kompresja"
 msgid "Flags"
 msgstr "Flagi"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "niekompletne"
 
@@ -1321,52 +1321,52 @@ msgstr "Śmieci następujące po zacytowanym parametrze"
 msgid "Remote method not supported"
 msgstr "Zdalna metoda nie obsługiwana"
 
-#: src/config/cmdline.c:446
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr "Folder szablonĆ³w opcji"
 
-#: src/config/cmdline.c:469
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(domyślnie: %ld)"
 
-#: src/config/cmdline.c:476 src/config/cmdline.c:505
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(domyślnie: \"%s\")"
 
-#: src/config/cmdline.c:481
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr "(alias dla %s)"
 
-#: src/config/cmdline.c:486 src/config/cmdline.c:495
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(domyślnie: %s)"
 
-#: src/config/cmdline.c:629
+#: src/config/cmdline.c:642
 msgid "Configuration options"
 msgstr "Ustawienia"
 
-#: src/config/cmdline.c:633
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr "Składnia: elinks [OPCJA]... [URL]..."
 
-#: src/config/cmdline.c:634
+#: src/config/cmdline.c:647
 msgid "Options"
 msgstr "Opcje"
 
-#: src/config/cmdline.c:676
+#: src/config/cmdline.c:689
 msgid "Internal consistency error"
 msgstr "Wewnętrzny błąd zgodności"
 
 #.
-#: src/config/cmdline.c:712
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "Ograniczenia do trybu anonimowego"
 
-#: src/config/cmdline.c:714
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1379,19 +1379,19 @@ msgstr ""
 "modyfikacji pozycji w tabeli skojarzeń."
 
 #
-#: src/config/cmdline.c:719
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Automatyczne wysyłanie formularzy"
 
-#: src/config/cmdline.c:721
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr "Automatycznie wysyłanie pierwszego formularza w podanym adresie URL."
 
-#: src/config/cmdline.c:723
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr "Klonowanie sesji z podanym ID"
 
-#: src/config/cmdline.c:725
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
@@ -1401,11 +1401,11 @@ msgstr ""
 "oknach. ID jest mapowane do informacji używanej podczas tworzenia\n"
 "nowej instancji. Nie zechcesz tego używać."
 
-#: src/config/cmdline.c:731
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "Nazwa katalogu z plikiem konfiguracyjnym"
 
-#: src/config/cmdline.c:733
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1417,11 +1417,11 @@ msgstr ""
 "jest traktowana jako bezwzględna, w przeciwnym wypadku jako\n"
 "względna do katalogu domowego."
 
-#: src/config/cmdline.c:738
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr "Wypisz domyślny plik konfiguracyjny na standardowe wyjście"
 
-#: src/config/cmdline.c:740
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
@@ -1429,11 +1429,11 @@ msgstr ""
 "Wypisz plik konfiguracyjny z domyślnymi ustawieniami na\n"
 "standardowe wyjście."
 
-#: src/config/cmdline.c:745
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "Nazwa pliku konfiguracyjnego"
 
-#: src/config/cmdline.c:747
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
@@ -1443,27 +1443,27 @@ msgstr ""
 "będzie zapisywana konfiguracja. Powinna być względna (względem\n"
 "config-dir)."
 
-#: src/config/cmdline.c:751
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "Wypisz pomoc do opcji konfiguracyjnych"
 
-#: src/config/cmdline.c:753
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr "Wypisz pomoc do opcji konfiguracyjnych i zakończ działanie."
 
-#: src/config/cmdline.c:755
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr "Typ MIME przyjmowany dla dokumentĆ³w"
 
-#: src/config/cmdline.c:757
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr "Domyślny typ MIME dla dokumentĆ³w nieznanego typu."
 
-#: src/config/cmdline.c:759
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr "Ignoruj przypisania klawiszy zdefiniowane przez użytkownika"
 
-#: src/config/cmdline.c:761
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
@@ -1473,45 +1473,45 @@ msgstr ""
 "konfiguracyjnego będą zignorowane. Wymusza użycie domyślnych\n"
 "przypisań oraz resetuje ustawienia użytkownika w momencie zapisu."
 
-#: src/config/cmdline.c:765
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr "Wypisanie sformatowanych wersji danych URL-i na standardowe wyjście"
 
-#: src/config/cmdline.c:767
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 "Wypisanie sformatowanych wersji podanych URL-i na standardowe\n"
 "wyjście."
 
-#: src/config/cmdline.c:769
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "Strona kodowa używana razem z -dump"
 
-#: src/config/cmdline.c:771
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr "Strona kodowa używana przy zrzutach."
 
-#: src/config/cmdline.c:773
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr "Tryb koloru używany razem z -dump"
 
-#: src/config/cmdline.c:775
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr "Tryb koloru używany razem z -dump."
 
-#: src/config/cmdline.c:777
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "Szerokość sformatowanego dokumentu z -dump"
 
-#: src/config/cmdline.c:779
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "Szerokość wyjścia dump."
 
-#: src/config/cmdline.c:781
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr "Wylicz podaną opcję konfiguracyjną"
 
-#: src/config/cmdline.c:783
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,11 +1524,11 @@ msgstr ""
 "\t-eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:789
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr "Interpretuj dokumenty nieznanego typu jako HTML"
 
-#: src/config/cmdline.c:791
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
@@ -1539,19 +1539,19 @@ msgstr ""
 "przeglądarki z programem pocztowym. Jest to rĆ³wnoważne\n"
 "z -default-mime-type text/html."
 
-#: src/config/cmdline.c:801
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "Wypisz informacje na temat użycia ELinksa i zakończ działanie"
 
-#: src/config/cmdline.c:803
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "Wypisz informacje na temat użycia ELinksa i zakończ działanie."
 
-#: src/config/cmdline.c:805
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "ZezwĆ³l jedynie na lokalne połączenia"
 
-#: src/config/cmdline.c:807
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
@@ -1561,30 +1561,30 @@ msgstr ""
 "adresĆ³w (np. 127.0.0.1). ELinks nie będzie się łączył ze zdalnymi\n"
 "serwerami."
 
-#: src/config/cmdline.c:811
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "Wypisz dokładne informacje na temat użycia ELinksa i zakończ działanie"
 
-#: src/config/cmdline.c:813
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 "Wypisz dokładne informacje na temat użycia ELinksa i zakończ\n"
 "działanie."
 
 #
-#: src/config/cmdline.c:815
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "Szukanie danego hosta"
 
-#: src/config/cmdline.c:817
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr "Szukanie danego hosta i wypisanie wszystkich rozwiązanych adresĆ³w."
 
-#: src/config/cmdline.c:819
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "Uruchamianie jako oddzielna instancja"
 
-#: src/config/cmdline.c:821
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1596,11 +1596,11 @@ msgstr ""
 "(zakładki, historia itp.) nie są zapisywane na dysk, gdy\n"
 "ta opcja jest używana. Zobacz także -touch-files."
 
-#: src/config/cmdline.c:826
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr "Nie używaj plikĆ³w w ~/.elinks"
 
-#: src/config/cmdline.c:828
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
@@ -1610,11 +1610,11 @@ msgstr ""
 "użytkownika (~/.elinks). Wymusza użycie domyślnej konfiguracji\n"
 "i blokuje zapis plikĆ³w konfiguracyjnych."
 
-#: src/config/cmdline.c:832
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr "Nie numeruj odnośnikĆ³w przy -dump"
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
@@ -1622,11 +1622,11 @@ msgstr ""
 "Zapobiega pokazywaniu numeracji odnośnikĆ³w przy zrzutach (-dump)\n"
 "Pamiętaj, że dotyczy to tylko -dump, niczego innego."
 
-#: src/config/cmdline.c:837
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr "Nie pokazuj referencji odnośnikĆ³w przy -dump"
 
-#: src/config/cmdline.c:839
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
@@ -1635,11 +1635,11 @@ msgstr ""
 "Zapobiega pokazywaniu referencji odnośnikĆ³w przy zrzutach (-dump)\n"
 "Pamiętaj, że dotyczy to tylko -dump, niczego innego."
 
-#: src/config/cmdline.c:843
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "Kontrolowanie już działającego ELinksa"
 
-#: src/config/cmdline.c:845
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1673,11 +1673,11 @@ msgstr ""
 "\tinfoBox(text)             : wyświetl tekst w oknie dialogowym\n"
 "\txfeDoCommand(openBrowser) : otwĆ³rz nowe okienko"
 
-#: src/config/cmdline.c:861
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr "Połącz się do pierścienia sesji z danym ID"
 
-#: src/config/cmdline.c:863
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1710,19 +1710,19 @@ msgstr ""
 "zapisywane na dysk, gdy ta opcja jest użyta. Zobacz także\n"
 "-touch-files."
 
-#: src/config/cmdline.c:878
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr "Wypisz ÅŗrĆ³dło danego URL na standardowe wyjście"
 
-#: src/config/cmdline.c:880
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr "Wypisz podany URL w postaci ÅŗrĆ³dłowej na standardowe wyjście."
 
-#: src/config/cmdline.c:884
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr "Uaktualnij pliki w ~/.elinks gdy uruchomiony -no-connect/-session-ring"
 
-#: src/config/cmdline.c:886
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1734,11 +1734,11 @@ msgstr ""
 "będzie podane. Opcja nie daje żadnego rezultatu, bez połączenia\n"
 "z żadną z tych opcji."
 
-#: src/config/cmdline.c:891
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr "Poziom gadatliwości"
 
-#: src/config/cmdline.c:893
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1752,15 +1752,15 @@ msgstr ""
 "\t1 pokazuj poważne błędy i ostrzeżenia\n"
 "\t2 pokazuj wszystkie informacje"
 
-#: src/config/cmdline.c:899
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Wypisz informacje o wersji i zakończ działanie"
 
-#: src/config/cmdline.c:901
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "Wypisz informacje o wersji ELinksa i zakończ działanie."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1773,7 +1773,7 @@ msgstr ""
 "## tylko wartości opcji będą zmienione a formatowanie, komentarze\n"
 "## itp. pozostaną niezmienione.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1792,7 +1792,7 @@ msgstr ""
 "## traktowana jako brakująca. Wiedz, że sposĆ³b formatowania\n"
 "## i komentarze pozostaną niezmienione.\n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1804,7 +1804,7 @@ msgstr ""
 "## przez ELinksa gdy zapiszesz konfigurację poprzez menadżera ustawień\n"
 "## Twoje formatowanie i komentarze zostaną utracone.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1813,11 +1813,11 @@ msgstr ""
 "## Oczywiście, jeśli nie podoba Ci się to, co ELinks robi z tym plikiem\n"
 "## możesz to zmienić ustawiając odpowiednio zmienną config.saving_style.\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "Automatycznie zapisane ustawienia\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Automatycznie zapisane przypisania klawiszy\n"
 
@@ -1947,7 +1947,7 @@ msgstr "Nie można dodać tu opcji."
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 msgid "Sa~ve"
 msgstr "~Zapisz"
 
@@ -3355,7 +3355,7 @@ msgstr "Ustawienia dotyczące zrzutĆ³w."
 
 #. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:411 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Strona kodowa"
 
@@ -4418,7 +4418,7 @@ msgid "When closing a tab show confirmation dialog."
 msgstr "Przy zamykaniu karty pokazuj okienko dialogowe potwierdzania."
 
 #. OPT_LANGUAGE
-#: src/config/options.inc:1250 src/config/opttypes.c:413
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Język"
 
@@ -4586,68 +4586,68 @@ msgstr "Błąd odczytu"
 
 #. The OPT_ comments below are here to be found by grep.
 #. OPT_BOOL
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Typ boolowski"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
 #. OPT_INT
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: src/config/opttypes.c:404 src/config/opttypes.c:406
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr "<liczba>"
 
 #. OPT_LONG
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "Duża liczba całkowita"
 
 #. OPT_STRING
-#: src/config/opttypes.c:408
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Napis"
 
-#: src/config/opttypes.c:408
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<łańcuch>"
 
 #
-#: src/config/opttypes.c:411
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<strona kodowa>"
 
 #
-#: src/config/opttypes.c:413
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<język>"
 
 #. OPT_COLOR
-#: src/config/opttypes.c:415
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Kolor"
 
-#: src/config/opttypes.c:415
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<kolor|#rrggbb>"
 
 #. OPT_COMMAND
-#: src/config/opttypes.c:418
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "Specjalny"
 
 #. OPT_ALIAS
-#: src/config/opttypes.c:421
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr "Alias"
 
 #. OPT_TREE
-#: src/config/opttypes.c:424
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Folder"
 
@@ -4807,7 +4807,7 @@ msgid "~Reject"
 msgstr "Od~rzucenie"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Serwer"
 
@@ -4925,40 +4925,40 @@ msgstr "Data ostatniej wizyty odnośnika"
 msgid "Link title (from history)"
 msgstr "Tytuł odnośnika (z historii)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "przyjęta domyślnie"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ustawienia serwera zignorowane"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Data ostatniej wizyty"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Informacje o nagÅ‚Ć³wku"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 msgid "Internal header info"
 msgstr "Wewnętrzne informacje o nagÅ‚Ć³wku"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Brak nagÅ‚Ć³wka."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Pobieranie"
 
@@ -5034,7 +5034,7 @@ msgid "Download manager"
 msgstr "Menadżer pobierania"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr "Tryb ex"
 
@@ -6461,24 +6461,25 @@ msgid "Program"
 msgstr "Program"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Zewnętrzna przeglądarka dla tego typu plikĆ³w. '%' w łańcuchu\n"
 "zostanie zastąpiony nazwą pliku."
 
 #
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Skojarzenia rozszerzeń plikĆ³w"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr "Rozszerzenie <-> skojarzenie typu MIME."
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
@@ -6487,12 +6488,12 @@ msgstr ""
 "używana tutaj zamiast '.')."
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "System konfiguracyjny"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6587,19 +6588,19 @@ msgstr "Usuń rozszerzenie"
 msgid "Delete extension %s -> %s?"
 msgstr "Czy usunąć rozszerzenie %s -> %s?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Rozszerzenie"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Rozszerzenie"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Typ zawartości"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Brak rozszerzeń"
 
@@ -6753,7 +6754,7 @@ msgstr "Błąd gniazda"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
@@ -7488,7 +7489,7 @@ msgstr "Pliki"
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7676,7 +7677,7 @@ msgstr "Co chcesz zrobić z plikiem '%s'?"
 msgid "Information about the torrent"
 msgstr "Informacje o potoku"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Co mam zrobić?"
 
@@ -7686,12 +7687,12 @@ msgid "Down~load"
 msgstr "~Pobierz"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 msgid "~Display"
 msgstr "~Wyświetl"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr "Pokaż ~nagÅ‚Ć³wek"
 
@@ -7724,19 +7725,19 @@ msgid "CGI"
 msgstr "CGI"
 
 #
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Lokalne pliki"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Ustawienia dotyczące przeglądania lokalnych plikĆ³w."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Zezwolenie na czytanie plikĆ³w specjalnych"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7746,11 +7747,11 @@ msgstr ""
 "NIEBEZPIECZNE - czytanie /dev/urandom czy /dev/zero\n"
 "może zepsuć Ci dzień!"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Pokazuj ukryte pliki przy wyświetlaniu katalogĆ³w"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
 "hidden in local directory listings."
@@ -7759,11 +7760,11 @@ msgstr ""
 "nie będą pokazywane."
 
 #
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "PrĆ³buj rĆ³Å¼ne rozszerzenia plikĆ³w"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7774,7 +7775,7 @@ msgstr ""
 "(np. 'plik.gz'); zależy to od wspieranych formatĆ³w kompresji."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "Plik"
 
@@ -8074,6 +8075,7 @@ msgid "User-agent identification"
 msgstr "Identyfikacja przeglądarki"
 
 #: src/protocol/http/http.c:192
+#, fuzzy
 msgid ""
 "Change the User Agent ID. That means identification string, which\n"
 "is sent to HTTP server when a document is requested. The 'textmode'\n"
@@ -8081,11 +8083,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "Zmienia identyfikator przeglądarki. To znaczy łańcuch, ktĆ³ry\n"
 "jest wysyłany do serwera HTTP przy każdym zapytaniu.\n"
@@ -8291,17 +8293,17 @@ msgid "Default template"
 msgstr "Domyślny szablon"
 
 #: src/protocol/rewrite/rewrite.c:96
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Default URI template used when the string entered in\n"
 "the goto dialog does not appear to be a URI or a filename\n"
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 "Domyślny szablon URI używany, kiedy łańcuch wprowadzony\n"
 "w okienku \"PrzejdÅŗ do URL-a\" nie jest ani URI ani nazwą\n"
@@ -8467,12 +8469,12 @@ msgstr "Błąd skryptu użytkownika"
 msgid "Spidermonkey ECMAScript"
 msgstr "ECMAScript Spidermonkey"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Błąd pobierania"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8481,7 +8483,7 @@ msgstr ""
 "Nie można utworzyć pliku '%s':\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8492,17 +8494,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' to katalog."
 
 #
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Plik istnieje"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8518,55 +8520,51 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr "Zap~isz pod alternatywną nazwą"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr "Nadpisz ~oryginalny plik"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr "WznĆ³w pobie~ranie oryginalnego pliku"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Nieznany typ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Co chcesz zrobić z plikiem '%s' (typu %s%s%s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Co chcesz zrobić z plikiem (typu %s%s%s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Program ('%' zostanie zastąpione nazwą pliku)"
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr "Wyniki programu będą widoczne na karcie"
-
 #
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 msgid "Block the terminal"
 msgstr "Blokowanie terminala"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr "Plik zostanie otwarty przy użyciu programu '%s'."
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 msgid "~Open"
 msgstr "~OtwĆ³rz"
 
@@ -8698,7 +8696,7 @@ msgstr "Błędne zdarzenie %d"
 msgid "Could not read event: %d (%s)"
 msgstr "Nie można odczytać zdarzenia: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "Zbyt dużo bajtĆ³w przeczytanych z itrm!"
@@ -9090,6 +9088,9 @@ msgstr "Stoper"
 msgid "Viewer"
 msgstr "Przeglądarka"
 
+#~ msgid "The output of the program will be shown in the tab"
+#~ msgstr "Wyniki programu będą widoczne na karcie"
+
 #~ msgid " (built on %s %s)"
 #~ msgstr " (zbudowany %s %s)"
 
diff --git a/po/pt.po b/po/pt.po
index bfa62c14..6f575ce5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Andre Valente <a.valente@netcabo.pt>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr "Fechar"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -158,7 +158,7 @@ msgstr "Texto a procurar n
 msgid "Name"
 msgstr "Nome"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Nśmero invįlido"
 
@@ -182,10 +182,10 @@ msgstr "N
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -251,7 +251,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -563,15 +563,15 @@ msgstr ""
 msgid "Content type"
 msgstr "O Tipo de conteśdo é"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Śltima modificaēćo"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "Cifra SSL"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Codificaēćo"
 
@@ -580,7 +580,7 @@ msgstr "Codifica
 msgid "Flags"
 msgstr "Alias"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "incompleto"
 
@@ -765,7 +765,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Bloquear cursor"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -998,283 +998,308 @@ msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Bloquear cursor"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Bloquear cursor"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Bloquear cursor"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Bloquear cursor"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Bloquear cursor"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Ir para link"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Bloquear cursor"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Segundo plano"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~OS shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 #, fuzzy
 msgid "Open options manager"
 msgstr "Explorador de Opēões"
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "A aguardar pela confirmaēćo do redirecionamento"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Ver ~imagem"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "D~ownload da imagem"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "A aguardar pela confirmaēćo do redirecionamento"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Ver ~imagem"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "D~ownload da imagem"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Salvar opēões"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Guar~dar URL como"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Procurar pelo texto"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Procurar pelo texto"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opēões do Terminal"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "~Enviar formulįrio"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "E~nviar formulįrio e recarregar"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Fechar"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "D~ownload da imagem"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Abrir em nova ~janela"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Nćo hį procura anterior"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opēões do Terminal"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Trocar display"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Trocar display"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Ver ~imagem"
@@ -1350,60 +1375,60 @@ msgstr "Sem frames"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 #, fuzzy
 msgid "Template option folder"
 msgstr "Apagar opēćo"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Conexões"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Salvar opēões"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Erro interno"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1411,31 +1436,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "~Enviar formulįrio"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1443,91 +1468,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1536,58 +1561,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Nenhum programa foi especificado para"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1595,43 +1620,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1650,11 +1675,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1672,19 +1697,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1692,11 +1717,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1705,15 +1730,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1721,7 +1746,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1732,7 +1757,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1740,18 +1765,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1878,7 +1903,7 @@ msgstr "N
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Salvar"
@@ -2150,7 +2175,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2159,7 +2184,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2171,7 +2196,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2540,7 +2565,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2585,7 +2610,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2679,7 +2704,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2783,9 +2808,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2795,7 +2820,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2971,7 +2996,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3054,8 +3079,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Codepage"
 
@@ -3209,7 +3235,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3312,7 +3338,7 @@ msgstr "Erro ao salvar"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3904,7 +3930,7 @@ msgstr "Apagar op
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3915,7 +3941,7 @@ msgstr "Apagar op
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3996,7 +4022,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -4008,7 +4034,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Lķngua"
 
@@ -4153,62 +4180,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Erro ao salvar"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "Booleana"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "Inteiro"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "InteiroLongo"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Frase"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Codepage"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Lķngua"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Cores"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "Especial"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr "Alias"
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "Directoria"
 
@@ -4279,7 +4314,7 @@ msgid "Saving"
 msgstr "média"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4355,7 +4390,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Servidor"
 
@@ -4485,41 +4520,41 @@ msgstr "Data da 
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "assumido"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Ignorando configuraēćo de servidor"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Data da śltima visita"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "desconhecido"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Informaēćo de cabeēalhos"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Sem cabeēalho de informaēćo"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "Sem cabeēalho de informaēćo"
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Download"
 
@@ -4604,7 +4639,7 @@ msgid "Download manager"
 msgstr "D~ownload da imagem"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4818,7 +4853,8 @@ msgstr "documentos"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Alternar entre ~HTML/Texto simples"
 
 #. accelerator_context(tab_menu)
@@ -6029,31 +6065,32 @@ msgstr "Nenhum programa"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "~Extensões de ficheiro"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6112,7 +6149,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6133,19 +6170,19 @@ msgstr "Apagar extens
 msgid "Delete extension %s -> %s?"
 msgstr "Apagar extensćo"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Extensćo"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Extensćo(ões)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tipo de conteśdo (Content-Type)"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Sem extensões"
 
@@ -6290,7 +6327,7 @@ msgstr "Excess
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Erro interno"
@@ -6424,7 +6461,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6966,7 +7003,7 @@ msgstr "~Ficheiro"
 msgid "Comment"
 msgstr "documentos"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7149,7 +7186,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "D~ownload da imagem"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "O que fazer?"
 
@@ -7160,13 +7197,13 @@ msgid "Down~load"
 msgstr "Download"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Mostar"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 #, fuzzy
 msgid "Show ~header"
 msgstr "Sem cabeēalho de informaēćo"
@@ -7198,42 +7235,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "arquivosfiles"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Sem extensões"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7241,7 +7278,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Ficheiro"
@@ -7514,11 +7551,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7687,10 +7724,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7836,19 +7873,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "Descriēćo"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Erro de download"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Nćo posso gravar para arquivo"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7856,17 +7893,17 @@ msgid ""
 "%s"
 msgstr "Erro durante o download"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "~Extensões de ficheiro"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7877,55 +7914,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tipo desconhecido"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Terminal do ~BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Abrir"
@@ -7941,13 +7974,13 @@ msgstr "Aten
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7955,12 +7988,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8035,7 +8068,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Nćo posso gravar para arquivo"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8415,19 +8448,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Ir para link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Digite o nśmero do link"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Erro ao salvar"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Erro ao gravar no ficheiro"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 284869e7..f8b233a0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Andre Valente <a.valente@netcabo.pt>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -22,7 +22,7 @@ msgstr "Fechar"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -35,7 +35,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -159,7 +159,7 @@ msgstr "String de procura n
 msgid "Name"
 msgstr "Nome"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Nśmero invįlido"
 
@@ -183,10 +183,10 @@ msgstr "N
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -252,7 +252,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -565,15 +565,15 @@ msgstr ""
 msgid "Content type"
 msgstr "O Tipo de conteśdo é"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Śltima modificaēćo"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "codificaēćo"
 
@@ -581,7 +581,7 @@ msgstr "codifica
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "incompleto"
 
@@ -766,7 +766,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Cursor Bloco"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -996,282 +996,307 @@ msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Cursor Bloco"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Cursor Bloco"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Cursor Bloco"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Cursor Bloco"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Cursor Bloco"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Ir para link"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Cursor Bloco"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Segundo plano"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~OS shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Aguardando pela confirmaēćo de redirecionamento"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "V~isualizar imagem"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Download da ima~gem"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Aguardando pela confirmaēćo de redirecionamento"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "V~isualizar imagem"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Download da ima~gem"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Salvar opēões"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Salvar ~URL como"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Procurar pelo texto"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Procurar pelo texto"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opēões do Terminal"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Enviar formulįrio"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Enviar formulįrio e recarregar"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Fechar"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Download da ima~gem"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Abrir em nova janela"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Nćo hį procura anterior"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opēões do Terminal"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Trocar display"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Trocar display"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "V~isualizar imagem"
@@ -1347,59 +1372,59 @@ msgstr "Sem frames"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Conexões"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Salvar opēões"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Erro interno"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1407,31 +1432,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Enviar formulįrio"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1439,91 +1464,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1532,58 +1557,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Nenhum programa foi especificado para"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1591,43 +1616,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1646,11 +1671,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1668,19 +1693,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1688,11 +1713,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1701,15 +1726,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1717,7 +1742,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1728,7 +1753,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1736,18 +1761,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1871,7 +1896,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Salvar"
@@ -2139,7 +2164,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2148,7 +2173,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2160,7 +2185,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2528,7 +2553,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2573,7 +2598,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2666,7 +2691,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2770,9 +2795,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2782,7 +2807,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2958,7 +2983,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3041,8 +3066,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Codepage"
 
@@ -3195,7 +3221,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3298,7 +3324,7 @@ msgstr "Erro ao salvar"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3889,7 +3915,7 @@ msgstr "Campo de sele
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3900,7 +3926,7 @@ msgstr "Campo de sele
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3980,7 +4006,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3992,7 +4018,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4137,62 +4164,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Erro ao salvar"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Codepage"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Idioma"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Cores"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4263,7 +4298,7 @@ msgid "Saving"
 msgstr "média"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4339,7 +4374,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Servidor"
 
@@ -4469,41 +4504,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "assumido"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Ignorando configuraēćo de servidor"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Śltima vez visitado"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Informaēćo de cabeēalhos"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Informaēćo de cabeēalhos"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Download"
 
@@ -4588,7 +4623,7 @@ msgid "Download manager"
 msgstr "Download da ima~gem"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4802,7 +4837,8 @@ msgstr "documentos"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Alternar entre ~html/plain"
 
 #. accelerator_context(tab_menu)
@@ -6010,31 +6046,32 @@ msgstr "Nenhum programa"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "~Extensões de arquivo"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6093,7 +6130,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6114,19 +6151,19 @@ msgstr "Apagar extens
 msgid "Delete extension %s -> %s?"
 msgstr "Apagar extensćo"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Extensćo"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Extensćo(ões)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tipo de conteśdo (Content-Type)"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Sem extensões"
 
@@ -6271,7 +6308,7 @@ msgstr "Excess
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Erro interno"
@@ -6404,7 +6441,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6946,7 +6983,7 @@ msgstr "Arquivo"
 msgid "Comment"
 msgstr "documentos"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7129,7 +7166,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Download da ima~gem"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Fazer o que?"
 
@@ -7140,13 +7177,13 @@ msgid "Down~load"
 msgstr "Download"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Exibir"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7177,42 +7214,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "arquivosfiles"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Sem extensões"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7220,7 +7257,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "Arquivo"
@@ -7491,11 +7528,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7663,10 +7700,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7809,19 +7846,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Erro de download"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Nćo posso gravar no arquivo"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7829,17 +7866,17 @@ msgid ""
 "%s"
 msgstr "Erro durante o download"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "~Extensões de arquivo"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7850,55 +7887,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tipo desconhecido"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Terminal do ~BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Abrir"
@@ -7914,13 +7947,13 @@ msgstr "Aten
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7928,12 +7961,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8008,7 +8041,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Nćo posso gravar no arquivo"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8385,19 +8418,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Ir para link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Digite o nśmero do number"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Erro ao salvar"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Erro ao gravar em arquivo"
 
diff --git a/po/ro.po b/po/ro.po
index 4f516ce6..0c2f169f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Ionel Mugurel Ciobica <I.M.Ciobica@TUe.nl>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr "
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "
 msgid "Name"
 msgstr "Nume"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Numćr greŗit"
 
@@ -181,10 +181,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Tipul de conžinut este"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Ultima modificare"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "Incomplet"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Cursor bloc"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Cursor bloc"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Cursor bloc"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Cursor bloc"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Cursor bloc"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Cursor bloc"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Du-te la link"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Cursor bloc"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Fundal"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "~Shell-ul sistemului de operare"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Aŗtept pentru redirecžionarea confirmćrii"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "Vez~i imagine"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Descarcć ima~ginea"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Aŗtept pentru redirecžionarea confirmćrii"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "Vez~i imagine"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Descarcć ima~ginea"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Salveazć opžiunile"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Salveazć ~URL ca"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Cautć pentru text"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Cautć pentru text"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Opžiuni de terminal"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Trimite formularul"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Trimite formularul ŗi ~descarcć"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Īnchide"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Descarcć ima~ginea"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Deschide ī~n fereastrć nouć"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Nu existć cćutćri anterioare"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Opžiuni de terminal"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Schimbć ~html/plain"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Schimbć ~html/plain"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "Vez~i imagine"
@@ -1339,59 +1364,59 @@ msgstr "F
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Conexiuni"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Salveazć opžiunile"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Eroare internć"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Trimite formularul"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Program nespecificat pentru"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Salveazć"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Codare"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "Eroare la salvare"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "Selecteaz
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "Selecteaz
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Eroare la salvare"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Codare"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "~Limbaj"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Culoare"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "Medie"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "Asumat"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Ignorć setarea serverului"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Data"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Info pentru antet"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Info pentru antet"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Īncarcć"
 
@@ -4570,7 +4605,7 @@ msgid "Download manager"
 msgstr "Descarcć ima~ginea"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4780,7 +4815,8 @@ msgstr "Documente"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Schimbć ~html/plain"
 
 #. accelerator_context(tab_menu)
@@ -5982,31 +6018,32 @@ msgstr "Nici un program"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "~Extensia fiŗierelor"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6065,7 +6102,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6086,19 +6123,19 @@ msgstr "
 msgid "Delete extension %s -> %s?"
 msgstr "Ŗterge extensia"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Extensia"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Extensia (extensiile)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Tipul conžinutului"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Fćrć extensie"
 
@@ -6244,7 +6281,7 @@ msgstr "Socket exception"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Eroare internć"
@@ -6377,7 +6414,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6918,7 +6955,7 @@ msgstr "~Fi
 msgid "Comment"
 msgstr "Documente"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7101,7 +7138,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Descarcć ima~ginea"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Ce sć fac?"
 
@@ -7112,13 +7149,13 @@ msgid "Down~load"
 msgstr "Īncarcć"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Aratć"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7149,42 +7186,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "Fiŗier(e)"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Fćrć extensie"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7192,7 +7229,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Fiŗier"
@@ -7461,11 +7498,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7633,10 +7670,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7779,19 +7816,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Eroare la descćrcare"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Nu s-a putut crea fiŗierul"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7799,17 +7836,17 @@ msgid ""
 "%s"
 msgstr "Eroare la descćrcare"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "~Extensia fiŗierelor"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7820,55 +7857,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Tip necunoscut"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Terminal ~BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Deschide"
@@ -7884,13 +7917,13 @@ msgstr "Avertisment"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7898,12 +7931,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7975,7 +8008,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Nu s-a putut crea fiŗierul"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8352,19 +8385,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Du-te la link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Introdu numćrul link-ului"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Eroare la salvare"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Eroare la scrierea fiŗierului"
 
diff --git a/po/ru.po b/po/ru.po
index 89dc6846..c8c3f6d2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Dmitry M. Klimov <dmk@gtrk.kmtn.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -24,7 +24,7 @@ msgstr "
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "éĪĘĻ"
 
@@ -37,7 +37,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -161,7 +161,7 @@ msgstr "
 msgid "Name"
 msgstr "éĶŃ"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "īÅ×ÅŅĪĻÅ ŽÉÓĢĻ"
 
@@ -185,10 +185,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -254,7 +254,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -565,15 +565,15 @@ msgstr ""
 msgid "Content type"
 msgstr "ōÉŠ ÄĻĖÕĶÅĪŌĮ"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "šĻÓĢÅÄĪŃŃ ĶĻÄÉĘÉĖĮĆÉŃ"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "ūÉĘŅ SSL"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "ėĻÄÉŅĻ×ĖĮ"
 
@@ -581,7 +581,7 @@ msgstr "
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ĪÅ ŠĻĢĪĻÓŌŲĄ"
 
@@ -766,7 +766,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -997,282 +997,307 @@ msgstr "
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "šĻŹŌÉ ŠĻ ÓÓŁĢĖÅ"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "ėÕŅÓĻŅ ŠŅŃĶĻÕĒĻĢŲĪÉĖĻĶ"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "÷ ĘĻĪÅ"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "ėĻĶĮĪÄĪĮŃ ÓŌŅĻĖĮ"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "ļÖÉÄĮĪÉÅ ŠĻÄŌ×ÅŅÖÄÅĪÉŃ ŠÅŅÅĪĮŠŅĮ×ĢÅĪÉŃ"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "šŅĻÓĶĻŌŅÅŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "óĖĮŽĮŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "ļÖÉÄĮĪÉÅ ŠĻÄŌ×ÅŅÖÄÅĪÉŃ ŠÅŅÅĪĮŠŅĮ×ĢÅĪÉŃ"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "šŅĻÓĶĻŌŅÅŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "óĖĮŽĮŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "óĻČŅĮĪÉŌŲ ĪĮÓŌŅĻŹĖÉ"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "óĻČŅĮĪÉŌŲ URL ĖĮĖ"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "šĻÉÓĖ ŌÅĖÓŌĮ"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "šĻÉÓĖ ŌÅĖÓŌĮ"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "īĮÓŌŅĻŹĖÉ ŌÅŅĶÉĪĮĢĮ"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "šĻÓĢĮŌŲ ĘĻŅĶÕ"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "šĻÓĢĮŌŲ ĘĻŅĶÕ É ŠÅŅÅŚĮĒŅÕŚÉŌŲ"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "śĮĖŅŁŌŲ"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "óĖĮŽĮŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "ļŌĖŅŁŌŲ × ĪĻ×ĻĶ ĻĖĪÅ"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "ņĮĪÅÅ ŠĻÉÓĖĮ ĪÅ ĀŁĢĻ"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "īĮÓŌŅĻŹĖÉ ŌÅŅĶÉĪĮĢĮ"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "šÅŅÅĖĢĄŽÉŌŲ HTML/ŌÅĖÓŌ"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "šÅŅÅĖĢĄŽÉŌŲ HTML/ŌÅĖÓŌ"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "šŅĻÓĶĻŌŅÅŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
@@ -1348,59 +1373,59 @@ msgstr "
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "óĻÅÄÉĪÅĪÉŃ(ÉŹ)"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "óĻČŅĮĪÉŌŲ ĪĮÓŌŅĻŹĖÉ"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "÷ĪÕŌŅÅĪĪŃŃ ĻŪÉĀĖĮ"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1408,31 +1433,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "šĻÓĢĮŌŲ ĘĻŅĶÕ"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1440,91 +1465,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1533,58 +1558,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "īÅ ÕĖĮŚĮĪĮ ŠŅĻĒŅĮĶĶĮ ÄĢŃ"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1592,43 +1617,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1647,11 +1672,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1669,19 +1694,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1689,11 +1714,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1702,15 +1727,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1718,7 +1743,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1729,7 +1754,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1737,18 +1762,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1872,7 +1897,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "óĻČŅĮĪÉŌŲ"
@@ -2140,7 +2165,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2149,7 +2174,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2161,7 +2186,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2529,7 +2554,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2574,7 +2599,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2667,7 +2692,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2771,9 +2796,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2783,7 +2808,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2959,7 +2984,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3042,8 +3067,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "ėĻÄĻ×ĮŃ ÓŌŅĮĪÉĆĮ"
 
@@ -3196,7 +3222,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3299,7 +3325,7 @@ msgstr "
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3890,7 +3916,7 @@ msgstr "
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3901,7 +3927,7 @@ msgstr "
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3981,7 +4007,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3993,7 +4019,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4138,62 +4165,70 @@ msgstr ""
 msgid "Read error"
 msgstr "ļŪÉĀĖĮ ÓĻČŅĮĪÅĪÉŃ"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "ėĻÄĻ×ĮŃ ÓŌŅĮĪÉĆĮ"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "ńŚŁĖ"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "ć×ÅŌ"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4264,7 +4299,7 @@ msgid "Saving"
 msgstr "× ÓŅÅÄĪÅĶ"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4340,7 +4375,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "óÅŅ×ÅŅ"
 
@@ -4470,41 +4505,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "ŠŅÉĪŃŌĻ"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ÉĒĪĻŅÉŅĻ×ĮŌŲ ĪĮÓŌŅĻŹĖÉ ÓÅŅ×ÅŅĮ"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "äĮŌĮ"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "šĻÓĢÅÄĪÅÅ ĻĀŅĮŻÅĪÉÅ"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "īÅÉŚ×ÅÓŌĪĻ"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "éĪĘĻ Ļ ŚĮĒĻĢĻ×ĖÅ"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "éĪĘĻ Ļ ŚĮĒĻĢĻ×ĖÅ"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "śĮĖĮŽĖĮ"
 
@@ -4589,7 +4624,7 @@ msgid "Download manager"
 msgstr "óĖĮŽĮŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4799,7 +4834,8 @@ msgstr "
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "šÅŅÅĖĢĄŽÉŌŲ HTML/ŌÅĖÓŌ"
 
 #. accelerator_context(tab_menu)
@@ -6007,31 +6043,32 @@ msgstr "
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "ņĮÓŪÉŅÅĪÉŃ ĘĮŹĢĻ×"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6090,7 +6127,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6111,19 +6148,19 @@ msgstr "
 msgid "Delete extension %s -> %s?"
 msgstr "õÄĮĢÉŌŲ ŅĮÓŪÉŅÅĪÉÅ"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "ņĮÓŪÉŅÅĪÉÅ"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "ņĮÓŪÉŅÅĪÉŃ"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "ōÉŠ ÓĻÄÅŅÖÉĶĻĒĻ"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "īÅŌ ŅĮÓŪÉŅÅĪÉŹ"
 
@@ -6268,7 +6305,7 @@ msgstr "
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "÷ĪÕŌŅÅĪĪŃŃ ĻŪÉĀĖĮ"
@@ -6401,7 +6438,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6943,7 +6980,7 @@ msgstr "
 msgid "Comment"
 msgstr "ÄĻĖÕĶÅĪŌĻ×"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7126,7 +7163,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "óĖĮŽĮŌŲ ÉŚĻĀŅĮÖÅĪÉÅ"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "žŌĻ ÄÅĢĮŌŲ?"
 
@@ -7137,13 +7174,13 @@ msgid "Down~load"
 msgstr "śĮĖĮŽĖĮ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "ļŌĻĀŅĮŚÉŌŲ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7174,42 +7211,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "ĘĮŹĢĻ×"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "īÅŌ ŅĮÓŪÉŅÅĪÉŹ"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7217,7 +7254,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "ęĮŹĢ"
@@ -7488,11 +7525,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7660,10 +7697,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7806,19 +7843,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "ļŪÉĀĖĮ ŚĮĖĮŽĖÉ"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "īÅ×ĻŚĶĻÖĪĻ ŠÉÓĮŌŲ × ĘĮŹĢ"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7826,17 +7863,17 @@ msgid ""
 "%s"
 msgstr "ļŪÉĀĖĮ ŚĮĖĮŽÉ×ĮĪÉŃ"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "ņĮÓŪÉŅÅĪÉŃ ĘĮŹĢĻ×"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7847,55 +7884,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "īÅÉŚ×ÅÓŌĪŁŹ ŌÉŠ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "ōÅŅĶÉĪĮĢ BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "ļŌĖŅŁŌŲ"
@@ -7911,13 +7944,13 @@ msgstr "
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7925,12 +7958,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8004,7 +8037,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "īÅ×ĻŚĶĻÖĪĻ ŠÉÓĮŌŲ × ĘĮŹĢ"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8381,19 +8414,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "šĻŹŌÉ ŠĻ ÓÓŁĢĖÅ"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "÷×ÅÄÉŌÅ ĪĻĶÅŅ ÓÓŁĢĖÉ"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "ļŪÉĀĖĮ ÓĻČŅĮĪÅĪÉŃ"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "ļŪÉĀĖĮ ŚĮŠÉÓÉ × ĘĮŹĢ"
 
diff --git a/po/sk.po b/po/sk.po
index fcba2a95..f1ccf6a0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2004-02-13 19:07+0100\n"
 "Last-Translator: Peter Samek <samek@upc.uniba.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -22,7 +22,7 @@ msgstr "Zavri"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Informįcie"
 
@@ -35,7 +35,7 @@ msgstr "Na rozbalenie tejto zlo
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -155,7 +155,7 @@ msgstr "H
 msgid "Name"
 msgstr "Nįzov"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Chybné čķslo"
 
@@ -179,10 +179,10 @@ msgstr "Pr
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -251,7 +251,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -567,15 +567,15 @@ msgstr "Stiahnut
 msgid "Content type"
 msgstr "Obsah je"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Poslednį zmena"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "SSL ¹ifra"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "Kódovanie"
 
@@ -583,7 +583,7 @@ msgstr "K
 msgid "Flags"
 msgstr "Prķznaky"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "neśplnż"
 
@@ -762,7 +762,7 @@ msgstr "Vlo
 msgid "Move to the previous item"
 msgstr "Presunś» sa so predchįdzajśceho rįmca"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Prekresli» terminįl"
@@ -975,268 +975,293 @@ msgstr "Posun
 
 #: src/config/actions-main.inc:57
 #, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "Ķs» na začiatok strįnky alebo riadku"
+
+#: src/config/actions-main.inc:58
+#, fuzzy
 msgid "Move cursor right"
 msgstr "Posunś» kurzor doprava"
 
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 #, fuzzy
 msgid "Move cursor up"
 msgstr "Posunś» kurzor smerom hore"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 #, fuzzy
 msgid "Move to the end of the document"
 msgstr "Ķs» na koniec strįnky/riadku"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 #, fuzzy
 msgid "Move to the start of the document"
 msgstr "Ķs» na začiatok strįnky alebo riadku"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 #, fuzzy
 msgid "Move one link down"
 msgstr "Posunś» sa o stranu vy¹¹ie"
 
-#: src/config/actions-main.inc:62
-#, fuzzy
-msgid "Move one link left"
-msgstr "Posunś» sa o stranu vy¹¹ie"
-
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Presunś» sa na ļal¹iu polo¾ku"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
+msgid "Move one link left"
+msgstr "Posunś» sa o stranu vy¹¹ie"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "Presunś» sa so predchįdzajśceho rįmca"
+
+#: src/config/actions-main.inc:66
+#, fuzzy
+msgid "Move to the next link"
+msgstr "Presunś» sa na ļal¹iu polo¾ku"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
 msgid "Move to the previous link"
 msgstr "Presunś» sa so predchįdzajśceho rįmca"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 #, fuzzy
 msgid "Move one link right"
 msgstr "Posunś» kurzor doprava"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Presunś» sa na ļal¹iu polo¾ku"
+
+#: src/config/actions-main.inc:70
 #, fuzzy
 msgid "Move one link up"
 msgstr "Posunś» sa o stranu vy¹¹ie"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Presunś» sa so predchįdzajśceho rįmca"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "Posunś» sa o stranu ni¾¹ie"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "Posunś» sa o stranu vy¹¹ie"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "Otvori» aktuįlny odkaz v novom tabe"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Otvori» aktuįlny odkaz v novom tabe na pozadķ"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "Otvori» aktuįlny odkaz v novom okne"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "Otvori» novż tab"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Otvori» novż tab na pozadķ"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "Otvori» nové okno"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr "Otvori» OS shell"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "Otvori» sprįvcu nastavenķ"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "Otvori» dialóg potvrdzujści skončenie Elinksu"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "Skonči» bez reptania"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "Znovu natiahnu» sśčasnś strįnku"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 #, fuzzy
 msgid "Re-render the current page"
 msgstr "Znovu natiahnu» sśčasnś strįnku"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "Resetova» formulįr na začiatočné hodnoty"
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr "Zobrazi» informįcie o prįve pou¾ķvanżch zdrojoch"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 #, fuzzy
 msgid "Save the current document in source form"
 msgstr "Vypķsa» danż HTML dokument v zdrojovej podobe na ¹tandardnż vżstup."
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr ""
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "Ulo¾i» nastavenia"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "Ulo¾i» URL ako"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "Posun v texte smerom dole"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "Posun v texte smerom vµavo"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "Posun v texte smerom vpravo"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "Posun v texte smerom hore"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "Hµada» vzorku textu"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "Hµada» spätne vzorku textu"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr "Interaktķvne hµadanie v texte odkazov"
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 #, fuzzy
 msgid "Search document text by typing ahead"
 msgstr "Interaktķvne hµadanie v texte odkazov"
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 #, fuzzy
 msgid "Search document text backwards by typing ahead"
 msgstr "Interaktķvne hµadanie v texte odkazov"
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "Nastavenie terminįlu"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr "Odosla» formulįr"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr "Odosla» formulįr a obnovi» strįnku"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "Zavrie» tab"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "Zavrie» v¹etky taby okrem aktuįlneho"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "Otvori» menu tabov"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Otvori» aktuįlny odkaz v novom tabe"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Otvori» aktuįlny odkaz v novom tabe"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "Ļal¹ķ tab"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "Predchįdzajści tab"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Nastavenie terminįlu"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 #, fuzzy
 msgid "Toggle rendering of page using CSS"
 msgstr "Prepnś» zobrazovanie tabuliek"
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "Prepnś» zobrazovanie odkazov na obrįzky"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr "Prepnś» zobrazovanie tabuliek"
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr "Prepnś» pou¾ķvanie farieb nastavenżch v dokumente"
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr "Prepnś» zobrazovanie strįnky ako HTML / čistż text"
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Prepnś» ukladanie"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "Prepnś» čķslovanie odkazov"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr "Prepnś» zlučovanie prįzdnych riadkov"
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Prepnś» zobrazovanie tabuliek"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr "Zobrazi» aktuįlny obrįzok"
 
@@ -1308,62 +1333,62 @@ msgstr "R
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr "©ablónovį zlo¾ka"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(¹tandardne: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(¹tandardne: \"%s\")"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr "(alias pre %s)"
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(¹tandardne: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Konfiguračné voµby:\n"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 #, fuzzy
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 "Pou¾itie: elinks [voµby]... [URL]\n"
 "\n"
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Nastavenie:\n"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Vnśtornį chyba"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "Obmedzenie na anonymnż re¾im"
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 #, fuzzy
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
@@ -1376,32 +1401,32 @@ msgstr ""
 "spś¹»enie ext. prezeračov je povolené, ale nedajś sa meni» ich\n"
 "nastavenia."
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "Automatické odoslanie prvého formulįra"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 #, fuzzy
 msgid "Automatically submit the first form in the given URLs."
 msgstr "Choļ a odo¹li prvż formulįr, na ktorż narazķ¹."
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 #, fuzzy
 msgid "Clone internal session with given ID"
 msgstr "Naklonovanie sedenia s danżm ID"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "Nįzov adresįra s konfiguračnżm sśborom"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 #, fuzzy
 msgid ""
 "Path of the directory ELinks will read and write its\n"
@@ -1414,22 +1439,22 @@ msgstr ""
 "pova¾ovanį za absolśtnu cestu. Inak sa predpokladį, ¾e je\n"
 "relatķvna k domovskému adresįru."
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 #, fuzzy
 msgid "Print default configuration file to stdout"
 msgstr "Zobrazi» nįpovedu pre konfiguračné voµby"
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "Nįzov konfiguračného sśboru"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 #, fuzzy
 msgid ""
 "Name of the configuration file that all configuration\n"
@@ -1440,79 +1465,79 @@ msgstr ""
 "zapisova» v¹etky nastavenia. Meno by malo byt relatķvne k\n"
 "parametru confdir."
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "Zobrazi» nįpovedu pre konfiguračné voµby"
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 #, fuzzy
 msgid "Print help for configuration options and exit."
 msgstr "Zobrazi» nįpovedu pre konfiguračné voµby a skonči»."
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 #, fuzzy
 msgid "MIME type assumed for unknown document types"
 msgstr "Predpokadanż MIME typ dokumentov"
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 #, fuzzy
 msgid "The default MIME type used for documents of unknown type."
 msgstr "©tandardnż MIME typ, ktorż predpoklada» pri neznįmych dokumentoch."
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 #, fuzzy
 msgid "Print formatted versions of given URLs to stdout"
 msgstr "Vypķsa» formįtovanś verziu daného URL na ¹tandardnż vżstup"
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 #, fuzzy
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr "Vypķsa» formįtovanś verziu daného URL na ¹tandardnż vżstup"
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "Kódovį strįnka, ktorį mį by» pou¾itį na -dump vżstup"
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 #, fuzzy
 msgid "Codepage used when formatting dump output."
 msgstr "Kódovį strįnka pou¾itį v dump vżstupe."
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 #, fuzzy
 msgid "Color mode used with -dump"
 msgstr "Kódovį strįnka, ktorį mį by» pou¾itį na -dump vżstup"
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 #, fuzzy
 msgid "Color mode used with -dump."
 msgstr "Kódovį strįnka, ktorį mį by» pou¾itį na -dump vżstup"
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "©ķrka dokumenty formįtovaného pomocou -dump"
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "©ķrka dump vżstupu."
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 #, fuzzy
 msgid "Evaluate configuration file directive"
 msgstr "Vyhodnoti» danś konfiguračnś voµbu"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 #, fuzzy
 msgid ""
 "Specify configuration file directives on the command-line\n"
@@ -1524,12 +1549,12 @@ msgstr ""
 "  -eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 #, fuzzy
 msgid "Interpret documents of unknown types as HTML"
 msgstr "©tandardnż MIME typ, ktorż predpoklada» pri neznįmych dokumentoch."
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 #, fuzzy
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
@@ -1539,46 +1564,46 @@ msgstr ""
 "Voµba prinśti ELinks predpoklada», ¾e sśbory, ktoré vidķ sś v HTML.Je to "
 "ekvivalentné voµbe -default-mime-type text/html ."
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "Zobrazi» nįpovedu a skonči»"
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "Zobrazi» nįpovedu a skonči»."
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "Zobrazi» detailnś nįpovedu a skonči»"
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr "Zobrazi» detailnś nįpovedu a skonči»."
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "Vyhµada» zadaného hostiteµa"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "Spustenie oddelenej in¹tancie programu"
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 #, fuzzy
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
@@ -1591,24 +1616,24 @@ msgstr ""
 "na disk ¾iadne konfiguračné sśbory (ani zįlo¾ky, história a pod.)\n"
 "Viļ tie¾ parameter -touch-files."
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 #, fuzzy
 msgid "Disable use of files in ~/.elinks"
 msgstr "Nepou¾ķva» sśbory v ~/.elinks"
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 #, fuzzy
 msgid "Disable link numbering in dump output"
 msgstr "Nečķslova» odkazy v dump vżstupe."
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 #, fuzzy
 msgid ""
 "Prevents printing of link number in dump output.\n"
@@ -1619,12 +1644,12 @@ msgstr ""
 "ale\n"
 "¾e sa to tżka iba parametra --dump a ničoho iného."
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 #, fuzzy
 msgid "Disable printing of link references in dump output"
 msgstr "Nečķslova» odkazy v dump vżstupe."
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 #, fuzzy
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
@@ -1636,11 +1661,11 @@ msgstr ""
 "ale\n"
 "¾e sa to tżka iba parametra --dump a ničoho iného."
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1659,11 +1684,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr "Pripoji» sa do skupiny sedenķ s danżm ID"
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1681,22 +1706,22 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 #, fuzzy
 msgid "Print the source of given URLs to stdout"
 msgstr "Vypķsa» dané URL v zdrojovej podobe na ¹tandardnż vżstup"
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 #, fuzzy
 msgid "Print given URLs in source form to stdout."
 msgstr "Vypķsa» danż HTML dokument v zdrojovej podobe na ¹tandardnż vżstup."
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 "Pou¾ķva» sśbory v ~/.elinks aj pri spustenķ s -no-connect/-session-ring"
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 #, fuzzy
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
@@ -1708,11 +1733,11 @@ msgstr ""
 "na disk aj v prķpade, ¾e bol pou¾itż parameter -no-connect alebo\n"
 "-session-ring; inak nemį tento parameter ¾iadny vżznam,"
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1721,15 +1746,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "Vypķsa» informįciu o verzii a skonči»"
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "Vypķsa» informįciu o verzii ELinksu a skonči»"
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1742,7 +1767,7 @@ msgstr ""
 "## volieb a v¹etko va¹e formįtovanie, vlastné komentįre a pod. zostane\n"
 "## tak ako je.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1760,7 +1785,7 @@ msgstr ""
 "## V¹etko va¹e formįtovanie, vlastné komentįre a pod. zostane zachované.\n"
 "## \n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1772,7 +1797,7 @@ msgstr ""
 "## zaka¾dżm keļ ulo¾ķte nsatavenia cez u¾ķvateµské rozhranie. A s va¹ķm\n"
 "## formįtovanķm a poznįmkami je amen.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1782,11 +1807,11 @@ msgstr ""
 "## mō¾ete to ovplyvni» zmenou voµby config.saving_style. Nie sme a¾\n"
 "## takķ zlķ, nie? ;-)\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "Automaticky ulo¾ené nastavenie\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "Automaticky ulo¾ené klįvesové skratky\n"
 
@@ -1913,7 +1938,7 @@ msgstr "Do tejto zlo
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Ulo¾i»"
@@ -2205,7 +2230,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2214,7 +2239,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2226,7 +2251,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2614,7 +2639,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2663,8 +2688,9 @@ msgstr "Zacyklen
 
 #. 0
 #: src/config/options.inc:353
+#, fuzzy
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Pri stlačenķ klįvesy 'dole' na poslednom odkaze sa presuņ na prvż odkaz\n"
@@ -2772,8 +2798,9 @@ msgid "Show search hit top or bottom dialogs"
 msgstr "Zobrazova» upozornenie o vyhµadįvanķ, ktoré dosiahlo koniec dokumentu"
 
 #: src/config/options.inc:403
+#, fuzzy
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 "Povoli» zobrazovanie upozornenia keļ vyhµadįvanie dosiahne koniec alebo\n"
@@ -2896,9 +2923,9 @@ msgstr "Ke
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2908,7 +2935,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -3085,7 +3112,7 @@ msgstr "Zabezpe
 
 #: src/config/options.inc:587
 #, fuzzy
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Zabezpeči» aby farby pozadia a textu neboli rovnaké."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3188,8 +3215,9 @@ msgstr "Dump v
 msgid "Dump output options."
 msgstr "Nastavenie dump vżstupu."
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Kódovį strįnka"
 
@@ -3339,7 +3367,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Zobrazi» horné indexy (ako ^index)"
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+#, fuzzy
+msgid "Rendering of HTML link element"
 msgstr "Zobrazovanie HTML elementu 'link' (¹peciįlnych odkazov)"
 
 #: src/config/options.inc:723
@@ -3454,7 +3483,7 @@ msgstr "Interval automatick
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -4058,9 +4087,10 @@ msgid "Underline menu hotkeys"
 msgstr "Podčiarkova» horśce klįvesy"
 
 #: src/config/options.inc:1184
+#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Zapnś» podčiarkovanie horścich klįves v menu aby boli viac viditeµné.\n"
 "Funguje to ale iba ak terminįl podčiarkovanie podporuje."
@@ -4074,7 +4104,7 @@ msgstr "Pod
 #, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Zapnś» podčiarkovanie horścich klįves v menu aby boli viac viditeµné.\n"
 "Funguje to ale iba ak terminįl podčiarkovanie podporuje."
@@ -4169,8 +4199,9 @@ msgid "Wrap-around tabs cycling"
 msgstr "Cyklické prechįdzanie medzi tabmi"
 
 #: src/config/options.inc:1241
+#, fuzzy
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "Pri presune z posledného tabu ļalej doprava preskoči» na prvż tab a naopak."
@@ -4183,7 +4214,8 @@ msgstr "Potvrdzova
 msgid "When closing a tab show confirmation dialog."
 msgstr "Pri zatvįranķ tabu zobrazi» potvrdzovacķ dialóg."
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "Jazyk"
 
@@ -4329,60 +4361,68 @@ msgstr ""
 msgid "Read error"
 msgstr "Chyba pri čķtanķ"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "Re»azec"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<znakovį sada>"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<jazyk>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Farby"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4450,7 +4490,7 @@ msgid "Saving"
 msgstr "Ukladanie"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4523,7 +4563,7 @@ msgid "~Reject"
 msgstr "Zamietnu»"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4650,41 +4690,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr "Titulok odkazu (z histórie)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "predpokladįm"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ignoruj informįciu zo servera"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Dįtum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "Čas poslednej nįv¹tevy"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "neznįmy"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Informįcie o hlavičke"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Informįcie o hlavičke"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "S»ahovanie"
 
@@ -4766,7 +4806,7 @@ msgid "Download manager"
 msgstr ""
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4978,7 +5018,8 @@ msgstr ""
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Prepnś» htm~l/zdrojįk"
 
 #. accelerator_context(tab_menu)
@@ -6158,30 +6199,31 @@ msgstr "Program"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "Asociįcie prķpon sśborov"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6240,7 +6282,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6261,19 +6303,19 @@ msgstr "Zmaza
 msgid "Delete extension %s -> %s?"
 msgstr "Zmaza» prķponu %s?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Prķpona"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Prķpona(y)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Typ"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "®iadne prķpony"
 
@@ -6415,7 +6457,7 @@ msgstr "Chyba v sockete"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Vnśtornį chyba"
@@ -6547,7 +6589,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -7093,7 +7135,7 @@ msgstr "~S
 msgid "Comment"
 msgstr "Komentįre"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7281,7 +7323,7 @@ msgstr "Nena
 msgid "Information about the torrent"
 msgstr "Zobrazi» informįcie o aktuįlnej strįnke"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Čo mįm teda robi»?"
 
@@ -7292,13 +7334,13 @@ msgid "Down~load"
 msgstr "S»ahovanie"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Zobrazi»"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 #, fuzzy
 msgid "Show ~header"
 msgstr "Zobrazova» ¹ablóny"
@@ -7328,19 +7370,19 @@ msgstr "Povolenie sp
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "Lokįlne sśbory"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "Nastavenia prezerania lokįlnych sśborov"
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "Povoli» čķtanie ¹peciįlnych sśborov"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 #, fuzzy
 msgid ""
 "Whether to allow reading from non-regular files.\n"
@@ -7350,24 +7392,24 @@ msgstr ""
 "Povoli» čķtanie zo ¹peciįlnych sśborov? (NEBEZPEČNÉ - čķtanie zo sśborov\n"
 "ako /dev/urandom alebo /dev/zero vįm mō¾e spōsobi» veµké problémy.)"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "Zobrazi» skryté sśbory vo vżpisoch adresįrov"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 #, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 "Zobrazi» skryté sśbory vo vżpise adresįra ?\n"
 "Ak vypnuté, vo vżpise adresįra nebudś zobrazené sśbory začķnajśce bodkou."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "Skś¹a» prķpony rōznych kódovanķ"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7375,7 +7417,7 @@ msgid ""
 msgstr "Ak je tįto voµba zapnutį "
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Sśbor"
@@ -7681,11 +7723,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "Zmenķ identifikįciu prehliadača (hlavičku User-Agent). To je identifikačnż\n"
 "re»azec, ktorż je poslanż HTTP serveru pri ¾iadosti o dokument.\n"
@@ -7866,10 +7908,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -8025,12 +8067,12 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Chyba pri downloade"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8039,7 +8081,7 @@ msgstr ""
 "Nemō¾em vytvori» sśbor '%s':\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8050,16 +8092,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "Sśbor existuje"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8070,57 +8112,53 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 #, fuzzy
 msgid "~Overwrite the original file"
 msgstr "Nastavi» pōvodnż čas"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 #, fuzzy
 msgid "~Resume download of the original file"
 msgstr "Pokśsi» sa obnovi» s»ahovanie aktuįlneho odkazu"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Neznįmy typ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "Nena¹iel som odkaz obsahujści text: '%s'."
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Zablokova» terminįl"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Otvori»"
@@ -8136,13 +8174,13 @@ msgstr "Upozornenie"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -8150,12 +8188,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8229,7 +8267,7 @@ msgstr "Zl
 msgid "Could not read event: %d (%s)"
 msgstr "Nemō¾em čķta» udalos»: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "Načķtal som z itrm prķli¹ vela bajtov!"
@@ -8598,19 +8636,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Choļ na link"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Zadaj čķslo linku"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Chyba pri ukladanķ"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Chyba pri zįpise do sśboru"
 
diff --git a/po/sr.po b/po/sr.po
index c4c52a5a..683e5856 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.10.6.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2005-09-21 16:20+0200\n"
 "Last-Translator: Strahinya Radich (ĮāąŠåŲśŠ ĄŠŌŲū) <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -19,7 +19,7 @@ msgstr "
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "¾ŃŠŅÕčāÕśÕ"
 
@@ -32,7 +32,7 @@ msgstr "
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -149,7 +149,7 @@ msgstr "
 msgid "Name"
 msgstr "½Š×ŲŅ"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "»Žč 䎹܊ā"
 
@@ -173,10 +173,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 msgid "~Cancel"
 msgstr "~æŽŻŲčāŲ"
@@ -234,7 +234,7 @@ msgid "LED indicators"
 msgstr "øŻŌŲŚŠāŽąŲ ŌŲŽŌŠ"
 
 #: src/bfu/leds.c:306
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "What the different LEDs indicate:\n"
 "\n"
@@ -242,7 +242,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -569,15 +569,15 @@ msgstr "
 msgid "Content type"
 msgstr "²ąįāŠ įŠŌąÖŠųŠ"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "æŽįŪÕŌśŠ Ų×ÜÕŻŠ"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "±ŲāŻŽįā SSL-Š"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "ŗŽŌŲąŠśÕ"
 
@@ -585,7 +585,7 @@ msgstr "
 msgid "Flags"
 msgstr "æąÕŚŲŌŠēŲ"
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ŻÕŌŽŅąčÕŻŽ"
 
@@ -759,7 +759,7 @@ msgstr "
 msgid "Move to the previous item"
 msgstr "æŽÜÕąŠśÕ ŻŠ ßąÕāåŽŌŻć įāŠŅŚć"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "æŽŻŽŅŻŽ ŲįęąāŠŅŠśÕ āÕąÜŲŻŠŪŠ"
@@ -967,248 +967,273 @@ msgid "Move cursor left"
 msgstr "æŽÜÕąŠśÕ ŚćąįŽąŠ ŻŠŪÕŅŽ"
 
 #: src/config/actions-main.inc:57
+#, fuzzy
+msgid "Move cursor to the start of the line"
+msgstr "¾ŌŪŠ×ŠŚ ŻŠ ߎēÕāŠŚ įāąŠŻŲęÕ ŲŪŲ ąÕŌŠ"
+
+#: src/config/actions-main.inc:58
 msgid "Move cursor right"
 msgstr "æŽÜÕąŠśÕ ŚćąįŽąŠ ŻŠŌÕįŻŽ"
 
-#: src/config/actions-main.inc:58
+#: src/config/actions-main.inc:59
 msgid "Move cursor up"
 msgstr "æŽÜÕąŠśÕ ŚćąįŽąŠ ŻŠŅŲčÕ"
 
-#: src/config/actions-main.inc:59
+#: src/config/actions-main.inc:60
 msgid "Move to the end of the document"
 msgstr "æŽÜÕąŠśÕ ŻŠ ŚąŠų ŌŽŚćÜÕŻāŠ"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 msgid "Move to the start of the document"
 msgstr "æŽÜÕąŠśÕ ŻŠ ߎēÕāŠŚ ŌŽŚćÜÕŻāŠ"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 msgid "Move one link down"
 msgstr "æŽÜÕąŠśÕ ׊ ųÕŌŻć ŅÕ×ć ŻŠŻŲÖÕ"
 
-#: src/config/actions-main.inc:62
-msgid "Move one link left"
-msgstr "æŽÜÕąŠśÕ ׊ ųÕŌŻć ŅÕ×ć ŻŠŪÕŅŽ"
-
 #: src/config/actions-main.inc:63
-msgid "Move to the next link"
+#, fuzzy
+msgid "Move to the next line with a link"
 msgstr "æŽÜÕąŠśÕ ŻŠ įŪÕŌÕūć ŅÕ×ć"
 
 #: src/config/actions-main.inc:64
+msgid "Move one link left"
+msgstr "æŽÜÕąŠśÕ ׊ ųÕŌŻć ŅÕ×ć ŻŠŪÕŅŽ"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "æŽÜÕąŠśÕ ŻŠ ßąÕāåŽŌŻć ŅÕ×ć"
+
+#: src/config/actions-main.inc:66
+msgid "Move to the next link"
+msgstr "æŽÜÕąŠśÕ ŻŠ įŪÕŌÕūć ŅÕ×ć"
+
+#: src/config/actions-main.inc:67
 msgid "Move to the previous link"
 msgstr "æŽÜÕąŠśÕ ŻŠ ßąÕāåŽŌŻć ŅÕ×ć"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 msgid "Move one link right"
 msgstr "æŽÜÕąŠśÕ ׊ ųÕŌŻć ŅÕ×ć ŻŠŌÕįŻŽ"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "æŽÜÕąŠśÕ ŻŠ įŪÕŌÕūć ŅÕ×ć"
+
+#: src/config/actions-main.inc:70
 msgid "Move one link up"
 msgstr "æŽÜÕąŠśÕ ׊ ųÕŌŻć ŅÕ×ć ŻŠŅŲčÕ"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "æŽÜÕąŠśÕ ŻŠ ßąÕāåŽŌŻć ŅÕ×ć"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "æŽÜÕąŠśÕ ׊ ųÕŌŻć įāąŠŻŲęć ŻŠŻŲÖÕ"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "æŽÜÕąŠśÕ ׊ ųÕŌŻć įāąŠŻŲęć ŻŠŅŲčÕ"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 msgid "Open the current link in a new tab"
 msgstr "¾āŅŠąŠśÕ āÕŚćūÕ ŅÕ×Õ ć ŻŽŅŽÜ ųÕ×ŲēŚć"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 msgid "Open the current link in a new tab in the background"
 msgstr "¾āŅŠąŠśÕ āÕŚćūÕ ŅÕ×Õ ć ŻŽŅŽÜ ߎ׊ŌŲŻįŚŽÜ ųÕ×ŲēŚć"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "¾āŅŠąŠśÕ āÕŚćūÕ ŅÕ×Õ ć ŻŽŅŽÜ ßąŽ×Žąć"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 msgid "Open a new tab"
 msgstr "¾āŅŠąŠśÕ ŻŽŅŽÓ ųÕ×ŲēŚŠ"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 msgid "Open a new tab in the background"
 msgstr "¾āŅŠąŠśÕ ŻŽŅŽÓ ųÕ×ŲēŚŠ ć ߎ׊ŌŲŻŲ"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "¾āŅŠąŠśÕ ŻŽŅŽÓ ßąŽ×ŽąŠ"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 msgid "Open an OS shell"
 msgstr "¾āŅŠąŠśÕ łćįŚÕ ¾Į-Š"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "¾āŅŠąŠśÕ ćßąŠŅłŠēŠ Ų×ŃŽąŠ"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "¾āŅŠąŠśÕ ŌŲųŠŪŽÓŠ ߎāŅąŌÕ ×ŠŅąčÕāŚŠ"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "·ŠŅąčÕāŠŚ ŃÕ× ßŽāŅąŌÕ"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "æŽŻŽŅŻŽ ćēŲāŠŅŠśÕ āÕŚćūÕ įāąŠŻŲęÕ"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 msgid "Re-render the current page"
 msgstr "æŽŻŽŅŻŽ ŲįęąāŠŅŠśÕ āÕŚćūÕ įāąŠŻŲęÕ"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr "æŽŻŽŅŻŽ ߎįāŠŅłŠśÕ įāŠŅŚÕ ŽŃąŠįęŠ ŻŠ śŲåŽŅÕ ßŽēÕāŻÕ ŅąÕŌŻŽįāŲ"
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 msgid "Show information about the currently used resources"
 msgstr "æąŲŚŠ×ŲŅŠśÕ ߎŌŠāŠŚŠ Ž āąÕŻćāŻŽ ćߎāąÕŃłÕŻŲÜ ąÕįćąįŲÜŠ"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr "ĒćŅŠśÕ āÕŚćūÕÓ ŌŽŚćÜÕŻāŠ ć Ų×ŅŽąŻŽÜ ŽŃŪŲŚć"
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr "ĒćŅŠśÕ āÕŚćūÕÓ ŌŽŚćÜÕŻāŠ ć 䎹܊āŲąŠŻŽÜ ŽŃŪŲŚć"
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 msgid "Save options"
 msgstr "ĒćŅŠśÕ Ų×ŃŽąŠ"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 msgid "Save URL as"
 msgstr "ĒćŅŠśÕ ĆĄ»-Š ߎŌ ŌąćÓŲÜ ŲÜÕŻŽÜ"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "ŗŪŲ׊śÕ ŻŠŻŲÖÕ"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "ŗŪŲ׊śÕ ŻŠŪÕŅŽ"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "ŗŪŲ׊śÕ ŻŠŌÕįŻŽ"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "ŗŪŲ׊śÕ ŻŠŅŲčÕ"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "ĀąŠÖÕśÕ āÕŚįāćŠŪŻŽÓ ŽŃąŠįęŠ"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "ĀąŠÖÕśÕ āÕŚįāćŠŪŻŽÓ ŽŃąŠįęŠ ćŻŠ×ŠŌ"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr "æąÕāąŠÓŠ āÕŚįāŠ ŅÕ×Õ ßŽįāÕßÕŻŲÜ ćŻŽįŽÜ"
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr "æąÕāąŠÓŠ āÕŚįāŠ ŌŽŚćÜÕŻāŠ ߎįāÕßÕŻŲÜ ćŻŽįŽÜ"
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr "æąÕāąŠÓŠ āÕŚįāŠ ŌŽŚćÜÕŻāŠ 毊׊Ō ߎįāÕßÕŻŲÜ ćŻŽįŽÜ"
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 msgid "Show terminal options dialog"
 msgstr "æąŲŚŠ× ŌŲųŠŪŽÓŠ Ų×ŃŽąŠ āÕąÜŲŻŠŪŠ"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 msgid "Submit form"
 msgstr "æąÕŌŠŅŠśÕ ŽŃąŠįęŠ"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 msgid "Submit form and reload"
 msgstr "æąÕŌŠŅŠśÕ ŽŃąŠįęŠ Ų ߎŻŽŅŻŽ ćēŲāŠŅŠśÕ"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 msgid "Close tab"
 msgstr "·ŠāŅŠąŠśÕ ųÕ×ŲēŚŠ"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 msgid "Close all tabs but the current one"
 msgstr "·ŠāŅŠąŠśÕ įŅŲå ųÕ×ŲēŠŚŠ ŽįŲÜ āÕŚćūÕÓ"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr "æąŽįŪÕņŲŅŠśÕ ĆĄø-ųŠ āÕŚćūÕÓ ųÕ×ŲēŚŠ įߎłŠčśŽų ŻŠąÕŌŃŲ"
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 msgid "Open the tab menu"
 msgstr "¾āŅŠąŠśÕ ÜÕŻŲųŠ ųÕ×ŲēŚŠ"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 msgid "Move the current tab to the left"
 msgstr "æŽÜÕąŠśÕ āÕŚćūÕÓ ųÕ×ŲēŚŠ ŻŠŪÕŅŽ"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 msgid "Move the current tab to the right"
 msgstr "æŽÜÕąŠśÕ āÕŚćūÕÓ ųÕ×ŲēŚŠ ŻŠŌÕįŻŽ"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr "ĮŪÕŌÕūŲ ųÕ×ŲēŠŚ"
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 msgid "Previous tab"
 msgstr "æąÕāåŽŌŻŲ ųÕ×ŲēŠŚ"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 msgid "Open the terminal resize dialog"
 msgstr "¾āŅŠąŠśÕ ŌŲųŠŪŽÓŠ ׊ ßąŽÜÕŻć ŅÕŪŲēŲŻÕ āÕąÜŲŻŠŪŠ"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr "ĮÜÕśŲŅŠśÕ ßąŲŚŠ×Š įāąŠŻŲęÕ ć× ćߎāąÕŃć CSS-Š"
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr "ĮÜÕśŲŅŠśÕ ßąŲŚŠ×ŲŅŠśŠ ŅÕ׊ ŚŠ įŪŲŚŠÜŠ"
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr "ĮÜÕśŲŅŠśÕ ßąŲŚŠ×ŲŅŠśŠ āŠŃÕŪŠ"
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr "ĮÜÕśŲŅŠśÕ ćߎāąÕŃÕ ŻÕįāŠŻŌŠąŌŻŲå ŃŽųŠ ć ŌŽŚćÜÕŻāŲÜŠ"
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr "ĮÜÕśŲŅŠśÕ ßąŲŚŠ×ŲŅŠśŠ įāąŠŻŲęŠ ŚŠŽ HTML ŲŪŲ ēŲįāŲ āÕŚįā"
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "~ĮÜÕŻŲ ēćŅŠśÕ"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr "ĮÜÕśŲŅŠśÕ ßąŲŚŠ×ŲŅŠśŠ ŃąŽųÕŅŠ ŅÕ׊"
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr "ĮÜÕśŲŅŠśÕ ŚŽÜßąŲÜŽŅŠśŠ ßąŠ×ŻŲå ąÕŌŽŅŠ ŚŽŌ ēŲįāŽÓ ßąŲŚŠ×ŲŅŠśŠ"
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 msgid "Toggle wrapping of text"
 msgstr "ĮÜÕśŲŅŠśÕ ßąÕŪŠÜŠśŠ āÕŚįāŠ"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 msgid "View the current image"
 msgstr "æąÕÓŪÕŌ āÕŚćūÕ įŪŲŚÕ"
 
@@ -1280,56 +1305,56 @@ msgstr "
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr "ĆŌŠłÕŻŲ ÜÕāŽŌ ŻŲųÕ ßŽŌąÖŠŻ"
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr "ÄŠįęŲŚŪŠ Ų×ŃŽąŠ čŠŃŪŽŻŠ"
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr "(ߎŌąŠ×ćÜÕŅŠŻŽ: %ld)"
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr "(ߎŌąŠ×ćÜÕŅŠŻŽ: ,,%s``)"
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr "(ßįÕćŌŽŻŲÜ ×Š %s)"
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr "(ߎŌąŠ×ćÜÕŅŠŻŽ: %s)"
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 msgid "Configuration options"
 msgstr "ø×ŃŽąŲ ߎŌÕčŠŅŠśŠ"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr "ĆߎāąÕŃŠ: elinks [ø·±¾Ą]... [ĆĄ»]..."
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 msgid "Options"
 msgstr "ø×ŃŽąŲ"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 msgid "Internal consistency error"
 msgstr "³ąÕ茊 ćŻćāąŠčśÕ ŌŽįŪÕŌŻŽįāŲ"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr "¾ÓąŠŻŲēŠŅŠśÕ ŻŠ ŠŻŽŻŲÜŻŲ ąÕÖŲÜ"
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1342,19 +1367,19 @@ msgstr ""
 "ŠŪŲ įāŠŅŚÕ ć āŠŃÕŪŲ ßąŲŌąćÖŲŅŠśŠ ŻÕūÕ ÜŽūŲ ŌŠ įÕ ŌŽŌŠųć\n"
 "ŲŪŲ ÜÕśŠųć."
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 msgid "Autosubmit first form"
 msgstr "°ćāŽÜŠāįŚŽ ßąÕŌŠŅŠśÕ ßąŅŽÓ ŽŃąŠįęŠ"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr "°ćāŽÜŠāįŚŲ ūÕ ßąÕŌŠŅŠāŲ ßąŅŲ ŽŃąŠ×Šę įŠ ׊ŌŠŻŲå ĆĄ»-ŽŅŠ."
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr "ŗŪŽŻŲąŠśÕ ŲŻāÕąŻÕ įÕįŲųÕ įŠ ׊ŌŠŻŲÜ ø±-ŽÜ"
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
@@ -1364,11 +1389,11 @@ msgstr ""
 "ßąŽ×ŽąŲÜŠ. ø± įÕ ŽŌŻŽįŲ ŻŠ ŲŻäŽąÜŠęŲųć ŚŽųŠ ūÕ įÕ ŚŽąŲįāŲāŲ\n"
 "ßąŲ įāŅŠąŠść ŻŽŅŽÓ ßąŲÜÕąŚŠ. ¾ŅŽ ŅÕąŽŅŠāŻŽ ŻÕ ÖÕŪŲāÕ ŌŠ ÜÕśŠāÕ."
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr "½Š×ŲŅ ŌŲąÕŚāŽąŲųćÜŠ ć ŚŽÜÕ ųÕ ŌŠāŽāÕŚŠ įŠ ߎŌÕčŠŅŠśŲÜŠ"
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1381,12 +1406,12 @@ msgstr ""
 "ߎįÜŠāąŠ ć ŽŌŻŽįć ŻŠ ŅŠč ŚŽąŲįŻŲēŚŲ ŌŲąÕŚāŽąŲųćÜ (Ų×\n"
 "ßąŽÜÕŻłŲŅÕ HOME)."
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 "øįßŲįŲŅŠśÕ ߎŌąŠ×ćÜÕŅŠŻÕ ŌŠāŽāÕŚÕ įŠ ߎŌÕčŠŅŠśŲÜŠ ŻŠ įāŠŻŌŠąŌŻŽÜ Ų×ŪŠ×ć"
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
@@ -1394,11 +1419,11 @@ msgstr ""
 "øįßŲįŲŅŠūÕ ŌŠāŽāÕŚć įŠ ߎŌÕčŠŅŠśŲÜŠ ć ŚŽųŽų įŅŲ Ų×ŃŽąŲ ŲÜŠųć\n"
 "ߎŌąŠ×ćÜÕŅŠŻÕ ŅąÕŌŻŽįāŲ ŻŠ įāŠŻŌŠąŌŻŽÜ Ų×ŪŠ×ć."
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr "½Š×ŲŅ ŌŠāŽāÕŚÕ įŠ ߎŌÕčŠŅŠśŲÜŠ"
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
@@ -1409,27 +1434,27 @@ msgstr ""
 "āąÕŃŠŪŽ ŌŠ įÕ ćŻŽįŲ ć ŽŌŻŽįć ŻŠ ŌŲąÕŚāŽąŲųćÜ įŠ\n"
 "ߎŌÕčŠŅŠśŲÜŠ."
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr "øįßŲįŲŅŠśÕ ߎ܎ūŲ ŽŚŽ Ų×ŃŽąŠ ߎŌÕčŠŅŠśŠ"
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr "øįßŲįŠūÕ ßŽÜŽū ׊ Ų×ŃŽąÕ ߎŌÕčŠŅŠśŠ Ų Ų׊ūŲ."
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr "æŽŌąŠ×ćÜÕŅŠŻŠ MIME ŅąįāŠ ׊ ŻÕߎׯŠāÕ ŅąįāÕ ŌŽŚćÜÕŻŠāŠ"
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr "æŽŌąŠ×ćÜÕŅŠŻŠ MIME ŅąįāŠ ŚŽųŠ įÕ ŚŽąŲįāŲ ׊ ŌŽŚćÜÕŻāÕ ŻÕߎׯŠāÕ ŅąįāÕ."
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr "·ŠŻÕÜŠąŲŅŠśÕ ŚŽąŲįŻŲēŚŲ ׊ŌŠŻŲå ßąÕēŲęŠ"
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
@@ -1440,47 +1465,47 @@ msgstr ""
 "ߎŌąŠ×ćÜÕŅŠŻŲå ßąÕēŲęŠ Ų ߎŻŽŅŽ ūÕ Ųå ߎįāŠŅŲāŲ ŻŠ\n"
 "ߎŌąŠ×ćÜÕŅŠŻÕ ŅąÕŌŻŽįāŲ ßąŲ ēćŅŠść."
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr "øįßŲįŲŅŠśÕ 䎹܊āŲąŠŻŲå ŅÕą×ŲųŠ ׊ŌŠŻŲå ĆĄ»-ŽŅŠ ŻŠ įāŠŻŌŠąŌŻŽÜ Ų×ŪŠ×ć"
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 "øįßŲįŠūÕ äŽąÜŠāŲąŠŻÕ āÕŚįāćŠŪŻÕ ŅÕą×ŲųÕ ×ŠŌŠŻŲå ĆĄ»-ŽŅŠ ŻŠ\n"
 "įāŠŻŌŠąŌŻŽÜ Ų×ŪŠ×ć."
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr "ŗŽŌŻŠ įāąŠŻŠ ׊ -dump"
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr "ŗŽŌŻŠ įāąŠŻŠ ׊ 䎹܊āŲąŠśÕ Ų×ŪŠ×Š ŲįāŽŅŠąŠ."
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 #, fuzzy
 msgid "Color mode used with -dump"
 msgstr "ŗŽŌŻŠ įāąŠŻŠ ׊ -dump"
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 #, fuzzy
 msgid "Color mode used with -dump."
 msgstr "ŗŽŌŻŠ įāąŠŻŠ ׊ -dump"
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr "ČŲąŲŻŠ ŌŽŚćÜÕŻāŠ 䎹܊āŲąŠŻŽÓ ßąÕŚŲŌŠēÕÜ -dump"
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr "ČŲąŲŻŠ Ų×ŪŠ×Š ŲįāŽŅŠąŠ."
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr "¾ŃąŠŌŠ ŌŲąÕŚāŲŅÕ ŌŠāŽāÕŚÕ įŠ ߎŌÕčŠŅŠśŲÜŠ"
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1492,11 +1517,11 @@ msgstr ""
 "\t-eval 'set protocol.file.allow_special_files = 1'"
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr "øŻāÕąßąÕāŲąŠśÕ ŌŽŚćÜÕŻŠāŠ ŻÕߎׯŠāÕ ŅąįāÕ ŚŠŽ HTML"
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
@@ -1508,19 +1533,19 @@ msgstr ""
 "ߎčāć). ¾ŅŽ ųÕ ÕŚŅŲŅŠŪÕŻāŻŽ ßąÕŚŲŌŠēć\n"
 "-default-mime-type text/html."
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr "øįßŲįŲŅŠśÕ ߎ܎ūŲ ŽŚŽ ćߎāąÕŃÕ Ų Ų×ŪŠ×"
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr "øįßŲįŠūÕ ßŽÜŽū ŽŚŽ ćߎāąÕŃÕ Ų Ų׊ūŲ."
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr "“Ž×ŅŽłŠŅŠųć įÕ įŠÜŽ ŪŽŚŠŪŻŠ ߎŅÕ×ŲŅŠśŠ"
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
@@ -1530,29 +1555,29 @@ msgstr ""
 "įÕąŅÕąŲÜŠ ŚŽųŲ ŲÜŠųć ŪŽŚŠŪŻÕ ŠŌąÕįÕ (Żßą. 127.0.0.1).\n"
 "æŽŅÕ×ŲŅŠśŠ įŠ ćŌŠłÕŻŲÜ įÕąŅÕąŲÜŠ ŻÕūÕ ŃŲāŲ ŌŽ×ŅŽłÕŻŠ."
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr "øįßŲįŲŅŠśÕ ŌÕāŠłŻÕ ߎ܎ūŲ ŽŚŽ ćߎāąÕŃÕ Ų Ų×ŪŠ×"
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr "øįßŲįŠūÕ ŌÕāŠłŻć ߎ܎ū ŽŚŽ ćߎāąÕŃÕ Ų Ų׊ūŲ."
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 msgid "Look up specified host"
 msgstr "ĀąŠÖÕśÕ ŠŌąÕįÕ ×ŠŌŠŻŽÓ ŌŽÜŠūŲŻŠ"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 "æŽāąŠÖŲūÕ ŠŌąÕįć ׊ŌŠŻŽÓ ŌŽÜŠūŲŻŠ Ų ŲįßŲįŠāŲ øæ ŠŌąÕįÕ ŚŽųÕ\n"
 "įć ąŠ×ąÕčÕŻÕ DNS-ŽÜ."
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr "æŽŚąÕāŠśÕ ׊įÕŃŻŽÓ ßąŲÜÕąŚŠ"
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1565,11 +1590,11 @@ msgstr ""
 "(ŽŃÕŪÕÖŲŅŠēŲ, ŲįāŽąŲųŠ, ŲāŌ.) ŻÕ ׊ßŲįćųÕ ŻŠ ŌŲįŚ.\n"
 "æŽÓŪÕŌŠųāÕ Ų -touch-files."
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr "“ÕŠŚāŲŅŲąŠśÕ ŚŽąŲčūÕśŠ ŌŠāŽāÕŚŠ ć ŌŲąÕŚāŽąŲųćÜć ~/.elinks"
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
@@ -1580,11 +1605,11 @@ msgstr ""
 "ŚŽąŲįāÕ ßŽŌąŠ×ćÜÕŅŠŻÕ ŅąÕŌŻŽįāŲ ߎŌÕčŠŅŠśŠ Ų ŌÕŠŚāŲŅŲąŠūÕ\n"
 "ēćŅŠśÕ ŌŠāŽāÕŚŠ įāŠśŠ Ų×ŅąčŠŅŠśŠ."
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr "“ÕŠŚāŲŅŲąŠśÕ ŌŽŌÕłŲŅŠśŠ ŃąŽųÕŅŠ ŅÕ׊܊ ć ŲįāŽŅŠąŻŽÜ Ų×ŪŠ×ć"
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
@@ -1592,11 +1617,11 @@ msgstr ""
 "ĮßąÕēŲūÕ ŲįßŲįŲŅŠśÕ ŃąŽųÕŅŠ ŅÕ׊ ć ŲįāŽŅŠąŻŽÜ Ų×ŪŠ×ć.\n"
 "æąŲÜÕāŲāÕ ŌŠ ŽŅŽ ćāŲēÕ įŠÜŽ ŻŠ ßąÕŚŲŌŠē -dump, Ų ŻŲŻŠčāŠ ŌąćÓŽ."
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr "“ÕŠŚāŲŅŲąŠśÕ ŲįßŲįŲŅŠśŠ ćßćūŲŅŠśŠ ŻŠ ŅÕ×Õ ć ŲįāŽŅŠąŻŽÜ Ų×ŪŠ×ć"
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
@@ -1606,11 +1631,11 @@ msgstr ""
 "ć ŲįāŽŅŠąŻŽÜ Ų×ŪŠ×ć. æąŲÜÕāŲāÕ ŌŠ ŽŅŽ ćāŲēÕ įŠÜŽ ŻŠ\n"
 "ßąÕŚŲŌŠē -dump, Ų ŻŲŻŠčāŠ ŅŲčÕ."
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr "ĆßąŠŅłŠśÕ ŅÕū ߎŚąÕŻćāŲÜ µ»ŲŻŚįŽÜ"
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 #, fuzzy
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
@@ -1644,11 +1669,11 @@ msgstr ""
 "\taddBookmark(URL)          : ŌŽŌŠųÕ ĆĄ» ć ŽŃÕŪÕÖŲŅŠēÕ\n"
 "\txfeDoCommand(openBrowser) : ŽāŅŠąŠ ŻŽŅŲ ßąŽ×Žą"
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr "æŽŅÕ×ŲŅŠśÕ įŠ įÕįŲųįŚŲÜ ßąįāÕŻŽÜ įŠ ׊ŌŠŻŲÜ ø±-ŽÜ"
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1681,21 +1706,21 @@ msgstr ""
 "ćßŲįćųÕ ŻŠ ŌŲįŚ ŚŠŌŠ įÕ ŚŽąŲįāŲ ŽŅŠų Ų×ŃŽą. æŽÓŪÕŌŠųāÕ Ų\n"
 "-touch-files."
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr "ČāŠÜߊśÕ Ų×ŅŽąŻŽÓ ŚŽŌŠ ׊ŌŠŻŲå ĆĄ»-ŽŅŠ ŻŠ įāŠŻŌŠąŌŻŽÜ Ų×ŪŠ×ć"
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr "¾ŌčāŠÜߊūÕ ×ŠŌŠŻÕ ĆĄ»-ŽŅÕ ć Ų×ŅŽąŻŽÜ ŽŃŪŲŚć ŻŠ įāŠŻŌŠąŌŻŽÜ Ų×ŪŠ×ć."
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 "¾įŅÕÖŠŅŠśÕ ŌŠāŽāÕŚŠ ć ŌŲą. ~/.elinks ŚŠŌŠ ųÕ ×ŠŌŠŻŽ -no-connect ŲŪŲ -session-"
 "ring"
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1707,11 +1732,11 @@ msgstr ""
 "-no-connect ŲŪŲ -session-ring. ¾ŅŠų Ų×ŃŽą ŻÕÜŠ ćāŲęŠųŠ ŠŚŽ\n"
 "įÕ ŻÕ ŚŽąŲįāŲ ׊ųÕŌŻŽ įŠ ŻÕŚŲÜ ŽŌ ŽŅŲå Ų×ŃŽąŠ."
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr "½ŲŅŽ ѹѳŲŅŽįāŲ"
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1725,15 +1750,15 @@ msgstr ""
 "\t1 ßąŲŚŠ×ŲŅŠūÕ Ž×ŃŲłŻÕ ÓąÕčŚÕ Ų ćߎ׎ąÕśŠ\n"
 "\t2 ßąŲŚŠ×ŲŅŠūÕ įŅÕ ÓąÕčŚÕ"
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr "øįßŲįŲŅŠśÕ ߎŌŠāŠŚŠ Ž ŅÕą×ŲųŲ Ų Ų×ŪŠ×"
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr "øįßŲįŠūÕ ßŽŌŠāŚÕ Ž ŅÕą×ŲųŲ µ»ŲŻŚįŠ Ų Ų׊ūŲ."
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1745,7 +1770,7 @@ msgstr ""
 "## ŚąŽ× ŗĮ, ŠŪŲ ūÕ ŽŻŌŠ įŠÜŽ ŅąÕŌŻŽįāŲ Ų×ŃŽąŠ Ų śŲåŽŅŽ 䎹܊āŲąŠśÕ\n"
 "## ŃŲāŲ Ų×ÜÕśÕŻŲ, Š ŅŠčŲ ŚŽÜÕŻāŠąŲ, ŲāŌ. ūÕ ŃŲāŲ įŠēćŅŠŻŲ.\n"
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1763,7 +1788,7 @@ msgstr ""
 "## ŌŠāŽāÕŚÕ, ŽŻŌŠ įÕ ŽŻ ½µ Ą°ĒĆ½° ć ŻÕŌŽįāŠųćūÕ. æąŲÜÕāŲāÕ ŌŠ ūÕ ŅŠčÕ\n"
 "## 䎹܊āŲąŠśÕ, ŚŽÜÕŻāŠąŲ, ŲāŌ. ŃŲāŲ įŠēćŅŠŻŲ.\n"
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1775,7 +1800,7 @@ msgstr ""
 "## µ»ŲŻŚį ŚŠŌŠ ŃćŌÕāÕ įŠēćŅŠŪŲ Ų×ŃŽąÕ ŚąŽ× ŗĮ, Š čāŽ įÕ āŲēÕ ŅŠčÕÓ\n"
 "## 䎹܊āŲąŠśŠ Ų ŚŽÜÕŻāŠąŠ, ŻÕÜŠāÕ įąÕūÕ, ׊āŽ ߊ×ŲāÕ.\n"
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
@@ -1785,11 +1810,11 @@ msgstr ""
 "## ŌŠāŽāÕŚŽÜ, ÜŽÖÕāÕ āŽ ŌŠ ßąŽÜÕŻŲāÕ ÜÕśŠśÕÜ Ų×ŃŽąŠ\n"
 "## config.saving_style. ·Šą ŻŲįÜŽ ßąŠŅŲ ŌąćÓŠąŲ?\n"
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr "°ćāŽÜŠāįŚŲ įŠēćŅŠŻŠ ߎŌÕčŠŅŠśŠ\n"
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr "°ćāŽÜŠāįŚŲ įŠēćŅŠŻÕ ßąÕēŲęÕ\n"
 
@@ -1918,7 +1943,7 @@ msgstr "
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 msgid "Sa~ve"
 msgstr "ĮŠēćŅŠ~ų"
 
@@ -2217,7 +2242,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "“Š ŪŲ ŌŠ įÕ ßŽŚćčŠ ßŽŅÕ×ŲŅŠśÕ įŠ ŌŽÜŠūŲŻŽÜ ßąÕŚŽ\n"
@@ -2235,7 +2260,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "“Š ŪŲ ŌŠ įÕ ßŽŚćčŠ ßŽŅÕ×ŲŅŠśÕ įŠ ŌŽÜŠūŲŻŽÜ ßąÕŚŽ\n"
@@ -2254,7 +2279,7 @@ msgstr "
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 "“Š ŪŲ ŌŠ įÕ ßŽŚćčŠ ßŽŅÕ×ŲŅŠśÕ įŠ ŌŽÜŠūŲŻŽÜ ßąÕŚŽ\n"
@@ -2682,11 +2707,12 @@ msgid "Use tabindex"
 msgstr "ĆߎāąÕŃŠ ,,tabindex``-Š"
 
 #: src/config/options.inc:326
+#, fuzzy
 msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 "“Š ŪŲ ūÕ ßąŠāŲāŲ ŅÕ×Õ ć× ßŽÜŽū ąÕŌŽįŪÕŌŠ ŚŽųŲ ųÕ ×ŠŌŠŻ ć\n"
 "ŠāąŲŃćāć ,,TABINDEX``. ĀŠų ŠāąŲŃćā ć ÕŪÕÜÕŻāŲÜŠ HTML-Š\n"
@@ -2741,8 +2767,9 @@ msgstr "
 
 #. 0
 #: src/config/options.inc:353
+#, fuzzy
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "ŗŠŌŠ įÕ ŻŠ ߎįŪÕŌśŽų ŅÕ×Ų ßąŲāŲįŻÕ įāąÕŪŲęŠ ŻŠŌŽŪÕ, įŚŽēŲūÕ\n"
@@ -2847,8 +2874,9 @@ msgid "Show search hit top or bottom dialogs"
 msgstr "æąŲŚŠ×ŲŅŠśÕ ŌŲųŠŪŽÓŠ ŚŠŌŠ įÕ ŌŽįāŲÓŻÕ Ņąå ŲŪŲ ŌŻŽ įāąŠŻŲęÕ"
 
 #: src/config/options.inc:403
+#, fuzzy
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 "“Š ŪŲ ūÕ ßąŲŚŠ×ŲŅŠāŲ ŌŲųŠŪŽÓ ŚŠŌŠ ßąÕāąŠÓŠ ŌŽįāŲÓŻÕ Ņąå ŲŪŲ\n"
@@ -2976,12 +3004,13 @@ msgid "Cache information about redirects"
 msgstr "ĮÜÕčāŠų ߎŌŠāŚÕ Ž ßąÕćįÜÕąŠŅŠśŲÜŠ"
 
 #: src/config/options.inc:462
+#, fuzzy
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2991,7 +3020,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -3206,7 +3235,8 @@ msgid "Ensure contrast"
 msgstr "¾įŲÓ湊ŅŠśÕ ŚŽŻāąŠįāŠ"
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+#, fuzzy
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "ĮāŠąŠūÕ įÕ ŌŠ ŃŽųÕ āÕŚįāŠ Ų ߎ׊ŌŲŻÕ ŻŲŚŠŌ ŻÕ ŃćŌć ųÕŌŻŠŚÕ."
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3306,8 +3336,9 @@ msgstr "
 msgid "Dump output options."
 msgstr "ø×ŃŽąŲ ŲįāŽŅŠąŻŽÓ Ų×ŪŠ×Š."
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "ŗŽŌŻŠ įāąŠŻŠ"
 
@@ -3455,7 +3486,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "æąŲŚŠ×ŲŅŠūÕ įāÕßÕŻÕ (Żßą. ^ŻÕčāŽ)."
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+#, fuzzy
+msgid "Rendering of HTML link element"
 msgstr "æąŲŚŠ×ŲŅŠśÕ ÕŪÕÜÕŻāŠ ,,link``"
 
 #: src/config/options.inc:723
@@ -3573,9 +3605,10 @@ msgid "Save interval"
 msgstr "øŻāÕąŅŠŪ ēćŅŠśŠ"
 
 #: src/config/options.inc:786
+#, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 "øŻāÕąŅŠŪ ßąŲ ŚŽÜÕ ūÕ ēćŅŠāŲ ŲŻäŽąÜŠāŲŅŻÕ ŌŠāŽāÕŚÕ ć\n"
 "ŌŲąÕŚāŽąŲųćÜć ~/.elinks ŻŠ ŌŲįŚ 挎ŪŲŚŽ įÕ ŽŻÕ Ų×ÜÕŻÕ (ć\n"
@@ -4198,9 +4231,10 @@ msgid "Underline menu hotkeys"
 msgstr "æŽŌŅŪŠēÕśÕ ßąÕēŲęŠ ÜÕŻŲųŠ"
 
 #: src/config/options.inc:1184
+#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "“Š ŪŲ ūÕ ßŽŌŅŪŠēŲāŲ ßąÕēŲęÕ ć ÜÕŻŲųŲÜŠ ŚŠŚŽ ŃŲ ŃŲŪÕ\n"
 "ŅŲŌłŲŅŲųÕ. ·ŠåāÕŅŠ ŠŚāŲŅŲąŠśÕ ߎŌŅŪŠēÕśŠ ŻŠ āÕąÜŲŻŠŪć."
@@ -4210,9 +4244,10 @@ msgid "Underline button shortcuts"
 msgstr "æŽŌŅŪŠēÕśÕ ßąÕēŲęŠ ŌćÓÜŠŌŲ"
 
 #: src/config/options.inc:1189
+#, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "“Š ŪŲ ūÕ ßŽŌŅŪŠēŲāŲ ßąÕēŲęÕ ŌćÓÜŠŌŲ ŚŠŚŽ ŃŲ ŃŲŪÕ ŅŲŌłŲŅŲųÕ.\n"
 "·ŠåāÕŅŠ ŠŚāŲŅŲąŠśÕ ߎŌŅŪŠēÕśŠ ŻŠ āÕąÜŲŻŠŪć."
@@ -4310,8 +4345,9 @@ msgid "Wrap-around tabs cycling"
 msgstr "ŗąćÖŻŽ ŚąÕāŠśÕ ŚąŽ× ųÕ×ŲēŚÕ"
 
 #: src/config/options.inc:1241
+#, fuzzy
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 "ŗŠŌŠ įÕ ŻŠ ߎįŪÕŌśÕÜ ųÕ×ŲēŚć ßąŲāŲįŻÕ įāąÕŪŲęŠ ŻŠŌÕįŻŽ,\n"
@@ -4325,7 +4361,8 @@ msgstr "
 msgid "When closing a tab show confirmation dialog."
 msgstr "æŲāŠūÕ ×Š ߎāŅąŌć ßąÕ ×ŠāŅŠąŠśŠ ųÕ×ŲēŚŠ."
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr "ØÕ×ŲŚ"
 
@@ -4488,60 +4525,68 @@ msgstr ""
 msgid "Read error"
 msgstr "³ąÕ茊 ßąŲ ēŲāŠść"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr "»ŽÓŲēŚŠ"
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr "[0|1]"
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr "ĘÕŽ ŃąŽų"
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr "<Ńą>"
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr "“ćÓŠēŠŚ ęÕŽ ŃąŽų"
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr "½ŲįŚŠ"
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr "<ŻŲįŚŠ>"
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 msgid "<codepage>"
 msgstr "<ŚŽŌŻŠįāąŠŻŠ>"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 msgid "<language>"
 msgstr "<ųÕ×ŲŚ>"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "±ŽųŠ"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr "<ŃŽųŠ|#ęę××ßß>"
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr "æŽįÕŃŻŽ"
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr "æįÕćŌŽŻŲÜ"
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr "ÄŠįęŲŚŪŠ"
 
@@ -4627,7 +4672,8 @@ msgid "Saving"
 msgstr "ĒćŅŠśÕ"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+#, fuzzy
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr "“Š ŪŲ ŃŲ ŚŽŪŠēŲūÕ āąÕŃŠŪŽ ćēŲāŠŅŠāŲ įŠ Ų ēćŅŠāŲ ŻŠ ŌŲįŚ."
 
 #: src/cookies/cookies.c:121
@@ -4701,7 +4747,7 @@ msgid "~Reject"
 msgstr "~¾ŌŃŠęŲ"
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "ĮÕąŅÕą"
 
@@ -4820,40 +4866,40 @@ msgstr "
 msgid "Link title (from history)"
 msgstr "½ŠįŪŽŅ ŅÕ×Õ (Ų× ŲįāŽąŲųÕ)"
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "ßąÕāߎįāŠŅłÕŻŽ"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "׊ŻÕÜŠąćųÕÜ ßŽįāŠŅŚć įÕąŅÕąŠ"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "“ŠāćÜ"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "²ąÕÜÕ ßŽįŪÕŌśÕ ߎįÕāÕ"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "½ÕߎׯŠāŽ"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "æŽŌŠęŲ Ž ׊ÓŪŠŅłć"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 msgid "Internal header info"
 msgstr "øŻāÕąŻŲ ߎŌŠęŲ Ž ׊ÓŪŠŅłć"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr "½ÕÜŠ ߎŌŠāŠŚŠ Ž ׊ÓŪŠŅłć."
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "æąÕć×ŲÜŠśÕ"
 
@@ -4929,7 +4975,7 @@ msgid "Download manager"
 msgstr "ĆßąŠŅłŠē ßąÕć×ŲÜŠśŠ"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -5140,7 +5186,8 @@ msgstr "
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "ĮÜÕŻŲ ~HTML/ēŲįā ßąŲŚŠ×"
 
 #. accelerator_context(tab_menu)
@@ -6335,23 +6382,24 @@ msgid "Program"
 msgstr "æąŽÓąŠÜ"
 
 #: src/mime/backend/default.c:74
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "ĮߎłŠčśŲ ßąÕÓŪÕŌŠē ׊ ŽŅć Ņąįāć ŌŠāŽāÕŚŠ. ,,%`` ć ŽŅŽų ŻŲįęŲ\n"
 "ūÕ ŃŲāŲ ׊ÜÕśÕŻŽ ŻŠ×ŲŅŽÜ ŌŠāŽāÕŚÕ."
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 msgid "File extension associations"
 msgstr "æąŲŌąćÖÕśŠ ŻŠįāŠŅŠŚŠ ŌŠāŽāÕŚŠ"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr "æąŲŌąćÖÕśŠ ŻŠįāŠŅŠŚ <-> ŅąįāŠ MIME-Š."
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
@@ -6360,12 +6408,12 @@ msgstr ""
 "ŚŽąŲįāŲ ćÜÕįāŽ ,,.``)."
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr "ĮŲįāÕÜ Ų×ŃŽąŠ"
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr "Mailcap"
 
@@ -6435,9 +6483,10 @@ msgid "Mimetypes files"
 msgstr "“ŠāŽāÕŚÕ ,,mimetypes``"
 
 #: src/mime/backend/mimetypes.c:48
+#, fuzzy
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 "ø×ŃŽąŲ ߎŌąčŚÕ ׊ ŌŠāŽāÕŚÕ mime.types. ¾ŅÕ ŌŠāŽāÕŚÕ įÕ ÜŽÓć\n"
@@ -6463,19 +6512,19 @@ msgstr "
 msgid "Delete extension %s -> %s?"
 msgstr "“Š ŽŃąŲčÕÜ Ņąįāć %s -> %s?"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "²ąįāŠ"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "²ąįāŠ(Õ)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "²ąįāŠ įŠŌąÖŠųŠ"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "½ÕÜŠ ŌŽŌŠāŠŚŠ"
 
@@ -6631,7 +6680,7 @@ msgstr "
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "øŻāÕąŻŠ ÓąÕ茊"
@@ -6775,7 +6824,8 @@ msgstr ""
 "protocol.nntp.server, ŲŪŲ ßąŽÜÕŻłŲŅć ŽŚąćÖÕśŠ NNTPSERVER."
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+#, fuzzy
+msgid "Server hung up for some reason"
 msgstr "·ŠŚŽēÕśÕ įÕąŅÕąŠ, Ų× ŻÕߎׯŠāŽÓ ąŠ×ŪŽÓŠ"
 
 #: src/network/state.c:102
@@ -7318,7 +7368,7 @@ msgstr "
 msgid "Comment"
 msgstr "ŗŽÜÕŻāŠąŲ"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, c-format
 msgid ""
 "Download complete:\n"
@@ -7503,7 +7553,7 @@ msgstr "
 msgid "Information about the torrent"
 msgstr "æąŲŚŠ×ŲŅŠśÕ ߎŌŠāŠŚŠ Ž āÕŚćūŽų įāąŠŻŲęŲ"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "ČāŠ ŌŠ ąŠŌŲÜ?"
 
@@ -7514,12 +7564,12 @@ msgid "Down~load"
 msgstr "æąÕć×ŲÜŠśÕ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 msgid "~Display"
 msgstr "æąŲŚŠ~ÖŲ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr "æąŲŚŠÖŲ ~׊ÓŪŠŅłÕ"
 
@@ -7550,19 +7600,19 @@ msgstr "
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 msgid "Local files"
 msgstr "»ŽŚŠŪŻÕ ŌŠāŽāÕŚÕ"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr "ø×ŃŽąŲ ć ŅÕ×Ų įŠ ŪŽŚŠŪŻŲÜ ßąÕÓŪÕŌŠśÕÜ."
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr "“Ž×ŅŽłŠŅŠśÕ ēŲāŠśŠ ߎįÕŃŻŲå ŌŠāŽāÕŚŠ"
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7572,24 +7622,25 @@ msgstr ""
 "ŃŲāŲ ŽßŠįŻŽ: ēŲāŠśÕ Ų× /dev/urandom ŲŪŲ Ų× /dev/zero ŅŠÜ\n"
 "ÜŽÖÕ ×ŠÓŽąēŠāŲ ÖŲŅŽā!"
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr "æąŲŚŠ×ŲŅŠśÕ įŠŚąŲŅÕŻŲå ŌŠāŽāÕŚŠ ć ŪŲįāŲŻ×ŲÜŠ ŌŲąÕŚāŽąŲųćÜŠ"
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
+#, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 "ŗŠŌŠ ųÕ ŽŅŽ ߎįāŠŅłÕŻŽ ŻŠ ,,ŻÕāŠēŻŽ``, ŌŠāŽāÕŚÕ ēŲųŲ ŻŠ×ŲŅ\n"
 "ߎēŲśÕ āŠēŚŽÜ ūÕ ŃŲāŲ įŠŚąŲŅÕŻÕ ć ŪŲįāŲŻ×ŲÜŠ ŪŽŚŠŪŻŲå\n"
 "ŌŲąÕŚāŽąŲųćÜŠ."
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 msgid "Try encoding extensions"
 msgstr "æąŽŃŠśÕ ŚŽŌŲąŠŻŲå ŻŠįāŠŅŠŚŠ"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7601,7 +7652,7 @@ msgstr ""
 "׊ŅŲįŲ ŽŌ ߎŌąÖŠŻŲå ŚŽŌŲąŠśŠ."
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 msgid "File"
 msgstr "“ŠāŽāÕŚŠ"
 
@@ -7919,11 +7970,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 "¼ÕśŠśÕ ø±-Š ŚŽąŲįŻŲēŚŽÓ ŠÓÕŻāŠ. ĀŽ ųÕ ŲŌÕŻāŲäŲŚŠęŲŽŻŠ ŻŲįŚŠ\n"
 "ŚŽųŠ įÕ čŠłÕ HTTP įÕąŅÕąć ŚŠŌŠ įÕ āąŠÖŲ ŌŽŚćÜÕŻā. ŗłćēŻŠ ąÕē\n"
@@ -8146,10 +8197,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -8311,12 +8362,12 @@ msgstr "
 msgid "Spidermonkey ECMAScript"
 msgstr "ECMAScript"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "³ąÕ茊 ßąŲ ßąÕć×ŲÜŠść"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8325,7 +8376,7 @@ msgstr ""
 "½Õ ÜŽÓć ŌŠ įāŅŽąŲÜ ŌŠāŽāÕŚć ,,%s``:\n"
 "%s"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -8336,16 +8387,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ",,%s`` ųÕ ŌŲąÕŚāŽąŲųćÜ."
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 msgid "File exists"
 msgstr "“ŠāŽāÕŚŠ ŅÕū ߎįāŽųŲ"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8361,55 +8412,51 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr "ĮŠēćŅŠų ߎŌ Š~ŪāÕąŻŠāŲŅŻŲÜ ŻŠ×ŲŅŽÜ"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr "æąÕßŲ~čŲ ßąÕŚŽ ßąŅŽŃŲāŻÕ ŌŠāŽāÕŚÕ"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr "½ŠįāŠŅŲ ßąÕć×Ų~ÜŠśÕ ŽąŲÓŲŻŠŪŻÕ ŌŠāŽāÕŚÕ"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "½ÕߎׯŠāŠ ŅąįāŠ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, fuzzy, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "“Š ŪŲ ŃŲįāÕ ÖÕŪÕŪŲ ŌŠ ßąŲŚŠÖÕÜ ŌŠāŽāÕŚć ,,%s`` (ŅąįāÕ %s)?"
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, fuzzy, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr "“Š ŪŲ ŃŲįāÕ ÖÕŪÕŪŲ ŌŠ ßąŲŚŠÖÕÜ ŌŠāŽāÕŚć ,,%s`` (ŅąįāÕ %s)?"
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "±ŪŽŚŲąŠśÕ āÕąÜŲŻŠŪŠ"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 msgid "~Open"
 msgstr "~¾āŅŽąŲ"
 
@@ -8423,14 +8470,15 @@ msgid "Warning"
 msgstr "Ćߎ׎ąÕśÕ"
 
 #: src/session/session.c:751
+#, fuzzy
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 "æąŽÜÕŻłŲŅŠ protocol.http.user_agent ųÕ ßŽįāŠŅłÕŻŠ ŻŠ ßąŠ×Żć ŻŲįŚć. ¾ŅŽ ųÕ "
 "ąŠŻŲųÕ ŃŲŪŠ ߎŌąŠ×ćÜÕŅŠŻŠ ŅąÕŌŻŽįā, ŚŽųŠ įÕ ×ŠÜÕśŲŅŠŪŠ µ»ŲŻŚįŽŅŽÜ ŻŲįŚŽÜ "
@@ -8442,16 +8490,17 @@ msgstr ""
 "ø×ŅŲśŠŅŠÜŽ įÕ ×ŃŽÓ ÕŅÕŻāćŠŪŻŲå ŻÕßąŲųŠāŻŽįāŲ ŚŽųÕ įć ŽŅŲÜ ßąŽć׹ŽŚŽŅŠŻÕ."
 
 #: src/session/session.c:770
+#, fuzzy
 msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 "æąŽÜÕŻłŲŅŠ config.saving_style ŅŠÜ ųÕ ßŽŌÕčÕŻŠ ŻŠ ŌÕ äŠŚāŽ ׊įāŠąÕŪć "
 "ŅąÕŌŻŽįā. µ»ŲŻŚįŽŅŲ ŠŪÓŽąŲāÜŲ ēćŅŠśŠ ߎŌÕčŠŅŠśŠ įć ßąŽÜÕśÕŻŲ ŽŌ ߎįŪÕŌśÕÓ "
@@ -8541,7 +8590,7 @@ msgstr "
 msgid "Could not read event: %d (%s)"
 msgstr "½ŲįŠÜ ÜŽÓŠŽ ŌŠ ßąŽēŲāŠÜ ŌŽÓŠņŠų: %d (%s)"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr "æąŽēŲāŠŻŽ ųÕ ßąÕŅŲčÕ ŃŠųāŽŅŠ Ų× itrm-Š!"
@@ -8903,19 +8952,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "øŌŲ ŻŠ ŅÕ×ć"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "ĆŻÕįŲāÕ ŃąŽų ŅÕ×Õ"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "³ąÕ茊 ßąŲ ēćŅŠść"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "³ąÕ茊 ßąŲ ćßŲįć ć ŌŠāŽāÕŚć"
 
diff --git a/po/sv.po b/po/sv.po
index 8d64425d..73627300 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Martin Norback <d95mback@dtek.chalmers.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -22,7 +22,7 @@ msgstr "St
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Info"
 
@@ -35,7 +35,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -158,7 +158,7 @@ msgstr "S
 msgid "Name"
 msgstr "Namn"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Felaktigt nummer"
 
@@ -182,10 +182,10 @@ msgstr "Tom str
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -251,7 +251,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -560,15 +560,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Innehållstyp är"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Senast ändrad"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -576,7 +576,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ej komplett"
 
@@ -761,7 +761,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Fylld markör"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -989,282 +989,307 @@ msgstr "Fylld mark
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Fylld markör"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Fylld markör"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Fylld markör"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Fylld markör"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Fylld markör"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Gå till länk"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Fylld markör"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Bakgrund"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Kommandot~olk"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Väntar på bekräftelse av omdirigering"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "V~isa bild"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Hämta bild"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Väntar på bekräftelse av omdirigering"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "V~isa bild"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Hämta bild"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "~Spara alternativ"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "Spara ~URL som"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Sök efter text"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Sök efter text"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Terminalalternativ"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "~Skicka formulär"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Skicka formulär och hämta"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Stäng"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Hämta bild"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "Öppna i nytt fönster"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Ingen tidigare sökning"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Terminalalternativ"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "Växla ~HTML/text"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "Växla ~HTML/text"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "V~isa bild"
@@ -1340,59 +1365,59 @@ msgstr "Inga ramar"
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "uppkopplingar"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "~Spara alternativ"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Internt fel"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1400,31 +1425,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "~Skicka formulär"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1432,91 +1457,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1525,58 +1550,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Inget program angett för"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1584,43 +1609,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1639,11 +1664,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1661,19 +1686,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1681,11 +1706,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1694,15 +1719,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1710,7 +1735,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1721,7 +1746,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1729,18 +1754,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1864,7 +1889,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Spara"
@@ -2131,7 +2156,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2140,7 +2165,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2152,7 +2177,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2520,7 +2545,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2565,7 +2590,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2657,7 +2682,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2761,9 +2786,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2773,7 +2798,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2948,7 +2973,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3030,8 +3055,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "teckenuppsättning"
 
@@ -3183,7 +3209,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3286,7 +3312,7 @@ msgstr "Sparfel"
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3876,7 +3902,7 @@ msgstr "Valf
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3887,7 +3913,7 @@ msgstr "Valf
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3967,7 +3993,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3979,7 +4005,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4123,62 +4150,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Sparfel"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "teckenuppsättning"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Språk"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Färg"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4249,7 +4284,7 @@ msgid "Saving"
 msgstr "medel"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4325,7 +4360,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Server"
 
@@ -4452,41 +4487,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "antagen"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "Ignorerar serverinställning"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "Huvudinfo"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Huvudinfo"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Hämta"
 
@@ -4570,7 +4605,7 @@ msgid "Download manager"
 msgstr "Hämta bild"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4784,7 +4819,8 @@ msgstr "dokument"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "Växla ~HTML/text"
 
 #. accelerator_context(tab_menu)
@@ -5986,31 +6022,32 @@ msgstr "Inget program"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Filänd~elser"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6069,7 +6106,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6090,19 +6127,19 @@ msgstr "Ta bort 
 msgid "Delete extension %s -> %s?"
 msgstr "Ta bort ändelse"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Ändelse"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Ändelse(r)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Innehållstyp"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Inga ändelser"
 
@@ -6249,7 +6286,7 @@ msgstr "Socketfel"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Internt fel"
@@ -6382,7 +6419,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6923,7 +6960,7 @@ msgstr "~Arkiv"
 msgid "Comment"
 msgstr "dokument"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7106,7 +7143,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Hämta bild"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Vad skall jag göra?"
 
@@ -7117,13 +7154,13 @@ msgid "Down~load"
 msgstr "Hämta"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Visa"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7154,42 +7191,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "filer"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Inga ändelser"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7197,7 +7234,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Arkiv"
@@ -7466,11 +7503,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7638,10 +7675,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7784,19 +7821,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Hämtningsfel"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Kunde inte skriva till fil"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7804,17 +7841,17 @@ msgid ""
 "%s"
 msgstr "Fel vid hämtning av"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Filänd~elser"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7825,55 +7862,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Okänd typ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS-terminal"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Öppna"
@@ -7889,13 +7922,13 @@ msgstr "Varning"
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7903,12 +7936,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7980,7 +8013,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Kunde inte skriva till fil"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8357,19 +8390,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Gå till länk"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Skriv in länknummer"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Sparfel"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
diff --git a/po/tr.po b/po/tr.po
index 518cdb48..60ce5372 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Baris Metin <baris@gelecek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr "Kapat"
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "Bilgi"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -157,7 +157,7 @@ msgstr "Aranan s
 msgid "Name"
 msgstr "Żsim"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "Hatalż sayż"
 
@@ -181,10 +181,10 @@ msgstr "Bo
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -250,7 +250,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -559,15 +559,15 @@ msgstr ""
 msgid "Content type"
 msgstr "Content-Type"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "Son güncelleme"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr ""
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "tamamlanmamżž"
 
@@ -760,7 +760,7 @@ msgstr ""
 msgid "Move to the previous item"
 msgstr "Blok imleē"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -988,282 +988,307 @@ msgstr "Blok imle
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
+msgid "Move cursor to the start of the line"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
-msgid "Move to the end of the document"
+msgid "Move cursor up"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:60
 #, fuzzy
-msgid "Move to the start of the document"
+msgid "Move to the end of the document"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:61
 #, fuzzy
-msgid "Move one link down"
+msgid "Move to the start of the document"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:62
 #, fuzzy
-msgid "Move one link left"
+msgid "Move one link down"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
-msgid "Move to the previous link"
+msgid "Move one link left"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:65
 #, fuzzy
-msgid "Move one link right"
+msgid "Move one link left or to the previous link"
 msgstr "Blok imleē"
 
 #: src/config/actions-main.inc:66
 #, fuzzy
+msgid "Move to the next link"
+msgstr "Blok imleē"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
+msgid "Move to the previous link"
+msgstr "Blok imleē"
+
+#: src/config/actions-main.inc:68
+#, fuzzy
+msgid "Move one link right"
+msgstr "Blok imleē"
+
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "Blok imleē"
+
+#: src/config/actions-main.inc:70
+#, fuzzy
 msgid "Move one link up"
 msgstr "Bašlantżya git"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "Blok imleē"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr ""
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 #, fuzzy
 msgid "Open the current link in a new window"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "Arkaplan"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 #, fuzzy
 msgid "Open a new window"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "Sis~tem kabušu"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr ""
 
-#: src/config/actions-main.inc:77
-msgid "Open a quit confirmation dialog box"
-msgstr ""
-
-#: src/config/actions-main.inc:78
-#, fuzzy
-msgid "Quit without confirmation"
-msgstr "Yönlendirme onayż iēin bekleniyor"
-
-#: src/config/actions-main.inc:80
-msgid "Reload the current page"
-msgstr ""
-
-#: src/config/actions-main.inc:81
-#, fuzzy
-msgid "Re-render the current page"
-msgstr "~Resmi göster"
-
 #: src/config/actions-main.inc:82
-msgid "Reset form items to their initial values"
+msgid "Open a quit confirmation dialog box"
 msgstr ""
 
 #: src/config/actions-main.inc:83
 #, fuzzy
-msgid "Show information about the currently used resources"
-msgstr "Resmi in~dir"
-
-#: src/config/actions-main.inc:84
-msgid "Save the current document in source form"
-msgstr ""
+msgid "Quit without confirmation"
+msgstr "Yönlendirme onayż iēin bekleniyor"
 
 #: src/config/actions-main.inc:85
-msgid "Save the current document in formatted form"
+msgid "Reload the current page"
 msgstr ""
 
 #: src/config/actions-main.inc:86
 #, fuzzy
+msgid "Re-render the current page"
+msgstr "~Resmi göster"
+
+#: src/config/actions-main.inc:87
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:88
+#, fuzzy
+msgid "Show information about the currently used resources"
+msgstr "Resmi in~dir"
+
+#: src/config/actions-main.inc:89
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+#, fuzzy
 msgid "Save options"
 msgstr "Seēenekleri ka~ydet"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "~Adresi karklż kaydet"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr ""
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr ""
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr ""
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr ""
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 #, fuzzy
 msgid "Search for a text pattern"
 msgstr "Metini ara"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 #, fuzzy
 msgid "Search backwards for a text pattern"
 msgstr "Metini ara"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "Terminal seēenekleri"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "Forumu ~Gönder"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "Formu gönder ve i~ndir"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "Kapat"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "Resmi in~dir"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "~Yeni pencerede aē"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "Geri arama yok"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "Terminal seēenekleri"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "~html/plain aē/kapa"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "~html/plain aē/kapa"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "~Resmi göster"
@@ -1339,59 +1364,59 @@ msgstr "
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "Bašlantżlar"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "Seēenekleri ka~ydet"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "Żēsel hata"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1399,31 +1424,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "Forumu ~Gönder"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1431,91 +1456,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1524,58 +1549,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "Program belirlenmemiž:"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1583,43 +1608,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1638,11 +1663,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1660,19 +1685,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1680,11 +1705,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1693,15 +1718,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1709,7 +1734,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1720,7 +1745,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1728,18 +1753,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1863,7 +1888,7 @@ msgstr ""
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "Kaydet"
@@ -2130,7 +2155,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2139,7 +2164,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2151,7 +2176,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2519,7 +2544,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2564,7 +2589,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2656,7 +2681,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2760,9 +2785,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2772,7 +2797,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2947,7 +2972,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3029,8 +3054,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "Karakter seti"
 
@@ -3182,7 +3208,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3285,7 +3311,7 @@ msgstr "Kaydetme hatas
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3875,7 +3901,7 @@ msgstr "Alan
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3886,7 +3912,7 @@ msgstr "Alan
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -3966,7 +3992,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -3978,7 +4004,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4122,62 +4149,70 @@ msgstr ""
 msgid "Read error"
 msgstr "Kaydetme hatasż"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "Karakter seti"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "Di~l"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "Renk"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4248,7 +4283,7 @@ msgid "Saving"
 msgstr "ortalama"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4324,7 +4359,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "Sunucu"
 
@@ -4451,41 +4486,41 @@ msgstr ""
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "tahmin edilen"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "sunucu ayarlarż gözardż ediliyor"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "Tarih"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr ""
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr ""
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr ""
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "Żēsel hata"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "Żndir"
 
@@ -4570,7 +4605,7 @@ msgid "Download manager"
 msgstr "Resmi in~dir"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4782,7 +4817,8 @@ msgstr "belgeler"
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "~html/plain aē/kapa"
 
 #. accelerator_context(tab_menu)
@@ -5984,31 +6020,32 @@ msgstr "Program yok"
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "Dosya ~uzantżlarż"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6067,7 +6104,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6088,19 +6125,19 @@ msgstr "Uzant
 msgid "Delete extension %s -> %s?"
 msgstr "Uzantżyż sil"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "Uzantż"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "Uzantż(lar)"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "Content-Type"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "Uzantż yok"
 
@@ -6246,7 +6283,7 @@ msgstr "Soket sorunu"
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "Żēsel hata"
@@ -6379,7 +6416,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -6919,7 +6956,7 @@ msgstr "~Dosya"
 msgid "Comment"
 msgstr "belgeler"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7102,7 +7139,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "Resmi in~dir"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "Ne yapacaksżnżz?"
 
@@ -7113,13 +7150,13 @@ msgid "Down~load"
 msgstr "Żndir"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "Görüntüle"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7150,42 +7187,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "dosyalar"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Uzantż yok"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7193,7 +7230,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "~Dosya"
@@ -7462,11 +7499,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7634,10 +7671,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7780,19 +7817,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr ""
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "Żndirme hatasż"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "Dosya yaratżlamżyor"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7800,17 +7837,17 @@ msgid ""
 "%s"
 msgstr "Error downloading"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "Dosya ~uzantżlarż"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7821,55 +7858,51 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 msgid "~Resume download of the original file"
 msgstr ""
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "Bilinmeyen tür"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "~BeOS terminali"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "Aē"
@@ -7885,13 +7918,13 @@ msgstr "Uyar
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7899,12 +7932,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -7978,7 +8011,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "Dosya yaratżlamżyor"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8355,19 +8388,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "Bašlantżya git"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "Bašlantż numarasżnż gir"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "Kaydetme hatasż"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "Dosyaya yazarken hata"
 
diff --git a/po/uk.po b/po/uk.po
index 38b63bb9..94744e28 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-03 11:53+0200\n"
+"POT-Creation-Date: 2008-06-29 22:26+0300\n"
 "PO-Revision-Date: 2003-01-03 03:41+0100\n"
 "Last-Translator: Dmitry Pinchukov <dpinch@mail.ru>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr "
 #. | MSGBOX_SCROLLABLE
 #.
 #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
-#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43
+#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43
 msgid "Info"
 msgstr "¶ĪĘĻŅĶĮƦŃ"
 
@@ -34,7 +34,7 @@ msgstr ""
 #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365
 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399
 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86
 #: src/session/session.c:800 src/viewer/text/search.c:1677
@@ -173,7 +173,7 @@ msgstr "
 msgid "Name"
 msgstr "¶Ķ'Ń"
 
-#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:112
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79 src/scripting/python/menu.c:113
 msgid "Bad number"
 msgstr "īÅŠŅĮ×ÉĢŲĪÅ ŽÉÓĢĻ"
 
@@ -197,10 +197,10 @@ msgstr "
 #. accelerator_context(do_auth_dialog, do_edit_dialog, input_dialog, menu_add_ext, resize_terminal_dialog, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/session/download.c:do_type_query, src/session/download.c:lookup_unique_name, src/viewer/text/search.c:search_dlg_do, terminal_options)
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:366 src/cookies/dialogs.c:373
 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
+#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481
-#: src/session/download.c:645 src/session/download.c:1266
+#: src/session/download.c:607 src/session/download.c:1219
 #: src/viewer/text/search.c:1678
 #, fuzzy
 msgid "~Cancel"
@@ -266,7 +266,7 @@ msgid ""
 " |||||`- Unused\n"
 " ||||`-- Unused\n"
 " |||`--- A JavaScript pop-up window was blocked\n"
-" ||`---- A JavaScript error has occured\n"
+" ||`---- A JavaScript error has occurred\n"
 " |`----- The state of insert mode for text-input form-fields\n"
 " |       'i' means modeless, 'I' means insert mode is on\n"
 " `------ Whether an SSL connection was used\n"
@@ -585,15 +585,15 @@ msgstr ""
 msgid "Content type"
 msgstr "ōÉŠ ÄĻĖÕĶÅĪŌÕ"
 
-#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+#: src/cache/dialogs.c:94 src/dialogs/document.c:202
 msgid "Last modified"
 msgstr "÷ĻÓŌĮĪĪ¤ ĶĻÄÉʦĖĻ×ĮĪĻ"
 
-#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+#: src/cache/dialogs.c:102 src/dialogs/document.c:184
 msgid "SSL Cipher"
 msgstr "ėĻÄ SSL"
 
-#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+#: src/cache/dialogs.c:106 src/dialogs/document.c:189
 msgid "Encoding"
 msgstr "ėĻÄÕ×ĮĪĪŃ"
 
@@ -601,7 +601,7 @@ msgstr "
 msgid "Flags"
 msgstr ""
 
-#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+#: src/cache/dialogs.c:115 src/dialogs/document.c:160
 msgid "incomplete"
 msgstr "ĪÅ ŠĻ×Ī¦ÓŌĄ"
 
@@ -793,7 +793,7 @@ msgstr "
 msgid "Move to the previous item"
 msgstr "šÅŅÅŹŌÉ ÄĻ ŠĻŠÅŅÅÄĪŲĻĒĻ ĘŅÅŹĶÕ"
 
-#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84
 #: src/config/actions-menu.inc:21
 #, fuzzy
 msgid "Redraw the terminal"
@@ -1014,277 +1014,302 @@ msgstr "
 
 #: src/config/actions-main.inc:57
 #, fuzzy
-msgid "Move cursor right"
-msgstr "šÅŅÅĶ¦ÓŌÉŌÉ ĖÕŅÓĻŅ Ģ¦×ĻŅÕŽ"
+msgid "Move cursor to the start of the line"
+msgstr "šÅŅÅŹŌÉ ÄĻ ŠĻŽĮŌĖÕ ÓŌĻŅ¦ĪĖÉ ĮĀĻ ŅŃÄĖĮ"
 
 #: src/config/actions-main.inc:58
 #, fuzzy
-msgid "Move cursor up"
+msgid "Move cursor right"
 msgstr "šÅŅÅĶ¦ÓŌÉŌÉ ĖÕŅÓĻŅ Ģ¦×ĻŅÕŽ"
 
 #: src/config/actions-main.inc:59
 #, fuzzy
+msgid "Move cursor up"
+msgstr "šÅŅÅĶ¦ÓŌÉŌÉ ĖÕŅÓĻŅ Ģ¦×ĻŅÕŽ"
+
+#: src/config/actions-main.inc:60
+#, fuzzy
 msgid "Move to the end of the document"
 msgstr "šÅŅÅŹŌÉ ÄĻ Ė¦ĪĆŃ ÓŌĻŅ¦ĪĖÉ ĮĀĻ ŅŃÄĖĮ"
 
-#: src/config/actions-main.inc:60
+#: src/config/actions-main.inc:61
 #, fuzzy
 msgid "Move to the start of the document"
 msgstr "šÅŅÅŹŌÉ ÄĻ ŠĻŽĮŌĖÕ ÓŌĻŅ¦ĪĖÉ ĮĀĻ ŅŃÄĖĮ"
 
-#: src/config/actions-main.inc:61
+#: src/config/actions-main.inc:62
 #, fuzzy
 msgid "Move one link down"
 msgstr "šÅŅÅĶ¦ÓŌÉŌÉÓŲ ×ĒĻŅÕ ŚĮ ÓŌĻŅ¦ĪĖĻĄ"
 
-#: src/config/actions-main.inc:62
-#, fuzzy
-msgid "Move one link left"
-msgstr "šÅŅÅĶ¦ÓŌÉŌÉÓŲ ×ĒĻŅÕ ŚĮ ÓŌĻŅ¦ĪĖĻĄ"
-
 #: src/config/actions-main.inc:63
 #, fuzzy
-msgid "Move to the next link"
+msgid "Move to the next line with a link"
 msgstr "šÅŅÅŹŌÉ ÄĻ ĪĮÓŌÕŠĪĻĒĻ ĘŅÅŹĶÕ"
 
 #: src/config/actions-main.inc:64
 #, fuzzy
+msgid "Move one link left"
+msgstr "šÅŅÅĶ¦ÓŌÉŌÉÓŲ ×ĒĻŅÕ ŚĮ ÓŌĻŅ¦ĪĖĻĄ"
+
+#: src/config/actions-main.inc:65
+#, fuzzy
+msgid "Move one link left or to the previous link"
+msgstr "šÅŅÅŹŌÉ ÄĻ ŠĻŠÅŅÅÄĪŲĻĒĻ ĘŅÅŹĶÕ"
+
+#: src/config/actions-main.inc:66
+#, fuzzy
+msgid "Move to the next link"
+msgstr "šÅŅÅŹŌÉ ÄĻ ĪĮÓŌÕŠĪĻĒĻ ĘŅÅŹĶÕ"
+
+#: src/config/actions-main.inc:67
+#, fuzzy
 msgid "Move to the previous link"
 msgstr "šÅŅÅŹŌÉ ÄĻ ŠĻŠÅŅÅÄĪŲĻĒĻ ĘŅÅŹĶÕ"
 
-#: src/config/actions-main.inc:65
+#: src/config/actions-main.inc:68
 #, fuzzy
 msgid "Move one link right"
 msgstr "šÅŅÅĶ¦ÓŌÉŌÉ ĖÕŅÓĻŅ Ģ¦×ĻŅÕŽ"
 
-#: src/config/actions-main.inc:66
+#: src/config/actions-main.inc:69
+#, fuzzy
+msgid "Move one link right or to the next link"
+msgstr "šÅŅÅŹŌÉ ÄĻ ĪĮÓŌÕŠĪĻĒĻ ĘŅÅŹĶÕ"
+
+#: src/config/actions-main.inc:70
 #, fuzzy
 msgid "Move one link up"
 msgstr "šÅŅÅĶ¦ÓŌÉŌÉÓŲ ×ĒĻŅÕ ŚĮ ÓŌĻŅ¦ĪĖĻĄ"
 
-#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18
+#: src/config/actions-main.inc:71
+#, fuzzy
+msgid "Move to the previous line with a link"
+msgstr "šÅŅÅŹŌÉ ÄĻ ŠĻŠÅŅÅÄĪŲĻĒĻ ĘŅÅŹĶÕ"
+
+#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
 msgstr "šÅŅÅĶ¦ÓŌÉŌÉÓŲ ×ĪÉŚ ŚĮ ÓŌĻŅ¦ĪĖĻĄ"
 
-#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19
+#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19
 msgid "Move upwards by a page"
 msgstr "šÅŅÅĶ¦ÓŌÉŌÉÓŲ ×ĒĻŅÕ ŚĮ ÓŌĻŅ¦ĪĖĻĄ"
 
-#: src/config/actions-main.inc:69
+#: src/config/actions-main.inc:74
 #, fuzzy
 msgid "Open the current link in a new tab"
 msgstr "÷¦ÄĖŅÉŌÉ ŠĻÓÉĢĮĪĪŃ × ĪĻ×ĻĶÕ ×¦ĖĪ¦"
 
-#: src/config/actions-main.inc:70
+#: src/config/actions-main.inc:75
 #, fuzzy
 msgid "Open the current link in a new tab in the background"
 msgstr "÷¦ÄĖŅÉŌÉ ŠĻÓÉĢĮĪĪŃ × ĪĻ×ĻĶÕ ×¦ĖĪ¦"
 
-#: src/config/actions-main.inc:71
+#: src/config/actions-main.inc:76
 msgid "Open the current link in a new window"
 msgstr "÷¦ÄĖŅÉŌÉ ŠĻÓÉĢĮĪĪŃ × ĪĻ×ĻĶÕ ×¦ĖĪ¦"
 
-#: src/config/actions-main.inc:72
+#: src/config/actions-main.inc:77
 #, fuzzy
 msgid "Open a new tab"
 msgstr "÷¦ÄĖŅÉŌÉ ĪĻ׊צĖĪĻ"
 
-#: src/config/actions-main.inc:73
+#: src/config/actions-main.inc:78
 #, fuzzy
 msgid "Open a new tab in the background"
 msgstr "īĮ ŌĢ¦"
 
-#: src/config/actions-main.inc:74
+#: src/config/actions-main.inc:79
 msgid "Open a new window"
 msgstr "÷¦ÄĖŅÉŌÉ ĪĻ׊צĖĪĻ"
 
-#: src/config/actions-main.inc:75
+#: src/config/actions-main.inc:80
 #, fuzzy
 msgid "Open an OS shell"
 msgstr "ļĀĻĢĻĪĖĮ ĻŠÅŅĮƦŹĪĻ§ ÓÉÓŌÅĶÉ"
 
-#: src/config/actions-main.inc:76
+#: src/config/actions-main.inc:81
 msgid "Open options manager"
 msgstr "÷¦ÄĖŅÉŌÉ ĪĮĢĮŪŌÕ×ĮĪĪŃ ĻŠĆ¦Ź"
 
-#: src/config/actions-main.inc:77
+#: src/config/actions-main.inc:82
 msgid "Open a quit confirmation dialog box"
 msgstr "÷¦ÄĖŅÉŌÉ ŚĮŠÉŌ Š¦ÄŌ×ÅŅÄÖÅĪĪŃ ×ÉČĻÄÕ"
 
-#: src/config/actions-main.inc:78
+#: src/config/actions-main.inc:83
 msgid "Quit without confirmation"
 msgstr "÷ÉŹŌÉ ĀÅŚ Š¦ÄŌ×ÅŅÄÖÅĪĪŃ"
 
-#: src/config/actions-main.inc:80
+#: src/config/actions-main.inc:85
 msgid "Reload the current page"
 msgstr "šÅŅÅŚĮ×ĮĪŌĮÖÉŌÉ ŠĻŌĻŽĪÕ ÓŌĻŅ¦ĪĖÕ"
 
-#: src/config/actions-main.inc:81
+#: src/config/actions-main.inc:86
 #, fuzzy
 msgid "Re-render the current page"
 msgstr "šÅŅÅŚĮ×ĮĪŌĮÖÉŌÉ ŠĻŌĻŽĪÕ ÓŌĻŅ¦ĪĖÕ"
 
-#: src/config/actions-main.inc:82
+#: src/config/actions-main.inc:87
 msgid "Reset form items to their initial values"
 msgstr ""
 
-#: src/config/actions-main.inc:83
+#: src/config/actions-main.inc:88
 #, fuzzy
 msgid "Show information about the currently used resources"
 msgstr "šĻĖĮŚĮŌÉ ¦ĪĘĻŅĶĮƦĄ ŠŅĻ ŠĻŌĻŽĪÕ ÓŌĻŅ¦ĪĖÕ"
 
-#: src/config/actions-main.inc:84
+#: src/config/actions-main.inc:89
 msgid "Save the current document in source form"
 msgstr ""
 
-#: src/config/actions-main.inc:85
+#: src/config/actions-main.inc:90
 msgid "Save the current document in formatted form"
 msgstr ""
 
-#: src/config/actions-main.inc:86
+#: src/config/actions-main.inc:91
 #, fuzzy
 msgid "Save options"
 msgstr "śĀÅŅÅĒŌÉ ŠĮŅĮĶÅŌŅÉ"
 
-#: src/config/actions-main.inc:87
+#: src/config/actions-main.inc:92
 #, fuzzy
 msgid "Save URL as"
 msgstr "śĀÅŅÅĒŌÉ URL ŃĖ"
 
-#: src/config/actions-main.inc:88
+#: src/config/actions-main.inc:93
 msgid "Scroll down"
 msgstr "šŅĻĖŅÕŌÉŌÉ ×ĪÉŚ"
 
-#: src/config/actions-main.inc:89
+#: src/config/actions-main.inc:94
 msgid "Scroll left"
 msgstr "šŅĻĖŅÕŌÉŌÉ Ģ¦×ĻŅÕŽ"
 
-#: src/config/actions-main.inc:90
+#: src/config/actions-main.inc:95
 msgid "Scroll right"
 msgstr "šŅĻĖŅÕŌÉŌÉ ŠŅĮ×ĻŅÕŽ"
 
-#: src/config/actions-main.inc:91
+#: src/config/actions-main.inc:96
 msgid "Scroll up"
 msgstr "šŅĻĖŅÕŌÉŌÉ ×ĒĻŅÕ"
 
-#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23
 msgid "Search for a text pattern"
 msgstr "šĻŪÕĖ ŌÅĖÓŌÕ ŚĮ ŪĮĀĢĻĪĻĶ"
 
-#: src/config/actions-main.inc:93
+#: src/config/actions-main.inc:98
 msgid "Search backwards for a text pattern"
 msgstr "ś×ĻŅĻŌĪ¦Ź ŠĻŪÕĖ ŌÅĖÓŌÕ ŚĮ ŪĮĀĢĻĪĻĶ"
 
-#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+#: src/config/actions-main.inc:99 src/config/actions-main.inc:100
 msgid "Search link text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:96
+#: src/config/actions-main.inc:101
 msgid "Search document text by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:97
+#: src/config/actions-main.inc:102
 msgid "Search document text backwards by typing ahead"
 msgstr ""
 
-#: src/config/actions-main.inc:98
+#: src/config/actions-main.inc:103
 #, fuzzy
 msgid "Show terminal options dialog"
 msgstr "šĮŅĮĶÅŌŅÉ ŌÅŅĶiĪĮĢÕ"
 
-#: src/config/actions-main.inc:99
+#: src/config/actions-main.inc:104
 #, fuzzy
 msgid "Submit form"
 msgstr "÷¦Ä¦ÓĢĮŌÉ ĘĻŅĶÕ"
 
-#: src/config/actions-main.inc:100
+#: src/config/actions-main.inc:105
 #, fuzzy
 msgid "Submit form and reload"
 msgstr "÷¦Ä¦ÓĢĮŌÉ ĘĻŅĶÕ ŌĮ ŠÅŅÅŚĮ×ĮĪŌĮÖÉŌÉ"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:205
+#: src/config/actions-main.inc:106 src/terminal/tab.c:205
 #: src/terminal/tab.c:249
 #, fuzzy
 msgid "Close tab"
 msgstr "śĮĖŅÉŌÉ"
 
-#: src/config/actions-main.inc:102
+#: src/config/actions-main.inc:107
 #, fuzzy
 msgid "Close all tabs but the current one"
 msgstr "šĻĖĮŚĮŌÉ ¦ĪĘĻŅĶĮƦĄ ŠŅĻ ŠĻŌĻŽĪÕ ÓŌĻŅ¦ĪĖÕ"
 
-#: src/config/actions-main.inc:103
+#: src/config/actions-main.inc:108
 msgid "Pass URI of current tab to external command"
 msgstr ""
 
-#: src/config/actions-main.inc:104
+#: src/config/actions-main.inc:109
 #, fuzzy
 msgid "Open the tab menu"
 msgstr "÷¦ÄĖŅÉŌÉ ĶÅĪĄ File"
 
-#: src/config/actions-main.inc:105
+#: src/config/actions-main.inc:110
 #, fuzzy
 msgid "Move the current tab to the left"
 msgstr "÷¦ÄĖŅÉŌÉ ŠĻÓÉĢĮĪĪŃ × ĪĻ×ĻĶÕ ×¦ĖĪ¦"
 
-#: src/config/actions-main.inc:106
+#: src/config/actions-main.inc:111
 #, fuzzy
 msgid "Move the current tab to the right"
 msgstr "÷¦ÄĖŅÉŌÉ ŠĻÓÉĢĮĪĪŃ × ĪĻ×ĻĶÕ ×¦ĖĪ¦"
 
-#: src/config/actions-main.inc:107
+#: src/config/actions-main.inc:112
 msgid "Next tab"
 msgstr ""
 
-#: src/config/actions-main.inc:108
+#: src/config/actions-main.inc:113
 #, fuzzy
 msgid "Previous tab"
 msgstr "šĻŪÕĖÕ ŻÅ ĪÅ ĀÕĢĻ"
 
-#: src/config/actions-main.inc:109
+#: src/config/actions-main.inc:114
 #, fuzzy
 msgid "Open the terminal resize dialog"
 msgstr "šĮŅĮĶÅŌŅÉ ŌÅŅĶiĪĮĢÕ"
 
-#: src/config/actions-main.inc:110
+#: src/config/actions-main.inc:115
 msgid "Toggle rendering of page using CSS"
 msgstr ""
 
-#: src/config/actions-main.inc:111
+#: src/config/actions-main.inc:116
 msgid "Toggle displaying of links to images"
 msgstr ""
 
-#: src/config/actions-main.inc:112
+#: src/config/actions-main.inc:117
 msgid "Toggle rendering of tables"
 msgstr ""
 
-#: src/config/actions-main.inc:113
+#: src/config/actions-main.inc:118
 msgid "Toggle usage of document specific colors"
 msgstr ""
 
-#: src/config/actions-main.inc:114
+#: src/config/actions-main.inc:119
 msgid "Toggle rendering page as HTML / plain text"
 msgstr ""
 
-#: src/config/actions-main.inc:115
+#: src/config/actions-main.inc:120
 #, fuzzy
 msgid "Toggle mouse handling"
 msgstr "šÅŅÅĶÉĖĪÕŌÉ ×¦ÄĻĀŅĮÖÅĪĪŃ"
 
-#: src/config/actions-main.inc:116
+#: src/config/actions-main.inc:121
 msgid "Toggle displaying of links numbers"
 msgstr ""
 
-#: src/config/actions-main.inc:117
+#: src/config/actions-main.inc:122
 msgid "Toggle plain renderer compression of empty lines"
 msgstr ""
 
-#: src/config/actions-main.inc:118
+#: src/config/actions-main.inc:123
 #, fuzzy
 msgid "Toggle wrapping of text"
 msgstr "šÅŅÅĶÉĖĪÕŌÉ ×¦ÄĻĀŅĮÖÅĪĪŃ"
 
-#: src/config/actions-main.inc:119
+#: src/config/actions-main.inc:124
 #, fuzzy
 msgid "View the current image"
 msgstr "šĻÄÉ×ÉŌÉÓŲ ŚĻĀŅĮÖÅĪĪŃ"
@@ -1360,59 +1385,59 @@ msgstr "
 msgid "Garbage after quoted argument"
 msgstr ""
 
-#: src/config/cmdline.c:391
+#: src/config/cmdline.c:394
 msgid "Remote method not supported"
 msgstr ""
 
-#: src/config/cmdline.c:443
+#: src/config/cmdline.c:452
 msgid "Template option folder"
 msgstr ""
 
-#: src/config/cmdline.c:466
+#: src/config/cmdline.c:475
 #, c-format
 msgid "(default: %ld)"
 msgstr ""
 
-#: src/config/cmdline.c:473 src/config/cmdline.c:502
+#: src/config/cmdline.c:482 src/config/cmdline.c:511
 #, c-format
 msgid "(default: \"%s\")"
 msgstr ""
 
-#: src/config/cmdline.c:478
+#: src/config/cmdline.c:487
 #, c-format
 msgid "(alias for %s)"
 msgstr ""
 
-#: src/config/cmdline.c:483 src/config/cmdline.c:492
+#: src/config/cmdline.c:492 src/config/cmdline.c:501
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: src/config/cmdline.c:626
+#: src/config/cmdline.c:642
 #, fuzzy
 msgid "Configuration options"
 msgstr "ś'¤ÄĪĮĪĪŃ"
 
-#: src/config/cmdline.c:630
+#: src/config/cmdline.c:646
 msgid "Usage: elinks [OPTION]... [URL]..."
 msgstr ""
 
-#: src/config/cmdline.c:631
+#: src/config/cmdline.c:647
 #, fuzzy
 msgid "Options"
 msgstr "śĀÅŅÅĒŌÉ ŠĮŅĮĶÅŌŅÉ"
 
-#: src/config/cmdline.c:673
+#: src/config/cmdline.c:689
 #, fuzzy
 msgid "Internal consistency error"
 msgstr "÷ĪÕŌŅ¦ŪĪŃ ŠĻĶÉĢĖĮ"
 
 #.
-#: src/config/cmdline.c:709
+#: src/config/cmdline.c:725
 msgid "Restrict to anonymous mode"
 msgstr ""
 
-#: src/config/cmdline.c:711
+#: src/config/cmdline.c:727
 msgid ""
 "Restricts ELinks so it can run on an anonymous account.\n"
 "Local file browsing, downloads, and modification of options\n"
@@ -1420,31 +1445,31 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-#: src/config/cmdline.c:716
+#: src/config/cmdline.c:732
 #, fuzzy
 msgid "Autosubmit first form"
 msgstr "÷¦Ä¦ÓĢĮŌÉ ĘĻŅĶÕ"
 
-#: src/config/cmdline.c:718
+#: src/config/cmdline.c:734
 msgid "Automatically submit the first form in the given URLs."
 msgstr ""
 
-#: src/config/cmdline.c:720
+#: src/config/cmdline.c:736
 msgid "Clone internal session with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:722
+#: src/config/cmdline.c:738
 msgid ""
 "Used internally when opening ELinks instances in new windows.\n"
 "The ID maps to information that will be used when creating the\n"
 "new instance. You don't want to use it."
 msgstr ""
 
-#: src/config/cmdline.c:728
+#: src/config/cmdline.c:744
 msgid "Name of directory with configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:730
+#: src/config/cmdline.c:746
 msgid ""
 "Path of the directory ELinks will read and write its\n"
 "config and runtime state files to instead of ~/.elinks.\n"
@@ -1452,91 +1477,91 @@ msgid ""
 "relative to your HOME directory."
 msgstr ""
 
-#: src/config/cmdline.c:735
+#: src/config/cmdline.c:751
 msgid "Print default configuration file to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:737
+#: src/config/cmdline.c:753
 msgid ""
 "Print a configuration file with options set to the built-in\n"
 "defaults to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:742
+#: src/config/cmdline.c:758
 msgid "Name of configuration file"
 msgstr ""
 
-#: src/config/cmdline.c:744
+#: src/config/cmdline.c:760
 msgid ""
 "Name of the configuration file that all configuration\n"
 "options will be read from and written to. It should be\n"
 "relative to config-dir."
 msgstr ""
 
-#: src/config/cmdline.c:748
+#: src/config/cmdline.c:764
 msgid "Print help for configuration options"
 msgstr ""
 
-#: src/config/cmdline.c:750
+#: src/config/cmdline.c:766
 msgid "Print help for configuration options and exit."
 msgstr ""
 
-#: src/config/cmdline.c:752
+#: src/config/cmdline.c:768
 msgid "MIME type assumed for unknown document types"
 msgstr ""
 
-#: src/config/cmdline.c:754
+#: src/config/cmdline.c:770
 msgid "The default MIME type used for documents of unknown type."
 msgstr ""
 
-#: src/config/cmdline.c:756
+#: src/config/cmdline.c:772
 msgid "Ignore user-defined keybindings"
 msgstr ""
 
-#: src/config/cmdline.c:758
+#: src/config/cmdline.c:774
 msgid ""
 "When set, all keybindings from configuration files will be\n"
 "ignored. It forces use of default keybindings and will reset\n"
 "user-defined ones on save."
 msgstr ""
 
-#: src/config/cmdline.c:762
+#: src/config/cmdline.c:778
 msgid "Print formatted versions of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:764
+#: src/config/cmdline.c:780
 msgid "Print formatted plain-text versions of given URLs to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:766
+#: src/config/cmdline.c:782
 msgid "Codepage to use with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:768
+#: src/config/cmdline.c:784
 msgid "Codepage used when formatting dump output."
 msgstr ""
 
-#: src/config/cmdline.c:770
+#: src/config/cmdline.c:786
 msgid "Color mode used with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:772
+#: src/config/cmdline.c:788
 msgid "Color mode used with -dump."
 msgstr ""
 
-#: src/config/cmdline.c:774
+#: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
 msgstr ""
 
-#: src/config/cmdline.c:776
+#: src/config/cmdline.c:792
 msgid "Width of the dump output."
 msgstr ""
 
-#: src/config/cmdline.c:778
+#: src/config/cmdline.c:794
 msgid "Evaluate configuration file directive"
 msgstr ""
 
-#: src/config/cmdline.c:780
+#: src/config/cmdline.c:796
 msgid ""
 "Specify configuration file directives on the command-line\n"
 "which will be evaluated after all configuration files has been\n"
@@ -1545,58 +1570,58 @@ msgid ""
 msgstr ""
 
 #. lynx compatibility
-#: src/config/cmdline.c:786
+#: src/config/cmdline.c:802
 msgid "Interpret documents of unknown types as HTML"
 msgstr ""
 
-#: src/config/cmdline.c:788
+#: src/config/cmdline.c:804
 msgid ""
 "Makes ELinks assume documents of unknown types are HTML.\n"
 "Useful when using ELinks as an external viewer from MUAs.\n"
 "This is equivalent to -default-mime-type text/html."
 msgstr ""
 
-#: src/config/cmdline.c:798
+#: src/config/cmdline.c:814
 msgid "Print usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:800
+#: src/config/cmdline.c:816
 msgid "Print usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:802
+#: src/config/cmdline.c:818
 msgid "Only permit local connections"
 msgstr ""
 
-#: src/config/cmdline.c:804
+#: src/config/cmdline.c:820
 msgid ""
 "Restricts ELinks to work offline and only connect to servers\n"
 "with local addresses (ie. 127.0.0.1). No connections to remote\n"
 "servers will be permitted."
 msgstr ""
 
-#: src/config/cmdline.c:808
+#: src/config/cmdline.c:824
 msgid "Print detailed usage help and exit"
 msgstr ""
 
-#: src/config/cmdline.c:810
+#: src/config/cmdline.c:826
 msgid "Print detailed usage help and exit."
 msgstr ""
 
-#: src/config/cmdline.c:812
+#: src/config/cmdline.c:828
 #, fuzzy
 msgid "Look up specified host"
 msgstr "īÅ ×ĖĮŚĮĪĻ ŠŅĻĒŅĮĶÕ ÄĢŃ"
 
-#: src/config/cmdline.c:814
+#: src/config/cmdline.c:830
 msgid "Look up specified host and print all DNS resolved IP addresses."
 msgstr ""
 
-#: src/config/cmdline.c:816
+#: src/config/cmdline.c:832
 msgid "Run as separate instance"
 msgstr ""
 
-#: src/config/cmdline.c:818
+#: src/config/cmdline.c:834
 msgid ""
 "Run ELinks as a separate instance instead of connecting to an\n"
 "existing instance. Note that normally no runtime state files\n"
@@ -1604,43 +1629,43 @@ msgid ""
 "option is used. See also -touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:823
+#: src/config/cmdline.c:839
 msgid "Disable use of files in ~/.elinks"
 msgstr ""
 
-#: src/config/cmdline.c:825
+#: src/config/cmdline.c:841
 msgid ""
 "Disables creation and use of files in the user specific home\n"
 "configuration directory (~/.elinks). It forces default configuration\n"
 "values to be used and disables saving of runtime state files."
 msgstr ""
 
-#: src/config/cmdline.c:829
+#: src/config/cmdline.c:845
 msgid "Disable link numbering in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:831
+#: src/config/cmdline.c:847
 msgid ""
 "Prevents printing of link number in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:834
+#: src/config/cmdline.c:850
 msgid "Disable printing of link references in dump output"
 msgstr ""
 
-#: src/config/cmdline.c:836
+#: src/config/cmdline.c:852
 msgid ""
 "Prevents printing of references (URIs) of document links\n"
 "in dump output.\n"
 "Note that this really affects only -dump, nothing else."
 msgstr ""
 
-#: src/config/cmdline.c:840
+#: src/config/cmdline.c:856
 msgid "Control an already running ELinks"
 msgstr ""
 
-#: src/config/cmdline.c:842
+#: src/config/cmdline.c:858
 msgid ""
 "Control a remote ELinks instance by passing commands to it.\n"
 "The option takes an additional argument containing the method\n"
@@ -1659,11 +1684,11 @@ msgid ""
 "\txfeDoCommand(openBrowser) : open new window"
 msgstr ""
 
-#: src/config/cmdline.c:858
+#: src/config/cmdline.c:874
 msgid "Connect to session ring with given ID"
 msgstr ""
 
-#: src/config/cmdline.c:860
+#: src/config/cmdline.c:876
 msgid ""
 "ID of session ring this ELinks session should connect to. ELinks\n"
 "works in so-called session rings, whereby all instances of ELinks\n"
@@ -1681,19 +1706,19 @@ msgid ""
 "-touch-files."
 msgstr ""
 
-#: src/config/cmdline.c:875
+#: src/config/cmdline.c:891
 msgid "Print the source of given URLs to stdout"
 msgstr ""
 
-#: src/config/cmdline.c:877
+#: src/config/cmdline.c:893
 msgid "Print given URLs in source form to stdout."
 msgstr ""
 
-#: src/config/cmdline.c:881
+#: src/config/cmdline.c:897
 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
 msgstr ""
 
-#: src/config/cmdline.c:883
+#: src/config/cmdline.c:899
 msgid ""
 "When enabled, runtime state files (bookmarks, history, etc.) are\n"
 "written to disk, even when -no-connect or -session-ring is used.\n"
@@ -1701,11 +1726,11 @@ msgid ""
 "these options."
 msgstr ""
 
-#: src/config/cmdline.c:888
+#: src/config/cmdline.c:904
 msgid "Verbose level"
 msgstr ""
 
-#: src/config/cmdline.c:890
+#: src/config/cmdline.c:906
 msgid ""
 "The verbose level controls what messages are shown at\n"
 "start up and while running:\n"
@@ -1714,15 +1739,15 @@ msgid ""
 "\t2 means show all messages"
 msgstr ""
 
-#: src/config/cmdline.c:896
+#: src/config/cmdline.c:912
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/config/cmdline.c:898
+#: src/config/cmdline.c:914
 msgid "Print ELinks version information and exit."
 msgstr ""
 
-#: src/config/conf.c:722
+#: src/config/conf.c:938
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1730,7 +1755,7 @@ msgid ""
 "## and all your formatting, own comments etc will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:730
+#: src/config/conf.c:946
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so; this file is edited by ELinks when you save\n"
@@ -1741,7 +1766,7 @@ msgid ""
 "## own comments and so on will be kept as-is.\n"
 msgstr ""
 
-#: src/config/conf.c:740
+#: src/config/conf.c:956
 msgid ""
 "## This is ELinks configuration file. You can edit it manually,\n"
 "## if you wish so, but keep in mind that this file is overwritten\n"
@@ -1749,18 +1774,18 @@ msgid ""
 "## luck with your formatting and own comments then, so beware.\n"
 msgstr ""
 
-#: src/config/conf.c:751
+#: src/config/conf.c:967
 msgid ""
 "## Obviously, if you don't like what ELinks is going to do with\n"
 "## this file, you can change it by altering the config.saving_style\n"
 "## option. Come on, aren't we friendly guys after all?\n"
 msgstr ""
 
-#: src/config/conf.c:764
+#: src/config/conf.c:980
 msgid "Automatically saved options\n"
 msgstr ""
 
-#: src/config/conf.c:776
+#: src/config/conf.c:992
 msgid "Automatically saved keybindings\n"
 msgstr ""
 
@@ -1885,7 +1910,7 @@ msgstr "
 #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options)
 #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1203
 #, fuzzy
 msgid "Sa~ve"
 msgstr "śĀÅŅÅĒŌÉ"
@@ -2157,7 +2182,7 @@ msgid ""
 "it takes precedence. And better do not touch this\n"
 "at all unless you are sure what are you doing.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2166,7 +2191,7 @@ msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http4://elinks.cz/."
 msgstr ""
 
@@ -2178,7 +2203,7 @@ msgstr ""
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
-"to be used on a per-connection basis by using an URL\n"
+"to be used on a per-connection basis by using a URL\n"
 "in the style of e.g. http6://elinks.cz/."
 msgstr ""
 
@@ -2546,7 +2571,7 @@ msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
 "in which links should receive focus when using the keyboard\n"
-"to navigating the document."
+"to navigate the document."
 msgstr ""
 
 #: src/config/options.inc:331
@@ -2591,7 +2616,7 @@ msgstr ""
 #. 0
 #: src/config/options.inc:353
 msgid ""
-"When pressing 'down' on the last link, jump at the first one, and\n"
+"When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -2685,7 +2710,7 @@ msgstr ""
 
 #: src/config/options.inc:403
 msgid ""
-"Whether to show a dialog when the search hits top or bottom of the\n"
+"Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
 msgstr ""
 
@@ -2789,9 +2814,9 @@ msgstr ""
 msgid ""
 "Cache even redirects sent by server (usually thru HTTP by a 302\n"
 "HTTP code and a Location header). This was the original behaviour\n"
-"for a quite some time, but it causes problems in a situation very\n"
+"for quite some time, but it causes problems in a situation very\n"
 "common to various web login systems - frequently, when accessing\n"
-"certain location, they will redirect you to a login page if they\n"
+"a certain location, they will redirect you to a login page if they\n"
 "don't receive an auth cookie, the login page then gives you the\n"
 "cookie and redirects you back to the original page, but there you\n"
 "have already cached redirect back to the login page! If this\n"
@@ -2801,7 +2826,7 @@ msgid ""
 "still workaround it by clever combination of usage of reload,\n"
 "jumping around in session history and hitting ctrl+enter.\n"
 "Note that this option is checked when retrieving the information\n"
-"from cache, not when saving it to cache - thus if you will enable\n"
+"from cache, not when saving it to cache - thus if you enable\n"
 "it, even previous redirects will be taken from cache instead of\n"
 "asking the server."
 msgstr ""
@@ -2977,7 +3002,7 @@ msgid "Ensure contrast"
 msgstr ""
 
 #: src/config/options.inc:587
-msgid "Makes sure that the back- and foreground color are never equal."
+msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr ""
 
 #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action
@@ -3060,8 +3085,9 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
+#. OPT_CODEPAGE
 #: src/config/options.inc:640 src/config/options.inc:912
-#: src/config/opttypes.c:404 src/dialogs/document.c:163
+#: src/config/opttypes.c:481 src/dialogs/document.c:164
 msgid "Codepage"
 msgstr "ėĻÄĻ×Į ÓŌĻŅ¦ĪĖĮ"
 
@@ -3214,7 +3240,7 @@ msgid "Display superscripts (as ^thing)."
 msgstr ""
 
 #: src/config/options.inc:721
-msgid "Rendering of html link element"
+msgid "Rendering of HTML link element"
 msgstr ""
 
 #: src/config/options.inc:723
@@ -3317,7 +3343,7 @@ msgstr "
 #: src/config/options.inc:786
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
-"to be saved to disk if they has changed (seconds; 0 to disable)"
+"to be saved to disk if they have changed (seconds; 0 to disable)"
 msgstr ""
 
 #: src/config/options.inc:789
@@ -3909,7 +3935,7 @@ msgstr "
 #: src/config/options.inc:1184
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1187
@@ -3920,7 +3946,7 @@ msgstr "
 #: src/config/options.inc:1189
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
-"visible. Requires the underlining is enabled for the terminal."
+"visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 
 #: src/config/options.inc:1193
@@ -4000,7 +4026,7 @@ msgstr ""
 
 #: src/config/options.inc:1241
 msgid ""
-"When moving right from the last tab, jump at the first one, and\n"
+"When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
 msgstr ""
 
@@ -4013,7 +4039,8 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr "÷¦ÄĖŅÉŌÉ ŚĮŠÉŌ Š¦ÄŌ×ÅŅÄÖÅĪĪŃ ×ÉČĻÄÕ"
 
-#: src/config/options.inc:1250 src/config/opttypes.c:405
+#. OPT_LANGUAGE
+#: src/config/options.inc:1250 src/config/opttypes.c:483
 msgid "Language"
 msgstr ""
 
@@ -4158,62 +4185,70 @@ msgstr ""
 msgid "Read error"
 msgstr "šĻĶÉĢĖĮ ŚĀÅŅÅÖÅĪĪŃ"
 
-#: src/config/opttypes.c:399
+#. The OPT_ comments below are here to be found by grep.
+#. OPT_BOOL
+#: src/config/opttypes.c:472
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:399
+#: src/config/opttypes.c:472
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#. OPT_INT
+#: src/config/opttypes.c:474
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:400 src/config/opttypes.c:401
+#: src/config/opttypes.c:474 src/config/opttypes.c:476
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:401
+#. OPT_LONG
+#: src/config/opttypes.c:476
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#. OPT_STRING
+#: src/config/opttypes.c:478
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:402
+#: src/config/opttypes.c:478
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:404
+#: src/config/opttypes.c:481
 #, fuzzy
 msgid "<codepage>"
 msgstr "ėĻÄĻ×Į ÓŌĻŅ¦ĪĖĮ"
 
-#: src/config/opttypes.c:405
+#: src/config/opttypes.c:483
 #, fuzzy
 msgid "<language>"
 msgstr "ķĻ×Į"
 
-#: src/config/opttypes.c:406
+#. OPT_COLOR
+#: src/config/opttypes.c:485
 msgid "Color"
 msgstr "ėĻĢŲĻŅÉ"
 
-#: src/config/opttypes.c:406
+#: src/config/opttypes.c:485
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:408
+#. OPT_COMMAND
+#: src/config/opttypes.c:488
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:410
+#. OPT_ALIAS
+#: src/config/opttypes.c:491
 msgid "Alias"
 msgstr ""
 
-#. tree
-#: src/config/opttypes.c:413
+#. OPT_TREE
+#: src/config/opttypes.c:494
 msgid "Folder"
 msgstr ""
 
@@ -4284,7 +4319,7 @@ msgid "Saving"
 msgstr "× ÓÅŅÅÄĪŲĻĶÕ"
 
 #: src/cookies/cookies.c:119
-msgid "Whether cookies should be loaded from and save to disk."
+msgid "Whether cookies should be loaded from and saved to disk."
 msgstr ""
 
 #: src/cookies/cookies.c:121
@@ -4360,7 +4395,7 @@ msgid "~Reject"
 msgstr ""
 
 #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357
-#: src/dialogs/document.c:177
+#: src/dialogs/document.c:178
 msgid "Server"
 msgstr "óÅŅ×ÅŅ"
 
@@ -4502,41 +4537,41 @@ msgstr "
 msgid "Link title (from history)"
 msgstr ""
 
-#: src/dialogs/document.c:167
+#: src/dialogs/document.c:168
 msgid "assumed"
 msgstr "ŠŅÉŹĪŃŌĻ"
 
-#: src/dialogs/document.c:170
+#: src/dialogs/document.c:171
 msgid "ignoring server setting"
 msgstr "ŠĮŅĮĶÅŌŅÉ ÓÅŅ×ÅŅÕ ¦ĒĪĻŅÕĄŌŲÓŃ"
 
-#: src/dialogs/document.c:195
+#: src/dialogs/document.c:196
 msgid "Date"
 msgstr "äĮŌĮ"
 
-#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+#: src/dialogs/document.c:214 src/globhist/dialogs.c:67
 msgid "Last visit time"
 msgstr "÷ĻÓŌĮĪĪ¤ צÄצÄĮĪĻ"
 
-#: src/dialogs/document.c:232
+#: src/dialogs/document.c:233
 msgid "Unknown"
 msgstr "īÅצÄĻĶĻ"
 
-#: src/dialogs/document.c:247 src/dialogs/document.c:316
+#: src/dialogs/document.c:248 src/dialogs/document.c:317
 msgid "Header info"
 msgstr "¶ĪĘĻŅĶĮĆ¦Ń ŠŅĻ ŚĮĒĻĢĻ×ĻĖ"
 
-#: src/dialogs/document.c:260
+#: src/dialogs/document.c:261
 #, fuzzy
 msgid "Internal header info"
 msgstr "¶ĪĘĻŅĶĮĆ¦Ń ŠŅĻ ŚĮĒĻĢĻ×ĻĖ"
 
-#: src/dialogs/document.c:301
+#: src/dialogs/document.c:302
 msgid "No header info."
 msgstr ""
 
 #: src/dialogs/download.c:243 src/dialogs/menu.c:598
-#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:399
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:361
 msgid "Download"
 msgstr "śĮ×ĮĪŌĮÖÅĪĪŃ"
 
@@ -4626,7 +4661,7 @@ msgid "Download manager"
 msgstr "śĮ×ĮĪŌÉÖÉŌÉ ŚĻĀŅĮÖÅĪĪŃ"
 
 #. name:
-#: src/dialogs/exmode.c:149
+#: src/dialogs/exmode.c:147
 msgid "Exmode"
 msgstr ""
 
@@ -4835,7 +4870,8 @@ msgstr "
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-msgid "Toggle ~html/plain"
+#, fuzzy
+msgid "Toggle ~HTML/plain"
 msgstr "šÅŅÅĶÉĖĮŽ HTML/ŌÅĖÓŌ"
 
 #. accelerator_context(tab_menu)
@@ -6057,31 +6093,32 @@ msgstr "
 #, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
-"substituted by a file name."
+"substituted by a file name.\n"
+"Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 
-#: src/mime/backend/default.c:78
+#: src/mime/backend/default.c:79
 #, fuzzy
 msgid "File extension associations"
 msgstr "ņĻŚŪÉŅÅĪĪŃ ĘĮŹĢ¦×"
 
-#: src/mime/backend/default.c:80
+#: src/mime/backend/default.c:81
 msgid "Extension <-> MIME type association."
 msgstr ""
 
-#: src/mime/backend/default.c:84
+#: src/mime/backend/default.c:85
 msgid ""
 "MIME-type matching this file extension ('*' is used here in place\n"
 "of '.')."
 msgstr ""
 
 #. name:
-#: src/mime/backend/default.c:215
+#: src/mime/backend/default.c:216
 msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:684
 msgid "Mailcap"
 msgstr ""
 
@@ -6140,7 +6177,7 @@ msgstr ""
 #: src/mime/backend/mimetypes.c:48
 msgid ""
 "Options for the support of mime.types files. These files\n"
-"can be used to find the content type of an URL by looking at\n"
+"can be used to find the content type of a URL by looking at\n"
 "the extension of the file name."
 msgstr ""
 
@@ -6161,19 +6198,19 @@ msgstr "
 msgid "Delete extension %s -> %s?"
 msgstr "÷ÉÄĮĢÉŌÉ ŅĻŚŪÉŅÅĪĪŃ"
 
-#: src/mime/dialogs.c:125
+#: src/mime/dialogs.c:126
 msgid "Extension"
 msgstr "ņĻŚŪÉŅÅĪĪŃ"
 
-#: src/mime/dialogs.c:128
+#: src/mime/dialogs.c:129
 msgid "Extension(s)"
 msgstr "ņĻŚŪÉŅÅĪĪŃ"
 
-#: src/mime/dialogs.c:129
+#: src/mime/dialogs.c:130
 msgid "Content-Type"
 msgstr "ōÉŠ ÄĮĪÉČ"
 
-#: src/mime/dialogs.c:141
+#: src/mime/dialogs.c:142
 msgid "No extensions"
 msgstr "īÅĶĮ¤ ŅĻŚŪÉŅÅĪŲ"
 
@@ -6319,7 +6356,7 @@ msgstr "
 
 #: src/network/state.c:46 src/scripting/python/dialogs.c:59
 #: src/scripting/python/dialogs.c:188 src/scripting/python/keybinding.c:98
-#: src/scripting/python/load.c:113 src/scripting/python/menu.c:98
+#: src/scripting/python/load.c:113 src/scripting/python/menu.c:99
 #: src/scripting/python/open.c:59
 msgid "Internal error"
 msgstr "÷ĪÕŌŅ¦ŪĪŃ ŠĻĶÉĢĖĮ"
@@ -6452,7 +6489,7 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:101
-msgid "Server hang up for some reason"
+msgid "Server hung up for some reason"
 msgstr ""
 
 #: src/network/state.c:102
@@ -7000,7 +7037,7 @@ msgstr "
 msgid "Comment"
 msgstr "ÄĻĖÕĶÅĪŌ¦×"
 
-#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:400
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:362
 #, fuzzy, c-format
 msgid ""
 "Download complete:\n"
@@ -7183,7 +7220,7 @@ msgstr ""
 msgid "Information about the torrent"
 msgstr "šĻĖĮŚĮŌÉ ¦ĪĘĻŅĶĮƦĄ ŠŅĻ ŠĻŌĻŽĪÕ ÓŌĻŅ¦ĪĖÕ"
 
-#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1106
 msgid "What to do?"
 msgstr "żĻ ŅĻĀÉŌÉ?"
 
@@ -7194,13 +7231,13 @@ msgid "Down~load"
 msgstr "śĮ×ĮĪŌĮÖÅĪĪŃ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1209
 #, fuzzy
 msgid "~Display"
 msgstr "šĻĖĮŚĮŌÉ"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query)
-#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1213
 msgid "Show ~header"
 msgstr ""
 
@@ -7231,42 +7268,42 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:42
+#: src/protocol/file/file.c:40
 #, fuzzy
 msgid "Local files"
 msgstr "ĘĮŹĢ¦×"
 
-#: src/protocol/file/file.c:44
+#: src/protocol/file/file.c:42
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:46
+#: src/protocol/file/file.c:44
 msgid "Allow reading special files"
 msgstr ""
 
-#: src/protocol/file/file.c:48
+#: src/protocol/file/file.c:46
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
 "/dev/zero can ruin your day!"
 msgstr ""
 
-#: src/protocol/file/file.c:52
+#: src/protocol/file/file.c:50
 msgid "Show hidden files in directory listing"
 msgstr ""
 
-#: src/protocol/file/file.c:54
+#: src/protocol/file/file.c:52
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
-"hidden in local directories listing."
+"hidden in local directory listings."
 msgstr ""
 
-#: src/protocol/file/file.c:57
+#: src/protocol/file/file.c:55
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "īÅĶĮ¤ ŅĻŚŪÉŅÅĪŲ"
 
-#: src/protocol/file/file.c:59
+#: src/protocol/file/file.c:57
 msgid ""
 "When set, if we can't open a file named 'filename', we'll try\n"
 "to open 'filename' with some encoding extension appended\n"
@@ -7274,7 +7311,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:67
+#: src/protocol/file/file.c:65
 #, fuzzy
 msgid "File"
 msgstr "ęĮŹĢ"
@@ -7545,11 +7582,11 @@ msgid ""
 "a standard for new textmode user agents, so that the webmasters can\n"
 "have just a single uniform test for these if they are e.g. pushing\n"
 "some lite version to them automagically.\n"
-"%v in the string means ELinks version\n"
-"%s in the string means system identification\n"
-"%t in the string means size of the terminal\n"
-"%b in the string means number of bars displayed by ELinks\n"
-"Use \" \" if you don't want any User-Agent header to be sent at all."
+"Use \" \" if you don't want any User-Agent header to be sent at all.\n"
+"%v in the string means ELinks version,\n"
+"%s in the string means system identification,\n"
+"%t in the string means size of the terminal,\n"
+"%b in the string means number of bars displayed by ELinks."
 msgstr ""
 
 #: src/protocol/http/http.c:205
@@ -7717,10 +7754,10 @@ msgid ""
 "(i.e. contains no '.', ':' or '/' characters), and does\n"
 "not match any defined prefixes. Set the value to \"\" to\n"
 "disable use of the default template rewrite rule.\n"
-"%c in the template means the current URL\n"
-"%s in the template means the whole string from the goto dialog\n"
-"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n"
-"%% in the template means '%'"
+"%c in the template means the current URL,\n"
+"%s in the template means the whole string from the goto dialog,\n"
+"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n"
+"%% in the template means '%'."
 msgstr ""
 
 #. name:
@@ -7865,19 +7902,19 @@ msgstr ""
 msgid "Spidermonkey ECMAScript"
 msgstr "ļŠÉÓ"
 
-#: src/session/download.c:236 src/session/download.c:360
-#: src/session/download.c:599 src/session/download.c:687
+#: src/session/download.c:233 src/session/download.c:330
+#: src/session/download.c:561 src/session/download.c:649
 msgid "Download error"
 msgstr "šĻĶÉĢĖĮ ŚĮ×ĮĪŌĮÖÅĪĪŃ"
 
-#: src/session/download.c:237 src/session/download.c:688
+#: src/session/download.c:234 src/session/download.c:650
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
 msgstr "īÅ ĶĻÖÕ ŠÉÓĮŌÉ Õ ĘĮŹĢ"
 
-#: src/session/download.c:361
+#: src/session/download.c:331
 #, fuzzy, c-format
 msgid ""
 "Error downloading %s:\n"
@@ -7885,17 +7922,17 @@ msgid ""
 "%s"
 msgstr "šĻĶÉĢĖĮ ŚĮ×ĮĪŌĮÖÅĪĪŃ"
 
-#: src/session/download.c:600
+#: src/session/download.c:562
 #, c-format
 msgid "'%s' is a directory."
 msgstr ""
 
-#: src/session/download.c:634
+#: src/session/download.c:596
 #, fuzzy
 msgid "File exists"
 msgstr "ņĻŚŪÉŅÅĪĪŃ ĘĮŹĢ¦×"
 
-#: src/session/download.c:635
+#: src/session/download.c:597
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7906,56 +7943,52 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:642
+#: src/session/download.c:604
 msgid "Sa~ve under the alternative name"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:643
+#: src/session/download.c:605
 msgid "~Overwrite the original file"
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:644
+#: src/session/download.c:606
 #, fuzzy
 msgid "~Resume download of the original file"
 msgstr "óŠŅĻĀÕ×ĮŌÉ ×¦ÄĪĻ×ÉŌÉ ŚĮ×ĮĪŌĮÖÅĪĪŃ ŠĻŌĻŽĪĻĒĻ ŠĻÓÉĢĮĪĪŃ"
 
-#: src/session/download.c:1150
+#: src/session/download.c:1109
 msgid "Unknown type"
 msgstr "īÅצÄĻĶÉŹ ŌÉŠ"
 
-#: src/session/download.c:1175
+#: src/session/download.c:1134
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1178
+#: src/session/download.c:1137
 #, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1206
+#: src/session/download.c:1165
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr ""
 
-#: src/session/download.c:1211
-msgid "The output of the program will be shown in the tab"
-msgstr ""
-
-#: src/session/download.c:1215
+#: src/session/download.c:1169
 #, fuzzy
 msgid "Block the terminal"
 msgstr "ōÅŅĶ¦ĪĮĢ BeOS"
 
-#: src/session/download.c:1222
+#: src/session/download.c:1175
 #, c-format
 msgid "The file will be opened with the program '%s'."
 msgstr ""
 
 #. accelerator_context(src/session/download.c:do_type_query)
-#: src/session/download.c:1243
+#: src/session/download.c:1196
 #, fuzzy
 msgid "~Open"
 msgstr "÷¦ÄĖŅÉŌÉ"
@@ -7971,13 +8004,13 @@ msgstr "
 
 #: src/session/session.c:751
 msgid ""
-"You have empty string in protocol.http.user_agent - this was a default value "
-"in the past, substituted by default ELinks User-Agent string. However, "
+"You have an empty string in protocol.http.user_agent - this was a default "
+"value in the past, substituted by default ELinks User-Agent string. However, "
 "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this "
-"is really what you want, set its value to \" \", otherwise please delete "
-"line with this settings from your configuration file (if you have no idea "
-"what I'm talking about, just do this), so that correct default setting will "
-"be used. Apologies for any inconvience caused."
+"is really what you want, set its value to \" \", otherwise please delete the "
+"line with this setting from your configuration file (if you have no idea "
+"what I'm talking about, just do this), so that the correct default setting "
+"will be used. Apologies for any inconvience caused."
 msgstr ""
 
 #: src/session/session.c:770
@@ -7985,12 +8018,12 @@ msgid ""
 "You have option config.saving_style set to a de facto obsolete value. The "
 "configuration saving algorithms of ELinks were changed from the last time "
 "you upgraded ELinks. Now, only those options which you actually changed are "
-"saved to the configuration file, instead of just all the options. This "
-"simplifies our situation greatly when we see that some option has "
-"inappropriate default value or we need to change semantic of some option in "
-"a subtle way. Thus, we recommend you to change the value of config."
-"saving_style option to 3 in order to get the \"right\" behaviour. Apologies "
-"for any inconvience caused."
+"saved to the configuration file, instead of all the options. This simplifies "
+"our situation greatly when we see that some option has an inappropriate "
+"default value or we need to change the semantics of some option in a subtle "
+"way. Thus, we recommend you change the value of config.saving_style option "
+"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience "
+"caused."
 msgstr ""
 
 #: src/session/session.c:795
@@ -8065,7 +8098,7 @@ msgstr ""
 msgid "Could not read event: %d (%s)"
 msgstr "īÅ ĶĻÖÕ ŠÉÓĮŌÉ Õ ĘĮŹĢ"
 
-#: src/terminal/kbd.c:1177
+#: src/terminal/kbd.c:1187
 #, c-format
 msgid "Too many bytes read from the itrm!"
 msgstr ""
@@ -8442,19 +8475,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Go to link"
 msgstr "źŌÉ ŚĮ ŠĻÓÉĢĮĪĪŃĶ"
 
-#: src/viewer/text/view.c:735
+#: src/viewer/text/view.c:1042
 msgid "Enter link number"
 msgstr "÷×ÅĦŌŲ ĪĻĶÅŅ ŠĻÓÉĢĮĪĪŃ"
 
-#: src/viewer/text/view.c:1320
+#: src/viewer/text/view.c:1627
 msgid "Save error"
 msgstr "šĻĶÉĢĖĮ ŚĀÅŅÅÖÅĪĪŃ"
 
-#: src/viewer/text/view.c:1321
+#: src/viewer/text/view.c:1628
 msgid "Error writing to file"
 msgstr "šĻĶÉĢĖĮ ŚĮŠÉÓÕ ÄĻ ĘĮŹĢÕ"
 

From 8493d6c021f8141468e20f2d556922f9b856356a Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 1 Jul 2008 03:16:25 +0300
Subject: [PATCH 15/43] ELinks 0.12pre1.GIT

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index a98cff93..c4bc8198 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ AC_CONFIG_SRCDIR([src/main/main.c])
 AC_CONFIG_AUX_DIR(config)
 
 PACKAGE=elinks
-VERSION=0.12pre1
+VERSION=0.12pre1.GIT
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Package version])

From 26a0afd8ae05628db25b9add8c67c2b3ebc10cca Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 1 Jul 2008 15:31:39 +0300
Subject: [PATCH 16/43] NEWS: 0.12pre1 was released on 2008-07-01

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 2338c679..a50ac841 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ file for details.
 ELinks 0.12pre1:
 ----------------
 
+Released on 2008-07-01.
+
 Notable new features:
 
 * enhancement 822: UTF-8 as terminal charset, not merely UTF-8 I/O

From 0fa88b1c05d2509354c3806de66228f9259f8bd0 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 1 Jul 2008 15:13:54 +0200
Subject: [PATCH 17/43] Update Danish translation

---
 po/da.po | 266 ++++++++++++++++++-------------------------------------
 1 file changed, 88 insertions(+), 178 deletions(-)

diff --git a/po/da.po b/po/da.po
index 720a54ce..3be92164 100644
--- a/po/da.po
+++ b/po/da.po
@@ -237,7 +237,7 @@ msgid "LED indicators"
 msgstr "LED-indikatorer"
 
 #: src/bfu/leds.c:306
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "What the different LEDs indicate:\n"
 "\n"
@@ -310,7 +310,6 @@ msgid "File format"
 msgstr "Filformat"
 
 #: src/bookmarks/bookmarks.c:55
-#, fuzzy
 msgid ""
 "File format for bookmarks (affects both reading and saving):\n"
 "0 is the default native ELinks format\n"
@@ -319,10 +318,9 @@ msgid ""
 msgstr ""
 "Filformat for bogmęrker (påvirker lęsning og gemning):\n"
 "0 er ELinks' standardformat\n"
-"1 er det universelle XBEL XML-bogmęrkeformat (INGEN NATIONALE TEGN!)"
+"1 er det universelle XBEL XML-bogmęrkeformat (ELinks bug 153: INGEN NATIONALE TEGN!)"
 
 #: src/bookmarks/bookmarks.c:61
-#, fuzzy
 msgid ""
 "File format for bookmarks (affects both reading and saving):\n"
 "0 is the default native ELinks format\n"
@@ -331,7 +329,8 @@ msgid ""
 msgstr ""
 "Filformat for bogmęrker (påvirker lęsning og gemning):\n"
 "0 er ELinks' standardformat\n"
-"1 er det universelle XBEL XML-bogmęrkeformat (INGEN NATIONALE TEGN!) \n"
+"1 er det universelle XBEL XML-bogmęrkeformat \n"
+"  (ELinks bug 153: INGEN NATIONALE TEGN!) \n"
 "(DEAKTIVERET)"
 
 #: src/bookmarks/bookmarks.c:67
@@ -687,9 +686,8 @@ msgid "Copy text to clipboard"
 msgstr "Kopiér tekst til klippebord"
 
 #: src/config/actions-edit.inc:14
-#, fuzzy
 msgid "Cut text to clipboard"
-msgstr "Kopiér tekst til klippebord"
+msgstr "Klip tekst til klippebord"
 
 #: src/config/actions-edit.inc:15 src/config/actions-menu.inc:9
 msgid "Delete character under cursor"
@@ -733,14 +731,12 @@ msgid "Move the cursor left"
 msgstr "Flyt markųr til venstre"
 
 #: src/config/actions-edit.inc:25
-#, fuzzy
 msgid "Move cursor before current word"
-msgstr "Flyt markųren nedad"
+msgstr "Flyt markųren foran det nuvęrende ord"
 
 #: src/config/actions-edit.inc:26
-#, fuzzy
 msgid "Move cursor after current word"
-msgstr "Flyt markųr op"
+msgstr "Flyt markųr efter det nuvęrende ord"
 
 #: src/config/actions-edit.inc:27 src/config/actions-menu.inc:17
 msgid "Move to the next item"
@@ -936,9 +932,8 @@ msgid "Open the link context menu"
 msgstr "Åbn link-kontekst-menu"
 
 #: src/config/actions-main.inc:50
-#, fuzzy
 msgid "Open the form fields menu"
-msgstr "Åbn Fil-menuen"
+msgstr "Åbn Formularfelts-menuen"
 
 #: src/config/actions-main.inc:51
 msgid "Open a Lua console"
@@ -965,9 +960,8 @@ msgid "Move cursor left"
 msgstr "Flyt markųr til venstre"
 
 #: src/config/actions-main.inc:57
-#, fuzzy
 msgid "Move cursor to the start of the line"
-msgstr "Gå til begyndelsen af siden/linjen"
+msgstr "Fly markųr til linjestart"
 
 #: src/config/actions-main.inc:58
 msgid "Move cursor right"
@@ -990,18 +984,16 @@ msgid "Move one link down"
 msgstr "Flyt et link ned"
 
 #: src/config/actions-main.inc:63
-#, fuzzy
 msgid "Move to the next line with a link"
-msgstr "Flyt til nęste link"
+msgstr "Flyt til nęste linje med et link"
 
 #: src/config/actions-main.inc:64
 msgid "Move one link left"
 msgstr "Flyt et link til venstre"
 
 #: src/config/actions-main.inc:65
-#, fuzzy
 msgid "Move one link left or to the previous link"
-msgstr "Flyt til forrige link"
+msgstr "Flyt et link til venstre eller til forrige link"
 
 #: src/config/actions-main.inc:66
 msgid "Move to the next link"
@@ -1016,18 +1008,16 @@ msgid "Move one link right"
 msgstr "Flyt et link til hųjre"
 
 #: src/config/actions-main.inc:69
-#, fuzzy
 msgid "Move one link right or to the next link"
-msgstr "Flyt til nęste link"
+msgstr "Flyt et link til hųjre eller til nęste link"
 
 #: src/config/actions-main.inc:70
 msgid "Move one link up"
 msgstr "Flyt et link op"
 
 #: src/config/actions-main.inc:71
-#, fuzzy
 msgid "Move to the previous line with a link"
-msgstr "Flyt til forrige link"
+msgstr "Flyt til forrige linje indeholdende et link"
 
 #: src/config/actions-main.inc:72 src/config/actions-menu.inc:18
 msgid "Move downwards by a page"
@@ -1289,18 +1279,16 @@ msgid "Out of memory"
 msgstr "Hukommelse opbrugt"
 
 #: src/config/cmdline.c:264
-#, fuzzy
 msgid "Too many arguments"
 msgstr "For mange parametre"
 
 #: src/config/cmdline.c:282
-#, fuzzy
 msgid "Mismatched ending argument quoting"
-msgstr "Rapportering af manglende fragment"
+msgstr "Citationstegn kunne ikke matches for parameter"
 
 #: src/config/cmdline.c:287
 msgid "Garbage after quoted argument"
-msgstr ""
+msgstr "Ulęselige tegn efter citeret parameter"
 
 #: src/config/cmdline.c:394
 msgid "Remote method not supported"
@@ -1477,14 +1465,12 @@ msgid "Codepage used when formatting dump output."
 msgstr "Tegnkodningstabel brugt i uddata fra -dump."
 
 #: src/config/cmdline.c:786
-#, fuzzy
 msgid "Color mode used with -dump"
-msgstr "Tegnkodningstabel brugt med -dump"
+msgstr "Farvetilstand brugt med -dump"
 
 #: src/config/cmdline.c:788
-#, fuzzy
 msgid "Color mode used with -dump."
-msgstr "Tegnkodningstabel brugt med -dump"
+msgstr "Farvetilstand brugt med -dump."
 
 #: src/config/cmdline.c:790
 msgid "Width of document formatted with -dump"
@@ -1974,9 +1960,8 @@ msgid "Invalid keystroke."
 msgstr "Ugyldig tastetildeling."
 
 #: src/config/dialogs.c:860
-#, fuzzy
 msgid "Need to select an action."
-msgstr "Det er nųdvendigt at vęlge en tasteoversigt."
+msgstr "Det er nųdvendigt at vęlge en handling."
 
 #: src/config/dialogs.c:882
 #, c-format
@@ -2219,7 +2204,6 @@ msgid "Try IPv4 when connecting"
 msgstr "Prųv IPv4 når forbindelse oprettes"
 
 #: src/config/options.inc:100
-#, fuzzy
 msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Note that if connection.try_ipv6 is enabled too,\n"
@@ -2237,7 +2221,6 @@ msgstr ""
 "adresse med en stil såsom http4://elinks.or.cz/."
 
 #: src/config/options.inc:110
-#, fuzzy
 msgid ""
 "Whether to try to connect to a host over IPv4.\n"
 "Do not touch this option.\n"
@@ -2255,7 +2238,6 @@ msgid "Try IPv6 when connecting"
 msgstr "Prųv IPv6 ved oprettelse af forbindelser"
 
 #: src/config/options.inc:120
-#, fuzzy
 msgid ""
 "Whether to try to connect to a host over IPv6.\n"
 "Note that you can also force a given protocol\n"
@@ -2410,7 +2392,6 @@ msgid "External editor"
 msgstr "Ekstern editor"
 
 #: src/config/options.inc:196
-#, fuzzy
 msgid ""
 "Path to the executable that ELinks should launch when the user\n"
 "requests to edit a textarea with an external editor.\n"
@@ -2418,7 +2399,7 @@ msgid ""
 "variable $EDITOR. If $EDITOR is empty or not set, ELinks will then\n"
 "default to \"vi\"."
 msgstr ""
-"Sti til programmet som ELinks skal start når brugeren ųnsker\n"
+"Sti til programmet som ELinks skal starte når brugeren ųnsker\n"
 "at redigere et tekstfelt (angivet med textarea-elementet)\n"
 "med en ekstern editor.\n"
 "\n"
@@ -2674,7 +2655,6 @@ msgid "Use tabindex"
 msgstr "Anvend tabindex"
 
 #: src/config/options.inc:326
-#, fuzzy
 msgid ""
 "Whether to navigate links using tabindex specified ordering.\n"
 "The TABINDEX attribute in HTML elements specifies the order\n"
@@ -2735,7 +2715,6 @@ msgstr "Bund/top navigeringscyklus for links"
 
 #. 0
 #: src/config/options.inc:353
-#, fuzzy
 msgid ""
 "When pressing 'down' on the last link, jump to the first one, and\n"
 "vice versa."
@@ -2840,7 +2819,6 @@ msgid "Show search hit top or bottom dialogs"
 msgstr "Vis dialoger hvis sųgning rammer top eller bund"
 
 #: src/config/options.inc:403
-#, fuzzy
 msgid ""
 "Whether to show a dialog when the search hits the top or bottom of the\n"
 "document."
@@ -3066,9 +3044,8 @@ msgstr ""
 
 #. FIXME: Write more.
 #: src/config/options.inc:506
-#, fuzzy
 msgid "Revalidation interval"
-msgstr "Keepalive-interval"
+msgstr "Genvalideringsinterval"
 
 #: src/config/options.inc:508
 msgid ""
@@ -3195,7 +3172,6 @@ msgid "Ensure contrast"
 msgstr "Sųrg for kontrast"
 
 #: src/config/options.inc:587
-#, fuzzy
 msgid "Makes sure that the back- and foreground colors are never equal."
 msgstr "Sikrer at bag- og forgrundsfarver aldrig er ens."
 
@@ -3444,9 +3420,8 @@ msgid "Display superscripts (as ^thing)."
 msgstr "Vis matematisk overskrift (<sup> tag) som ^overskrift."
 
 #: src/config/options.inc:721
-#, fuzzy
 msgid "Rendering of HTML link element"
-msgstr "Gengivelse af HTML-links"
+msgstr "Gengivelse af link HTML-elementer"
 
 #: src/config/options.inc:723
 msgid ""
@@ -3536,7 +3511,6 @@ msgid ""
 msgstr ""
 
 #: src/config/options.inc:770
-#, fuzzy
 msgid ""
 "A rule for passing URI to an external command.\n"
 "The format is:\n"
@@ -3565,7 +3539,6 @@ msgid "Save interval"
 msgstr "Gemningsinterval"
 
 #: src/config/options.inc:786
-#, fuzzy
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
 "to be saved to disk if they have changed (seconds; 0 to disable)"
@@ -3652,15 +3625,15 @@ msgid "Switch fonts for line drawing"
 msgstr "Skift skrifttype ved linjetegning"
 
 #: src/config/options.inc:852
-#, fuzzy
 msgid ""
 "Switch fonts when drawing lines, enabling both local characters\n"
 "and lines working at the same time. ELinks uses this option only if\n"
 "UTF-8 I/O is disabled and the terminal type is Linux or FreeBSD."
 msgstr ""
 "Skift skrifttype ved linjetegning således at både sęrlige\n"
-"nationale tegn og linjetegn kan bruges samtidig. Giver\n"
-"kun mening med en terminal af typen \"linux\"."
+"nationale tegn og linjetegn kan bruges samtidig. ELinks benytter\n"
+"kun denne indstilling når UTF-8 I/O er deaktiveret og terminalen\n"
+"er af tpen \"linux\" eller \"freebsd\"."
 
 #. When CONFIG_UTF8 is defined, any code that reads the "utf_8_io"
 #. * option should also check whether the "codepage" option is UTF-8,
@@ -3672,7 +3645,6 @@ msgid "UTF-8 I/O"
 msgstr "UTF-8 I/O"
 
 #: src/config/options.inc:863
-#, fuzzy
 msgid ""
 "Enable I/O in UTF-8 for Unicode terminals. Note that currently,\n"
 "only the subset of UTF-8 according to terminal codepage is used.\n"
@@ -3681,7 +3653,8 @@ msgstr ""
 "Aktivér I/O i UTF-8 på Unicode-terminaler. Bemęrk at i\n"
 "ųjeblikket bruges kun den del af UTF-8 tegntabellen som\n"
 "svarer til de tegn der er indeholdt i terminalens\n"
-"tegnkodningstabel."
+"tegnkodningstabel. ELinks benytter ikke denne indstilling\n"
+"when terminalens tegntabel er UTF-8."
 
 #: src/config/options.inc:867 src/dialogs/options.c:228
 msgid "Restrict frames in cp850/852"
@@ -3716,7 +3689,6 @@ msgstr ""
 #. * TRANSLATORS: This restriction applies only to the
 #. * "en" (English) translation.  (See doc/Makefile.)
 #: src/config/options.inc:885
-#, fuzzy
 msgid ""
 "The color mode controls what colors are used and how they are output to the "
 "terminal.\n"
@@ -3730,11 +3702,18 @@ msgid ""
 "3 is 256 color mode, uses XTerm RGB codes\n"
 "4 is true color mode, uses konsole RGB codes"
 msgstr ""
-"Farvetilstanden styrer hvilke farver der bruges og hvordan\n"
-"de sendes til skęrmen. Farvetilstandene er:\n"
+"Farvetilstanden styrer hvilke farver der bruges og hvordan de sendes\n"
+"skęrmen.\n"
+"Nogle farvetilstande er muligvis deaktiveret på oversęttelsestidspunktet\n"
+"For mere information se terminalindstillingsdialogen i Opsętnings menuen.\n"
+"Hvis du vęlger en farvetilstand som er deaktiveret benyttes tilstanden\n"
+"16-farver.\n"
+"Farvetilstandene er:\n"
 "0 betyder tilstanden monokron, hvor kun 2 farver bruges\n"
 "1 betyder tilstanden 16-farver, som bruger de normale ANSI-farver\n"
-"2 betyder tilstanden 256-farve, som bruger XTerm RGB-farvekoder"
+"2 betyder tilstanden 88-farver, som bruger XTerm RGB-farvekoder\n"
+"3 betyder tilstanden 256-farve, som bruger XTerm RGB-farvekoder\n"
+"4 betyder tilstanden rigtige farver, some bruger konsole RGB-farvekoder"
 
 #: src/config/options.inc:898 src/dialogs/options.c:230
 msgid "Transparency"
@@ -4188,28 +4167,26 @@ msgid "Underline menu hotkeys"
 msgstr "Understreg hurtigtaster i menu"
 
 #: src/config/options.inc:1184
-#, fuzzy
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
 "visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Vęlg om hurtigtaster i menuer skal understreges for at\n"
-"gųre dem mere synlige. Kręver at terminalen understųtter\n"
-"understregning."
+"gųre dem mere synlige. Kręver at understregning er understųttet\n"
+"og aktiveret for terminalen."
 
 #: src/config/options.inc:1187
 msgid "Underline button shortcuts"
 msgstr "Understreg knap-genvejstaster"
 
 #: src/config/options.inc:1189
-#, fuzzy
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
 "visible. Requires that underlining is enabled for the terminal."
 msgstr ""
 "Vęlg om genvejstaster for knapper skal understreges for at\n"
-"gųre dem mere synlige. Kręver at terminalen understųtter\n"
-"understregning."
+"gųre dem mere synlige. Kręver at understregning er understųttet\n"
+"og aktiveret for terminalen."
 
 #: src/config/options.inc:1193
 msgid "Timer options"
@@ -4289,20 +4266,18 @@ msgstr ""
 "2 betyder altid"
 
 #: src/config/options.inc:1235
-#, fuzzy
 msgid "Tab bar at top"
-msgstr "Fanebladsskilletegn"
+msgstr "Placer faneblade i toppen af skęrmen"
 
 #: src/config/options.inc:1237
 msgid "Whether display tab bar at top like other browsers do."
-msgstr ""
+msgstr "Om faneblade skal vises i toppen af skęrmen, som andre browsere."
 
 #: src/config/options.inc:1239
 msgid "Wrap-around tabs cycling"
 msgstr "Side til side navigeringscyklus for faneblade"
 
 #: src/config/options.inc:1241
-#, fuzzy
 msgid ""
 "When moving right from the last tab, jump to the first one, and\n"
 "vice versa."
@@ -4332,14 +4307,12 @@ msgstr ""
 "sprogindstillinger vil blive anvendt."
 
 #: src/config/options.inc:1255
-#, fuzzy
 msgid "Display menu bar always"
-msgstr "Vis titelbjęlke"
+msgstr "Vis altid hovedmenubjęlke"
 
 #: src/config/options.inc:1257
-#, fuzzy
 msgid "Always show menu bar on the screen."
-msgstr "Vis titelbjęlke på skęrmen."
+msgstr "Vis altid hovedmenubjęlken på skęrmen."
 
 #: src/config/options.inc:1259
 msgid "Display status bar"
@@ -4626,7 +4599,6 @@ msgid "Saving"
 msgstr "Gemning"
 
 #: src/cookies/cookies.c:119
-#, fuzzy
 msgid "Whether cookies should be loaded from and saved to disk."
 msgstr "Om cookier skal indlęses fra og gemmes på disken."
 
@@ -4644,17 +4616,16 @@ msgstr ""
 "er deaktiveret."
 
 #: src/cookies/cookies.c:817
-#, fuzzy
 msgid "Cannot save cookies"
-msgstr "Slet alle cookier"
+msgstr "Kan ikke gemme cookier"
 
 #: src/cookies/cookies.c:828
 msgid "ELinks was started without a home directory."
-msgstr ""
+msgstr "ELinks blev startet uden en hjemmemappe."
 
 #: src/cookies/cookies.c:834
 msgid "ELinks was started with the -anonymous option."
-msgstr ""
+msgstr "ELinks blev startet med -anonymous indstillingen."
 
 #: src/cookies/dialogs.c:36 src/cookies/dialogs.c:368
 msgid "Domain"
@@ -4771,20 +4742,17 @@ msgid "Do you really want to remove all cookies?"
 msgstr "Vil du virkelig slette alle cookier?"
 
 #: src/cookies/dialogs.c:464
-#, fuzzy
 msgid "Add server"
-msgstr "Tilfųj s~killetegn"
+msgstr "Tilfųj server"
 
 #: src/cookies/dialogs.c:468
-#, fuzzy
 msgid "Server name"
-msgstr "Server"
+msgstr "Servernavn"
 
 #. accelerator_context(src/cookies/dialogs.c:cookie_buttons)
 #: src/cookies/dialogs.c:491
-#, fuzzy
 msgid "Add ~server"
-msgstr "Tilfųj s~killetegn"
+msgstr "Tilfųj ~server"
 
 #. accelerator_context(do_edit_dialog, src/cookies/dialogs.c:cookie_buttons, src/dialogs/download.c:download_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
 #: src/cookies/dialogs.c:494 src/dialogs/download.c:498 src/dialogs/edit.c:99
@@ -4946,7 +4914,7 @@ msgid "Copying"
 msgstr "Licens"
 
 #: src/dialogs/info.c:143
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "ELinks %s\n"
 "\n"
@@ -4958,10 +4926,7 @@ msgid ""
 msgstr ""
 "ELinks %s\n"
 "\n"
-"(C) 1999 - 2002 Mikulas Patocka\n"
-"(C) 2001 - 2004 Petr Baudis\n"
-"(C) 2002 - 2005 Jonas Fonseca\n"
-"med flere\n"
+"%smed flere\n"
 "\n"
 "Dette program er fri software. Du kan distribuere det og/eller ęndre det i "
 "henhold til GNU General Public License, udgivet af The Free Software "
@@ -5137,7 +5102,6 @@ msgstr "Tilf
 
 #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
 #: src/dialogs/menu.c:249 src/dialogs/menu.c:418
-#, fuzzy
 msgid "Toggle ~HTML/plain"
 msgstr "~Skift mellem HTML/tekst"
 
@@ -5566,9 +5530,8 @@ msgid "256 colors"
 msgstr "256 farver"
 
 #: src/dialogs/options.c:225
-#, fuzzy
 msgid "true color"
-msgstr "Tekstfarve"
+msgstr "rigtige farver"
 
 #: src/dialogs/options.c:309
 msgid "Resize terminal"
@@ -5746,7 +5709,6 @@ msgid "Ignore <noscript> content"
 msgstr "Ignorer <noscript> indhold"
 
 #: src/ecmascript/ecmascript.c:55
-#, fuzzy
 msgid ""
 "Whether to ignore content enclosed by the <noscript> tag\n"
 "when ECMAScript is enabled."
@@ -6330,14 +6292,15 @@ msgid "Program"
 msgstr "Program"
 
 #: src/mime/backend/default.c:74
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "External viewer for this file type. '%' in this string will be\n"
 "substituted by a file name.\n"
 "Do _not_ put single- or double-quotes around the % sign."
 msgstr ""
 "Ekstern fremviser for denne filtype. Et '%' i denne tekststreng vil\n"
-"blive erstattet af et filnavn."
+"blive erstattet af et filnavn.\n"
+"Omring _ikke_ % med enkelt- eller dobbelt-citationstegn."
 
 #: src/mime/backend/default.c:79
 msgid "File extension associations"
@@ -6427,7 +6390,6 @@ msgid "Mimetypes files"
 msgstr "Mimetypes-filer"
 
 #: src/mime/backend/mimetypes.c:48
-#, fuzzy
 msgid ""
 "Options for the support of mime.types files. These files\n"
 "can be used to find the content type of a URL by looking at\n"
@@ -6766,7 +6728,6 @@ msgstr ""
 "NNTPSERVER."
 
 #: src/network/state.c:101
-#, fuzzy
 msgid "Server hung up for some reason"
 msgstr "Serveren afbrųd forbindelsen af en eller anden grund"
 
@@ -6868,9 +6829,8 @@ msgstr "~BeOS-terminal"
 
 #. name:
 #: src/protocol/auth/auth.c:332
-#, fuzzy
 msgid "Authentication"
-msgstr "~Identitetsbekręftelse"
+msgstr "Autentifikation"
 
 #: src/protocol/auth/dialogs.c:87
 #, c-format
@@ -6881,7 +6841,6 @@ msgstr "Autentifikation p
 #. * name the protocol here.  Consider also what an FTP server
 #. * behind an HTTP proxy should be called.
 #: src/protocol/auth/dialogs.c:102
-#, fuzzy
 msgid "Authentication required"
 msgstr "Autentifikation påkręvet"
 
@@ -7041,9 +7000,8 @@ msgid ""
 msgstr ""
 
 #: src/protocol/bittorrent/bittorrent.c:73
-#, fuzzy
 msgid "User identification string"
-msgstr "Identifikation af brugeragent"
+msgstr "Brugeridentifikationsstreng"
 
 #: src/protocol/bittorrent/bittorrent.c:75
 msgid ""
@@ -7541,7 +7499,6 @@ msgid "Show hidden files in directory listing"
 msgstr "Vis skjulte filer i katalogoversigter"
 
 #: src/protocol/file/file.c:52
-#, fuzzy
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
 "hidden in local directory listings."
@@ -7576,24 +7533,20 @@ msgstr "Finger"
 
 #. name:
 #: src/protocol/fsp/fsp.c:45 src/protocol/fsp/fsp.c:57
-#, fuzzy
 msgid "FSP"
-msgstr "FTP"
+msgstr "FSP"
 
 #: src/protocol/fsp/fsp.c:47
-#, fuzzy
 msgid "FSP specific options."
-msgstr "FTP-specifikke indstillinger."
+msgstr "FSP-specifikke indstillinger."
 
 #: src/protocol/fsp/fsp.c:49
-#, fuzzy
 msgid "Sort entries"
-msgstr "Smarte pręfikser"
+msgstr "Sortér filer"
 
 #: src/protocol/fsp/fsp.c:51
-#, fuzzy
 msgid "Whether to sort entries in directory listings."
-msgstr "Vis skjulte filer i katalogoversigter"
+msgstr "Om filer skal sorteres i katalogoversigter."
 
 #. name:
 #: src/protocol/ftp/ftp.c:56 src/protocol/ftp/ftp.c:86
@@ -7869,7 +7822,6 @@ msgid "User-agent identification"
 msgstr "Identifikation af brugeragent"
 
 #: src/protocol/http/http.c:192
-#, fuzzy
 msgid ""
 "Change the User Agent ID. That means identification string, which\n"
 "is sent to HTTP server when a document is requested. The 'textmode'\n"
@@ -7889,12 +7841,12 @@ msgstr ""
 "en standard for nye tekstbaserede brugeragenter, så webredaktųrer\n"
 "på en nem og ensartet måde kan undersųge dette, hvis de eksempelvis\n"
 "automatisk kan generere en letvęgts version.\n"
+"Sęt til \" \" hvis du ikke ųnsker at User-Agent bliver sendt i\n"
+"protokolhovedet.\n"
 "%v erstattes med ELinks' versionsnummer\n"
 "%s erstattes med identifikationsstreng for systemet\n"
 "%t erstattes med stųrrelsen af terminalen\n"
-"%b erstattes med antallet af bjęlker der vises af ELinks\n"
-"Sęt til \" \" hvis du ikke ųnsker at User-Agent bliver sendt i\n"
-"protokolhovedet."
+"%b erstattes med antallet af bjęlker der vises af ELinks."
 
 #: src/protocol/http/http.c:205
 msgid "HTTPS"
@@ -8012,7 +7964,6 @@ msgid "Enable dumb prefixes"
 msgstr "Aktivér simple pręfikser"
 
 #: src/protocol/rewrite/rewrite.c:55
-#, fuzzy
 msgid ""
 "Enable dumb prefixes - simple URI abbreviations which can\n"
 "be written to the Goto URL dialog instead of actual URIs - i.e.\n"
@@ -8022,7 +7973,7 @@ msgstr ""
 "Anvend simple pręfikser - simple URI forkortelser som skrives\n"
 "i Gå til adresse dialogvinduet i stedet for de egentlige adresser.\n"
 "Eksempelvis kan du skrive 'elinks' og blive omdirigeret til\n"
-"http://elinks.or.cz/."
+"http://elinks.cz/."
 
 #: src/protocol/rewrite/rewrite.c:60
 msgid "Enable smart prefixes"
@@ -8103,7 +8054,11 @@ msgstr ""
 "i \"Gå til\"-dialogboks ikke ligner en URI eller et filnavn (dvs.\n"
 "indeholder ikke tegnene '.', ':' eller '/') og som ikke er en\n"
 "konfigureret omskrivningspręfiks. Sęt til den tomme string (\"\")\n"
-"for at deaktiverer standard omskrivningsreglen."
+"for at deaktiverer standard omskrivningsreglen.\n"
+"%c erstattes med af den aktuelle adresse\n"
+"%s erstattes med hele argumentet fra dialogenboksen\n"
+"%0,%1,...,%9 erstattes med det 0., 1., ..., 9. argument\n"
+"%% erstattes med \"%\"."
 
 #. name:
 #: src/protocol/rewrite/rewrite.c:372
@@ -8180,9 +8135,8 @@ msgstr "Intet program angivet for protokol %s."
 
 #. name:
 #: src/scripting/guile/guile.c:16
-#, fuzzy
 msgid "Guile"
-msgstr "Fil"
+msgstr "Guile"
 
 #: src/scripting/lua/core.c:321 src/scripting/python/keybinding.c:151
 msgid "Error registering event hook"
@@ -8211,15 +8165,13 @@ msgstr ""
 
 #. name:
 #: src/scripting/perl/perl.c:16
-#, fuzzy
 msgid "Perl"
-msgstr "Peers"
+msgstr "Perl"
 
 #. name:
 #: src/scripting/python/python.c:18
-#, fuzzy
 msgid "Python"
-msgstr "Sti"
+msgstr "Python"
 
 #: src/scripting/ruby/core.c:131 src/scripting/ruby/core.c:184
 msgid "Ruby Message"
@@ -8228,21 +8180,21 @@ msgstr "Ruby-besked"
 #. name:
 #: src/scripting/ruby/ruby.c:16
 msgid "Ruby"
-msgstr ""
+msgstr "Ruby"
 
 #: src/scripting/scripting.c:44
 #, c-format
 msgid "[%s error] %s"
-msgstr ""
+msgstr "[%s fejl] %s"
 
 #: src/scripting/scripting.c:60
 #, c-format
 msgid "An error occurred while running a %s script"
-msgstr ""
+msgstr "En fejl opstod mens et %s script blev eksekveret"
 
 #: src/scripting/scripting.c:66
 msgid "Browser scripting error"
-msgstr ""
+msgstr "Browser scriptningsfejl"
 
 #. name:
 #: src/scripting/scripting.c:94
@@ -8250,15 +8202,13 @@ msgid "Scripting"
 msgstr "Scriptning"
 
 #: src/scripting/smjs/elinks_object.c:86
-#, fuzzy
 msgid "User script alert"
-msgstr "JavaScript advarsel"
+msgstr "Bruger script advarsel"
 
 #. name:
 #: src/scripting/smjs/smjs.c:16
-#, fuzzy
 msgid "Spidermonkey ECMAScript"
-msgstr "ECMAScript"
+msgstr "Spidermonkey ECMAScript"
 
 #: src/session/download.c:233 src/session/download.c:330
 #: src/session/download.c:561 src/session/download.c:649
@@ -8334,9 +8284,9 @@ msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr "Hvad vil du gųre med filen \"%s\" (type: %s%s%s)?"
 
 #: src/session/download.c:1137
-#, fuzzy, c-format
+#, c-format
 msgid "What would you like to do with the file (type: %s%s%s)?"
-msgstr "Hvad vil du gųre med filen \"%s\" (type: %s%s%s)?"
+msgstr "Hvad vil du gųre med filen (type: %s%s%s)?"
 
 #: src/session/download.c:1165
 #, no-c-format
@@ -8549,9 +8499,9 @@ msgid "Missing fragment"
 msgstr "Manglende fragment"
 
 #: src/viewer/text/draw.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "The requested fragment \"%s\" doesn't exist."
-msgstr "Den forespurgte fragment \"#%s\" findes ikke."
+msgstr "Det forespurgte fragment \"%s\" findes ikke."
 
 #: src/viewer/text/form.c:1049
 msgid "Error while posting form"
@@ -8631,14 +8581,12 @@ msgid "press %s to post to %s"
 msgstr "tast %s for at sende til %s"
 
 #: src/viewer/text/form.c:2045
-#, fuzzy
 msgid "Useless button"
 msgstr "Harmlųs knap"
 
 #: src/viewer/text/form.c:2047
-#, fuzzy
 msgid "Submit button"
-msgstr "Send formular til"
+msgstr "Sendknap"
 
 #. accelerator_context(link_menu.map)
 #: src/viewer/text/link.c:1280
@@ -8727,9 +8675,8 @@ msgstr "Indsend formular og ~overf
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
 #: src/viewer/text/link.c:1363
-#, fuzzy
 msgid "Form f~ields"
-msgstr "Adgangskodefelt"
+msgstr "Form~ularfelter"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
 #: src/viewer/text/link.c:1370
@@ -8863,47 +8810,10 @@ msgstr "Fejl ved skrivning til fil"
 
 #. name:
 #: src/viewer/timer.c:88
-#, fuzzy
 msgid "Timer"
-msgstr "Titel"
+msgstr "Stopur"
 
 #. name:
 #: src/viewer/viewer.c:25
-#, fuzzy
 msgid "Viewer"
-msgstr "~Vis"
-
-#~ msgid "Delete text from clipboard"
-#~ msgstr "Slet tekst fra klippebord"
-
-#~ msgid " (built on %s %s)"
-#~ msgstr " (bygget på %s %s)"
-
-#~ msgid "HTTP Authentication"
-#~ msgstr "HTTP-autentifikation"
-
-#~ msgid "Rules for passing URIs to external commands."
-#~ msgstr "Regler for håndtering af adresser af eksterne kommandoer."
-
-#~ msgid "~Clear"
-#~ msgstr "~Ryd"
-
-#~ msgid "SEE Message"
-#~ msgstr "SEE besked"
-
-#~ msgid "ELinks Cvs ~History"
-#~ msgstr "ELinks CVS ~historik"
-
-#~ msgid "ELinks ~LXR"
-#~ msgstr "ELinks ~LXR"
-
-#~ msgid "HTTP 100 (???)"
-#~ msgstr "HTTP 100 (???)"
-
-#~ msgid "Ruby Error"
-#~ msgstr "Ruby-fejl"
-
-#~ msgid "%d byte"
-#~ msgid_plural "%d bytes"
-#~ msgstr[0] "%d byte"
-#~ msgstr[1] "%d bytes"
+msgstr "Fremviser"

From d5dcdb4d9275769863489f835d38cb415b82f736 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Wed, 2 Jul 2008 00:46:05 +0300
Subject: [PATCH 18/43] mkdist: separate md5 file for each file

md5sum -c exits with code 1 if some of the files listed in the md5
file are missing, so each md5 file should list only those files that
the user is supposed to download together.  This is also how
elinks-web/download.html has been set up.
---
 contrib/mkdist | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/mkdist b/contrib/mkdist
index 3c56dd79..e56cb032 100755
--- a/contrib/mkdist
+++ b/contrib/mkdist
@@ -140,13 +140,14 @@ mv -- "$tmpdir/elinks" "$tmpdir/$tartopdir"
 (set -e
  cd -- "$tmpdir"
  tar cf "$tarbasename.tar" "$tartopdir"
- md5sum --binary -- "$tarbasename.tar" > "$tarbasename.md5"
  bzip2 --keep -- "$tarbasename.tar"
  gzip -9 -- "$tarbasename.tar"
- md5sum --binary -- "$tarbasename.tar.gz" "$tarbasename.tar.bz2" >> "$tarbasename.md5"
+ md5sum --binary -- "$tarbasename.tar.gz" > "$tarbasename.tar.gz.md5"
+ md5sum --binary -- "$tarbasename.tar.bz2" > "$tarbasename.tar.bz2.md5"
 ) || exit 1
  
-mv -- "$tmpdir/$tarbasename.tar.gz"	"$outdir"
-mv -- "$tmpdir/$tarbasename.tar.bz2"	"$outdir"
-mv -- "$tmpdir/$tarbasename.md5"	"$outdir"
+mv -- "$tmpdir/$tarbasename.tar.gz"      "$outdir"
+mv -- "$tmpdir/$tarbasename.tar.bz2"     "$outdir"
+mv -- "$tmpdir/$tarbasename.tar.gz.md5"  "$outdir"
+mv -- "$tmpdir/$tarbasename.tar.bz2.md5" "$outdir"
 rm -rf -- "$tmpdir"

From 45f237a26c904a8066b1f0267b10b3384b7540fd Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Wed, 2 Jul 2008 00:58:04 +0300
Subject: [PATCH 19/43] release: more like what I actually did with 0.12pre1

In particular:
- mkdist takes options and need not be run at elinks.cz
- git push just the single tag, rather than all --tags
- explicitly avoid multipart/signed
- add the release date from the elinks-users archive to NEWS
- update download.txt, release.html, and bugzilla/milestones/elinks.html
---
 doc/release.txt | 50 +++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/doc/release.txt b/doc/release.txt
index f51f9b9c..2e05f85d 100644
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -4,14 +4,13 @@ Release check list
 When releasing a new version
 ----------------------------
 
-1. Tasks in the elinks module:
+1. Tasks in the elinks module (part 1):
 
  - Go over the changes since the last release. Use git-shortlog as a template.
    Write a small changelog highlighting the most important changes. Changes
    by new contributors are always important!
  - Update NEWS file and commit. Remember to add the new version number!
-   Don't add the release date yet though; it will be added after the release,
-   from the date in the mailing list archives. 
+   Don't add the release date yet though; you will add it in a later step.
  - Change VERSION in the top of configure.in to hold the new version number.
  - Update the manpages so the will have the new release number by first
    building the source, followed by making the `update-man' target in doc/.
@@ -22,58 +21,73 @@ When releasing a new version
 
 	$ git tag -s -F changelog.file elinks-X.X.X
 
+ - Run script to create new tarballs (both .gz and .bz2).
+
+	$ contrib/mkdist -g "$PWD/.git" -r elinks-X.X.X -l X.X.X
+
+   This step also builds the elinks binary and documentation based on
+   the label, and that might fail because of some bug, so it's best to
+   do this before pushing anything.
+
+ - Create ASCII armored signature files.
+
+	$ gpg -b --armor elinks-X.X.X.tar.bz2
+	$ gpg -b --armor elinks-X.X.X.tar.gz
+
  - Append ".GIT" to the VERSION variable in the top of configure.in.
  - Commit only this change.
  - Push these changes plus tag using:
 
 	$ git push
-	$ git push --tags
+	$ git push tag elinks-X.X.X
 
 2. Tasks on http://elinks.cz/ (part 1):
 
  - Wait until the tag etc. has been synced or force a sync of the repository
    at http://elinks.cz/elinks.git/.
- - Run script to create new tarballs (both .gz and .bz2).
-
-	$ mkdist elinks-X.X.X X.X.X -r
 
 3. Tasks on localhost:
 
- - Download new tarballs and create ASCII armored signature files.
+ - Copy the elinks-X.X.X.tar.* files to http://elinks.cz/download/.
+ - Send announcement to elinks-users mailing list.  Do not format it
+   as multipart/signed because the linuxfromscratch archive does not
+   display such messages properly.
+ - Wait for the announcement to hit the elinks-users mailing list archive.
 
-	$ gpg -b --armor elinks-X.X.X.tar.bz2
-	$ gpg -b --armor elinks-X.X.X.tar.gz
+4. Tasks in the elinks module (part 2):
 
- - Copy the elinks-X.X.X.tar.*.asc files to http://elinks.cz/download/.
- - Send announcement to elinks-users mailing list.
+ - Add the release date from the mailing list archive to NEWS.
+ - Commit and push that change.
 
-4. Tasks in the elinks-web module:
+5. Tasks in the elinks-web module:
 
  - Change the version and release data in the start of website.conf.
- - Wait for the announcement to hit the elinks-users mailing list archive.
+   Also change download.txt if necessary.
  - Add paraphrased version of the first paragraph of the release announcement
    as a news entry in news/latest.txt. Make the entry link to both the
    archived announcement from linuxfromscratch.org and gmane.org using the
    "magic numbers" expanded by the macro. Possibly, move the cut-off markers
    that control which news entries to display on the front page.
- - Rebuild index.html, download.html, news.html, and news.rss.
+ - Rebuild index.html, download.html, news.html, news.rss, and release.html.
+ - Update bugzilla/milestones/elinks.html if the release corresponds
+   to a reached milestone.
  - Commit the updates HTML and asciidoc files.
  - Push the commits.
 
-5. Tasks on http://elinks.cz/ (part 2):
+6. Tasks on http://elinks.cz/ (part 2):
 
  - Wait until the elinks-web module has been synced or force a sync of the
    repository.
  - Checkout the new updated webpages.
 
-6. Tasks on http://bugzilla.elinks.cz/:
+7. Tasks on http://bugzilla.elinks.cz/:
 
  - Add the new version.
  - Add a comment to each bug fixed in this version.  If some of them
    are already VERIFIED, change them to CLOSED, unless they are also
    waiting for a release in another branch.
 
-7. Tasks external sites and resources:
+8. Tasks external sites and resources:
 
  - Add a new release to the freshmeat.net page.
  - Change topic of #elinks

From 14cb43f403d56427c6af13c0207c4492192236a2 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Wed, 2 Jul 2008 16:04:54 +0300
Subject: [PATCH 20/43] grafthistory: support curl

Mac OS X comes with curl (in the com.apple.pkg.BSD package)
but not with wget.
---
 contrib/grafthistory.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/contrib/grafthistory.sh b/contrib/grafthistory.sh
index 950b385a..3721400a 100755
--- a/contrib/grafthistory.sh
+++ b/contrib/grafthistory.sh
@@ -4,8 +4,12 @@
 #
 # Note that this will download about 80M.
 
-if [ -z "`which wget 2>/dev/null`" ]; then
-  echo "Error: You need to have wget installed so that I can fetch the history." >&2
+if [ -n "`which wget 2>/dev/null`" ]; then
+  downloader="wget -c"
+elif [ -n "`which curl 2>/dev/null`" ]; then
+  downloader="curl -C - -O"
+else
+  echo "Error: You need to have wget or curl installed so that I can fetch the history." >&2
   exit 1
 fi
 
@@ -24,8 +28,8 @@ echo "ELinks history converted from CVS.  Keep this pack separate to speed up gi
 # pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.idx is 3163784 bytes long.
 # Downloading it takes less than 6 seconds here, whereas generating it
 # with git index-pack takes over 4 minutes (750 MHz Duron, git 1.5.4.1).
-wget -c http://elinks.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.idx
-wget -c http://elinks.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.pack
+$downloader http://elinks.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.idx
+$downloader http://elinks.cz/elinks-history.git/objects/pack/pack-0d6c5c67aab3b9d5d9b245da5929c15d79124a48.pack
 
 echo "[grafthistory] Setting up the grafts"
 cd ../..

From 3f8dee5a5ecbcd136ee855c17834d012ab8a316b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Wed, 2 Jul 2008 20:25:28 +0300
Subject: [PATCH 21/43] AUTHORS: Taking credit.

---
 AUTHORS | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 0ca2ce93..6c996a0a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -279,9 +279,11 @@ Julian Kinraid <jkinraid@clear.net.nz>
 	QNX-related fixes
 
 Kalle Olavi Niemitalo <kon@iki.fi>
-	HTTP Accept-Charset header fix
-	Finnish translation update
-	Fixed unnecessary or possibly skipped calls to bind_textdomain_codeset()
+	Scanning PO files for accelerator conflicts (msgaccel)
+	UTF-8 and terminal support enhancements
+	Build system fixes
+	Finnish translation updates
+	Random hacking
 
 Kaloian Doganov <kaloian@europe.com>
 	Bulgarian translation

From 26e8e52f231c4198f97b669c243e8b3bdec3e4e8 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Wed, 2 Jul 2008 15:02:49 +0200
Subject: [PATCH 22/43] Fix sgml-parser so it compiles

The test does however segfault in the incremental parsing test.
---
 src/dom/test/sgml-parser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dom/test/sgml-parser.c b/src/dom/test/sgml-parser.c
index eee862ae..9e106ade 100644
--- a/src/dom/test/sgml-parser.c
+++ b/src/dom/test/sgml-parser.c
@@ -252,6 +252,7 @@ main(int argc, char *argv[])
 	enum sgml_parser_type type = SGML_PARSER_STREAM;
 	enum dom_code code = 0;
 	enum dom_config_flag normalize_flags = 0;
+	struct dom_config config;
 	int normalize = 0;
 	int dump = 0;
 	int complete = 1;
@@ -310,7 +311,7 @@ main(int argc, char *argv[])
 
 	parser->error_func = sgml_error_function;
 	if (normalize)
-		add_dom_config_normalizer(&parser->stack, normalize_flags);
+		add_dom_config_normalizer(&parser->stack, &config, normalize_flags);
 	else if (!dump)
 		add_dom_stack_context(&parser->stack, NULL, &sgml_parser_test_context_info);
 

From a5574ce37ed1492b3ec0ab11008f2451a1f5bad3 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Thu, 3 Jul 2008 01:55:03 +0200
Subject: [PATCH 23/43] Continue if a test fails

---
 Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.lib b/Makefile.lib
index 03bb7d8c..428026ec 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -230,7 +230,7 @@ export TEST_LIB
 TESTS = $(wildcard $(srcdir)test-*)
 
 $(TESTS): $(addsuffix .o,$(TEST_PROGS)) $(TEST_PROGS)
-	@echo "*** $(notdir $@) ***"; \
+	@-echo "*** $(notdir $@) ***"; \
 	$(call shellquote,$(SHELL)) $@ $(TEST_OPTS)
 
 test-default: $(TESTS)

From 429e08e0736562df4e1ab6f31ab8f9b4d4d98f86 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 10 Jun 2007 18:13:03 +0200
Subject: [PATCH 24/43] bug 955: Do not call onsubmit for RESET.

---
 src/viewer/text/link.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index ab5f7252..f50f01f5 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -912,7 +912,7 @@ call_onsubmit_and_submit(struct session *ses, struct document_view *doc_view,
 	 * explicitly tell the ECMAScript code which of them was
 	 * pressed.  W3C DOM Level 3 doesn't seem to include such a
 	 * feature.  */
-	if (fc->form->onsubmit) {
+	if (fc->type != FC_RESET && fc->form->onsubmit) {
 		struct string code;
 
 		if (init_string(&code)) {

From 5733f1785643fd327aa74a91d1ef756d3ebb8565 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah.masters@gmail.com>
Date: Wed, 11 Jun 2008 14:44:00 +0200
Subject: [PATCH 25/43] goto_current_link: do nothing on input buttons

The following is in the HTML 4 standard
(<http://www.w3.org/TR/html401/interact/forms.html#push-button>):

    push buttons: Push buttons have no default behavior. Each push
    button may have client-side scripts associated with the element's
    event attributes. When an event occurs (e.g., the user presses the
    button, releases it, etc.), the associated script is triggered.

Currently, a button such created by such HTML as "<input type="button"
value="foo" />" submits the form by default in ELinks.  According to
the above, it shouldn't.
---
 src/viewer/text/link.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index f50f01f5..6bb04d87 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -960,7 +960,8 @@ goto_current_link(struct session *ses, struct document_view *doc_view, int do_re
 	if (link_is_form(link)) {
 		struct form_control *fc = link->data.form_control;
 
-		if (!call_onsubmit_and_submit(ses, doc_view, fc, do_reload))
+		if (fc->type != FC_BUTTON
+		    && !call_onsubmit_and_submit(ses, doc_view, fc, do_reload))
 			return NULL;
 		else
 			return link;

From aa681786d95dbc4a92d10ecaa1a4492743fe6334 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Thu, 3 Jul 2008 12:37:28 +0300
Subject: [PATCH 26/43] NEWS: list bug 955; add 0.12pre1.GIT section

---
 NEWS | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/NEWS b/NEWS
index a50ac841..12e2af66 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,17 @@ You can see the complete list of recent changes, bugfixes and new features
 in the http://repo.or.cz/w/elinks.git[gitweb interface]. See the ChangeLog
 file for details.
 
+ELinks 0.12pre1.GIT now:
+------------------------
+
+To be released as 0.12pre2, 0.12rc1, or even 0.12.0.
+
+Bugs that should be removed from NEWS before the 0.12.0 release:
+
+* bug 955: Reset buttons no longer run FORM/@onsubmit, and
+  ``harmless'' buttons no longer submit the form.  ELinks 0.12pre1
+  was the first release that had these bugs.
+
 ELinks 0.12pre1:
 ----------------
 

From 5c0128d82d4bd9d706ec36cc2e13cd3492ff3181 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 4 Jul 2008 16:42:35 +0300
Subject: [PATCH 27/43] Bug 1021: initialize version in http_got_header

gcc-4.3 -O2 was complaining that http_got_header may use uninitialized
version.major and version.minor.  That indeed happened with HTTP/0.9
servers, and the PRE_HTTP_1_1(version) check then had an undefined
result, so http->close could remain 0 even though it should have
become 1; fortunately, it was then set to 1 anyway, because there was
no Content-Length header.  The undefined version was also saved in
http->recv_version, but it appears nothing ever reads that.  So in the
end, the bug did not cause any symptoms at runtime, but the warning
broke the build on gcc-4.3 if ELinks was configured with --enable-debug.
---
 src/protocol/http/http.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/protocol/http/http.c b/src/protocol/http/http.c
index e0887a09..10ab31da 100644
--- a/src/protocol/http/http.c
+++ b/src/protocol/http/http.c
@@ -1453,7 +1453,7 @@ http_got_header(struct socket *socket, struct read_buffer *rb)
 #endif
 	unsigned char *d;
 	struct uri *uri = conn->proxied_uri; /* Set to the real uri */
-	struct http_version version;
+	struct http_version version = { 0, 9 };
 	enum connection_state state = (conn->state != S_PROC ? S_GETH : S_PROC);
 	int a, h = 200;
 	int cf;
@@ -1482,6 +1482,9 @@ again:
 		read_from_socket(conn->socket, rb, state, http_got_header);
 		return;
 	}
+	/* a == -2 from get_header means HTTP/0.9.  In that case, skip
+	 * the get_http_code call; @h and @version have already been
+	 * initialized with the right values.  */
 	if (a == -2) a = 0;
 	if ((a && get_http_code(rb, &h, &version))
 	    || h == 101) {

From 9c73f020838fb82df9228a44edb8c30aa7aee51d Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 4 Jul 2008 23:01:42 +0300
Subject: [PATCH 28/43] NEWS: mention bug 1021, sync with 0.11.4.GIT

Because http://elinks.cz/release.html is made from this file,
I think we'll have to list both 0.11.4.GIT and 0.12pre1.GIT
even though it's a bit difficult to explain which fixes are
in which releases.
---
 NEWS | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 12e2af66..c1e29b23 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,8 @@ file for details.
 ELinks 0.12pre1.GIT now:
 ------------------------
 
-To be released as 0.12pre2, 0.12rc1, or even 0.12.0.
+To be released as 0.12pre2, 0.12rc1, or even 0.12.0.  This branch
+generally also includes the bug fixes made in ELinks 0.11.4.GIT.
 
 Bugs that should be removed from NEWS before the 0.12.0 release:
 
@@ -19,7 +20,8 @@ Bugs that should be removed from NEWS before the 0.12.0 release:
 ELinks 0.12pre1:
 ----------------
 
-Released on 2008-07-01.
+Released on 2008-07-01.  This release also included all the bug fixes
+of ELinks 0.11.4.
 
 Notable new features:
 
@@ -172,6 +174,13 @@ Changes in the experimental SGML/DOM implementation:
 * enhancement: incremental parsing
 * and more.
 
+ELinks 0.11.4.GIT now:
+----------------------
+
+To be released as 0.11.5.
+
+* build bug 1021: fixed uninitialized variable in http_got_header
+
 ELinks 0.11.4:
 --------------
 

From 4ffe6a1b6d774cf79ea655745eaebef4d3b71afb Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 4 Jul 2008 23:56:10 +0300
Subject: [PATCH 29/43] mkdist: include po/elinks.pot

---
 contrib/mkdist | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contrib/mkdist b/contrib/mkdist
index e56cb032..4d392c4a 100755
--- a/contrib/mkdist
+++ b/contrib/mkdist
@@ -132,6 +132,13 @@ else
 	make -C "$tmpdir/elinks/build/doc" html
 	mkdir -- "$tmpdir/elinks/doc/html"
 	mv -- "$tmpdir/elinks/build/doc"/*.html* "$tmpdir/elinks/doc/html/"
+	# <http://translationproject.org/html/maintainers.html>:
+	# "this tarball should contain an up to date POT file."
+	# Build that here.  The Makefile also creates potfiles.list
+	# in the source directory; that one we don't need.
+	# Use rm -f so it's not an error if the file is not there.
+	make -C "$tmpdir/elinks/build/po" ../../po/elinks.pot
+	rm -f -- "$tmpdir/elinks/po/potfiles.list"
 fi
 
 rm -rf -- "$tmpdir/elinks/build"

From 3a978bd0d8ee79aea95e00ef4bc4f43df78a02aa Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 5 Jul 2008 15:59:44 +0300
Subject: [PATCH 30/43] po/Makefile: put potfiles.list in build tree, not
 source

This is so that contrib/mkdist need not delete that explicitly
(although it still does, in order to do the right thing with
a few older versions too).

The file could apparently be removed altogether (see recent
emails on elinks-dev) but a small change like this is less
likely to cause any surprises.
---
 po/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/Makefile b/po/Makefile
index 29735600..469e0ff4 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -48,12 +48,12 @@ all-local: $(CATALOGS)
 # This pulls in _all_ .c and .h files in the src directory. Even files that has
 # not been added to the git repo. Beware of junk entries!
 
-$(srcdir)$(POTFILES_ABS_LIST): $(POTFILES_REL)
+$(POTFILES_ABS_LIST): $(POTFILES_REL)
 	@( cd $(top_srcdir); \
 	  find src/ -type f -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort ) \
-	 > $(srcdir)$(POTFILES_ABS_LIST)
+	 > $(POTFILES_ABS_LIST)
 
-$(srcdir)$(PACKAGE).pot: $(srcdir)$(POTFILES_ABS_LIST) $(srcdir)perl/msgaccel-prepare
+$(srcdir)$(PACKAGE).pot: $(POTFILES_ABS_LIST) $(srcdir)perl/msgaccel-prepare
 	$(XGETTEXT) --default-domain=$(PACKAGE) \
 		    --directory=$(top_srcdir) \
 		    --add-comments --language=C \
@@ -75,7 +75,7 @@ $(srcdir)$(PACKAGE).pot: $(srcdir)$(POTFILES_ABS_LIST) $(srcdir)perl/msgaccel-pr
 		    --flag=_:1:pass-c-format --flag=N_:1:pass-c-format \
 		    --flag=n_:1:pass-c-format --flag=n_:2:pass-c-format \
 		    --flag=N__:1:pass-c-format \
-		    -f $(srcdir)$(POTFILES_ABS_LIST) \
+		    -f $(POTFILES_ABS_LIST) \
 	&& test -f $(PACKAGE).po \
 	&& $(PERL) -I"$(srcdir)perl" $(srcdir)perl/msgaccel-prepare -S"$(top_srcdir)" $(PACKAGE).po \
 	&& mv -f $(PACKAGE).po $(srcdir)$(PACKAGE).pot
@@ -131,6 +131,6 @@ uninstall-local:
 	)
 
 clean-local:
-	@rm -f $(PACKAGE).po *.new.po $(srcdir)$(POTFILES_ABS_LIST)
+	@rm -f $(PACKAGE).po *.new.po $(POTFILES_ABS_LIST)
 
 include $(top_srcdir)/Makefile.lib

From 749dcb09eed7571a3a961445b64389dcaae71733 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 5 Jul 2008 18:12:42 +0300
Subject: [PATCH 31/43] po/Makefile: use xgettext --msgid-bugs-address

http://elinks.cz/community.html says bugs should be reported
to elinks-users but patches should be sent to elinks-dev.
I guess elinks-users is more appropriate here.
---
 po/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/po/Makefile b/po/Makefile
index 469e0ff4..e7a49d67 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -53,9 +53,12 @@ $(POTFILES_ABS_LIST): $(POTFILES_REL)
 	  find src/ -type f -name '*.[ch]' -o -name options.inc -o -name 'actions-*.inc' | sort ) \
 	 > $(POTFILES_ABS_LIST)
 
+# xgettext --flag requires GNU gettext 0.13 or later;
+# --msgid-bugs-address requires 0.12 or later.
 $(srcdir)$(PACKAGE).pot: $(POTFILES_ABS_LIST) $(srcdir)perl/msgaccel-prepare
 	$(XGETTEXT) --default-domain=$(PACKAGE) \
 		    --directory=$(top_srcdir) \
+		    --msgid-bugs-address=elinks-users@linuxfromscratch.org \
 		    --add-comments --language=C \
 		    --keyword=_ --keyword=N_ --keyword=n_:1,2 --keyword=N__ \
 		    --flag=msg_text:2:c-format --flag=die:1:c-format \

From 6c7986e118177951c82dd06c5b2ced4ffed66502 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 5 Jul 2008 18:16:36 +0300
Subject: [PATCH 32/43] faq: character droppings

---
 doc/faq.txt | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/doc/faq.txt b/doc/faq.txt
index f7ff4b24..9c45e4c3 100644
--- a/doc/faq.txt
+++ b/doc/faq.txt
@@ -3,7 +3,7 @@ Frequently Asked Questions
 :Description:	FAQ for the ELinks project
 
 This is an attempt to capture some of the questions that appear once in a
-while on the mailing list.
+while on the mailing list or on IRC.
 
 
 [[instances]]
@@ -142,3 +142,35 @@ The new ELinks versions (from 0.9.0 on) send:
 You should therefore check against something like /^ELinks[\/ ]/, since more
 fields can be added inside the parenthesis in subsequent versions.  Note that
 users can change their User-Agent through the options system.
+
+
+[[droppings]]
+ELinks doesn't erase characters from the screen when it should
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you scroll a web page, you may see ELinks leave some characters
+on the screen even though it should have erased them.  Pressing Ctrl+L
+usually removes these droppings until you scroll again.  There are
+a few possible reasons:
+
+- ELinks 0.11.* in a UTF-8 locale.  By default, ELinks guesses the
+  charset of the terminal from the environment variables LANG,
+  LC_CTYPE, and LC_ALL.  ELinks 0.11 versions do not support UTF-8
+  as this charset.  To use ELinks 0.11 on a UTF-8 terminal, you
+  should instead enable UTF-8 I/O via the Setup -> Terminal options
+  dialog box, and choose a charset from Setup -> Character set.
+  This limitation has been removed in ELinks 0.12pre1.
+
+- Web pages may use nonspacing combining characters or Unicode control
+  characters, which ELinks does not support.  This happens especially
+  on http://en.wikipedia.org/wiki/Special:Recentchanges[], where the
+  server generates U+200E LEFT-TO-RIGHT MARK characters.
+  ELinks 0.13.GIT now has some support for these characters; see
+  http://bugzilla.elinks.or.cz/show_bug.cgi?id=824[ELinks bug 824].
+
+- Some versions of the Terminal application in Mac OS X appear to
+  have a setting that makes line-drawing characters take up the
+  space of two ASCII letters.  ELinks does not expect this.
+  To avoid the incompatibility, either disable the setting in the
+  Terminal application or select "No frames" in the Terminal options
+  dialog box of ELinks.

From 8bd7d6b61a8aaadc22f147ac7720c8b75fc35311 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 7 Jul 2008 08:56:44 +0300
Subject: [PATCH 33/43] faq: rewording

---
 doc/faq.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/faq.txt b/doc/faq.txt
index 9c45e4c3..115b5c00 100644
--- a/doc/faq.txt
+++ b/doc/faq.txt
@@ -145,8 +145,8 @@ users can change their User-Agent through the options system.
 
 
 [[droppings]]
-ELinks doesn't erase characters from the screen when it should
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ELinks doesn't erase characters from the screen when it should!
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When you scroll a web page, you may see ELinks leave some characters
 on the screen even though it should have erased them.  Pressing Ctrl+L
@@ -162,11 +162,11 @@ a few possible reasons:
   This limitation has been removed in ELinks 0.12pre1.
 
 - Web pages may use nonspacing combining characters or Unicode control
-  characters, which ELinks does not support.  This happens especially
-  on http://en.wikipedia.org/wiki/Special:Recentchanges[], where the
-  server generates U+200E LEFT-TO-RIGHT MARK characters.
+  characters that ELinks does not recognize as such.  This happens
+  especially on http://en.wikipedia.org/wiki/Special:RecentChanges[],
+  where the server generates U+200E LEFT-TO-RIGHT MARK characters.
   ELinks 0.13.GIT now has some support for these characters; see
-  http://bugzilla.elinks.or.cz/show_bug.cgi?id=824[ELinks bug 824].
+  http://bugzilla.elinks.cz/show_bug.cgi?id=824[ELinks bug 824].
 
 - Some versions of the Terminal application in Mac OS X appear to
   have a setting that makes line-drawing characters take up the

From 38779902a049d1db3b30c9474b2c212db921ed9b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 7 Jul 2008 08:57:01 +0300
Subject: [PATCH 34/43] po/Makefile: removed && between commands

It is not necessary: when a rule has multiple commands in it, GNU Make
(which ELinks requires anyway) runs them one at a time, regardless of
the -j option, and skips the remaining commands when one of them
fails, regardless of the -k option.  These options take effect at the
level of targets rather than individual commands.
---
 po/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/Makefile b/po/Makefile
index e7a49d67..772b5eb7 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -78,10 +78,10 @@ $(srcdir)$(PACKAGE).pot: $(POTFILES_ABS_LIST) $(srcdir)perl/msgaccel-prepare
 		    --flag=_:1:pass-c-format --flag=N_:1:pass-c-format \
 		    --flag=n_:1:pass-c-format --flag=n_:2:pass-c-format \
 		    --flag=N__:1:pass-c-format \
-		    -f $(POTFILES_ABS_LIST) \
-	&& test -f $(PACKAGE).po \
-	&& $(PERL) -I"$(srcdir)perl" $(srcdir)perl/msgaccel-prepare -S"$(top_srcdir)" $(PACKAGE).po \
-	&& mv -f $(PACKAGE).po $(srcdir)$(PACKAGE).pot
+		    -f $(POTFILES_ABS_LIST)
+	test -f $(PACKAGE).po
+	$(PERL) -I"$(srcdir)perl" $(srcdir)perl/msgaccel-prepare -S"$(top_srcdir)" $(PACKAGE).po
+	mv -f $(PACKAGE).po $(srcdir)$(PACKAGE).pot
 
 
 ### Updating po and gmo files

From 01d5501228515fb9b959b14a37b2b99a19b7b052 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 7 Jul 2008 09:43:35 +0300
Subject: [PATCH 35/43] po/Makefile: preset Project-Id-Version

---
 po/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/po/Makefile b/po/Makefile
index 772b5eb7..d2484e2e 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,6 +1,13 @@
 top_builddir=..
 include $(top_builddir)/Makefile.config
 
+# We prefer the capitalized name for Project-Id-Version.
+ifeq ($(PACKAGE), elinks)
+PRETTY_PACKAGE = ELinks
+else
+PRETTY_PACKAGE = $(PACKAGE)
+endif
+
 # Where to install the catalog files.
 localedir = $(datadir)/locale
 
@@ -81,6 +88,9 @@ $(srcdir)$(PACKAGE).pot: $(POTFILES_ABS_LIST) $(srcdir)perl/msgaccel-prepare
 		    -f $(POTFILES_ABS_LIST)
 	test -f $(PACKAGE).po
 	$(PERL) -I"$(srcdir)perl" $(srcdir)perl/msgaccel-prepare -S"$(top_srcdir)" $(PACKAGE).po
+# GNU gettext 0.17 supports xgettext --package-version but is GPLv3+.
+# This rule already requires Perl so use that instead.
+	$(PERL) -pi -e 's/(^"Project-Id-Version: )PACKAGE VERSION/$$1$(PRETTY_PACKAGE) $(VERSION)/i and $$found=1 unless $$found' $(PACKAGE).po
 	mv -f $(PACKAGE).po $(srcdir)$(PACKAGE).pot
 
 

From 314a41588cb7322a01c51d5f0bc7067016c91482 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 5 Jul 2008 04:55:16 +0300
Subject: [PATCH 36/43] Bug 951: weaken pointer from JSObject to cache_entry

The SpiderMonkey scripting module handles the "pre-format-html" event
by constructing a JSObject for the struct cache_entry and then calling
elinks.preformat_html(cache_entry, view_state) if such a function
exists.  The problem with this was that each such JSObject kept the
struct cache_entry locked until SpiderMonkey garbage-collected the
JSObject, even if the user had not defined an elinks.preformat_html
function and the JSObject was thus never needed at all.  To work
around that, the SpiderMonkey scripting module ran a garbage
collection whenever the user told ELinks to flush caches.

Remove the SpiderMonkey scripting module's use of object_lock and
object_unlock on struct cache_entry, and instead make the pointers
weak so that ELinks can free the cache_entry whenever it wants even if
a JSObject is pointing to it.  Each cache_entry now has a pointer back
to the JSObject; done_cache_entry calls smjs_detach_cache_entry_object,
which follows the pointer and detaches the cache_entry and the JSObject
from each other.

This commit does not yet remove the workaround mentioned above.
---
 NEWS                              |   2 +
 src/cache/cache.c                 |   6 ++
 src/cache/cache.h                 |   3 +
 src/scripting/smjs/cache_object.c | 120 +++++++++++++++++++++++-------
 src/scripting/smjs/core.c         |   3 +
 src/scripting/smjs/smjs.h         |   7 ++
 6 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/NEWS b/NEWS
index c1e29b23..d6688b2e 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ Bugs that should be removed from NEWS before the 0.12.0 release:
 * bug 955: Reset buttons no longer run FORM/@onsubmit, and
   ``harmless'' buttons no longer submit the form.  ELinks 0.12pre1
   was the first release that had these bugs.
+* minor bug 951: SpiderMonkey scripting objects used to prevent ELinks
+  from removing files from the memory cache
 
 ELinks 0.12pre1:
 ----------------
diff --git a/src/cache/cache.c b/src/cache/cache.c
index 8b050800..001c3656 100644
--- a/src/cache/cache.c
+++ b/src/cache/cache.c
@@ -18,6 +18,9 @@
 #include "protocol/protocol.h"
 #include "protocol/proxy.h"
 #include "protocol/uri.h"
+#ifdef CONFIG_SCRIPTING_SPIDERMONKEY
+# include "scripting/smjs/smjs.h"
+#endif
 #include "util/error.h"
 #include "util/memory.h"
 #include "util/string.h"
@@ -656,6 +659,9 @@ done_cache_entry(struct cache_entry *cached)
 	delete_entry_content(cached);
 
 	if (cached->box_item) done_listbox_item(&cache_browser, cached->box_item);
+#ifdef CONFIG_SCRIPTING_SPIDERMONKEY
+	if (cached->jsobject) smjs_detach_cache_entry_object(cached);
+#endif
 
 	if (cached->uri) done_uri(cached->uri);
 	if (cached->proxy_uri) done_uri(cached->proxy_uri);
diff --git a/src/cache/cache.h b/src/cache/cache.h
index ed68d1fe..e19717bf 100644
--- a/src/cache/cache.h
+++ b/src/cache/cache.h
@@ -50,6 +50,9 @@ struct cache_entry {
 	off_t data_size;		/* The actual size of all fragments */
 
 	struct listbox_item *box_item;	/* Dialog data for cache manager */
+#ifdef CONFIG_SCRIPTING_SPIDERMONKEY
+	struct JSObject *jsobject;      /* Instance of cache_entry_class */
+#endif
 
 	timeval_T max_age;		/* Expiration time */
 
diff --git a/src/scripting/smjs/cache_object.c b/src/scripting/smjs/cache_object.c
index 8d2a44d9..7da71ef7 100644
--- a/src/scripting/smjs/cache_object.c
+++ b/src/scripting/smjs/cache_object.c
@@ -11,6 +11,7 @@
 #include "protocol/uri.h"
 #include "scripting/smjs/cache_object.h"
 #include "scripting/smjs/core.h"
+#include "scripting/smjs/smjs.h"
 #include "util/error.h"
 #include "util/memory.h"
 
@@ -42,6 +43,7 @@ static JSBool
 cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 {
 	struct cache_entry *cached;
+	JSBool ret;
 
 	/* This can be called if @obj if not itself an instance of the
 	 * appropriate class but has one in its prototype chain.  Fail
@@ -51,15 +53,22 @@ cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 	cached = JS_GetInstancePrivate(ctx, obj,
 				       (JSClass *) &cache_entry_class, NULL);
+	if (!cached) return JS_FALSE; /* already detached */
 
-	if (!cache_entry_is_valid(cached)) return JS_FALSE;
+	assert(cache_entry_is_valid(cached));
+	if_assert_failed return JS_FALSE;
+
+	/* Get a strong reference to the cache entry to prevent it
+	 * from being deleted if some function called below decides to
+	 * collect garbage.  After this, all code paths must
+	 * eventually unlock the object.  */
+	object_lock(cached);
 
 	undef_to_jsval(ctx, vp);
 
 	if (!JSVAL_IS_INT(id))
-		return JS_FALSE;
-
-	switch (JSVAL_TO_INT(id)) {
+		ret = JS_FALSE;
+	else switch (JSVAL_TO_INT(id)) {
 	case CACHE_ENTRY_CONTENT: {
 		struct fragment *fragment = get_cache_fragment(cached);
 
@@ -69,27 +78,32 @@ cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 	                                                fragment->data,
 	                                                fragment->length));
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	}
 	case CACHE_ENTRY_TYPE:
 		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx,
 	                                                cached->content_type));
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	case CACHE_ENTRY_HEAD:
 		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx,
 	                                                cached->head));
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	case CACHE_ENTRY_LENGTH:
 		*vp = INT_TO_JSVAL(cached->length);
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	case CACHE_ENTRY_URI:
 		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx,
 		                                        struri(cached->uri)));
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	default:
 		/* Unrecognized integer property ID; someone is using
 		 * the object as an array.  SMJS builtin classes (e.g.
@@ -97,8 +111,12 @@ cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 		 * and leave *@vp unchanged.  Do the same here.
 		 * (Actually not quite the same, as we already used
 		 * @undef_to_jsval.)  */
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	}
+
+	object_unlock(cached);
+	return ret;
 }
 
 /* @cache_entry_class.setProperty */
@@ -106,6 +124,7 @@ static JSBool
 cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 {
 	struct cache_entry *cached;
+	JSBool ret;
 
 	/* This can be called if @obj if not itself an instance of the
 	 * appropriate class but has one in its prototype chain.  Fail
@@ -115,13 +134,20 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 	cached = JS_GetInstancePrivate(ctx, obj,
 				       (JSClass *) &cache_entry_class, NULL);
+	if (!cached) return JS_FALSE; /* already detached */
 
-	if (!cache_entry_is_valid(cached)) return JS_FALSE;
+	assert(cache_entry_is_valid(cached));
+	if_assert_failed return JS_FALSE;
+
+	/* Get a strong reference to the cache entry to prevent it
+	 * from being deleted if some function called below decides to
+	 * collect garbage.  After this, all code paths must
+	 * eventually unlock the object.  */
+	object_lock(cached);
 
 	if (!JSVAL_IS_INT(id))
-		return JS_FALSE;
-
-	switch (JSVAL_TO_INT(id)) {
+		ret = JS_FALSE;
+	else switch (JSVAL_TO_INT(id)) {
 	case CACHE_ENTRY_CONTENT: {
 		JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
 		unsigned char *str = JS_GetStringBytes(jsstr);
@@ -130,7 +156,8 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 		add_fragment(cached, 0, str, len);
 		normalize_cache_entry(cached, len);
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	}
 	case CACHE_ENTRY_TYPE: {
 		JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
@@ -138,7 +165,8 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 		mem_free_set(&cached->content_type, stracpy(str));
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	}
 	case CACHE_ENTRY_HEAD: {
 		JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
@@ -146,18 +174,25 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 		mem_free_set(&cached->head, stracpy(str));
 
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	}
 	default:
 		/* Unrecognized integer property ID; someone is using
 		 * the object as an array.  SMJS builtin classes (e.g.
 		 * js_RegExpClass) just return JS_TRUE in this case.
 		 * Do the same here.  */
-		return JS_TRUE;
+		ret = JS_TRUE;
+		break;
 	}
+
+	object_unlock(cached);
+	return ret;
 }
 
-/* @cache_entry_class.finalize */
+/** Pointed to by cache_entry_class.finalize.  SpiderMonkey
+ * automatically finalizes all objects before it frees the JSRuntime,
+ * so cache_entry.jsobject won't be left dangling.  */
 static void
 cache_entry_finalize(JSContext *ctx, JSObject *obj)
 {
@@ -169,14 +204,17 @@ cache_entry_finalize(JSContext *ctx, JSObject *obj)
 	cached = JS_GetInstancePrivate(ctx, obj,
 				       (JSClass *) &cache_entry_class, NULL);
 
-	if (!cached) return;
+	if (!cached) return;	/* already detached */
 
-	object_unlock(cached);
+	JS_SetPrivate(ctx, obj, NULL); /* perhaps not necessary */
+	assert(cached->jsobject == obj);
+	if_assert_failed return;
+	cached->jsobject = NULL;
 }
 
 static const JSClass cache_entry_class = {
 	"cache_entry",
-	JSCLASS_HAS_PRIVATE,	/* struct cache_entry * */
+	JSCLASS_HAS_PRIVATE,	/* struct cache_entry *; a weak reference */
 	JS_PropertyStub, JS_PropertyStub,
 	cache_entry_get_property, cache_entry_set_property,
 	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, cache_entry_finalize
@@ -187,7 +225,10 @@ smjs_get_cache_entry_object(struct cache_entry *cached)
 {
 	JSObject *cache_entry_object;
 
+	if (cached->jsobject) return cached->jsobject;
+
 	assert(smjs_ctx);
+	if_assert_failed return NULL;
 
 	cache_entry_object = JS_NewObject(smjs_ctx,
 	                                  (JSClass *) &cache_entry_class,
@@ -195,14 +236,39 @@ smjs_get_cache_entry_object(struct cache_entry *cached)
 
 	if (!cache_entry_object) return NULL;
 
-	if (JS_FALSE == JS_SetPrivate(smjs_ctx, cache_entry_object, cached)) /* to @cache_entry_class */
-		return NULL;
-
-	object_lock(cached);
-
 	if (JS_FALSE == JS_DefineProperties(smjs_ctx, cache_entry_object,
 	                               (JSPropertySpec *) cache_entry_props))
 		return NULL;
 
+	/* Do this last, so that if any previous step fails, we can
+	 * just forget the object and its finalizer won't attempt to
+	 * access @cached.  */
+	if (JS_FALSE == JS_SetPrivate(smjs_ctx, cache_entry_object, cached)) /* to @cache_entry_class */
+		return NULL;
+
+	cached->jsobject = cache_entry_object;
 	return cache_entry_object;
 }
+
+/** Ensure that no JSObject contains the pointer @a cached.  This is
+ * called when the reference count of the cache entry *@a cached is
+ * already 0 and it is about to be freed.  If a JSObject was
+ * previously attached to the cache entry, the object will remain in
+ * memory but it will no longer be able to access the cache entry. */
+void
+smjs_detach_cache_entry_object(struct cache_entry *cached)
+{
+	assert(smjs_ctx);
+	assert(cached);
+	if_assert_failed return;
+
+	if (!cached->jsobject) return;
+
+	assert(JS_GetInstancePrivate(smjs_ctx, cached->jsobject,
+				     (JSClass *) &cache_entry_class, NULL)
+	       == cached);
+	if_assert_failed {}
+
+	JS_SetPrivate(smjs_ctx, cached->jsobject, NULL);
+	cached->jsobject = NULL;
+}
diff --git a/src/scripting/smjs/core.c b/src/scripting/smjs/core.c
index 599c0096..9d51a915 100644
--- a/src/scripting/smjs/core.c
+++ b/src/scripting/smjs/core.c
@@ -154,6 +154,9 @@ cleanup_smjs(struct module *module)
 {
 	if (!smjs_ctx) return;
 
+	/* These calls also finalize all JSObjects that have been
+	 * allocated in the JSRuntime, so cache_entry_finalize gets
+	 * called and resets each cache_entry.jsobject = NULL.  */
 	JS_DestroyContext(smjs_ctx);
 	JS_DestroyRuntime(smjs_rt);
 }
diff --git a/src/scripting/smjs/smjs.h b/src/scripting/smjs/smjs.h
index 8c545d43..c4155a7f 100644
--- a/src/scripting/smjs/smjs.h
+++ b/src/scripting/smjs/smjs.h
@@ -2,7 +2,14 @@
 #define EL__SCRIPTING_SMJS_SMJS_H
 
 struct module;
+struct cache_entry;
 
 extern struct module smjs_scripting_module;
 
+/* TODO: Use trigger_event() for this, so that the caching code need
+ * not directly call the SMJS scripting module?  That would require
+ * changes in struct cache_object though, to let a dynamic number of
+ * scripting modules have pointers from there to their objects.  */
+void smjs_detach_cache_entry_object(struct cache_entry *cached);
+
 #endif

From 06c39a8ac45f8bbe8a2f38c0b28414fc8725acf9 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Tue, 8 Jul 2008 15:13:45 +0300
Subject: [PATCH 37/43] Bug 951: Lock the cache entry while the hook runs.

---
 contrib/smjs/README               | 13 ++++++++++++-
 doc/events.txt                    |  3 +++
 src/scripting/smjs/cache_object.c |  6 ++++++
 src/scripting/smjs/load_uri.c     |  9 +++++++++
 src/session/session.c             | 11 +++++++++++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/contrib/smjs/README b/contrib/smjs/README
index 16c1a00b..897120de 100644
--- a/contrib/smjs/README
+++ b/contrib/smjs/README
@@ -45,6 +45,8 @@ elinks.load_uri(uri, callback)
 
    displays a fortune.
 
+   The cache object will not expire until after the callback returns.
+
 
 Properties
 ----------
@@ -183,6 +185,8 @@ elinks.preformat_html(cached, vs)
    to elinks.preformat_html_hooks rather than to assign it to
    elinks.preformat_html.
 
+   The cache object will not expire until after this function returns.
+
 
 elinks.goto_url_hook(url)
 
@@ -210,7 +214,14 @@ cache
 
   The cache object mentioned in the descriptions of elinks.load_uri and
   elinks.preformat_html is a wrapper for the internal ELinks cache object.
-  Its properties are:
+  ELinks passes the ECMAScript cache object as an argument to your
+  ECMAScript function, and keeps the corresponding document in the
+  cache until the function returns. After that, ELinks may remove the
+  document from the cache, even if the function has saved the cache
+  object to some global variable. Such an expired cache object does
+  not work but it does not crash ELinks either.
+
+  The properties of the cache object are:
 
   cached.content (string)
 
diff --git a/doc/events.txt b/doc/events.txt
index 7ee8b639..ed0fca2e 100644
--- a/doc/events.txt
+++ b/doc/events.txt
@@ -249,6 +249,9 @@ Description:
 	add_fragment(cached, 0, new_string, new_len);
 	normalize_cache_entry(cached, new_len);
 
+ The caller must ensure that there is a reference to cached, so that
+ calling garbage_collection() from the event handler cannot free it.
+
 -------------------------------------------------------------------------------
 Name:		quit
 Managed By:	The scripting subsystem/backends
diff --git a/src/scripting/smjs/cache_object.c b/src/scripting/smjs/cache_object.c
index 7da71ef7..59708fe8 100644
--- a/src/scripting/smjs/cache_object.c
+++ b/src/scripting/smjs/cache_object.c
@@ -220,6 +220,12 @@ static const JSClass cache_entry_class = {
 	JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, cache_entry_finalize
 };
 
+/** Return an SMJS object through which scripts can access @a cached.
+ * If there already is such an object, return that; otherwise create a
+ * new one.  The SMJS object holds only a weak reference to @a cached;
+ * so if the caller wants to guarantee that @a cached exists at least
+ * until a script returns, it should use lock_object() and
+ * unlock_object().  */
 JSObject *
 smjs_get_cache_entry_object(struct cache_entry *cached)
 {
diff --git a/src/scripting/smjs/load_uri.c b/src/scripting/smjs/load_uri.c
index a74f80b5..f9c7e09f 100644
--- a/src/scripting/smjs/load_uri.c
+++ b/src/scripting/smjs/load_uri.c
@@ -32,6 +32,13 @@ smjs_loading_callback(struct download *download, void *data)
 
 	if (!download->cached) goto end;
 
+	/* download->cached->object.refcount is typically 0 here
+	 * because no struct document uses the cache entry.  Because
+	 * the connection is no longer using the cache entry either,
+	 * it can be garbage collected.  Don't let that happen while
+	 * the script is using it.  */
+	object_lock(download->cached);
+
 	assert(hop->callback);
 
 	smjs_ses = hop->ses;
@@ -44,6 +51,8 @@ smjs_loading_callback(struct download *download, void *data)
 	JS_CallFunction(smjs_ctx, NULL, hop->callback, 1, args, &rval);
 
 end:
+	if (download->cached)
+		object_unlock(download->cached);
 	mem_free(download->data);
 	mem_free(download);
 
diff --git a/src/session/session.c b/src/session/session.c
index 46ec3279..aa7fce99 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -513,6 +513,17 @@ maybe_pre_format_html(struct cache_entry *cached, struct session *ses)
 	if (!cached || cached->preformatted)
 		return;
 
+	/* The script called from here may indirectly call
+	 * garbage_collection().  If the refcount of the cache entry
+	 * were 0, it could then be freed, and the
+	 * cached->preformatted assignment at the end of this function
+	 * would crash.  Normally, the document has a reference to the
+	 * cache entry, and that suffices.  If the following assertion
+	 * ever fails, object_lock(cached) and object_unlock(cached)
+	 * must be added to this function.  */
+	assert(cached->object.refcount > 0);
+	if_assert_failed return;
+
 	fragment = get_cache_fragment(cached);
 	if (!fragment) return;
 

From 8ee5e8c4a1e355b42df555e93ac1e356395bef51 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 5 Jul 2008 05:23:21 +0300
Subject: [PATCH 38/43] Bug 951: Revert "Garbage-collect SMJS objects before
 flushing caches."

This reverts commit c33d195ff49597a808324791cb93a91cd37a868d.
ELinks no longer needs to collect garbage in this situation
because it can now free cache entries even if the corresponding
SMJS objects remain.
---
 doc/events.txt             | 20 --------------------
 src/main/main.c            |  7 -------
 src/scripting/smjs/hooks.c | 16 ----------------
 3 files changed, 43 deletions(-)

diff --git a/doc/events.txt b/doc/events.txt
index ed0fca2e..ca129194 100644
--- a/doc/events.txt
+++ b/doc/events.txt
@@ -113,26 +113,6 @@ Description:
 
  Open Lua console dialog.
 
--------------------------------------------------------------------------------
-Name:		flush-caches
-Managed By:	The scripting subsystem/backends
-Triggered When:
-
- Elinks is going to free its caches.  This happens when the user chooses
- ACT_MAIN_CACHE_MINIMIZE, but currently also on ACT_MAIN_FORGET_CREDENTIALS
- and when ELinks is quitting.
-
-Arguments:
-
- None
-
-Description:
-
- If scripting backends hold pointers to cache entries, they should try
- to release those pointers so that ELinks can free the entries.  This
- may involve a full garbage collection.  Also, if backends have some
- caches of their own, they should flush them.
-
 -------------------------------------------------------------------------------
 Name:		follow-url
 Managed By:	The scripting subsystem/backends
diff --git a/src/main/main.c b/src/main/main.c
index 8b34d16b..aa6b773f 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -306,13 +306,6 @@ terminate_all_subsystems(void)
 void
 shrink_memory(int whole)
 {
-#ifdef CONFIG_SCRIPTING
-	/* The SMJS pre-format-html hook constructs an SMJS object for
-	 * each cache entry.  Give all scripting modules a cue to garbage
-	 * collect any such objects so that the entries can be freed.  */
-	if (whole)
-		trigger_event_name("flush-caches");
-#endif
 	shrink_dns_cache(whole);
 	shrink_format_cache(whole);
 	garbage_collection(whole);
diff --git a/src/scripting/smjs/hooks.c b/src/scripting/smjs/hooks.c
index f2c0289a..647d2887 100644
--- a/src/scripting/smjs/hooks.c
+++ b/src/scripting/smjs/hooks.c
@@ -89,26 +89,10 @@ end:
 	return ret;
 }
 
-static enum evhook_status
-script_hook_flush_caches(va_list ap, void *data)
-{
-	/* script_hook_pre_format_html() calls smjs_get_cache_entry_object()
-	 * for each struct cache_entry.  The resulting SMJS objects hold
-	 * references to the structs, and these references prevent ELinks
-	 * from freeing the cache entries.  (The resource info dialog shows
-	 * that the entries are "in use".)  SMJS does not immediately collect
-	 * these objects as garbage.  If we're really trying to flush the
-	 * caches then ask SMJS to run a check.  */
-	if (smjs_ctx)
-		JS_GC(smjs_ctx);
-	return EVENT_HOOK_STATUS_NEXT;
-}
-
 struct event_hook_info smjs_scripting_hooks[] = {
 	{ "goto-url", 0, script_hook_url, "goto_url_hook" },
 	{ "follow-url", 0, script_hook_url, "follow_url_hook" },
 	{ "pre-format-html", 0, script_hook_pre_format_html, NULL },
-	{ "flush-caches", 0, script_hook_flush_caches, NULL },
 
 	NULL_EVENT_HOOK_INFO,
 };

From 9954d37a6804488c1b70d6cd361c2b5f22c1b57a Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Thu, 10 Jul 2008 20:31:22 +0300
Subject: [PATCH 39/43] Move most of contrib/smjs/README into the manual.

Also document elinks.vs and elinks.action.

<kahmalo> Miciah: IMO most of contrib/smjs/README should be moved into
    the ELinks manual.  Specifically the parts that do not depend on
    contrib/smjs/hooks.js.  However manual.txt contains a notice:
    "Hold blameless the authors.  Any lawful use is allowed."  Will
    you allow that also for what is now in contrib/smjs/README?
<Miciah> Absolutely.
<Miciah> In fact, I would allow some lawless uses.
<Miciah> It seems a little silly to say that lawful uses are allowed.
---
 contrib/smjs/README    | 253 ++---------------------------
 doc/manual.txt         |   2 +
 doc/smjs-scripting.txt | 351 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 366 insertions(+), 240 deletions(-)
 create mode 100644 doc/smjs-scripting.txt

diff --git a/contrib/smjs/README b/contrib/smjs/README
index 897120de..dd0121f6 100644
--- a/contrib/smjs/README
+++ b/contrib/smjs/README
@@ -1,163 +1,15 @@
-Methods
--------
+Most of the SpiderMonkey scripting interface is documented in the
+ELinks manual.  This README describes only features added by
+contrib/smjs/*.js.
 
-do_file(path)
 
-   Load and evaluate the file with the given path (string). For example:
+Multiple functions in the same hook
+-----------------------------------
 
-      do_file("/home/me/.elinks/hooks.js");
-
-   will reload your hooks file.
-
-
-elinks.alert(message)
-
-   Display the given message (string) in a message box. For example:
-
-      elinks.alert("Hello, world!");
-
-   will display a friendly greeting.
-
-
-elinks.execute(command)
-
-   Execute the given command (string) on the current terminal. For example:
-
-      var quoted_uri = "'" + elinks.location.replace(/'/g, "'\\''") + "'";
-      elinks.execute("firefox " + quoted_uri);
-
-   will run Firefox with the URI of the current document.
-
-   Note: one must be very careful with elinks.execute, because depending
-   on the OS, the command may be subject to interpretation by a command shell
-   language. When constructing the command string, be sure to quote any
-   dubious parts (such as the URI of the current document, as above).
-
-
-elinks.load_uri(uri, callback)
-
-   Load the given URI (string). When the URI completes loading, ELinks calls
-   the given callback (function). The callback is passed the cache object
-   that corresponds to the URI. For example:
-
-     elinks.load_uri("http://www.eldar.org/cgi-bin/fortune.pl?text_format=yes",
-                     function (cached) { elinks.alert(cached.content); });
-
-   displays a fortune.
-
-   The cache object will not expire until after the callback returns.
-
-
-Properties
-----------
-
-elinks.home (string)
-
-   ELinks's 'home' directory, where it stores its configuration files.
-   Read-only. For example,
-
-      do_file(elinks.home + "hooks.js");
-
-   will reload your hooks file.
-
-
-elinks.location (string)
-
-   The URI of the currently open document. This can be read to get a string
-   with the URI or set to load a different document. For example,
-
-      elinks.location = elinks.location + "/..";
-
-   will go up a directory (if the URI doesn't end in a file).
-
-
-elinks.bookmarks (hash)
-
-   This is a hash, the elements of which correspond to the bookmarks.
-   One can delve into the bookmarks hierarchy in a reasonably nifty
-   fashion, just by using standard ECMAScript syntax:
-
-      elinks.bookmarks.x.children.y.children.z.children.foo.title
-
-   gets the title of the bookmark titled 'foo' under the folder 'z',
-   which is a subfolder of 'y', which is a subfolder of 'x'.
-
-   A bookmark object has these properties:
-
-   item.title (string)
-
-      This is the title of the bookmark. It can be read and set.
-
-   item.url (string)
-
-      This is the URI of the bookmark. It can be read and set.
-
-   item.children (hash)
-
-      This is a hash, the elements of which are the bookmarks that
-      are children to the item. It is read-only.
-
-
-elinks.globhist (hash)
-
-   This is a hash, the elements of which correspond to entries in ELinks's
-   global history. The hash is indexed by URI. For example,
-
-      elinks.globhist["file:///"]
-
-   will get you the history item for your root directory.
-
-   A history item has these properties:
-
-   item.title (string)
-
-      This is the title of the history item. It can be read and set.
-
-   item.url (string)
-
-      This is the URI of the history item. It can be read and set.
-
-   item.last_visit (number)
-
-      This is the UNIX time of the last visit time for the item. UNIX time
-      is the number of seconds that have passed between the UNIX epoch (which
-      is 1970-01-01 00:00:00 UTC) and the represented time. Note that this is
-      _seconds_ since the epoch, whereas ECMAScript likes to use _milliseconds_
-      since the epoch. This property can be set or read.
-
-
-elinks.keybinding (hash)
-
-   This is a hash, the elements of which correspond to ELinks's keymaps.
-   Currently, there are three: elinks.keybinding.main, elinks.keybinding.edit,
-   and elinks.keybinding.menu. These elements are also hashes, the elements of
-   which correspond to bindings. For example, elinks.keymaps.main["q"] is
-   the binding to the 'q' key in the main map. These bindings can be red,
-   to get the name of the action to which the key is bound, or set, either
-   to a string with the name of the ELinks action or to a function, which will
-   thenceforth be called when the key is pressed. For example,
-
-      elinks.keymaps.main["!"] = function () { elinks.alert("Hello!"); }
-
-   binds the '!' key in the main map to a function that displays a friendly
-   alert.
-
-      elinks.keymaps.main["/"] = "search-typeahead-text";
-
-   changes the '/' key to use the nice typeahead search function instead of
-   opening that ugly old search dialogue box.
-
-
-Hooks
------
-
-These are actually properties, but a special case: one assigns functions
-to them, which functions are called at certain events.
-
-Note that the default hooks file assigns functions that provide a mechanism
-to register multiple functions to each hook. When these default hooks are
-called, they iterate over all functions that are registered to them, calling
-each one in serial.
+The default hooks file contrib/smjs/hooks.js assigns functions that
+provide a mechanism to register multiple functions to each hook. When
+these default hooks are called, they iterate over all functions that
+are registered to them, calling each one in serial.
 
 If you want to register a preformat_html hook, for example,
 the preferred way to do so is not this:
@@ -173,87 +25,8 @@ elinks.preformat_html function will iterate.
 
 If any function in that array returns false, the default hook
 will stop iteration, not calling any more handlers. This applies
-to all of the default hooks.
+to all of the default hooks:
 
-
-elinks.preformat_html(cached, vs)
-
-   This function is called every time a document is loaded, before the document
-   is actually rendered, to give scripts the opportunity to modify it. The
-   first parameter is the cache object and the second is the view_state object
-   (documented below). As explained above, it is preferred to add your hook
-   to elinks.preformat_html_hooks rather than to assign it to
-   elinks.preformat_html.
-
-   The cache object will not expire until after this function returns.
-
-
-elinks.goto_url_hook(url)
-
-   This function is called every time the user enters something
-   in the Go to URL box. The url (string) can be modified or not,
-   and the returned string is substituted for what the user entered.
-   If the value false is returned, the URL is not changed and further hooks
-   in ELinks are not run. As explained above, it is preferred to add your hook
-   to elinks.goto_url_hooks rather than to assign it to elinks.goto_url_hook.
-
-
-elinks.follow_url_hook(url)
-
-   This function is called every time the user tries to load a document,
-   whether by following a link, by entering a URI in the Go to URL box,
-   by setting elinks.location, or whatever. It behaves the same as
-   elinks.goto_url_hook above. As explained above, it is preferred to add your
-   hook to elinks.follow_url_hooks rather than to assign it to
-   elinks.follow_url_hook.
-
-Other Objects
--------------
-
-cache
-
-  The cache object mentioned in the descriptions of elinks.load_uri and
-  elinks.preformat_html is a wrapper for the internal ELinks cache object.
-  ELinks passes the ECMAScript cache object as an argument to your
-  ECMAScript function, and keeps the corresponding document in the
-  cache until the function returns. After that, ELinks may remove the
-  document from the cache, even if the function has saved the cache
-  object to some global variable. Such an expired cache object does
-  not work but it does not crash ELinks either.
-
-  The properties of the cache object are:
-
-  cached.content (string)
-
-     This is the content received from the server. It can be read and set.
-
-  cached.type (string)
-
-     This is the MIME type of the cache entry. It can be read and set.
-
-  cached.length (number)
-
-     This is the length of cached.content. It is read-only.
-
-  cached.head (string)
-
-     This is the header received from the server. It can be read and set.
-
-  cached.uri (string)
-
-     This is the URI of the cache entry. It is read-only.
-
-view_state
-
-   The view_state object mentioned in the description of elinks.preformat_html
-   is a wrapper for the internal ELinks view_state object. The view state holds
-   information on how the current document is being displayed.
-
-   vs.plain (boolean)
-
-      Whether the current document is rendered as HTML or displayed
-      as plaintext. This can be read and set.
-
-   vs.uri (string)
-
-      This is the URI of the current document. It is read-only.
+- elinks.preformat_html_hooks
+- elinks.goto_url_hooks
+- elinks.follow_url_hooks
diff --git a/doc/manual.txt b/doc/manual.txt
index ee3af56e..75f87e8d 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -59,3 +59,5 @@ include::exmode.txt[]
 include::bittorrent.txt[]
 
 include::lua-scripting.txt[]
+
+include::smjs-scripting.txt[]
diff --git a/doc/smjs-scripting.txt b/doc/smjs-scripting.txt
new file mode 100644
index 00000000..440f269f
--- /dev/null
+++ b/doc/smjs-scripting.txt
@@ -0,0 +1,351 @@
+[[smjs-scripting]]
+Scripting ELinks with ECMAScript
+--------------------------------
+
+As a user of ELinks, you can control its behaviour by writing scripts
+in ECMAScript.  Unlike <<ecmascript,scripts in SCRIPT elements of
+HTML>>, these user scripts run with all the permissions of your user
+account, the same as with <<lua-scripting,Lua>>.  The object model is
+very different too.
+
+Support for ECMAScript user scripts was first added in ELinks 0.11.0.
+The `configure` script enables it by default if the required SpiderMonkey
+library has been installed, but you can disable it with `configure
+\--disable-sm-scripting` or by <<CONFIG-SCRIPTING-SPIDERMONKEY,editing
+features.conf>>.
+
+WARNING: ECMAScript scripting is still a bit experimental: there seem to be
+ways to crash ELinks with it, and the object model may change.  However, if
+you don't have a `hooks.js` file, the risk is minimal.
+
+When ELinks starts up, it evaluates the ECMAScript file `hooks.js` in
+your ELinks configuration directory (thus normally `~/.elinks/hooks.js`
+on Unix-like systems), or if the file does not exist there, then in
+the system-wide ELinks configuration directory (the location depends
+on how ELinks was built, but `/etc/elinks/hooks.js` is typical).
+
+In the ELinks source tree, the `contrib/smjs` directory contains some
+examples about scripting ELinks with ECMAScript.  Please see the
+`README` file in that directory for details.
+
+
+[[smjs-global-object]]
+Global Object
+~~~~~~~~~~~~~
+
+The global object provided to ECMAScript user scripts contains the standard
+ECMAScript classes, as well as the following:
+
+
+[[smjs-global-methods]]
+Global Object Methods
+^^^^^^^^^^^^^^^^^^^^^
+
+[[smjs-global.do_file]] do_file(path)::
+	Load and evaluate the file with the given path (string). For example:
++
+--
+----------------------------------------------------------------------
+do_file("/home/me/.elinks/hooks.js");
+----------------------------------------------------------------------
+
+will reload your hooks file.
+--
+
+
+[[smjs-global-properties]]
+Global Object Properties
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+[[smjs-global.elinks]] elinks (elinks)::
+	A reference to the <<smjs-elinks-object,ELinks object>>.
+
+
+[[smjs-elinks-object]]
+ELinks Object
+~~~~~~~~~~~~~
+
+The global <<smjs-global.elinks,'elinks'>> property refers to this object.
+
+
+[[smjs-elinks-methods]]
+ELinks Object Methods
+^^^^^^^^^^^^^^^^^^^^^
+
+[[smjs-elinks.alert]] elinks.alert(message)::
+	Display the given message (string) in a message box. For example:
++
+--
+----------------------------------------------------------------------
+elinks.alert("Hello, world!");
+----------------------------------------------------------------------
+
+will display a friendly greeting.
+--
+
+[[smjs-elinks.execute]] elinks.execute(command)::
+	Execute the given command (string) on the current terminal.
+	For example:
++
+--
+----------------------------------------------------------------------
+var quoted_uri = "'" + elinks.location.replace(/'/g, "'\\''") + "'";
+elinks.execute("firefox " + quoted_uri);
+----------------------------------------------------------------------
+
+will run Firefox with the URI of the current document.
+
+WARNING: One must be very careful with 'elinks.execute', because depending
+on the OS, the command may be subject to interpretation by a command
+shell language. When constructing the command string, be sure to quote
+any dubious parts (such as the URI of the current document, as above).
+--
+
+[[smjs-elinks.load_uri]] elinks.load_uri(uri, callback)::
+	Load the given URI (string). When the URI completes loading, ELinks
+	calls the given callback (function). The callback is passed the
+	<<smjs-cache_entry-object,cache object>> that corresponds to the URI.
+	For example:
++
+--
+----------------------------------------------------------------------
+elinks.load_uri("http://www.eldar.org/cgi-bin/fortune.pl?text_format=yes",
+                function (cached) { elinks.alert(cached.content); });
+----------------------------------------------------------------------
+
+displays a fortune.
+
+The <<smjs-cache_entry-object,cache object>> will not expire until after the
+callback returns.
+--
+
+
+[[smjs-elinks-properties]]
+ELinks Object Properties
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+[[smjs-elinks.home]] elinks.home (string)::
+	ELinks's ``home'' directory, where it stores its configuration files.
+	Read-only. For example,
++
+--
+----------------------------------------------------------------------
+do_file(elinks.home + "hooks.js");
+----------------------------------------------------------------------
+
+will reload your hooks file.
+--
+
+[[smjs-elinks.location]] elinks.location (string)::
+	The URI of the currently open document. This can be read to get a
+	string with the URI or set to load a different document.
+	For example,
++
+--
+----------------------------------------------------------------------
+elinks.location = elinks.location + "/..";
+----------------------------------------------------------------------
+
+will go up a directory (if the URI doesn't end in a file).
+--
+
+[[smjs-elinks.bookmarks]] elinks.bookmarks (hash)::
+	This is a hash, the elements of which correspond to the bookmarks.
+	One can delve into the bookmarks hierarchy in a reasonably nifty
+	fashion, just by using standard ECMAScript syntax:
++
+--
+----------------------------------------------------------------------
+elinks.bookmarks.x.children.y.children.z.children.foo.title
+----------------------------------------------------------------------
+
+gets the title of the bookmark titled ``foo'' under the folder ``z'',
+which is a subfolder of ``y'', which is a subfolder of ``x''.
+
+[[smjs-bookmark-properties]]
+A bookmark object has these properties:
+
+[[smjs-bookmark.title]] item.title (string)::
+	This is the title of the bookmark. It can be read and set.
+
+[[smjs-bookmark.url]] item.url (string)::
+	This is the URI of the bookmark. It can be read and set.
+
+[[smjs-bookmark.children]] item.children (hash)::
+	This is a hash, the elements of which are the bookmarks that
+	are children to the item. It is read-only.
+--
+
+[[smjs-elinks.globhist]] elinks.globhist (hash)::
+	This is a hash, the elements of which correspond to entries in ELinks's
+	global history. The hash is indexed by URI. For example,
++
+--
+----------------------------------------------------------------------
+elinks.globhist["file:///"]
+----------------------------------------------------------------------
+
+will get you the history item for your root directory.
+
+[[smjs-global_history_item-properties]]
+A history item has these properties:
+
+[[smjs-global_history_item.title]] item.title (string)::
+	This is the title of the history item. It can be read and set.
+
+[[smjs-global_history_item.url]] item.url (string)::
+	This is the URI of the history item. It can be read and set.
+
+[[smjs-global_history_item.last_visit]] item.last_visit (number)::
+	This is the UNIX time of the last visit time for the item. UNIX time
+	is the number of seconds that have passed between the UNIX epoch
+	(which is 1970-01-01 00:00:00 UTC) and the represented time. Note that
+	this is 'seconds' since the epoch, whereas ECMAScript likes to use
+	'milliseconds' since the epoch. This property can be set or read.
+--
+
+[[smjs-elinks.action]] elinks.action (hash)::
+	This hash lets you call the built-in actions of ELinks.  For example,
+	you can call `elinks.action.auth_manager()` to open the authentication
+	manager.  The names of the actions are the same as in elinks.conf or
+	in the keybinding manager, except they have underscores instead of
+	dashes in order to make them valid ECMAScript identifiers.
++
+--
+NOTE: When you read an action function from this hash, ELinks binds it to the
+current tab; any later calls to the function affect that tab.  This may be
+changed in a future version.  It is safest to call the function right away,
+rather than save it in a variable and call it later.
+--
+
+[[smjs-elinks.keymaps]] elinks.keymaps (hash)::
+	This is a hash, the elements of which correspond to ELinks's keymaps.
+	Currently, there are three: 'elinks.keymaps.main', 'elinks.keymaps.edit',
+	and 'elinks.keymaps.menu'. These elements are also hashes, the elements of
+	which correspond to bindings. For example, `elinks.keymaps.main["q"]` is
+	the binding to the ``q'' key in the main map. These bindings can be red,
+	to get the name of the action to which the key is bound, or set, either
+	to a string with the name of the ELinks action or to a function, which will
+	thenceforth be called when the key is pressed. For example,
++
+--
+----------------------------------------------------------------------
+elinks.keymaps.main["!"] = function () { elinks.alert("Hello!"); }
+----------------------------------------------------------------------
+
+binds the ``!'' key in the main map to a function that displays a friendly
+alert.
+
+----------------------------------------------------------------------
+elinks.keymaps.main["/"] = "search-typeahead-text";
+----------------------------------------------------------------------
+
+changes the ``/'' key to use the nice typeahead search function instead of
+opening that ugly old search dialogue box.
+
+NOTE: Do not read a function from <<smjs-elinks.action,'elinks.action'>>,
+e.g. `elinks.action.search_typeahead_text`, and place it in a keymap.
+ELinks binds such functions to the current tab when the script reads
+them from 'elinks.action', so they will not work right in other tabs.
+Use the name of the action instead.
+--
+
+[[smjs-elinks.vs]] elinks.vs (view_state)::
+	This property refers to the <<smjs-view_state-object,view-state
+	object>> for the current document, if any.
+
+
+[[smjs-elinks-hooks]]
+ELinks Object Hooks
+^^^^^^^^^^^^^^^^^^^
+
+These are actually properties, but a special case: one assigns functions
+to them, which functions are called at certain events.
+
+In the ELinks source tree, `contrib/smjs/hooks.js` provides a mechanism
+with which multiple scripts can add their functions to the same hooks.
+Please see `contrib/smjs/README` for details.
+
+[[smjs-elinks.preformat_html]] elinks.preformat_html(cached, vs)::
+	This function is called every time a document is loaded, before the
+	document is actually rendered, to give scripts the opportunity to
+	modify it. The first parameter is the <<smjs-cache_entry-object,cache
+	object>> and the second is the <<smjs-view_state-object,view-state
+	object>>.
++
+--
+The <<smjs-cache_entry-object,cache object>> will not expire until after this
+function returns.
+--
+
+[[smjs-elinks.goto_url_hook]] elinks.goto_url_hook(url)::
+	This function is called every time the user enters something in the
+	'Go to URL' box. The url (string) can be modified or not, and the
+	returned string is substituted for what the user entered.  If the
+	value `false` is returned, the URL is not changed and further hooks
+	in ELinks are not run.
+
+[[smjs-elinks.follow_url_hook]] elinks.follow_url_hook(url)::
+	This function is called every time the user tries to load a document,
+	whether by following a link, by entering a URI in the Go to URL box,
+	by setting <<smjs-elinks.location,'elinks.location'>>, or whatever.
+	It behaves the same as <<smjs-elinks.goto_url_hook,'elinks.goto_url_hook'>>
+	above.
+
+
+[[smjs-cache_entry-object]]
+Cache Object
+~~~~~~~~~~~~
+
+The cache object mentioned in the descriptions of
+<<smjs-elinks.load_uri,'elinks.load_uri'>> and
+<<smjs-elinks.preformat_html,'elinks.preformat_html'>> is a wrapper for the
+internal ELinks cache object.  ELinks passes the ECMAScript cache object as an
+argument to your ECMAScript function, and keeps the corresponding document in
+the cache until the function returns.  After that, ELinks may remove the
+document from the cache, even if the function has saved the cache object to
+some global variable.  Such an expired cache object does not work but it does
+not crash ELinks either.
+
+
+[[smjs-cache_entry-properties]]
+Cache Object Properties
+^^^^^^^^^^^^^^^^^^^^^^^
+
+[[smjs-cache_entry.content]] cached.content (string)::
+	This is the content received from the server. It can be read and set.
+
+[[smjs-cache_entry.type]] cached.type (string)::
+	This is the MIME type of the cache entry. It can be read and set.
+
+[[smjs-cache_entry.length]] cached.length (number)::
+	This is the length of cached.content. It is read-only.
+
+[[smjs-cache_entry.head]] cached.head (string)::
+	This is the header received from the server. It can be read and set.
+
+[[smjs-cache_entry.uri]] cached.uri (string)::
+	This is the URI of the cache entry. It is read-only.
+
+
+[[smjs-view_state-object]]
+View-state Object
+~~~~~~~~~~~~~~~~~
+
+The view-state object mentioned in the descriptions of
+<<smjs-elinks.preformat_html,'elinks.preformat_html'>> and
+<<smjs-elinks.vs,'elinks.vs'>> is a wrapper for the internal ELinks view_state
+object.  The view state holds information on how the current document is being
+displayed.
+
+
+[[smjs-view_state-properties]]
+View-state Object Properties
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+[[smjs.view_state.plain]] vs.plain (boolean)::
+	Whether the current document is rendered as HTML or displayed
+	as plaintext. This can be read and set.
+
+[[smjs.view_state.uri]] vs.uri (string)::
+	This is the URI of the current document. It is read-only.

From 5251441fdce1ae55a717839cf592e39b204af377 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Thu, 10 Jul 2008 21:11:45 +0300
Subject: [PATCH 40/43] doc/smjs-scripting: add version info, rephrase risk

---
 doc/smjs-scripting.txt | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/doc/smjs-scripting.txt b/doc/smjs-scripting.txt
index 440f269f..ef9d80ab 100644
--- a/doc/smjs-scripting.txt
+++ b/doc/smjs-scripting.txt
@@ -16,7 +16,8 @@ features.conf>>.
 
 WARNING: ECMAScript scripting is still a bit experimental: there seem to be
 ways to crash ELinks with it, and the object model may change.  However, if
-you don't have a `hooks.js` file, the risk is minimal.
+you don't have a `hooks.js` file, there is not much risk in enabling the
+feature at compile time.
 
 When ELinks starts up, it evaluates the ECMAScript file `hooks.js` in
 your ELinks configuration directory (thus normally `~/.elinks/hooks.js`
@@ -50,6 +51,8 @@ do_file("/home/me/.elinks/hooks.js");
 ----------------------------------------------------------------------
 
 will reload your hooks file.
+
+*Compatibility:* ELinks 0.11.0
 --
 
 
@@ -59,6 +62,8 @@ Global Object Properties
 
 [[smjs-global.elinks]] elinks (elinks)::
 	A reference to the <<smjs-elinks-object,ELinks object>>.
++
+*Compatibility:* ELinks 0.11.0
 
 
 [[smjs-elinks-object]]
@@ -81,6 +86,8 @@ elinks.alert("Hello, world!");
 ----------------------------------------------------------------------
 
 will display a friendly greeting.
+
+*Compatibility:* ELinks 0.11.0
 --
 
 [[smjs-elinks.execute]] elinks.execute(command)::
@@ -95,6 +102,8 @@ elinks.execute("firefox " + quoted_uri);
 
 will run Firefox with the URI of the current document.
 
+*Compatibility:* ELinks 0.12pre1
+
 WARNING: One must be very careful with 'elinks.execute', because depending
 on the OS, the command may be subject to interpretation by a command
 shell language. When constructing the command string, be sure to quote
@@ -117,6 +126,8 @@ displays a fortune.
 
 The <<smjs-cache_entry-object,cache object>> will not expire until after the
 callback returns.
+
+*Compatibility:* ELinks 0.12pre1
 --
 
 
@@ -134,6 +145,8 @@ do_file(elinks.home + "hooks.js");
 ----------------------------------------------------------------------
 
 will reload your hooks file.
+
+*Compatibility:* ELinks 0.11.0
 --
 
 [[smjs-elinks.location]] elinks.location (string)::
@@ -147,6 +160,8 @@ elinks.location = elinks.location + "/..";
 ----------------------------------------------------------------------
 
 will go up a directory (if the URI doesn't end in a file).
+
+*Compatibility:* ELinks 0.11.0
 --
 
 [[smjs-elinks.bookmarks]] elinks.bookmarks (hash)::
@@ -162,6 +177,8 @@ elinks.bookmarks.x.children.y.children.z.children.foo.title
 gets the title of the bookmark titled ``foo'' under the folder ``z'',
 which is a subfolder of ``y'', which is a subfolder of ``x''.
 
+*Compatibility:* ELinks 0.11.0
+
 [[smjs-bookmark-properties]]
 A bookmark object has these properties:
 
@@ -187,6 +204,8 @@ elinks.globhist["file:///"]
 
 will get you the history item for your root directory.
 
+*Compatibility:* ELinks 0.12pre1
+
 [[smjs-global_history_item-properties]]
 A history item has these properties:
 
@@ -212,6 +231,8 @@ A history item has these properties:
 	dashes in order to make them valid ECMAScript identifiers.
 +
 --
+*Compatibility:* ELinks 0.12pre1
+
 NOTE: When you read an action function from this hash, ELinks binds it to the
 current tab; any later calls to the function affect that tab.  This may be
 changed in a future version.  It is safest to call the function right away,
@@ -243,6 +264,8 @@ elinks.keymaps.main["/"] = "search-typeahead-text";
 changes the ``/'' key to use the nice typeahead search function instead of
 opening that ugly old search dialogue box.
 
+*Compatibility:* ELinks 0.11.0
+
 NOTE: Do not read a function from <<smjs-elinks.action,'elinks.action'>>,
 e.g. `elinks.action.search_typeahead_text`, and place it in a keymap.
 ELinks binds such functions to the current tab when the script reads
@@ -253,6 +276,8 @@ Use the name of the action instead.
 [[smjs-elinks.vs]] elinks.vs (view_state)::
 	This property refers to the <<smjs-view_state-object,view-state
 	object>> for the current document, if any.
++
+*Compatibility:* ELinks 0.12pre1
 
 
 [[smjs-elinks-hooks]]
@@ -276,6 +301,9 @@ Please see `contrib/smjs/README` for details.
 --
 The <<smjs-cache_entry-object,cache object>> will not expire until after this
 function returns.
+
+*Compatibility:* ELinks 0.11.1 as described.  ELinks 0.11.0 did not provide
+the 'vs' argument.
 --
 
 [[smjs-elinks.goto_url_hook]] elinks.goto_url_hook(url)::
@@ -284,6 +312,8 @@ function returns.
 	returned string is substituted for what the user entered.  If the
 	value `false` is returned, the URL is not changed and further hooks
 	in ELinks are not run.
++
+*Compatibility:* ELinks 0.11.0
 
 [[smjs-elinks.follow_url_hook]] elinks.follow_url_hook(url)::
 	This function is called every time the user tries to load a document,
@@ -291,6 +321,8 @@ function returns.
 	by setting <<smjs-elinks.location,'elinks.location'>>, or whatever.
 	It behaves the same as <<smjs-elinks.goto_url_hook,'elinks.goto_url_hook'>>
 	above.
++
+*Compatibility:* ELinks 0.11.0
 
 
 [[smjs-cache_entry-object]]
@@ -307,6 +339,8 @@ document from the cache, even if the function has saved the cache object to
 some global variable.  Such an expired cache object does not work but it does
 not crash ELinks either.
 
+*Compatibility:* ELinks 0.11.0
+
 
 [[smjs-cache_entry-properties]]
 Cache Object Properties
@@ -338,6 +372,8 @@ The view-state object mentioned in the descriptions of
 object.  The view state holds information on how the current document is being
 displayed.
 
+*Compatibility:* ELinks 0.11.1
+
 
 [[smjs-view_state-properties]]
 View-state Object Properties

From fd27acf784b6c04678b581413f142a3e278afd21 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 11 Jul 2008 16:37:44 +0300
Subject: [PATCH 41/43] Bug 1027, SMJS: make null mean "none" in elinks.keymaps

elinks.keymaps.main["/"] = null;
used to crash ELinks with a segfault in JS_ObjectIsFunction.
Fix that by recognizing JSVAL_NULL explicitly and treating it as "none".
Likewise, if keymap_get_property would return "none" to ECMAScript,
return JSVAL_NULL instead.
---
 NEWS                            |  2 ++
 doc/smjs-scripting.txt          | 19 ++++++++++++++-----
 src/scripting/smjs/keybinding.c |  8 +++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index d6688b2e..2fcd70e4 100644
--- a/NEWS
+++ b/NEWS
@@ -181,6 +181,8 @@ ELinks 0.11.4.GIT now:
 
 To be released as 0.11.5.
 
+* critical bug 1027 in user SMJS: make elinks.keymaps treat null and
+  "none" as equivalent actions, avoiding a segfault
 * build bug 1021: fixed uninitialized variable in http_got_header
 
 ELinks 0.11.4:
diff --git a/doc/smjs-scripting.txt b/doc/smjs-scripting.txt
index ef9d80ab..34221cd4 100644
--- a/doc/smjs-scripting.txt
+++ b/doc/smjs-scripting.txt
@@ -244,12 +244,21 @@ rather than save it in a variable and call it later.
 	Currently, there are three: 'elinks.keymaps.main', 'elinks.keymaps.edit',
 	and 'elinks.keymaps.menu'. These elements are also hashes, the elements of
 	which correspond to bindings. For example, `elinks.keymaps.main["q"]` is
-	the binding to the ``q'' key in the main map. These bindings can be red,
-	to get the name of the action to which the key is bound, or set, either
-	to a string with the name of the ELinks action or to a function, which will
-	thenceforth be called when the key is pressed. For example,
+	the binding to the ``q'' key in the main map. These bindings can be read,
+	to get the name of the action to which the key is bound, or set to one of:
 +
 --
+- A string with the name of the ELinks action.
+- A function, which will thenceforth be called when the key is pressed.
+- The string `"none"`, to unbind the key.  You can also use the `null`
+  value for this purpose, but that crashes ELinks 0.11.4 and 0.12pre1
+  (http://bugzilla.elinks.cz/show_bug.cgi?id=1027[bug 1027]),
+  so it may be best to use the string for now.
+--
++
+--
+For example,
+
 ----------------------------------------------------------------------
 elinks.keymaps.main["!"] = function () { elinks.alert("Hello!"); }
 ----------------------------------------------------------------------
@@ -264,7 +273,7 @@ elinks.keymaps.main["/"] = "search-typeahead-text";
 changes the ``/'' key to use the nice typeahead search function instead of
 opening that ugly old search dialogue box.
 
-*Compatibility:* ELinks 0.11.0
+*Compatibility:* ELinks 0.11.0, unless you use `null`.
 
 NOTE: Do not read a function from <<smjs-elinks.action,'elinks.action'>>,
 e.g. `elinks.action.search_typeahead_text`, and place it in a keymap.
diff --git a/src/scripting/smjs/keybinding.c b/src/scripting/smjs/keybinding.c
index eff4c545..8c2f697b 100644
--- a/src/scripting/smjs/keybinding.c
+++ b/src/scripting/smjs/keybinding.c
@@ -37,7 +37,7 @@ keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 	action_str = get_action_name_from_keystroke((enum keymap_id) *data,
 						    keystroke_str);
-	if (!action_str) goto ret_null;
+	if (!action_str || !strcmp(action_str, "none")) goto ret_null;
 
 	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(ctx, action_str));
 
@@ -106,6 +106,12 @@ keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 		return JS_TRUE;
 
+	} else if (JSVAL_IS_NULL(*vp)) { /* before JSVAL_IS_OBJECT */
+		if (bind_do(keymap_str, keystroke_str, "none", 0))
+			return JS_FALSE;
+
+		return JS_TRUE;
+
 	} else if (JSVAL_IS_OBJECT(*vp)) {
 		unsigned char *err = NULL;
 		int event_id;

From 4649d0ccbae1fc80414c17339c11b44e31367b52 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 11 Jul 2008 19:09:07 +0300
Subject: [PATCH 42/43] Bug 951 should not be removed from NEWS before 0.12.0.

That's because the bug was in 0.11.4 as well.
---
 NEWS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 2fcd70e4..21227cf3 100644
--- a/NEWS
+++ b/NEWS
@@ -11,13 +11,14 @@ ELinks 0.12pre1.GIT now:
 To be released as 0.12pre2, 0.12rc1, or even 0.12.0.  This branch
 generally also includes the bug fixes made in ELinks 0.11.4.GIT.
 
+* minor bug 951: SpiderMonkey scripting objects used to prevent ELinks
+  from removing files from the memory cache
+
 Bugs that should be removed from NEWS before the 0.12.0 release:
 
 * bug 955: Reset buttons no longer run FORM/@onsubmit, and
   ``harmless'' buttons no longer submit the form.  ELinks 0.12pre1
   was the first release that had these bugs.
-* minor bug 951: SpiderMonkey scripting objects used to prevent ELinks
-  from removing files from the memory cache
 
 ELinks 0.12pre1:
 ----------------

From 12bb8fdfe77f5fd6850f288c0ed312ac96c4d1ee Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 11 Jul 2008 22:22:27 +0300
Subject: [PATCH 43/43] NEWS: sync from 0.11.4.GIT

http://elinks.cz/release.html is generated from NEWS of elinks-0.12;
thus we should have all the news of 0.11.4.GIT here too.
---
 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 21227cf3..f117d602 100644
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,7 @@ ELinks 0.12pre1:
 ----------------
 
 Released on 2008-07-01.  This release also included all the bug fixes
-of ELinks 0.11.4.
+of ELinks 0.11.4, but not the ones made in 0.11.4.GIT.
 
 Notable new features:
 
@@ -184,6 +184,7 @@ To be released as 0.11.5.
 
 * critical bug 1027 in user SMJS: make elinks.keymaps treat null and
   "none" as equivalent actions, avoiding a segfault
+* major bug 503: various fixes in parsing and updating of elinks.conf
 * build bug 1021: fixed uninitialized variable in http_got_header
 
 ELinks 0.11.4: