diff --git a/config/m4/ruby.m4 b/config/m4/ruby.m4
index a6485548..eb6fbae1 100644
--- a/config/m4/ruby.m4
+++ b/config/m4/ruby.m4
@@ -32,7 +32,7 @@ if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then
 	if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
 
 		AC_MSG_CHECKING(Ruby version)
-		if $CONFIG_SCRIPTING_RUBY -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
+		if $CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}" >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
 			ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
 			AC_MSG_RESULT($ruby_version)
 
diff --git a/po/fr.po b/po/fr.po
index a5c12b72..d59446bb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-05 13:13+0100\n"
-"PO-Revision-Date: 2006-11-05 13:14+0100\n"
+"POT-Creation-Date: 2006-11-06 16:59+0100\n"
+"PO-Revision-Date: 2006-11-06 17:01+0100\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "Cha
 #: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:391 src/scripting/lua/core.c:472
-#: src/session/download.c:637 src/session/download.c:1236
+#: src/session/download.c:637 src/session/download.c:1243
 #: src/viewer/text/search.c:1667
 msgid "~Cancel"
 msgstr "~Annuler"
@@ -192,8 +192,8 @@ msgstr "Horloge"
 msgid "Digital clock in the status bar."
 msgstr "Horloge digitale dans la barre de status."
 
-#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1212
-#: src/config/options.inc:1219 src/ecmascript/ecmascript.c:45
+#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1214
+#: src/config/options.inc:1221 src/ecmascript/ecmascript.c:45
 #: src/globhist/globhist.c:64 src/mime/backend/mailcap.c:93
 #: src/mime/backend/mimetypes.c:52 src/network/ssl/ssl.c:80
 msgid "Enable"
@@ -366,7 +366,7 @@ msgstr ""
 "\n"
 "Cette fonctionnalité requiert le support des signets."
 
-#: src/bookmarks/dialogs.c:72 src/config/options.inc:1064
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1066
 #: src/dialogs/document.c:145 src/globhist/dialogs.c:65
 msgid "Title"
 msgstr "Titre"
@@ -1910,7 +1910,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:535 src/config/dialogs.c:963 src/cookies/dialogs.c:479
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1227
 msgid "Sa~ve"
 msgstr "Enre~gistrer"
 
@@ -1922,7 +1922,7 @@ msgstr "Gestionnaire d'options"
 msgid "Keystroke"
 msgstr "Touches"
 
-#: src/config/dialogs.c:704 src/config/options.inc:1232
+#: src/config/dialogs.c:704 src/config/options.inc:1234
 msgid "Action"
 msgstr "Action"
 
@@ -2554,12 +2554,12 @@ msgid "Active link colors."
 msgstr "Couleurs du lien actif."
 
 #: src/config/options.inc:274 src/config/options.inc:548
-#: src/config/options.inc:958
+#: src/config/options.inc:960
 msgid "Background color"
 msgstr "Couleur du fond"
 
 #: src/config/options.inc:276 src/config/options.inc:550
-#: src/config/options.inc:959
+#: src/config/options.inc:961
 msgid "Default background color."
 msgstr "Couleur par défaut du fond."
 
@@ -2572,12 +2572,12 @@ msgstr "Couleur par d
 #. The colors and mono tree should be similar but with different default
 #. * values of course so always use the macros below.
 #: src/config/options.inc:278 src/config/options.inc:544
-#: src/config/options.inc:956
+#: src/config/options.inc:958
 msgid "Text color"
 msgstr "Couleur du texte"
 
 #: src/config/options.inc:280 src/config/options.inc:546
-#: src/config/options.inc:957
+#: src/config/options.inc:959
 msgid "Default text color."
 msgstr "Couleur du texte par défaut."
 
@@ -2611,7 +2611,7 @@ msgid "Invert the fore- and background color so the link stands out."
 msgstr ""
 "Inverser les couleurs de fond et de texte pour mettre le lien en évidence."
 
-#: src/config/options.inc:296 src/config/options.inc:921
+#: src/config/options.inc:296 src/config/options.inc:923
 #: src/dialogs/options.c:231
 msgid "Underline"
 msgstr "Souligné"
@@ -3265,7 +3265,7 @@ msgstr "Sortie (dump)"
 msgid "Dump output options."
 msgstr "Options de sortie (dump)."
 
-#: src/config/options.inc:639 src/config/options.inc:925
+#: src/config/options.inc:639 src/config/options.inc:927
 #: src/config/opttypes.c:408 src/dialogs/document.c:163
 msgid "Codepage"
 msgstr "Jeu de caractčres"
@@ -3803,17 +3803,24 @@ msgid ""
 "If we should not set the background to black. This is particularly\n"
 "useful when we have a terminal (typically in some windowing\n"
 "environment) with a background image or a transparent background -\n"
-"it will be visible in ELinks as well. Note that this option makes\n"
+"it will be visible in ELinks as well (but ELinks document color handling\n"
+"will still assume the background is black so if you have a bright "
+"background\n"
+"you might experience contrast problems). Note that this option makes\n"
 "sense only when colors are enabled."
 msgstr ""
-"Permet d'utiliser un fond image ou transparent au lieu d'un fond noir.\n"
-"Votre terminal doit supporter la transparence et les couleurs."
+"Rendre le fond noir ou non. C'est particuličrement utile quand vous\n"
+"utilisez un terminal avec une image de fond ou un fond transparent - \n"
+"il deviendra visible aussi dans ELinks (mais la gestion des couleurs\n"
+"de document d'ELinks assumera que le fond est noir, aussi si vous avez\n"
+"un fond clair vous rencontrerez des problčmes de contraste).\n"
+"Cette option n'a de sens que quand les couleurs sont activées."
 
-#: src/config/options.inc:923
+#: src/config/options.inc:925
 msgid "If we should use underline or enhance the color instead."
 msgstr "Si nous devons utiliser le souligné ou modifier la couleur."
 
-#: src/config/options.inc:927
+#: src/config/options.inc:929
 msgid ""
 "Codepage of charset used for displaying content on terminal.\n"
 "'System' stands for a codepage determined by a selected locale."
@@ -3823,374 +3830,374 @@ msgstr ""
 "sélectionnée."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:934
+#: src/config/options.inc:936
 msgid "User interface"
 msgstr "Interface utilisateur"
 
-#: src/config/options.inc:936
+#: src/config/options.inc:938
 msgid "User interface options."
 msgstr "Options de l'interface utilisateur."
 
-#: src/config/options.inc:940
+#: src/config/options.inc:942
 msgid "Color settings"
 msgstr "Configuration des couleurs"
 
-#: src/config/options.inc:942
+#: src/config/options.inc:944
 msgid "Default user interface color settings."
 msgstr "Configuration des couleurs de l'interface utilisateur."
 
-#: src/config/options.inc:969
+#: src/config/options.inc:971
 msgid "Color terminals"
 msgstr "Terminaux couleur"
 
-#: src/config/options.inc:971
+#: src/config/options.inc:973
 msgid "Color settings for color terminal."
 msgstr "Configuration des couleurs des terminaux couleur."
 
-#: src/config/options.inc:973
+#: src/config/options.inc:975
 msgid "Non-color terminals"
 msgstr "Terminaux monochromes"
 
-#: src/config/options.inc:975
+#: src/config/options.inc:977
 msgid "Color settings for non-color terminal."
 msgstr "Configuration des couleurs pour les terminaux monochromes."
 
 #. FIXME: obsolete, how to alias them correctly ? --Zas
-#: src/config/options.inc:978
+#: src/config/options.inc:980
 msgid "Main menu bar"
 msgstr "Barre du menu principal"
 
-#: src/config/options.inc:980
+#: src/config/options.inc:982
 msgid "Main menu bar colors."
 msgstr "Couleurs de la barre du menu principal."
 
-#: src/config/options.inc:982
+#: src/config/options.inc:984
 msgid "Unselected main menu bar item"
 msgstr "Item non sélectionné de la barre de menu"
 
-#: src/config/options.inc:984
+#: src/config/options.inc:986
 msgid "Unselected main menu bar item colors."
 msgstr "Couleurs des items non sélectionnés de la barre de menu."
 
-#: src/config/options.inc:986
+#: src/config/options.inc:988
 msgid "Selected main menu bar item"
 msgstr "Item sélectionné de la barre de menu"
 
-#: src/config/options.inc:988
+#: src/config/options.inc:990
 msgid "Selected main menu bar item colors."
 msgstr "Couleurs de l'item sélectionné de la barre de menu."
 
-#: src/config/options.inc:990 src/config/options.inc:1019
+#: src/config/options.inc:992 src/config/options.inc:1021
 msgid "Hotkey"
 msgstr "Raccourci clavier"
 
-#: src/config/options.inc:992
+#: src/config/options.inc:994
 msgid "Main menu hotkey colors."
 msgstr "Couleurs des raccourcis de la barre du menu principal."
 
-#: src/config/options.inc:994 src/config/options.inc:1023
+#: src/config/options.inc:996 src/config/options.inc:1025
 msgid "Unselected hotkey"
 msgstr "Raccourci non sélectionné"
 
-#: src/config/options.inc:996
+#: src/config/options.inc:998
 msgid "Main menu unselected hotkey colors."
 msgstr "Couleurs des raccourcis non sélectionnés du menu principal."
 
-#: src/config/options.inc:998 src/config/options.inc:1027
+#: src/config/options.inc:1000 src/config/options.inc:1029
 msgid "Selected hotkey"
 msgstr "Raccourci sélectionné"
 
-#: src/config/options.inc:1000
+#: src/config/options.inc:1002
 msgid "Main menu selected hotkey colors."
 msgstr "Couleurs des raccourcis sélectionnés du menu principal."
 
-#: src/config/options.inc:1003
+#: src/config/options.inc:1005
 msgid "Menu bar"
 msgstr "Barre de menu"
 
-#: src/config/options.inc:1005
+#: src/config/options.inc:1007
 msgid "Menu bar colors."
 msgstr "Couleurs de la barre de menu."
 
-#: src/config/options.inc:1007
+#: src/config/options.inc:1009
 msgid "Unselected menu item"
 msgstr "Item non sélectionné du menu"
 
-#: src/config/options.inc:1009
+#: src/config/options.inc:1011
 msgid "Unselected menu item colors."
 msgstr "Couleurs des items non sélectionnés du menu."
 
-#: src/config/options.inc:1011
+#: src/config/options.inc:1013
 msgid "Selected menu item"
 msgstr "Item sélectionné du menu"
 
-#: src/config/options.inc:1013
+#: src/config/options.inc:1015
 msgid "Selected menu item colors."
 msgstr "Couleurs de l'item sélectionnés du menu."
 
-#: src/config/options.inc:1015
+#: src/config/options.inc:1017
 msgid "Marked menu item"
 msgstr "Item de menu marqué"
 
-#: src/config/options.inc:1017
+#: src/config/options.inc:1019
 msgid "Marked menu item colors."
 msgstr "Couleurs de l'item du menu marqué."
 
-#: src/config/options.inc:1021
+#: src/config/options.inc:1023
 msgid "Menu item hotkey colors."
 msgstr "Couleurs des raccourcis dans les menus."
 
-#: src/config/options.inc:1025
+#: src/config/options.inc:1027
 msgid "Menu item unselected hotkey colors."
 msgstr "Couleurs des raccourcis non sélectionnés dans les menus."
 
-#: src/config/options.inc:1029
+#: src/config/options.inc:1031
 msgid "Menu item selected hotkey colors."
 msgstr "Couleurs des raccourcis sélectionnés dans les menus."
 
-#: src/config/options.inc:1031
+#: src/config/options.inc:1033
 msgid "Menu frame"
 msgstr "Bordure du menu"
 
-#: src/config/options.inc:1033
+#: src/config/options.inc:1035
 msgid "Menu frame colors."
 msgstr "Couleurs de la bordure du menu."
 
-#: src/config/options.inc:1036
+#: src/config/options.inc:1038
 msgid "Dialog"
 msgstr "Dialogue"
 
-#: src/config/options.inc:1038
+#: src/config/options.inc:1040
 msgid "Dialog colors."
 msgstr "Couleurs des dialogues."
 
-#: src/config/options.inc:1048
+#: src/config/options.inc:1050
 msgid "Generic"
 msgstr "Générique"
 
-#: src/config/options.inc:1050
+#: src/config/options.inc:1052
 msgid "Generic dialog colors."
 msgstr "Couleurs des dialogues génériques."
 
-#: src/config/options.inc:1052
+#: src/config/options.inc:1054
 msgid "Frame"
 msgstr "Bordure"
 
-#: src/config/options.inc:1054
+#: src/config/options.inc:1056
 msgid "Dialog frame colors."
 msgstr "Couleurs de la bordure des dialogues."
 
-#: src/config/options.inc:1056
+#: src/config/options.inc:1058
 msgid "Scrollbar"
 msgstr "Barre de défilement"
 
-#: src/config/options.inc:1058
+#: src/config/options.inc:1060
 msgid "Scrollbar colors."
 msgstr "Couleurs de la barre de défilement."
 
-#: src/config/options.inc:1060
+#: src/config/options.inc:1062
 msgid "Selected scrollbar"
 msgstr "Barre de défilement sélectionnée"
 
-#: src/config/options.inc:1062
+#: src/config/options.inc:1064
 msgid "Scrollbar selected colors."
 msgstr "Couleurs de la barre de défilement sélectionnée."
 
-#: src/config/options.inc:1066
+#: src/config/options.inc:1068
 msgid "Dialog title colors."
 msgstr "Couleurs du titre des dialogues."
 
-#: src/config/options.inc:1068
+#: src/config/options.inc:1070
 msgid "Text"
 msgstr "Texte"
 
-#: src/config/options.inc:1070
+#: src/config/options.inc:1072
 msgid "Dialog text colors."
 msgstr "Couleurs du texte des dialogues."
 
-#: src/config/options.inc:1072 src/viewer/text/form.c:1800
+#: src/config/options.inc:1074 src/viewer/text/form.c:1800
 msgid "Checkbox"
 msgstr "Case ŕ cocher"
 
-#: src/config/options.inc:1074
+#: src/config/options.inc:1076
 msgid "Dialog checkbox colors."
 msgstr "Couleurs des cases ŕ cocher dans les dialogues."
 
-#: src/config/options.inc:1076
+#: src/config/options.inc:1078
 msgid "Selected checkbox"
 msgstr "Case ŕ cocher sélectionnée"
 
-#: src/config/options.inc:1078
+#: src/config/options.inc:1080
 msgid "Dialog selected checkbox colors."
 msgstr "Couleurs de la case ŕ cocher sélectionnée dans les dialogues."
 
-#: src/config/options.inc:1080
+#: src/config/options.inc:1082
 msgid "Checkbox label"
 msgstr "Label de case ŕ cocher"
 
-#: src/config/options.inc:1082
+#: src/config/options.inc:1084
 msgid "Dialog checkbox label colors."
 msgstr "Couleurs des labels des cases ŕ cocher dans les dialogues."
 
-#: src/config/options.inc:1084
+#: src/config/options.inc:1086
 msgid "Button"
 msgstr "Bouton"
 
-#: src/config/options.inc:1086 src/config/options.inc:1094
+#: src/config/options.inc:1088 src/config/options.inc:1096
 msgid "Dialog button colors."
 msgstr "Couleurs des boutons des dialogues."
 
-#: src/config/options.inc:1088
+#: src/config/options.inc:1090
 msgid "Selected button"
 msgstr "Bouton sélectionné"
 
-#: src/config/options.inc:1090 src/config/options.inc:1098
+#: src/config/options.inc:1092 src/config/options.inc:1100
 msgid "Dialog selected button colors."
 msgstr "Couleurs du bouton sélectionné dans les dialogues."
 
-#: src/config/options.inc:1092
+#: src/config/options.inc:1094
 msgid "Button shortcut"
 msgstr "Raccourci du bouton"
 
-#: src/config/options.inc:1096
+#: src/config/options.inc:1098
 msgid "Selected button shortcut"
 msgstr "Raccourci du bouton sélectionné"
 
-#: src/config/options.inc:1100 src/viewer/text/form.c:1804
+#: src/config/options.inc:1102 src/viewer/text/form.c:1804
 msgid "Text field"
 msgstr "Champ texte"
 
-#: src/config/options.inc:1102
+#: src/config/options.inc:1104
 msgid "Dialog text field colors."
 msgstr "Couleurs des champs texte dans les dialogues."
 
-#: src/config/options.inc:1104
+#: src/config/options.inc:1106
 msgid "Text field text"
 msgstr "Texte des champs texte"
 
-#: src/config/options.inc:1106
+#: src/config/options.inc:1108
 msgid "Dialog field text colors."
 msgstr "Couleurs de texte des champs texte dans les dialogues."
 
-#: src/config/options.inc:1108
+#: src/config/options.inc:1110
 msgid "Meter"
 msgstr "Barre de progression"
 
-#: src/config/options.inc:1110
+#: src/config/options.inc:1112
 msgid "Dialog meter colors."
 msgstr "Couleurs des barres de progression."
 
-#: src/config/options.inc:1112
+#: src/config/options.inc:1114
 msgid "Shadow"
 msgstr "Ombrage"
 
-#: src/config/options.inc:1114
+#: src/config/options.inc:1116
 msgid "Dialog shadow colors (see ui.shadows option)."
 msgstr "Couleurs des ombres des dialogues (voir l'option ui.shadows)."
 
-#: src/config/options.inc:1116
+#: src/config/options.inc:1118
 msgid "Title bar"
 msgstr "Barre de titre"
 
-#: src/config/options.inc:1118
+#: src/config/options.inc:1120
 msgid "Title bar colors."
 msgstr "Couleurs de la barre de titre."
 
-#: src/config/options.inc:1120
+#: src/config/options.inc:1122
 msgid "Generic title bar"
 msgstr "Barre de titre générique"
 
-#: src/config/options.inc:1122
+#: src/config/options.inc:1124
 msgid "Generic title bar colors."
 msgstr "Couleurs de la barre de titre générique."
 
-#: src/config/options.inc:1124
+#: src/config/options.inc:1126
 msgid "Title bar text"
 msgstr "Texte de la barre de titre"
 
-#: src/config/options.inc:1126
+#: src/config/options.inc:1128
 msgid "Title bar text colors."
 msgstr "Couleurs du texte de la barre de titre."
 
-#: src/config/options.inc:1129
+#: src/config/options.inc:1131
 msgid "Status bar"
 msgstr "Barre d'état"
 
-#: src/config/options.inc:1131
+#: src/config/options.inc:1133
 msgid "Status bar colors."
 msgstr "Couleurs de la barre d'état."
 
-#: src/config/options.inc:1133
+#: src/config/options.inc:1135
 msgid "Generic status bar"
 msgstr "Barre d'état générique"
 
-#: src/config/options.inc:1135
+#: src/config/options.inc:1137
 msgid "Generic status bar colors."
 msgstr "Couleurs de la barre d'état générique."
 
-#: src/config/options.inc:1137
+#: src/config/options.inc:1139
 msgid "Status bar text"
 msgstr "Texte de la barre d'état"
 
-#: src/config/options.inc:1139
+#: src/config/options.inc:1141
 msgid "Status bar text colors."
 msgstr "Couleurs du texte de la barre d'état."
 
-#: src/config/options.inc:1142
+#: src/config/options.inc:1144
 msgid "Tabs bar"
 msgstr "Barre d'onglets"
 
-#: src/config/options.inc:1144
+#: src/config/options.inc:1146
 msgid "Tabs bar colors."
 msgstr "Couleurs de la barre d'onglets."
 
-#: src/config/options.inc:1146
+#: src/config/options.inc:1148
 msgid "Unvisited tab"
 msgstr "Onglet non visité"
 
-#: src/config/options.inc:1148
+#: src/config/options.inc:1150
 msgid ""
 "Tab colors for tabs that have not been\n"
 "selected since they completed loading."
 msgstr "Couleurs pour les onglets non encore visités depuis leur chargement."
 
-#: src/config/options.inc:1151
+#: src/config/options.inc:1153
 msgid "Unselected tab"
 msgstr "Onglet non sélectionné"
 
-#: src/config/options.inc:1153
+#: src/config/options.inc:1155
 msgid "Unselected tab colors."
 msgstr "Couleurs des onglets non sélectionnés."
 
-#: src/config/options.inc:1155
+#: src/config/options.inc:1157
 msgid "Loading tab"
 msgstr "Onglet en cours de chargement"
 
-#: src/config/options.inc:1157
+#: src/config/options.inc:1159
 msgid "Tab colors for tabs that are loading in the background."
 msgstr "Couleurs pour les onglets en cours de chargement."
 
-#: src/config/options.inc:1159
+#: src/config/options.inc:1161
 msgid "Selected tab"
 msgstr "Onglet sélectionné"
 
-#: src/config/options.inc:1161
+#: src/config/options.inc:1163
 msgid "Selected tab colors."
 msgstr "Couleurs de l'onglet sélectionné."
 
-#: src/config/options.inc:1163
+#: src/config/options.inc:1165
 msgid "Tab separator"
 msgstr "Séparateur d'onglets"
 
-#: src/config/options.inc:1165
+#: src/config/options.inc:1167
 msgid "Tab separator colors."
 msgstr "Couleurs du séparateur d'onglets."
 
-#: src/config/options.inc:1168
+#: src/config/options.inc:1170
 msgid "Searched strings"
 msgstr "Chaînes recherchées"
 
-#: src/config/options.inc:1170
+#: src/config/options.inc:1172
 msgid "Searched string highlight colors."
 msgstr "Couleurs de mise en évidence des chaînes recherchées."
 
@@ -4198,19 +4205,19 @@ msgstr "Couleurs de mise en 
 #. ============= BORING PART (colors) END ===================
 #. ==========================================================
 #. Keep options in alphabetical order.
-#: src/config/options.inc:1179
+#: src/config/options.inc:1181
 msgid "Dialog settings"
 msgstr "Configuration des dialogues"
 
-#: src/config/options.inc:1181
+#: src/config/options.inc:1183
 msgid "Dialogs-specific appearance and behaviour settings."
 msgstr "Configuration de l'apparence et du fonctionnement des dialogues."
 
-#: src/config/options.inc:1184
+#: src/config/options.inc:1186
 msgid "Minimal height of listbox widget"
 msgstr "Hauteur minimale des boîtes liste"
 
-#: src/config/options.inc:1186
+#: src/config/options.inc:1188
 msgid ""
 "Minimal height of the listbox widget (used e.g. for bookmarks\n"
 "or global history)."
@@ -4218,11 +4225,11 @@ msgstr ""
 "Hauteur minimale des boîtes liste (utilisée par exemple pour les\n"
 "signets ou l'historique global)."
 
-#: src/config/options.inc:1189
+#: src/config/options.inc:1191
 msgid "Drop shadows"
 msgstr "Porter des ombres"
 
-#: src/config/options.inc:1191
+#: src/config/options.inc:1193
 msgid ""
 "Make dialogs drop shadows (the shadows are solid, you can\n"
 "adjust their color by ui.colors.*.dialog.shadow). You may\n"
@@ -4232,11 +4239,11 @@ msgstr ""
 "ombres est définie par ui.colors.*.dialog.shadow). Vous pouvez\n"
 "réduire la largeur des bordures en éditant setup.h."
 
-#: src/config/options.inc:1195
+#: src/config/options.inc:1197
 msgid "Underline menu hotkeys"
 msgstr "Souligner les raccourcis des menus"
 
-#: src/config/options.inc:1197
+#: src/config/options.inc:1199
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4244,11 +4251,11 @@ msgstr ""
 "Souligner ou non les raccourcis des menus pour les rendre\n"
 "plus visibles. Le soulignement doit ętre activé pour le terminal."
 
-#: src/config/options.inc:1200
+#: src/config/options.inc:1202
 msgid "Underline button shortcuts"
 msgstr "Souligner les raccourcis des boutons"
 
-#: src/config/options.inc:1202
+#: src/config/options.inc:1204
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4256,11 +4263,11 @@ msgstr ""
 "Souligner ou non les raccourcis des boutons pour les rendre\n"
 "plus visibles. Le soulignement doit ętre activé pour le terminal."
 
-#: src/config/options.inc:1206
+#: src/config/options.inc:1208
 msgid "Timer options"
 msgstr "Options des timers"
 
-#: src/config/options.inc:1208
+#: src/config/options.inc:1210
 msgid ""
 "Timed action after certain interval of user inactivity. Someone can\n"
 "even find this useful, although you may not believe that."
@@ -4268,7 +4275,7 @@ msgstr ""
 "Action aprčs un certain temps d'inactivité de l'utilisateur. Certains\n"
 "peuvent trouver ceci utile ou non."
 
-#: src/config/options.inc:1214
+#: src/config/options.inc:1216
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4280,7 +4287,7 @@ msgstr ""
 "1 oui, mais ne pas montrer le timer\n"
 "2 oui et montrer le timer prčs des LEDs"
 
-#: src/config/options.inc:1221
+#: src/config/options.inc:1223
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4292,11 +4299,11 @@ msgstr ""
 "1 oui, mais ne pas montrer le timer\n"
 "2 oui et montrer le timer prčs des LEDs (DÉSACTIVÉ)"
 
-#: src/config/options.inc:1227
+#: src/config/options.inc:1229
 msgid "Duration"
 msgstr "Durée"
 
-#: src/config/options.inc:1229
+#: src/config/options.inc:1231
 msgid ""
 "Inactivity timeout in seconds. The maximum of one day\n"
 "should be enough for just everyone (TM)."
@@ -4304,23 +4311,23 @@ msgstr ""
 "Délai d'inactivité en secondes. Une durée maximale\n"
 "d'un jour devrait suffire ŕ tout le monde (TM)."
 
-#: src/config/options.inc:1234
+#: src/config/options.inc:1236
 msgid "Keybinding action to be triggered when timer reaches zero."
 msgstr "Action ŕ déclencher lorsque le timer atteint zéro."
 
-#: src/config/options.inc:1237
+#: src/config/options.inc:1239
 msgid "Window tabs"
 msgstr "Onglets"
 
-#: src/config/options.inc:1239
+#: src/config/options.inc:1241
 msgid "Window tabs settings."
 msgstr "Configuration des onglets."
 
-#: src/config/options.inc:1241
+#: src/config/options.inc:1243
 msgid "Display tabs bar"
 msgstr "Afficher la barre d'onglets"
 
-#: src/config/options.inc:1243
+#: src/config/options.inc:1245
 msgid ""
 "Show tabs bar on the screen:\n"
 "0 means never\n"
@@ -4332,20 +4339,20 @@ msgstr ""
 "1 seulement si deux onglets ou plus sont ouverts\n"
 "2 toujours"
 
-#: src/config/options.inc:1248
+#: src/config/options.inc:1250
 msgid "Tab bar at top"
 msgstr "Barre d'onglets en haut"
 
-#: src/config/options.inc:1250
+#: src/config/options.inc:1252
 msgid "Whether display tab bar at top like other browsers do."
 msgstr ""
 "Afficher ou non la barre d'onglets en haut, comme les autres navigateurs."
 
-#: src/config/options.inc:1252
+#: src/config/options.inc:1254
 msgid "Wrap-around tabs cycling"
 msgstr "Navigation cyclique dans les onglets"
 
-#: src/config/options.inc:1254
+#: src/config/options.inc:1256
 msgid ""
 "When moving right from the last tab, jump at the first one, and\n"
 "vice versa."
@@ -4353,20 +4360,20 @@ msgstr ""
 "En cas de déplacement ŕ droite sur le dernier onglet, saute au premier\n"
 "et vice-versa."
 
-#: src/config/options.inc:1257
+#: src/config/options.inc:1259
 msgid "Confirm tab closing"
 msgstr "Confirmer la fermeture d'onglet"
 
-#: src/config/options.inc:1259
+#: src/config/options.inc:1261
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 "Lors de la fermeture d'un onglet, afficher un dialogue de confirmation."
 
-#: src/config/options.inc:1263 src/config/opttypes.c:409
+#: src/config/options.inc:1265 src/config/opttypes.c:409
 msgid "Language"
 msgstr "Langue"
 
-#: src/config/options.inc:1265
+#: src/config/options.inc:1267
 msgid ""
 "Language of user interface. 'System' means that the language will\n"
 "be extracted from the environment dynamically."
@@ -4374,35 +4381,35 @@ msgstr ""
 "Langue de l'interface utilisateur. 'System' signifie que la langue\n"
 "sera dynamiquement extraite de l'environnement."
 
-#: src/config/options.inc:1268
+#: src/config/options.inc:1270
 msgid "Display menu bar always"
 msgstr "Toujours afficher la barre de menu"
 
-#: src/config/options.inc:1270
+#: src/config/options.inc:1272
 msgid "Always show menu bar on the screen."
 msgstr "Toujours montrer la barre de menu ŕ l'écran."
 
-#: src/config/options.inc:1272
+#: src/config/options.inc:1274
 msgid "Display status bar"
 msgstr "Afficher la barre d'état"
 
-#: src/config/options.inc:1274
+#: src/config/options.inc:1276
 msgid "Show status bar on the screen."
 msgstr "Montrer la barre d'état."
 
-#: src/config/options.inc:1276
+#: src/config/options.inc:1278
 msgid "Display title bar"
 msgstr "Afficher la barre de titre"
 
-#: src/config/options.inc:1278
+#: src/config/options.inc:1280
 msgid "Show title bar on the screen."
 msgstr "Montrer la barre de titre."
 
-#: src/config/options.inc:1280
+#: src/config/options.inc:1282
 msgid "Display goto dialog in new tabs"
 msgstr "Afficher le dialogue \"Atteindre l'URL\" dans les nouveaux onglets"
 
-#: src/config/options.inc:1282
+#: src/config/options.inc:1284
 msgid ""
 "Pop up goto dialog in newly created tabs when there's no homepage\n"
 "set. This means also showing goto dialog on startup."
@@ -4411,11 +4418,11 @@ msgstr ""
 "quand aucune page d'accueil n'est configurée. Cela implique aussi de\n"
 "montrer le dialogue au démarrage."
 
-#: src/config/options.inc:1285
+#: src/config/options.inc:1287
 msgid "Show a message box when file is saved successfully"
 msgstr "Afficher un dialogue quand le fichier a été sauvé avec succčs"
 
-#: src/config/options.inc:1287
+#: src/config/options.inc:1289
 msgid ""
 "When you pressed a [ Save ] button in some manager, this option\n"
 "will make sure that a box confirming success of the operation will\n"
@@ -4425,27 +4432,27 @@ msgstr ""
 "option active un dialogue qui confirme que l'opération s'est déroulée\n"
 "correctement."
 
-#: src/config/options.inc:1292
+#: src/config/options.inc:1294
 msgid "Sessions"
 msgstr "Sessions"
 
-#: src/config/options.inc:1294
+#: src/config/options.inc:1296
 msgid "Sessions settings."
 msgstr "Configuration des sessions."
 
-#: src/config/options.inc:1296
+#: src/config/options.inc:1298
 msgid "Keep session active"
 msgstr "Garder la session active"
 
-#: src/config/options.inc:1298
+#: src/config/options.inc:1300
 msgid "Keep the session active even if the last terminal exits."
 msgstr "Garder la session active męme si le dernier terminal est clos."
 
-#: src/config/options.inc:1300
+#: src/config/options.inc:1302
 msgid "Auto save session"
 msgstr "Sauver automatiquement la session"
 
-#: src/config/options.inc:1302
+#: src/config/options.inc:1304
 msgid ""
 "Automatically save the session when quitting.\n"
 "This feature requires bookmark support."
@@ -4453,11 +4460,11 @@ msgstr ""
 "Sauvegarder automatiquement la session au moment de quitter.\n"
 "Cette fonctionnalité nécessite le support des signets."
 
-#: src/config/options.inc:1305
+#: src/config/options.inc:1307
 msgid "Auto restore session"
 msgstr "Restaurer automatiquement la session"
 
-#: src/config/options.inc:1307
+#: src/config/options.inc:1309
 msgid ""
 "Automatically restore the session at start.\n"
 "This feature requires bookmark support."
@@ -4465,11 +4472,11 @@ msgstr ""
 "Restaurer automatiquement la session au démarrage.\n"
 "Cette fonctionnalité nécessite le support des signets."
 
-#: src/config/options.inc:1310
+#: src/config/options.inc:1312
 msgid "Auto save and restore session folder name"
 msgstr "Nom du dossier pour la session automatique"
 
-#: src/config/options.inc:1312
+#: src/config/options.inc:1314
 msgid ""
 "Name of the bookmarks folder used for auto saving and restoring session.\n"
 "The name has to be unique. Any folders with the same name will be deleted.\n"
@@ -4479,11 +4486,11 @@ msgstr ""
 "automatique de la session. Le nom doit ętre unique, tout dossier du męme\n"
 "nom sera détruit. Cette option n'a de sens qu'avec le support des signets."
 
-#: src/config/options.inc:1316
+#: src/config/options.inc:1318
 msgid "Homepage URI"
 msgstr "URI de la page d'accueil"
 
-#: src/config/options.inc:1318
+#: src/config/options.inc:1320
 msgid ""
 "The URI to load either at startup time when no URI was given\n"
 "on the command line or when requested by the goto-url-home action.\n"
@@ -4495,19 +4502,19 @@ msgstr ""
 "Mettre \"\" si la variable d'environnement WWW_HOME doit ętre\n"
 "utilisée comme URI de page d'accueil."
 
-#: src/config/options.inc:1324
+#: src/config/options.inc:1326
 msgid "Date format"
 msgstr "Format des dates"
 
-#: src/config/options.inc:1326
+#: src/config/options.inc:1328
 msgid "Date format to use in dialogs. See strftime(3)."
 msgstr "Format utilisé pour les dates dans les dialogues. Voir strftime(3)."
 
-#: src/config/options.inc:1329
+#: src/config/options.inc:1331
 msgid "Set window title"
 msgstr "Modifier le titre de la fenętre"
 
-#: src/config/options.inc:1331
+#: src/config/options.inc:1333
 msgid ""
 "Set the window title when running in a windowing environment\n"
 "in an xterm-like terminal. This way the document's title is\n"
@@ -6475,19 +6482,19 @@ msgid "No extensions"
 msgstr "Aucune extension"
 
 #. name:
-#: src/mime/mime.c:34 src/mime/mime.c:321
+#: src/mime/mime.c:38 src/mime/mime.c:359
 msgid "MIME"
 msgstr "MIME"
 
-#: src/mime/mime.c:36
+#: src/mime/mime.c:40
 msgid "MIME-related options (handlers of various MIME types)."
 msgstr "Options et gestion des types MIME."
 
-#: src/mime/mime.c:38
+#: src/mime/mime.c:42
 msgid "Default MIME-type"
 msgstr "Type MIME par défaut"
 
-#: src/mime/mime.c:40
+#: src/mime/mime.c:44
 msgid ""
 "Document MIME-type to assume by default (when we are unable to\n"
 "guess it properly from known information about the document)."
@@ -6823,7 +6830,11 @@ msgstr "Le fichier metainfo de BitTorrent contenait des erreurs"
 msgid "The tracker requesting failed"
 msgstr "L'interrogation du serveur a échouée"
 
-#: src/network/state.c:148
+#: src/network/state.c:125
+msgid "The BitTorrent URL does not point to a valid URL"
+msgstr "L'URL BitTorrent ne pointe pas sur une URL valide"
+
+#: src/network/state.c:149
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -7524,12 +7535,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:1226
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1233
 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:1230
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1237
 msgid "Show ~header"
 msgstr "~Montrer les en-tętes"
 
@@ -8321,31 +8332,36 @@ msgstr "~Reprendre le t
 msgid "Unknown type"
 msgstr "Type inconnu"
 
-#: src/session/download.c:1146
+#: src/session/download.c:1149
 #, 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:1176
+#: src/session/download.c:1152
+#, 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
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Programme ('%' sera remplacé par le nom du fichier)"
 
-#: src/session/download.c:1181
+#: 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:1185
+#: src/session/download.c:1192
 msgid "Block the terminal"
 msgstr "Bloquer le terminal"
 
-#: src/session/download.c:1192
+#: src/session/download.c:1199
 #, 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:1213
+#: src/session/download.c:1220
 msgid "~Open"
 msgstr "~Ouvrir"
 
diff --git a/po/pl.po b/po/pl.po
index 31719b6e..5efac5a8 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: 2006-11-05 15:33+0100\n"
+"POT-Creation-Date: 2006-11-06 18:47+0100\n"
 "PO-Revision-Date: 2006-09-03 08:30+0200\n"
 "Last-Translator: Witold Filipczyk <witekfl@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -185,7 +185,7 @@ msgstr "Musisz wpisa
 #: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:391 src/scripting/lua/core.c:472
-#: src/session/download.c:637 src/session/download.c:1236
+#: src/session/download.c:637 src/session/download.c:1243
 #: src/viewer/text/search.c:1667
 msgid "~Cancel"
 msgstr "~Anuluj"
@@ -199,8 +199,8 @@ msgid "Digital clock in the status bar."
 msgstr "Cyfrowy zegar w pasku statusu."
 
 #
-#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1212
-#: src/config/options.inc:1219 src/ecmascript/ecmascript.c:45
+#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1214
+#: src/config/options.inc:1221 src/ecmascript/ecmascript.c:45
 #: src/globhist/globhist.c:64 src/mime/backend/mailcap.c:93
 #: src/mime/backend/mimetypes.c:52 src/network/ssl/ssl.c:80
 msgid "Enable"
@@ -374,7 +374,7 @@ msgstr ""
 "\n"
 "Wymagana jest obsługa zakładek."
 
-#: src/bookmarks/dialogs.c:72 src/config/options.inc:1064
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1066
 #: src/dialogs/document.c:145 src/globhist/dialogs.c:65
 msgid "Title"
 msgstr "Tytuł"
@@ -1917,7 +1917,7 @@ msgstr "Nie mo
 #. 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:535 src/config/dialogs.c:963 src/cookies/dialogs.c:479
 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1227
 msgid "Sa~ve"
 msgstr "~Zapisz"
 
@@ -1929,7 +1929,7 @@ msgstr "Menad
 msgid "Keystroke"
 msgstr "Skrót klawiszowy"
 
-#: src/config/dialogs.c:704 src/config/options.inc:1232
+#: src/config/dialogs.c:704 src/config/options.inc:1234
 msgid "Action"
 msgstr "Akcja"
 
@@ -2573,13 +2573,13 @@ msgstr "Kolory aktywnego odno
 
 #
 #: src/config/options.inc:274 src/config/options.inc:548
-#: src/config/options.inc:958
+#: src/config/options.inc:960
 msgid "Background color"
 msgstr "Kolor tła"
 
 #
 #: src/config/options.inc:276 src/config/options.inc:550
-#: src/config/options.inc:959
+#: src/config/options.inc:961
 msgid "Default background color."
 msgstr "Domyślny kolor tła."
 
@@ -2593,12 +2593,12 @@ msgstr "Domy
 #. The colors and mono tree should be similar but with different default
 #. * values of course so always use the macros below.
 #: src/config/options.inc:278 src/config/options.inc:544
-#: src/config/options.inc:956
+#: src/config/options.inc:958
 msgid "Text color"
 msgstr "Kolor tekstu"
 
 #: src/config/options.inc:280 src/config/options.inc:546
-#: src/config/options.inc:957
+#: src/config/options.inc:959
 msgid "Default text color."
 msgstr "Domyślny kolor tekstu."
 
@@ -2632,7 +2632,7 @@ msgstr "Inwersja kolor
 msgid "Invert the fore- and background color so the link stands out."
 msgstr "Odwróć kolory tekstu i tła tak, żeby wyróżnić odnośnik."
 
-#: src/config/options.inc:296 src/config/options.inc:921
+#: src/config/options.inc:296 src/config/options.inc:923
 #: src/dialogs/options.c:231
 msgid "Underline"
 msgstr "Podkreślenie"
@@ -3316,7 +3316,7 @@ msgstr "Zrzuty"
 msgid "Dump output options."
 msgstr "Ustawienia dotyczące zrzutów."
 
-#: src/config/options.inc:639 src/config/options.inc:925
+#: src/config/options.inc:639 src/config/options.inc:927
 #: src/config/opttypes.c:408 src/dialogs/document.c:163
 msgid "Codepage"
 msgstr "Strona kodowa"
@@ -3862,21 +3862,26 @@ msgid ""
 "If we should not set the background to black. This is particularly\n"
 "useful when we have a terminal (typically in some windowing\n"
 "environment) with a background image or a transparent background -\n"
-"it will be visible in ELinks as well. Note that this option makes\n"
+"it will be visible in ELinks as well (but ELinks document color handling\n"
+"will still assume the background is black so if you have a bright "
+"background\n"
+"you might experience contrast problems). Note that this option makes\n"
 "sense only when colors are enabled."
 msgstr ""
 "Czy powinniśmy nie ustawiać tła na czarno. To jest\n"
 "szczególnie użyteczne, gdy mamy terminal (zwykle\n"
 "w środowisku okienkowym) z obrazkiem w tle lub\n"
 "przezroczystym tłem - będzie to widoczne także w ELinksie.\n"
-"Wiedz, że to ustawienie ma sens jedynie, gdy używanie\n"
+"(Obsługa kolorów w ELinksie będzie przyjmowała, że tło jest\n"
+"czarne. Możesz napotkać na problemy z kontrastem, gdy Twoje tło\n"
+"jest jasne). Wiedz, że to ustawienie ma sens jedynie, gdy używanie\n"
 "kolorów jest włączone."
 
-#: src/config/options.inc:923
+#: src/config/options.inc:925
 msgid "If we should use underline or enhance the color instead."
 msgstr "Czy powinno się używać podkreślenia czy wzmocnienia koloru."
 
-#: src/config/options.inc:927
+#: src/config/options.inc:929
 msgid ""
 "Codepage of charset used for displaying content on terminal.\n"
 "'System' stands for a codepage determined by a selected locale."
@@ -3885,347 +3890,347 @@ msgstr ""
 "'System' oznacza iż zostanie okreslona przez wybrane locale."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:934
+#: src/config/options.inc:936
 msgid "User interface"
 msgstr "Interfejs użytkownika"
 
 #
-#: src/config/options.inc:936
+#: src/config/options.inc:938
 msgid "User interface options."
 msgstr "Ustawienia interfejsu użytkownika."
 
-#: src/config/options.inc:940
+#: src/config/options.inc:942
 msgid "Color settings"
 msgstr "Ustawienia kolorów"
 
-#: src/config/options.inc:942
+#: src/config/options.inc:944
 msgid "Default user interface color settings."
 msgstr "Domyślne ustawienia kolorów interfejsu użytkownika."
 
 #
-#: src/config/options.inc:969
+#: src/config/options.inc:971
 msgid "Color terminals"
 msgstr "Kolorowe terminale"
 
-#: src/config/options.inc:971
+#: src/config/options.inc:973
 msgid "Color settings for color terminal."
 msgstr "Ustawienia kolorów dla kolorowych terminali."
 
-#: src/config/options.inc:973
+#: src/config/options.inc:975
 msgid "Non-color terminals"
 msgstr "Terminale monochromatyczne"
 
-#: src/config/options.inc:975
+#: src/config/options.inc:977
 msgid "Color settings for non-color terminal."
 msgstr "Ustawienia kolorów dla terminali monochromatycznych."
 
 #. FIXME: obsolete, how to alias them correctly ? --Zas
-#: src/config/options.inc:978
+#: src/config/options.inc:980
 msgid "Main menu bar"
 msgstr "Pasek menu głównego"
 
-#: src/config/options.inc:980
+#: src/config/options.inc:982
 msgid "Main menu bar colors."
 msgstr "Kolory głównego paska menu."
 
-#: src/config/options.inc:982
+#: src/config/options.inc:984
 msgid "Unselected main menu bar item"
 msgstr "Pasek niewybranego elementu menu"
 
-#: src/config/options.inc:984
+#: src/config/options.inc:986
 msgid "Unselected main menu bar item colors."
 msgstr "Kolory dla paska niewybranego elementu menu."
 
-#: src/config/options.inc:986
+#: src/config/options.inc:988
 msgid "Selected main menu bar item"
 msgstr "Pasek wybranego elementu menu"
 
-#: src/config/options.inc:988
+#: src/config/options.inc:990
 msgid "Selected main menu bar item colors."
 msgstr "Kolory dla paska wybranego elementu menu."
 
-#: src/config/options.inc:990 src/config/options.inc:1019
+#: src/config/options.inc:992 src/config/options.inc:1021
 msgid "Hotkey"
 msgstr "Klawisz skrótu"
 
-#: src/config/options.inc:992
+#: src/config/options.inc:994
 msgid "Main menu hotkey colors."
 msgstr "Kolory klawiszy skrótu głównego paska menu."
 
-#: src/config/options.inc:994 src/config/options.inc:1023
+#: src/config/options.inc:996 src/config/options.inc:1025
 msgid "Unselected hotkey"
 msgstr "Niewybrany klawisz skrótu"
 
-#: src/config/options.inc:996
+#: src/config/options.inc:998
 msgid "Main menu unselected hotkey colors."
 msgstr "Kolory niewybranych klawiszy skrótu głównego menu."
 
 #
-#: src/config/options.inc:998 src/config/options.inc:1027
+#: src/config/options.inc:1000 src/config/options.inc:1029
 msgid "Selected hotkey"
 msgstr "Wybrany klawisz skrótu"
 
-#: src/config/options.inc:1000
+#: src/config/options.inc:1002
 msgid "Main menu selected hotkey colors."
 msgstr "Kolory wybranych klawiszy skrótu głównego menu."
 
-#: src/config/options.inc:1003
+#: src/config/options.inc:1005
 msgid "Menu bar"
 msgstr "Pasek menu"
 
-#: src/config/options.inc:1005
+#: src/config/options.inc:1007
 msgid "Menu bar colors."
 msgstr "Kolory paska menu."
 
-#: src/config/options.inc:1007
+#: src/config/options.inc:1009
 msgid "Unselected menu item"
 msgstr "Niewybrane elementy menu"
 
-#: src/config/options.inc:1009
+#: src/config/options.inc:1011
 msgid "Unselected menu item colors."
 msgstr "Kolory niewybranego elementu menu."
 
 #
-#: src/config/options.inc:1011
+#: src/config/options.inc:1013
 msgid "Selected menu item"
 msgstr "Podświetlone elementy menu"
 
-#: src/config/options.inc:1013
+#: src/config/options.inc:1015
 msgid "Selected menu item colors."
 msgstr "Kolory wybranych elementów menu."
 
 #
-#: src/config/options.inc:1015
+#: src/config/options.inc:1017
 msgid "Marked menu item"
 msgstr "Podświetlone elementy menu"
 
-#: src/config/options.inc:1017
+#: src/config/options.inc:1019
 msgid "Marked menu item colors."
 msgstr "Kolory podświetlonych elementów menu."
 
-#: src/config/options.inc:1021
+#: src/config/options.inc:1023
 msgid "Menu item hotkey colors."
 msgstr "Kolory klawiszy skrótu menu."
 
-#: src/config/options.inc:1025
+#: src/config/options.inc:1027
 msgid "Menu item unselected hotkey colors."
 msgstr "Kolory niewybranych klawiszy skrótu menu."
 
-#: src/config/options.inc:1029
+#: src/config/options.inc:1031
 msgid "Menu item selected hotkey colors."
 msgstr "Kolory wybranych klawiszy skrótu menu."
 
 #
-#: src/config/options.inc:1031
+#: src/config/options.inc:1033
 msgid "Menu frame"
 msgstr "Ramka menu"
 
-#: src/config/options.inc:1033
+#: src/config/options.inc:1035
 msgid "Menu frame colors."
 msgstr "Kolory ramki menu."
 
-#: src/config/options.inc:1036
+#: src/config/options.inc:1038
 msgid "Dialog"
 msgstr "Okno dialogowe"
 
-#: src/config/options.inc:1038
+#: src/config/options.inc:1040
 msgid "Dialog colors."
 msgstr "Kolory okna dialogowego."
 
-#: src/config/options.inc:1048
+#: src/config/options.inc:1050
 msgid "Generic"
 msgstr "Zwykłe"
 
-#: src/config/options.inc:1050
+#: src/config/options.inc:1052
 msgid "Generic dialog colors."
 msgstr "Zwykłe kolory okienka dialogowego."
 
 #
-#: src/config/options.inc:1052
+#: src/config/options.inc:1054
 msgid "Frame"
 msgstr "Ramka"
 
-#: src/config/options.inc:1054
+#: src/config/options.inc:1056
 msgid "Dialog frame colors."
 msgstr "Kolory ramki okna dialogowego."
 
-#: src/config/options.inc:1056
+#: src/config/options.inc:1058
 msgid "Scrollbar"
 msgstr "Pasek przewijania"
 
-#: src/config/options.inc:1058
+#: src/config/options.inc:1060
 msgid "Scrollbar colors."
 msgstr "Kolory paska przewijania."
 
-#: src/config/options.inc:1060
+#: src/config/options.inc:1062
 msgid "Selected scrollbar"
 msgstr "Wybrany pasek przewijania"
 
-#: src/config/options.inc:1062
+#: src/config/options.inc:1064
 msgid "Scrollbar selected colors."
 msgstr "Kolory wybranego paska przewijania."
 
-#: src/config/options.inc:1066
+#: src/config/options.inc:1068
 msgid "Dialog title colors."
 msgstr "Kolory tytułu okna dialogowego."
 
 #
-#: src/config/options.inc:1068
+#: src/config/options.inc:1070
 msgid "Text"
 msgstr "Tekst"
 
-#: src/config/options.inc:1070
+#: src/config/options.inc:1072
 msgid "Dialog text colors."
 msgstr "Kolory tekstu w oknie dialogowym."
 
-#: src/config/options.inc:1072 src/viewer/text/form.c:1800
+#: src/config/options.inc:1074 src/viewer/text/form.c:1800
 msgid "Checkbox"
 msgstr "Przycisk wyboru"
 
-#: src/config/options.inc:1074
+#: src/config/options.inc:1076
 msgid "Dialog checkbox colors."
 msgstr "Kolory przycisku wyboru."
 
 #
-#: src/config/options.inc:1076
+#: src/config/options.inc:1078
 msgid "Selected checkbox"
 msgstr "Wybrany przycisk wyboru"
 
-#: src/config/options.inc:1078
+#: src/config/options.inc:1080
 msgid "Dialog selected checkbox colors."
 msgstr "Kolory wybranego przycisku wyboru."
 
 #
-#: src/config/options.inc:1080
+#: src/config/options.inc:1082
 msgid "Checkbox label"
 msgstr "Etykieta przycisku wyboru"
 
-#: src/config/options.inc:1082
+#: src/config/options.inc:1084
 msgid "Dialog checkbox label colors."
 msgstr "Kolory etykiety przycisku wyboru."
 
-#: src/config/options.inc:1084
+#: src/config/options.inc:1086
 msgid "Button"
 msgstr "Przycisk"
 
-#: src/config/options.inc:1086 src/config/options.inc:1094
+#: src/config/options.inc:1088 src/config/options.inc:1096
 msgid "Dialog button colors."
 msgstr "Kolory przycisku."
 
 #
-#: src/config/options.inc:1088
+#: src/config/options.inc:1090
 msgid "Selected button"
 msgstr "Wybrany przycisk"
 
-#: src/config/options.inc:1090 src/config/options.inc:1098
+#: src/config/options.inc:1092 src/config/options.inc:1100
 msgid "Dialog selected button colors."
 msgstr "Kolory wybranego przycisku."
 
-#: src/config/options.inc:1092
+#: src/config/options.inc:1094
 msgid "Button shortcut"
 msgstr "Klawisz skrótu przycisku"
 
 #
-#: src/config/options.inc:1096
+#: src/config/options.inc:1098
 msgid "Selected button shortcut"
 msgstr "Klawisz skrótu wybranego przycisku"
 
-#: src/config/options.inc:1100 src/viewer/text/form.c:1804
+#: src/config/options.inc:1102 src/viewer/text/form.c:1804
 msgid "Text field"
 msgstr "Pole tekstowe"
 
-#: src/config/options.inc:1102
+#: src/config/options.inc:1104
 msgid "Dialog text field colors."
 msgstr "Kolory pola tekstowego."
 
 #
-#: src/config/options.inc:1104
+#: src/config/options.inc:1106
 msgid "Text field text"
 msgstr "Tekst w polu tekstowym"
 
-#: src/config/options.inc:1106
+#: src/config/options.inc:1108
 msgid "Dialog field text colors."
 msgstr "Kolory tekstu w polu tekstowym."
 
-#: src/config/options.inc:1108
+#: src/config/options.inc:1110
 msgid "Meter"
 msgstr "Licznik"
 
-#: src/config/options.inc:1110
+#: src/config/options.inc:1112
 msgid "Dialog meter colors."
 msgstr "Kolory licznika."
 
-#: src/config/options.inc:1112
+#: src/config/options.inc:1114
 msgid "Shadow"
 msgstr "Cień"
 
-#: src/config/options.inc:1114
+#: src/config/options.inc:1116
 msgid "Dialog shadow colors (see ui.shadows option)."
 msgstr "Kolory cienia (zobacz opcję ui.shadows)."
 
 #
-#: src/config/options.inc:1116
+#: src/config/options.inc:1118
 msgid "Title bar"
 msgstr "Pasek tytułowy"
 
-#: src/config/options.inc:1118
+#: src/config/options.inc:1120
 msgid "Title bar colors."
 msgstr "Kolory paska tytułowego."
 
-#: src/config/options.inc:1120
+#: src/config/options.inc:1122
 msgid "Generic title bar"
 msgstr "Zwykły pasek tytułowy"
 
-#: src/config/options.inc:1122
+#: src/config/options.inc:1124
 msgid "Generic title bar colors."
 msgstr "Kolory zwykłego paska tytułowego."
 
-#: src/config/options.inc:1124
+#: src/config/options.inc:1126
 msgid "Title bar text"
 msgstr "Tekst na pasku tytułowym"
 
-#: src/config/options.inc:1126
+#: src/config/options.inc:1128
 msgid "Title bar text colors."
 msgstr "Kolory tekstu na pasku tytułowym."
 
-#: src/config/options.inc:1129
+#: src/config/options.inc:1131
 msgid "Status bar"
 msgstr "Pasek statusu"
 
-#: src/config/options.inc:1131
+#: src/config/options.inc:1133
 msgid "Status bar colors."
 msgstr "Kolory paska statusu."
 
-#: src/config/options.inc:1133
+#: src/config/options.inc:1135
 msgid "Generic status bar"
 msgstr "Zwykły pasek statusu"
 
-#: src/config/options.inc:1135
+#: src/config/options.inc:1137
 msgid "Generic status bar colors."
 msgstr "Kolory zwykłego paska statusu."
 
 #
-#: src/config/options.inc:1137
+#: src/config/options.inc:1139
 msgid "Status bar text"
 msgstr "Tekst na pasku statusu"
 
-#: src/config/options.inc:1139
+#: src/config/options.inc:1141
 msgid "Status bar text colors."
 msgstr "Kolory tekstu na pasku statusu."
 
-#: src/config/options.inc:1142
+#: src/config/options.inc:1144
 msgid "Tabs bar"
 msgstr "Pasek kart"
 
-#: src/config/options.inc:1144
+#: src/config/options.inc:1146
 msgid "Tabs bar colors."
 msgstr "Kolory paska kart."
 
-#: src/config/options.inc:1146
+#: src/config/options.inc:1148
 msgid "Unvisited tab"
 msgstr "Nieodwiedzana karta"
 
-#: src/config/options.inc:1148
+#: src/config/options.inc:1150
 msgid ""
 "Tab colors for tabs that have not been\n"
 "selected since they completed loading."
@@ -4233,44 +4238,44 @@ msgstr ""
 "Kolory karty dla kart, które nie zostały\n"
 "wybrane od zakończenia ładowania."
 
-#: src/config/options.inc:1151
+#: src/config/options.inc:1153
 msgid "Unselected tab"
 msgstr "Niewybrana karta"
 
-#: src/config/options.inc:1153
+#: src/config/options.inc:1155
 msgid "Unselected tab colors."
 msgstr "Kolory niewybranych kart."
 
-#: src/config/options.inc:1155
+#: src/config/options.inc:1157
 msgid "Loading tab"
 msgstr "Karta, do której wczytywany jest dokument"
 
-#: src/config/options.inc:1157
+#: src/config/options.inc:1159
 msgid "Tab colors for tabs that are loading in the background."
 msgstr "Kolory kart dla kart, do których wczytywany jest dokument w tle."
 
 #
-#: src/config/options.inc:1159
+#: src/config/options.inc:1161
 msgid "Selected tab"
 msgstr "Wybrana karta"
 
-#: src/config/options.inc:1161
+#: src/config/options.inc:1163
 msgid "Selected tab colors."
 msgstr "Kolory wybranej karty."
 
-#: src/config/options.inc:1163
+#: src/config/options.inc:1165
 msgid "Tab separator"
 msgstr "Separator kart"
 
-#: src/config/options.inc:1165
+#: src/config/options.inc:1167
 msgid "Tab separator colors."
 msgstr "Kolory separatora kart."
 
-#: src/config/options.inc:1168
+#: src/config/options.inc:1170
 msgid "Searched strings"
 msgstr "Szukane łańcuchy"
 
-#: src/config/options.inc:1170
+#: src/config/options.inc:1172
 msgid "Searched string highlight colors."
 msgstr "Kolory podświetlenia szukanych łańcuchów."
 
@@ -4278,19 +4283,19 @@ msgstr "Kolory pod
 #. ============= BORING PART (colors) END ===================
 #. ==========================================================
 #. Keep options in alphabetical order.
-#: src/config/options.inc:1179
+#: src/config/options.inc:1181
 msgid "Dialog settings"
 msgstr "Ustawienia okien dialogowych"
 
-#: src/config/options.inc:1181
+#: src/config/options.inc:1183
 msgid "Dialogs-specific appearance and behaviour settings."
 msgstr "Ustawienia dotyczące wyglądu i zachowania okien dialogowych."
 
-#: src/config/options.inc:1184
+#: src/config/options.inc:1186
 msgid "Minimal height of listbox widget"
 msgstr "Minimalna wysokość listy wyboru"
 
-#: src/config/options.inc:1186
+#: src/config/options.inc:1188
 msgid ""
 "Minimal height of the listbox widget (used e.g. for bookmarks\n"
 "or global history)."
@@ -4298,11 +4303,11 @@ msgstr ""
 "Minimalna wysokość listy wyboru (używanej np. przy zakładkach\n"
 "czy globalnej historii)."
 
-#: src/config/options.inc:1189
+#: src/config/options.inc:1191
 msgid "Drop shadows"
 msgstr "Rzucanie cienia"
 
-#: src/config/options.inc:1191
+#: src/config/options.inc:1193
 msgid ""
 "Make dialogs drop shadows (the shadows are solid, you can\n"
 "adjust their color by ui.colors.*.dialog.shadow). You may\n"
@@ -4313,11 +4318,11 @@ msgstr ""
 "ui.colors.*.dialog.shadow). Możesz też wyeliminować szerokie\n"
 "obrzeża przez dostosowanie pliku setup.h."
 
-#: src/config/options.inc:1195
+#: src/config/options.inc:1197
 msgid "Underline menu hotkeys"
 msgstr "Podkreślanie klawiszy skrótu menu"
 
-#: src/config/options.inc:1197
+#: src/config/options.inc:1199
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4325,11 +4330,11 @@ msgstr ""
 "Czy podkreślać klawisze skrótu w menu, by były bardziej\n"
 "widoczne? Wymaga włączenia podkreślania dla terminala."
 
-#: src/config/options.inc:1200
+#: src/config/options.inc:1202
 msgid "Underline button shortcuts"
 msgstr "Podkreślanie klawiszy skrótu przycisku"
 
-#: src/config/options.inc:1202
+#: src/config/options.inc:1204
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4338,11 +4343,11 @@ msgstr ""
 "widoczne? Wymaga włączenia podkreślania dla terminala."
 
 #
-#: src/config/options.inc:1206
+#: src/config/options.inc:1208
 msgid "Timer options"
 msgstr "Ustawienia stopera"
 
-#: src/config/options.inc:1208
+#: src/config/options.inc:1210
 msgid ""
 "Timed action after certain interval of user inactivity. Someone can\n"
 "even find this useful, although you may not believe that."
@@ -4350,7 +4355,7 @@ msgstr ""
 "Odmierzane akcje po pewnym okresie bezczynności użytkownika.\n"
 "Komuś może się to przyda, chociaż możesz w to nie wierzyć."
 
-#: src/config/options.inc:1214
+#: src/config/options.inc:1216
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4362,7 +4367,7 @@ msgstr ""
 "1 - odlicza, ale nie pokazuje stopera\n"
 "2 - odlicza i pokazuje stoper w pobliżu LEDów"
 
-#: src/config/options.inc:1221
+#: src/config/options.inc:1223
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4375,37 +4380,37 @@ msgstr ""
 "2 - odlicza i pokazuje stoper w pobliżu LEDów (WYŁĄCZONE)"
 
 #
-#: src/config/options.inc:1227
+#: src/config/options.inc:1229
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: src/config/options.inc:1229
+#: src/config/options.inc:1231
 msgid ""
 "Inactivity timeout in seconds. The maximum of one day\n"
 "should be enough for just everyone (TM)."
 msgstr ""
 "Limit czasu bezczynności. Jeden dzień powinien wystarczyć każdemu (TM)."
 
-#: src/config/options.inc:1234
+#: src/config/options.inc:1236
 msgid "Keybinding action to be triggered when timer reaches zero."
 msgstr ""
 "Akcja powiązana z klawiaturą, która ma być wyzwolona gdy\n"
 "stoper osiągnie zero."
 
-#: src/config/options.inc:1237
+#: src/config/options.inc:1239
 msgid "Window tabs"
 msgstr "Karty"
 
-#: src/config/options.inc:1239
+#: src/config/options.inc:1241
 msgid "Window tabs settings."
 msgstr "Ustawienia kart."
 
 #
-#: src/config/options.inc:1241
+#: src/config/options.inc:1243
 msgid "Display tabs bar"
 msgstr "Wyświetl pasek kart"
 
-#: src/config/options.inc:1243
+#: src/config/options.inc:1245
 msgid ""
 "Show tabs bar on the screen:\n"
 "0 means never\n"
@@ -4417,39 +4422,39 @@ msgstr ""
 "1 - tylko gdy więcej niż jedna karta jest otwarta\n"
 "2 - zawsze"
 
-#: src/config/options.inc:1248
+#: src/config/options.inc:1250
 msgid "Tab bar at top"
 msgstr "Pasek kart u góry"
 
-#: src/config/options.inc:1250
+#: src/config/options.inc:1252
 msgid "Whether display tab bar at top like other browsers do."
 msgstr ""
 "Czy wyświetlać pasek kart u góry strony, tak jak w innych\n"
 "przeglądarkach."
 
-#: src/config/options.inc:1252
+#: src/config/options.inc:1254
 msgid "Wrap-around tabs cycling"
 msgstr "Cykliczność kart"
 
-#: src/config/options.inc:1254
+#: src/config/options.inc:1256
 msgid ""
 "When moving right from the last tab, jump at the first one, and\n"
 "vice versa."
 msgstr "Przeskakiwanie z ostatniej karty do pierwszej i na odwrót."
 
-#: src/config/options.inc:1257
+#: src/config/options.inc:1259
 msgid "Confirm tab closing"
 msgstr "Potwierdzenie zamknięcia karty"
 
-#: src/config/options.inc:1259
+#: src/config/options.inc:1261
 msgid "When closing a tab show confirmation dialog."
 msgstr "Przy zamykaniu karty pokazuj okienko dialogowe potwierdzania."
 
-#: src/config/options.inc:1263 src/config/opttypes.c:409
+#: src/config/options.inc:1265 src/config/opttypes.c:409
 msgid "Language"
 msgstr "Język"
 
-#: src/config/options.inc:1265
+#: src/config/options.inc:1267
 msgid ""
 "Language of user interface. 'System' means that the language will\n"
 "be extracted from the environment dynamically."
@@ -4458,37 +4463,37 @@ msgstr ""
 "zostanie uzyskany ze środowiska w sposób dynamiczny."
 
 #
-#: src/config/options.inc:1268
+#: src/config/options.inc:1270
 msgid "Display menu bar always"
 msgstr "Wyświetlanie paska tytułowego na stałe"
 
-#: src/config/options.inc:1270
+#: src/config/options.inc:1272
 msgid "Always show menu bar on the screen."
 msgstr "Zawsze pokazuj pasek tytułowy na ekranie."
 
 #
-#: src/config/options.inc:1272
+#: src/config/options.inc:1274
 msgid "Display status bar"
 msgstr "Wyświetlanie paska statusu"
 
-#: src/config/options.inc:1274
+#: src/config/options.inc:1276
 msgid "Show status bar on the screen."
 msgstr "Pokazuje pasek statusu na ekranie."
 
 #
-#: src/config/options.inc:1276
+#: src/config/options.inc:1278
 msgid "Display title bar"
 msgstr "Wyświetlanie paska tytułowego"
 
-#: src/config/options.inc:1278
+#: src/config/options.inc:1280
 msgid "Show title bar on the screen."
 msgstr "Pokazuje pasek tytułowy na ekranie."
 
-#: src/config/options.inc:1280
+#: src/config/options.inc:1282
 msgid "Display goto dialog in new tabs"
 msgstr "Wyświetlanie okienka \"goto\" w nowych kartach"
 
-#: src/config/options.inc:1282
+#: src/config/options.inc:1284
 msgid ""
 "Pop up goto dialog in newly created tabs when there's no homepage\n"
 "set. This means also showing goto dialog on startup."
@@ -4497,11 +4502,11 @@ msgstr ""
 "jeśli strona domowa nie jest ustawiona. Oznacza to iż okno\n"
 "to będzie pokazywane także przy starcie."
 
-#: src/config/options.inc:1285
+#: src/config/options.inc:1287
 msgid "Show a message box when file is saved successfully"
 msgstr "Pokazuj okienko dialogowe, gdy plik zostanie pomyślnie zapisany"
 
-#: src/config/options.inc:1287
+#: src/config/options.inc:1289
 msgid ""
 "When you pressed a [ Save ] button in some manager, this option\n"
 "will make sure that a box confirming success of the operation will\n"
@@ -4511,27 +4516,27 @@ msgstr ""
 "te ustawienie zapewni, że pojawi się okienko potwierdzające\n"
 "pomyślne wykonanie operacji."
 
-#: src/config/options.inc:1292
+#: src/config/options.inc:1294
 msgid "Sessions"
 msgstr "Sesje"
 
-#: src/config/options.inc:1294
+#: src/config/options.inc:1296
 msgid "Sessions settings."
 msgstr "Ustawienia sesji."
 
-#: src/config/options.inc:1296
+#: src/config/options.inc:1298
 msgid "Keep session active"
 msgstr "Utrzymuj aktywną sesję"
 
-#: src/config/options.inc:1298
+#: src/config/options.inc:1300
 msgid "Keep the session active even if the last terminal exits."
 msgstr "Utrzymuj sesję nawet po zamknięciu ostatniego terminala."
 
-#: src/config/options.inc:1300
+#: src/config/options.inc:1302
 msgid "Auto save session"
 msgstr "Automatyczne zapisywanie sesji"
 
-#: src/config/options.inc:1302
+#: src/config/options.inc:1304
 msgid ""
 "Automatically save the session when quitting.\n"
 "This feature requires bookmark support."
@@ -4539,11 +4544,11 @@ msgstr ""
 "Automatycznie zapisuj sesję przy kończeniu działania.\n"
 "Wymagana jest obsługa zakładek."
 
-#: src/config/options.inc:1305
+#: src/config/options.inc:1307
 msgid "Auto restore session"
 msgstr "Automatyczne odtwarzanie sesji"
 
-#: src/config/options.inc:1307
+#: src/config/options.inc:1309
 msgid ""
 "Automatically restore the session at start.\n"
 "This feature requires bookmark support."
@@ -4551,11 +4556,11 @@ msgstr ""
 "Automatycznie odtwarzaj sesję na starcie.\n"
 "Wymagana jest obsługa zakładek."
 
-#: src/config/options.inc:1310
+#: src/config/options.inc:1312
 msgid "Auto save and restore session folder name"
 msgstr "Nazwa foldera do automatycznego zapisywania i odtwarzania sesji"
 
-#: src/config/options.inc:1312
+#: src/config/options.inc:1314
 msgid ""
 "Name of the bookmarks folder used for auto saving and restoring session.\n"
 "The name has to be unique. Any folders with the same name will be deleted.\n"
@@ -4566,11 +4571,11 @@ msgstr ""
 "Foldery o takiej samej nazwie zostaną usunięte. Ma to sens\n"
 "jedynie wtedy, gdy wkompilowana jest obsługa zakładek."
 
-#: src/config/options.inc:1316
+#: src/config/options.inc:1318
 msgid "Homepage URI"
 msgstr "URI strony domowej"
 
-#: src/config/options.inc:1318
+#: src/config/options.inc:1320
 msgid ""
 "The URI to load either at startup time when no URI was given\n"
 "on the command line or when requested by the goto-url-home action.\n"
@@ -4583,20 +4588,20 @@ msgstr ""
 "środowiskowej WWW_HOME powinna być użyta jako strona domowa."
 
 #
-#: src/config/options.inc:1324
+#: src/config/options.inc:1326
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/config/options.inc:1326
+#: src/config/options.inc:1328
 msgid "Date format to use in dialogs. See strftime(3)."
 msgstr "Format daty używany w dialog. Zobacz strftime(3)."
 
 #
-#: src/config/options.inc:1329
+#: src/config/options.inc:1331
 msgid "Set window title"
 msgstr "Ustalenie tytułu okna"
 
-#: src/config/options.inc:1331
+#: src/config/options.inc:1333
 msgid ""
 "Set the window title when running in a windowing environment\n"
 "in an xterm-like terminal. This way the document's title is\n"
@@ -5847,7 +5852,7 @@ msgstr ""
 "Zostaw jako \"\", żeby używać wbudowanych styli dokumentu."
 
 #. name:
-#: src/ecmascript/ecmascript.c:41 src/ecmascript/ecmascript.c:340
+#: src/ecmascript/ecmascript.c:41 src/ecmascript/ecmascript.c:341
 msgid "ECMAScript"
 msgstr "ECMAScript"
 
@@ -6601,19 +6606,19 @@ msgid "No extensions"
 msgstr "Brak rozszerzeń"
 
 #. name:
-#: src/mime/mime.c:34 src/mime/mime.c:321
+#: src/mime/mime.c:38 src/mime/mime.c:359
 msgid "MIME"
 msgstr "MIME"
 
-#: src/mime/mime.c:36
+#: src/mime/mime.c:40
 msgid "MIME-related options (handlers of various MIME types)."
 msgstr "Ustawienia związane z MIME (uchwyty dla różnych typów MIME)."
 
-#: src/mime/mime.c:38
+#: src/mime/mime.c:42
 msgid "Default MIME-type"
 msgstr "Domyślny typ MIME"
 
-#: src/mime/mime.c:40
+#: src/mime/mime.c:44
 msgid ""
 "Document MIME-type to assume by default (when we are unable to\n"
 "guess it properly from known information about the document)."
@@ -6952,7 +6957,11 @@ msgstr "Plik metainformacji BitTorrent zawiera b
 msgid "The tracker requesting failed"
 msgstr "Zapytanie dotyczące śledzenia nie powiodło się"
 
-#: src/network/state.c:148
+#: src/network/state.c:125
+msgid "The BitTorrent URL does not point to a valid URL"
+msgstr "URL BitTorrenta nie wskazuje na prawidłowy URL"
+
+#: src/network/state.c:149
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -7672,12 +7681,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:1226
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1233
 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:1230
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1237
 msgid "Show ~header"
 msgstr "Pokaż ~nagłówek"
 
@@ -8477,32 +8486,37 @@ msgstr "Wzn
 msgid "Unknown type"
 msgstr "Nieznany typ"
 
-#: src/session/download.c:1146
+#: src/session/download.c:1149
 #, 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:1176
+#: src/session/download.c:1152
+#, 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:1183
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Program ('%' zostanie zastąpione nazwą pliku)"
 
-#: src/session/download.c:1181
+#: src/session/download.c:1188
 msgid "The output of the program will be shown in the tab"
 msgstr "Wyniki programu będą widoczne na karcie"
 
 #
-#: src/session/download.c:1185
+#: src/session/download.c:1192
 msgid "Block the terminal"
 msgstr "Blokowanie terminala"
 
-#: src/session/download.c:1192
+#: src/session/download.c:1199
 #, 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:1213
+#: src/session/download.c:1220
 msgid "~Open"
 msgstr "~Otwórz"
 
diff --git a/src/config/options.inc b/src/config/options.inc
index 6e651797..5755f208 100644
--- a/src/config/options.inc
+++ b/src/config/options.inc
@@ -917,7 +917,7 @@ static struct option_info config_options_info[] = {
 		"environment) with a background image or a transparent background -\n"
 		"it will be visible in ELinks as well (but ELinks document color handling\n"
 		"will still assume the background is black so if you have a bright background\n"
-		"you might experience contrast problems. Note that this option makes\n"
+		"you might experience contrast problems). Note that this option makes\n"
 		"sense only when colors are enabled.")),
 
 	INIT_OPT_BOOL("terminal._template_", N_("Underline"),
diff --git a/src/mime/mime.c b/src/mime/mime.c
index 9cd18244..5c39b43f 100644
--- a/src/mime/mime.c
+++ b/src/mime/mime.c
@@ -1,5 +1,9 @@
 /* Functionality for handling mime types */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* XXX: we _WANT_ strcasestr() ! */
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -224,6 +228,34 @@ get_cache_header_content_type(struct cache_entry *cached)
 	return NULL;
 }
 
+static unsigned char *
+get_fragment_content_type(struct cache_entry *cached)
+{
+	struct fragment *fragment;
+	size_t length;
+	unsigned char *sample;
+	unsigned char *ctype = NULL;
+
+	if (list_empty(cached->frag))
+		return NULL;
+
+	fragment = cached->frag.next;
+	if (fragment->offset)
+		return NULL;
+
+	length = fragment->length > 1024 ? 1024 : fragment->length;
+	sample = memacpy(fragment->data, length);
+	if (!sample)
+		return NULL;
+
+	if (strcasestr(sample, "<html>"))
+		ctype = stracpy("text/html");
+
+	mem_free(sample);
+
+	return ctype;
+}
+
 unsigned char *
 get_content_type(struct cache_entry *cached)
 {
@@ -269,6 +301,12 @@ get_content_type(struct cache_entry *cached)
 		mem_free_if(ctype);
 	}
 
+	ctype = get_fragment_content_type(cached);
+	if (ctype && *ctype) {
+		cached->content_type = ctype;
+		return ctype;
+	}
+
 	debug_ctype(get_default_mime_type());
 
 	/* Fallback.. use some hardwired default */
diff --git a/src/network/state.c b/src/network/state.c
index 5dfe6fcc..1d94d32b 100644
--- a/src/network/state.c
+++ b/src/network/state.c
@@ -122,6 +122,7 @@ struct s_msg_dsc {
 	{S_BITTORRENT_ERROR,	N_("BitTorrent error")},
 	{S_BITTORRENT_METAINFO,	N_("The BitTorrent metainfo file contained errors")},
 	{S_BITTORRENT_TRACKER,	N_("The tracker requesting failed")},
+	{S_BITTORRENT_BAD_URL,	N_("The BitTorrent URL does not point to a valid URL")},
 #endif
 
 	{0,			NULL}
diff --git a/src/network/state.h b/src/network/state.h
index 1fa41616..e5e443a6 100644
--- a/src/network/state.h
+++ b/src/network/state.h
@@ -104,6 +104,7 @@ enum connection_state {
 	S_BITTORRENT_ERROR	= -100800,
 	S_BITTORRENT_METAINFO	= -100801,
 	S_BITTORRENT_TRACKER	= -100802,
+	S_BITTORRENT_BAD_URL	= -100803,
 };
 
 unsigned char *get_state_message(enum connection_state state, struct terminal *term);
diff --git a/src/protocol/bittorrent/connection.c b/src/protocol/bittorrent/connection.c
index c0d4423a..75f8c957 100644
--- a/src/protocol/bittorrent/connection.c
+++ b/src/protocol/bittorrent/connection.c
@@ -284,6 +284,10 @@ init_bittorrent_connection(struct connection *conn)
 	bittorrent->conn = conn;
 	bittorrent->tracker.timer = TIMER_ID_UNDEF;
 
+	/* Initialize here so that error handling can safely call
+	 * free_list on it. */
+	init_list(bittorrent->meta.files);
+
 	return bittorrent;
 }
 
@@ -377,7 +381,7 @@ bittorrent_metainfo_callback(void *data, enum connection_state state,
 void
 bittorrent_protocol_handler(struct connection *conn)
 {
-	struct uri *uri;
+	struct uri *uri = NULL;
 	struct bittorrent_connection *bittorrent;
 
 	bittorrent = init_bittorrent_connection(conn);
@@ -386,11 +390,11 @@ bittorrent_protocol_handler(struct connection *conn)
 		return;
 	}
 
-	assert(conn->uri->datalen);
+	if (conn->uri->datalen)
+		uri = get_uri(conn->uri->data, 0);
 
-	uri = get_uri(conn->uri->data, 0);
 	if (!uri) {
-		abort_connection(conn, S_OUT_OF_MEM);
+		abort_connection(conn, S_BITTORRENT_BAD_URL);
 		return;
 	}
 
diff --git a/src/protocol/uri.c b/src/protocol/uri.c
index 076f9cf4..33df543e 100644
--- a/src/protocol/uri.c
+++ b/src/protocol/uri.c
@@ -250,6 +250,13 @@ parse_uri(struct uri *uri, unsigned char *uristring)
 			datalen = strlen(prefix_end);
 		}
 
+		/* A bit of a special case, but using the "normal" host
+		 * parsing seems a bit scary at this point. (see bug 107). */
+		if (datalen > 9 && !strncasecmp(prefix_end, "localhost/", 10)) {
+			prefix_end += 9;
+			datalen -= 9;
+		}
+
 		uri->data = prefix_end;
 		uri->datalen = datalen;
 
diff --git a/src/session/download.c b/src/session/download.c
index e4999e0a..00ffbabb 100644
--- a/src/session/download.c
+++ b/src/session/download.c
@@ -1143,8 +1143,15 @@ do_type_query(struct type_query *type_query, unsigned char *ct, struct mime_hand
 	}
 
 	text = get_dialog_offset(dlg, TYPE_QUERY_WIDGETS_COUNT);
-	format = _("What would you like to do with the file '%s' (type: %s%s%s)?", term);
-	snprintf(text, MAX_STR_LEN, format, filename.source, ct, desc_sep, description);
+	/* For "default directory index pages" with wrong content-type
+	 * the filename can be NULL, e.g. http://www.spamhaus.org in bug 396. */
+	if (filename.length) {
+		format = _("What would you like to do with the file '%s' (type: %s%s%s)?", term);
+		snprintf(text, MAX_STR_LEN, format, filename.source, ct, desc_sep, description);
+	} else {
+		format = _("What would you like to do with the file (type: %s%s%s)?", term);
+		snprintf(text, MAX_STR_LEN, format, ct, desc_sep, description);
+	}
 
 	done_string(&filename);