From d90a7c8c054b5857c55f7a0cc03277f1ff7cbd5a Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Fri, 11 Aug 2006 21:04:06 +0200
Subject: [PATCH 001/132] Polish translation was updated

---
 po/pl.po | 530 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 268 insertions(+), 262 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 60f22aeb..82b689a1 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-06-30 21:43+0200\n"
+"POT-Creation-Date: 2006-08-11 21:01+0200\n"
 "PO-Revision-Date: 2006-06-30 22:00+0200\n"
 "Last-Translator: Witold Filipczyk <witekfl@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -36,14 +36,14 @@ msgid "Press space to expand this folder."
 msgstr "Wciśnij spację by rozwinąć ten folder."
 
 #. accelerator_context(do_auth_dialog, do_edit_dialog, generic_external_protocol_handler, info_box, input_dialog, menu_add_ext, menu_keys, push_hierbox_info_button, refreshed_msg_box, resize_terminal_dialog, setup_first_session, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/viewer/text/search.c:search_dlg_do, terminal_options, write_config_dialog)
-#: src/bfu/hierbox.c:441 src/bfu/inpfield.c:255 src/bfu/msgbox.c:173
+#: src/bfu/hierbox.c:441 src/bfu/inpfield.c:256 src/bfu/msgbox.c:173
 #: src/bfu/msgbox.c:191 src/config/dialogs.c:58 src/config/dialogs.c:393
 #: src/cookies/dialogs.c:356 src/cookies/dialogs.c:454 src/dialogs/edit.c:98
-#: src/dialogs/info.c:134 src/dialogs/options.c:218 src/dialogs/options.c:299
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:111
-#: src/protocol/protocol.c:236 src/scripting/lua/core.c:378
-#: src/scripting/lua/core.c:459 src/session/session.c:801
-#: src/viewer/text/search.c:1594
+#: src/dialogs/info.c:134 src/dialogs/options.c:220 src/dialogs/options.c:301
+#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/protocol/protocol.c:236 src/scripting/lua/core.c:379
+#: src/scripting/lua/core.c:460 src/session/session.c:806
+#: src/viewer/text/search.c:1665
 msgid "~OK"
 msgstr "~OK"
 
@@ -125,7 +125,7 @@ msgstr "B
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
-#: src/bfu/hierbox.c:870 src/config/dialogs.c:836 src/dialogs/menu.c:127
+#: src/bfu/hierbox.c:870 src/config/dialogs.c:837 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
 #: src/terminal/tab.c:213 src/terminal/tab.c:250
 msgid "~Yes"
@@ -133,59 +133,59 @@ msgstr "~Tak"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
-#: src/bfu/hierbox.c:871 src/config/dialogs.c:837 src/dialogs/menu.c:128
+#: src/bfu/hierbox.c:871 src/config/dialogs.c:838 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
 #: src/terminal/tab.c:214 src/terminal/tab.c:251
 msgid "~No"
 msgstr "~Nie"
 
-#: src/bfu/hierbox.c:939 src/bfu/hierbox.c:970 src/viewer/text/search.c:1013
-#: src/viewer/text/search.c:1021 src/viewer/text/search.c:1037
-#: src/viewer/text/search.c:1613
+#: src/bfu/hierbox.c:939 src/bfu/hierbox.c:970 src/viewer/text/search.c:1085
+#: src/viewer/text/search.c:1093 src/viewer/text/search.c:1109
+#: src/viewer/text/search.c:1684
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/bfu/hierbox.c:941 src/viewer/text/search.c:1014
+#: src/bfu/hierbox.c:941 src/viewer/text/search.c:1086
 #, c-format
 msgid "Search string '%s' not found"
 msgstr "Nie znaleziono wyrażenia '%s'"
 
 #: src/bfu/hierbox.c:970 src/config/dialogs.c:169 src/config/dialogs.c:359
-#: src/config/dialogs.c:506 src/cookies/dialogs.c:34 src/cookies/dialogs.c:350
-#: src/dialogs/edit.c:92 src/dialogs/edit.c:94 src/scripting/lua/core.c:374
-#: src/scripting/lua/core.c:375 src/scripting/lua/core.c:456
+#: src/config/dialogs.c:507 src/cookies/dialogs.c:34 src/cookies/dialogs.c:350
+#: src/dialogs/edit.c:92 src/dialogs/edit.c:94 src/scripting/lua/core.c:375
+#: src/scripting/lua/core.c:376 src/scripting/lua/core.c:457
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/bfu/inpfield.c:71 src/bfu/inpfield.c:78
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79
 msgid "Bad number"
 msgstr "Nieprawidłowa liczba"
 
-#: src/bfu/inpfield.c:72
+#: src/bfu/inpfield.c:73
 msgid "Number expected in field"
 msgstr "Oczekiwano liczby"
 
-#: src/bfu/inpfield.c:80
+#: src/bfu/inpfield.c:81
 #, c-format
 msgid "Number should be in the range from %d to %d."
 msgstr "Liczba powinna być z zakresu od %d do %d."
 
-#: src/bfu/inpfield.c:98 src/config/dialogs.c:460
+#: src/bfu/inpfield.c:99 src/config/dialogs.c:460
 msgid "Bad string"
 msgstr "Nieprawidłowe wyrażenie"
 
-#: src/bfu/inpfield.c:99
+#: src/bfu/inpfield.c:100
 msgid "Empty string not allowed"
 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:255 src/config/dialogs.c:394 src/cookies/dialogs.c:357
+#: src/bfu/inpfield.c:256 src/config/dialogs.c:394 src/cookies/dialogs.c:357
 #: src/cookies/dialogs.c:455 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:221 src/dialogs/options.c:300 src/mime/dialogs.c:132
-#: src/protocol/auth/dialogs.c:112 src/protocol/bittorrent/dialogs.c:802
-#: src/scripting/lua/core.c:379 src/scripting/lua/core.c:460
-#: src/session/download.c:580 src/session/download.c:1188
-#: src/viewer/text/search.c:1595
+#: src/dialogs/options.c:223 src/dialogs/options.c:302 src/mime/dialogs.c:132
+#: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
+#: src/scripting/lua/core.c:380 src/scripting/lua/core.c:461
+#: src/session/download.c:637 src/session/download.c:1236
+#: src/viewer/text/search.c:1666
 msgid "~Cancel"
 msgstr "~Anuluj"
 
@@ -199,7 +199,7 @@ msgstr "Cyfrowy zegar w pasku statusu."
 
 #
 #: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1166
-#: src/config/options.inc:1173 src/ecmascript/ecmascript.c:43
+#: src/config/options.inc:1173 src/ecmascript/ecmascript.c:44
 #: 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"
@@ -270,7 +270,7 @@ msgstr ""
 "\n"
 "'-' - oznacza iż dany wskaźnik jest wyłączony."
 
-#: src/bfu/menu.c:771
+#: src/bfu/menu.c:874
 msgid "Search menu/"
 msgstr "Menu wyszukiwania/"
 
@@ -380,8 +380,8 @@ msgstr "Tytu
 
 #: src/bookmarks/dialogs.c:73 src/cache/dialogs.c:65
 #: src/dialogs/document.c:136 src/dialogs/edit.c:96 src/formhist/dialogs.c:63
-#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:159
-#: src/scripting/lua/core.c:376
+#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:163
+#: src/scripting/lua/core.c:377
 msgid "URL"
 msgstr "URL"
 
@@ -441,7 +441,7 @@ msgstr "Dodaj folder"
 msgid "Folder name"
 msgstr "Nazwa foldera"
 
-#: src/bookmarks/dialogs.c:310 src/scripting/lua/core.c:370
+#: src/bookmarks/dialogs.c:310 src/scripting/lua/core.c:371
 msgid "Edit bookmark"
 msgstr "Edytuj zakładkę"
 
@@ -478,27 +478,27 @@ msgstr ""
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
 #: src/bookmarks/dialogs.c:487 src/cache/dialogs.c:230
-#: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:257
+#: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:261
 msgid "~Goto"
 msgstr "~Przejdź do"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons)
-#: src/bookmarks/dialogs.c:488 src/config/dialogs.c:530
+#: src/bookmarks/dialogs.c:488 src/config/dialogs.c:531
 #: src/cookies/dialogs.c:476
 msgid "~Edit"
 msgstr "~Edytuj"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
 #: src/bookmarks/dialogs.c:489 src/cache/dialogs.c:231
-#: src/config/dialogs.c:532 src/config/dialogs.c:945 src/cookies/dialogs.c:477
+#: src/config/dialogs.c:533 src/config/dialogs.c:946 src/cookies/dialogs.c:477
 #: src/dialogs/menu.c:457 src/formhist/dialogs.c:211
-#: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:259
+#: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:263
 msgid "~Delete"
 msgstr "~Usuń"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu)
-#: src/bookmarks/dialogs.c:490 src/config/dialogs.c:531
-#: src/config/dialogs.c:944 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
+#: src/bookmarks/dialogs.c:490 src/config/dialogs.c:532
+#: src/config/dialogs.c:945 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
 msgid "~Add"
 msgstr "~Dodaj"
 
@@ -519,7 +519,7 @@ msgstr "Prze~nie
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/dialogs/menu.c:view_menu, src/globhist/dialogs.c:globhist_buttons)
 #: src/bookmarks/dialogs.c:494 src/cache/dialogs.c:232
-#: src/config/dialogs.c:533 src/config/dialogs.c:947 src/dialogs/menu.c:408
+#: src/config/dialogs.c:534 src/config/dialogs.c:948 src/dialogs/menu.c:408
 #: src/globhist/dialogs.c:230
 msgid "~Search"
 msgstr "~Szukaj"
@@ -601,7 +601,7 @@ msgstr "Flagi"
 msgid "incomplete"
 msgstr "niekompletne"
 
-#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:178
+#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:182
 msgid "invalid"
 msgstr "nieprawidłowy"
 
@@ -651,10 +651,10 @@ msgid "Delete this cache entry?"
 msgstr "Czy usunąć zaznaczony wpis cache?"
 
 #. accelerator_context(display_download, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/download.c:download_buttons, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
-#: src/cache/dialogs.c:229 src/config/dialogs.c:529 src/cookies/dialogs.c:473
-#: src/dialogs/download.c:250 src/dialogs/download.c:480
+#: src/cache/dialogs.c:229 src/config/dialogs.c:530 src/cookies/dialogs.c:473
+#: src/dialogs/download.c:255 src/dialogs/download.c:492
 #: src/formhist/dialogs.c:210 src/globhist/dialogs.c:225
-#: src/protocol/auth/dialogs.c:258
+#: src/protocol/auth/dialogs.c:262
 msgid "~Info"
 msgstr "~Informacja"
 
@@ -1874,10 +1874,10 @@ msgstr "Brak"
 msgid "Description"
 msgstr "Opis"
 
-#: src/config/dialogs.c:321 src/protocol/bittorrent/dialogs.c:594
-#: src/protocol/protocol.c:230 src/session/session.c:282
-#: src/session/session.c:964 src/viewer/text/textarea.c:331
-#: src/viewer/text/textarea.c:338
+#: src/config/dialogs.c:321 src/protocol/bittorrent/dialogs.c:599
+#: src/protocol/protocol.c:230 src/session/session.c:287
+#: src/session/session.c:969 src/viewer/text/textarea.c:570
+#: src/viewer/text/textarea.c:577
 msgid "Error"
 msgstr "Błąd"
 
@@ -1905,42 +1905,42 @@ msgstr ""
 "Nazwy opcji mogą zawierać tylko znaki alfanumeryczne\n"
 "oraz '_' i '-'."
 
-#: src/config/dialogs.c:481 src/config/dialogs.c:506
+#: src/config/dialogs.c:482 src/config/dialogs.c:507
 msgid "Add option"
 msgstr "Dodaj opcję"
 
-#: src/config/dialogs.c:482
+#: src/config/dialogs.c:483
 msgid "Cannot add an option here."
 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:534 src/config/dialogs.c:948 src/cookies/dialogs.c:479
-#: src/dialogs/options.c:220 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:789 src/session/download.c:1172
+#: src/config/dialogs.c:535 src/config/dialogs.c:949 src/cookies/dialogs.c:479
+#: src/dialogs/options.c:222 src/formhist/dialogs.c:214
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
 msgstr "~Zapisz"
 
-#: src/config/dialogs.c:539
+#: src/config/dialogs.c:540
 msgid "Option manager"
 msgstr "Menadżer ustawień"
 
-#: src/config/dialogs.c:701
+#: src/config/dialogs.c:702
 msgid "Keystroke"
 msgstr "Skrót klawiszowy"
 
-#: src/config/dialogs.c:703 src/config/options.inc:1186
+#: src/config/dialogs.c:704 src/config/options.inc:1186
 msgid "Action"
 msgstr "Akcja"
 
-#: src/config/dialogs.c:704
+#: src/config/dialogs.c:705
 msgid "Keymap"
 msgstr "Mapowanie klawiatury"
 
-#: src/config/dialogs.c:830
+#: src/config/dialogs.c:831
 msgid "Keystroke already used"
 msgstr "Skrót klawiszowy jest już używany"
 
-#: src/config/dialogs.c:831
+#: src/config/dialogs.c:832
 #, c-format
 msgid ""
 "The keystroke \"%s\" is currently used for \"%s\".\n"
@@ -1949,24 +1949,24 @@ msgstr ""
 "Skrót klawiszowy \"%s\" jest używany przez \"%s\".\n"
 "Czy na pewno chcesz go zmienić?"
 
-#: src/config/dialogs.c:854 src/config/dialogs.c:871 src/config/dialogs.c:908
+#: src/config/dialogs.c:855 src/config/dialogs.c:872 src/config/dialogs.c:909
 msgid "Add keybinding"
 msgstr "Dodaj przypisanie"
 
-#: src/config/dialogs.c:855
+#: src/config/dialogs.c:856
 msgid "Invalid keystroke."
 msgstr "Niepoprawny skrót klawiszowy."
 
-#: src/config/dialogs.c:872
+#: src/config/dialogs.c:873
 msgid "Need to select a keymap."
 msgstr "Trzeba wybrać mapowanie klawiatury."
 
 #. accelerator_context(menu_keys, src/config/dialogs.c:keybinding_buttons, src/globhist/dialogs.c:globhist_buttons)
-#: src/config/dialogs.c:946 src/dialogs/info.c:135 src/globhist/dialogs.c:231
+#: src/config/dialogs.c:947 src/dialogs/info.c:135 src/globhist/dialogs.c:231
 msgid "~Toggle display"
 msgstr "~Krótki/długi opis"
 
-#: src/config/dialogs.c:953
+#: src/config/dialogs.c:954
 msgid "Keybinding manager"
 msgstr "Menadżer przypisań klawiszy"
 
@@ -2611,7 +2611,7 @@ 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:875
-#: src/dialogs/options.c:215
+#: src/dialogs/options.c:217
 msgid "Underline"
 msgstr "Podkreślenie"
 
@@ -3677,7 +3677,7 @@ msgstr ""
 "3 - KOI-8\n"
 "4 - FreeBSD"
 
-#: src/config/options.inc:837 src/dialogs/options.c:211
+#: src/config/options.inc:837 src/dialogs/options.c:213
 msgid "Switch fonts for line drawing"
 msgstr "Zmiana fontu do rysowania linii"
 
@@ -3690,7 +3690,7 @@ msgstr ""
 "Zmienia font podczas rysowania linii, włączając oba zestawy\n"
 "znaków. Ma sens jedynie na linuksowym terminalu."
 
-#: src/config/options.inc:843 src/dialogs/options.c:216
+#: src/config/options.inc:843 src/dialogs/options.c:218
 msgid "UTF-8 I/O"
 msgstr "I/O w UTF-8"
 
@@ -3703,7 +3703,7 @@ msgstr ""
 "jedynie podzbiór UTF8 jest używany w zależności od używanej\n"
 "strony kodowej."
 
-#: src/config/options.inc:848 src/dialogs/options.c:212
+#: src/config/options.inc:848 src/dialogs/options.c:214
 msgid "Restrict frames in cp850/852"
 msgstr "Ogranicz ramki w cp850/852"
 
@@ -3716,7 +3716,7 @@ msgstr ""
 "z terminalami linuksowymi używającymi stron kodowych cp850/852."
 
 #
-#: src/config/options.inc:853 src/dialogs/options.c:213
+#: src/config/options.inc:853 src/dialogs/options.c:215
 msgid "Block cursor"
 msgstr "Kursor blokowy"
 
@@ -3745,7 +3745,7 @@ msgstr ""
 "1 - tryb 16 kolorowy, używa standardowych kolorów ANSI\n"
 "2 - tryb 256 kolorowy, używa kodów RGB xterma"
 
-#: src/config/options.inc:867 src/dialogs/options.c:214
+#: src/config/options.inc:867 src/dialogs/options.c:216
 msgid "Transparency"
 msgstr "Przezroczystość"
 
@@ -3970,7 +3970,7 @@ msgstr "Tekst"
 msgid "Dialog text colors."
 msgstr "Kolory tekstu w oknie dialogowym."
 
-#: src/config/options.inc:1026 src/viewer/text/form.c:1503
+#: src/config/options.inc:1026 src/viewer/text/form.c:1780
 msgid "Checkbox"
 msgstr "Przycisk wyboru"
 
@@ -4022,7 +4022,7 @@ msgstr "Klawisz skr
 msgid "Selected button shortcut"
 msgstr "Klawisz skrótu wybranego przycisku"
 
-#: src/config/options.inc:1054 src/viewer/text/form.c:1507
+#: src/config/options.inc:1054 src/viewer/text/form.c:1784
 msgid "Text field"
 msgstr "Pole tekstowe"
 
@@ -4790,8 +4790,8 @@ msgid "Add ~server"
 msgstr "Dodaj ~serwer"
 
 #. 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:478 src/dialogs/download.c:486 src/dialogs/edit.c:99
-#: src/globhist/dialogs.c:232 src/protocol/auth/dialogs.c:260
+#: src/cookies/dialogs.c:478 src/dialogs/download.c:498 src/dialogs/edit.c:99
+#: src/globhist/dialogs.c:232 src/protocol/auth/dialogs.c:264
 msgid "C~lear"
 msgstr "Wy~czyść"
 
@@ -4856,79 +4856,79 @@ msgstr "Wewn
 msgid "No header info."
 msgstr "Brak nagłówka."
 
-#: src/dialogs/download.c:238 src/dialogs/menu.c:588
+#: src/dialogs/download.c:243 src/dialogs/menu.c:593
 #: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:398
 msgid "Download"
 msgstr "Pobieranie"
 
 #. accelerator_context(display_download)
-#: src/dialogs/download.c:245
+#: src/dialogs/download.c:250
 msgid "~Background"
 msgstr "W ~tle"
 
 #. accelerator_context(display_download)
-#: src/dialogs/download.c:246
+#: src/dialogs/download.c:251
 msgid "Background with ~notify"
 msgstr "W tle z powiadomie~niem"
 
 #. accelerator_context(display_download, src/dialogs/download.c:download_buttons)
-#: src/dialogs/download.c:253 src/dialogs/download.c:481
+#: src/dialogs/download.c:258 src/dialogs/download.c:493
 msgid "~Abort"
 msgstr "~Przerwij"
 
 #. accelerator_context(display_download)
-#: src/dialogs/download.c:258
+#: src/dialogs/download.c:263
 msgid "Abort and ~delete file"
 msgstr "Przerwij i ~skasuj plik"
 
 #. cant_delete_item
-#: src/dialogs/download.c:411
+#: src/dialogs/download.c:423
 #, c-format
 msgid "Sorry, but download \"%s\" cannot be interrupted."
 msgstr "Przykro mi, ale ściąganie \"%s\" nie może być przerwane."
 
 #. cant_delete_used_item
-#: src/dialogs/download.c:413
+#: src/dialogs/download.c:425
 #, c-format
 msgid "Sorry, but download \"%s\" is being used by something else."
 msgstr "Przykro mi, ale ściąganie \"%s\" jest używane przez coś innego."
 
 #. delete_marked_items_title
-#: src/dialogs/download.c:419
+#: src/dialogs/download.c:431
 msgid "Interrupt marked downloads"
 msgstr "Przerwij zaznaczone ściągania"
 
 #. delete_marked_items
-#: src/dialogs/download.c:421
+#: src/dialogs/download.c:433
 msgid "Interrupt marked downloads?"
 msgstr "Przerwać zaznaczone ściągania?"
 
 #. delete_item_title
-#: src/dialogs/download.c:427
+#: src/dialogs/download.c:439
 msgid "Interrupt download"
 msgstr "Przerwij ściąganie"
 
-#: src/dialogs/download.c:429
+#: src/dialogs/download.c:441
 #, c-format
 msgid "Interrupt this download?"
 msgstr "Przerwać to ściąganie?"
 
 #. clear_all_items_title
-#: src/dialogs/download.c:431
+#: src/dialogs/download.c:443
 msgid "Interrupt all downloads"
 msgstr "Przerwij wszystkie ściągania"
 
 #. clear_all_items_title
-#: src/dialogs/download.c:433
+#: src/dialogs/download.c:445
 msgid "Do you really want to interrupt all downloads?"
 msgstr "Czy na pewno chcesz przerwać wszystkie ściągania?"
 
 #. This requires more work to make locking work and query the user
-#: src/dialogs/download.c:484
+#: src/dialogs/download.c:496
 msgid "Abort and delete file"
 msgstr "Przerwij i skasuj plik"
 
-#: src/dialogs/download.c:491
+#: src/dialogs/download.c:503
 msgid "Download manager"
 msgstr "Menadżer pobierania"
 
@@ -5504,24 +5504,24 @@ msgstr "Po~moc"
 msgid "Go to URL"
 msgstr "Przejdź do URL-a"
 
-#: src/dialogs/menu.c:588
+#: src/dialogs/menu.c:593
 msgid "Save to file"
 msgstr "Zapisz do pliku"
 
-#: src/dialogs/menu.c:923
+#: src/dialogs/menu.c:928
 msgid "Empty directory"
 msgstr "Pusty katalog"
 
-#: src/dialogs/menu.c:967
+#: src/dialogs/menu.c:972
 msgid "Directories:"
 msgstr "Katalogi:"
 
-#: src/dialogs/menu.c:980
+#: src/dialogs/menu.c:985
 msgid "Files:"
 msgstr "Pliki:"
 
 #. 2 '\n' + 1 '\0'
-#: src/dialogs/options.c:159
+#: src/dialogs/options.c:161
 #, c-format
 msgid ""
 "The environmental variable TERM is set to '%s'.\n"
@@ -5538,63 +5538,63 @@ msgstr ""
 "Pozwala to na konfigurację tych ustawień dla każdego z\n"
 "terminali, w których uruchamiasz ELinksa."
 
-#: src/dialogs/options.c:185
+#: src/dialogs/options.c:187
 msgid "Terminal options"
 msgstr "Opcje terminala"
 
-#: src/dialogs/options.c:194
+#: src/dialogs/options.c:196
 msgid "Frame handling:"
 msgstr "Rysowanie ramek:"
 
-#: src/dialogs/options.c:195
+#: src/dialogs/options.c:197
 msgid "No frames"
 msgstr "Brak ramek"
 
-#: src/dialogs/options.c:196
+#: src/dialogs/options.c:198
 msgid "VT 100 frames"
 msgstr "Ramki VT100"
 
-#: src/dialogs/options.c:197
+#: src/dialogs/options.c:199
 msgid "Linux or OS/2 frames"
 msgstr "Ramki typu Linux lub OS/2"
 
-#: src/dialogs/options.c:198
+#: src/dialogs/options.c:200
 msgid "FreeBSD frames"
 msgstr "Ramki FreeBSD"
 
-#: src/dialogs/options.c:199
+#: src/dialogs/options.c:201
 msgid "KOI8-R frames"
 msgstr "Ramki KOI8-R"
 
-#: src/dialogs/options.c:201
+#: src/dialogs/options.c:203
 msgid "Color mode:"
 msgstr "Tryb kolorowy:"
 
-#: src/dialogs/options.c:202
+#: src/dialogs/options.c:204
 msgid "No colors (mono)"
 msgstr "Brak kolorów (mono)"
 
-#: src/dialogs/options.c:203
+#: src/dialogs/options.c:205
 msgid "16 colors"
 msgstr "16 kolorów"
 
-#: src/dialogs/options.c:205
+#: src/dialogs/options.c:207
 msgid "88 colors"
 msgstr "88 kolorów"
 
-#: src/dialogs/options.c:208
+#: src/dialogs/options.c:210
 msgid "256 colors"
 msgstr "256 kolorów"
 
-#: src/dialogs/options.c:293
+#: src/dialogs/options.c:295
 msgid "Resize terminal"
 msgstr "Zmień rozmiar terminala"
 
-#: src/dialogs/options.c:296
+#: src/dialogs/options.c:298
 msgid "Width="
 msgstr "Szerokość="
 
-#: src/dialogs/options.c:297
+#: src/dialogs/options.c:299
 msgid "Height="
 msgstr "Wysokość="
 
@@ -5657,29 +5657,29 @@ msgstr "pozosta
 msgid "ETA"
 msgstr "ETA"
 
-#: src/dialogs/status.c:191
+#: src/dialogs/status.c:184
 msgid "Enter a mark to set"
 msgstr "Ustaw zaznaczenie"
 
-#: src/dialogs/status.c:195
+#: src/dialogs/status.c:188
 msgid "Enter a mark to which to jump"
 msgstr "Wprowadź zaznaczenie, do którego skoczyć"
 
-#: src/dialogs/status.c:202
+#: src/dialogs/status.c:195
 #, c-format
 msgid "Keyboard prefix: %d"
 msgstr "Prefix klawiatury: %d"
 
-#: src/dialogs/status.c:226
+#: src/dialogs/status.c:219
 #, c-format
 msgid "Cursor position: %dx%d"
 msgstr "Pozycja kursora: %dx%d"
 
-#: src/dialogs/status.c:326
+#: src/dialogs/status.c:319
 msgid "Untitled"
 msgstr "Bez tytułu"
 
-#: src/dialogs/status.c:328
+#: src/dialogs/status.c:321
 msgid "No document"
 msgstr "Brak dokumentu"
 
@@ -5734,32 +5734,32 @@ msgstr ""
 "Zostaw jako \"\", żeby używać wbudowanych styli dokumentu."
 
 #. name:
-#: src/ecmascript/ecmascript.c:39 src/ecmascript/ecmascript.c:310
+#: src/ecmascript/ecmascript.c:40 src/ecmascript/ecmascript.c:311
 msgid "ECMAScript"
 msgstr "ECMAScript"
 
 #
-#: src/ecmascript/ecmascript.c:41
+#: src/ecmascript/ecmascript.c:42
 msgid "ECMAScript options."
 msgstr "Ustawienia ECMAScript."
 
-#: src/ecmascript/ecmascript.c:45
+#: src/ecmascript/ecmascript.c:46
 msgid "Whether to run those scripts inside of documents."
 msgstr "Czy wykonywać skrypty zawarte w dokumentach."
 
-#: src/ecmascript/ecmascript.c:47
+#: src/ecmascript/ecmascript.c:48
 msgid "Script error reporting"
 msgstr "Raportowanie błędów skryptu"
 
-#: src/ecmascript/ecmascript.c:49
+#: src/ecmascript/ecmascript.c:50
 msgid "Open a message box when a script reports an error."
 msgstr "Czy otwierać okienko dialogowe z raportem o błędzie skryptu."
 
-#: src/ecmascript/ecmascript.c:51
+#: src/ecmascript/ecmascript.c:52
 msgid "Ignore <noscript> content"
 msgstr "Ignoruj zawartość <noscript>"
 
-#: src/ecmascript/ecmascript.c:53
+#: src/ecmascript/ecmascript.c:54
 msgid ""
 "Whether to ignore content enclosed by the <noscript> tag\n"
 "when ECMAScript is enabled."
@@ -5767,27 +5767,27 @@ msgstr ""
 "Czy ignorować treść zawartą w znaczniku <noscript> w przypadku, gdy\n"
 "ECMAScript jest włączony."
 
-#: src/ecmascript/ecmascript.c:56
+#: src/ecmascript/ecmascript.c:57
 msgid "Maximum execution time"
 msgstr "Maksymalny czas wykonywania"
 
-#: src/ecmascript/ecmascript.c:58
+#: src/ecmascript/ecmascript.c:59
 msgid "Maximum execution time in seconds for a script."
 msgstr "Maksymalny czas w sekundach wykonywania skryptu."
 
-#: src/ecmascript/ecmascript.c:60
+#: src/ecmascript/ecmascript.c:61
 msgid "Pop-up window blocking"
 msgstr "Blokowanie okienek pop-up"
 
-#: src/ecmascript/ecmascript.c:62
+#: src/ecmascript/ecmascript.c:63
 msgid "Whether to disallow scripts to open new windows or tabs."
 msgstr "Czy zabronić skryptom otwieranie nowych okien lub kart."
 
-#: src/ecmascript/ecmascript.c:255
+#: src/ecmascript/ecmascript.c:256
 msgid "JavaScript Emergency"
 msgstr "Wypadek JavaScriptu"
 
-#: src/ecmascript/ecmascript.c:257
+#: src/ecmascript/ecmascript.c:258
 #, c-format
 msgid ""
 "A script embedded in the current document was running\n"
@@ -6870,78 +6870,81 @@ msgstr "Terminal ~BeOS"
 msgid "Authentication required for %s at %s"
 msgstr "Potrzebne uwierzytelnienie dla %s w %s"
 
-#: src/protocol/auth/dialogs.c:98
-msgid "HTTP Authentication"
-msgstr "Uwierzytelnienie HTTP"
+#. This function is used for at least HTTP and FTP, so don't
+#. * name the protocol here.  Consider also what an FTP server
+#. * behind an HTTP proxy should be called.
+#: src/protocol/auth/dialogs.c:102
+msgid "Authentication required"
+msgstr "Wymagane uwierzytelnienie"
 
-#: src/protocol/auth/dialogs.c:108
+#: src/protocol/auth/dialogs.c:112
 msgid "Login"
 msgstr "Nazwa użytkownika"
 
-#: src/protocol/auth/dialogs.c:109 src/protocol/http/http.c:140
+#: src/protocol/auth/dialogs.c:113 src/protocol/http/http.c:140
 msgid "Password"
 msgstr "Hasło"
 
-#: src/protocol/auth/dialogs.c:162
+#: src/protocol/auth/dialogs.c:166
 msgid "Realm"
 msgstr "Uwierzytelnienie"
 
-#: src/protocol/auth/dialogs.c:174
+#: src/protocol/auth/dialogs.c:178
 msgid "none"
 msgstr "żaden"
 
-#: src/protocol/auth/dialogs.c:177
+#: src/protocol/auth/dialogs.c:181
 msgid "State"
 msgstr "Stan"
 
-#: src/protocol/auth/dialogs.c:178
+#: src/protocol/auth/dialogs.c:182
 msgid "valid"
 msgstr "poprawny"
 
 #. cant_delete_item
-#: src/protocol/auth/dialogs.c:215
+#: src/protocol/auth/dialogs.c:219
 #, c-format
 msgid "Sorry, but auth entry \"%s\" cannot be deleted."
 msgstr "Przykro mi, ale pozycja autentykacji \"%s\" nie może być usunięta."
 
 #. cant_delete_used_item
-#: src/protocol/auth/dialogs.c:217
+#: src/protocol/auth/dialogs.c:221
 #, c-format
 msgid "Sorry, but auth entry \"%s\" is being used by something else."
 msgstr ""
 "Przykro mi, ale pozycja autentykacji \"%s\" jest używana przez coś innego."
 
 #. delete_marked_items_title
-#: src/protocol/auth/dialogs.c:223
+#: src/protocol/auth/dialogs.c:227
 msgid "Delete marked auth entries"
 msgstr "Usuwanie zaznaczonych pozycji autentykacji"
 
 #. delete_marked_items
-#: src/protocol/auth/dialogs.c:225
+#: src/protocol/auth/dialogs.c:229
 msgid "Delete marked auth entries?"
 msgstr "Czy usunąć zaznaczone pozycje autentykacji?"
 
 #. delete_item_title
-#: src/protocol/auth/dialogs.c:231
+#: src/protocol/auth/dialogs.c:235
 msgid "Delete auth entry"
 msgstr "Usuwanie pozycji autentykacji"
 
-#: src/protocol/auth/dialogs.c:233
+#: src/protocol/auth/dialogs.c:237
 #, c-format
 msgid "Delete this auth entry?"
 msgstr "Czy usunąć tę pozycję autentykacji?"
 
 #. clear_all_items_title
-#: src/protocol/auth/dialogs.c:235
+#: src/protocol/auth/dialogs.c:239
 msgid "Clear all auth entries"
 msgstr "Skasowanie wszystkich pozycji"
 
 #. clear_all_items_title
-#: src/protocol/auth/dialogs.c:237
+#: src/protocol/auth/dialogs.c:241
 msgid "Do you really want to remove all auth entries?"
 msgstr "Czy na pewno chcesz skasować wszystkie pozycje autentykacji?"
 
-#: src/protocol/auth/dialogs.c:265
+#: src/protocol/auth/dialogs.c:269
 msgid "Authentication manager"
 msgstr "Zarządca autentykacji"
 
@@ -7524,36 +7527,36 @@ msgstr[0] "%u niedost
 msgstr[1] "%u niedostępne"
 msgstr[2] "%u niedostępnych"
 
-#: src/protocol/bittorrent/dialogs.c:579 src/session/session.c:273
+#: src/protocol/bittorrent/dialogs.c:584 src/session/session.c:278
 #, c-format
 msgid "Unable to retrieve %s"
 msgstr "Nie można odebrać %s"
 
-#: src/protocol/bittorrent/dialogs.c:726
+#: src/protocol/bittorrent/dialogs.c:736
 #, c-format
 msgid "What would you like to do with the file '%s'?"
 msgstr "Co chcesz zrobić z plikiem '%s'?"
 
-#: src/protocol/bittorrent/dialogs.c:742
+#: src/protocol/bittorrent/dialogs.c:752
 msgid "Information about the torrent"
 msgstr "Informacje o potoku"
 
-#: src/protocol/bittorrent/dialogs.c:764 src/session/download.c:1078
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1121
 msgid "What to do?"
 msgstr "Co mam zrobić?"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback)
-#: src/protocol/bittorrent/dialogs.c:786
+#: src/protocol/bittorrent/dialogs.c:796
 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:792 src/session/download.c:1178
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1226
 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:796 src/session/download.c:1182
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1230
 msgid "Show ~header"
 msgstr "Pokaż ~nagłówek"
 
@@ -7586,19 +7589,19 @@ msgid "CGI"
 msgstr "CGI"
 
 #
-#: src/protocol/file/file.c:41
+#: src/protocol/file/file.c:42
 msgid "Local files"
 msgstr "Lokalne pliki"
 
-#: src/protocol/file/file.c:43
+#: src/protocol/file/file.c:44
 msgid "Options specific to local browsing."
 msgstr "Ustawienia dotyczące przeglądania lokalnych plików."
 
-#: src/protocol/file/file.c:45
+#: src/protocol/file/file.c:46
 msgid "Allow reading special files"
 msgstr "Zezwolenie na czytanie plików specjalnych"
 
-#: src/protocol/file/file.c:47
+#: src/protocol/file/file.c:48
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7608,11 +7611,11 @@ msgstr ""
 "NIEBEZPIECZNE - czytanie /dev/urandom czy /dev/zero\n"
 "może zepsuć Ci dzień!"
 
-#: src/protocol/file/file.c:51
+#: src/protocol/file/file.c:52
 msgid "Show hidden files in directory listing"
 msgstr "Pokazuj ukryte pliki przy wyświetlaniu katalogów"
 
-#: src/protocol/file/file.c:53
+#: src/protocol/file/file.c:54
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
 "hidden in local directories listing."
@@ -7621,11 +7624,11 @@ msgstr ""
 "nie będą pokazywane."
 
 #
-#: src/protocol/file/file.c:56
+#: src/protocol/file/file.c:57
 msgid "Try encoding extensions"
 msgstr "Próbuj różne rozszerzenia plików"
 
-#: src/protocol/file/file.c:58
+#: src/protocol/file/file.c:59
 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"
@@ -7636,7 +7639,7 @@ msgstr ""
 "(np. 'plik.gz'); zależy to od wspieranych formatów kompresji."
 
 #. name:
-#: src/protocol/file/file.c:66
+#: src/protocol/file/file.c:67
 msgid "File"
 msgstr "Plik"
 
@@ -8242,41 +8245,41 @@ msgstr "Nie okre
 msgid "No program specified for protocol %s."
 msgstr "Nie określono programu do obsługi protokołu %s."
 
-#: src/scripting/lua/core.c:300
+#: src/scripting/lua/core.c:301
 msgid "Error registering event hook"
 msgstr "Błąd przy rejestrowaniu zaczepienia zdarzenia"
 
-#: src/scripting/lua/core.c:451
+#: src/scripting/lua/core.c:452
 msgid "User dialog"
 msgstr "Okno dialogowe użytkownika"
 
-#: src/scripting/lua/core.c:730
+#: src/scripting/lua/core.c:731
 msgid "Lua Error"
 msgstr "Błąd Lua"
 
-#: src/scripting/lua/core.c:880
+#: src/scripting/lua/core.c:881
 msgid "Lua Console"
 msgstr "Konsola Lua"
 
-#: src/scripting/lua/core.c:880
+#: src/scripting/lua/core.c:881
 msgid "Enter expression"
 msgstr "Wprowadź wyrażenie"
 
-#: src/scripting/ruby/core.c:130 src/scripting/ruby/core.c:183
+#: src/scripting/ruby/core.c:131 src/scripting/ruby/core.c:184
 msgid "Ruby Message"
 msgstr "Wiadomość Ruby'ego"
 
-#: src/scripting/scripting.c:54
+#: src/scripting/scripting.c:59
 #, c-format
 msgid "An error occurred while running a %s script"
 msgstr "Wystąpił błąd przy uruchamianiu skryptu %s"
 
-#: src/scripting/scripting.c:60
+#: src/scripting/scripting.c:65
 msgid "Browser scripting error"
 msgstr "Błąd skryptów przeglądarki"
 
 #. name:
-#: src/scripting/scripting.c:88
+#: src/scripting/scripting.c:93
 msgid "Scripting"
 msgstr "Skryptowanie"
 
@@ -8285,11 +8288,11 @@ msgid "User script alert"
 msgstr "Błąd skryptu użytkownika"
 
 #: src/session/download.c:235 src/session/download.c:359
-#: src/session/download.c:534 src/session/download.c:629
+#: src/session/download.c:591 src/session/download.c:679
 msgid "Download error"
 msgstr "Błąd pobierania"
 
-#: src/session/download.c:236 src/session/download.c:630
+#: src/session/download.c:236 src/session/download.c:680
 #, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -8309,17 +8312,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/session/download.c:535
+#: src/session/download.c:592
 #, c-format
 msgid "'%s' is a directory."
 msgstr "'%s' to katalog."
 
 #
-#: src/session/download.c:569
+#: src/session/download.c:626
 msgid "File exists"
 msgstr "Plik istnieje"
 
-#: src/session/download.c:570
+#: src/session/download.c:627
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -8335,59 +8338,59 @@ msgstr ""
 "%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:577
+#: src/session/download.c:634
 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:578
+#: src/session/download.c:635
 msgid "~Overwrite the original file"
 msgstr "Nadpisz ~oryginalny plik"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:579
+#: src/session/download.c:636
 msgid "~Resume download of the original file"
 msgstr "Wznów pobie~ranie oryginalnego pliku"
 
-#: src/session/download.c:1081
+#: src/session/download.c:1124
 msgid "Unknown type"
 msgstr "Nieznany typ"
 
-#: src/session/download.c:1098
+#: src/session/download.c:1146
 #, 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:1128
+#: src/session/download.c:1176
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Program ('%' zostanie zastąpione nazwą pliku)"
 
-#: src/session/download.c:1133
+#: src/session/download.c:1181
 msgid "The output of the program will be shown in the tab"
 msgstr "Wyniki programu będą widoczne na karcie"
 
 #
-#: src/session/download.c:1137
+#: src/session/download.c:1185
 msgid "Block the terminal"
 msgstr "Blokowanie terminala"
 
-#: src/session/download.c:1144
+#: src/session/download.c:1192
 #, 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:1165
+#: src/session/download.c:1213
 msgid "~Open"
 msgstr "~Otwórz"
 
-#: src/session/session.c:751 src/session/session.c:770 src/session/task.c:270
-#: src/viewer/text/textarea.c:385
+#: src/session/session.c:756 src/session/session.c:775 src/session/task.c:270
+#: src/viewer/text/textarea.c:624
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: src/session/session.c:752
+#: src/session/session.c:757
 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, "
@@ -8405,7 +8408,7 @@ msgstr ""
 "co mi chodzi, po prostu to zrób), tak że domyślne ustawienie będzie używane. "
 "Przepraszamy za wszelkie niedogodności."
 
-#: src/session/session.c:771
+#: src/session/session.c:776
 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 "
@@ -8427,11 +8430,11 @@ msgstr ""
 "saving_style na 3, by uzyskać \"właściwe\" zachowanie. Przepraszamy za "
 "wszelkie niedogodności."
 
-#: src/session/session.c:796
+#: src/session/session.c:801
 msgid "Welcome"
 msgstr "Powitanie"
 
-#: src/session/session.c:797
+#: src/session/session.c:802
 msgid ""
 "Welcome to ELinks!\n"
 "\n"
@@ -8481,30 +8484,30 @@ msgstr "Czy chcesz wys
 msgid "Do you want to repost form data to URL %s?"
 msgstr "Czy chcesz ponownie wysłać formularz do %s?"
 
-#: src/terminal/event.c:71
+#: src/terminal/event.c:77
 #, c-format
 msgid "Bad terminal size: %d, %d"
 msgstr "Błędny rozmiar terminala: %d, %d"
 
-#: src/terminal/event.c:154
+#: src/terminal/event.c:169
 msgid "Warning: terminal name contains illicit chars."
 msgstr "Ostrzeżenie: nazwa terminala zawiera \"nieprzyzwoite\" znaki."
 
-#: src/terminal/event.c:225
+#: src/terminal/event.c:250
 msgid "Failed to create session."
 msgstr "Nie udało się utworzyć sesji."
 
-#: src/terminal/event.c:315
+#: src/terminal/event.c:415
 #, c-format
 msgid "Bad event %d"
 msgstr "Błędne zdarzenie %d"
 
-#: src/terminal/event.c:355
+#: src/terminal/event.c:455
 #, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Nie można odczytać zdarzenia: %d (%s)"
 
-#: src/terminal/kbd.c:920
+#: src/terminal/kbd.c:1068
 msgid "Too many bytes read from the itrm!"
 msgstr "Zbyt dużo bajtów przeczytanych z itrm!"
 
@@ -8516,16 +8519,16 @@ msgstr "Czy na pewno chcesz zamkn
 msgid "Do you really want to close all except the current tab?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie karty za wyjątkiem bieżącej?"
 
-#: src/viewer/dump/dump.c:83
+#: src/viewer/dump/dump.c:84
 #, c-format
 msgid "Can't write to stdout: %s"
 msgstr "Błąd przy zapisywaniu na standardowe wyjście: %s"
 
-#: src/viewer/dump/dump.c:86
+#: src/viewer/dump/dump.c:87
 msgid "Can't write to stdout."
 msgstr "Nie można zapisać na standardowe wyjście."
 
-#: src/viewer/dump/dump.c:276
+#: src/viewer/dump/dump.c:277
 #, c-format
 msgid "URL protocol not supported (%s)."
 msgstr "Protokół URL-a nie obsługiwany (%s)."
@@ -8540,282 +8543,282 @@ msgstr "Brakuj
 msgid "The requested fragment \"#%s\" doesn't exist."
 msgstr "Wybrany fragment \"#%s\" nie istnieje."
 
-#: src/viewer/text/form.c:862
+#: src/viewer/text/form.c:949
 msgid "Error while posting form"
 msgstr "Wystąpił błąd podczas wysyłania formularza"
 
-#: src/viewer/text/form.c:863
+#: src/viewer/text/form.c:950
 #, c-format
 msgid "Could not load file %s: %s"
 msgstr "Nie można wczytać pliku %s: %s"
 
-#: src/viewer/text/form.c:1488
+#: src/viewer/text/form.c:1765
 msgid "Reset form"
 msgstr "Wyczyść formularz"
 
 #
-#: src/viewer/text/form.c:1490
+#: src/viewer/text/form.c:1767
 msgid "Harmless button"
 msgstr "Nieszkodliwy przycisk"
 
-#: src/viewer/text/form.c:1498
+#: src/viewer/text/form.c:1775
 msgid "Submit form to"
 msgstr "Prześlij formularz do"
 
-#: src/viewer/text/form.c:1499
+#: src/viewer/text/form.c:1776
 msgid "Post form to"
 msgstr "Wyślij formularz do"
 
-#: src/viewer/text/form.c:1501
+#: src/viewer/text/form.c:1778
 msgid "Radio button"
 msgstr "Okrągły przycisk"
 
-#: src/viewer/text/form.c:1505
+#: src/viewer/text/form.c:1782
 msgid "Select field"
 msgstr "Pole wyboru"
 
-#: src/viewer/text/form.c:1509
+#: src/viewer/text/form.c:1786
 msgid "Text area"
 msgstr "Pole tekstowe"
 
-#: src/viewer/text/form.c:1511
+#: src/viewer/text/form.c:1788
 msgid "File upload"
 msgstr "Ładowanie pliku"
 
-#: src/viewer/text/form.c:1513
+#: src/viewer/text/form.c:1790
 msgid "Password field"
 msgstr "Pole hasła"
 
-#: src/viewer/text/form.c:1551
+#: src/viewer/text/form.c:1828
 msgid "name"
 msgstr "nazwa"
 
-#: src/viewer/text/form.c:1563
+#: src/viewer/text/form.c:1840
 msgid "value"
 msgstr "wartość"
 
-#: src/viewer/text/form.c:1576
+#: src/viewer/text/form.c:1853
 msgid "read only"
 msgstr "tylko do odczytu"
 
-#: src/viewer/text/form.c:1587
+#: src/viewer/text/form.c:1864
 #, c-format
 msgid "press %s to navigate"
 msgstr "wciśnij %s aby nawigować"
 
-#: src/viewer/text/form.c:1589
+#: src/viewer/text/form.c:1866
 #, c-format
 msgid "press %s to edit"
 msgstr "wciśnij %s aby edytować"
 
-#: src/viewer/text/form.c:1625
+#: src/viewer/text/form.c:1902
 #, c-format
 msgid "press %s to submit to %s"
 msgstr "wciśnij %s aby wysłać do %s"
 
-#: src/viewer/text/form.c:1627
+#: src/viewer/text/form.c:1904
 #, c-format
 msgid "press %s to post to %s"
 msgstr "wciśnij %s aby wysłać do %s"
 
 #
-#: src/viewer/text/form.c:1729
+#: src/viewer/text/form.c:2006
 msgid "Useless button"
 msgstr "Bezużyteczny przycisk"
 
-#: src/viewer/text/form.c:1731
+#: src/viewer/text/form.c:2008
 msgid "Submit button"
 msgstr "Przycisk wysłania formularza"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1237
+#: src/viewer/text/link.c:1249
 msgid "Display ~usemap"
 msgstr "Pokaż ~mapę obrazków"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1242
+#: src/viewer/text/link.c:1254
 msgid "~Follow link"
 msgstr "Wybierz od~nośnik"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1244
+#: src/viewer/text/link.c:1256
 msgid "Follow link and r~eload"
 msgstr "Wybierz odnośnik i p~rzeładuj"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1248
+#: src/viewer/text/link.c:1260
 msgid "Open in new ~window"
 msgstr "Otwórz w no~wym oknie"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1250
+#: src/viewer/text/link.c:1262
 msgid "Open in new ~tab"
 msgstr "Otwórz w nowej ~karcie"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1252
+#: src/viewer/text/link.c:1264
 msgid "Open in new tab in ~background"
 msgstr "Otwórz w nowej k~arcie w tle"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1257
+#: src/viewer/text/link.c:1269
 msgid "~Download link"
 msgstr "~Pobierz"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1260
+#: src/viewer/text/link.c:1272
 msgid "~Add link to bookmarks"
 msgstr "~Dodaj zakładkę"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1264
+#: src/viewer/text/link.c:1276
 msgid "Pass link URI to e~xternal command"
 msgstr "Przekaż URI odnośnika do z~ewnętrznego polecenia"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1275 src/viewer/text/link.c:1315
+#: src/viewer/text/link.c:1287 src/viewer/text/link.c:1327
 msgid "~Reset form"
 msgstr "Wy~czyść formularz"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1290
+#: src/viewer/text/link.c:1302
 msgid "Open in ~external editor"
 msgstr "Otwórz w zewnętrznym ~edytorze"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1298
+#: src/viewer/text/link.c:1310
 msgid "~Submit form"
 msgstr "~Prześlij formularz"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1299
+#: src/viewer/text/link.c:1311
 msgid "Submit form and rel~oad"
 msgstr "Prześlij fo~rmularz i przeładuj"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1303
+#: src/viewer/text/link.c:1315
 msgid "Submit form and open in new ~window"
 msgstr "Prześlij ~formularz i otwórz w nowym oknie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1305
+#: src/viewer/text/link.c:1317
 msgid "Submit form and open in new ~tab"
 msgstr "Prześlij formularz i otwórz na nowej ~karcie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1308
+#: src/viewer/text/link.c:1320
 msgid "Submit form and open in new tab in ~background"
 msgstr "Prześlij formularz i otwórz w ~tle na nowej karcie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1313
+#: src/viewer/text/link.c:1325
 msgid "Submit form and ~download"
 msgstr "Prześlij formu~larz i ściągnij"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1320
+#: src/viewer/text/link.c:1332
 msgid "Form f~ields"
 msgstr "Pola form~ularza"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1327
+#: src/viewer/text/link.c:1339
 msgid "V~iew image"
 msgstr "Pokaż o~brazek"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1329
+#: src/viewer/text/link.c:1341
 msgid "Download ima~ge"
 msgstr "Pobierz ~obrazek"
 
-#: src/viewer/text/link.c:1338
+#: src/viewer/text/link.c:1350
 msgid "No link selected"
 msgstr "Nie wybrano żadnego odnośnika"
 
-#: src/viewer/text/link.c:1386
+#: src/viewer/text/link.c:1420
 msgid "Image"
 msgstr "Obrazek"
 
-#: src/viewer/text/link.c:1391
+#: src/viewer/text/link.c:1425
 msgid "Usemap"
 msgstr "Mapa obrazków"
 
-#: src/viewer/text/search.c:1006
+#: src/viewer/text/search.c:1078
 msgid "Search hit top, continuing at bottom."
 msgstr "Przeszukiwanie osiągnęło początek tekstu, kontynuacja od końca."
 
-#: src/viewer/text/search.c:1007
+#: src/viewer/text/search.c:1079
 msgid "Search hit bottom, continuing at top."
 msgstr "Przeszukiwanie osiągnęło koniec tekstu, kontynuacja od początku."
 
-#: src/viewer/text/search.c:1010
+#: src/viewer/text/search.c:1082
 msgid "No previous search"
 msgstr "Niczego wcześniej nie szukano"
 
-#: src/viewer/text/search.c:1022
+#: src/viewer/text/search.c:1094
 #, c-format
 msgid "Could not compile regular expression '%s'"
 msgstr "Nie mogę skompilować wyrażenia regularnego '%s'"
 
-#: src/viewer/text/search.c:1065
+#: src/viewer/text/search.c:1137
 #, c-format
 msgid "No further matches for '%s'."
 msgstr "Brak dalszych trafień dla '%s'."
 
-#: src/viewer/text/search.c:1067
+#: src/viewer/text/search.c:1139
 #, c-format
 msgid "Could not find a link with the text '%s'."
 msgstr "Nie można znaleźć odnośnika z tekstem '%s'."
 
-#: src/viewer/text/search.c:1069 src/viewer/text/search.c:1478
+#: src/viewer/text/search.c:1141 src/viewer/text/search.c:1549
 msgid "Typeahead"
 msgstr "Szukanie z wyprzedzeniem"
 
-#: src/viewer/text/search.c:1480
+#: src/viewer/text/search.c:1551
 msgid "No links in current document"
 msgstr "Brak odnośników w bieżącym dokumencie"
 
-#: src/viewer/text/search.c:1558
+#: src/viewer/text/search.c:1629
 msgid "Search for text"
 msgstr "Znajdź tekst"
 
-#: src/viewer/text/search.c:1588
+#: src/viewer/text/search.c:1659
 msgid "Normal search"
 msgstr "Zwykłe szukanie"
 
-#: src/viewer/text/search.c:1589
+#: src/viewer/text/search.c:1660
 msgid "Regexp search"
 msgstr "Szukanie z użyciem wyrażeń regularnych"
 
-#: src/viewer/text/search.c:1590
+#: src/viewer/text/search.c:1661
 msgid "Extended regexp search"
 msgstr "Szukanie z użyciem rozszerzonych wyrażeń regularnych"
 
-#: src/viewer/text/search.c:1591
+#: src/viewer/text/search.c:1662
 msgid "Case sensitive"
 msgstr "Rozróżnianie wielkości liter"
 
-#: src/viewer/text/search.c:1592
+#: src/viewer/text/search.c:1663
 msgid "Case insensitive"
 msgstr "Nierozróżnianie wielkości liter"
 
-#: src/viewer/text/search.c:1616
+#: src/viewer/text/search.c:1687
 msgid "Search backward"
 msgstr "Szukaj wstecz"
 
 #. name:
-#: src/viewer/text/search.c:1655
+#: src/viewer/text/search.c:1726
 msgid "Search History"
 msgstr "Szukanie w historii"
 
-#: src/viewer/text/textarea.c:332
+#: src/viewer/text/textarea.c:571
 msgid "You cannot launch an external editor in the anonymous mode."
 msgstr "Nie możesz uruchomić zewnętrznego edytora w trybie anonimowym."
 
-#: src/viewer/text/textarea.c:339
+#: src/viewer/text/textarea.c:578
 msgid "You can do this only on the master terminal"
 msgstr "Możesz zrobić to jedynie na głównym terminalu"
 
-#: src/viewer/text/textarea.c:388
+#: src/viewer/text/textarea.c:627
 #, c-format
 msgid ""
 "You have exceeded the textarea's size limit: your input is %d bytes, but the "
@@ -8851,6 +8854,9 @@ msgstr "B
 msgid "Viewer"
 msgstr "Przeglądarka"
 
+#~ msgid "HTTP Authentication"
+#~ msgstr "Uwierzytelnienie HTTP"
+
 #~ msgid "Rules for passing URIs to external commands."
 #~ msgstr "Zasady przekazywania URI do zewnętrznych poleceń."
 

From e101f5f53796576bbd043a0184300d12282592a9 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 12 Aug 2006 12:37:37 +0300
Subject: [PATCH 002/132] UTF-8 doc: Clarify FIXME in add_accesskey_to_string.

---
 src/config/kbdbind.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/config/kbdbind.h b/src/config/kbdbind.h
index af5164b3..92a32fb9 100644
--- a/src/config/kbdbind.h
+++ b/src/config/kbdbind.h
@@ -179,9 +179,14 @@ unsigned char *get_keymap_name(enum keymap_id);
 int parse_keystroke(unsigned char *, struct term_event_keyboard *);
 void add_keystroke_to_string(struct string *str, struct term_event_keyboard *kbd, int escape);
 
+/* void add_accesskey_to_string(struct string *str, unicode_val_T accesskey); */
 #define add_accesskey_to_string(str, accesskey) do { 		\
 	struct term_event_keyboard kbd; 			\
-	kbd.key = accesskey; /* FIXME: unicode_val_T to int */	\
+	/* FIXME: #ifndef CONFIG_UTF_8, kbd.key is encoded in	\
+	 * the charset of the terminal, so accesskey should be	\
+	 * converted from unicode_val_T to that.		\
+	 * #ifdef CONFIG_UTF_8, the code is correct.  */	\
+	kbd.key = accesskey;					\
 	kbd.modifier = 0; 					\
 	add_keystroke_to_string(str, &kbd, 0); 			\
 } while (0)

From f3b04b8645bc56ce57f7542f90ce3a970759103c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 12 Aug 2006 14:48:08 +0300
Subject: [PATCH 003/132] terminal: Introduce term_event_key_T.

---
 src/bfu/menu.c         |  2 +-
 src/config/kbdbind.c   |  4 ++--
 src/config/kbdbind.h   |  2 +-
 src/terminal/kbd.h     | 20 +++++++++++++-------
 src/viewer/text/link.c |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/bfu/menu.c b/src/bfu/menu.c
index dfd9a669..0782d97b 100644
--- a/src/bfu/menu.c
+++ b/src/bfu/menu.c
@@ -948,7 +948,7 @@ menu_kbd_handler(struct menu *menu, struct term_event *ev)
 
 		default:
 		{
-			int key = get_kbd_key(ev);
+			term_event_key_T key = get_kbd_key(ev);
 
 			if (is_kbd_fkey(key)
 			    || check_kbd_modifier(ev, KBD_MOD_ALT)) {
diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index c6a24054..f099c8f4 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -354,7 +354,7 @@ static struct key key_table[] = {
 	{ NULL, 0 }
 };
 
-long
+term_event_key_T
 read_key(unsigned char *key_str)
 {
 	struct key *key;
@@ -366,7 +366,7 @@ read_key(unsigned char *key_str)
 		if (!strcasecmp(key->str, key_str))
 			return key->num;
 
-	return -1;
+	return KBD_UNDEF;
 }
 
 int
diff --git a/src/config/kbdbind.h b/src/config/kbdbind.h
index 92a32fb9..c7a9f5ab 100644
--- a/src/config/kbdbind.h
+++ b/src/config/kbdbind.h
@@ -173,7 +173,7 @@ action_requires_form(enum keymap_id keymap_id, action_id_T action_id)
 	return action && (action->flags & ACTION_REQUIRE_FORM);
 }
 
-long read_key(unsigned char *);
+term_event_key_T read_key(unsigned char *);
 unsigned char *get_keymap_name(enum keymap_id);
 
 int parse_keystroke(unsigned char *, struct term_event_keyboard *);
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index a4ee0ca0..4bb25fc0 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -3,13 +3,15 @@
 
 struct itrm;
 
+/* Values <= -0x100 are special; e.g. KBD_ENTER.
+ * Values between -0xFF and -2 are not used yet; treat as special.
+ * Value  == -1 is KBD_UNDEF; not sent via socket. 
+ * Values >= 0 are characters received from the terminal;
+ * in UCS-4 #ifdef CONFIG_UTF_8. */
+typedef int term_event_key_T;
+
 struct term_event_keyboard {
-	/* Values <= -0x100 are special; e.g. KBD_ENTER.
-	 * Values between -0xFF and -2 are not used yet; treat as special.
-	 * Value  == -1 is KBD_UNDEF; not sent via socket. 
-	 * Values >= 0 are characters received from the terminal;
-	 * in UCS-4 #ifdef CONFIG_UTF_8. */
-	int key;
+	term_event_key_T key;
 	int modifier;
 };
 
@@ -22,6 +24,8 @@ struct interlink_event_keyboard {
 	int modifier;
 };
 
+/* Values for term_event_key_T */
+
 #define KBD_UNDEF	-1
 
 #define KBD_ENTER	(-0x100)
@@ -51,12 +55,14 @@ struct interlink_event_keyboard {
 #define KBD_F10		(-0x129)
 #define KBD_F11		(-0x12a)
 #define KBD_F12		(-0x12b)
-static inline int is_kbd_fkey(int key) { return key <= KBD_F1 && key >= KBD_F12; }
+static inline int is_kbd_fkey(term_event_key_T key) { return key <= KBD_F1 && key >= KBD_F12; }
 #define number_to_kbd_fkey(num) (KBD_F1 - (num) + 1)
 #define kbd_fkey_to_number(key) (KBD_F1 - (key) + 1)
 
 #define KBD_CTRL_C	(-0x200)
 
+/* Values for term_event_keyboard.modifier and
+ * interlink_event_keyboard.modifier */
 #define KBD_MOD_NONE	0
 #define KBD_MOD_SHIFT	1
 #define KBD_MOD_CTRL	2
diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 1c9d7a88..41ee3480 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -1178,7 +1178,7 @@ enum frame_event_status
 try_document_key(struct session *ses, struct document_view *doc_view,
 		 struct term_event *ev)
 {
-	long key;
+	term_event_key_T key;
 	int passed = -1;
 	int i; /* GOD I HATE C! --FF */ /* YEAH, BRAINFUCK RULEZ! --pasky */
 

From 8be5ed974922adb1a4696f37da6ac823ecd5509b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 12 Aug 2006 14:53:28 +0300
Subject: [PATCH 004/132] add_accesskey_to_string: Use KBD_MOD_NONE, rather
 than plain 0.

---
 src/config/kbdbind.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/kbdbind.h b/src/config/kbdbind.h
index c7a9f5ab..d4bea25c 100644
--- a/src/config/kbdbind.h
+++ b/src/config/kbdbind.h
@@ -187,7 +187,7 @@ void add_keystroke_to_string(struct string *str, struct term_event_keyboard *kbd
 	 * converted from unicode_val_T to that.		\
 	 * #ifdef CONFIG_UTF_8, the code is correct.  */	\
 	kbd.key = accesskey;					\
-	kbd.modifier = 0; 					\
+	kbd.modifier = KBD_MOD_NONE;				\
 	add_keystroke_to_string(str, &kbd, 0); 			\
 } while (0)
 

From 2648fd57e4b4cd261ed516d237c7a8f48cbb80c3 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 12 Aug 2006 15:00:44 +0300
Subject: [PATCH 005/132] UTF-8 doc: Clarify FIXME in try_document_key.

---
 src/viewer/text/link.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 41ee3480..8042f5e0 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -1197,7 +1197,13 @@ try_document_key(struct session *ses, struct document_view *doc_view,
 	for (i = 0; i < doc_view->document->nlinks; i++) {
 		struct link *link = &doc_view->document->links[i];
 
-		if (key == link->accesskey) {	/* FIXME: key vs unicode ... */
+		/* FIXME: charset mismatch.  @link->accesskey is always
+		 * unicode_val_T; if CONFIG_UTF_8 is not defined, @key
+		 * can be a byte from the charset of the terminal, in
+		 * which case one of them should be converted for
+		 * comparison.  When implementing this, note that @key
+		 * can also be a special key.  */
+		if (key == link->accesskey) {
 			if (passed != i && i <= doc_view->vs->current_link) {
 				/* This is here in order to rotate between
 				 * links with same accesskey. */

From f97a392c0128cd68afa739eba0a5c4e58c05c9b3 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 12 Aug 2006 15:07:07 +0300
Subject: [PATCH 006/132] try_mark_key: Reject non-ASCII keys as mark
 characters.

The previous version used only the low 8 bits of the key code.
This one arranges for the whole key to be rejected if it's not ASCII.
Perhaps the modifiers should be checked too, but I'm not changing that now.
---
 src/viewer/text/view.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c
index 6ab45a4e..14a28783 100644
--- a/src/viewer/text/view.c
+++ b/src/viewer/text/view.c
@@ -637,7 +637,19 @@ enum frame_event_status
 try_mark_key(struct session *ses, struct document_view *doc_view,
 	     struct term_event *ev)
 {
-	unsigned char mark = get_kbd_key(ev);
+	unsigned char mark;
+
+	/* set_mark and goto_mark allow only a subset of the ASCII
+	 * character repertoire as mark characters.  If get_kbd_key(ev)
+	 * is something else (i.e. a special key or a non-ASCII
+	 * character), map it to an ASCII character that the functions
+	 * will not accept, so the results are consistent.
+	 * When CONFIG_UTF_8 is not defined, this assumes that codes
+	 * 0 to 0x7F in all codepages match ASCII.  */
+	if (get_kbd_key(ev) >= 0 && get_kbd_key(ev) <= 0x7F)
+		mark = get_kbd_key(ev);
+	else
+		mark = 0;
 
 	switch (ses->kbdprefix.mark) {
 		case KP_MARK_NOTHING:

From a14074a763969a74f617b9c938cf7024e44e88d9 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 12 Aug 2006 16:04:21 +0300
Subject: [PATCH 007/132] try_document_key: Convert the key to UCS-4, resolving
 the FIXME.

This requires compiling cp2u() in even without CONFIG_UTF_8.
I also added an is_kbd_character macro to make try_document_key
more resilient to changes in the definition of term_event_key_T.
---
 src/intl/charsets.c    |  2 --
 src/intl/charsets.h    |  2 +-
 src/terminal/kbd.h     |  6 ++++++
 src/viewer/text/link.c | 28 +++++++++++++++++-----------
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index dc8d25e0..867bfdc9 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -495,7 +495,6 @@ cp2u_shared(const struct codepage_desc *from, unsigned char c)
 	return UCS_NO_CHAR;
 }
 
-#ifdef CONFIG_UTF_8
 /* Slow algorithm, used for converting input from the terminal.  */
 unicode_val_T
 cp2u(int from, unsigned char c)
@@ -510,7 +509,6 @@ cp2u(int from, unsigned char c)
 	if (c < 0x80) return c;
 	else return cp2u_shared(&codepages[from], c);
 }
-#endif	/* CONFIG_UTF_8 */
 
 /* This slow and ugly code is used by the terminal utf_8_io */
 unsigned char *
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index ae8fe97f..16bc8664 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -65,9 +65,9 @@ inline int unicode_to_cell(unicode_val_T);
 unicode_val_T unicode_fold_label_case(unicode_val_T);
 inline int strlen_utf8(unsigned char **);
 inline unicode_val_T utf_8_to_unicode(unsigned char **, unsigned char *);
-unicode_val_T cp2u(int, unsigned char);
 #endif /* CONFIG_UTF_8 */
 
+unicode_val_T cp2u(int, unsigned char);
 unsigned char *cp2utf_8(int, int);
 
 unsigned char *u2cp_(unicode_val_T, int, int no_nbsp_hack);
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index 4bb25fc0..a4aeb153 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -61,6 +61,12 @@ static inline int is_kbd_fkey(term_event_key_T key) { return key <= KBD_F1 && ke
 
 #define KBD_CTRL_C	(-0x200)
 
+/* int is_kbd_character(term_event_key_T key);
+ * Return true if @key is a character in some charset, rather than a
+ * special key.  The character is not necessarily printable.  As for
+ * which charset it is in, see the definition of term_event_key_T.  */
+#define is_kbd_character(key) ((key) >= 0)
+
 /* Values for term_event_keyboard.modifier and
  * interlink_event_keyboard.modifier */
 #define KBD_MOD_NONE	0
diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 8042f5e0..99163fa1 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -1178,31 +1178,37 @@ enum frame_event_status
 try_document_key(struct session *ses, struct document_view *doc_view,
 		 struct term_event *ev)
 {
-	term_event_key_T key;
+	unicode_val_T key;
 	int passed = -1;
 	int i; /* GOD I HATE C! --FF */ /* YEAH, BRAINFUCK RULEZ! --pasky */
 
 	assert(ses && doc_view && doc_view->document && doc_view->vs && ev);
 	if_assert_failed return FRAME_EVENT_IGNORED;
 
-	if (!check_kbd_modifier(ev, KBD_MOD_ALT)) {
-		/* We accept those only in alt-combo. */
+	if (!check_kbd_modifier(ev, KBD_MOD_ALT)
+	    || !is_kbd_character(get_kbd_key(ev))) {
+		/* We accept only alt-character combos. */
 		return FRAME_EVENT_IGNORED;
 	}
 
+	/* The key is a character.  Convert it to Unicode so that it
+	 * can be compared with link.accesskey.  */
+#ifdef CONFIG_UTF_8
+	key = get_kbd_key(ev);
+#else  /* !CONFIG_UTF_8 */
+	key = cp2u(get_opt_codepage_tree(ses->tab->term->spec,
+					 "charset"),
+		   get_kbd_key(ev));
+#endif /* !CONFIG_UTF_8 */
+	/* If @key now is 0 (which is used in link.accesskey if there
+	 * is no access key) or UCS_REPLACEMENT_CHARACTER, then the
+	 * results may be a little odd, but not really harmful.  */
+
 	/* Run through all the links and see if one of them is bound to the
 	 * key we test.. */
-	key = get_kbd_key(ev);
-
 	for (i = 0; i < doc_view->document->nlinks; i++) {
 		struct link *link = &doc_view->document->links[i];
 
-		/* FIXME: charset mismatch.  @link->accesskey is always
-		 * unicode_val_T; if CONFIG_UTF_8 is not defined, @key
-		 * can be a byte from the charset of the terminal, in
-		 * which case one of them should be converted for
-		 * comparison.  When implementing this, note that @key
-		 * can also be a special key.  */
 		if (key == link->accesskey) {
 			if (passed != i && i <= doc_view->vs->current_link) {
 				/* This is here in order to rotate between

From 19315e136e6e54de11c4d25f2a30ab02dbedc402 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 12 Aug 2006 18:43:31 +0200
Subject: [PATCH 008/132] Ecmascript: the code adjusted for SEE-2.0

---
 src/ecmascript/see/document.c  |   3 +-
 src/ecmascript/see/form.c      |  12 +-
 src/ecmascript/see/location.c  |   6 +-
 src/ecmascript/see/navigator.c |   3 +-
 src/ecmascript/see/strings.c   | 354 ++++++++-------------------------
 src/ecmascript/see/unibar.c    |   6 +-
 src/ecmascript/see/window.c    |   3 +-
 7 files changed, 93 insertions(+), 294 deletions(-)

diff --git a/src/ecmascript/see/document.c b/src/ecmascript/see/document.c
index 523914e1..959d8d31 100644
--- a/src/ecmascript/see/document.c
+++ b/src/ecmascript/see/document.c
@@ -56,7 +56,7 @@ static void js_document_writeln(struct SEE_interpreter *, struct SEE_object *, s
 void location_goto(struct document_view *, unsigned char *);
 
 struct SEE_objectclass js_document_object_class = {
-	NULL,
+	"document",
 	document_get,
 	document_put,
 	document_canput,
@@ -288,7 +288,6 @@ init_js_document_object(struct ecmascript_interpreter *interpreter)
 		struct js_document_object);
 
 	doc->object.objectclass = &js_document_object_class;
-	doc->object.objectclass->Class = s_document;
 	doc->object.Prototype = NULL;
 
 	SEE_SET_OBJECT(&v, (struct SEE_object *)doc);
diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index 27c0e9a8..8f8404b4 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -77,7 +77,7 @@ static void js_form_submit(struct SEE_interpreter *, struct SEE_object *, struct
 
 
 struct SEE_objectclass js_input_object_class = {
-	NULL,
+	"input",
 	input_get,
 	input_put,
 	input_canput,
@@ -91,7 +91,7 @@ struct SEE_objectclass js_input_object_class = {
 };
 
 struct SEE_objectclass js_form_elems_class = {
-	NULL,
+	"elements",
 	form_elems_get,
 	SEE_no_put,
 	SEE_no_canput,
@@ -105,7 +105,7 @@ struct SEE_objectclass js_form_elems_class = {
 };
 
 struct SEE_objectclass js_forms_object_class = {
-	NULL,
+	"forms",
 	forms_get,
 	SEE_no_put,
 	SEE_no_canput,
@@ -119,7 +119,7 @@ struct SEE_objectclass js_forms_object_class = {
 };
 
 struct SEE_objectclass js_form_class = {
-	NULL,
+	"form",
 	form_get,
 	form_put,
 	form_canput,
@@ -464,7 +464,6 @@ js_get_input_object(struct SEE_interpreter *interp, struct js_form *jsform,
 	jsinput = SEE_NEW(interp, struct js_input);
 
 	jsinput->object.objectclass = &js_input_object_class;
-	jsinput->object.objectclass->Class = s_input;
 	jsinput->object.Prototype = NULL;
 
 	jsinput->blur = SEE_cfunction_make(interp, js_input_blur, s_blur, 0);
@@ -822,7 +821,6 @@ form_get(struct SEE_interpreter *interp, struct SEE_object *o,
 		struct js_form_elems *jsfe = SEE_NEW(interp, struct js_form_elems);
 
 		jsfe->object.objectclass = &js_form_elems_class;
-		jsfe->object.objectclass->Class = s_elements;
 		jsfe->object.Prototype = NULL;
 		jsfe->parent = js_form;
 		jsfe->item = SEE_cfunction_make(interp, js_form_elems_item, s_item, 1);
@@ -971,7 +969,6 @@ struct js_form *js_get_form_object(struct SEE_interpreter *interp,
 	 * should be its parent, but gimme DOM first. --pasky */
 	js_form = SEE_NEW(interp, struct js_form);
 	js_form->object.objectclass = &js_form_class;
-	js_form->object.objectclass->Class = s_form;
 	js_form->object.Prototype = NULL; /* TODO: use prototype for form */
 	js_form->parent = doc;
 	js_form->reset = SEE_cfunction_make(interp, js_form_reset, s_reset, 0);
@@ -992,7 +989,6 @@ init_js_forms_object(struct ecmascript_interpreter *interpreter)
 	 struct js_forms_object);
 
 	forms->object.objectclass = &js_forms_object_class;
-	forms->object.objectclass->Class = s_forms;
 	forms->object.Prototype = NULL;
 
 	SEE_OBJECT_GET(interp, interp->Global, s_document, &document);
diff --git a/src/ecmascript/see/location.c b/src/ecmascript/see/location.c
index a187bebb..31274b7d 100644
--- a/src/ecmascript/see/location.c
+++ b/src/ecmascript/see/location.c
@@ -80,7 +80,7 @@ struct delayed_goto {
 };
 
 struct SEE_objectclass js_history_object_class = {
-	NULL,
+	"history",
 	history_get,
 	SEE_no_put,
 	SEE_no_canput,
@@ -94,7 +94,7 @@ struct SEE_objectclass js_history_object_class = {
 };
 
 struct SEE_objectclass js_location_object_class = {
-	NULL,
+	"location",
 	location_get,
 	location_put,
 	location_canput,
@@ -332,7 +332,6 @@ init_js_history_object(struct ecmascript_interpreter *interpreter)
 	 struct js_history_object);
 
 	history->object.objectclass = &js_history_object_class;
-	history->object.objectclass->Class = s_history;
 	history->object.Prototype = NULL;
 
 	SEE_SET_OBJECT(&v, (struct SEE_object *)history);
@@ -353,7 +352,6 @@ init_js_location_object(struct ecmascript_interpreter *interpreter)
 		struct js_location_object);
 
 	loc->object.objectclass = &js_location_object_class;
-	loc->object.objectclass->Class = s_location;
 	loc->object.Prototype = NULL;
 
 	SEE_SET_OBJECT(&v, (struct SEE_object *)loc);
diff --git a/src/ecmascript/see/navigator.c b/src/ecmascript/see/navigator.c
index 52b600e9..5b7d8997 100644
--- a/src/ecmascript/see/navigator.c
+++ b/src/ecmascript/see/navigator.c
@@ -50,7 +50,7 @@ static void navigator_get(struct SEE_interpreter *, struct SEE_object *, struct
 static int navigator_hasproperty(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *);
 
 struct SEE_objectclass js_navigator_object_class = {
-	NULL,
+	"navigator",
 	navigator_get,
 	SEE_no_put,
 	SEE_no_canput,
@@ -142,7 +142,6 @@ init_js_navigator_object(struct ecmascript_interpreter *interpreter)
 	navigator = SEE_NEW(interp, struct SEE_object);
 
 	navigator->objectclass = &js_navigator_object_class;
-	navigator->objectclass->Class = s_navigator;
 	navigator->Prototype = NULL;
 
 	SEE_SET_OBJECT(&v, navigator);
diff --git a/src/ecmascript/see/strings.c b/src/ecmascript/see/strings.c
index 42364925..c2b39138 100644
--- a/src/ecmascript/see/strings.c
+++ b/src/ecmascript/see/strings.c
@@ -1,4 +1,5 @@
 #include <see/see.h>
+#include "ecmascript/see/strings.h"
 
 struct SEE_string *s_window;
 struct SEE_string *s_closed;
@@ -95,293 +96,102 @@ struct SEE_string *s_hidden;
 
 struct SEE_string *s_timeout;
 
+
 void
 init_intern_strings(void)
 {
-	static SEE_char_t SA_window[] =    {'w','i','n','d','o','w'};
-	static struct SEE_string S_window = SEE_STRING_DECL(SA_window);
-	static SEE_char_t SA_closed[] =  {'c','l','o','s','e','d'};
-	static struct SEE_string S_closed = SEE_STRING_DECL(SA_closed);
-	static SEE_char_t SA_parent[] =  {'p','a','r','e','n','t'};
-	static struct SEE_string S_parent = SEE_STRING_DECL(SA_parent);
-	static SEE_char_t SA_self[] =  {'s','e','l','f'};
-	static struct SEE_string S_self = SEE_STRING_DECL(SA_self);
-	static SEE_char_t SA_top[] =  {'t','o','p'};
-	static struct SEE_string S_top = SEE_STRING_DECL(SA_top);
-	static SEE_char_t SA_alert[] ={'a','l','e','r','t'};
-	static struct SEE_string S_alert = SEE_STRING_DECL(SA_alert);
-	static SEE_char_t SA_open[] ={'o','p','e','n'};
-	static struct SEE_string S_open = SEE_STRING_DECL(SA_open);
+	s_window = SEE_intern_global("window");
+	s_closed = SEE_intern_global("closed");
+	s_parent = SEE_intern_global("parent");
+	s_self = SEE_intern_global("self");
+	s_top = SEE_intern_global("top");
+	s_alert = SEE_intern_global("alert");
+	s_open = SEE_intern_global("open");
 
-	static SEE_char_t SA_menubar[] =  {'m','e','n','u','b','a','r'};
-	static struct SEE_string S_menubar = SEE_STRING_DECL(SA_menubar);
+	s_menubar = SEE_intern_global("menubar");
 
-	static SEE_char_t SA_statusbar[] =  {'s','t','a','t','u','s','b','a','r'};
-	static struct SEE_string S_statusbar = SEE_STRING_DECL(SA_statusbar);
-	static SEE_char_t SA_visible[] =  {'v','i','s','i','b','l','e'};
-	static struct SEE_string S_visible = SEE_STRING_DECL(SA_visible);
+	s_statusbar = SEE_intern_global("statusbar");
+	s_visible = SEE_intern_global("visible");
 
-	static SEE_char_t SA_navigator[] ={'n','a','v','i','g','a','t','o','r'};
-	static struct SEE_string S_navigator = SEE_STRING_DECL(SA_navigator);
-	static SEE_char_t SA_appCodeName[] ={'a','p','p','C','o','d','e','N','a','m','e'};
-	static struct SEE_string S_appCodeName = SEE_STRING_DECL(SA_appCodeName);
-	static SEE_char_t SA_appName[] ={'a','p','p','N','a','m','e'};
-	static struct SEE_string S_appName = SEE_STRING_DECL(SA_appName);
-	static SEE_char_t SA_appVersion[] ={'a','p','p','V','e','r','s','i','o','n'};
-	static struct SEE_string S_appVersion = SEE_STRING_DECL(SA_appVersion);
-	static SEE_char_t SA_language[] ={'l','a','n','g','u','a','g','e'};
-	static struct SEE_string S_language = SEE_STRING_DECL(SA_language);
-	static SEE_char_t SA_platform[] ={'p','l','a','t','f','o','r','m'};
-	static struct SEE_string S_platform = SEE_STRING_DECL(SA_platform);
-	static SEE_char_t SA_userAgent[] ={'u','s','e','r','A','g','e','n','t'};
-	static struct SEE_string S_userAgent = SEE_STRING_DECL(SA_userAgent);
+	s_navigator = SEE_intern_global("navigator");
+	s_appCodeName = SEE_intern_global("appCodeName");
+	s_appName = SEE_intern_global("appName");
+	s_appVersion = SEE_intern_global("appVersion");
+	s_language = SEE_intern_global("language");
+	s_platform = SEE_intern_global("platform");
+	s_userAgent = SEE_intern_global("userAgent");
 
-	static SEE_char_t SA_history[] ={'h','i','s','t','o','r','y'};
-	static struct SEE_string S_history = SEE_STRING_DECL(SA_history);
-	static SEE_char_t SA_back[] ={'b','a','c','k'};
-	static struct SEE_string S_back = SEE_STRING_DECL(SA_back);
-	static SEE_char_t SA_forward[] ={'f','o','r','w','a','r','d'};
-	static struct SEE_string S_forward = SEE_STRING_DECL(SA_forward);
-	static SEE_char_t SA_go[] ={'g','o'};
-	static struct SEE_string S_go = SEE_STRING_DECL(SA_go);
+	s_history = SEE_intern_global("history");
+	s_back = SEE_intern_global("back");
+	s_forward = SEE_intern_global("forward");
+	s_go = SEE_intern_global("go");
 
-	static SEE_char_t SA_location[] ={'l','o','c','a','t','i','o','n'};
-	static struct SEE_string S_location = SEE_STRING_DECL(SA_location);
-	static SEE_char_t SA_href[] ={'h','r','e','f'};
-	static struct SEE_string S_href = SEE_STRING_DECL(SA_href);
-	static SEE_char_t SA_toString[] ={'t','o','S','t','r','i','n','g'};
-	static struct SEE_string S_toString = SEE_STRING_DECL(SA_toString);
-	static SEE_char_t SA_toLocaleString[] ={'t','o','L','o','c','a','l','e','S','t','r','i','n','g'};
-	static struct SEE_string S_toLocaleString = SEE_STRING_DECL(SA_toLocaleString);
+	s_location = SEE_intern_global("location");
+	s_href = SEE_intern_global("href");
+	s_toString = SEE_intern_global("toString");
+	s_toLocaleString = SEE_intern_global("toLocaleString");
 
-	static SEE_char_t SA_input[] ={'i','n','p','u','t'};
-	static struct SEE_string S_input = SEE_STRING_DECL(SA_input);
-	static SEE_char_t SA_accessKey[] ={'a','c','c','e','s','s','K','e','y'};
-	static struct SEE_string S_accessKey = SEE_STRING_DECL(SA_accessKey);
-	static SEE_char_t SA_alt[] ={'a','l','t'};
-	static struct SEE_string S_alt = SEE_STRING_DECL(SA_alt);
-	static SEE_char_t SA_checked[] ={'c','h','e','c','k','e','d'};
-	static struct SEE_string S_checked = SEE_STRING_DECL(SA_checked);
-	static SEE_char_t SA_defaultChecked[] ={'d','e','f','a','u','l','t','C','h','e','c','k','e','d'};
-	static struct SEE_string S_defaultChecked = SEE_STRING_DECL(SA_defaultChecked);
-	static SEE_char_t SA_defaultValue[] ={'d','e','f','a','u','l','t','V','a','l','u','e'};
-	static struct SEE_string S_defaultValue = SEE_STRING_DECL(SA_defaultValue);
-	static SEE_char_t SA_disabled[] ={'d','i','s','a','b','l','e','d'};
-	static struct SEE_string S_disabled = SEE_STRING_DECL(SA_disabled);
-	static SEE_char_t SA_form[] ={'f','o','r','m'};
-	static struct SEE_string S_form = SEE_STRING_DECL(SA_form);
-	static SEE_char_t SA_maxLength[] ={'m','a','x','L','e','n','g','t','h'};
-	static struct SEE_string S_maxLength = SEE_STRING_DECL(SA_maxLength);
-	static SEE_char_t SA_name[] ={'n','a','m','e'};
-	static struct SEE_string S_name = SEE_STRING_DECL(SA_name);
-	static SEE_char_t SA_readonly[] ={'r','e','a','d','o','n','l','y'};
-	static struct SEE_string S_readonly = SEE_STRING_DECL(SA_readonly);
-	static SEE_char_t SA_size[] ={'s','i','z','e'};
-	static struct SEE_string S_size = SEE_STRING_DECL(SA_size);
-	static SEE_char_t SA_src[] ={'s','r','c'};
-	static struct SEE_string S_src = SEE_STRING_DECL(SA_src);
-	static SEE_char_t SA_tabindex[] ={'t','a','b','i','n','d','e','x'};
-	static struct SEE_string S_tabindex = SEE_STRING_DECL(SA_tabindex);
-	static SEE_char_t SA_type[] ={'t','y','p','e'};
-	static struct SEE_string S_type = SEE_STRING_DECL(SA_type);
-	static SEE_char_t SA_value[] ={'v','a','l','u','e'};
-	static struct SEE_string S_value = SEE_STRING_DECL(SA_value);
-	static SEE_char_t SA_blur[] ={'b','l','u','r'};
-	static struct SEE_string S_blur = SEE_STRING_DECL(SA_blur);
-	static SEE_char_t SA_click[] ={'c','l','i','c','k'};
-	static struct SEE_string S_click = SEE_STRING_DECL(SA_click);
-	static SEE_char_t SA_focus[] ={'f','o','c','u','s'};
-	static struct SEE_string S_focus = SEE_STRING_DECL(SA_focus);
-	static SEE_char_t SA_select[] ={'s','e','l','e','c','t'};
-	static struct SEE_string S_select = SEE_STRING_DECL(SA_select);
-	static SEE_char_t SA_selectedIndex[] ={'s','e','l','e','c','t','e','d','I','n','d','e','x'};
-	static struct SEE_string S_selectedIndex = SEE_STRING_DECL(SA_selectedIndex);
+	s_input = SEE_intern_global("input");
+	s_accessKey = SEE_intern_global("accessKey");
+	s_alt = SEE_intern_global("alt");
+	s_checked = SEE_intern_global("checked");
+	s_defaultChecked = SEE_intern_global("defaultChecked");
+	s_defaultValue = SEE_intern_global("defaultValue");
+	s_disabled = SEE_intern_global("disabled");
+	s_form = SEE_intern_global("form");
+	s_maxLength = SEE_intern_global("maxLength");
+	s_name = SEE_intern_global("name");
+	s_readonly = SEE_intern_global("readonly");
+	s_size = SEE_intern_global("size");
+	s_src = SEE_intern_global("src");
+	s_tabindex = SEE_intern_global("tabindex");
+	s_type = SEE_intern_global("type");
+	s_value = SEE_intern_global("value");
+	s_blur = SEE_intern_global("blur");
+	s_click = SEE_intern_global("click");
+	s_focus = SEE_intern_global("focus");
+	s_select = SEE_intern_global("select");
+	s_selectedIndex = SEE_intern_global("selectedIndex");
 
-	static SEE_char_t SA_elements[] ={'e','l','e','m','e','n','t','s'};
-	static struct SEE_string S_elements = SEE_STRING_DECL(SA_elements);
-	static SEE_char_t SA_item[] ={'i','t','e','m'};
-	static struct SEE_string S_item = SEE_STRING_DECL(SA_item);
-	static SEE_char_t SA_namedItem[] ={'n','a','m','e','d','I','t','e','m'};
-	static struct SEE_string S_namedItem = SEE_STRING_DECL(SA_namedItem);
-	static SEE_char_t SA_length[] ={'l','e','n','g','t','h'};
-	static struct SEE_string S_length = SEE_STRING_DECL(SA_length);
+	s_elements = SEE_intern_global("elements");
+	s_item = SEE_intern_global("item");
+	s_namedItem = SEE_intern_global("namedItem");
+	s_length = SEE_intern_global("length");
 
-	static SEE_char_t SA_action[] ={'a','c','t','i','o','n'};
-	static struct SEE_string S_action = SEE_STRING_DECL(SA_action);
-	static SEE_char_t SA_encoding[] ={'e','n','c','o','d','i','g'};
-	static struct SEE_string S_encoding = SEE_STRING_DECL(SA_encoding);
-	static SEE_char_t SA_method[] ={'m','e','t','h','o','d'};
-	static struct SEE_string S_method = SEE_STRING_DECL(SA_method);
-	static SEE_char_t SA_target[] ={'t','a','r','g','e','t'};
-	static struct SEE_string S_target = SEE_STRING_DECL(SA_target);
-	static SEE_char_t SA_reset[] ={'r','e','s','e','t'};
-	static struct SEE_string S_reset = SEE_STRING_DECL(SA_reset);
-	static SEE_char_t SA_submit[] ={'s','u','b','m','i','t'};
-	static struct SEE_string S_submit = SEE_STRING_DECL(SA_submit);
+	s_action = SEE_intern_global("action");
+	s_encoding = SEE_intern_global("encoding");
+	s_method = SEE_intern_global("method");
+	s_target = SEE_intern_global("target");
+	s_reset = SEE_intern_global("reset");
+	s_submit = SEE_intern_global("submit");
 
-	static SEE_char_t SA_forms[] ={'f','o','r','m','s'};
-	static struct SEE_string S_forms = SEE_STRING_DECL(SA_forms);
+	s_forms = SEE_intern_global("forms");
 
-	static SEE_char_t SA_document[] = {'d','o','c','u','m','e','n','t'};
-	static struct SEE_string S_document = SEE_STRING_DECL(SA_document);
-	static SEE_char_t SA_referrer[] ={'r','e','f','e','r','r','e','r'};
-	static struct SEE_string S_referrer = SEE_STRING_DECL(SA_referrer);
-	static SEE_char_t SA_title[] ={'t','i','t','l','e'};
-	static struct SEE_string S_title = SEE_STRING_DECL(SA_title);
-	static SEE_char_t SA_url[] ={'u','r','l'};
-	static struct SEE_string S_url = SEE_STRING_DECL(SA_url);
-	static SEE_char_t SA_write[] = {'w','r','i','t','e'};
-	static struct SEE_string S_write = SEE_STRING_DECL(SA_write);
-	static SEE_char_t SA_writeln[] = {'w','r','i','t','e','l','n'};
-	static struct SEE_string S_writeln = SEE_STRING_DECL(SA_writeln);
+	s_document = SEE_intern_global("document");
+	s_referrer = SEE_intern_global("referrer");
+	s_title = SEE_intern_global("title");
+	s_url = SEE_intern_global("url");
+	s_write = SEE_intern_global("write");
+	s_writeln = SEE_intern_global("writeln");
 
-	static SEE_char_t SA_Mozilla[] = {'M','o','z','i','l','l','a'};
-	static struct SEE_string S_Mozilla = SEE_STRING_DECL(SA_Mozilla);
-	static SEE_char_t SA_ELinks_[] = {'E','L','i','n','k','s',' ','(',
-	 'r','o','u','g','h','l','y',' ','c','o','m','p','a','t','i','b','l','e',
-	 ' ','w','i','t','h',' ','N','e','t','s','c','a','p','e',' ',
-	 'N','a','v','i','g','a','t','o','r',',',' ','M','o','z','i','l','l','a',
-	 ' ','a','n','d',' ','M','i','c','r','o','s','o','f','t',' ',
-	 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',')'};
-	static struct SEE_string S_ELinks_ = SEE_STRING_DECL(SA_ELinks_);
+	s_Mozilla = SEE_intern_global("Mozilla");
+	s_ELinks_ = SEE_intern_global("ELinks (roughly compatible with Netscape Navigator Mozilla and Microsoft Internet Explorer)");
+	s_cookie = SEE_intern_global("cookie");
 
-	static SEE_char_t SA_cookie[] = {'c','o','o','k','i','e'};
-	static struct SEE_string S_cookie = SEE_STRING_DECL(SA_cookie);
+	s_GET = SEE_intern_global("GET");
+	s_POST = SEE_intern_global("POST");
+	s_application_ = SEE_intern_global("application/x-www-form-urlencoded");
+	s_multipart_ = SEE_intern_global("multipart/form-data");
+	s_textplain = SEE_intern_global("text/plain");
 
-	static SEE_char_t SA_GET[] = {'G','E','T'};
-	static struct SEE_string S_GET = SEE_STRING_DECL(SA_GET);
-	static SEE_char_t SA_POST[] = {'P','O','S','T'};
-	static struct SEE_string S_POST = SEE_STRING_DECL(SA_POST);
+	s_text = SEE_intern_global("text");
+	s_password = SEE_intern_global("password");
+	s_file = SEE_intern_global("file");
+	s_checkbox = SEE_intern_global("checkbox");
+	s_radio = SEE_intern_global("radio");
+	s_image = SEE_intern_global("image");
+	s_button = SEE_intern_global("button");
+	s_hidden = SEE_intern_global("hidden");
 
-	static SEE_char_t SA_application_[] = {'a','p','p','l','i','c','a','t',
-	'i','o','n','/','x','-','w','w','w','-','f','o','r','m','-','u','r','l',
-	'e','n','c','o','d','e','d'};
-	static struct SEE_string S_application_ = SEE_STRING_DECL(SA_application_);
-	static SEE_char_t SA_multipart_[] = {'m','u','l','t','i','p','a','r','t','/',
-	'f','o','r','m','-','d','a','t','a'};
-	static struct SEE_string S_multipart_ = SEE_STRING_DECL(SA_multipart_);
-	static SEE_char_t SA_textplain[] = {'t','e','x','t','/','p','l','a','i','n'};
-	static struct SEE_string S_textplain = SEE_STRING_DECL(SA_textplain);
-
-	static SEE_char_t SA_text[] = {'t','e','x','t'};
-	static struct SEE_string S_text = SEE_STRING_DECL(SA_text);
-
-	static SEE_char_t SA_password[] = {'p','a','s','s','w','o','r','d'};
-	static struct SEE_string S_password = SEE_STRING_DECL(SA_password);
-
-	static SEE_char_t SA_file[] = {'f','i','l','e'};
-	static struct SEE_string S_file = SEE_STRING_DECL(SA_file);
-
-	static SEE_char_t SA_checkbox[] = {'c','h','e','c','k','b','o','x'};
-	static struct SEE_string S_checkbox = SEE_STRING_DECL(SA_checkbox);
-
-	static SEE_char_t SA_radio[] = {'r','a','d','i','o'};
-	static struct SEE_string S_radio = SEE_STRING_DECL(SA_radio);
-
-	static SEE_char_t SA_image[] = {'i','m','a','g','e'};
-	static struct SEE_string S_image = SEE_STRING_DECL(SA_image);
-
-	static SEE_char_t SA_button[] = {'b','u','t','t','o','n'};
-	static struct SEE_string S_button = SEE_STRING_DECL(SA_button);
-
-	static SEE_char_t SA_hidden[] = {'h','i','d','d','e','n'};
-	static struct SEE_string S_hidden = SEE_STRING_DECL(SA_hidden);
-
-	static SEE_char_t SA_timeout[] = {'t','i','m','e','o','u','t'};
-	static struct SEE_string S_timeout = SEE_STRING_DECL(SA_timeout);
-
-	SEE_intern_global(s_window = &S_window);
-	SEE_intern_global(s_closed = &S_closed);
-	SEE_intern_global(s_parent = &S_parent);
-	SEE_intern_global(s_self = &S_self);
-	SEE_intern_global(s_top = &S_top);
-	SEE_intern_global(s_alert = &S_alert);
-	SEE_intern_global(s_open = &S_open);
-
-	SEE_intern_global(s_menubar = &S_menubar);
-	SEE_intern_global(s_statusbar = &S_statusbar);
-	SEE_intern_global(s_visible = &S_visible);
-
-	SEE_intern_global(s_navigator = &S_navigator);
-	SEE_intern_global(s_appCodeName = &S_appCodeName);
-	SEE_intern_global(s_appName = &S_appName);
-	SEE_intern_global(s_appVersion = &S_appVersion);
-	SEE_intern_global(s_language = &S_language);
-	SEE_intern_global(s_platform = &S_platform);
-	SEE_intern_global(s_userAgent = &S_userAgent);
-
-	SEE_intern_global(s_history = &S_history);
-	SEE_intern_global(s_back = &S_back);
-	SEE_intern_global(s_forward = &S_forward);
-	SEE_intern_global(s_go = &S_go);
-
-	SEE_intern_global(s_location = &S_location);
-	SEE_intern_global(s_href = &S_href);
-	SEE_intern_global(s_toString = &S_toString);
-	SEE_intern_global(s_toLocaleString = &S_toLocaleString);
-
-	SEE_intern_global(s_input = &S_input);
-	SEE_intern_global(s_accessKey = &S_accessKey);
-	SEE_intern_global(s_alt = &S_alt);
-	SEE_intern_global(s_checked = &S_checked);
-	SEE_intern_global(s_defaultChecked = &S_defaultChecked);
-	SEE_intern_global(s_defaultValue = &S_defaultValue);
-	SEE_intern_global(s_disabled = &S_disabled);
-	SEE_intern_global(s_form = &S_form);
-	SEE_intern_global(s_maxLength = &S_maxLength);
-	SEE_intern_global(s_name = &S_name);
-	SEE_intern_global(s_readonly = &S_readonly);
-	SEE_intern_global(s_size = &S_size);
-	SEE_intern_global(s_src = &S_src);
-	SEE_intern_global(s_tabindex = &S_tabindex);
-	SEE_intern_global(s_type = &S_type);
-	SEE_intern_global(s_value = &S_value);
-	SEE_intern_global(s_blur = &S_blur);
-	SEE_intern_global(s_click = &S_click);
-	SEE_intern_global(s_focus = &S_focus);
-	SEE_intern_global(s_select = &S_select);
-	SEE_intern_global(s_selectedIndex = &S_selectedIndex);
-
-	SEE_intern_global(s_elements = &S_elements);
-	SEE_intern_global(s_item = &S_item);
-	SEE_intern_global(s_namedItem = &S_namedItem);
-	SEE_intern_global(s_length = &S_length);
-
-	SEE_intern_global(s_action = &S_action);
-	SEE_intern_global(s_encoding = &S_encoding);
-	SEE_intern_global(s_method = &S_method);
-	SEE_intern_global(s_target = &S_target);
-	SEE_intern_global(s_reset = &S_reset);
-	SEE_intern_global(s_submit = &S_submit);
-
-	SEE_intern_global(s_forms = &S_forms);
-
-	SEE_intern_global(s_document = &S_document);
-	SEE_intern_global(s_referrer = &S_referrer);
-	SEE_intern_global(s_title = &S_title);
-	SEE_intern_global(s_url = &S_url);
-	SEE_intern_global(s_write = &S_write);
-	SEE_intern_global(s_writeln = &S_writeln);
-
-	SEE_intern_global(s_Mozilla = &S_Mozilla);
-	SEE_intern_global(s_ELinks_ = &S_ELinks_);
-	SEE_intern_global(s_cookie = &S_cookie);
-
-	SEE_intern_global(s_GET = &S_GET);
-	SEE_intern_global(s_POST = &S_POST);
-
-	SEE_intern_global(s_application_ = &S_application_);
-	SEE_intern_global(s_multipart_ = &S_multipart_);
-	SEE_intern_global(s_textplain = &S_textplain);
-
-	SEE_intern_global(s_text = &S_text);
-	SEE_intern_global(s_password = &S_password);
-	SEE_intern_global(s_file = &S_file);
-	SEE_intern_global(s_checkbox = &S_checkbox);
-	SEE_intern_global(s_radio = &S_radio);
-	SEE_intern_global(s_image = &S_image);
-	SEE_intern_global(s_button = &S_button);
-	SEE_intern_global(s_hidden = &S_hidden);
-
-	SEE_intern_global(s_timeout = &S_timeout);
+	s_timeout = SEE_intern_global("timeout");
 }
diff --git a/src/ecmascript/see/unibar.c b/src/ecmascript/see/unibar.c
index ca10f8d8..c5fa9047 100644
--- a/src/ecmascript/see/unibar.c
+++ b/src/ecmascript/see/unibar.c
@@ -57,7 +57,7 @@ struct js_unibar_object {
 };
 
 struct SEE_objectclass js_menubar_object_class = {
-	NULL,
+	"menubar",
 	unibar_get,
 	unibar_put,
 	unibar_canput,
@@ -71,7 +71,7 @@ struct SEE_objectclass js_menubar_object_class = {
 };
 
 struct SEE_objectclass js_statusbar_object_class = {
-	NULL,
+	"statusbar",
 	unibar_get,
 	unibar_put,
 	unibar_canput,
@@ -178,7 +178,6 @@ init_js_menubar_object(struct ecmascript_interpreter *interpreter)
 	menu = SEE_NEW(interp, struct js_unibar_object);
 
 	menu->object.objectclass = &js_menubar_object_class;
-	menu->object.objectclass->Class = s_menubar;
 	menu->object.Prototype = NULL;
 	menu->bar = 't';
 
@@ -197,7 +196,6 @@ init_js_statusbar_object(struct ecmascript_interpreter *interpreter)
 	status = SEE_NEW(interp, struct js_unibar_object);
 
 	status->object.objectclass = &js_statusbar_object_class;
-	status->object.objectclass->Class = s_statusbar;
 	status->object.Prototype = NULL;
 	status->bar = 's';
 
diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index 6324092a..1f878e7c 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -58,7 +58,7 @@ static void js_window_open(struct SEE_interpreter *, struct SEE_object *, struct
 void location_goto(struct document_view *, unsigned char *);
 
 struct SEE_objectclass js_window_object_class = {
-	NULL,
+	"window",
 	window_get,
 	window_put,
 	window_canput,
@@ -329,7 +329,6 @@ init_js_window_object(struct ecmascript_interpreter *interpreter)
 	g->win = SEE_NEW(interp, struct js_window_object);
 
 	g->win->object.objectclass = &js_window_object_class;
-	g->win->object.objectclass->Class = s_window;
 	g->win->object.Prototype = NULL;
 	g->win->vs = interpreter->vs;
 

From b1c8eb5572eb20a623719a99ae58d178063b778f Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 12 Aug 2006 19:07:16 +0200
Subject: [PATCH 009/132] SEE: use periodic callback. SEE engine passes
 infinite test

---
 src/ecmascript/see.c           |  1 +
 src/ecmascript/see/document.c  |  5 -----
 src/ecmascript/see/form.c      | 25 -------------------------
 src/ecmascript/see/location.c  |  9 ---------
 src/ecmascript/see/navigator.c |  2 --
 src/ecmascript/see/unibar.c    |  4 ----
 src/ecmascript/see/window.c    |  6 ------
 7 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/src/ecmascript/see.c b/src/ecmascript/see.c
index 001efca7..6cef7a75 100644
--- a/src/ecmascript/see.c
+++ b/src/ecmascript/see.c
@@ -60,6 +60,7 @@ static void
 see_init(struct module *xxx)
 {
 	init_intern_strings();
+	SEE_system.periodic = checktime;
 }
 
 static void
diff --git a/src/ecmascript/see/document.c b/src/ecmascript/see/document.c
index 959d8d31..22bfe936 100644
--- a/src/ecmascript/see/document.c
+++ b/src/ecmascript/see/document.c
@@ -83,7 +83,6 @@ document_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct SEE_string *str;
 	unsigned char *string;
 
-	checktime(interp);
 	SEE_SET_UNDEFINED(res);
 
 	if (p == s_cookie) {
@@ -175,7 +174,6 @@ document_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct SEE_value res;
 	unsigned char *string;
 
-	checktime(interp);
 	if (p == s_forms) {
 		SEE_ToObject(interp, val, &res);
 		doc->forms = res.u.object;
@@ -238,7 +236,6 @@ js_document_write_do(struct SEE_interpreter *interp, struct SEE_object *self,
 
 	set_led_value(vs->doc_view->session->status.ecmascript_led, 'J');
 #endif
-	checktime(interp);
 	SEE_SET_BOOLEAN(res, 0);
 }
 
@@ -262,7 +259,6 @@ static int
 document_canput(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_location || p == s_url || p == s_cookie)
 		return 1;
 	return 0;
@@ -272,7 +268,6 @@ static int
 document_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	/* all unknown properties return UNDEFINED value */
 	return 1;
 }
diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index 8f8404b4..604a0ef6 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -176,7 +176,6 @@ input_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	assert(fc);
 	assert(fc->form && fs);
 
-	checktime(interp);
 	linknum = get_form_control_link(document, fc);
 	/* Hiddens have no link. */
 	if (linknum >= 0) link = &document->links[linknum];
@@ -279,7 +278,6 @@ input_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	assert(fc);
 	assert(fc->form && fs);
 
-	checktime(interp);
 	linknum = get_form_control_link(document, fc);
 	/* Hiddens have no link. */
 	if (linknum >= 0) link = &document->links[linknum];
@@ -348,7 +346,6 @@ js_input_blur(struct SEE_interpreter *interp, struct SEE_object *self,
 	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
 	     struct SEE_value *res)
 {
-	checktime(interp);
 	SEE_SET_BOOLEAN(res, 0);
 	/* We are a text-mode browser and there *always* has to be something
 	 * selected.  So we do nothing for now. (That was easy.) */
@@ -369,7 +366,6 @@ js_input_click(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct form_control *fc;
 	int linknum;
 
-	checktime(interp);
 	SEE_SET_BOOLEAN(res, 0);
 	assert(fs);
 	fc = find_form_control(document, fs);
@@ -403,7 +399,6 @@ js_input_focus(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct form_control *fc;
 	int linknum;
 
-	checktime(interp);
 	SEE_SET_BOOLEAN(res, 0);
 	assert(fs);
 	fc = find_form_control(document, fs);
@@ -423,7 +418,6 @@ js_input_select(struct SEE_interpreter *interp, struct SEE_object *self,
 	     struct SEE_object *thisobj, int argc, struct SEE_value **argv,
 	     struct SEE_value *res)
 {
-	checktime(interp);
 	SEE_SET_BOOLEAN(res, 0);
 	/* We support no text selecting yet.  So we do nothing for now.
 	 * (That was easy, too.) */
@@ -433,7 +427,6 @@ static int
 input_canput(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	return 1;
 }
 
@@ -442,7 +435,6 @@ input_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
 	/* all unknown properties return UNDEFINED value */
-	checktime(interp);
 	return 1;
 }
 
@@ -452,7 +444,6 @@ js_get_input_object(struct SEE_interpreter *interp, struct js_form *jsform,
 {
 	struct js_input *jsinput;
 
-	checktime(interp);
 
 #if 0
 	if (fs->ecmascript_obj)
@@ -482,7 +473,6 @@ static struct js_input *
 js_get_form_control_object(struct SEE_interpreter *interp, struct js_form *jsform,
 	enum form_type type,  struct form_state *fs)
 {
-	checktime(interp);
 	switch (type) {
 		case FC_TEXT:
 		case FC_PASSWORD:
@@ -528,7 +518,6 @@ js_form_elems_item(struct SEE_interpreter *interp, struct SEE_object *self,
 	int counter = -1;
 	int index;
 
-	checktime(interp);
 	SEE_SET_UNDEFINED(res);
 	if (argc < 1)
 		return;
@@ -568,7 +557,6 @@ js_form_elems_namedItem(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct form_control *fc;
 	unsigned char *string;
 
-	checktime(interp);
 	SEE_SET_UNDEFINED(res);
 	if (argc < 1)
 		return;
@@ -602,7 +590,6 @@ form_elems_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct form_view *fv = parent_form->fv;
 	struct form *form = find_form_by_form_view(document, fv);
 
-	checktime(interp);
 	if (p == s_length) {
 		SEE_number_t length = list_size(&form->items);
 		SEE_SET_NUMBER(res, length);
@@ -634,7 +621,6 @@ static int
 form_elems_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	/* all unknown properties return UNDEFINED value */
 	return 1;
 }
@@ -654,7 +640,6 @@ js_forms_item(struct SEE_interpreter *interp, struct SEE_object *self,
 	int counter = -1;
 	int index;
 
-	checktime(interp);
 	SEE_SET_UNDEFINED(res);
 	if (argc < 1)
 		return;
@@ -690,7 +675,6 @@ js_forms_namedItem(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct form *form;
 	unsigned char *string;
 
-	checktime(interp);
 	SEE_SET_UNDEFINED(res);
 	if (argc < 1)
 		return;
@@ -722,7 +706,6 @@ forms_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct document *document = doc_view->document;
 	struct js_forms_object *fo = (struct js_forms_object *)o;
 
-	checktime(interp);
 	if (p == s_length) {
 		SEE_number_t length = list_size(&document->forms);
 		SEE_SET_NUMBER(res, length);
@@ -755,7 +738,6 @@ static int
 forms_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	/* all unknown properties return UNDEFINED value */
 	return 1;
 }
@@ -774,7 +756,6 @@ form_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 	struct SEE_string *str;
 
-	checktime(interp);
 	SEE_SET_UNDEFINED(res);
 
 	if (p == s_action) {
@@ -865,7 +846,6 @@ form_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 	unsigned char *string = SEE_value_to_unsigned_char(interp, val);
 
-	checktime(interp);
 	if (!string)
 		return;
 
@@ -903,7 +883,6 @@ static int
 form_canput(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	return 1;
 }
 
@@ -911,7 +890,6 @@ static int
 form_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	return 1;
 }
 
@@ -929,7 +907,6 @@ js_form_reset(struct SEE_interpreter *interp, struct SEE_object *self,
 
 	assert(form);
 
-	checktime(interp);
 	do_reset_form(doc_view, form);
 	draw_forms(doc_view->session->tab->term, doc_view);
 	SEE_SET_BOOLEAN(res, 0);
@@ -949,7 +926,6 @@ js_form_submit(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct form *form = find_form_by_form_view(doc_view->document, fv);
 
 	assert(form);
-	checktime(interp);
 	submit_given_form(ses, doc_view, form, 0);
 	SEE_SET_BOOLEAN(res, 0);
 }
@@ -959,7 +935,6 @@ struct js_form *js_get_form_object(struct SEE_interpreter *interp,
 {
 	struct js_form *js_form;
 
-	checktime(interp);
 #if 0
 	if (fv->ecmascript_obj)
 		return fv->ecmascript_obj;
diff --git a/src/ecmascript/see/location.c b/src/ecmascript/see/location.c
index 31274b7d..20ac8049 100644
--- a/src/ecmascript/see/location.c
+++ b/src/ecmascript/see/location.c
@@ -160,7 +160,6 @@ history_get(struct SEE_interpreter *interp, struct SEE_object *o,
 {
 	struct js_history_object *history = (struct js_history_object *)o;
 
-	checktime(interp);
 	if (p == s_back) {
 		SEE_SET_OBJECT(res, history->back);
 	} else if (p == s_forward) {
@@ -176,7 +175,6 @@ static int
 history_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_back || p == s_forward || p == s_go)
 		return 1;
 	return 0;
@@ -206,7 +204,6 @@ js_history_forward(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct document_view *doc_view = vs->doc_view;
 	struct session *ses = doc_view->session;
 
-	checktime(interp);
 	SEE_SET_NULL(res);
 	go_unback(ses);
 }
@@ -224,7 +221,6 @@ js_history_go(struct SEE_interpreter *interp, struct SEE_object *self,
 	int index;
 	struct location *loc;
 
-	checktime(interp);
 	SEE_SET_NULL(res);
 	if (argc < 1)
 		return;
@@ -259,7 +255,6 @@ js_location_toString(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct SEE_string *str = string_to_SEE_string(interp, string);
 
 	mem_free_if(string);
-	checktime(interp);
 
 	SEE_SET_STRING(res, str);
 }
@@ -270,7 +265,6 @@ location_get(struct SEE_interpreter *interp, struct SEE_object *o,
 {
 	struct js_location_object *loc = (struct js_location_object *)o;
 
-	checktime(interp);
 	if (p == s_toString || p == s_toLocaleString) {
 		SEE_SET_OBJECT(res, loc->toString);
 	} else if (p == s_href) {
@@ -290,7 +284,6 @@ static void
 location_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	   struct SEE_string *p, struct SEE_value *val, int attr)
 {
-	checktime(interp);
 	if (p == s_href) {
 		struct global_object *g = (struct global_object *)interp;
 		struct view_state *vs = g->win->vs;
@@ -306,7 +299,6 @@ static int
 location_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_toString || p == s_toLocaleString || p == s_href)
 		return 1;
 	return 0;
@@ -316,7 +308,6 @@ static int
 location_canput(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_href)
 		return 1;
 	return 0;
diff --git a/src/ecmascript/see/navigator.c b/src/ecmascript/see/navigator.c
index 5b7d8997..aec53a14 100644
--- a/src/ecmascript/see/navigator.c
+++ b/src/ecmascript/see/navigator.c
@@ -69,7 +69,6 @@ navigator_get(struct SEE_interpreter *interp, struct SEE_object *o,
 {
 	struct SEE_string *str;
 
-	checktime(interp);
 	SEE_SET_UNDEFINED(res);
 	if (p == s_appCodeName) {
 		SEE_SET_STRING(res, s_Mozilla);
@@ -122,7 +121,6 @@ static int
 navigator_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_appCodeName || p == s_appName || p == s_appVersion
 	    || p == s_language || p == s_platform || p == s_userAgent)
 		return 1;
diff --git a/src/ecmascript/see/unibar.c b/src/ecmascript/see/unibar.c
index c5fa9047..ae72f766 100644
--- a/src/ecmascript/see/unibar.c
+++ b/src/ecmascript/see/unibar.c
@@ -95,7 +95,6 @@ unibar_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct js_unibar_object *obj = (struct js_unibar_object *)o;
 	unsigned char bar = obj->bar;
 
-	checktime(interp);
 	if (p == s_visible) {
 #define unibar_fetch(bar) \
 	SEE_SET_BOOLEAN(res, status->force_show_##bar##_bar >= 0 \
@@ -122,7 +121,6 @@ static void
 unibar_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	   struct SEE_string *p, struct SEE_value *val, int attr)
 {
-	checktime(interp);
 	if (p == s_location) {
 		struct global_object *g = (struct global_object *)interp;
 		struct view_state *vs = g->win->vs;
@@ -151,7 +149,6 @@ static int
 unibar_canput(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_visible)
 		return 1;
 	return 0;
@@ -161,7 +158,6 @@ static int
 unibar_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_visible)
 		return 1;
 	return 0;
diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c
index 1f878e7c..b6c235af 100644
--- a/src/ecmascript/see/window.c
+++ b/src/ecmascript/see/window.c
@@ -100,7 +100,6 @@ window_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	struct js_window_object *win = (struct js_window_object *)o;
 	struct view_state *vs = win->vs;
 
-	checktime(interp);
 	if (p == s_closed) {
 		SEE_SET_BOOLEAN(res, 0);
 	} else if (p == s_self || p == s_parent || p == s_top) {
@@ -157,7 +156,6 @@ static void
 window_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	   struct SEE_string *p, struct SEE_value *val, int attr)
 {
-	checktime(interp);
 	if (p == s_location) {
 		struct js_window_object *win = (struct js_window_object *)o;
 		struct view_state *vs = win->vs;
@@ -175,7 +173,6 @@ static int
 window_canput(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	if (p == s_location)
 		return 1;
 	return 0;
@@ -185,7 +182,6 @@ static int
 window_hasproperty(struct SEE_interpreter *interp, struct SEE_object *o,
 	      struct SEE_string *p)
 {
-	checktime(interp);
 	/* all unknown properties return UNDEFINED value */
 	return 1;
 }
@@ -201,7 +197,6 @@ js_window_alert(struct SEE_interpreter *interp, struct SEE_object *self,
 	struct view_state *vs = win->vs;
 	unsigned char *string;
 
-	checktime(interp);
 	SEE_SET_BOOLEAN(res, 1);
 	if (argc < 1)
 		return;
@@ -236,7 +231,6 @@ js_window_open(struct SEE_interpreter *interp, struct SEE_object *self,
 	static time_t ratelimit_start;
 	static int ratelimit_count;
 #endif
-	checktime(interp);
 	SEE_SET_OBJECT(res, (struct SEE_object *)win);
 	if (get_opt_bool("ecmascript.block_window_opening")) {
 #ifdef CONFIG_LEDS

From 143d95e9271396d37538a44c34c94c3bc8e026c4 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 31 Jul 2006 20:21:10 +0300
Subject: [PATCH 010/132] UTF-8: Reuse the translation table if it is from the
 same charset.

This change makes ELinks more efficient and causes bug 782 to occur
far less often.  (That does not mean the bug should not be fixed.)
---
 src/intl/charsets.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 867bfdc9..8fd19f9b 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -573,6 +573,7 @@ get_translation_table_to_utf_8(int from)
 	if (from == -1) return NULL;
 	from &= ~SYSTEM_CHARSET_FLAG;
 	if (from == lfr) return utf_table;
+	lfr = from;
 	if (utf_table_init)
 		memset(utf_table, 0, sizeof(utf_table)),
 		utf_table_init = 0;

From 32ac7bcb2f6063db70f129180c7915a2ca3e25d9 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sat, 12 Aug 2006 22:09:20 +0200
Subject: [PATCH 011/132] French translation was updated.

---
 po/fr.po | 213 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 108 insertions(+), 105 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 7707f811..951f0667 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-07-27 15:44+0200\n"
-"PO-Revision-Date: 2006-07-27 15:45+0200\n"
+"POT-Creation-Date: 2006-08-12 22:07+0200\n"
+"PO-Revision-Date: 2006-08-12 22:08+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr "Pressez espace pour d
 #: src/bfu/msgbox.c:191 src/config/dialogs.c:58 src/config/dialogs.c:393
 #: src/cookies/dialogs.c:356 src/cookies/dialogs.c:454 src/dialogs/edit.c:98
 #: src/dialogs/info.c:134 src/dialogs/options.c:220 src/dialogs/options.c:301
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:111
+#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:236 src/scripting/lua/core.c:379
 #: src/scripting/lua/core.c:460 src/session/session.c:806
 #: src/viewer/text/search.c:1665
@@ -119,7 +119,7 @@ msgstr "Erreur de suppression"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
-#: src/bfu/hierbox.c:870 src/config/dialogs.c:836 src/dialogs/menu.c:127
+#: src/bfu/hierbox.c:870 src/config/dialogs.c:837 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
 #: src/terminal/tab.c:213 src/terminal/tab.c:250
 msgid "~Yes"
@@ -127,7 +127,7 @@ msgstr "~Oui"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
-#: src/bfu/hierbox.c:871 src/config/dialogs.c:837 src/dialogs/menu.c:128
+#: src/bfu/hierbox.c:871 src/config/dialogs.c:838 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
 #: src/terminal/tab.c:214 src/terminal/tab.c:251
 msgid "~No"
@@ -145,7 +145,7 @@ msgid "Search string '%s' not found"
 msgstr "Chaîne recherchée '%s' introuvable"
 
 #: src/bfu/hierbox.c:970 src/config/dialogs.c:169 src/config/dialogs.c:359
-#: src/config/dialogs.c:506 src/cookies/dialogs.c:34 src/cookies/dialogs.c:350
+#: src/config/dialogs.c:507 src/cookies/dialogs.c:34 src/cookies/dialogs.c:350
 #: src/dialogs/edit.c:92 src/dialogs/edit.c:94 src/scripting/lua/core.c:375
 #: src/scripting/lua/core.c:376 src/scripting/lua/core.c:457
 msgid "Name"
@@ -176,7 +176,7 @@ msgstr "Cha
 #: src/bfu/inpfield.c:256 src/config/dialogs.c:394 src/cookies/dialogs.c:357
 #: src/cookies/dialogs.c:455 src/dialogs/edit.c:102 src/dialogs/edit.c:105
 #: src/dialogs/options.c:223 src/dialogs/options.c:302 src/mime/dialogs.c:132
-#: src/protocol/auth/dialogs.c:112 src/protocol/bittorrent/dialogs.c:812
+#: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:380 src/scripting/lua/core.c:461
 #: src/session/download.c:637 src/session/download.c:1236
 #: src/viewer/text/search.c:1666
@@ -372,7 +372,7 @@ msgstr "Titre"
 
 #: src/bookmarks/dialogs.c:73 src/cache/dialogs.c:65
 #: src/dialogs/document.c:136 src/dialogs/edit.c:96 src/formhist/dialogs.c:63
-#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:159
+#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:163
 #: src/scripting/lua/core.c:377
 msgid "URL"
 msgstr "URL"
@@ -470,27 +470,27 @@ msgstr ""
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
 #: src/bookmarks/dialogs.c:487 src/cache/dialogs.c:230
-#: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:257
+#: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:261
 msgid "~Goto"
 msgstr "A~ller ŕ"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons)
-#: src/bookmarks/dialogs.c:488 src/config/dialogs.c:530
+#: src/bookmarks/dialogs.c:488 src/config/dialogs.c:531
 #: src/cookies/dialogs.c:476
 msgid "~Edit"
 msgstr "~Modifier"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
 #: src/bookmarks/dialogs.c:489 src/cache/dialogs.c:231
-#: src/config/dialogs.c:532 src/config/dialogs.c:945 src/cookies/dialogs.c:477
+#: src/config/dialogs.c:533 src/config/dialogs.c:946 src/cookies/dialogs.c:477
 #: src/dialogs/menu.c:457 src/formhist/dialogs.c:211
-#: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:259
+#: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:263
 msgid "~Delete"
 msgstr "~Supprimer"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu)
-#: src/bookmarks/dialogs.c:490 src/config/dialogs.c:531
-#: src/config/dialogs.c:944 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
+#: src/bookmarks/dialogs.c:490 src/config/dialogs.c:532
+#: src/config/dialogs.c:945 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
 msgid "~Add"
 msgstr "~Ajouter"
 
@@ -511,7 +511,7 @@ msgstr "~D
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/dialogs/menu.c:view_menu, src/globhist/dialogs.c:globhist_buttons)
 #: src/bookmarks/dialogs.c:494 src/cache/dialogs.c:232
-#: src/config/dialogs.c:533 src/config/dialogs.c:947 src/dialogs/menu.c:408
+#: src/config/dialogs.c:534 src/config/dialogs.c:948 src/dialogs/menu.c:408
 #: src/globhist/dialogs.c:230
 msgid "~Search"
 msgstr "~Chercher"
@@ -592,7 +592,7 @@ msgstr "Drapeaux"
 msgid "incomplete"
 msgstr "incomplet"
 
-#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:178
+#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:182
 msgid "invalid"
 msgstr "invalide"
 
@@ -643,10 +643,10 @@ msgid "Delete this cache entry?"
 msgstr "Supprimer cette entrée de cache ?"
 
 #. accelerator_context(display_download, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/download.c:download_buttons, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
-#: src/cache/dialogs.c:229 src/config/dialogs.c:529 src/cookies/dialogs.c:473
+#: src/cache/dialogs.c:229 src/config/dialogs.c:530 src/cookies/dialogs.c:473
 #: src/dialogs/download.c:255 src/dialogs/download.c:492
 #: src/formhist/dialogs.c:210 src/globhist/dialogs.c:225
-#: src/protocol/auth/dialogs.c:258
+#: src/protocol/auth/dialogs.c:262
 msgid "~Info"
 msgstr "~Info"
 
@@ -1898,42 +1898,42 @@ msgstr ""
 "Les noms d'options ne doivent contenir que des caractčres\n"
 "alphanumériques ou les caractčres '_' et '-'."
 
-#: src/config/dialogs.c:481 src/config/dialogs.c:506
+#: src/config/dialogs.c:482 src/config/dialogs.c:507
 msgid "Add option"
 msgstr "Ajouter option"
 
-#: src/config/dialogs.c:482
+#: src/config/dialogs.c:483
 msgid "Cannot add an option here."
 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:534 src/config/dialogs.c:948 src/cookies/dialogs.c:479
+#: src/config/dialogs.c:535 src/config/dialogs.c:949 src/cookies/dialogs.c:479
 #: src/dialogs/options.c:222 src/formhist/dialogs.c:214
 #: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
 msgstr "Enre~gistrer"
 
-#: src/config/dialogs.c:539
+#: src/config/dialogs.c:540
 msgid "Option manager"
 msgstr "Gestionnaire d'options"
 
-#: src/config/dialogs.c:701
+#: src/config/dialogs.c:702
 msgid "Keystroke"
 msgstr "Touches"
 
-#: src/config/dialogs.c:703 src/config/options.inc:1186
+#: src/config/dialogs.c:704 src/config/options.inc:1186
 msgid "Action"
 msgstr "Action"
 
-#: src/config/dialogs.c:704
+#: src/config/dialogs.c:705
 msgid "Keymap"
 msgstr "Table"
 
-#: src/config/dialogs.c:830
+#: src/config/dialogs.c:831
 msgid "Keystroke already used"
 msgstr "Touche déjŕ utilisée"
 
-#: src/config/dialogs.c:831
+#: src/config/dialogs.c:832
 #, c-format
 msgid ""
 "The keystroke \"%s\" is currently used for \"%s\".\n"
@@ -1942,24 +1942,24 @@ msgstr ""
 "La combinaison de touches \"%s\" est déjŕ utilisée pour l'action \"%s\".\n"
 "Etes-vous sűr de vouloir la remplacer ?"
 
-#: src/config/dialogs.c:854 src/config/dialogs.c:871 src/config/dialogs.c:908
+#: src/config/dialogs.c:855 src/config/dialogs.c:872 src/config/dialogs.c:909
 msgid "Add keybinding"
 msgstr "Ajouter une association de touches"
 
-#: src/config/dialogs.c:855
+#: src/config/dialogs.c:856
 msgid "Invalid keystroke."
 msgstr "Touche invalide."
 
-#: src/config/dialogs.c:872
+#: src/config/dialogs.c:873
 msgid "Need to select a keymap."
 msgstr "Vous devez sélectionner une table."
 
 #. accelerator_context(menu_keys, src/config/dialogs.c:keybinding_buttons, src/globhist/dialogs.c:globhist_buttons)
-#: src/config/dialogs.c:946 src/dialogs/info.c:135 src/globhist/dialogs.c:231
+#: src/config/dialogs.c:947 src/dialogs/info.c:135 src/globhist/dialogs.c:231
 msgid "~Toggle display"
 msgstr "Co~mmuter affich."
 
-#: src/config/dialogs.c:953
+#: src/config/dialogs.c:954
 msgid "Keybinding manager"
 msgstr "Gestionnaire d'assoc. de touches"
 
@@ -3900,7 +3900,7 @@ msgstr "Texte"
 msgid "Dialog text colors."
 msgstr "Couleurs du texte des dialogues."
 
-#: src/config/options.inc:1026 src/viewer/text/form.c:1789
+#: src/config/options.inc:1026 src/viewer/text/form.c:1780
 msgid "Checkbox"
 msgstr "Case ŕ cocher"
 
@@ -3948,7 +3948,7 @@ msgstr "Raccourci du bouton"
 msgid "Selected button shortcut"
 msgstr "Raccourci du bouton sélectionné"
 
-#: src/config/options.inc:1054 src/viewer/text/form.c:1793
+#: src/config/options.inc:1054 src/viewer/text/form.c:1784
 msgid "Text field"
 msgstr "Champ texte"
 
@@ -4695,7 +4695,7 @@ msgstr "Ajouter un ser~veur"
 
 #. 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:478 src/dialogs/download.c:498 src/dialogs/edit.c:99
-#: src/globhist/dialogs.c:232 src/protocol/auth/dialogs.c:260
+#: src/globhist/dialogs.c:232 src/protocol/auth/dialogs.c:264
 msgid "C~lear"
 msgstr "~Effacer"
 
@@ -5681,7 +5681,7 @@ msgstr ""
 "qu'il y a un bogue dans ce script et que cela aurait pű\n"
 "bloquer ELinks, l'exécution du script a donc été interrompue."
 
-#: src/ecmascript/see/window.c:216 src/ecmascript/spidermonkey/window.c:286
+#: src/ecmascript/see/window.c:211 src/ecmascript/spidermonkey/window.c:286
 msgid "JavaScript Alert"
 msgstr "Alerte JavaScript"
 
@@ -6742,78 +6742,81 @@ msgstr "Terminal ~BeOS"
 msgid "Authentication required for %s at %s"
 msgstr "Authentication requise pour %s ŕ %s"
 
-#: src/protocol/auth/dialogs.c:98
-msgid "HTTP Authentication"
-msgstr "Authentification HTTP"
+#. This function is used for at least HTTP and FTP, so don't
+#. * name the protocol here.  Consider also what an FTP server
+#. * behind an HTTP proxy should be called.
+#: src/protocol/auth/dialogs.c:102
+msgid "Authentication required"
+msgstr "Authentication requise"
 
-#: src/protocol/auth/dialogs.c:108
+#: src/protocol/auth/dialogs.c:112
 msgid "Login"
 msgstr "Login"
 
-#: src/protocol/auth/dialogs.c:109 src/protocol/http/http.c:140
+#: src/protocol/auth/dialogs.c:113 src/protocol/http/http.c:140
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/protocol/auth/dialogs.c:162
+#: src/protocol/auth/dialogs.c:166
 msgid "Realm"
 msgstr "Domaine"
 
-#: src/protocol/auth/dialogs.c:174
+#: src/protocol/auth/dialogs.c:178
 msgid "none"
 msgstr "aucun"
 
-#: src/protocol/auth/dialogs.c:177
+#: src/protocol/auth/dialogs.c:181
 msgid "State"
 msgstr "Etat"
 
-#: src/protocol/auth/dialogs.c:178
+#: src/protocol/auth/dialogs.c:182
 msgid "valid"
 msgstr "valide"
 
 #. cant_delete_item
-#: src/protocol/auth/dialogs.c:215
+#: src/protocol/auth/dialogs.c:219
 #, c-format
 msgid "Sorry, but auth entry \"%s\" cannot be deleted."
 msgstr "Désolé, mais l'authentification \"%s\" ne peut ętre supprimée."
 
 #. cant_delete_used_item
-#: src/protocol/auth/dialogs.c:217
+#: src/protocol/auth/dialogs.c:221
 #, c-format
 msgid "Sorry, but auth entry \"%s\" is being used by something else."
 msgstr ""
 "Désolé, mais l'authentification \"%s\" est actuellement utilisée ailleurs."
 
 #. delete_marked_items_title
-#: src/protocol/auth/dialogs.c:223
+#: src/protocol/auth/dialogs.c:227
 msgid "Delete marked auth entries"
 msgstr "Supprimer les authentifications marquées"
 
 #. delete_marked_items
-#: src/protocol/auth/dialogs.c:225
+#: src/protocol/auth/dialogs.c:229
 msgid "Delete marked auth entries?"
 msgstr "Supprimer les authentifications marquées ?"
 
 #. delete_item_title
-#: src/protocol/auth/dialogs.c:231
+#: src/protocol/auth/dialogs.c:235
 msgid "Delete auth entry"
 msgstr "Supprimer une authentification"
 
-#: src/protocol/auth/dialogs.c:233
+#: src/protocol/auth/dialogs.c:237
 #, c-format
 msgid "Delete this auth entry?"
 msgstr "Supprimer cette authentification ?"
 
 #. clear_all_items_title
-#: src/protocol/auth/dialogs.c:235
+#: src/protocol/auth/dialogs.c:239
 msgid "Clear all auth entries"
 msgstr "Effacer toutes les authentifications"
 
 #. clear_all_items_title
-#: src/protocol/auth/dialogs.c:237
+#: src/protocol/auth/dialogs.c:241
 msgid "Do you really want to remove all auth entries?"
 msgstr "Ętes-vous sűr de vouloir effacer toutes les authentifications ?"
 
-#: src/protocol/auth/dialogs.c:265
+#: src/protocol/auth/dialogs.c:269
 msgid "Authentication manager"
 msgstr "Gestionnaire d'authentification"
 
@@ -8328,30 +8331,30 @@ msgstr "Voulez-vous poster les donn
 msgid "Do you want to repost form data to URL %s?"
 msgstr "Voulez-vous re-poster les données de formulaire ŕ l'URL %s ?"
 
-#: src/terminal/event.c:71
+#: src/terminal/event.c:77
 #, c-format
 msgid "Bad terminal size: %d, %d"
 msgstr "Mauvaise taille de terminal: %d, %d"
 
-#: src/terminal/event.c:154
+#: src/terminal/event.c:169
 msgid "Warning: terminal name contains illicit chars."
 msgstr "Attention: le nom du terminal contient des caractčres illicites."
 
-#: src/terminal/event.c:231
+#: src/terminal/event.c:250
 msgid "Failed to create session."
 msgstr "Echec de création de session."
 
-#: src/terminal/event.c:321
+#: src/terminal/event.c:415
 #, c-format
 msgid "Bad event %d"
 msgstr "Mauvais évčnement %d"
 
-#: src/terminal/event.c:361
+#: src/terminal/event.c:455
 #, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Impossible de lire l'évčnement: %d (%s)"
 
-#: src/terminal/kbd.c:920
+#: src/terminal/kbd.c:1068
 msgid "Too many bytes read from the itrm!"
 msgstr "Trop d'octets lus en provenance de itrm!"
 
@@ -8395,191 +8398,191 @@ msgstr "Erreur lors de l'envoi du formulaire"
 msgid "Could not load file %s: %s"
 msgstr "Impossible de charger le fichier %s: %s"
 
-#: src/viewer/text/form.c:1774
+#: src/viewer/text/form.c:1765
 msgid "Reset form"
 msgstr "Réinitialiser le formulaire"
 
-#: src/viewer/text/form.c:1776
+#: src/viewer/text/form.c:1767
 msgid "Harmless button"
 msgstr "Bouton sans impact"
 
-#: src/viewer/text/form.c:1784
+#: src/viewer/text/form.c:1775
 msgid "Submit form to"
 msgstr "Envoi du formulaire ŕ"
 
-#: src/viewer/text/form.c:1785
+#: src/viewer/text/form.c:1776
 msgid "Post form to"
 msgstr "Transfert du formulaire ŕ"
 
-#: src/viewer/text/form.c:1787
+#: src/viewer/text/form.c:1778
 msgid "Radio button"
 msgstr "Bouton radio"
 
-#: src/viewer/text/form.c:1791
+#: src/viewer/text/form.c:1782
 msgid "Select field"
 msgstr "Liste"
 
-#: src/viewer/text/form.c:1795
+#: src/viewer/text/form.c:1786
 msgid "Text area"
 msgstr "Champ texte multiligne"
 
-#: src/viewer/text/form.c:1797
+#: src/viewer/text/form.c:1788
 msgid "File upload"
 msgstr "Envoi de fichier"
 
-#: src/viewer/text/form.c:1799
+#: src/viewer/text/form.c:1790
 msgid "Password field"
 msgstr "Champ mot de passe"
 
-#: src/viewer/text/form.c:1837
+#: src/viewer/text/form.c:1828
 msgid "name"
 msgstr "Nom"
 
-#: src/viewer/text/form.c:1849
+#: src/viewer/text/form.c:1840
 msgid "value"
 msgstr "Valeur"
 
-#: src/viewer/text/form.c:1862
+#: src/viewer/text/form.c:1853
 msgid "read only"
 msgstr "lecture seule"
 
-#: src/viewer/text/form.c:1873
+#: src/viewer/text/form.c:1864
 #, c-format
 msgid "press %s to navigate"
 msgstr "pressez %s pour naviguer"
 
-#: src/viewer/text/form.c:1875
+#: src/viewer/text/form.c:1866
 #, c-format
 msgid "press %s to edit"
 msgstr "pressez %s pour éditer"
 
-#: src/viewer/text/form.c:1911
+#: src/viewer/text/form.c:1902
 #, c-format
 msgid "press %s to submit to %s"
 msgstr "pressez %s pour soumettre ŕ %s"
 
-#: src/viewer/text/form.c:1913
+#: src/viewer/text/form.c:1904
 #, c-format
 msgid "press %s to post to %s"
 msgstr "pressez %s pour poster ŕ %s"
 
-#: src/viewer/text/form.c:2015
+#: src/viewer/text/form.c:2006
 msgid "Useless button"
 msgstr "Bouton inutile"
 
-#: src/viewer/text/form.c:2017
+#: src/viewer/text/form.c:2008
 msgid "Submit button"
 msgstr "Bouton Soumettre"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1249
+#: src/viewer/text/link.c:1261
 msgid "Display ~usemap"
 msgstr "Afficher ~usemap"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1254
+#: src/viewer/text/link.c:1266
 msgid "~Follow link"
 msgstr "~Suivre le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1256
+#: src/viewer/text/link.c:1268
 msgid "Follow link and r~eload"
 msgstr "Suivre le lien et ~recharger"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1260
+#: src/viewer/text/link.c:1272
 msgid "Open in new ~window"
 msgstr "Ouvrir dans une nouvelle ~fenętre"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1262
+#: src/viewer/text/link.c:1274
 msgid "Open in new ~tab"
 msgstr "Ouvrir dans un nouvel ongle~t"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1264
+#: src/viewer/text/link.c:1276
 msgid "Open in new tab in ~background"
 msgstr "Ouvrir dans un nouvel onglet en arričre-~plan"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1269
+#: src/viewer/text/link.c:1281
 msgid "~Download link"
 msgstr "~Enregistrer le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1272
+#: src/viewer/text/link.c:1284
 msgid "~Add link to bookmarks"
 msgstr "~Ajouter ce lien aux signets"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1276
+#: src/viewer/text/link.c:1288
 msgid "Pass link URI to e~xternal command"
 msgstr "Passer l'URI du lien ŕ une commande e~xterne"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1287 src/viewer/text/link.c:1327
+#: src/viewer/text/link.c:1299 src/viewer/text/link.c:1339
 msgid "~Reset form"
 msgstr "Remettre ŕ ~zéro le formulaire"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1302
+#: src/viewer/text/link.c:1314
 msgid "Open in ~external editor"
 msgstr "Ouvrir dans un ~éditeur externe"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1310
+#: src/viewer/text/link.c:1322
 msgid "~Submit form"
 msgstr "~Envoyer le formulaire"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1311
+#: src/viewer/text/link.c:1323
 msgid "Submit form and rel~oad"
 msgstr "Envoyer le formulaire et ~recharger"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1315
+#: src/viewer/text/link.c:1327
 msgid "Submit form and open in new ~window"
 msgstr "Envoyer le formulaire et ouvrir dans une nouvelle ~fenętre"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1317
+#: src/viewer/text/link.c:1329
 msgid "Submit form and open in new ~tab"
 msgstr "Envoyer le formulaire et ouvrir un ~onglet"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1320
+#: src/viewer/text/link.c:1332
 msgid "Submit form and open in new tab in ~background"
 msgstr "Envoyer le formulaire et ouvrir un onglet en ~arričre-plan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1325
+#: src/viewer/text/link.c:1337
 msgid "Submit form and ~download"
 msgstr "Envoyer le formulaire et ~télécharger"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1332
+#: src/viewer/text/link.c:1344
 msgid "Form f~ields"
 msgstr "C~hamps de formulaire"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1339
+#: src/viewer/text/link.c:1351
 msgid "V~iew image"
 msgstr "~Voir l'image"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1341
+#: src/viewer/text/link.c:1353
 msgid "Download ima~ge"
 msgstr "Enregistrer l'~image"
 
-#: src/viewer/text/link.c:1350
+#: src/viewer/text/link.c:1362
 msgid "No link selected"
 msgstr "Aucun lien sélectionné"
 
-#: src/viewer/text/link.c:1420
+#: src/viewer/text/link.c:1432
 msgid "Image"
 msgstr "Image"
 
-#: src/viewer/text/link.c:1425
+#: src/viewer/text/link.c:1437
 msgid "Usemap"
 msgstr "Usemap"
 
@@ -8674,19 +8677,19 @@ msgstr ""
 "Votre entrée a été tronquée, mais vous pouvez toujours récupérer le texte "
 "que vous avez entré dans le fichier suivant: %s"
 
-#: src/viewer/text/view.c:715
+#: src/viewer/text/view.c:727
 msgid "Go to link"
 msgstr "Aller au lien"
 
-#: src/viewer/text/view.c:715
+#: src/viewer/text/view.c:727
 msgid "Enter link number"
 msgstr "Entrez un numéro de lien"
 
-#: src/viewer/text/view.c:1299
+#: src/viewer/text/view.c:1311
 msgid "Save error"
 msgstr "Erreur lors de la sauvegarde"
 
-#: src/viewer/text/view.c:1300
+#: src/viewer/text/view.c:1312
 msgid "Error writing to file"
 msgstr "Erreur lors de l'écriture du fichier"
 

From 5e1a1a215a75304a5ebdc77cd14e7f77866be42f Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 13 Aug 2006 08:58:20 +0200
Subject: [PATCH 012/132] Fixed about:

---
 src/protocol/about.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/protocol/about.c b/src/protocol/about.c
index 7cfe8317..1cefec20 100644
--- a/src/protocol/about.c
+++ b/src/protocol/about.c
@@ -109,6 +109,7 @@ about_protocol_handler(struct connection *conn)
 				str = page->string;
 				len = strlen(str);
 				add_fragment(cached, 0, str, len);
+				conn->from = len;
 				break;
 			}
 		}

From 75e292efe63c2b33c3bb7669f72fb93992adc8d7 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Sun, 13 Aug 2006 07:34:25 +0000
Subject: [PATCH 013/132] Mark the prompt for a key when adding a binding as
 translatable

Thanks to Kalle Olavi Niemitalo for noticing this omission.
---
 src/config/dialogs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index 97f6f5de..0b4aa279 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -892,16 +892,16 @@ push_kbdbind_add_button(struct dialog_data *dlg_data,
 	}
 
 	text = msg_text(term,
-			"Action: %s\n"
-			"Keymap: %s\n"
-			"\n"
-			"Keystroke should be written in the format: "
-			"[Prefix-]Key\n"
-			"Prefix: Shift, Ctrl, Alt\n"
-			"Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,"
-			"Tab,Enter,Insert,F5,..."
-			"\n\n"
-			"Keystroke",
+			N_("Action: %s\n"
+			   "Keymap: %s\n"
+			   "\n"
+			   "Keystroke should be written in the format: "
+			   "[Prefix-]Key\n"
+			   "Prefix: Shift, Ctrl, Alt\n"
+			   "Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,"
+			   "Tab,Enter,Insert,F5,..."
+			   "\n\n"
+			   "Keystroke"),
 			get_action_name(hop->keymap_id, hop->action_id),
 			get_keymap_name(hop->keymap_id));
 

From 19bb5f02d1f457d70e48f0553e195dab6a4832b5 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 12 Aug 2006 19:39:45 +0300
Subject: [PATCH 014/132] do_file_menu: Correct the order of arguments in
 SET_MENU_ITEM invocations.

The last two parameters are hotkey_state_ and hotkey_pos_, not vice versa.
This bug did not affect the binary because HKS_SHOW is defined as 0 anyway.
---
 src/dialogs/menu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dialogs/menu.c b/src/dialogs/menu.c
index b4c26720..56a5274f 100644
--- a/src/dialogs/menu.c
+++ b/src/dialogs/menu.c
@@ -364,7 +364,7 @@ do_file_menu(struct terminal *term, void *xxx, void *ses_)
 	if (o) {
 		SET_MENU_ITEM(e, N_("Open ~new window"), NULL, ACT_MAIN_OPEN_NEW_WINDOW,
 			      open_in_new_window, send_open_new_window,
-			      (o - 1) ? SUBMENU : 0, 0, HKS_SHOW);
+			      (o - 1) ? SUBMENU : 0, HKS_SHOW, 0);
 		e++;
 	}
 
@@ -382,14 +382,14 @@ do_file_menu(struct terminal *term, void *xxx, void *ses_)
 	x = 1;
 	if (!anonymous && can_open_os_shell(term->environment)) {
 		SET_MENU_ITEM(e, N_("~OS shell"), NULL, ACT_MAIN_OPEN_OS_SHELL,
-			      NULL, NULL, 0, 0, HKS_SHOW);
+			      NULL, NULL, 0, HKS_SHOW, 0);
 		e++;
 		x = 0;
 	}
 
 	if (can_resize_window(term->environment)) {
 		SET_MENU_ITEM(e, N_("Resize t~erminal"), NULL, ACT_MAIN_TERMINAL_RESIZE,
-			      NULL, NULL, 0, 0, HKS_SHOW);
+			      NULL, NULL, 0, HKS_SHOW, 0);
 		e++;
 		x = 0;
 	}

From 921f12926fd91b0744ea015529bfc6e37c90936c Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 13 Aug 2006 10:22:48 +0200
Subject: [PATCH 015/132] French translation was updated.

---
 po/fr.po | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 951f0667..8bbac2d7 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-08-12 22:07+0200\n"
-"PO-Revision-Date: 2006-08-12 22:08+0200\n"
+"POT-Creation-Date: 2006-08-13 10:18+0200\n"
+"PO-Revision-Date: 2006-08-13 10:20+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -1954,6 +1954,28 @@ msgstr "Touche invalide."
 msgid "Need to select a keymap."
 msgstr "Vous devez sélectionner une table."
 
+#: src/config/dialogs.c:895
+#, c-format
+msgid ""
+"Action: %s\n"
+"Keymap: %s\n"
+"\n"
+"Keystroke should be written in the format: [Prefix-]Key\n"
+"Prefix: Shift, Ctrl, Alt\n"
+"Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
+"\n"
+"Keystroke"
+msgstr ""
+"Action: %s\n"
+"Table: %s\n"
+"\n"
+"La combinaison de touches doit ętre écrite dans le format suivant:\n"
+"[Préfixe-]Touche\n"
+"Préfixes: Shift, Ctrl, Alt\n"
+"Touches: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
+"\n"
+"Combinaison de touches"
+
 #. accelerator_context(menu_keys, src/config/dialogs.c:keybinding_buttons, src/globhist/dialogs.c:globhist_buttons)
 #: src/config/dialogs.c:947 src/dialogs/info.c:135 src/globhist/dialogs.c:231
 msgid "~Toggle display"

From 93ef5e02f56768a296fdf46400a8ab181a1a6a1f Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 14:04:17 +0300
Subject: [PATCH 016/132] really_add_keybinding: Display the canonical name of
 the keystroke.

Before really_add_keybinding() is called, check_keystroke() calls
parse_keystroke(), which converts the modifier prefix to canonical
form: for example, "alt+f9" becomes "Alt-f9".  This commit makes
really_add_keybinding() normally ignore that string and generate a
brand new one, e.g. "Alt-F9" (note the upper-case F), for its
"Keystroke already used" warning.  Likewise, " " turns to "Space".

After this commit, it should be possible to change parse_keystroke()
to never write back into its input string.

If really_add_keybinding() cannot generate the string for some reason
(out of memory?), then it will use whatever parse_keystroke() has left
in the buffer.  The alternatives would be to omit the keystroke name
from the warning or to reject the keybinding entirely; it isn't clear
what the best solution is here, but the one I implemented is closest
to the previous behaviour.
---
 src/config/dialogs.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index 0b4aa279..46b37b6e 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -817,26 +817,41 @@ really_add_keybinding(void *data, unsigned char *keystroke)
 	struct kbdbind_add_hop *hop = data;
 	action_id_T action_id;
 
+	/* check_keystroke() has parsed @keystroke to @hop->kbd.  */
 	if (keybinding_exists(hop->keymap_id, &hop->kbd, &action_id)
 	    && action_id != ACT_MAIN_NONE) {
 		struct kbdbind_add_hop *new_hop;
+		struct string canonical = NULL_STRING;
 
 		/* Same keystroke for same action, just return. */
 		if (action_id == hop->action_id) return;
 
+		/* @*hop is on the memory_list of the input_dialog,
+		 * which will be closed when this function returns.  */
 		new_hop = new_hop_from(hop);
 		if (!new_hop) return; /* out of mem */
 
+		/* Try to convert the parsed keystroke back to a
+		 * string, so that the "Keystroke already used" box
+		 * displays the same canonical name as the keybinding
+		 * manager does.  If something goes wrong here, then
+		 * canonical.length will probably be 0, in which case
+		 * we'll use the original @keystroke string instead. */
+		if (init_string(&canonical))
+			add_keystroke_to_string(&canonical, &hop->kbd, 0);
+
 		msg_box(new_hop->term, getml(new_hop, NULL), MSGBOX_FREE_TEXT,
 			N_("Keystroke already used"), ALIGN_CENTER,
 			msg_text(new_hop->term, N_("The keystroke \"%s\" "
 			"is currently used for \"%s\".\n"
 			"Are you sure you want to replace it?"),
-			keystroke, get_action_name(hop->keymap_id, action_id)),
+			canonical.length ? canonical.source : keystroke,
+			get_action_name(hop->keymap_id, action_id)),
 			new_hop, 2,
 			N_("~Yes"), really_really_add_keybinding, B_ENTER,
 			N_("~No"), NULL, B_ESC);
 
+		done_string(&canonical); /* safe even if init failed */
 		return;
 	}
 

From f24fa6ef635f82e588fafec4091b7fd3ecc94a59 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 13 Aug 2006 13:20:32 +0200
Subject: [PATCH 017/132] search_dlg_do: Minor (questionable) cleanup

---
 src/viewer/text/search.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c
index b8e7c40f..d812414d 100644
--- a/src/viewer/text/search.c
+++ b/src/viewer/text/search.c
@@ -1627,12 +1627,13 @@ search_dlg_do(struct terminal *term, struct memory_list *ml,
 	unsigned char *field;
 	struct search_dlg_hop *hop;
 	unsigned char *text = _("Search for text", term);
+	struct option *search_options;
 
 	hop = mem_calloc(1, sizeof(*hop));
 	if (!hop) return;
 
-	checkout_option_values(resolvers, get_opt_rec(config_options,
-						      "document.browse.search"),
+	search_options = get_opt_rec(config_options, "document.browse.search");
+	checkout_option_values(resolvers, search_options,
 			       hop->values, SEARCH_OPTIONS);
 	hop->data = data;
 

From aba0bc77a85bc5a13c648b0bb2adbe2e32c2f1f3 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 14:24:28 +0300
Subject: [PATCH 018/132] parse_keystroke: Never write back to the input
 string.

This fixes a bug: in the previous version, l_bind_key() modified the
buffer whose address lua_tostring() returned, even though that is not
allowed according to Lua documentation <http://www.lua.org/pil/24.2.2.html>.

The change affects the user interface: previously, if the user typed
"ctrl+cokebottle" in the "Add keybinding" dialog box, ELinks would
change the text in the widget to "Ctrl-cokebottle" before complaining
that the keystroke is invalid.  Now, it leaves the widget unchanged.

This commit does not yet add const to parameters of parse_keystroke()
and related functions.
---
 src/config/kbdbind.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index f099c8f4..cea0db33 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -372,23 +372,20 @@ read_key(unsigned char *key_str)
 int
 parse_keystroke(unsigned char *s, struct term_event_keyboard *kbd)
 {
+	unsigned char ctrlbuf[2];
+
 	if (!strncasecmp(s, "Shift", 5) && (s[5] == '-' || s[5] == '+')) {
 		/* Shift+a == shiFt-a == Shift-a */
-		memcpy(s, "Shift-", 6);
 		kbd->modifier = KBD_MOD_SHIFT;
 		s += 6;
 
 	} else if (!strncasecmp(s, "Ctrl", 4) && (s[4] == '-' || s[4] == '+')) {
 		/* Ctrl+a == ctRl-a == Ctrl-a */
-		memcpy(s, "Ctrl-", 5);
 		kbd->modifier = KBD_MOD_CTRL;
 		s += 5;
-		/* Ctrl-a == Ctrl-A */
-		if (s[0] && !s[1]) s[0] = toupper(s[0]);
 
 	} else if (!strncasecmp(s, "Alt", 3) && (s[3] == '-' || s[3] == '+')) {
 		/* Alt+a == aLt-a == Alt-a */
-		memcpy(s, "Alt-", 4);
 		kbd->modifier = KBD_MOD_ALT;
 		s += 4;
 
@@ -397,6 +394,13 @@ parse_keystroke(unsigned char *s, struct term_event_keyboard *kbd)
 		kbd->modifier = KBD_MOD_NONE;
 	}
 
+	if ((kbd->modifier & KBD_MOD_CTRL) != 0 && s[0] && !s[1]) {
+		/* Ctrl-a == Ctrl-A */
+		ctrlbuf[0] = toupper(s[0]);
+		ctrlbuf[1] = '\0';
+		s = ctrlbuf;
+	}
+
 	kbd->key = read_key(s);
 	return (kbd->key == KBD_UNDEF) ? -1 : 0;
 }

From edeb934cc32c235c03206bc9128266d550dfcf07 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 13 Aug 2006 13:27:16 +0200
Subject: [PATCH 019/132] try_mark_key: try to improve readability by using a
 local var and a cast

The cast is not necessary since we already check the bounds, but by using a
cast here, it hopefully makes it more obvious what the long comment above
is pointing out: namely that we put the value of a signed integer into an
unsigned char.
---
 src/viewer/text/view.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c
index 14a28783..e16847e6 100644
--- a/src/viewer/text/view.c
+++ b/src/viewer/text/view.c
@@ -637,6 +637,7 @@ enum frame_event_status
 try_mark_key(struct session *ses, struct document_view *doc_view,
 	     struct term_event *ev)
 {
+	term_event_key_T key = get_kbd_key(ev);
 	unsigned char mark;
 
 	/* set_mark and goto_mark allow only a subset of the ASCII
@@ -646,8 +647,8 @@ try_mark_key(struct session *ses, struct document_view *doc_view,
 	 * will not accept, so the results are consistent.
 	 * When CONFIG_UTF_8 is not defined, this assumes that codes
 	 * 0 to 0x7F in all codepages match ASCII.  */
-	if (get_kbd_key(ev) >= 0 && get_kbd_key(ev) <= 0x7F)
-		mark = get_kbd_key(ev);
+	if (key >= 0 && key <= 0x7F)
+		mark = (unsigned char) key;
 	else
 		mark = 0;
 

From 2eeb14f95c9d2fb442c3b57245f0cb73b010ecdc Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 14:44:01 +0300
Subject: [PATCH 020/132] Key name strings are const in read_key() and in its
 (indirect) callers.

---
 src/config/kbdbind.c            | 18 +++++++++---------
 src/config/kbdbind.h            | 12 ++++++------
 src/scripting/lua/core.c        |  2 +-
 src/scripting/smjs/keybinding.c |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index cea0db33..1fd78341 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -206,7 +206,7 @@ kbd_nm_lookup(enum keymap_id keymap_id, unsigned char *name)
 }
 
 static struct keybinding *
-kbd_stroke_lookup(enum keymap_id keymap_id, unsigned char *keystroke_str)
+kbd_stroke_lookup(enum keymap_id keymap_id, const unsigned char *keystroke_str)
 {
 	struct term_event_keyboard kbd;
 
@@ -230,7 +230,7 @@ static struct keymap keymap_table[] = {
 
 static struct action *
 get_action_from_keystroke(enum keymap_id keymap_id,
-                          unsigned char *keystroke_str)
+                          const unsigned char *keystroke_str)
 {
 	struct keybinding *keybinding = kbd_stroke_lookup(keymap_id,
 	                                                  keystroke_str);
@@ -240,7 +240,7 @@ get_action_from_keystroke(enum keymap_id keymap_id,
 
 unsigned char *
 get_action_name_from_keystroke(enum keymap_id keymap_id,
-                               unsigned char *keystroke_str)
+                               const unsigned char *keystroke_str)
 {
 	struct action *action = get_action_from_keystroke(keymap_id,
 	                                                  keystroke_str);
@@ -355,7 +355,7 @@ static struct key key_table[] = {
 };
 
 term_event_key_T
-read_key(unsigned char *key_str)
+read_key(const unsigned char *key_str)
 {
 	struct key *key;
 
@@ -370,7 +370,7 @@ read_key(unsigned char *key_str)
 }
 
 int
-parse_keystroke(unsigned char *s, struct term_event_keyboard *kbd)
+parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 {
 	unsigned char ctrlbuf[2];
 
@@ -550,7 +550,7 @@ free_keymaps(struct module *xxx)
 
 #ifdef CONFIG_SCRIPTING
 static unsigned char *
-bind_key_to_event(unsigned char *ckmap, unsigned char *ckey, int event)
+bind_key_to_event(unsigned char *ckmap, const unsigned char *ckey, int event)
 {
 	struct term_event_keyboard kbd;
 	action_id_T action_id;
@@ -572,7 +572,7 @@ bind_key_to_event(unsigned char *ckmap, unsigned char *ckey, int event)
 }
 
 int
-bind_key_to_event_name(unsigned char *ckmap, unsigned char *ckey,
+bind_key_to_event_name(unsigned char *ckmap, const unsigned char *ckey,
 		       unsigned char *event_name, unsigned char **err)
 {
 	int event_id;
@@ -867,7 +867,7 @@ get_aliased_action(enum keymap_id keymap_id, unsigned char *action_str)
 
 /* Return 0 when ok, something strange otherwise. */
 int
-bind_do(unsigned char *keymap_str, unsigned char *keystroke_str,
+bind_do(unsigned char *keymap_str, const unsigned char *keystroke_str,
 	unsigned char *action_str, int is_system_conf)
 {
 	enum keymap_id keymap_id;
@@ -891,7 +891,7 @@ bind_do(unsigned char *keymap_str, unsigned char *keystroke_str,
 }
 
 unsigned char *
-bind_act(unsigned char *keymap_str, unsigned char *keystroke_str)
+bind_act(unsigned char *keymap_str, const unsigned char *keystroke_str)
 {
 	enum keymap_id keymap_id;
 	unsigned char *action;
diff --git a/src/config/kbdbind.h b/src/config/kbdbind.h
index d4bea25c..9f42847a 100644
--- a/src/config/kbdbind.h
+++ b/src/config/kbdbind.h
@@ -123,7 +123,7 @@ struct action *get_action(enum keymap_id keymap_id, action_id_T action_id);
 unsigned char *get_action_name(enum keymap_id keymap_id, action_id_T action_id);
 action_id_T get_action_from_string(enum keymap_id keymap_id, unsigned char *str);
 unsigned char *get_action_name_from_keystroke(enum keymap_id keymap_id,
-                                              unsigned char *keystroke_str);
+                                              const unsigned char *keystroke_str);
 
 static inline unsigned int
 action_is_anonymous_safe(enum keymap_id keymap_id, action_id_T action_id)
@@ -173,10 +173,10 @@ action_requires_form(enum keymap_id keymap_id, action_id_T action_id)
 	return action && (action->flags & ACTION_REQUIRE_FORM);
 }
 
-term_event_key_T read_key(unsigned char *);
+term_event_key_T read_key(const unsigned char *);
 unsigned char *get_keymap_name(enum keymap_id);
 
-int parse_keystroke(unsigned char *, struct term_event_keyboard *);
+int parse_keystroke(const unsigned char *, struct term_event_keyboard *);
 void add_keystroke_to_string(struct string *str, struct term_event_keyboard *kbd, int escape);
 
 /* void add_accesskey_to_string(struct string *str, unicode_val_T accesskey); */
@@ -195,12 +195,12 @@ action_id_T kbd_action(enum keymap_id, struct term_event *, int *);
 struct keybinding *kbd_ev_lookup(enum keymap_id, struct term_event_keyboard *kbd, int *);
 struct keybinding *kbd_nm_lookup(enum keymap_id, unsigned char *);
 
-int bind_do(unsigned char *, unsigned char *, unsigned char *, int);
-unsigned char *bind_act(unsigned char *, unsigned char *);
+int bind_do(unsigned char *, const unsigned char *, unsigned char *, int);
+unsigned char *bind_act(unsigned char *, const unsigned char *);
 void bind_config_string(struct string *);
 
 #ifdef CONFIG_SCRIPTING
-int bind_key_to_event_name(unsigned char *, unsigned char *, unsigned char *,
+int bind_key_to_event_name(unsigned char *, const unsigned char *, unsigned char *,
 			   unsigned char **);
 #endif
 
diff --git a/src/scripting/lua/core.c b/src/scripting/lua/core.c
index 94671f64..432581ec 100644
--- a/src/scripting/lua/core.c
+++ b/src/scripting/lua/core.c
@@ -289,7 +289,7 @@ l_bind_key(LS)
 	add_format_to_string(&event_name, "lua-run-func %i", ref);
 
 	event_id = bind_key_to_event_name((unsigned char *) lua_tostring(S, 1),
-					  (unsigned char *) lua_tostring(S, 2),
+					  (const unsigned char *) lua_tostring(S, 2),
 					  event_name.source, &err);
 	done_string(&event_name);
 
diff --git a/src/scripting/smjs/keybinding.c b/src/scripting/smjs/keybinding.c
index aa05ac69..96721fd9 100644
--- a/src/scripting/smjs/keybinding.c
+++ b/src/scripting/smjs/keybinding.c
@@ -17,7 +17,7 @@ static JSBool
 keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 {
 	unsigned char *action_str;
-	unsigned char *keystroke_str;
+	const unsigned char *keystroke_str;
 	int *data = JS_GetPrivate(ctx, obj);
 	enum keymap_id keymap_id = *data;
 
@@ -64,7 +64,7 @@ keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 	int *data = JS_GetPrivate(ctx, obj);
 	enum keymap_id keymap_id = *data;
 	unsigned char *keymap_str;
-	unsigned char *keystroke_str;
+	const unsigned char *keystroke_str;
 
 	/* Ugly fact: we need to get the string from the id to give to bind_do,
 	 * which will of course then convert the string back to an id... */

From 6108c3e109b0678183d1dd49e9da73fb73e7449e Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 15:27:48 +0300
Subject: [PATCH 021/132] check_kbd_label_key: Allow only the Alt modifier.

Thus, pressing Ctrl-O in the "Terminal options" dialog no longer
triggers the "~OK" button.  One must instead press o, O, Alt-o, or
Alt-O.
---
 src/terminal/event.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/terminal/event.h b/src/terminal/event.h
index 63a420a9..8125b1b0 100644
--- a/src/terminal/event.h
+++ b/src/terminal/event.h
@@ -173,9 +173,9 @@ void in_term(struct terminal *);
  * TO DO: Change the event handlers to use unicode_fold_label_case()
  * instead.  The code that extracts the hotkey from the label string
  * will also have to be changed.  */
-#define check_kbd_label_key(event)	(get_kbd_key(event) > ' ' && get_kbd_key(event) <= 0x7F)
+#define check_kbd_label_key(event)	(get_kbd_key(event) > ' ' && get_kbd_key(event) <= 0x7F && (check_kbd_modifier(event, KBD_MOD_NONE) || check_kbd_modifier(event, KBD_MOD_ALT)))
 #else  /* !CONFIG_UTF_8 */
-#define check_kbd_label_key(event)	(get_kbd_key(event) > ' ')
+#define check_kbd_label_key(event)	(get_kbd_key(event) > ' ' && (check_kbd_modifier(event, KBD_MOD_NONE) || check_kbd_modifier(event, KBD_MOD_ALT)))
 #endif /* !CONFIG_UTF_8 */
 
 

From de93359a5af1378358d704940f0b3861a025b1a7 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 15:32:06 +0300
Subject: [PATCH 022/132] Support Ctrl-Alt-letter key combinations.

Actions can now be bound to e.g. Ctrl-Alt-A.  The keybinding code also
supports other combinations of modifiers, like Shift-Ctrl-Up, but the
escape sequence decoder doesn't yet.

Don't let Ctrl-Alt-letter combinations open menus.
---
 src/config/dialogs.c   |  3 +--
 src/config/kbdbind.c   | 33 ++++++++++++++++++---------------
 src/terminal/kbd.c     |  2 +-
 src/viewer/text/view.c |  3 ++-
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index 46b37b6e..3dca10e3 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -911,8 +911,7 @@ push_kbdbind_add_button(struct dialog_data *dlg_data,
 			   "Keymap: %s\n"
 			   "\n"
 			   "Keystroke should be written in the format: "
-			   "[Prefix-]Key\n"
-			   "Prefix: Shift, Ctrl, Alt\n"
+			   "[Shift-][Ctrl-][Alt-]Key\n"
 			   "Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,"
 			   "Tab,Enter,Insert,F5,..."
 			   "\n\n"
diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index 1fd78341..c630c12c 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -374,24 +374,27 @@ parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 {
 	unsigned char ctrlbuf[2];
 
-	if (!strncasecmp(s, "Shift", 5) && (s[5] == '-' || s[5] == '+')) {
-		/* Shift+a == shiFt-a == Shift-a */
-		kbd->modifier = KBD_MOD_SHIFT;
-		s += 6;
+	kbd->modifier = KBD_MOD_NONE;
+	while (1) {
+		if (!strncasecmp(s, "Shift", 5) && (s[5] == '-' || s[5] == '+')) {
+			/* Shift+a == shiFt-a == Shift-a */
+			kbd->modifier |= KBD_MOD_SHIFT;
+			s += 6;
 
-	} else if (!strncasecmp(s, "Ctrl", 4) && (s[4] == '-' || s[4] == '+')) {
-		/* Ctrl+a == ctRl-a == Ctrl-a */
-		kbd->modifier = KBD_MOD_CTRL;
-		s += 5;
+		} else if (!strncasecmp(s, "Ctrl", 4) && (s[4] == '-' || s[4] == '+')) {
+			/* Ctrl+a == ctRl-a == Ctrl-a */
+			kbd->modifier |= KBD_MOD_CTRL;
+			s += 5;
 
-	} else if (!strncasecmp(s, "Alt", 3) && (s[3] == '-' || s[3] == '+')) {
-		/* Alt+a == aLt-a == Alt-a */
-		kbd->modifier = KBD_MOD_ALT;
-		s += 4;
+		} else if (!strncasecmp(s, "Alt", 3) && (s[3] == '-' || s[3] == '+')) {
+			/* Alt+a == aLt-a == Alt-a */
+			kbd->modifier |= KBD_MOD_ALT;
+			s += 4;
 
-	} else {
-		/* No modifier. */
-		kbd->modifier = KBD_MOD_NONE;
+		} else {
+			/* No modifier. */
+			break;
+		}
 	}
 
 	if ((kbd->modifier & KBD_MOD_CTRL) != 0 && s[0] && !s[1]) {
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index 229cf4de..07fd3056 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -865,7 +865,7 @@ set_kbd_event(struct interlink_event *ev, int key, int modifier)
 	default:
 		if (key < ' ') {
 			key += 'A' - 1;
-			modifier = KBD_MOD_CTRL;
+			modifier |= KBD_MOD_CTRL;
 		}
 	}
 
diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c
index 14a28783..d383d16e 100644
--- a/src/viewer/text/view.c
+++ b/src/viewer/text/view.c
@@ -1169,7 +1169,8 @@ quit:
 
 	if (check_kbd_key(ev, KBD_CTRL_C)) goto quit;
 
-	if (get_kbd_modifier(ev) & KBD_MOD_ALT) {
+	/* Ctrl-Alt-F should not open the File menu like Alt-f does.  */
+	if (check_kbd_modifier(ev, KBD_MOD_ALT)) {
 		struct window *win;
 
 		get_kbd_modifier(ev) &= ~KBD_MOD_ALT;

From c79ecefe73105a9c9260bd1f9e83711d14819492 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 15:41:34 +0300
Subject: [PATCH 023/132] doc: Document parse_keystroke().

---
 src/config/kbdbind.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index c630c12c..d8d597d8 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -369,6 +369,9 @@ read_key(const unsigned char *key_str)
 	return KBD_UNDEF;
 }
 
+/* Parse the string @s as the name of a keystroke.
+ * Write the parsed key and modifiers to *@kbd.
+ * Return >=0 on success, <0 on error.  */
 int
 parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 {

From 1837a554440c05f52b82a9dbf5bdce1ed179e59c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 15:45:13 +0300
Subject: [PATCH 024/132] really_add_keybinding: Remove unneeded
 initialization.

According to Jonas Fonseca, if init_string(&canonical) fails, then it
anyway sets canonical.source = NULL and makes done_string(&canonical)
safe, even if canonical was previously uninitialized.
---
 src/config/dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index 3dca10e3..2b05cece 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -821,7 +821,7 @@ really_add_keybinding(void *data, unsigned char *keystroke)
 	if (keybinding_exists(hop->keymap_id, &hop->kbd, &action_id)
 	    && action_id != ACT_MAIN_NONE) {
 		struct kbdbind_add_hop *new_hop;
-		struct string canonical = NULL_STRING;
+		struct string canonical;
 
 		/* Same keystroke for same action, just return. */
 		if (action_id == hop->action_id) return;

From abc66da432abbc0e13ce17bf8c040047bf4ce8d2 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 13 Aug 2006 14:50:45 +0200
Subject: [PATCH 025/132] really_add_keybinding: Indent msg_text arguments

---
 src/config/dialogs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index 2b05cece..66a5806d 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -843,10 +843,10 @@ really_add_keybinding(void *data, unsigned char *keystroke)
 		msg_box(new_hop->term, getml(new_hop, NULL), MSGBOX_FREE_TEXT,
 			N_("Keystroke already used"), ALIGN_CENTER,
 			msg_text(new_hop->term, N_("The keystroke \"%s\" "
-			"is currently used for \"%s\".\n"
-			"Are you sure you want to replace it?"),
-			canonical.length ? canonical.source : keystroke,
-			get_action_name(hop->keymap_id, action_id)),
+				 "is currently used for \"%s\".\n"
+				 "Are you sure you want to replace it?"),
+				 canonical.length ? canonical.source : keystroke,
+				 get_action_name(hop->keymap_id, action_id)),
 			new_hop, 2,
 			N_("~Yes"), really_really_add_keybinding, B_ENTER,
 			N_("~No"), NULL, B_ESC);

From 9c053d1d36cecd03a0a0d7f7f10f364e795d7929 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 13 Aug 2006 15:24:31 +0200
Subject: [PATCH 026/132] French translation was updated.

---
 po/fr.po | 76 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 8bbac2d7..c109c306 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-08-13 10:18+0200\n"
-"PO-Revision-Date: 2006-08-13 10:20+0200\n"
+"POT-Creation-Date: 2006-08-13 15:22+0200\n"
+"PO-Revision-Date: 2006-08-13 15:24+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr "Pressez espace pour d
 #: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:236 src/scripting/lua/core.c:379
 #: src/scripting/lua/core.c:460 src/session/session.c:806
-#: src/viewer/text/search.c:1665
+#: src/viewer/text/search.c:1666
 msgid "~OK"
 msgstr "~OK"
 
@@ -119,7 +119,7 @@ msgstr "Erreur de suppression"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
-#: src/bfu/hierbox.c:870 src/config/dialogs.c:837 src/dialogs/menu.c:127
+#: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
 #: src/terminal/tab.c:213 src/terminal/tab.c:250
 msgid "~Yes"
@@ -127,7 +127,7 @@ msgstr "~Oui"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
-#: src/bfu/hierbox.c:871 src/config/dialogs.c:838 src/dialogs/menu.c:128
+#: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
 #: src/terminal/tab.c:214 src/terminal/tab.c:251
 msgid "~No"
@@ -135,7 +135,7 @@ msgstr "~Non"
 
 #: src/bfu/hierbox.c:939 src/bfu/hierbox.c:970 src/viewer/text/search.c:1085
 #: src/viewer/text/search.c:1093 src/viewer/text/search.c:1109
-#: src/viewer/text/search.c:1684
+#: src/viewer/text/search.c:1685
 msgid "Search"
 msgstr "Chercher"
 
@@ -179,7 +179,7 @@ msgstr "Cha
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:380 src/scripting/lua/core.c:461
 #: src/session/download.c:637 src/session/download.c:1236
-#: src/viewer/text/search.c:1666
+#: src/viewer/text/search.c:1667
 msgid "~Cancel"
 msgstr "~Annuler"
 
@@ -482,7 +482,7 @@ msgstr "~Modifier"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
 #: src/bookmarks/dialogs.c:489 src/cache/dialogs.c:231
-#: src/config/dialogs.c:533 src/config/dialogs.c:946 src/cookies/dialogs.c:477
+#: src/config/dialogs.c:533 src/config/dialogs.c:960 src/cookies/dialogs.c:477
 #: src/dialogs/menu.c:457 src/formhist/dialogs.c:211
 #: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:263
 msgid "~Delete"
@@ -490,7 +490,7 @@ msgstr "~Supprimer"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu)
 #: src/bookmarks/dialogs.c:490 src/config/dialogs.c:532
-#: src/config/dialogs.c:945 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
+#: src/config/dialogs.c:959 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
 msgid "~Add"
 msgstr "~Ajouter"
 
@@ -511,7 +511,7 @@ msgstr "~D
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/dialogs/menu.c:view_menu, src/globhist/dialogs.c:globhist_buttons)
 #: src/bookmarks/dialogs.c:494 src/cache/dialogs.c:232
-#: src/config/dialogs.c:534 src/config/dialogs.c:948 src/dialogs/menu.c:408
+#: src/config/dialogs.c:534 src/config/dialogs.c:962 src/dialogs/menu.c:408
 #: src/globhist/dialogs.c:230
 msgid "~Search"
 msgstr "~Chercher"
@@ -1907,7 +1907,7 @@ msgid "Cannot add an option here."
 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:949 src/cookies/dialogs.c:479
+#: src/config/dialogs.c:535 src/config/dialogs.c:963 src/cookies/dialogs.c:479
 #: src/dialogs/options.c:222 src/formhist/dialogs.c:214
 #: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
@@ -1929,11 +1929,11 @@ msgstr "Action"
 msgid "Keymap"
 msgstr "Table"
 
-#: src/config/dialogs.c:831
+#: src/config/dialogs.c:844
 msgid "Keystroke already used"
 msgstr "Touche déjŕ utilisée"
 
-#: src/config/dialogs.c:832
+#: src/config/dialogs.c:845
 #, c-format
 msgid ""
 "The keystroke \"%s\" is currently used for \"%s\".\n"
@@ -1942,26 +1942,25 @@ msgstr ""
 "La combinaison de touches \"%s\" est déjŕ utilisée pour l'action \"%s\".\n"
 "Etes-vous sűr de vouloir la remplacer ?"
 
-#: src/config/dialogs.c:855 src/config/dialogs.c:872 src/config/dialogs.c:909
+#: src/config/dialogs.c:870 src/config/dialogs.c:887 src/config/dialogs.c:923
 msgid "Add keybinding"
 msgstr "Ajouter une association de touches"
 
-#: src/config/dialogs.c:856
+#: src/config/dialogs.c:871
 msgid "Invalid keystroke."
 msgstr "Touche invalide."
 
-#: src/config/dialogs.c:873
+#: src/config/dialogs.c:888
 msgid "Need to select a keymap."
 msgstr "Vous devez sélectionner une table."
 
-#: src/config/dialogs.c:895
+#: src/config/dialogs.c:910
 #, c-format
 msgid ""
 "Action: %s\n"
 "Keymap: %s\n"
 "\n"
-"Keystroke should be written in the format: [Prefix-]Key\n"
-"Prefix: Shift, Ctrl, Alt\n"
+"Keystroke should be written in the format: [Shift-][Ctrl-][Alt-]Key\n"
 "Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
 "\n"
 "Keystroke"
@@ -1970,18 +1969,17 @@ msgstr ""
 "Table: %s\n"
 "\n"
 "La combinaison de touches doit ętre écrite dans le format suivant:\n"
-"[Préfixe-]Touche\n"
-"Préfixes: Shift, Ctrl, Alt\n"
-"Touches: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
+"[Shift-][Ctrl-][Alt-]Touche\n"
+"Touche: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
 "\n"
 "Combinaison de touches"
 
 #. accelerator_context(menu_keys, src/config/dialogs.c:keybinding_buttons, src/globhist/dialogs.c:globhist_buttons)
-#: src/config/dialogs.c:947 src/dialogs/info.c:135 src/globhist/dialogs.c:231
+#: src/config/dialogs.c:961 src/dialogs/info.c:135 src/globhist/dialogs.c:231
 msgid "~Toggle display"
 msgstr "Co~mmuter affich."
 
-#: src/config/dialogs.c:954
+#: src/config/dialogs.c:968
 msgid "Keybinding manager"
 msgstr "Gestionnaire d'assoc. de touches"
 
@@ -2020,19 +2018,19 @@ msgstr "Edition"
 msgid "Menu mapping"
 msgstr "Menu"
 
-#: src/config/kbdbind.c:556
+#: src/config/kbdbind.c:566
 msgid "Unrecognised keymap"
 msgstr "Table d'associations de touches non reconnue"
 
-#: src/config/kbdbind.c:559
+#: src/config/kbdbind.c:569
 msgid "Error parsing keystroke"
 msgstr "Erreur d'interprétation de touche"
 
-#: src/config/kbdbind.c:563
+#: src/config/kbdbind.c:573
 msgid "Unrecognised action (internal error)"
 msgstr "Action non reconnue (erreur interne)"
 
-#: src/config/kbdbind.c:579
+#: src/config/kbdbind.c:589
 msgid "Error registering event"
 msgstr "Erreur d'enregistrement d'événement"
 
@@ -8647,32 +8645,32 @@ msgstr "Aucun lien dans le document courant"
 msgid "Search for text"
 msgstr "Recherche du texte"
 
-#: src/viewer/text/search.c:1659
+#: src/viewer/text/search.c:1660
 msgid "Normal search"
 msgstr "Plein texte"
 
-#: src/viewer/text/search.c:1660
+#: src/viewer/text/search.c:1661
 msgid "Regexp search"
 msgstr "Expression réguličre"
 
-#: src/viewer/text/search.c:1661
+#: src/viewer/text/search.c:1662
 msgid "Extended regexp search"
 msgstr "Expression réguličre étendue"
 
-#: src/viewer/text/search.c:1662
+#: src/viewer/text/search.c:1663
 msgid "Case sensitive"
 msgstr "Respecter la casse"
 
-#: src/viewer/text/search.c:1663
+#: src/viewer/text/search.c:1664
 msgid "Case insensitive"
 msgstr "Ignorer la casse"
 
-#: src/viewer/text/search.c:1687
+#: src/viewer/text/search.c:1688
 msgid "Search backward"
 msgstr "Chercher en arričre"
 
 #. name:
-#: src/viewer/text/search.c:1726
+#: src/viewer/text/search.c:1727
 msgid "Search History"
 msgstr "Historique des recherches"
 
@@ -8699,19 +8697,19 @@ msgstr ""
 "Votre entrée a été tronquée, mais vous pouvez toujours récupérer le texte "
 "que vous avez entré dans le fichier suivant: %s"
 
-#: src/viewer/text/view.c:727
+#: src/viewer/text/view.c:728
 msgid "Go to link"
 msgstr "Aller au lien"
 
-#: src/viewer/text/view.c:727
+#: src/viewer/text/view.c:728
 msgid "Enter link number"
 msgstr "Entrez un numéro de lien"
 
-#: src/viewer/text/view.c:1311
+#: src/viewer/text/view.c:1313
 msgid "Save error"
 msgstr "Erreur lors de la sauvegarde"
 
-#: src/viewer/text/view.c:1312
+#: src/viewer/text/view.c:1314
 msgid "Error writing to file"
 msgstr "Erreur lors de l'écriture du fichier"
 

From c5c36eba88b1fdeb8154973924fa974d7bbda07c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 17:16:10 +0300
Subject: [PATCH 027/132] terminal: Define term_event_key_T as int32_t, not
 int.

int might be 16-bit and that is not enough.
---
 src/terminal/kbd.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index a4aeb153..4bea2992 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -7,8 +7,12 @@ struct itrm;
  * Values between -0xFF and -2 are not used yet; treat as special.
  * Value  == -1 is KBD_UNDEF; not sent via socket. 
  * Values >= 0 are characters received from the terminal;
- * in UCS-4 #ifdef CONFIG_UTF_8. */
-typedef int term_event_key_T;
+ * in UCS-4 #ifdef CONFIG_UTF_8.
+ *
+ * Any at least 32-bit signed integer type would work here; using an
+ * exact-width type hurts portability in principle, but some other
+ * parts of ELinks already require the existence of uint32_t.  */
+typedef int32_t term_event_key_T;
 
 struct term_event_keyboard {
 	term_event_key_T key;

From f290ff560840de430b2c3536bca43aafec4b49b2 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 19:03:09 +0300
Subject: [PATCH 028/132] terminal: New enum term_event_special_key.

This makes constants like KBD_ENTER visible to the debugger, at least
when compiled with GCC.
---
 src/terminal/event.h |  6 ++--
 src/terminal/kbd.c   |  8 +++++
 src/terminal/kbd.h   | 72 ++++++++++++++++++++++++--------------------
 3 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/terminal/event.h b/src/terminal/event.h
index 8125b1b0..a3bfab4f 100644
--- a/src/terminal/event.h
+++ b/src/terminal/event.h
@@ -78,8 +78,10 @@ set_kbd_term_event(struct term_event *ev, int key, int modifier)
 	kbd_set(&ev->info.keyboard, key, modifier);
 }
 
-/* @key can be e.g. KBD_ENTER as in term_event_keyboard.key.
- * This function then sets ev->info.keyboard.key = -KBD_ENTER.  */
+/* @key can be either a 8-bit byte or a value from enum term_event_special_key.
+ * In the latter case, this function negates the value, unless it is KBD_UNDEF.
+ * For example, key == KBD_ENTER results in ev->info.keyboard.key = -KBD_ENTER.
+ * This mapping keeps the interlink protocol compatible with ELinks 0.11.  */
 static inline void
 set_kbd_interlink_event(struct interlink_event *ev, int key, int modifier)
 {
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index 07fd3056..87c89245 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -48,6 +48,14 @@ static int process_queue(struct itrm *);
 static void handle_itrm_stdin(struct itrm *);
 static void unhandle_itrm_stdin(struct itrm *);
 
+#ifdef CONFIG_DEBUG
+/* This hack makes GCC put enum term_event_special_key in the debug
+ * information even though it is not otherwise used.  The const
+ * prevents an unused-variable warning.  */
+static const enum term_event_special_key dummy_term_event_special_key;
+#endif
+
+
 int
 is_blocked(void)
 {
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index 4bea2992..fbda0eb0 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -3,11 +3,11 @@
 
 struct itrm;
 
-/* Values <= -0x100 are special; e.g. KBD_ENTER.
+/* Values <= -0x100 are special; from enum term_event_special_key.
  * Values between -0xFF and -2 are not used yet; treat as special.
  * Value  == -1 is KBD_UNDEF; not sent via socket. 
  * Values >= 0 are characters received from the terminal;
- * in UCS-4 #ifdef CONFIG_UTF_8.
+ * in UCS-4 #ifdef CONFIG_UTF_8.  Test with is_kbd_character().
  *
  * Any at least 32-bit signed integer type would work here; using an
  * exact-width type hurts portability in principle, but some other
@@ -23,48 +23,54 @@ struct interlink_event_keyboard {
 	/* Values <= -2 are not used, for ELinks 0.11 compatibility.
 	 * Value  == -1 is KBD_UNDEF; not sent via socket.
 	 * Values between 0 and 0xFF are bytes received from the terminal.
-	 * Values >= 0x100 are special; e.g. -KBD_ENTER.  */
+	 * Values >= 0x100 are special; absolute values of constants
+	 * from enum term_event_special_key, e.g. -KBD_ENTER.  */
 	int key;
 	int modifier;
 };
 
-/* Values for term_event_key_T */
+/* Codes of special keys, for use in term_event_key_T.
+ * The enum has a tag mainly to let you cast numbers to it in GDB and see
+ * their names.  ELinks doesn't use this enum type as term_event_key_T,
+ * because it might be 16-bit and Unicode characters wouldn't then fit.  */
+enum term_event_special_key {
+	KBD_UNDEF 	= -1,
 
-#define KBD_UNDEF	-1
+	KBD_ENTER	= -0x100,
+	KBD_BS		= -0x101,
+	KBD_TAB		= -0x102,
+	KBD_ESC		= -0x103,
+	KBD_LEFT	= -0x104,
+	KBD_RIGHT	= -0x105,
+	KBD_UP		= -0x106,
+	KBD_DOWN	= -0x107,
+	KBD_INS		= -0x108,
+	KBD_DEL		= -0x109,
+	KBD_HOME	= -0x10a,
+	KBD_END		= -0x10b,
+	KBD_PAGE_UP	= -0x10c,
+	KBD_PAGE_DOWN	= -0x10d,
 
-#define KBD_ENTER	(-0x100)
-#define KBD_BS		(-0x101)
-#define KBD_TAB		(-0x102)
-#define KBD_ESC		(-0x103)
-#define KBD_LEFT	(-0x104)
-#define KBD_RIGHT	(-0x105)
-#define KBD_UP		(-0x106)
-#define KBD_DOWN	(-0x107)
-#define KBD_INS		(-0x108)
-#define KBD_DEL		(-0x109)
-#define KBD_HOME	(-0x10a)
-#define KBD_END		(-0x10b)
-#define KBD_PAGE_UP	(-0x10c)
-#define KBD_PAGE_DOWN	(-0x10d)
+	KBD_F1		= -0x120,
+	KBD_F2		= -0x121,
+	KBD_F3		= -0x122,
+	KBD_F4		= -0x123,
+	KBD_F5		= -0x124,
+	KBD_F6		= -0x125,
+	KBD_F7		= -0x126,
+	KBD_F8		= -0x127,
+	KBD_F9		= -0x128,
+	KBD_F10		= -0x129,
+	KBD_F11		= -0x12a,
+	KBD_F12		= -0x12b,
+
+	KBD_CTRL_C	= -0x200
+};
 
-#define KBD_F1		(-0x120)
-#define KBD_F2		(-0x121)
-#define KBD_F3		(-0x122)
-#define KBD_F4		(-0x123)
-#define KBD_F5		(-0x124)
-#define KBD_F6		(-0x125)
-#define KBD_F7		(-0x126)
-#define KBD_F8		(-0x127)
-#define KBD_F9		(-0x128)
-#define KBD_F10		(-0x129)
-#define KBD_F11		(-0x12a)
-#define KBD_F12		(-0x12b)
 static inline int is_kbd_fkey(term_event_key_T key) { return key <= KBD_F1 && key >= KBD_F12; }
 #define number_to_kbd_fkey(num) (KBD_F1 - (num) + 1)
 #define kbd_fkey_to_number(key) (KBD_F1 - (key) + 1)
 
-#define KBD_CTRL_C	(-0x200)
-
 /* int is_kbd_character(term_event_key_T key);
  * Return true if @key is a character in some charset, rather than a
  * special key.  The character is not necessarily printable.  As for

From c8584a1c7e05cd43459b792247ceb5c1e53a6487 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 19:41:46 +0300
Subject: [PATCH 029/132] terminal: New type term_event_modifier_T.

KBD_MOD_NONE and related constants are now also visible in GDB.
---
 src/terminal/event.c |  7 ++++---
 src/terminal/event.h |  8 +++++---
 src/terminal/kbd.c   |  8 +++++++-
 src/terminal/kbd.h   | 21 +++++++++++++--------
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/terminal/event.c b/src/terminal/event.c
index ac7794b7..d7da3d77 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -49,7 +49,7 @@ struct terminal_interlink {
 		 * ELinks sees e.g. ESC U+00F6 as 0x1B 0xC3 0xB6 and
 		 * converts it to Alt-0xC3 0xB6, attaching the
 		 * modifier to the first byte only.  */
-		int modifier;
+		term_event_modifier_T modifier;
 	} utf_8;
 
 	/* This is the queue of events as coming from the other ELinks instance
@@ -133,7 +133,8 @@ term_send_event(struct terminal *term, struct term_event *ev)
 }
 
 static void
-term_send_ucs(struct terminal *term, unicode_val_T u, int modifier)
+term_send_ucs(struct terminal *term, unicode_val_T u,
+	      term_event_modifier_T modifier)
 {
 #ifdef CONFIG_UTF_8
 	struct term_event ev;
@@ -277,7 +278,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 	{
 		int utf8_io = -1;
 		int key = ilev->info.keyboard.key;
-		int modifier = ilev->info.keyboard.modifier;
+		term_event_modifier_T modifier = ilev->info.keyboard.modifier;
 
 		if (key >= 0x100)
 			key = -key;
diff --git a/src/terminal/event.h b/src/terminal/event.h
index a3bfab4f..152b4567 100644
--- a/src/terminal/event.h
+++ b/src/terminal/event.h
@@ -71,19 +71,21 @@ set_mouse_interlink_event(struct interlink_event *ev, int x, int y, unsigned int
 }
 
 static inline void
-set_kbd_term_event(struct term_event *ev, int key, int modifier)
+set_kbd_term_event(struct term_event *ev, int key,
+		   term_event_modifier_T modifier)
 {
 	memset(ev, 0, sizeof(*ev));
 	ev->ev = EVENT_KBD;
 	kbd_set(&ev->info.keyboard, key, modifier);
 }
 
-/* @key can be either a 8-bit byte or a value from enum term_event_special_key.
+/* @key can be either an 8-bit byte or a value from enum term_event_special_key.
  * In the latter case, this function negates the value, unless it is KBD_UNDEF.
  * For example, key == KBD_ENTER results in ev->info.keyboard.key = -KBD_ENTER.
  * This mapping keeps the interlink protocol compatible with ELinks 0.11.  */
 static inline void
-set_kbd_interlink_event(struct interlink_event *ev, int key, int modifier)
+set_kbd_interlink_event(struct interlink_event *ev, int key,
+			term_event_modifier_T modifier)
 {
 	memset(ev, 0, sizeof(*ev));
 	ev->ev = EVENT_KBD;
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index 87c89245..5e593d86 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -841,8 +841,14 @@ decode_terminal_application_key(struct itrm *itrm, struct interlink_event *ev)
 }
 
 
+/* Initialize *@ev to match the byte @key received from the terminal.
+ * Actually, @key could also be a value from enum term_event_special_key;
+ * but callers that use those values generally don't need the mapping
+ * provided by this function, so they call set_kbd_interlink_event()
+ * directly.  */
 static void
-set_kbd_event(struct interlink_event *ev, int key, int modifier)
+set_kbd_event(struct interlink_event *ev,
+	      int key, term_event_modifier_T modifier)
 {
 	switch (key) {
 	case ASCII_TAB:
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index fbda0eb0..c43a250d 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -14,9 +14,18 @@ struct itrm;
  * parts of ELinks already require the existence of uint32_t.  */
 typedef int32_t term_event_key_T;
 
+/* Values for term_event_keyboard.modifier and
+ * interlink_event_keyboard.modifier */
+typedef enum {
+	KBD_MOD_NONE	= 0,
+	KBD_MOD_SHIFT	= 1,
+	KBD_MOD_CTRL	= 2,
+	KBD_MOD_ALT	= 4
+} term_event_modifier_T;
+
 struct term_event_keyboard {
 	term_event_key_T key;
-	int modifier;
+	term_event_modifier_T modifier;
 };
 
 struct interlink_event_keyboard {
@@ -26,6 +35,9 @@ struct interlink_event_keyboard {
 	 * Values >= 0x100 are special; absolute values of constants
 	 * from enum term_event_special_key, e.g. -KBD_ENTER.  */
 	int key;
+	/* The values are from term_event_modifier_T, but the type
+	 * must be int so that the representation remains compatible
+	 * with ELinks 0.11.  */
 	int modifier;
 };
 
@@ -77,13 +89,6 @@ static inline int is_kbd_fkey(term_event_key_T key) { return key <= KBD_F1 && ke
  * which charset it is in, see the definition of term_event_key_T.  */
 #define is_kbd_character(key) ((key) >= 0)
 
-/* Values for term_event_keyboard.modifier and
- * interlink_event_keyboard.modifier */
-#define KBD_MOD_NONE	0
-#define KBD_MOD_SHIFT	1
-#define KBD_MOD_CTRL	2
-#define KBD_MOD_ALT	4
-
 void
 handle_trm(int std_in, int std_out, int sock_in, int sock_out, int ctl_in,
 	   void *init_string, int init_len, int remote);

From 4d80fe645327c071f53ea2b4f4c4ccfd389cdf73 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 20:30:19 +0300
Subject: [PATCH 030/132] BFU UTF-8: select_button_by_key() folds the case of
 Unicode characters.

This causes the documented-slow cp2u() to be called in a loop, which
fortunately doesn't have very many iterations.  If this is too slow,
then cp2u() can be rewritten, or the hotkeys can be cached in struct
widget or struct widget_data.

Note that check_kbd_label_key() does not yet allow non-ASCII
characters when CONFIG_UTF_8 is defined.  Before they are allowed,
menu.c should also be updated.
---
 src/bfu/dialog.c | 45 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index 289f4b66..eab5e81c 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -285,16 +285,33 @@ select_button_by_flag(struct dialog_data *dlg_data, int flag)
 static void
 select_button_by_key(struct dialog_data *dlg_data)
 {
+#ifdef CONFIG_UTF_8
+	unicode_val_T key;
+	int codepage;
+#else
 	unsigned char key;
+#endif
+	
 	struct widget_data *widget_data;
 	struct term_event *ev = dlg_data->term_event;
 
 	if (!check_kbd_label_key(ev)) return;
 
+#ifdef CONFIG_UTF_8
+	key = unicode_fold_label_case(get_kbd_key(ev));
+	codepage = get_opt_codepage_tree(dlg_data->win->term->spec, "charset");
+#else
 	key = toupper(get_kbd_key(ev));
+#endif
 
 	foreach_widget(dlg_data, widget_data) {
 		int hk_pos;
+		unsigned char *hk_ptr;
+#ifdef CONFIG_UTF_8
+		unicode_val_T hk_char;
+#else
+		unsigned char hk_char;
+#endif
 
 		if (widget_data->widget->type != WIDGET_BUTTON)
 			continue;
@@ -303,16 +320,26 @@ select_button_by_key(struct dialog_data *dlg_data)
 		 * one else we fallback to first character in button
 		 * name. */
 		hk_pos = widget_data->widget->info.button.hotkey_pos;
-		if (hk_pos >= 0) {
-			if (toupper(widget_data->widget->text[hk_pos + 1]) != key)
-				continue;
-		} else {
-			if (toupper(widget_data->widget->text[0]) != key)
-				continue;
-		}
+		if (hk_pos >= 0)
+			hk_ptr = &widget_data->widget->text[hk_pos + 1];
+		else
+			hk_ptr = widget_data->widget->text;
 
-		select_dlg_item(dlg_data, widget_data);
-		break;
+#ifdef CONFIG_UTF_8
+		if (is_cp_utf8(codepage))
+			hk_char = utf_8_to_unicode(&hk_ptr,
+						   strchr(hk_ptr, '\0'));
+		else
+			hk_char = cp2u(codepage, *hk_ptr);
+		hk_char = unicode_fold_label_case(hk_char);
+#else
+		hk_char = toupper(*hk_ptr);
+#endif
+
+		if (hk_char == key) {
+			select_dlg_item(dlg_data, widget_data);
+			break;
+		}
 	}
 }
 

From 0fdba55e52b95e066dac46dd50e9f6573f435ce3 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 13 Aug 2006 20:57:35 +0200
Subject: [PATCH 031/132] Few whitespaces fixes.

---
 src/terminal/event.c | 4 ++--
 src/terminal/kbd.c   | 2 +-
 src/terminal/kbd.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/terminal/event.c b/src/terminal/event.c
index d7da3d77..0f534e52 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -236,7 +236,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 		 * terminal screen before decoding the session info so that
 		 * handling of bad URL syntax by openning msg_box() will be
 		 * possible. */
-		set_init_term_event(&tev, 
+		set_init_term_event(&tev,
 				    ilev->info.size.width,
 				    ilev->info.size.height);
 		term_send_event(term, &tev);
@@ -388,7 +388,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 			int len = 0;
 
 			/* The number of 1's between the first bit and first
-			 * 0 bit (exclusive) is the number of remaining 
+			 * 0 bit (exclusive) is the number of remaining
 			 * continuation bytes in the encoding of the character
 			 * that is now being processed, which number will be
 			 * stored in interlink->utf_8.len. */
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index 5e593d86..016efabd 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -1032,7 +1032,7 @@ process_queue(struct itrm *itrm)
 	if (ev.ev == EVENT_MOUSE || ev.info.keyboard.key != KBD_UNDEF)
 		itrm_queue_event(itrm, (char *) &ev, sizeof(ev));
 
- return_without_event:
+return_without_event:
 	if (el == -1) {
 		install_timer(&itrm->timer, ESC_TIMEOUT, (void (*)(void *)) kbd_timeout,
 			      itrm);
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index c43a250d..33fae62c 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -5,7 +5,7 @@ struct itrm;
 
 /* Values <= -0x100 are special; from enum term_event_special_key.
  * Values between -0xFF and -2 are not used yet; treat as special.
- * Value  == -1 is KBD_UNDEF; not sent via socket. 
+ * Value  == -1 is KBD_UNDEF; not sent via socket.
  * Values >= 0 are characters received from the terminal;
  * in UCS-4 #ifdef CONFIG_UTF_8.  Test with is_kbd_character().
  *

From 7ebc8d8281b92c00bf5162772f1e3f0c8183c4bc Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 23:23:54 +0300
Subject: [PATCH 032/132] terminal UTF-8: New type term_event_char_T.

It is either unicode_val_T or unsigned char.
---
 src/bfu/dialog.c   | 10 ++--------
 src/terminal/kbd.h | 25 +++++++++++++++++++------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index eab5e81c..80e874c0 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -285,11 +285,9 @@ select_button_by_flag(struct dialog_data *dlg_data, int flag)
 static void
 select_button_by_key(struct dialog_data *dlg_data)
 {
+	term_event_char_T key;
 #ifdef CONFIG_UTF_8
-	unicode_val_T key;
 	int codepage;
-#else
-	unsigned char key;
 #endif
 	
 	struct widget_data *widget_data;
@@ -307,11 +305,7 @@ select_button_by_key(struct dialog_data *dlg_data)
 	foreach_widget(dlg_data, widget_data) {
 		int hk_pos;
 		unsigned char *hk_ptr;
-#ifdef CONFIG_UTF_8
-		unicode_val_T hk_char;
-#else
-		unsigned char hk_char;
-#endif
+		term_event_char_T hk_char;
 
 		if (widget_data->widget->type != WIDGET_BUTTON)
 			continue;
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index c43a250d..769226ed 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -1,13 +1,25 @@
 #ifndef EL__TERMINAL_KBD_H
 #define EL__TERMINAL_KBD_H
 
+#include "intl/charsets.h"
+
 struct itrm;
 
-/* Values <= -0x100 are special; from enum term_event_special_key.
+/* A character received from a terminal.  */
+#ifdef CONFIG_UTF_8
+typedef unicode_val_T term_event_char_T; /* in UCS-4 */
+#else
+typedef unsigned char term_event_char_T; /* in the charset of the terminal */
+#endif
+
+/* A key received from a terminal, without modifiers.  The value is
+ * either from term_event_char_T or from enum term_event_special_key.
+ * To check which one it is, use is_kbd_character(). 
+ *
+ * Values <= -0x100 are special; from enum term_event_special_key.
  * Values between -0xFF and -2 are not used yet; treat as special.
  * Value  == -1 is KBD_UNDEF; not sent via socket. 
- * Values >= 0 are characters received from the terminal;
- * in UCS-4 #ifdef CONFIG_UTF_8.  Test with is_kbd_character().
+ * Values >= 0 are characters; from term_event_char_T.
  *
  * Any at least 32-bit signed integer type would work here; using an
  * exact-width type hurts portability in principle, but some other
@@ -84,9 +96,10 @@ static inline int is_kbd_fkey(term_event_key_T key) { return key <= KBD_F1 && ke
 #define kbd_fkey_to_number(key) (KBD_F1 - (key) + 1)
 
 /* int is_kbd_character(term_event_key_T key);
- * Return true if @key is a character in some charset, rather than a
- * special key.  The character is not necessarily printable.  As for
- * which charset it is in, see the definition of term_event_key_T.  */
+ * Check whether @key is a character or a special key.
+ * Return true if @key is a character from term_event_char_T.
+ * (The character is not necessarily printable.)
+ * Return false if @key is a special key from enum term_event_special_key.  */
 #define is_kbd_character(key) ((key) >= 0)
 
 void

From 3b54979481cdd56af536eb6eb52e04a1167f5e12 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 23:25:52 +0300
Subject: [PATCH 033/132] terminal doc: More documentation for keyboard event
 structures.

---
 src/terminal/kbd.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index 769226ed..3bf1e649 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -35,13 +35,24 @@ typedef enum {
 	KBD_MOD_ALT	= 4
 } term_event_modifier_T;
 
+/* A key received from a terminal, with modifiers.  */
 struct term_event_keyboard {
 	term_event_key_T key;
 	term_event_modifier_T modifier;
 };
 
+/* Like struct term_event_keyboard but used in the interlink protocol
+ * between ELinks processes.  Because the processes may be running
+ * different versions of ELinks, especially if a new version has just
+ * been installed, this structure should be kept binary compatible as
+ * long as possible.  See bug 793 for a list of pending changes to the
+ * protocol.  */
 struct interlink_event_keyboard {
-	/* Values <= -2 are not used, for ELinks 0.11 compatibility.
+	/* This is like term_event_key_T but carries individual bytes
+	 * rather than entire characters, and uses different values
+	 * for special keys.
+	 *
+	 * Values <= -2 are not used, for ELinks 0.11 compatibility.
 	 * Value  == -1 is KBD_UNDEF; not sent via socket.
 	 * Values between 0 and 0xFF are bytes received from the terminal.
 	 * Values >= 0x100 are special; absolute values of constants

From b6447ae26b59f8e3ad3da306b72cb0a199398ef5 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 23:35:50 +0300
Subject: [PATCH 034/132] UTF-8: New function cp_to_unicode().

---
 src/bfu/dialog.c    |  7 ++-----
 src/intl/charsets.c | 19 +++++++++++++++++++
 src/intl/charsets.h |  1 +
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index 80e874c0..fad2d7dd 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -320,11 +320,8 @@ select_button_by_key(struct dialog_data *dlg_data)
 			hk_ptr = widget_data->widget->text;
 
 #ifdef CONFIG_UTF_8
-		if (is_cp_utf8(codepage))
-			hk_char = utf_8_to_unicode(&hk_ptr,
-						   strchr(hk_ptr, '\0'));
-		else
-			hk_char = cp2u(codepage, *hk_ptr);
+		hk_char = cp_to_unicode(codepage, &hk_ptr,
+					strchr(hk_ptr, '\0'));
 		hk_char = unicode_fold_label_case(hk_char);
 #else
 		hk_char = toupper(*hk_ptr);
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 8fd19f9b..5809403e 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -522,6 +522,25 @@ cp2utf_8(int from, int c)
 	return encode_utf_8(cp2u_shared(&codepages[from], c));
 }
 
+#ifdef CONFIG_UTF_8
+unicode_val_T
+cp_to_unicode(int codepage, unsigned char **string, unsigned char *end)
+{
+	if (is_cp_utf8(codepage))
+		return utf_8_to_unicode(string, end);
+	else {
+		if (*string >= end)
+			return UCS_NO_CHAR;
+		else {
+			unicode_val_T ret = cp2u(codepage, **string);
+			++*string;
+			return ret;
+		}
+	}
+}
+#endif	/* CONFIG_UTF_8 */
+
+
 static void
 add_utf_8(struct conv_table *ct, unicode_val_T u, unsigned char *str)
 {
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index 16bc8664..6a28c8ae 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -65,6 +65,7 @@ inline int unicode_to_cell(unicode_val_T);
 unicode_val_T unicode_fold_label_case(unicode_val_T);
 inline int strlen_utf8(unsigned char **);
 inline unicode_val_T utf_8_to_unicode(unsigned char **, unsigned char *);
+unicode_val_T cp_to_unicode(int, unsigned char **, unsigned char *);
 #endif /* CONFIG_UTF_8 */
 
 unicode_val_T cp2u(int, unsigned char);

From 85d4c5679c85a9263c254f6e1bf5050ab4b96446 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 23:41:48 +0300
Subject: [PATCH 035/132] UTF-8 doc: unicode_fold_label_case() may be called
 for any Unicode character.

It cannot be restricted just to characters that have passed
check_kbd_label_key(), because hotkeys in strings received from
gettext must also be processed with it, and there we don't have
a struct term_event for check_kbd_label_key().
---
 src/intl/charsets.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 5809403e..1ece9502 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -408,8 +408,7 @@ unicode_to_cell(unicode_val_T c)
 }
 
 /* Fold the case of a Unicode character, so that hotkeys in labels can
- * be compared case-insensitively.  This should be called only if
- * check_kbd_label_key(c) is true.  It is unspecified whether the
+ * be compared case-insensitively.  It is unspecified whether the
  * result will be in upper or lower case.  */
 unicode_val_T
 unicode_fold_label_case(unicode_val_T c)

From 6773c8505d435b7a7ff756d39ddaaa1d75b61625 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 23:45:41 +0300
Subject: [PATCH 036/132] BFU UTF-8: check_hotkeys_common() compares hotkeys as
 Unicode.

---
 src/bfu/hotkey.c | 30 ++++++++++++++++++++++++------
 src/bfu/hotkey.h |  6 ++++--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/bfu/hotkey.c b/src/bfu/hotkey.c
index 0c3078de..4feaac79 100644
--- a/src/bfu/hotkey.c
+++ b/src/bfu/hotkey.c
@@ -122,10 +122,15 @@ refresh_hotkeys(struct terminal *term, struct menu *menu)
 }
 
 static int
-check_hotkeys_common(struct menu *menu, unsigned char hotkey, struct terminal *term,
+check_hotkeys_common(struct menu *menu, term_event_char_T hotkey, struct terminal *term,
 		     int check_mode)
 {
+#ifdef CONFIG_UTF_8
+	unicode_val_T key = unicode_fold_label_case(hotkey);
+	int codepage = get_opt_codepage_tree(term->spec, "charset");
+#else
 	unsigned char key = toupper(hotkey);
+#endif
 	int i = menu->selected;
 	int start;
 
@@ -138,6 +143,9 @@ check_hotkeys_common(struct menu *menu, unsigned char hotkey, struct terminal *t
 	do {
 		struct menu_item *item;
 		unsigned char *text;
+#ifdef CONFIG_UTF_8
+		unicode_val_T items_hotkey;
+#endif
 		int found;
 
 		if (++i == menu->size) i = 0;
@@ -150,6 +158,8 @@ check_hotkeys_common(struct menu *menu, unsigned char hotkey, struct terminal *t
 		if (mi_text_translate(item)) text = _(text, term);
 		if (!text || !*text) continue;
 
+		/* Change @text to point to the character that should
+		 * be compared to @key.  */
 		if (check_mode == 0) {
 			/* Does the key (upcased) matches one of the
 			 * hotkeys in menu ? */
@@ -158,14 +168,22 @@ check_hotkeys_common(struct menu *menu, unsigned char hotkey, struct terminal *t
 #ifdef CONFIG_DEBUG
 			if (key_pos < 0) key_pos = -key_pos;
 #endif
-			found = (key_pos && (toupper(text[key_pos]) == key));
-
+			if (!key_pos) continue;
+			text += key_pos;
 		} else {
 			/* Does the key (upcased) matches first letter
 			 * of menu item left text ? */
-			found = (toupper(*text) == key);
 		}
 
+		/* Compare @key to the character to which @text points.  */
+#ifdef CONFIG_UTF_8
+		items_hotkey = cp_to_unicode(codepage, &text,
+					     strchr(text, '\0'));
+		found = (unicode_fold_label_case(items_hotkey) == key);
+#else
+		found = (toupper(*text) == key);
+#endif		
+
 		if (found) {
 			menu->selected = i;
 			return 1;
@@ -178,7 +196,7 @@ check_hotkeys_common(struct menu *menu, unsigned char hotkey, struct terminal *t
 
 /* Returns true if a hotkey was found in the menu, and set menu->selected. */
 int
-check_hotkeys(struct menu *menu, unsigned char key, struct terminal *term)
+check_hotkeys(struct menu *menu, term_event_char_T key, struct terminal *term)
 {
 	return check_hotkeys_common(menu, key, term, 0);
 }
@@ -188,7 +206,7 @@ check_hotkeys(struct menu *menu, unsigned char key, struct terminal *term)
  * to selected entry.
  * It returns 1 if found and set menu->selected. */
 int
-check_not_so_hot_keys(struct menu *menu, unsigned char key, struct terminal *term)
+check_not_so_hot_keys(struct menu *menu, term_event_char_T key, struct terminal *term)
 {
 	return check_hotkeys_common(menu, key, term, 1);
 }
diff --git a/src/bfu/hotkey.h b/src/bfu/hotkey.h
index 8ddca989..24a8352c 100644
--- a/src/bfu/hotkey.h
+++ b/src/bfu/hotkey.h
@@ -3,6 +3,8 @@
 #ifndef EL__BFU_HOTKEY_H
 #define EL__BFU_HOTKEY_H
 
+#include "terminal/kbd.h"
+
 struct menu;
 struct terminal;
 
@@ -13,7 +15,7 @@ void clear_hotkeys_cache(struct menu *menu);
 #endif
 void refresh_hotkeys(struct terminal *term, struct menu *menu);
 /* int is_hotkey(struct menu_item *item, unsigned char key, struct terminal *term); */
-int check_hotkeys(struct menu *menu, unsigned char hotkey, struct terminal *term);
-int check_not_so_hot_keys(struct menu *menu, unsigned char key, struct terminal *term);
+int check_hotkeys(struct menu *menu, term_event_char_T hotkey, struct terminal *term);
+int check_not_so_hot_keys(struct menu *menu, term_event_char_T key, struct terminal *term);
 
 #endif

From 5737cc546b3c798367f4225bcf736690e630102d Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 13 Aug 2006 23:48:18 +0300
Subject: [PATCH 037/132] terminal UTF-8: check_kbd_label_key() allows
 non-ASCII characters again.

All of its callers now use unicode_fold_label_case() rather than toupper(),
if CONFIG_UTF_8 is defined.
---
 src/terminal/event.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/terminal/event.h b/src/terminal/event.h
index 152b4567..8599b55c 100644
--- a/src/terminal/event.h
+++ b/src/terminal/event.h
@@ -170,17 +170,7 @@ void in_term(struct terminal *);
 #define check_kbd_modifier(event, mod)	(kbd_modifier_is(&(event)->info.keyboard, (mod)))
 
 #define check_kbd_textinput_key(event)	(get_kbd_key(event) >= ' ' && check_kbd_modifier(event, KBD_MOD_NONE))
-#ifdef CONFIG_UTF_8
-/* We must currently limit hotkeys of labels to ASCII, because
- * get_kbd_key(event) is in UCS-4 and various event handlers pass it
- * to toupper() if check_kbd_label_key() returns true.
- * TO DO: Change the event handlers to use unicode_fold_label_case()
- * instead.  The code that extracts the hotkey from the label string
- * will also have to be changed.  */
-#define check_kbd_label_key(event)	(get_kbd_key(event) > ' ' && get_kbd_key(event) <= 0x7F && (check_kbd_modifier(event, KBD_MOD_NONE) || check_kbd_modifier(event, KBD_MOD_ALT)))
-#else  /* !CONFIG_UTF_8 */
 #define check_kbd_label_key(event)	(get_kbd_key(event) > ' ' && (check_kbd_modifier(event, KBD_MOD_NONE) || check_kbd_modifier(event, KBD_MOD_ALT)))
-#endif /* !CONFIG_UTF_8 */
 
 
 /* For mouse events handling */

From 8a8fc52eec3cdc757662fd10c46e8fa19110f4f0 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 14 Aug 2006 02:19:10 +0200
Subject: [PATCH 038/132] cp_to_unicode: Simplify and cleanup

---
 src/intl/charsets.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 1ece9502..fb8faba3 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -525,17 +525,17 @@ cp2utf_8(int from, int c)
 unicode_val_T
 cp_to_unicode(int codepage, unsigned char **string, unsigned char *end)
 {
+	unicode_val_T ret;
+
 	if (is_cp_utf8(codepage))
 		return utf_8_to_unicode(string, end);
-	else {
-		if (*string >= end)
-			return UCS_NO_CHAR;
-		else {
-			unicode_val_T ret = cp2u(codepage, **string);
-			++*string;
-			return ret;
-		}
-	}
+
+	if (*string >= end)
+		return UCS_NO_CHAR;
+
+	ret = cp2u(codepage, **string);
+	++*string;
+	return ret;
 }
 #endif	/* CONFIG_UTF_8 */
 

From 0cca8d4af067f7bf252ffde9f641ebf67275d21d Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Mon, 14 Aug 2006 07:59:10 +0000
Subject: [PATCH 039/132] Call set_screen_dirty in draw_link

I dropped this in c91c763d49bc7cd01aa06c0dabbd15fecc97da80, but it seems
necessary to fix some drawing artefacts exhibited with a local patch.
---
 src/viewer/text/link.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 99163fa1..42d5c39b 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -293,6 +293,7 @@ draw_link(struct terminal *term, struct document_view *doc_view,
 
 			ch = get_char(term, x + xpos, y + ypos);
 			copy_struct(ch, &doc_view->document->data[y].chars[x]);
+			set_screen_dirty(term->screen, y + ypos, y + ypos);
 		}
 	}
 }

From c8c83250926c72100d099b1fa360a728a3c9e27c Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Mon, 14 Aug 2006 16:10:24 +0200
Subject: [PATCH 040/132] Fix assertion failure related to closing all tabs but
 the current

Decrement term->current_tab before calling delete_window() instead of after
deleting all backgrounded tabs, so get_tab_by_number() will see a
consistent value.
---
 src/terminal/tab.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/terminal/tab.c b/src/terminal/tab.c
index 7b021d0f..e6825b55 100644
--- a/src/terminal/tab.c
+++ b/src/terminal/tab.c
@@ -223,11 +223,17 @@ really_close_tabs(struct session *ses)
 
 	foreach_tab (tab, term->windows) {
 		if (tab == current) continue;
+
+		/* Update the current tab counter so assertions in the
+		 * delete_window() call-chain will hold, namely the one in
+		 * get_tab_by_number().  */
+		if (term->current_tab > 0)
+			term->current_tab--;
+
 		tab = tab->prev;
 		delete_window(tab->next);
 	}
 
-	term->current_tab = 0;
 	redraw_terminal(term);
 }
 

From e53b7416d6a40a7d2e1a079643e622849975ff5d Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Wed, 16 Aug 2006 20:19:58 +0000
Subject: [PATCH 041/132] Fix -dump with charsets other than UTF-8

Restring the spaghetti in dump_to_file to fix a bug that was introduced
in commit 2a6125e3d0407b588eb286d4d0ff5c98c23ebda9 whereby when
document.dump.codepage != "utf-8", the document itself was not output,
only the references list.
---
 src/viewer/dump/dump.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/viewer/dump/dump.c b/src/viewer/dump/dump.c
index 86b65682..aa9159d7 100644
--- a/src/viewer/dump/dump.c
+++ b/src/viewer/dump/dump.c
@@ -799,6 +799,7 @@ utf_8:
 		if (write_char('\n', fd, buf, &bptr))
 			goto fail;
 	}
+ref:
 #endif /* CONFIG_UTF_8 */
 
 	if (hard_write(fd, buf, bptr) != bptr) {
@@ -806,9 +807,7 @@ fail:
 		mem_free(buf);
 		return -1;
 	}
-#ifdef CONFIG_UTF_8
-ref:
-#endif /* CONFIG_UTF_8 */
+
 	if (document->nlinks && get_opt_bool("document.dump.references")) {
 		int x;
 		unsigned char *header = "\nReferences\n\n   Visible links\n";

From 63d834c1d3f942e44814c4f7543f059a221ba64d Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Fri, 18 Aug 2006 19:37:35 +0200
Subject: [PATCH 042/132] Polish translation was updated.

---
 po/pl.po | 155 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 88 insertions(+), 67 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 82b689a1..f75629f5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@
 # Grzegorz Golawski <grzegol@pld.org.pl>
 # Jakub Bogusz <qboosh@pld-linux.org>, 2002-2006
 # Wojtek Bojdo/l <wojboj@lp.net.pl>
-# Witold Filipczyk <witekfl@pld-linux.org>, 2001 - 2004
+# Witold Filipczyk <witekfl@pld-linux.org>, 2002 - 2006
 # Adam Gołębiowski <adamg@pld-linux.org>, 2003-2006
 # Mikołaj Machowski <mikmach@wp.pl>, 2003
 #
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-11 21:01+0200\n"
-"PO-Revision-Date: 2006-06-30 22:00+0200\n"
+"POT-Creation-Date: 2006-08-18 19:30+0200\n"
+"PO-Revision-Date: 2006-08-18 20:00+0200\n"
 "Last-Translator: Witold Filipczyk <witekfl@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr "Wci
 #: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
 #: src/protocol/protocol.c:236 src/scripting/lua/core.c:379
 #: src/scripting/lua/core.c:460 src/session/session.c:806
-#: src/viewer/text/search.c:1665
+#: src/viewer/text/search.c:1666
 msgid "~OK"
 msgstr "~OK"
 
@@ -125,23 +125,23 @@ msgstr "B
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
-#: src/bfu/hierbox.c:870 src/config/dialogs.c:837 src/dialogs/menu.c:127
+#: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
-#: src/terminal/tab.c:213 src/terminal/tab.c:250
+#: src/terminal/tab.c:213 src/terminal/tab.c:256
 msgid "~Yes"
 msgstr "~Tak"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
-#: src/bfu/hierbox.c:871 src/config/dialogs.c:838 src/dialogs/menu.c:128
+#: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
-#: src/terminal/tab.c:214 src/terminal/tab.c:251
+#: src/terminal/tab.c:214 src/terminal/tab.c:257
 msgid "~No"
 msgstr "~Nie"
 
 #: src/bfu/hierbox.c:939 src/bfu/hierbox.c:970 src/viewer/text/search.c:1085
 #: src/viewer/text/search.c:1093 src/viewer/text/search.c:1109
-#: src/viewer/text/search.c:1684
+#: src/viewer/text/search.c:1685
 msgid "Search"
 msgstr "Szukaj"
 
@@ -185,7 +185,7 @@ msgstr "Musisz wpisa
 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
 #: src/scripting/lua/core.c:380 src/scripting/lua/core.c:461
 #: src/session/download.c:637 src/session/download.c:1236
-#: src/viewer/text/search.c:1666
+#: src/viewer/text/search.c:1667
 msgid "~Cancel"
 msgstr "~Anuluj"
 
@@ -490,7 +490,7 @@ msgstr "~Edytuj"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
 #: src/bookmarks/dialogs.c:489 src/cache/dialogs.c:231
-#: src/config/dialogs.c:533 src/config/dialogs.c:946 src/cookies/dialogs.c:477
+#: src/config/dialogs.c:533 src/config/dialogs.c:960 src/cookies/dialogs.c:477
 #: src/dialogs/menu.c:457 src/formhist/dialogs.c:211
 #: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:263
 msgid "~Delete"
@@ -498,7 +498,7 @@ msgstr "~Usu
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu)
 #: src/bookmarks/dialogs.c:490 src/config/dialogs.c:532
-#: src/config/dialogs.c:945 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
+#: src/config/dialogs.c:959 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
 msgid "~Add"
 msgstr "~Dodaj"
 
@@ -519,7 +519,7 @@ msgstr "Prze~nie
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/dialogs/menu.c:view_menu, src/globhist/dialogs.c:globhist_buttons)
 #: src/bookmarks/dialogs.c:494 src/cache/dialogs.c:232
-#: src/config/dialogs.c:534 src/config/dialogs.c:948 src/dialogs/menu.c:408
+#: src/config/dialogs.c:534 src/config/dialogs.c:962 src/dialogs/menu.c:408
 #: src/globhist/dialogs.c:230
 msgid "~Search"
 msgstr "~Szukaj"
@@ -1144,7 +1144,7 @@ msgid "Submit form and reload"
 msgstr "Prześlij formularz i przeładuj"
 
 #: src/config/actions-main.inc:101 src/terminal/tab.c:210
-#: src/terminal/tab.c:247
+#: src/terminal/tab.c:253
 msgid "Close tab"
 msgstr "Zamknij kartę"
 
@@ -1914,7 +1914,7 @@ msgid "Cannot add an option here."
 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:535 src/config/dialogs.c:949 src/cookies/dialogs.c:479
+#: src/config/dialogs.c:535 src/config/dialogs.c:963 src/cookies/dialogs.c:479
 #: src/dialogs/options.c:222 src/formhist/dialogs.c:214
 #: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
@@ -1936,11 +1936,11 @@ msgstr "Akcja"
 msgid "Keymap"
 msgstr "Mapowanie klawiatury"
 
-#: src/config/dialogs.c:831
+#: src/config/dialogs.c:844
 msgid "Keystroke already used"
 msgstr "Skrót klawiszowy jest już używany"
 
-#: src/config/dialogs.c:832
+#: src/config/dialogs.c:845
 #, c-format
 msgid ""
 "The keystroke \"%s\" is currently used for \"%s\".\n"
@@ -1949,24 +1949,45 @@ msgstr ""
 "Skrót klawiszowy \"%s\" jest używany przez \"%s\".\n"
 "Czy na pewno chcesz go zmienić?"
 
-#: src/config/dialogs.c:855 src/config/dialogs.c:872 src/config/dialogs.c:909
+#: src/config/dialogs.c:870 src/config/dialogs.c:887 src/config/dialogs.c:923
 msgid "Add keybinding"
 msgstr "Dodaj przypisanie"
 
-#: src/config/dialogs.c:856
+#: src/config/dialogs.c:871
 msgid "Invalid keystroke."
 msgstr "Niepoprawny skrót klawiszowy."
 
-#: src/config/dialogs.c:873
+#: src/config/dialogs.c:888
 msgid "Need to select a keymap."
 msgstr "Trzeba wybrać mapowanie klawiatury."
 
+#: src/config/dialogs.c:910
+#, c-format
+msgid ""
+"Action: %s\n"
+"Keymap: %s\n"
+"\n"
+"Keystroke should be written in the format: [Shift-][Ctrl-][Alt-]Key\n"
+"Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
+"\n"
+"Keystroke"
+msgstr ""
+"Akcja: %s\n"
+"Mapa klawiatury: %s\n"
+"\n"
+"Skrót klawiszowy powinien być zapisany w formacie:\n"
+"[Shift-][Ctrl-][Alt-]Klawisz\n"
+"Klawisz: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,\n"
+"F5,...\n"
+"\n"
+"Skrót klawiszowy"
+
 #. accelerator_context(menu_keys, src/config/dialogs.c:keybinding_buttons, src/globhist/dialogs.c:globhist_buttons)
-#: src/config/dialogs.c:947 src/dialogs/info.c:135 src/globhist/dialogs.c:231
+#: src/config/dialogs.c:961 src/dialogs/info.c:135 src/globhist/dialogs.c:231
 msgid "~Toggle display"
 msgstr "~Krótki/długi opis"
 
-#: src/config/dialogs.c:954
+#: src/config/dialogs.c:968
 msgid "Keybinding manager"
 msgstr "Menadżer przypisań klawiszy"
 
@@ -2005,19 +2026,19 @@ msgstr "Mapa klawiszy edycji"
 msgid "Menu mapping"
 msgstr "Mapa klawiszy menu"
 
-#: src/config/kbdbind.c:556
+#: src/config/kbdbind.c:566
 msgid "Unrecognised keymap"
 msgstr "Nierozpoznana mapa klawiszy"
 
-#: src/config/kbdbind.c:559
+#: src/config/kbdbind.c:569
 msgid "Error parsing keystroke"
 msgstr "Błąd przy odczytywaniu kombinacji klawiszy"
 
-#: src/config/kbdbind.c:563
+#: src/config/kbdbind.c:573
 msgid "Unrecognised action (internal error)"
 msgstr "Nierozpoznana akcja (błąd wewnętrzny)"
 
-#: src/config/kbdbind.c:579
+#: src/config/kbdbind.c:589
 msgid "Error registering event"
 msgstr "Błąd przy rejestrowaniu zdarzenia"
 
@@ -5800,7 +5821,7 @@ msgstr ""
 "błąd i może to spowodować zastopowanie całego ELinksa.\n"
 "Wykonywanie skryptu zostało przerwane."
 
-#: src/ecmascript/see/window.c:216 src/ecmascript/spidermonkey/window.c:286
+#: src/ecmascript/see/window.c:211 src/ecmascript/spidermonkey/window.c:286
 msgid "JavaScript Alert"
 msgstr "Alert JavaScriptu"
 
@@ -8489,25 +8510,25 @@ msgstr "Czy chcesz ponownie wys
 msgid "Bad terminal size: %d, %d"
 msgstr "Błędny rozmiar terminala: %d, %d"
 
-#: src/terminal/event.c:169
+#: src/terminal/event.c:170
 msgid "Warning: terminal name contains illicit chars."
 msgstr "Ostrzeżenie: nazwa terminala zawiera \"nieprzyzwoite\" znaki."
 
-#: src/terminal/event.c:250
+#: src/terminal/event.c:251
 msgid "Failed to create session."
 msgstr "Nie udało się utworzyć sesji."
 
-#: src/terminal/event.c:415
+#: src/terminal/event.c:416
 #, c-format
 msgid "Bad event %d"
 msgstr "Błędne zdarzenie %d"
 
-#: src/terminal/event.c:455
+#: src/terminal/event.c:456
 #, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Nie można odczytać zdarzenia: %d (%s)"
 
-#: src/terminal/kbd.c:1068
+#: src/terminal/kbd.c:1082
 msgid "Too many bytes read from the itrm!"
 msgstr "Zbyt dużo bajtów przeczytanych z itrm!"
 
@@ -8515,7 +8536,7 @@ msgstr "Zbyt du
 msgid "Do you really want to close the current tab?"
 msgstr "Czy na pewno chcesz zamknąć bieżącą kartę?"
 
-#: src/terminal/tab.c:248
+#: src/terminal/tab.c:254
 msgid "Do you really want to close all except the current tab?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie karty za wyjątkiem bieżącej?"
 
@@ -8631,114 +8652,114 @@ msgid "Submit button"
 msgstr "Przycisk wysłania formularza"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1249
+#: src/viewer/text/link.c:1262
 msgid "Display ~usemap"
 msgstr "Pokaż ~mapę obrazków"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1254
+#: src/viewer/text/link.c:1267
 msgid "~Follow link"
 msgstr "Wybierz od~nośnik"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1256
+#: src/viewer/text/link.c:1269
 msgid "Follow link and r~eload"
 msgstr "Wybierz odnośnik i p~rzeładuj"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1260
+#: src/viewer/text/link.c:1273
 msgid "Open in new ~window"
 msgstr "Otwórz w no~wym oknie"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1262
+#: src/viewer/text/link.c:1275
 msgid "Open in new ~tab"
 msgstr "Otwórz w nowej ~karcie"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1264
+#: src/viewer/text/link.c:1277
 msgid "Open in new tab in ~background"
 msgstr "Otwórz w nowej k~arcie w tle"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1269
+#: src/viewer/text/link.c:1282
 msgid "~Download link"
 msgstr "~Pobierz"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1272
+#: src/viewer/text/link.c:1285
 msgid "~Add link to bookmarks"
 msgstr "~Dodaj zakładkę"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1276
+#: src/viewer/text/link.c:1289
 msgid "Pass link URI to e~xternal command"
 msgstr "Przekaż URI odnośnika do z~ewnętrznego polecenia"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1287 src/viewer/text/link.c:1327
+#: src/viewer/text/link.c:1300 src/viewer/text/link.c:1340
 msgid "~Reset form"
 msgstr "Wy~czyść formularz"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1302
+#: src/viewer/text/link.c:1315
 msgid "Open in ~external editor"
 msgstr "Otwórz w zewnętrznym ~edytorze"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1310
+#: src/viewer/text/link.c:1323
 msgid "~Submit form"
 msgstr "~Prześlij formularz"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1311
+#: src/viewer/text/link.c:1324
 msgid "Submit form and rel~oad"
 msgstr "Prześlij fo~rmularz i przeładuj"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1315
+#: src/viewer/text/link.c:1328
 msgid "Submit form and open in new ~window"
 msgstr "Prześlij ~formularz i otwórz w nowym oknie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1317
+#: src/viewer/text/link.c:1330
 msgid "Submit form and open in new ~tab"
 msgstr "Prześlij formularz i otwórz na nowej ~karcie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1320
+#: src/viewer/text/link.c:1333
 msgid "Submit form and open in new tab in ~background"
 msgstr "Prześlij formularz i otwórz w ~tle na nowej karcie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1325
+#: src/viewer/text/link.c:1338
 msgid "Submit form and ~download"
 msgstr "Prześlij formu~larz i ściągnij"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1332
+#: src/viewer/text/link.c:1345
 msgid "Form f~ields"
 msgstr "Pola form~ularza"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1339
+#: src/viewer/text/link.c:1352
 msgid "V~iew image"
 msgstr "Pokaż o~brazek"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1341
+#: src/viewer/text/link.c:1354
 msgid "Download ima~ge"
 msgstr "Pobierz ~obrazek"
 
-#: src/viewer/text/link.c:1350
+#: src/viewer/text/link.c:1363
 msgid "No link selected"
 msgstr "Nie wybrano żadnego odnośnika"
 
-#: src/viewer/text/link.c:1420
+#: src/viewer/text/link.c:1433
 msgid "Image"
 msgstr "Obrazek"
 
-#: src/viewer/text/link.c:1425
+#: src/viewer/text/link.c:1438
 msgid "Usemap"
 msgstr "Mapa obrazków"
 
@@ -8781,32 +8802,32 @@ msgstr "Brak odno
 msgid "Search for text"
 msgstr "Znajdź tekst"
 
-#: src/viewer/text/search.c:1659
+#: src/viewer/text/search.c:1660
 msgid "Normal search"
 msgstr "Zwykłe szukanie"
 
-#: src/viewer/text/search.c:1660
+#: src/viewer/text/search.c:1661
 msgid "Regexp search"
 msgstr "Szukanie z użyciem wyrażeń regularnych"
 
-#: src/viewer/text/search.c:1661
+#: src/viewer/text/search.c:1662
 msgid "Extended regexp search"
 msgstr "Szukanie z użyciem rozszerzonych wyrażeń regularnych"
 
-#: src/viewer/text/search.c:1662
+#: src/viewer/text/search.c:1663
 msgid "Case sensitive"
 msgstr "Rozróżnianie wielkości liter"
 
-#: src/viewer/text/search.c:1663
+#: src/viewer/text/search.c:1664
 msgid "Case insensitive"
 msgstr "Nierozróżnianie wielkości liter"
 
-#: src/viewer/text/search.c:1687
+#: src/viewer/text/search.c:1688
 msgid "Search backward"
 msgstr "Szukaj wstecz"
 
 #. name:
-#: src/viewer/text/search.c:1726
+#: src/viewer/text/search.c:1727
 msgid "Search History"
 msgstr "Szukanie w historii"
 
@@ -8833,19 +8854,19 @@ msgstr ""
 "Wejście zostało obcięte, ale można nadal odzyskać wpisany tekst z tego "
 "pliku: %s"
 
-#: src/viewer/text/view.c:715
+#: src/viewer/text/view.c:728
 msgid "Go to link"
 msgstr "Przejdź do odnośnika"
 
-#: src/viewer/text/view.c:715
+#: src/viewer/text/view.c:728
 msgid "Enter link number"
 msgstr "Wprowadź numer odnośnika"
 
-#: src/viewer/text/view.c:1299
+#: src/viewer/text/view.c:1313
 msgid "Save error"
 msgstr "Błąd zapisu"
 
-#: src/viewer/text/view.c:1300
+#: src/viewer/text/view.c:1314
 msgid "Error writing to file"
 msgstr "Błąd zapisu do pliku"
 

From 77470526ba4f75a9ba03def89a00eac7291b02c7 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 19 Aug 2006 00:06:04 +0200
Subject: [PATCH 043/132] vsftpd shows total filesize, so I commented out
 addition. I know that this is not correct for every server. Show me ftp
 sites, where resuming displays wrong filesize.

---
 src/protocol/ftp/ftp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/protocol/ftp/ftp.c b/src/protocol/ftp/ftp.c
index b46ecfdd..c7e2c893 100644
--- a/src/protocol/ftp/ftp.c
+++ b/src/protocol/ftp/ftp.c
@@ -977,7 +977,9 @@ ftp_retr_file(struct socket *socket, struct read_buffer *rb)
 			if (file_len > 0) {
 				/* FIXME: ..when downloads resuming
 				 * implemented.. */
-				conn->est_length = file_len + conn->progress->start;
+				/* This is right for vsftpd.
+				 * Show me urls where this is wrong. --witekfl */
+				conn->est_length = file_len; /* + conn->progress->start; */
 			}
 		}
 	}

From 10f2b33360043d0689fe60ccc07e808bb4ca4b2e Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 19 Aug 2006 08:35:53 +0300
Subject: [PATCH 044/132] fi.po: kaavake -> lomake, like in MSIE and Firefox.

---
 po/fi.po | 51 +++++++++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index bf877be8..d693900b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-21 16:40+0300\n"
-"PO-Revision-Date: 2006-05-21 17:10+0300\n"
+"PO-Revision-Date: 2006-08-19 08:28+0300\n"
 "Last-Translator: Kalle Olavi Niemitalo <kon@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -1086,7 +1086,7 @@ msgstr "Piirr
 
 #: src/config/actions-main.inc:82
 msgid "Reset form items to their initial values"
-msgstr "Palauta kaavakkeen kohtiin niiden alkuarvot"
+msgstr "Palauta lomakkeen kohtiin niiden alkuarvot"
 
 #: src/config/actions-main.inc:83
 #, fuzzy
@@ -1155,12 +1155,12 @@ msgstr "Terminaaliasetukset"
 #: src/config/actions-main.inc:99
 #, fuzzy
 msgid "Submit form"
-msgstr "Lähetä kaavake"
+msgstr "Lähetä lomake"
 
 #: src/config/actions-main.inc:100
 #, fuzzy
 msgid "Submit form and reload"
-msgstr "Lähetä kaavake ja lataa"
+msgstr "Lähetä lomake ja lataa"
 
 #: src/config/actions-main.inc:101 src/terminal/tab.c:210
 #: src/terminal/tab.c:247
@@ -1350,14 +1350,10 @@ msgid ""
 "in the association table can't be added or modified."
 msgstr ""
 
-# TODO: Nykyään ELinksissä "form" = "kaavake". Mutta Mozilla Firefox
-# 1.0:ssa ja Microsoft Internet Explorer 6.0:ssa se on "lomake".
-# Pitäisikö muuttaa?
-#
 # "automaattisesti" olisi kovin pitkä.
 #: src/config/cmdline.c:654
 msgid "Autosubmit first form"
-msgstr "Lähetä ensimmäinen kaavake heti"
+msgstr "Lähetä ensimmäinen lomake heti"
 
 #: src/config/cmdline.c:656
 msgid "Automatically submit the first form in the given URLs."
@@ -2243,7 +2239,7 @@ msgstr ""
 #: src/config/options.inc:172
 #, fuzzy
 msgid "Submit form automatically"
-msgstr "Hyväksy kaavake:"
+msgstr "Hyväksy lomake:"
 
 #: src/config/options.inc:174
 msgid ""
@@ -5408,7 +5404,7 @@ msgstr ""
 #. clear_all_items_title
 #: src/formhist/dialogs.c:142
 msgid "Do you really want to remove all forms?"
-msgstr "Haluatko tosiaan poistaa kaikki kaavakkeet?"
+msgstr "Haluatko tosiaan poistaa kaikki lomakkeet?"
 
 #: src/formhist/dialogs.c:173
 msgid "Form not saved"
@@ -5444,7 +5440,7 @@ msgstr "Muisti loppu"
 
 #: src/formhist/formhist.c:36
 msgid "Show form history dialog"
-msgstr "Näytä kaavakehistoriaikkuna"
+msgstr "Näytä lomakehistoriaikkuna"
 
 #: src/formhist/formhist.c:38
 msgid ""
@@ -5455,7 +5451,7 @@ msgstr ""
 
 #: src/formhist/formhist.c:413
 msgid "Form history"
-msgstr "Kaavakehistoria"
+msgstr "Lomakehistoria"
 
 #: src/formhist/formhist.c:414
 msgid ""
@@ -5475,7 +5471,7 @@ msgstr ""
 #. name:
 #: src/formhist/formhist.c:440
 msgid "Form History"
-msgstr "Kaavakehistoria"
+msgstr "Lomakehistoria"
 
 #. cant_delete_item
 #: src/globhist/dialogs.c:105
@@ -7820,7 +7816,7 @@ msgstr ""
 
 #: src/viewer/text/form.c:862
 msgid "Error while posting form"
-msgstr "Virhe kaavaketta lähetettäessä"
+msgstr "Virhe lomaketta lähetettäessä"
 
 #: src/viewer/text/form.c:863
 #, fuzzy, c-format
@@ -7830,7 +7826,7 @@ msgstr "Tiedoston haku ep
 #: src/viewer/text/form.c:1443
 #, fuzzy
 msgid "Reset form"
-msgstr "Tyhjennä kaavake"
+msgstr "Tyhjennä lomake"
 
 #: src/viewer/text/form.c:1445
 msgid "Harmless button"
@@ -7838,11 +7834,11 @@ msgstr "Harmiton painike"
 
 #: src/viewer/text/form.c:1453
 msgid "Submit form to"
-msgstr "Hyväksy kaavake:"
+msgstr "Hyväksy lomake:"
 
 #: src/viewer/text/form.c:1454
 msgid "Post form to"
-msgstr "Lähetä kaavake:"
+msgstr "Lähetä lomake:"
 
 #: src/viewer/text/form.c:1456
 msgid "Radio button"
@@ -7953,7 +7949,7 @@ msgstr "Anna linkin U~RI ulkoiselle komennolle"
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
 #: src/viewer/text/link.c:1297 src/viewer/text/link.c:1337
 msgid "~Reset form"
-msgstr "T~yhjennä kaavake"
+msgstr "T~yhjennä lomake"
 
 #. accelerator_context(link_menu.textarea)
 #: src/viewer/text/link.c:1312
@@ -7963,37 +7959,37 @@ msgstr "~Avaa ulkoisessa muokkausohjelmassa"
 #. accelerator_context(link_menu.form, link_menu.textarea)
 #: src/viewer/text/link.c:1320
 msgid "~Submit form"
-msgstr "~Lähetä kaavake"
+msgstr "~Lähetä lomake"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
 #: src/viewer/text/link.c:1321
 msgid "Submit form and rel~oad"
-msgstr "Lähetä kaavake ja lataa ~uudestaan"
+msgstr "Lähetä lomake ja lataa ~uudestaan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
 #: src/viewer/text/link.c:1325
 msgid "Submit form and open in new ~window"
-msgstr "Lähetä kaavake ja avaa uuteen ~ikkunaan"
+msgstr "Lähetä lomake ja avaa uuteen ~ikkunaan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
 #: src/viewer/text/link.c:1327
 msgid "Submit form and open in new ~tab"
-msgstr "Lähetä kaavake ja avaa uuteen ~välilehteen"
+msgstr "Lähetä lomake ja avaa uuteen ~välilehteen"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
 #: src/viewer/text/link.c:1330
 msgid "Submit form and open in new tab in ~background"
-msgstr "Lähetä kaavake ja avaa uuteen välilehteen ~taustalla"
+msgstr "Lähetä lomake ja avaa uuteen välilehteen ~taustalla"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
 #: src/viewer/text/link.c:1335
 msgid "Submit form and ~download"
-msgstr "Lähetä kaavake ~ja lataa tiedostoksi"
+msgstr "Lähetä lomake ~ja lataa tiedostoksi"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
 #: src/viewer/text/link.c:1342
 msgid "Form f~ields"
-msgstr "Kaavakkeen k~entät"
+msgstr "Lomakkeen k~entät"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
 #: src/viewer/text/link.c:1349
@@ -8083,9 +8079,8 @@ msgstr "Etsi takaisinp
 
 #. name:
 #: src/viewer/text/search.c:1655
-#, fuzzy
 msgid "Search History"
-msgstr "Kaavakehistoria"
+msgstr "Etsintähistoria"
 
 #: src/viewer/text/textarea.c:332
 msgid "You cannot launch an external editor in the anonymous mode."

From 8615cb529ea6421cfc1b0e4dea44b1a01e65fe2b Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 19 Aug 2006 09:11:53 +0200
Subject: [PATCH 045/132] Added output parameter to the get_filesize_from_RETR.
 It indicates whether we ought to add the conn->progress->start to the
 conn->est_length. Currently displaying resuming works correctly with
 ftp.task.gda.pl and ftp.pld-linux.org.

---
 src/protocol/ftp/ftp.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/protocol/ftp/ftp.c b/src/protocol/ftp/ftp.c
index c7e2c893..87ec4445 100644
--- a/src/protocol/ftp/ftp.c
+++ b/src/protocol/ftp/ftp.c
@@ -792,7 +792,7 @@ ftp_send_retr_req(struct connection *conn, int state)
 
 /* Parse RETR response and return file size or -1 on error. */
 static off_t
-get_filesize_from_RETR(unsigned char *data, int data_len)
+get_filesize_from_RETR(unsigned char *data, int data_len, int *resume)
 {
 	off_t file_len;
 	int pos;
@@ -801,6 +801,7 @@ get_filesize_from_RETR(unsigned char *data, int data_len)
 	/* Getting file size from text response.. */
 	/* 150 Opening BINARY mode data connection for hello-1.0-1.1.diff.gz (16452 bytes). */
 
+	*resume = 0;
 	for (pos = 0; pos < data_len && data[pos] != ASCII_LF; pos++)
 		if (data[pos] == '(')
 			pos_file_len = pos;
@@ -825,6 +826,7 @@ get_filesize_from_RETR(unsigned char *data, int data_len)
 		kbytes++;
 		size = strtod((const char *)kbytes, &endptr);
 		if (endptr == (char *)kbytes) return -1;
+		*resume = 1;
 		return (off_t)(size * 1024.0);
 	}
 
@@ -972,14 +974,16 @@ ftp_retr_file(struct socket *socket, struct read_buffer *rb)
 		 * get filesize if needed. */
 		if (!ftp->dir && conn->est_length == -1) {
 			off_t file_len;
+			int res;
 
-			file_len = get_filesize_from_RETR(rb->data, rb->length);
+			file_len = get_filesize_from_RETR(rb->data, rb->length, &res);
 			if (file_len > 0) {
 				/* FIXME: ..when downloads resuming
 				 * implemented.. */
 				/* This is right for vsftpd.
 				 * Show me urls where this is wrong. --witekfl */
-				conn->est_length = file_len; /* + conn->progress->start; */
+				conn->est_length = res ?
+					file_len + conn->progress->start : file_len;
 			}
 		}
 	}

From dd22535b8cd99693652261fa38a9c1880bb486b9 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 19 Aug 2006 10:40:30 +0300
Subject: [PATCH 046/132] config: Change an error message in the keybinding
 manager.

The message appears when the user has selected e.g. "Main mapping"
rather than an action inside it.  Because the main mapping is a keymap,
ELinks must not tell the user to select a keymap.
---
 src/config/dialogs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/dialogs.c b/src/config/dialogs.c
index 66a5806d..49a7837d 100644
--- a/src/config/dialogs.c
+++ b/src/config/dialogs.c
@@ -885,7 +885,7 @@ push_kbdbind_add_button(struct dialog_data *dlg_data,
 
 	if (!item || !item->depth) {
 		info_box(term, 0, N_("Add keybinding"), ALIGN_CENTER,
-			 N_("Need to select a keymap."));
+			 N_("Need to select an action."));
 		return EVENT_PROCESSED;
 	}
 

From fa1859c0f126e9a45d008c67ea5d38fcfa9c2830 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 19 Aug 2006 12:23:13 +0300
Subject: [PATCH 047/132] fi.po: keybindings, authentication, and managers

---
 po/fi.po | 1159 +++++++++++++++++++++++++++---------------------------
 1 file changed, 582 insertions(+), 577 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index d693900b..e358b76c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.5pre0.CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-21 16:40+0300\n"
-"PO-Revision-Date: 2006-08-19 08:28+0300\n"
+"POT-Creation-Date: 2006-08-19 10:40+0300\n"
+"PO-Revision-Date: 2006-08-19 12:17+0300\n"
 "Last-Translator: Kalle Olavi Niemitalo <kon@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -15,86 +15,86 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/bfu/hierbox.c:338
+#: src/bfu/hierbox.c:332
 msgid "Close"
 msgstr "Sulje"
 
 #. | MSGBOX_SCROLLABLE
-#: src/bfu/hierbox.c:435 src/bfu/hierbox.c:444 src/dialogs/document.c:43
+#: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
 #: src/dialogs/document.c:240
 msgid "Info"
 msgstr "Tieto"
 
-#: src/bfu/hierbox.c:436
+#: src/bfu/hierbox.c:430
 msgid "Press space to expand this folder."
 msgstr "Voit laventaa kansion painamalla välilyöntiä."
 
 #. accelerator_context(do_auth_dialog, do_edit_dialog, generic_external_protocol_handler, info_box, input_dialog, menu_add_ext, menu_keys, push_hierbox_info_button, refreshed_msg_box, resize_terminal_dialog, setup_first_session, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/viewer/text/search.c:search_dlg_do, terminal_options, write_config_dialog)
-#: src/bfu/hierbox.c:447 src/bfu/inpfield.c:255 src/bfu/msgbox.c:173
+#: src/bfu/hierbox.c:441 src/bfu/inpfield.c:256 src/bfu/msgbox.c:173
 #: src/bfu/msgbox.c:191 src/config/dialogs.c:58 src/config/dialogs.c:393
-#: src/cookies/dialogs.c:356 src/cookies/dialogs.c:449 src/dialogs/edit.c:98
-#: src/dialogs/info.c:134 src/dialogs/options.c:211 src/dialogs/options.c:292
-#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:111
-#: src/protocol/protocol.c:236 src/scripting/lua/core.c:378
-#: src/scripting/lua/core.c:459 src/session/session.c:801
-#: src/viewer/text/search.c:1594
+#: src/cookies/dialogs.c:356 src/cookies/dialogs.c:454 src/dialogs/edit.c:98
+#: src/dialogs/info.c:134 src/dialogs/options.c:220 src/dialogs/options.c:301
+#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115
+#: src/protocol/protocol.c:236 src/scripting/lua/core.c:379
+#: src/scripting/lua/core.c:460 src/session/session.c:806
+#: src/viewer/text/search.c:1666
 msgid "~OK"
 msgstr "~OK"
 
 #. cant_delete_item
-#: src/bfu/hierbox.c:558
+#: src/bfu/hierbox.c:552
 #, c-format
 msgid "Sorry, but the item \"%s\" cannot be deleted."
 msgstr "Ikävä kyllä kohtaa \"%s\" ei voi poistaa."
 
 #. cant_delete_used_item
-#: src/bfu/hierbox.c:561
+#: src/bfu/hierbox.c:555
 #, c-format
 msgid "Sorry, but the item \"%s\" is being used by something else."
 msgstr "Ikävä kyllä kohtaa \"%s\" käyttää vielä jokin muu."
 
 #. cant_delete_folder
-#: src/bfu/hierbox.c:564 src/bookmarks/dialogs.c:119
+#: src/bfu/hierbox.c:558 src/bookmarks/dialogs.c:121
 #, c-format
 msgid "Sorry, but the folder \"%s\" cannot be deleted."
 msgstr "Ikävä kyllä kansiota \"%s\" ei voi poistaa."
 
 #. cant_delete_used_folder
-#: src/bfu/hierbox.c:567 src/bookmarks/dialogs.c:121
+#: src/bfu/hierbox.c:561 src/bookmarks/dialogs.c:123
 #, c-format
 msgid "Sorry, but the folder \"%s\" is being used by something else."
 msgstr "Ikävä kyllä kansiota \"%s\" käyttää vielä jokin muu."
 
 #. delete_marked_items_title
-#: src/bfu/hierbox.c:570
+#: src/bfu/hierbox.c:564
 msgid "Delete marked items"
 msgstr "Poista merkityt kohdat"
 
 # ELinksin suomennoksessa tämmöisissä kysymyksissä on toinen persoona.
 #. delete_marked_items
-#: src/bfu/hierbox.c:573
+#: src/bfu/hierbox.c:567
 msgid "Delete marked items?"
 msgstr "Poistatko merkityt kohdat?"
 
 #. delete_folder_title
-#: src/bfu/hierbox.c:576 src/bookmarks/dialogs.c:127
+#: src/bfu/hierbox.c:570 src/bookmarks/dialogs.c:129
 msgid "Delete folder"
 msgstr "Poista kansio"
 
 #. delete_folder
-#: src/bfu/hierbox.c:579
+#: src/bfu/hierbox.c:573
 #, c-format
 msgid "Delete the folder \"%s\" and its content?"
 msgstr "Poistatko kansion \"%s\" sisältöineen?"
 
 # ihan kohta :)
 #. delete_item_title
-#: src/bfu/hierbox.c:582
+#: src/bfu/hierbox.c:576
 msgid "Delete item"
 msgstr "Poista kohta"
 
 #. delete_item
-#: src/bfu/hierbox.c:585
+#: src/bfu/hierbox.c:579
 #, c-format
 msgid ""
 "Delete \"%s\"?\n"
@@ -106,85 +106,85 @@ msgstr ""
 "%s"
 
 #. clear_all_items_title
-#: src/bfu/hierbox.c:588
+#: src/bfu/hierbox.c:582
 msgid "Clear all items"
 msgstr "Tyhjennä kaikki kohdat"
 
 #. clear_all_items
-#: src/bfu/hierbox.c:591
+#: src/bfu/hierbox.c:585
 msgid "Do you really want to remove all items?"
 msgstr "Haluatko tosiaan poistaa kaikki kohdat?"
 
-#: src/bfu/hierbox.c:648
+#: src/bfu/hierbox.c:642
 msgid "Delete error"
 msgstr "Poistovirhe"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
-#: src/bfu/hierbox.c:760 src/bfu/hierbox.c:772 src/bfu/hierbox.c:814
-#: src/bfu/hierbox.c:876 src/config/dialogs.c:836 src/dialogs/menu.c:127
+#: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
+#: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
-#: src/terminal/tab.c:213 src/terminal/tab.c:250
+#: src/terminal/tab.c:213 src/terminal/tab.c:256
 msgid "~Yes"
 msgstr "~Kyllä"
 
 #. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
-#: src/bfu/hierbox.c:761 src/bfu/hierbox.c:773 src/bfu/hierbox.c:815
-#: src/bfu/hierbox.c:877 src/config/dialogs.c:837 src/dialogs/menu.c:128
+#: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
+#: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
-#: src/terminal/tab.c:214 src/terminal/tab.c:251
+#: src/terminal/tab.c:214 src/terminal/tab.c:257
 msgid "~No"
 msgstr "~Ei"
 
-#: src/bfu/hierbox.c:945 src/bfu/hierbox.c:976 src/viewer/text/search.c:1013
-#: src/viewer/text/search.c:1021 src/viewer/text/search.c:1037
-#: src/viewer/text/search.c:1613
+#: src/bfu/hierbox.c:939 src/bfu/hierbox.c:970 src/viewer/text/search.c:1085
+#: src/viewer/text/search.c:1093 src/viewer/text/search.c:1109
+#: src/viewer/text/search.c:1685
 msgid "Search"
 msgstr "Etsi"
 
-#: src/bfu/hierbox.c:947 src/viewer/text/search.c:1014
+#: src/bfu/hierbox.c:941 src/viewer/text/search.c:1086
 #, c-format
 msgid "Search string '%s' not found"
 msgstr "Etsittyä jonoa \"%s\" ei löytynyt"
 
-#: src/bfu/hierbox.c:976 src/config/dialogs.c:169 src/config/dialogs.c:359
-#: src/config/dialogs.c:506 src/cookies/dialogs.c:34 src/cookies/dialogs.c:350
-#: src/dialogs/edit.c:92 src/dialogs/edit.c:94 src/scripting/lua/core.c:374
-#: src/scripting/lua/core.c:375 src/scripting/lua/core.c:456
+#: src/bfu/hierbox.c:970 src/config/dialogs.c:169 src/config/dialogs.c:359
+#: src/config/dialogs.c:507 src/cookies/dialogs.c:34 src/cookies/dialogs.c:350
+#: src/dialogs/edit.c:92 src/dialogs/edit.c:94 src/scripting/lua/core.c:375
+#: src/scripting/lua/core.c:376 src/scripting/lua/core.c:457
 msgid "Name"
 msgstr "Nimi"
 
-#: src/bfu/inpfield.c:71 src/bfu/inpfield.c:78
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79
 msgid "Bad number"
 msgstr "Ei luku"
 
-#: src/bfu/inpfield.c:72
+#: src/bfu/inpfield.c:73
 msgid "Number expected in field"
 msgstr "Kentässä on oltava luku"
 
 # ELinks ei anna tallentaa muuta lukua; siksi ei "olisi oltava".
-#: src/bfu/inpfield.c:80
+#: src/bfu/inpfield.c:81
 #, c-format
 msgid "Number should be in the range from %d to %d."
 msgstr "Luvun on oltava välillä %d-%d."
 
-#: src/bfu/inpfield.c:98 src/config/dialogs.c:460
+#: src/bfu/inpfield.c:99 src/config/dialogs.c:460
 msgid "Bad string"
 msgstr "Laiton merkkijono"
 
-#: src/bfu/inpfield.c:99
+#: src/bfu/inpfield.c:100
 msgid "Empty string not allowed"
 msgstr "Tyhjä merkkijono ei sallittu"
 
 # TODO: Latauksissa "Keskeytä" saattaa antaa vaikutelman, että latausta
 # voisi myöhemmin helposti jatkaakin. Windowsissa OK/Cancel = OK/Hylkää.
 #. 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:255 src/config/dialogs.c:394 src/cookies/dialogs.c:357
-#: src/cookies/dialogs.c:450 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:214 src/dialogs/options.c:293 src/mime/dialogs.c:132
-#: src/protocol/auth/dialogs.c:112 src/protocol/bittorrent/dialogs.c:802
-#: src/scripting/lua/core.c:379 src/scripting/lua/core.c:460
-#: src/session/download.c:580 src/session/download.c:1182
-#: src/viewer/text/search.c:1595
+#: src/bfu/inpfield.c:256 src/config/dialogs.c:394 src/cookies/dialogs.c:357
+#: src/cookies/dialogs.c:455 src/dialogs/edit.c:102 src/dialogs/edit.c:105
+#: src/dialogs/options.c:223 src/dialogs/options.c:302 src/mime/dialogs.c:132
+#: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812
+#: src/scripting/lua/core.c:380 src/scripting/lua/core.c:461
+#: src/session/download.c:637 src/session/download.c:1236
+#: src/viewer/text/search.c:1667
 #, fuzzy
 msgid "~Cancel"
 msgstr "~Keskeytä"
@@ -198,7 +198,7 @@ msgid "Digital clock in the status bar."
 msgstr "Digitaalikello tilapalkissa."
 
 #: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1166
-#: src/config/options.inc:1173 src/ecmascript/ecmascript.c:43
+#: src/config/options.inc:1173 src/ecmascript/ecmascript.c:44
 #: 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"
@@ -259,7 +259,7 @@ msgstr ""
 # Jos käyttäjä on painanut etsintänäppäintä (yleensä "/") kun valikko on
 # auki, niin tämä teksti näkyy tilarivillä, ja käyttäjä saa heti perään
 # kirjoittaa etsittävän kohdan nimen.
-#: src/bfu/menu.c:739
+#: src/bfu/menu.c:874
 msgid "Search menu/"
 msgstr "Etsi valikosta/"
 
@@ -291,20 +291,19 @@ msgid "No URL"
 msgstr "Ei URL:ää"
 
 #. name:
-#: src/bookmarks/bookmarks.c:47 src/bookmarks/bookmarks.c:185
+#: src/bookmarks/bookmarks.c:48 src/bookmarks/bookmarks.c:181
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: src/bookmarks/bookmarks.c:49
-#, fuzzy
+#: src/bookmarks/bookmarks.c:50
 msgid "Bookmark options."
-msgstr "Kirjanmerkit"
+msgstr "Kirjanmerkkiasetukset."
 
-#: src/bookmarks/bookmarks.c:52 src/bookmarks/bookmarks.c:58
+#: src/bookmarks/bookmarks.c:53 src/bookmarks/bookmarks.c:59
 msgid "File format"
 msgstr "Tiedostomuoto"
 
-#: src/bookmarks/bookmarks.c:54
+#: src/bookmarks/bookmarks.c:55
 msgid ""
 "File format for bookmarks (affects both reading and saving):\n"
 "0 is the default native ELinks format\n"
@@ -315,7 +314,7 @@ msgstr ""
 "1 on siirrettävä XML-pohjainen XBEL-kirjanmerkkimuoto (EI KANSALLISTEN "
 "MERKKIEN TUKEA!)"
 
-#: src/bookmarks/bookmarks.c:60
+#: src/bookmarks/bookmarks.c:61
 msgid ""
 "File format for bookmarks (affects both reading and saving):\n"
 "0 is the default native ELinks format\n"
@@ -327,11 +326,11 @@ msgstr ""
 "1 on siirrettävä XML-pohjainen XBEL-kirjanmerkkimuoto (EI KANSALLISTEN "
 "MERKKIEN TUKEA!)  (ESTETTY)"
 
-#: src/bookmarks/bookmarks.c:66
+#: src/bookmarks/bookmarks.c:67
 msgid "Save folder state"
 msgstr "Tallenna kansioiden tilat"
 
-#: src/bookmarks/bookmarks.c:68
+#: src/bookmarks/bookmarks.c:69
 msgid ""
 "When saving bookmarks also store whether folders are\n"
 "expanded or not, so the look of the bookmark dialog is\n"
@@ -340,17 +339,17 @@ msgid ""
 msgstr ""
 "Kirjanmerkkejä tallennettaessa tallentaa myös tiedon, mitkä\n"
 "kansiot olivat auki, jotta kirjanmerkkilista säilyy saman\n"
-"näköisenä ELinksin käyttökerrasta toiseen.  Jos kytket tämän\n"
+"näköisenä ELinksin käyttökerrasta toiseen. Jos kytket tämän\n"
 "pois, niin seuraavalla käynnistyskerralla kaikki kansiot\n"
 "ovat aluksi kiinni."
 
-#: src/bookmarks/bookmarks.c:73
+#: src/bookmarks/bookmarks.c:74
 msgid "Periodic snapshotting"
 msgstr "Ajoittaiset tilannevedokset"
 
 # "bookmark support" tarkoittanee, että features.conf:ssa oli
 # CONFIG_BOOKMARKS=yes, kun ELinks käännettiin.
-#: src/bookmarks/bookmarks.c:75
+#: src/bookmarks/bookmarks.c:76
 msgid ""
 "Automatically save a snapshot of all tabs periodically.\n"
 "This will periodically bookmark the tabs of each terminal in a separate "
@@ -367,85 +366,85 @@ msgstr ""
 "Tämä ominaisuus toimii vain sellaisissa ELinksin versioissa, jotka tukevat\n"
 "kirjanmerkkejä."
 
-#: src/bookmarks/dialogs.c:70 src/config/options.inc:1018
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1018
 #: src/dialogs/document.c:145 src/globhist/dialogs.c:65
 msgid "Title"
 msgstr "Otsikko"
 
-#: src/bookmarks/dialogs.c:71 src/cache/dialogs.c:65
+#: src/bookmarks/dialogs.c:73 src/cache/dialogs.c:65
 #: src/dialogs/document.c:136 src/dialogs/edit.c:96 src/formhist/dialogs.c:63
-#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:159
-#: src/scripting/lua/core.c:376
+#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:163
+#: src/scripting/lua/core.c:377
 msgid "URL"
 msgstr "URL"
 
 #. cant_delete_item
-#: src/bookmarks/dialogs.c:115
-#, fuzzy, c-format
+#: src/bookmarks/dialogs.c:117
+#, c-format
 msgid "Sorry, but the bookmark \"%s\" cannot be deleted."
 msgstr "Ikävä kyllä kirjanmerkkiä \"%s\" ei voi poistaa."
 
 #. cant_delete_used_item
-#: src/bookmarks/dialogs.c:117
+#: src/bookmarks/dialogs.c:119
 #, c-format
 msgid "Sorry, but the bookmark \"%s\" is being used by something else."
 msgstr "Ikävä kyllä kirjanmerkkiä \"%s\" käyttää vielä jokin muu."
 
 #. delete_marked_items_title
-#: src/bookmarks/dialogs.c:123
+#: src/bookmarks/dialogs.c:125
 msgid "Delete marked bookmarks"
 msgstr "Poista merkityt kirjanmerkit"
 
 #. delete_marked_items
-#: src/bookmarks/dialogs.c:125
+#: src/bookmarks/dialogs.c:127
 msgid "Delete marked bookmarks?"
 msgstr "Poistatko merkityt kirjanmerkit?"
 
 #. delete_folder
-#: src/bookmarks/dialogs.c:129
+#: src/bookmarks/dialogs.c:131
 #, c-format
 msgid "Delete the folder \"%s\" and all bookmarks in it?"
 msgstr "Poistatko kansion \"%s\" ja kaikki sen sisältämät kirjanmerkit?"
 
 #. delete_item_title
-#: src/bookmarks/dialogs.c:131
+#: src/bookmarks/dialogs.c:133
 msgid "Delete bookmark"
 msgstr "Poista kirjanmerkki"
 
-#. delete_item
-#: src/bookmarks/dialogs.c:133
+#: src/bookmarks/dialogs.c:135
+#, c-format
 msgid "Delete this bookmark?"
 msgstr "Poistatko tämän kirjanmerkin?"
 
 #. clear_all_items_title
-#: src/bookmarks/dialogs.c:135
+#: src/bookmarks/dialogs.c:137
 msgid "Clear all bookmarks"
 msgstr "Tyhjennä kaikki kirjanmerkit"
 
 #. clear_all_items_title
-#: src/bookmarks/dialogs.c:137
+#: src/bookmarks/dialogs.c:139
 msgid "Do you really want to remove all bookmarks?"
 msgstr "Haluatko tosiaan poistaa kaikki kirjanmerkit?"
 
 # "Lisää kansio" kuulostaa siltä kuin kansio jo olisi olemassa
 # jossakin muualla ja se pitäisi enää lisätä kirjanmerkkeihin.
-#: src/bookmarks/dialogs.c:270
+#: src/bookmarks/dialogs.c:254
 msgid "Add folder"
 msgstr "Luo kansio"
 
-#: src/bookmarks/dialogs.c:270
+#: src/bookmarks/dialogs.c:254
 msgid "Folder name"
 msgstr "Kansion nimi"
 
-#: src/bookmarks/dialogs.c:326 src/scripting/lua/core.c:370
+#: src/bookmarks/dialogs.c:310 src/scripting/lua/core.c:371
 msgid "Edit bookmark"
 msgstr "Muokkaa kirjanmerkkiä"
 
-#: src/bookmarks/dialogs.c:477
+#: src/bookmarks/dialogs.c:461
 msgid "Cannot move folder inside itself"
 msgstr "Kansiota ei voi siirtää itsensä sisään"
 
-#: src/bookmarks/dialogs.c:478
+#: src/bookmarks/dialogs.c:462
 msgid ""
 "You are trying to move the marked folder inside itself. To move the folder "
 "to a different location select the new location before pressing the Move "
@@ -455,11 +454,11 @@ msgstr ""
 "johonkin muuhun paikkaan, valitse uusi paikka ennen kuin painat Siirrä-"
 "painiketta."
 
-#: src/bookmarks/dialogs.c:484
+#: src/bookmarks/dialogs.c:468
 msgid "Nothing to move"
 msgstr "Ei ole mitään siirrettävää"
 
-#: src/bookmarks/dialogs.c:485
+#: src/bookmarks/dialogs.c:469
 msgid ""
 "To move bookmarks, first mark all the bookmarks (or folders) you want to "
 "move.  This can be done with the Insert key if you're using the default key-"
@@ -473,88 +472,88 @@ msgstr ""
 "paina \"Siirrä\"-painiketta."
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
-#: src/bookmarks/dialogs.c:502 src/cache/dialogs.c:230
-#: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:257
+#: src/bookmarks/dialogs.c:487 src/cache/dialogs.c:230
+#: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:261
 msgid "~Goto"
 msgstr "~Mene"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons)
-#: src/bookmarks/dialogs.c:503 src/config/dialogs.c:530
-#: src/cookies/dialogs.c:471
+#: src/bookmarks/dialogs.c:488 src/config/dialogs.c:531
+#: src/cookies/dialogs.c:476
 msgid "~Edit"
 msgstr "M~uokkaa"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
-#: src/bookmarks/dialogs.c:504 src/cache/dialogs.c:231
-#: src/config/dialogs.c:532 src/config/dialogs.c:945 src/cookies/dialogs.c:472
+#: src/bookmarks/dialogs.c:489 src/cache/dialogs.c:231
+#: src/config/dialogs.c:533 src/config/dialogs.c:960 src/cookies/dialogs.c:477
 #: src/dialogs/menu.c:457 src/formhist/dialogs.c:211
-#: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:259
+#: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:263
 msgid "~Delete"
 msgstr "~Poista"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu)
-#: src/bookmarks/dialogs.c:505 src/config/dialogs.c:531
-#: src/config/dialogs.c:944 src/cookies/dialogs.c:469 src/dialogs/menu.c:455
+#: src/bookmarks/dialogs.c:490 src/config/dialogs.c:532
+#: src/config/dialogs.c:959 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
 msgid "~Add"
 msgstr "~Lisää"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons)
-#: src/bookmarks/dialogs.c:506
+#: src/bookmarks/dialogs.c:491
 msgid "Add se~parator"
 msgstr "Luo e~rotin"
 
 # "Lisää kansio" kuulostaa siltä kuin kansio jo olisi olemassa
 # jossakin muualla ja se pitäisi enää lisätä kirjanmerkkeihin.
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons)
-#: src/bookmarks/dialogs.c:507
+#: src/bookmarks/dialogs.c:492
 msgid "Add ~folder"
 msgstr "Luo ~kansio"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons)
-#: src/bookmarks/dialogs.c:508
+#: src/bookmarks/dialogs.c:493
 msgid "~Move"
 msgstr "S~iirrä"
 
 #. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/dialogs/menu.c:view_menu, src/globhist/dialogs.c:globhist_buttons)
-#: src/bookmarks/dialogs.c:509 src/cache/dialogs.c:232
-#: src/config/dialogs.c:533 src/config/dialogs.c:947 src/dialogs/menu.c:408
+#: src/bookmarks/dialogs.c:494 src/cache/dialogs.c:232
+#: src/config/dialogs.c:534 src/config/dialogs.c:962 src/dialogs/menu.c:408
 #: src/globhist/dialogs.c:230
 msgid "~Search"
 msgstr "~Etsi"
 
 #. This one is too dangerous, so just let user delete
 #. * the bookmarks file if needed. --Zas
-#: src/bookmarks/dialogs.c:513
+#: src/bookmarks/dialogs.c:498
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TODO: Would this be useful? --jonas
-#: src/bookmarks/dialogs.c:516 src/globhist/dialogs.c:235
+#: src/bookmarks/dialogs.c:501 src/globhist/dialogs.c:235
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/bookmarks/dialogs.c:522
+#: src/bookmarks/dialogs.c:507
 msgid "Bookmark manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Kirjanmerkkien hallinta"
 
 # Tällä etsintätavalla löytyy enintään yksi kerrallaan.
-#: src/bookmarks/dialogs.c:648
+#: src/bookmarks/dialogs.c:632
 msgid "Search bookmarks"
 msgstr "Etsi kirjanmerkki"
 
-#: src/bookmarks/dialogs.c:677
+#: src/bookmarks/dialogs.c:661
 msgid "Add bookmark"
 msgstr "Lisää kirjanmerkki"
 
-#: src/bookmarks/dialogs.c:713
+#: src/bookmarks/dialogs.c:697
 msgid "Saved session"
 msgstr "Tallennettu istunto"
 
-#: src/bookmarks/dialogs.c:721
+#: src/bookmarks/dialogs.c:705
 msgid "Bookmark tabs"
 msgstr "Kirjanmerkit välilehdistä"
 
-#: src/bookmarks/dialogs.c:721
+#: src/bookmarks/dialogs.c:705
 msgid "Enter folder name"
 msgstr "Kirjoita kansion nimi"
 
@@ -597,11 +596,12 @@ msgstr "Koodaus"
 msgid "Flags"
 msgstr "Liput"
 
+# "vajaa", "kesken"?
 #: src/cache/dialogs.c:115 src/dialogs/document.c:159
 msgid "incomplete"
 msgstr "epätäydellinen"
 
-#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:178
+#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:182
 msgid "invalid"
 msgstr ""
 
@@ -623,49 +623,49 @@ msgstr "Otsikkotieto"
 #: src/cache/dialogs.c:187
 #, c-format
 msgid "Sorry, but cache entry \"%s\" cannot be deleted."
-msgstr ""
+msgstr "Ikävä kyllä sivua \"%s\" ei voi poistaa välimuistista."
 
 #. cant_delete_used_item
 #: src/cache/dialogs.c:189
 #, c-format
 msgid "Sorry, but cache entry \"%s\" is being used by something else."
-msgstr ""
+msgstr "Ikävä kyllä sivua \"%s\" käyttää välimuistista vielä jokin muu."
 
-# ei "merkityt kohdat" koska itse muistia ei olla poistamassa
+# Ei "merkityt kohdat" koska itse muistia ei olla poistamassa.
+# Poisto koskee struct cache_entryä, jossa on:
+# 	struct uri *uri;		/* Identifier for the cached data */
+# joten sitä voinee nimittää sivuksi.
 #. delete_marked_items_title
 #: src/cache/dialogs.c:195
-#, fuzzy
 msgid "Delete marked cache entries"
-msgstr "Poista merkityt tiedot välimuistista"
+msgstr "Poista merkityt sivut välimuistista"
 
 #. delete_marked_items
 #: src/cache/dialogs.c:197
 msgid "Delete marked cache entries?"
-msgstr "Poistatko merkityt tiedot välimuistista?"
+msgstr "Poistatko merkityt sivut välimuistista?"
 
 #. delete_item_title
 #: src/cache/dialogs.c:203
-#, fuzzy
 msgid "Delete cache entry"
-msgstr "Poista kirjanmerkki"
+msgstr "Poista sivu välimuistista"
 
-#. delete_item
 #: src/cache/dialogs.c:205
+#, c-format
 msgid "Delete this cache entry?"
-msgstr ""
+msgstr "Poistatko tämän sivun välimuistista?"
 
 #. accelerator_context(display_download, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/download.c:download_buttons, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
-#: src/cache/dialogs.c:229 src/config/dialogs.c:529 src/cookies/dialogs.c:468
-#: src/dialogs/download.c:250 src/dialogs/download.c:480
+#: src/cache/dialogs.c:229 src/config/dialogs.c:530 src/cookies/dialogs.c:473
+#: src/dialogs/download.c:255 src/dialogs/download.c:492
 #: src/formhist/dialogs.c:210 src/globhist/dialogs.c:225
-#: src/protocol/auth/dialogs.c:258
+#: src/protocol/auth/dialogs.c:262
 msgid "~Info"
 msgstr "T~ieto"
 
 #: src/cache/dialogs.c:237
-#, fuzzy
 msgid "Cache manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Välimuistin hallinta"
 
 #. Please keep these tables in alphabetical order, and in sync with
 #. * the ACT_* constants in kbdbind.h.
@@ -677,7 +677,7 @@ msgstr "
 
 #: src/config/actions-edit.inc:7
 msgid "Attempt to auto-complete the input"
-msgstr ""
+msgstr "Yritä täydentää syöte"
 
 #: src/config/actions-edit.inc:8
 msgid "Attempt to auto-complete a local file"
@@ -685,15 +685,15 @@ msgstr "Yrit
 
 #: src/config/actions-edit.inc:9
 msgid "Attempt to unambiguously auto-complete the input"
-msgstr ""
+msgstr "Yritä täydentää syötteen yksiselitteinen osa"
 
 #: src/config/actions-edit.inc:10
 msgid "Delete character in front of the cursor"
-msgstr ""
+msgstr "Poista kohdistinta edeltävä merkki"
 
 #: src/config/actions-edit.inc:11
 msgid "Go to the first line of the buffer"
-msgstr ""
+msgstr "Siirry puskurin ensimmäiselle riville"
 
 # vai "Hylkää"?
 #: src/config/actions-edit.inc:12 src/config/actions-menu.inc:8
@@ -742,43 +742,55 @@ msgstr "Poista rivin alkuun asti"
 msgid "Delete to end of line"
 msgstr "Poista rivin loppuun asti"
 
+#: src/config/actions-edit.inc:23
+msgid "Delete backwards to start of word"
+msgstr "Pyyhi taaksepäin sanan alkuun asti"
+
 # Toisaalla on "Move cursor left"; miten eronnee tästä?
-#: src/config/actions-edit.inc:23 src/config/actions-menu.inc:15
+#: src/config/actions-edit.inc:24 src/config/actions-menu.inc:15
 msgid "Move the cursor left"
 msgstr "Siirrä kohdistinta vasemmalle"
 
-#: src/config/actions-edit.inc:24 src/config/actions-menu.inc:17
+#: src/config/actions-edit.inc:25
+msgid "Move cursor before current word"
+msgstr "Siirrä kohdistin nykyisen sanan eteen"
+
+#: src/config/actions-edit.inc:26
+msgid "Move cursor after current word"
+msgstr "Siirrä kohdistin nykyisen sanan taakse"
+
+#: src/config/actions-edit.inc:27 src/config/actions-menu.inc:17
 msgid "Move to the next item"
 msgstr "Siirry seuraavaan kohtaan"
 
-#: src/config/actions-edit.inc:25
+#: src/config/actions-edit.inc:28
 msgid "Open in external editor"
 msgstr "Avaa ulkoisessa muokkausohjelmassa"
 
-#: src/config/actions-edit.inc:26
+#: src/config/actions-edit.inc:29
 msgid "Paste text from the clipboard"
 msgstr "Liitä teksti leikepöydältä"
 
-#: src/config/actions-edit.inc:27 src/config/actions-menu.inc:20
+#: src/config/actions-edit.inc:30 src/config/actions-menu.inc:20
 msgid "Move to the previous item"
 msgstr "Siirry edelliseen kohtaan"
 
-#: src/config/actions-edit.inc:28 src/config/actions-main.inc:79
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
 #: src/config/actions-menu.inc:21
 msgid "Redraw the terminal"
 msgstr "Piirrä pääte uudestaan"
 
 # Toisaalla on "Move cursor right"; miten eronnee tästä?
-#: src/config/actions-edit.inc:29 src/config/actions-menu.inc:22
+#: src/config/actions-edit.inc:32 src/config/actions-menu.inc:22
 msgid "Move the cursor right"
 msgstr "Siirrä kohdistinta oikealle"
 
-#: src/config/actions-edit.inc:30
+#: src/config/actions-edit.inc:33
 msgid "Toggle regex matching (type-ahead searching)"
 msgstr ""
 
 # Toisaalla on "Move cursor up"; miten eronnee tästä?
-#: src/config/actions-edit.inc:31 src/config/actions-menu.inc:26
+#: src/config/actions-edit.inc:34 src/config/actions-menu.inc:26
 msgid "Move cursor upwards"
 msgstr "Siirrä kohdistinta ylöspäin"
 
@@ -799,31 +811,28 @@ msgid "Bookmark all open tabs"
 msgstr "Tee kaikista avoimista välilehdistä kirjanmerkit"
 
 #: src/config/actions-main.inc:12
-#, fuzzy
 msgid "Open authentication manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Avaa todennustietojen hallinta"
 
 #: src/config/actions-main.inc:13
 msgid "Backspace the last entered digit of the current prefix"
-msgstr ""
+msgstr "Pyyhi nykyisen etuliitteen viimeksi syötetty numero"
 
 #: src/config/actions-main.inc:14
 msgid "Open bookmark manager"
-msgstr "Avaa kirjanmerkkimuokkain"
+msgstr "Avaa kirjanmerkkien hallinta"
 
 #: src/config/actions-main.inc:15
-#, fuzzy
 msgid "Open cache manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Avaa välimuistin hallinta"
 
 #: src/config/actions-main.inc:16
 msgid "Free unused cache entries"
 msgstr "Vapauta käyttämättömät tiedot välimuistista"
 
 #: src/config/actions-main.inc:17
-#, fuzzy
 msgid "Open cookie manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Avaa evästeiden hallinta"
 
 #: src/config/actions-main.inc:18
 msgid "Reload cookies file"
@@ -834,9 +843,8 @@ msgid "Show information about the current page"
 msgstr "Näytä tietoja nykyisestä sivusta"
 
 #: src/config/actions-main.inc:21
-#, fuzzy
 msgid "Open download manager"
-msgstr "Lataa kuva"
+msgstr "Avaa latausten hallinta"
 
 #: src/config/actions-main.inc:22
 msgid "Enter ex-mode (command line)"
@@ -860,7 +868,7 @@ msgstr "Unohda todennuksen valtuustiedot"
 
 #: src/config/actions-main.inc:27
 msgid "Open form history manager"
-msgstr ""
+msgstr "Avaa lomakehistorian hallinta"
 
 #: src/config/actions-main.inc:28
 msgid "Pass URI of current frame to external command"
@@ -901,7 +909,7 @@ msgstr "N
 
 #: src/config/actions-main.inc:37
 msgid "Open history manager"
-msgstr ""
+msgstr "Avaa historian hallinta"
 
 #: src/config/actions-main.inc:38
 #, fuzzy
@@ -909,7 +917,6 @@ msgid "Return to the previous document in history"
 msgstr "Palaa historiassa edelliseen dokumenttiin"
 
 #: src/config/actions-main.inc:39
-#, fuzzy
 msgid "Go forward in history"
 msgstr "Etene historiassa"
 
@@ -919,7 +926,7 @@ msgstr "Hypp
 
 #: src/config/actions-main.inc:41
 msgid "Open keybinding manager"
-msgstr ""
+msgstr "Avaa näppäinsidontojen hallinta"
 
 # Toisaalla on "~Kill background connections".
 #: src/config/actions-main.inc:42
@@ -943,18 +950,16 @@ msgid "Pass URI of current link to external command"
 msgstr "Anna nykyisen linkin URI ulkoiselle komennolle"
 
 #: src/config/actions-main.inc:48
-#, fuzzy
 msgid "Follow the current link, forcing reload of the target"
 msgstr "Seuraa nykyistä linkkiä ja lataa kohde uudestaan"
 
 #: src/config/actions-main.inc:49
 msgid "Open the link context menu"
-msgstr ""
+msgstr "Avaa linkin tilannevalikko"
 
 #: src/config/actions-main.inc:50
-#, fuzzy
 msgid "Open the form fields menu"
-msgstr "Avaa Tiedosto-valikko"
+msgstr "Avaa lomakkeen kentät -valikko"
 
 #: src/config/actions-main.inc:51
 msgid "Open a Lua console"
@@ -1065,7 +1070,7 @@ msgstr "K
 
 #: src/config/actions-main.inc:76
 msgid "Open options manager"
-msgstr ""
+msgstr "Avaa asetusten hallinta"
 
 #: src/config/actions-main.inc:77
 msgid "Open a quit confirmation dialog box"
@@ -1079,10 +1084,10 @@ msgstr "Lopeta kysym
 msgid "Reload the current page"
 msgstr "Lataa nykyinen sivu uudestaan"
 
+# Toisaalla on "Sa~ve formatted document".
 #: src/config/actions-main.inc:81
-#, fuzzy
 msgid "Re-render the current page"
-msgstr "Piirrä nykyinen sivu uudestaan"
+msgstr "Muotoile nykyinen sivu uudestaan"
 
 #: src/config/actions-main.inc:82
 msgid "Reset form items to their initial values"
@@ -1148,9 +1153,8 @@ msgid "Search document text backwards by typing ahead"
 msgstr ""
 
 #: src/config/actions-main.inc:98
-#, fuzzy
 msgid "Show terminal options dialog"
-msgstr "Terminaaliasetukset"
+msgstr "Näytä Pääteasetukset-ikkuna"
 
 #: src/config/actions-main.inc:99
 #, fuzzy
@@ -1163,7 +1167,7 @@ msgid "Submit form and reload"
 msgstr "Lähetä lomake ja lataa"
 
 #: src/config/actions-main.inc:101 src/terminal/tab.c:210
-#: src/terminal/tab.c:247
+#: src/terminal/tab.c:253
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
@@ -1196,10 +1200,10 @@ msgstr "Seuraava v
 msgid "Previous tab"
 msgstr "Edellinen välilehti"
 
+# Toisaalla on "Resize t~erminal".
 #: src/config/actions-main.inc:109
-#, fuzzy
 msgid "Open the terminal resize dialog"
-msgstr "Terminaaliasetukset"
+msgstr "Avaa \"Aseta päätteen koko\" -ikkuna"
 
 #: src/config/actions-main.inc:110
 msgid "Toggle rendering of page using CSS"
@@ -1259,9 +1263,9 @@ msgid "Collapse item"
 msgstr "Supista kohta"
 
 #: src/config/cmdline.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot parse option %s: %s"
-msgstr "Töpseliin kirjoitus ei onnistu"
+msgstr ""
 
 #: src/config/cmdline.c:114
 #, c-format
@@ -1718,7 +1722,7 @@ msgstr ""
 
 #: src/config/conf.c:774
 msgid "Automatically saved keybindings\n"
-msgstr ""
+msgstr "Automaattisesti tallennetut näppäinsidonnat\n"
 
 #: src/config/dialogs.c:54
 msgid "Write config success"
@@ -1827,10 +1831,10 @@ msgstr ""
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/config/dialogs.c:321 src/protocol/bittorrent/dialogs.c:594
-#: src/protocol/protocol.c:230 src/session/session.c:282
-#: src/session/session.c:964 src/viewer/text/textarea.c:331
-#: src/viewer/text/textarea.c:338
+#: src/config/dialogs.c:321 src/protocol/bittorrent/dialogs.c:599
+#: src/protocol/protocol.c:230 src/session/session.c:287
+#: src/session/session.c:969 src/viewer/text/textarea.c:570
+#: src/viewer/text/textarea.c:577
 msgid "Error"
 msgstr "Virhe"
 
@@ -1854,69 +1858,87 @@ msgid ""
 "in addition to '_' and '-'."
 msgstr ""
 
-#: src/config/dialogs.c:481 src/config/dialogs.c:506
+#: src/config/dialogs.c:482 src/config/dialogs.c:507
 msgid "Add option"
 msgstr ""
 
-#: src/config/dialogs.c:482
+#: src/config/dialogs.c:483
 msgid "Cannot add an option here."
 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:534 src/config/dialogs.c:948 src/cookies/dialogs.c:474
-#: src/dialogs/options.c:213 src/formhist/dialogs.c:214
-#: src/protocol/bittorrent/dialogs.c:789 src/session/download.c:1166
+#: src/config/dialogs.c:535 src/config/dialogs.c:963 src/cookies/dialogs.c:479
+#: src/dialogs/options.c:222 src/formhist/dialogs.c:214
+#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
 msgstr "~Tallenna"
 
-#: src/config/dialogs.c:539
-#, fuzzy
+#: src/config/dialogs.c:540
 msgid "Option manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Asetusten hallinta"
 
-#: src/config/dialogs.c:701
+#: src/config/dialogs.c:702
 msgid "Keystroke"
 msgstr ""
 
-#: src/config/dialogs.c:703 src/config/options.inc:1186
+#: src/config/dialogs.c:704 src/config/options.inc:1186
 msgid "Action"
 msgstr ""
 
-#: src/config/dialogs.c:704
+#: src/config/dialogs.c:705
 msgid "Keymap"
 msgstr ""
 
-#: src/config/dialogs.c:830
+#: src/config/dialogs.c:844
 msgid "Keystroke already used"
 msgstr ""
 
-#: src/config/dialogs.c:831
+#: src/config/dialogs.c:845
 #, c-format
 msgid ""
 "The keystroke \"%s\" is currently used for \"%s\".\n"
 "Are you sure you want to replace it?"
 msgstr ""
 
-#: src/config/dialogs.c:854 src/config/dialogs.c:871 src/config/dialogs.c:908
+#: src/config/dialogs.c:870 src/config/dialogs.c:887 src/config/dialogs.c:923
 msgid "Add keybinding"
-msgstr ""
+msgstr "Lisää näppäinsidonta"
 
-#: src/config/dialogs.c:855
+#: src/config/dialogs.c:871
 msgid "Invalid keystroke."
-msgstr ""
+msgstr "Virheellinen näppäily."
 
-#: src/config/dialogs.c:872
-msgid "Need to select a keymap."
+#: src/config/dialogs.c:888
+msgid "Need to select an action."
+msgstr "Valitse ensin toiminto."
+
+#: src/config/dialogs.c:910
+#, c-format
+msgid ""
+"Action: %s\n"
+"Keymap: %s\n"
+"\n"
+"Keystroke should be written in the format: [Shift-][Ctrl-][Alt-]Key\n"
+"Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
+"\n"
+"Keystroke"
 msgstr ""
+"Toiminto: %s\n"
+"Näppäinkartta: %s\n"
+"\n"
+"Kirjoita näppäily tässä muodossa: [Shift-][Ctrl-][Alt-]Näppäin\n"
+"Näppäin: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
+"\n"
+"Näppäily"
 
 #. accelerator_context(menu_keys, src/config/dialogs.c:keybinding_buttons, src/globhist/dialogs.c:globhist_buttons)
-#: src/config/dialogs.c:946 src/dialogs/info.c:135 src/globhist/dialogs.c:231
+#: src/config/dialogs.c:961 src/dialogs/info.c:135 src/globhist/dialogs.c:231
 msgid "~Toggle display"
 msgstr "~Vaihda näyttötapa"
 
-#: src/config/dialogs.c:953
+#: src/config/dialogs.c:968
 msgid "Keybinding manager"
-msgstr ""
+msgstr "Näppäinsidontojen hallinta"
 
 #: src/config/home.c:121
 #, c-format
@@ -1948,20 +1970,20 @@ msgstr ""
 msgid "Menu mapping"
 msgstr ""
 
-#: src/config/kbdbind.c:556
+#: src/config/kbdbind.c:566
 msgid "Unrecognised keymap"
 msgstr ""
 
-#: src/config/kbdbind.c:559
+#: src/config/kbdbind.c:569
 #, fuzzy
 msgid "Error parsing keystroke"
 msgstr "Töpseliin kirjoitus ei onnistu"
 
-#: src/config/kbdbind.c:563
+#: src/config/kbdbind.c:573
 msgid "Unrecognised action (internal error)"
 msgstr ""
 
-#: src/config/kbdbind.c:579
+#: src/config/kbdbind.c:589
 #, fuzzy
 msgid "Error registering event"
 msgstr "Töpseliin kirjoitus ei onnistu"
@@ -2473,7 +2495,7 @@ msgid "Invert the fore- and background color so the link stands out."
 msgstr ""
 
 #: src/config/options.inc:296 src/config/options.inc:875
-#: src/dialogs/options.c:208
+#: src/dialogs/options.c:217
 msgid "Underline"
 msgstr "Alleviivaa"
 
@@ -3008,7 +3030,7 @@ msgid "Dump output options."
 msgstr ""
 
 #: src/config/options.inc:630 src/config/options.inc:879
-#: src/config/opttypes.c:394 src/dialogs/document.c:163
+#: src/config/opttypes.c:407 src/dialogs/document.c:163
 msgid "Codepage"
 msgstr "Merkistö"
 
@@ -3308,14 +3330,13 @@ msgstr ""
 
 #. Keep options in alphabetical order.
 #: src/config/options.inc:819
-#, fuzzy
 msgid "Terminals"
-msgstr "Terminaaliasetukset"
+msgstr "Päätteet"
 
+# voisi olla myös "päätekohtaiset asetukset" mutta ei "päätteen asetukset"
 #: src/config/options.inc:821
-#, fuzzy
 msgid "Terminal options."
-msgstr "Terminaaliasetukset"
+msgstr "Pääteasetukset."
 
 #: src/config/options.inc:825
 msgid "Options specific to this terminal type (according to $TERM value)."
@@ -3332,7 +3353,7 @@ msgid ""
 "4 is FreeBSD"
 msgstr ""
 
-#: src/config/options.inc:837 src/dialogs/options.c:204
+#: src/config/options.inc:837 src/dialogs/options.c:213
 msgid "Switch fonts for line drawing"
 msgstr ""
 
@@ -3343,7 +3364,7 @@ msgid ""
 "terminal."
 msgstr ""
 
-#: src/config/options.inc:843 src/dialogs/options.c:209
+#: src/config/options.inc:843 src/dialogs/options.c:218
 msgid "UTF-8 I/O"
 msgstr ""
 
@@ -3353,7 +3374,7 @@ msgid ""
 "only the subset of UTF8 according to terminal codepage is used."
 msgstr ""
 
-#: src/config/options.inc:848 src/dialogs/options.c:205
+#: src/config/options.inc:848 src/dialogs/options.c:214
 msgid "Restrict frames in cp850/852"
 msgstr "Rajoita kehykset näihin: cp850/852"
 
@@ -3363,7 +3384,7 @@ msgid ""
 "only with linux terminals using the cp850/852 character sets."
 msgstr ""
 
-#: src/config/options.inc:853 src/dialogs/options.c:206
+#: src/config/options.inc:853 src/dialogs/options.c:215
 #, fuzzy
 msgid "Block cursor"
 msgstr "Neliöosoitin"
@@ -3384,7 +3405,7 @@ msgid ""
 "2 is 256 color mode, uses XTerm RGB codes"
 msgstr ""
 
-#: src/config/options.inc:867 src/dialogs/options.c:207
+#: src/config/options.inc:867 src/dialogs/options.c:216
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
@@ -3602,7 +3623,7 @@ msgstr "Tekstialue"
 msgid "Dialog text colors."
 msgstr ""
 
-#: src/config/options.inc:1026 src/viewer/text/form.c:1458
+#: src/config/options.inc:1026 src/viewer/text/form.c:1780
 msgid "Checkbox"
 msgstr "Valintalaatikko"
 
@@ -3654,7 +3675,7 @@ msgstr ""
 msgid "Selected button shortcut"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:1054 src/viewer/text/form.c:1462
+#: src/config/options.inc:1054 src/viewer/text/form.c:1784
 msgid "Text field"
 msgstr "Tekstikenttä"
 
@@ -3943,7 +3964,7 @@ msgstr ""
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1217 src/config/opttypes.c:395
+#: src/config/options.inc:1217 src/config/opttypes.c:408
 msgid "Language"
 msgstr ""
 
@@ -4087,61 +4108,61 @@ msgstr ""
 msgid "Read error"
 msgstr "Talletusvirhe"
 
-#: src/config/opttypes.c:389
+#: src/config/opttypes.c:402
 msgid "Boolean"
 msgstr ""
 
-#: src/config/opttypes.c:389
+#: src/config/opttypes.c:402
 msgid "[0|1]"
 msgstr ""
 
-#: src/config/opttypes.c:390
+#: src/config/opttypes.c:403
 msgid "Integer"
 msgstr ""
 
-#: src/config/opttypes.c:390 src/config/opttypes.c:391
+#: src/config/opttypes.c:403 src/config/opttypes.c:404
 msgid "<num>"
 msgstr ""
 
-#: src/config/opttypes.c:391
+#: src/config/opttypes.c:404
 msgid "Longint"
 msgstr ""
 
-#: src/config/opttypes.c:392
+#: src/config/opttypes.c:405
 msgid "String"
 msgstr ""
 
-#: src/config/opttypes.c:392
+#: src/config/opttypes.c:405
 msgid "<str>"
 msgstr ""
 
-#: src/config/opttypes.c:394
+#: src/config/opttypes.c:407
 #, fuzzy
 msgid "<codepage>"
 msgstr "Merkistö"
 
-#: src/config/opttypes.c:395
+#: src/config/opttypes.c:408
 msgid "<language>"
 msgstr "<kieli>"
 
-#: src/config/opttypes.c:396
+#: src/config/opttypes.c:409
 msgid "Color"
 msgstr "Väri"
 
-#: src/config/opttypes.c:396
+#: src/config/opttypes.c:409
 msgid "<color|#rrggbb>"
 msgstr ""
 
-#: src/config/opttypes.c:398
+#: src/config/opttypes.c:411
 msgid "Special"
 msgstr ""
 
-#: src/config/opttypes.c:400
+#: src/config/opttypes.c:413
 msgid "Alias"
 msgstr ""
 
 #. tree
-#: src/config/opttypes.c:403
+#: src/config/opttypes.c:416
 msgid "Folder"
 msgstr "Kansio"
 
@@ -4157,7 +4178,7 @@ msgid "Goto URL History"
 msgstr "Ei historiaa"
 
 #. name:
-#: src/cookies/cookies.c:80 src/cookies/cookies.c:827
+#: src/cookies/cookies.c:80 src/cookies/cookies.c:858
 msgid "Cookies"
 msgstr ""
 
@@ -4225,7 +4246,7 @@ msgstr ""
 
 #: src/cookies/dialogs.c:36 src/cookies/dialogs.c:352
 msgid "Domain"
-msgstr ""
+msgstr "Verkkoalue"
 
 #: src/cookies/dialogs.c:37 src/mime/backend/mailcap.c:97
 #: src/mime/backend/mimetypes.c:56 src/protocol/file/cgi.c:43
@@ -4276,61 +4297,56 @@ msgstr "Palvelin"
 #: src/cookies/dialogs.c:201
 #, c-format
 msgid "Sorry, but cookie \"%s\" cannot be deleted."
-msgstr ""
+msgstr "Ikävä kyllä evästettä \"%s\" ei voi poistaa."
 
 #. cant_delete_used_item
 #: src/cookies/dialogs.c:203
 #, c-format
 msgid "Sorry, but cookie \"%s\" is being used by something else."
-msgstr ""
+msgstr "Ikävä kyllä evästettä \"%s\" käyttää vielä jokin muu."
 
 #. cant_delete_folder
 #: src/cookies/dialogs.c:205
 #, c-format
 msgid "Sorry, but cookie domain \"%s\" cannot be deleted."
-msgstr ""
+msgstr "Ikävä kyllä evästeiden verkkoaluetta \"%s\" ei voi poistaa."
 
 #. cant_delete_used_folder
 #: src/cookies/dialogs.c:207
 #, c-format
 msgid "Sorry, but cookie domain \"%s\" is being used by something else."
-msgstr ""
+msgstr "Ikävä kyllä evästeiden verkkoaluetta \"%s\" käyttää vielä jokin muu."
 
 #. delete_marked_items_title
 #: src/cookies/dialogs.c:209
-#, fuzzy
 msgid "Delete marked cookies"
 msgstr "Poista merkityt evästeet"
 
 #. delete_marked_items
 #: src/cookies/dialogs.c:211
-#, fuzzy
 msgid "Delete marked cookies?"
-msgstr "Valitse kenttä"
+msgstr "Poistatko merkityt evästeet?"
 
 #. delete_folder_title
 #: src/cookies/dialogs.c:213
-#, fuzzy
 msgid "Delete domain's cookies"
-msgstr "Valitse kenttä"
+msgstr "Poista verkkoalueen evästeet"
 
 #. delete_folder
 #: src/cookies/dialogs.c:215
 #, c-format
 msgid "Delete all cookies from domain \"%s\"?"
-msgstr ""
+msgstr "Poistatko kaikki verkkoalueen \"%s\" evästeet?"
 
 #. delete_item_title
 #: src/cookies/dialogs.c:217
-#, fuzzy
 msgid "Delete cookie"
-msgstr "Poista"
+msgstr "Poista eväste"
 
-#. delete_item
 #: src/cookies/dialogs.c:219
-#, fuzzy
+#, c-format
 msgid "Delete this cookie?"
-msgstr "Poista tiedostopääte"
+msgstr "Poistatko tämän evästeen?"
 
 #. clear_all_items_title
 #: src/cookies/dialogs.c:221
@@ -4342,32 +4358,28 @@ msgstr "Tyhjenn
 msgid "Do you really want to remove all cookies?"
 msgstr "Haluatko tosiaan poistaa kaikki evästeet?"
 
-#: src/cookies/dialogs.c:443
-#, fuzzy
+#: src/cookies/dialogs.c:448
 msgid "Add server"
-msgstr "Luo e~rotin"
+msgstr "Lisää palvelin"
 
-#: src/cookies/dialogs.c:447
-#, fuzzy
+#: src/cookies/dialogs.c:452
 msgid "Server name"
-msgstr "Palvelin"
+msgstr "Palvelimen nimi"
 
 #. accelerator_context(src/cookies/dialogs.c:cookie_buttons)
-#: src/cookies/dialogs.c:470
-#, fuzzy
+#: src/cookies/dialogs.c:475
 msgid "Add ~server"
-msgstr "Luo e~rotin"
+msgstr "Lisää p~alvelin"
 
 #. 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:473 src/dialogs/download.c:486 src/dialogs/edit.c:99
-#: src/globhist/dialogs.c:232 src/protocol/auth/dialogs.c:260
+#: src/cookies/dialogs.c:478 src/dialogs/download.c:498 src/dialogs/edit.c:99
+#: src/globhist/dialogs.c:232 src/protocol/auth/dialogs.c:264
 msgid "C~lear"
 msgstr "T~yhjennä"
 
-#: src/cookies/dialogs.c:479
-#, fuzzy
+#: src/cookies/dialogs.c:484
 msgid "Cookie manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Evästeiden hallinta"
 
 #: src/dialogs/document.c:46
 msgid "You are nowhere!"
@@ -4412,7 +4424,7 @@ msgstr ""
 
 #: src/dialogs/document.c:232
 msgid "Unknown"
-msgstr ""
+msgstr "Tuntematon"
 
 #: src/dialogs/document.c:247 src/dialogs/document.c:316
 msgid "Header info"
@@ -4427,84 +4439,83 @@ msgstr "Otsikkotieto"
 msgid "No header info."
 msgstr ""
 
-#: src/dialogs/download.c:238 src/dialogs/menu.c:588
+#: src/dialogs/download.c:243 src/dialogs/menu.c:593
 #: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:398
 msgid "Download"
 msgstr "Lataa"
 
 # Painike siirtää latauksen taustalle.
 #. accelerator_context(display_download)
-#: src/dialogs/download.c:245
+#: src/dialogs/download.c:250
 msgid "~Background"
 msgstr "~Taustalle"
 
 #. accelerator_context(display_download)
-#: src/dialogs/download.c:246
+#: src/dialogs/download.c:251
 msgid "Background with ~notify"
 msgstr "Taustalle ja i~lmoita"
 
 # Keskeytettyä raskauttakaan ei enää voi jatkaa.
 #. accelerator_context(display_download, src/dialogs/download.c:download_buttons)
-#: src/dialogs/download.c:253 src/dialogs/download.c:481
+#: src/dialogs/download.c:258 src/dialogs/download.c:493
 msgid "~Abort"
 msgstr "~Keskeytä"
 
 #. accelerator_context(display_download)
-#: src/dialogs/download.c:258
+#: src/dialogs/download.c:263
 msgid "Abort and ~delete file"
 msgstr "Keskeytä ja ~poista tiedosto"
 
 #. cant_delete_item
-#: src/dialogs/download.c:411
+#: src/dialogs/download.c:423
 #, c-format
 msgid "Sorry, but download \"%s\" cannot be interrupted."
-msgstr ""
+msgstr "Ikävä kyllä latausta \"%s\" ei voi keskeyttää."
 
 #. cant_delete_used_item
-#: src/dialogs/download.c:413
+#: src/dialogs/download.c:425
 #, c-format
 msgid "Sorry, but download \"%s\" is being used by something else."
-msgstr ""
+msgstr "Ikävä kyllä latausta \"%s\" käyttää vielä jokin muu."
 
 #. delete_marked_items_title
-#: src/dialogs/download.c:419
+#: src/dialogs/download.c:431
 msgid "Interrupt marked downloads"
 msgstr ""
 
 #. delete_marked_items
-#: src/dialogs/download.c:421
+#: src/dialogs/download.c:433
 msgid "Interrupt marked downloads?"
 msgstr ""
 
 #. delete_item_title
-#: src/dialogs/download.c:427
+#: src/dialogs/download.c:439
 msgid "Interrupt download"
 msgstr "Keskeytä lataus"
 
-#. delete_item
-#: src/dialogs/download.c:429
+#: src/dialogs/download.c:441
+#, c-format
 msgid "Interrupt this download?"
 msgstr ""
 
 #. clear_all_items_title
-#: src/dialogs/download.c:431
+#: src/dialogs/download.c:443
 msgid "Interrupt all downloads"
 msgstr "Keskeytä kaikki lataukset"
 
 #. clear_all_items_title
-#: src/dialogs/download.c:433
+#: src/dialogs/download.c:445
 msgid "Do you really want to interrupt all downloads?"
 msgstr "Haluatko tosiaan keskeyttää kaikki lataukset?"
 
 #. This requires more work to make locking work and query the user
-#: src/dialogs/download.c:484
+#: src/dialogs/download.c:496
 msgid "Abort and delete file"
 msgstr "Keskeytä ja poista tiedosto"
 
-#: src/dialogs/download.c:491
-#, fuzzy
+#: src/dialogs/download.c:503
 msgid "Download manager"
-msgstr "Lataa kuva"
+msgstr "Latausten hallinta"
 
 #. name:
 #: src/dialogs/exmode.c:149
@@ -4661,9 +4672,8 @@ msgstr[0] "%ld istunto"
 msgstr[1] "%ld istuntoa"
 
 #: src/dialogs/info.c:254
-#, fuzzy
 msgid "Memory allocated"
-msgstr "Välimuisti"
+msgstr "Muistia varattu"
 
 #: src/dialogs/info.c:262
 #, c-format
@@ -4804,6 +4814,7 @@ msgstr "Tallenna ~nimell
 msgid "Save UR~L as"
 msgstr "Tallenna ~URL nimellä"
 
+# Toisaalla on "Re-render the current page".
 #. accelerator_context(src/dialogs/menu.c:file_menu)
 #: src/dialogs/menu.c:320
 msgid "Sa~ve formatted document"
@@ -4817,9 +4828,8 @@ msgstr "Poista tausta~yhteydet"
 
 #. accelerator_context(src/dialogs/menu.c:file_menu)
 #: src/dialogs/menu.c:330
-#, fuzzy
 msgid "Flush all ~caches"
-msgstr "Tyhjennä väli~muisti"
+msgstr "Tyhjennä kaikki väli~muistit"
 
 #. accelerator_context(src/dialogs/menu.c:file_menu)
 #: src/dialogs/menu.c:331
@@ -4841,6 +4851,7 @@ msgstr "Avaa uusi ~ikkuna"
 msgid "~OS shell"
 msgstr "Käyttö~järjestelmä"
 
+# Toisaalla on "Open the terminal resize dialog".
 #. accelerator_context(src/dialogs/menu.c:file_menu)
 #: src/dialogs/menu.c:391
 msgid "Resize t~erminal"
@@ -4975,12 +4986,12 @@ msgstr "Ti~edostop
 #. accelerator_context(src/dialogs/menu.c:setup_menu)
 #: src/dialogs/menu.c:470
 msgid "~Options manager"
-msgstr ""
+msgstr "~Asetusten hallinta"
 
 #. accelerator_context(src/dialogs/menu.c:setup_menu)
 #: src/dialogs/menu.c:471
 msgid "~Keybinding manager"
-msgstr ""
+msgstr "~Näppäinsidontojen hallinta"
 
 #. accelerator_context(src/dialogs/menu.c:setup_menu)
 #: src/dialogs/menu.c:472
@@ -5015,7 +5026,7 @@ msgstr "~Ev
 #. accelerator_context(src/dialogs/menu.c:tools_menu)
 #: src/dialogs/menu.c:498
 msgid "~Form history"
-msgstr "K~aavakehistoria"
+msgstr "L~omakehistoria"
 
 #. accelerator_context(src/dialogs/menu.c:tools_menu)
 #: src/dialogs/menu.c:500
@@ -5057,24 +5068,24 @@ msgstr "~Ohje"
 msgid "Go to URL"
 msgstr "Valitse URL"
 
-#: src/dialogs/menu.c:588
+#: src/dialogs/menu.c:593
 msgid "Save to file"
 msgstr "Tallenna tiedostoon"
 
-#: src/dialogs/menu.c:923
+#: src/dialogs/menu.c:928
 msgid "Empty directory"
-msgstr ""
+msgstr "Tyhjä hakemisto"
 
-#: src/dialogs/menu.c:967
+#: src/dialogs/menu.c:972
 msgid "Directories:"
-msgstr ""
+msgstr "Hakemistot:"
 
-#: src/dialogs/menu.c:980
+#: src/dialogs/menu.c:985
 msgid "Files:"
 msgstr "Tiedostot:"
 
 #. 2 '\n' + 1 '\0'
-#: src/dialogs/options.c:152
+#: src/dialogs/options.c:161
 #, c-format
 msgid ""
 "The environmental variable TERM is set to '%s'.\n"
@@ -5085,67 +5096,66 @@ msgid ""
 "each terminal in which you run ELinks."
 msgstr ""
 
-#: src/dialogs/options.c:178
+#: src/dialogs/options.c:187
 msgid "Terminal options"
 msgstr "Terminaaliasetukset"
 
-#: src/dialogs/options.c:187
+#: src/dialogs/options.c:196
 msgid "Frame handling:"
 msgstr "Kehysten käsittely:"
 
-#: src/dialogs/options.c:188
+#: src/dialogs/options.c:197
 msgid "No frames"
 msgstr "Ei kehyksiä"
 
-#: src/dialogs/options.c:189
+#: src/dialogs/options.c:198
 msgid "VT 100 frames"
 msgstr "VT 100 -kehykset"
 
-#: src/dialogs/options.c:190
+#: src/dialogs/options.c:199
 msgid "Linux or OS/2 frames"
 msgstr "Linux- tai OS/2-kehykset"
 
-#: src/dialogs/options.c:191
+#: src/dialogs/options.c:200
 msgid "FreeBSD frames"
 msgstr "FreeBSD-kehykset"
 
-#: src/dialogs/options.c:192
+#: src/dialogs/options.c:201
 msgid "KOI8-R frames"
 msgstr "KOI8-R-kehykset"
 
-#: src/dialogs/options.c:194
+#: src/dialogs/options.c:203
 msgid "Color mode:"
 msgstr "Värit:"
 
-#: src/dialogs/options.c:195
+#: src/dialogs/options.c:204
 msgid "No colors (mono)"
 msgstr "Ei värejä (yksiväri)"
 
-#: src/dialogs/options.c:196
+#: src/dialogs/options.c:205
 msgid "16 colors"
 msgstr "16 väriä"
 
-#: src/dialogs/options.c:198
+#: src/dialogs/options.c:207
 #, fuzzy
 msgid "88 colors"
 msgstr "16 väriä"
 
-#: src/dialogs/options.c:201
+#: src/dialogs/options.c:210
 msgid "256 colors"
 msgstr "256 väriä"
 
-#: src/dialogs/options.c:286
-#, fuzzy
+#: src/dialogs/options.c:295
 msgid "Resize terminal"
-msgstr "Aseta ~terminaalin koko"
+msgstr "Aseta päätteen koko"
 
-#: src/dialogs/options.c:289
+#: src/dialogs/options.c:298
 msgid "Width="
-msgstr ""
+msgstr "Leveys="
 
-#: src/dialogs/options.c:290
+#: src/dialogs/options.c:299
 msgid "Height="
-msgstr ""
+msgstr "Korkeus="
 
 #. FIXME: The following is a PITA from the l10n standpoint. A *big*
 #. * one, _("of")-like pearls are a nightmare. Format strings need to
@@ -5163,9 +5173,8 @@ msgid "Average speed"
 msgstr "Keskinopeus"
 
 #: src/dialogs/progress.c:49
-#, fuzzy
 msgid "average speed"
-msgstr "Keskinopeus"
+msgstr "keskinopeus"
 
 #: src/dialogs/progress.c:50
 msgid "avg"
@@ -5184,22 +5193,20 @@ msgid "Elapsed time"
 msgstr "Kulutettu aika"
 
 #: src/dialogs/progress.c:66
-#, fuzzy
 msgid "elapsed time"
-msgstr "Kulutettu aika"
+msgstr "kulutettu aika"
 
 #: src/dialogs/progress.c:67
 msgid "ETT"
-msgstr ""
+msgstr "kul"
 
 #: src/dialogs/progress.c:73
 msgid "Speed"
 msgstr "Nopeus"
 
 #: src/dialogs/progress.c:73
-#, fuzzy
 msgid "speed"
-msgstr "Nopeus"
+msgstr "nopeus"
 
 #: src/dialogs/progress.c:83
 msgid "estimated time"
@@ -5209,32 +5216,31 @@ msgstr "laskettu aika"
 msgid "ETA"
 msgstr ""
 
-#: src/dialogs/status.c:191
+#: src/dialogs/status.c:184
 msgid "Enter a mark to set"
 msgstr ""
 
-#: src/dialogs/status.c:195
+#: src/dialogs/status.c:188
 msgid "Enter a mark to which to jump"
 msgstr ""
 
-#: src/dialogs/status.c:202
+#: src/dialogs/status.c:195
 #, c-format
 msgid "Keyboard prefix: %d"
-msgstr ""
+msgstr "Näppäilty etuliite: %d"
 
-#: src/dialogs/status.c:226
+#: src/dialogs/status.c:219
 #, c-format
 msgid "Cursor position: %dx%d"
-msgstr ""
+msgstr "Kohdistimen sijainti: %dx%d"
 
-#: src/dialogs/status.c:326
+#: src/dialogs/status.c:319
 msgid "Untitled"
-msgstr ""
+msgstr "Ei otsikkoa"
 
-#: src/dialogs/status.c:328
-#, fuzzy
+#: src/dialogs/status.c:321
 msgid "No document"
-msgstr "documentit"
+msgstr ""
 
 #. name:
 #: src/document/css/css.c:28 src/document/css/css.c:155
@@ -5246,9 +5252,8 @@ msgid "Options concerning how to use CSS for styling documents."
 msgstr ""
 
 #: src/document/css/css.c:32
-#, fuzzy
 msgid "Enable CSS"
-msgstr "nimi"
+msgstr ""
 
 #: src/document/css/css.c:34
 msgid "Enable adding of CSS style info to documents."
@@ -5279,58 +5284,57 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/ecmascript/ecmascript.c:39 src/ecmascript/ecmascript.c:310
+#: src/ecmascript/ecmascript.c:40 src/ecmascript/ecmascript.c:311
 msgid "ECMAScript"
-msgstr ""
+msgstr "ECMAScript"
 
-#: src/ecmascript/ecmascript.c:41
-#, fuzzy
+#: src/ecmascript/ecmascript.c:42
 msgid "ECMAScript options."
-msgstr "Terminaaliasetukset"
+msgstr "ECMAScript-asetukset."
 
-#: src/ecmascript/ecmascript.c:45
+#: src/ecmascript/ecmascript.c:46
 msgid "Whether to run those scripts inside of documents."
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:47
+#: src/ecmascript/ecmascript.c:48
 msgid "Script error reporting"
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:49
+#: src/ecmascript/ecmascript.c:50
 msgid "Open a message box when a script reports an error."
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:51
+#: src/ecmascript/ecmascript.c:52
 msgid "Ignore <noscript> content"
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:53
+#: src/ecmascript/ecmascript.c:54
 msgid ""
 "Whether to ignore content enclosed by the <noscript> tag\n"
 "when ECMAScript is enabled."
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:56
+#: src/ecmascript/ecmascript.c:57
 msgid "Maximum execution time"
-msgstr ""
+msgstr "Suorituksen enimmäisaika"
 
-#: src/ecmascript/ecmascript.c:58
+#: src/ecmascript/ecmascript.c:59
 msgid "Maximum execution time in seconds for a script."
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:60
+#: src/ecmascript/ecmascript.c:61
 msgid "Pop-up window blocking"
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:62
+#: src/ecmascript/ecmascript.c:63
 msgid "Whether to disallow scripts to open new windows or tabs."
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:255
+#: src/ecmascript/ecmascript.c:256
 msgid "JavaScript Emergency"
 msgstr ""
 
-#: src/ecmascript/ecmascript.c:257
+#: src/ecmascript/ecmascript.c:258
 #, c-format
 msgid ""
 "A script embedded in the current document was running\n"
@@ -5339,7 +5343,7 @@ msgid ""
 "ELinks, so the script execution was interrupted."
 msgstr ""
 
-#: src/ecmascript/see/window.c:216 src/ecmascript/spidermonkey/window.c:286
+#: src/ecmascript/see/window.c:211 src/ecmascript/spidermonkey/window.c:286
 msgid "JavaScript Alert"
 msgstr ""
 
@@ -5364,13 +5368,13 @@ msgstr ""
 #: src/formhist/dialogs.c:120
 #, c-format
 msgid "Sorry, but form \"%s\" cannot be deleted."
-msgstr ""
+msgstr "Ikävä kyllä lomaketta \"%s\" ei voi poistaa."
 
 #. cant_delete_used_item
 #: src/formhist/dialogs.c:122
 #, c-format
 msgid "Sorry, but form \"%s\" is being used by something else."
-msgstr ""
+msgstr "Ikävä kyllä lomaketta \"%s\" käyttää vielä jokin muu."
 
 #. delete_marked_items_title
 #: src/formhist/dialogs.c:128
@@ -5390,9 +5394,8 @@ msgstr "Valitse kentt
 msgid "Delete form"
 msgstr "Poista kirjanmerkki"
 
-#. delete_item
 #: src/formhist/dialogs.c:138
-#, fuzzy
+#, fuzzy, c-format
 msgid "Delete this form?"
 msgstr "Poista kirjanmerkki"
 
@@ -5434,9 +5437,8 @@ msgid "Clea~r"
 msgstr "T~yhjennä"
 
 #: src/formhist/dialogs.c:219
-#, fuzzy
 msgid "Form history manager"
-msgstr "Muisti loppu"
+msgstr "Lomakehistorian hallinta"
 
 #: src/formhist/formhist.c:36
 msgid "Show form history dialog"
@@ -5477,45 +5479,41 @@ msgstr "Lomakehistoria"
 #: src/globhist/dialogs.c:105
 #, c-format
 msgid "Sorry, but history entry \"%s\" cannot be deleted."
-msgstr ""
+msgstr "Ikävä kyllä historiatietoa \"%s\" ei voi poistaa."
 
 #. cant_delete_used_item
 #: src/globhist/dialogs.c:107
 #, c-format
 msgid "Sorry, but history entry \"%s\" is being used by something else."
-msgstr ""
+msgstr "Ikävä kyllä historiatietoa \"%s\" käyttää vielä jokin muu."
 
 #. delete_marked_items_title
 #: src/globhist/dialogs.c:113
-#, fuzzy
 msgid "Delete marked history entries"
-msgstr "Valitse kenttä"
+msgstr "Poista merkityt historiatiedot"
 
 #. delete_marked_items
 #: src/globhist/dialogs.c:115
-#, fuzzy
 msgid "Delete marked history entries?"
-msgstr "Valitse kenttä"
+msgstr "Poistatko merkityt historiatiedot?"
 
 #. delete_item_title
 #: src/globhist/dialogs.c:121
-#, fuzzy
 msgid "Delete history entry"
-msgstr "Poista"
+msgstr "Poista historiatieto"
 
-#. delete_item
 #: src/globhist/dialogs.c:123
+#, c-format
 msgid "Delete this history entry?"
-msgstr ""
+msgstr "Poistatko tämän historiatiedon?"
 
 #. clear_all_items_title
 #: src/globhist/dialogs.c:125
 msgid "Clear all history entries"
-msgstr ""
+msgstr "Tyhjennä historiatiedot"
 
 #. clear_all_items_title
 #: src/globhist/dialogs.c:127
-#, fuzzy
 msgid "Do you really want to remove all history entries?"
 msgstr "Haluatko varmasti poistaa kaikki historiatiedot?"
 
@@ -5529,9 +5527,8 @@ msgid "~Bookmark"
 msgstr "~Kirjanmerkki"
 
 #: src/globhist/dialogs.c:241
-#, fuzzy
 msgid "Global history manager"
-msgstr "Ei historiaa"
+msgstr "Yleishistorian hallinta"
 
 #: src/globhist/globhist.c:60
 msgid "Global history"
@@ -5565,7 +5562,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/globhist/globhist.c:449
+#: src/globhist/globhist.c:448
 #, fuzzy
 msgid "Global History"
 msgstr "Ei historiaa"
@@ -5702,7 +5699,7 @@ msgstr "turkki"
 msgid "Ukrainian"
 msgstr "ukraina"
 
-#: src/main/interlink.c:329 src/main/select.c:255
+#: src/main/interlink.c:329 src/main/select.c:257
 #, c-format
 msgid "The call to %s failed: %d (%s)"
 msgstr "Funktio %s epäonnistui: %d (%s)"
@@ -5734,7 +5731,7 @@ msgid "Unable to attach_terminal()."
 msgstr ""
 
 #. Infinite loop prevention.
-#: src/main/select.c:258
+#: src/main/select.c:260
 #, c-format
 msgid "%d select() failures."
 msgstr ""
@@ -5883,7 +5880,7 @@ msgid "Option system"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:675
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
 msgid "Mailcap"
 msgstr ""
 
@@ -5929,13 +5926,13 @@ msgid ""
 "also be checked before deciding the handler."
 msgstr ""
 
-#: src/mime/backend/mailcap.c:351
+#: src/mime/backend/mailcap.c:349
 #, c-format
 msgid "Badly formated mailcap entry for type %s in \"%s\" line %d"
 msgstr ""
 
 #. name:
-#: src/mime/backend/mimetypes.c:46 src/mime/backend/mimetypes.c:285
+#: src/mime/backend/mimetypes.c:46 src/mime/backend/mimetypes.c:279
 msgid "Mimetypes files"
 msgstr ""
 
@@ -6266,9 +6263,8 @@ msgid "Transfer failed"
 msgstr "Siirtää"
 
 #: src/network/state.c:104
-#, fuzzy
 msgid "Authorization required"
-msgstr "Kirjoita kättäjänimi"
+msgstr "Valtuutus vaaditaan"
 
 #: src/network/state.c:105
 msgid "Access to server denied"
@@ -6343,82 +6339,87 @@ msgstr "~BeOS-terminaali"
 msgid "Authentication required for %s at %s"
 msgstr "Kirjoita kättäjänimi"
 
-#: src/protocol/auth/dialogs.c:98
-msgid "HTTP Authentication"
-msgstr ""
+#. This function is used for at least HTTP and FTP, so don't
+#. * name the protocol here.  Consider also what an FTP server
+#. * behind an HTTP proxy should be called.
+#: src/protocol/auth/dialogs.c:102
+msgid "Authentication required"
+msgstr "Todennus vaaditaan"
 
-#: src/protocol/auth/dialogs.c:108
+#: src/protocol/auth/dialogs.c:112
 msgid "Login"
 msgstr "Käyttäjän ID"
 
-#: src/protocol/auth/dialogs.c:109 src/protocol/http/http.c:137
+#: src/protocol/auth/dialogs.c:113 src/protocol/http/http.c:140
 msgid "Password"
 msgstr "Salasana"
 
-#: src/protocol/auth/dialogs.c:162
+#: src/protocol/auth/dialogs.c:166
 msgid "Realm"
 msgstr ""
 
-#: src/protocol/auth/dialogs.c:174
+#: src/protocol/auth/dialogs.c:178
 msgid "none"
 msgstr "ei mikään"
 
-#: src/protocol/auth/dialogs.c:177
+#: src/protocol/auth/dialogs.c:181
 #, fuzzy
 msgid "State"
 msgstr "Tila"
 
-#: src/protocol/auth/dialogs.c:178
+#: src/protocol/auth/dialogs.c:182
 msgid "valid"
 msgstr ""
 
 #. cant_delete_item
-#: src/protocol/auth/dialogs.c:215
+#: src/protocol/auth/dialogs.c:219
 #, c-format
 msgid "Sorry, but auth entry \"%s\" cannot be deleted."
-msgstr ""
+msgstr "Ikävä kyllä todennustietoa \"%s\" ei voi poistaa."
 
 #. cant_delete_used_item
-#: src/protocol/auth/dialogs.c:217
+#: src/protocol/auth/dialogs.c:221
 #, c-format
 msgid "Sorry, but auth entry \"%s\" is being used by something else."
-msgstr ""
+msgstr "Ikävä kyllä todennustietoa \"%s\" käyttää vielä jokin muu."
 
-# "Tunnistetiedot" viittaisi enemmänkin palvelimelle jääviin lokitietoihin.
+# identification = tunnistus
+# authentication = todennus
+# authorization = valtuutus
+# logging in = sisäänkirjaus
 #. delete_marked_items_title
-#: src/protocol/auth/dialogs.c:223
+#: src/protocol/auth/dialogs.c:227
 msgid "Delete marked auth entries"
-msgstr "Poista merkityt tunnistustiedot"
+msgstr "Poista merkityt todennustiedot"
 
 #. delete_marked_items
-#: src/protocol/auth/dialogs.c:225
+#: src/protocol/auth/dialogs.c:229
 msgid "Delete marked auth entries?"
-msgstr "Poistatko merkityt tunnistustiedot?"
+msgstr "Poistatko merkityt todennustiedot?"
 
 #. delete_item_title
-#: src/protocol/auth/dialogs.c:231
-msgid "Delete auth entry"
-msgstr "Poista tunnistustieto"
-
-#. delete_item
-#: src/protocol/auth/dialogs.c:233
-msgid "Delete this auth entry?"
-msgstr "Poistatko tämän tunnistustiedon?"
-
-#. clear_all_items_title
 #: src/protocol/auth/dialogs.c:235
-msgid "Clear all auth entries"
-msgstr "Tyhjennä kaikki tunnistustiedot"
+msgid "Delete auth entry"
+msgstr "Poista todennustieto"
+
+#: src/protocol/auth/dialogs.c:237
+#, c-format
+msgid "Delete this auth entry?"
+msgstr "Poistatko tämän todennustiedon?"
 
 #. clear_all_items_title
-#: src/protocol/auth/dialogs.c:237
-msgid "Do you really want to remove all auth entries?"
-msgstr "Haluatko tosiaan poistaa kaikki tunnistustiedot?"
+#: src/protocol/auth/dialogs.c:239
+msgid "Clear all auth entries"
+msgstr "Tyhjennä kaikki todennustiedot"
 
-#: src/protocol/auth/dialogs.c:265
-#, fuzzy
+#. clear_all_items_title
+#: src/protocol/auth/dialogs.c:241
+msgid "Do you really want to remove all auth entries?"
+msgstr "Haluatko tosiaan poistaa kaikki todennustiedot?"
+
+#: src/protocol/auth/dialogs.c:269
 msgid "Authentication manager"
-msgstr "Kirjanmerkkimuokkain"
+msgstr "Todennustietojen hallinta"
 
 #. name:
 #: src/protocol/bittorrent/bittorrent.c:26
@@ -6730,7 +6731,7 @@ msgid ""
 "selection strategy from random to rarest first."
 msgstr ""
 
-#: src/protocol/bittorrent/bittorrent.c:208 src/protocol/http/http.c:106
+#: src/protocol/bittorrent/bittorrent.c:208 src/protocol/http/http.c:109
 msgid "Allow blacklisting"
 msgstr ""
 
@@ -6938,37 +6939,37 @@ msgid_plural "%u unavailable"
 msgstr[0] "FTP-palvelin ei vastaa"
 msgstr[1] "FTP-palvelin ei vastaa"
 
-#: src/protocol/bittorrent/dialogs.c:579 src/session/session.c:273
+#: src/protocol/bittorrent/dialogs.c:584 src/session/session.c:278
 #, fuzzy, c-format
 msgid "Unable to retrieve %s"
 msgstr "Asetustiedoston kirjoitus ei onnistu"
 
-#: src/protocol/bittorrent/dialogs.c:726
+#: src/protocol/bittorrent/dialogs.c:736
 #, c-format
 msgid "What would you like to do with the file '%s'?"
 msgstr ""
 
-#: src/protocol/bittorrent/dialogs.c:742
+#: src/protocol/bittorrent/dialogs.c:752
 #, fuzzy
 msgid "Information about the torrent"
 msgstr "Näytä tietoja nykyisestä sivusta"
 
-#: src/protocol/bittorrent/dialogs.c:764 src/session/download.c:1078
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1121
 msgid "What to do?"
 msgstr "Mitä tehdä?"
 
 #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback)
-#: src/protocol/bittorrent/dialogs.c:786
+#: src/protocol/bittorrent/dialogs.c:796
 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:792 src/session/download.c:1172
+#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1226
 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:796 src/session/download.c:1176
+#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1230
 msgid "Show ~header"
 msgstr "Näytä ~otsake"
 
@@ -6998,19 +6999,19 @@ msgstr ""
 msgid "CGI"
 msgstr ""
 
-#: src/protocol/file/file.c:41
+#: src/protocol/file/file.c:42
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: src/protocol/file/file.c:43
+#: src/protocol/file/file.c:44
 msgid "Options specific to local browsing."
 msgstr ""
 
-#: src/protocol/file/file.c:45
+#: src/protocol/file/file.c:46
 msgid "Allow reading special files"
 msgstr "Anna lukea erikoistiedostoja"
 
-#: src/protocol/file/file.c:47
+#: src/protocol/file/file.c:48
 msgid ""
 "Whether to allow reading from non-regular files.\n"
 "Note this can be dangerous; reading /dev/urandom or\n"
@@ -7020,22 +7021,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:51
+#: src/protocol/file/file.c:52
 msgid "Show hidden files in directory listing"
 msgstr "Näytä piilotiedostot hakemistolistauksissa"
 
-#: src/protocol/file/file.c:53
+#: src/protocol/file/file.c:54
 msgid ""
 "When set to false, files with name starting with a dot will be\n"
 "hidden in local directories listing."
 msgstr ""
 
-#: src/protocol/file/file.c:56
+#: src/protocol/file/file.c:57
 #, fuzzy
 msgid "Try encoding extensions"
 msgstr "Ei tiedostopäätteitä"
 
-#: src/protocol/file/file.c:58
+#: src/protocol/file/file.c:59
 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"
@@ -7043,7 +7044,7 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/file/file.c:66
+#: src/protocol/file/file.c:67
 msgid "File"
 msgstr "Tiedosto"
 
@@ -7084,8 +7085,8 @@ msgstr ""
 msgid "FTP specific options."
 msgstr ""
 
-#: src/protocol/ftp/ftp.c:60 src/protocol/http/http.c:124
-#: src/protocol/http/http.c:206
+#: src/protocol/ftp/ftp.c:60 src/protocol/http/http.c:127
+#: src/protocol/http/http.c:209
 msgid "Proxy configuration"
 msgstr ""
 
@@ -7093,8 +7094,8 @@ msgstr ""
 msgid "FTP proxy configuration."
 msgstr ""
 
-#: src/protocol/ftp/ftp.c:64 src/protocol/http/http.c:128
-#: src/protocol/http/http.c:210
+#: src/protocol/ftp/ftp.c:64 src/protocol/http/http.c:131
+#: src/protocol/http/http.c:213
 #, fuzzy
 msgid "Host and port-number"
 msgstr "Palvelin ja portin numero"
@@ -7151,27 +7152,27 @@ msgid ""
 msgstr ""
 
 #. name:
-#: src/protocol/http/http.c:92 src/protocol/http/http.c:220
+#: src/protocol/http/http.c:95 src/protocol/http/http.c:223
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/protocol/http/http.c:94
+#: src/protocol/http/http.c:97
 msgid "HTTP-specific options."
 msgstr ""
 
-#: src/protocol/http/http.c:97
+#: src/protocol/http/http.c:100
 msgid "Server bug workarounds"
 msgstr "Palvelinten vikojen kierto"
 
-#: src/protocol/http/http.c:99
+#: src/protocol/http/http.c:102
 msgid "Server-side HTTP bugs workarounds."
 msgstr ""
 
-#: src/protocol/http/http.c:101
+#: src/protocol/http/http.c:104
 msgid "Do not send Accept-Charset"
 msgstr "Älä lähetä Accept-Charsetiä"
 
-#: src/protocol/http/http.c:103
+#: src/protocol/http/http.c:106
 msgid ""
 "The Accept-Charset header is quite long and sending it can trigger\n"
 "bugs in some rarely found servers."
@@ -7179,64 +7180,64 @@ msgstr ""
 "Accept-Charset-otsake on aika pitkä, ja sen saadessaan jotkin\n"
 "harvinaiset palvelimet voivat toimia väärin."
 
-#: src/protocol/http/http.c:108
+#: src/protocol/http/http.c:111
 msgid "Allow blacklisting of buggy servers."
 msgstr ""
 
-#: src/protocol/http/http.c:110
+#: src/protocol/http/http.c:113
 msgid "Broken 302 redirects"
 msgstr ""
 
-#: src/protocol/http/http.c:112
+#: src/protocol/http/http.c:115
 msgid ""
 "Broken 302 redirect (violates RFC but compatible with Netscape).\n"
 "This is a problem for a lot of web discussion boards and the like.\n"
 "If they will do strange things to you, try to play with this."
 msgstr ""
 
-#: src/protocol/http/http.c:116
+#: src/protocol/http/http.c:119
 msgid "No keepalive after POST requests"
 msgstr ""
 
-#: src/protocol/http/http.c:118
+#: src/protocol/http/http.c:121
 msgid "Disable keepalive connection after POST request."
 msgstr ""
 
-#: src/protocol/http/http.c:120
+#: src/protocol/http/http.c:123
 msgid "Use HTTP/1.0"
 msgstr ""
 
-#: src/protocol/http/http.c:122
+#: src/protocol/http/http.c:125
 msgid "Use HTTP/1.0 protocol instead of HTTP/1.1."
 msgstr ""
 
-#: src/protocol/http/http.c:126
+#: src/protocol/http/http.c:129
 msgid "HTTP proxy configuration."
 msgstr ""
 
-#: src/protocol/http/http.c:130
+#: src/protocol/http/http.c:133
 msgid ""
 "Host and port-number (host:port) of the HTTP proxy, or blank.\n"
 "If it's blank, HTTP_PROXY environment variable is checked as well."
 msgstr ""
 
-#: src/protocol/http/http.c:133
+#: src/protocol/http/http.c:136
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: src/protocol/http/http.c:135
+#: src/protocol/http/http.c:138
 msgid "Proxy authentication username."
 msgstr ""
 
-#: src/protocol/http/http.c:139
+#: src/protocol/http/http.c:142
 msgid "Proxy authentication password."
 msgstr ""
 
-#: src/protocol/http/http.c:142
+#: src/protocol/http/http.c:145
 msgid "Referer sending"
 msgstr ""
 
-#: src/protocol/http/http.c:144
+#: src/protocol/http/http.c:147
 msgid ""
 "HTTP referer sending options. HTTP referer is a special header\n"
 "sent in the HTTP requests, which is supposed to contain the previous\n"
@@ -7246,11 +7247,11 @@ msgid ""
 "security problem on some badly designed web pages."
 msgstr ""
 
-#: src/protocol/http/http.c:151
+#: src/protocol/http/http.c:154
 msgid "Policy"
 msgstr ""
 
-#: src/protocol/http/http.c:154
+#: src/protocol/http/http.c:157
 msgid ""
 "Mode of sending HTTP referer:\n"
 "0 is send no referer\n"
@@ -7259,27 +7260,27 @@ msgid ""
 "3 is send previous URL as referer (correct, but insecure)"
 msgstr ""
 
-#: src/protocol/http/http.c:160
+#: src/protocol/http/http.c:163
 msgid "Fake referer URL"
 msgstr ""
 
-#: src/protocol/http/http.c:162
+#: src/protocol/http/http.c:165
 msgid "Fake referer to be sent when policy is 2."
 msgstr ""
 
-#: src/protocol/http/http.c:165
+#: src/protocol/http/http.c:168
 msgid "Send Accept-Language header"
 msgstr ""
 
-#: src/protocol/http/http.c:167
+#: src/protocol/http/http.c:170
 msgid "Send Accept-Language header."
 msgstr ""
 
-#: src/protocol/http/http.c:169
+#: src/protocol/http/http.c:172
 msgid "Use UI language as Accept-Language"
 msgstr ""
 
-#: src/protocol/http/http.c:171
+#: src/protocol/http/http.c:174
 msgid ""
 "Request localised versions of documents from web-servers (using the\n"
 "Accept-Language header) using the language you have configured for\n"
@@ -7289,11 +7290,11 @@ msgid ""
 "your language preference."
 msgstr ""
 
-#: src/protocol/http/http.c:178
+#: src/protocol/http/http.c:181
 msgid "Activate HTTP TRACE debugging"
 msgstr ""
 
-#: src/protocol/http/http.c:180
+#: src/protocol/http/http.c:183
 msgid ""
 "If active, all HTTP requests are sent with TRACE as their method\n"
 "rather than GET or POST. This is useful for debugging of both ELinks\n"
@@ -7303,11 +7304,11 @@ msgid ""
 msgstr ""
 
 #. OSNews.com is supposed to be relying on the textmode token, at least.
-#: src/protocol/http/http.c:187
+#: src/protocol/http/http.c:190
 msgid "User-agent identification"
 msgstr ""
 
-#: src/protocol/http/http.c:189
+#: src/protocol/http/http.c:192
 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"
@@ -7322,20 +7323,20 @@ msgid ""
 "Use \" \" if you don't want any User-Agent header to be sent at all."
 msgstr ""
 
-#: src/protocol/http/http.c:202
+#: src/protocol/http/http.c:205
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: src/protocol/http/http.c:204
+#: src/protocol/http/http.c:207
 #, fuzzy
 msgid "HTTPS-specific options."
 msgstr "Ei ohjelmaa osoitettu"
 
-#: src/protocol/http/http.c:208
+#: src/protocol/http/http.c:211
 msgid "HTTPS proxy configuration."
 msgstr ""
 
-#: src/protocol/http/http.c:212
+#: src/protocol/http/http.c:215
 msgid ""
 "Host and port-number (host:port) of the HTTPS CONNECT proxy, or blank.\n"
 "If it's blank, HTTPS_PROXY environment variable is checked as well."
@@ -7387,7 +7388,7 @@ msgstr ""
 
 #: src/protocol/protocol.c:267
 msgid "No-proxy domains"
-msgstr ""
+msgstr "Välipalvelimettomat verkkoalueet"
 
 #: src/protocol/protocol.c:269
 msgid ""
@@ -7548,55 +7549,55 @@ msgstr "Ei ohjelmaa"
 msgid "No program specified for protocol %s."
 msgstr "Ei ohjelmaa osoitettu"
 
-#: src/scripting/lua/core.c:300
+#: src/scripting/lua/core.c:301
 #, fuzzy
 msgid "Error registering event hook"
 msgstr "Töpseliin kirjoitus ei onnistu"
 
-#: src/scripting/lua/core.c:451
+#: src/scripting/lua/core.c:452
 msgid "User dialog"
 msgstr ""
 
-#: src/scripting/lua/core.c:726
+#: src/scripting/lua/core.c:731
 msgid "Lua Error"
 msgstr "Lua-virhe"
 
-#: src/scripting/lua/core.c:876
+#: src/scripting/lua/core.c:881
 msgid "Lua Console"
 msgstr "Lua-konsoli"
 
-#: src/scripting/lua/core.c:876
+#: src/scripting/lua/core.c:881
 msgid "Enter expression"
 msgstr "Kirjoita lauseke"
 
-#: src/scripting/ruby/core.c:130 src/scripting/ruby/core.c:183
+#: src/scripting/ruby/core.c:131 src/scripting/ruby/core.c:184
 msgid "Ruby Message"
 msgstr ""
 
-#: src/scripting/scripting.c:54
+#: src/scripting/scripting.c:59
 #, c-format
 msgid "An error occurred while running a %s script"
 msgstr ""
 
-#: src/scripting/scripting.c:60
+#: src/scripting/scripting.c:65
 msgid "Browser scripting error"
 msgstr ""
 
 #. name:
-#: src/scripting/scripting.c:88
+#: src/scripting/scripting.c:93
 msgid "Scripting"
 msgstr ""
 
-#: src/scripting/smjs/elinks_object.c:83
+#: src/scripting/smjs/elinks_object.c:85
 msgid "User script alert"
 msgstr ""
 
 #: src/session/download.c:235 src/session/download.c:359
-#: src/session/download.c:534 src/session/download.c:629
+#: src/session/download.c:591 src/session/download.c:679
 msgid "Download error"
 msgstr "Vastaanottovirhe"
 
-#: src/session/download.c:236 src/session/download.c:630
+#: src/session/download.c:236 src/session/download.c:680
 #, fuzzy, c-format
 msgid ""
 "Could not create file '%s':\n"
@@ -7611,16 +7612,16 @@ msgid ""
 "%s"
 msgstr "Virhe ladattaessa"
 
-#: src/session/download.c:535
+#: src/session/download.c:592
 #, c-format
 msgid "'%s' is a directory."
 msgstr "\"%s\" on hakemisto."
 
-#: src/session/download.c:569
+#: src/session/download.c:626
 msgid "File exists"
 msgstr "Tiedosto on olemassa"
 
-#: src/session/download.c:570
+#: src/session/download.c:627
 #, c-format
 msgid ""
 "This file already exists:\n"
@@ -7631,55 +7632,59 @@ msgid ""
 msgstr ""
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:577
+#: src/session/download.c:634
 msgid "Sa~ve under the alternative name"
 msgstr "~Tallenna vaihtoehtoisella nimellä"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
-#: src/session/download.c:578
+#: src/session/download.c:635
 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:579
+#: src/session/download.c:636
 msgid "~Resume download of the original file"
 msgstr "~Jatka alkuperäisen tiedoston latausta"
 
-#: src/session/download.c:1081
+#: src/session/download.c:1124
 msgid "Unknown type"
 msgstr "Tuntematon tyyppi"
 
-#: src/session/download.c:1098
+#: src/session/download.c:1146
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
 msgstr ""
 
-#: src/session/download.c:1128
+#: src/session/download.c:1176
 #, no-c-format
 msgid "Program ('%' will be replaced by the filename)"
 msgstr "Ohjelma (\"%\" korvataan tiedoston nimellä)"
 
-#: src/session/download.c:1132
+#: src/session/download.c:1181
+msgid "The output of the program will be shown in the tab"
+msgstr ""
+
+#: src/session/download.c:1185
 #, fuzzy
 msgid "Block the terminal"
 msgstr "Varaa pääte"
 
-#: src/session/download.c:1138
+#: src/session/download.c:1192
 #, 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:1159
+#: src/session/download.c:1213
 msgid "~Open"
 msgstr "~Avaa"
 
-#: src/session/session.c:751 src/session/session.c:770 src/session/task.c:270
-#: src/viewer/text/textarea.c:385
+#: src/session/session.c:756 src/session/session.c:775 src/session/task.c:270
+#: src/viewer/text/textarea.c:624
 msgid "Warning"
 msgstr "Varoitus"
 
-#: src/session/session.c:752
+#: src/session/session.c:757
 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, "
@@ -7690,7 +7695,7 @@ msgid ""
 "be used. Apologies for any inconvience caused."
 msgstr ""
 
-#: src/session/session.c:771
+#: src/session/session.c:776
 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 "
@@ -7703,11 +7708,11 @@ msgid ""
 "for any inconvience caused."
 msgstr ""
 
-#: src/session/session.c:796
+#: src/session/session.c:801
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: src/session/session.c:797
+#: src/session/session.c:802
 msgid ""
 "Welcome to ELinks!\n"
 "\n"
@@ -7754,30 +7759,30 @@ msgstr "Haluatko l
 msgid "Do you want to repost form data to URL %s?"
 msgstr "Haluatko uudelleenlähettää datan osoitteeseen %s?"
 
-#: src/terminal/event.c:71
+#: src/terminal/event.c:77
 #, c-format
 msgid "Bad terminal size: %d, %d"
 msgstr ""
 
-#: src/terminal/event.c:154
+#: src/terminal/event.c:170
 msgid "Warning: terminal name contains illicit chars."
 msgstr ""
 
-#: src/terminal/event.c:225
+#: src/terminal/event.c:251
 msgid "Failed to create session."
 msgstr ""
 
-#: src/terminal/event.c:315
+#: src/terminal/event.c:416
 #, c-format
 msgid "Bad event %d"
 msgstr ""
 
-#: src/terminal/event.c:355
+#: src/terminal/event.c:456
 #, fuzzy, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Tiedostoon kirjoitus epäonnistui"
 
-#: src/terminal/kbd.c:920
+#: src/terminal/kbd.c:1082
 msgid "Too many bytes read from the itrm!"
 msgstr ""
 
@@ -7785,21 +7790,21 @@ msgstr ""
 msgid "Do you really want to close the current tab?"
 msgstr "Haluatko varmasti sulkea nykyisen välilehden?"
 
-#: src/terminal/tab.c:248
+#: src/terminal/tab.c:254
 msgid "Do you really want to close all except the current tab?"
 msgstr "Haluatko varmasti sulkea kaikki paitsi nykyisen välilehden?"
 
-#: src/viewer/dump/dump.c:83
+#: src/viewer/dump/dump.c:84
 #, fuzzy, c-format
 msgid "Can't write to stdout: %s"
 msgstr "Töpseliin kirjoitus ei onnistu"
 
-#: src/viewer/dump/dump.c:86
+#: src/viewer/dump/dump.c:87
 #, fuzzy
 msgid "Can't write to stdout."
 msgstr "Töpseliin kirjoitus ei onnistu"
 
-#: src/viewer/dump/dump.c:276
+#: src/viewer/dump/dump.c:277
 #, c-format
 msgid "URL protocol not supported (%s)."
 msgstr ""
@@ -7814,284 +7819,284 @@ msgstr "Ei kehyksi
 msgid "The requested fragment \"#%s\" doesn't exist."
 msgstr ""
 
-#: src/viewer/text/form.c:862
+#: src/viewer/text/form.c:949
 msgid "Error while posting form"
 msgstr "Virhe lomaketta lähetettäessä"
 
-#: src/viewer/text/form.c:863
+#: src/viewer/text/form.c:950
 #, fuzzy, c-format
 msgid "Could not load file %s: %s"
 msgstr "Tiedoston haku epäonnistui"
 
-#: src/viewer/text/form.c:1443
+#: src/viewer/text/form.c:1765
 #, fuzzy
 msgid "Reset form"
 msgstr "Tyhjennä lomake"
 
-#: src/viewer/text/form.c:1445
+#: src/viewer/text/form.c:1767
 msgid "Harmless button"
 msgstr "Harmiton painike"
 
-#: src/viewer/text/form.c:1453
+#: src/viewer/text/form.c:1775
 msgid "Submit form to"
 msgstr "Hyväksy lomake:"
 
-#: src/viewer/text/form.c:1454
+#: src/viewer/text/form.c:1776
 msgid "Post form to"
 msgstr "Lähetä lomake:"
 
-#: src/viewer/text/form.c:1456
+#: src/viewer/text/form.c:1778
 msgid "Radio button"
 msgstr "Radionäppäin"
 
 # kenttä, jossa on joukko arvoja, joista pitää valita yksi
-#: src/viewer/text/form.c:1460
+#: src/viewer/text/form.c:1782
 msgid "Select field"
 msgstr "Valintakenttä"
 
-#: src/viewer/text/form.c:1464
+#: src/viewer/text/form.c:1786
 msgid "Text area"
 msgstr "Tekstialue"
 
-#: src/viewer/text/form.c:1466
+#: src/viewer/text/form.c:1788
 msgid "File upload"
 msgstr "Tiedoston lähetys"
 
-#: src/viewer/text/form.c:1468
+#: src/viewer/text/form.c:1790
 msgid "Password field"
 msgstr "Salasanakenttä"
 
-#: src/viewer/text/form.c:1506
+#: src/viewer/text/form.c:1828
 msgid "name"
 msgstr "nimi"
 
-#: src/viewer/text/form.c:1518
+#: src/viewer/text/form.c:1840
 msgid "value"
 msgstr "arvo"
 
-#: src/viewer/text/form.c:1531
+#: src/viewer/text/form.c:1853
 msgid "read only"
 msgstr ""
 
-#: src/viewer/text/form.c:1542
+#: src/viewer/text/form.c:1864
 #, c-format
 msgid "press %s to navigate"
 msgstr ""
 
-#: src/viewer/text/form.c:1544
+#: src/viewer/text/form.c:1866
 #, c-format
 msgid "press %s to edit"
 msgstr "paina %s muokataksesi"
 
-#: src/viewer/text/form.c:1580
+#: src/viewer/text/form.c:1902
 #, fuzzy, c-format
 msgid "press %s to submit to %s"
 msgstr "hyväksy"
 
-#: src/viewer/text/form.c:1582
+#: src/viewer/text/form.c:1904
 #, fuzzy, c-format
 msgid "press %s to post to %s"
 msgstr "hyväksy"
 
-#: src/viewer/text/form.c:1684
+#: src/viewer/text/form.c:2006
 msgid "Useless button"
 msgstr "Hyödytön painike"
 
-#: src/viewer/text/form.c:1686
+#: src/viewer/text/form.c:2008
 msgid "Submit button"
 msgstr "Lähetyspainike"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1259
+#: src/viewer/text/link.c:1262
 msgid "Display ~usemap"
 msgstr "Näytä kuvan linkit (~usemap)"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1264
+#: src/viewer/text/link.c:1267
 msgid "~Follow link"
 msgstr "~Seuraa linkkiä"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1266
+#: src/viewer/text/link.c:1269
 msgid "Follow link and r~eload"
 msgstr "Seuraa linkkiä ja lataa ~uudestaan"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1270
+#: src/viewer/text/link.c:1273
 msgid "Open in new ~window"
 msgstr "Avaa uuteen ~ikkunaan"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1272
+#: src/viewer/text/link.c:1275
 msgid "Open in new ~tab"
 msgstr "Avaa uuteen ~välilehteen"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1274
+#: src/viewer/text/link.c:1277
 msgid "Open in new tab in ~background"
 msgstr "Avaa uuteen välilehteen ~taustalla"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1279
+#: src/viewer/text/link.c:1282
 msgid "~Download link"
 msgstr "~Lataa linkki tiedostoksi"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1282
+#: src/viewer/text/link.c:1285
 msgid "~Add link to bookmarks"
 msgstr "Lisää linkki ~kirjanmerkkeihin"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1286
+#: src/viewer/text/link.c:1289
 msgid "Pass link URI to e~xternal command"
 msgstr "Anna linkin U~RI ulkoiselle komennolle"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1297 src/viewer/text/link.c:1337
+#: src/viewer/text/link.c:1300 src/viewer/text/link.c:1340
 msgid "~Reset form"
 msgstr "T~yhjennä lomake"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1312
+#: src/viewer/text/link.c:1315
 msgid "Open in ~external editor"
 msgstr "~Avaa ulkoisessa muokkausohjelmassa"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1320
+#: src/viewer/text/link.c:1323
 msgid "~Submit form"
 msgstr "~Lähetä lomake"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1321
+#: src/viewer/text/link.c:1324
 msgid "Submit form and rel~oad"
 msgstr "Lähetä lomake ja lataa ~uudestaan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1325
+#: src/viewer/text/link.c:1328
 msgid "Submit form and open in new ~window"
 msgstr "Lähetä lomake ja avaa uuteen ~ikkunaan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1327
+#: src/viewer/text/link.c:1330
 msgid "Submit form and open in new ~tab"
 msgstr "Lähetä lomake ja avaa uuteen ~välilehteen"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1330
+#: src/viewer/text/link.c:1333
 msgid "Submit form and open in new tab in ~background"
 msgstr "Lähetä lomake ja avaa uuteen välilehteen ~taustalla"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1335
+#: src/viewer/text/link.c:1338
 msgid "Submit form and ~download"
 msgstr "Lähetä lomake ~ja lataa tiedostoksi"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1342
+#: src/viewer/text/link.c:1345
 msgid "Form f~ields"
 msgstr "Lomakkeen k~entät"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1349
+#: src/viewer/text/link.c:1352
 msgid "V~iew image"
 msgstr "~Näytä kuva"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1351
+#: src/viewer/text/link.c:1354
 msgid "Download ima~ge"
 msgstr "Lataa kuv~a tiedostoksi"
 
-#: src/viewer/text/link.c:1360
+#: src/viewer/text/link.c:1363
 msgid "No link selected"
 msgstr "Ei linkkiä"
 
-#: src/viewer/text/link.c:1408
+#: src/viewer/text/link.c:1433
 msgid "Image"
 msgstr "Kuva"
 
-#: src/viewer/text/link.c:1413
+#: src/viewer/text/link.c:1438
 msgid "Usemap"
 msgstr "Kartta"
 
-#: src/viewer/text/search.c:1006
+#: src/viewer/text/search.c:1078
 msgid "Search hit top, continuing at bottom."
 msgstr ""
 
-#: src/viewer/text/search.c:1007
+#: src/viewer/text/search.c:1079
 msgid "Search hit bottom, continuing at top."
 msgstr ""
 
-#: src/viewer/text/search.c:1010
+#: src/viewer/text/search.c:1082
 msgid "No previous search"
 msgstr "Ei aikaisempaa hakua"
 
-#: src/viewer/text/search.c:1022
+#: src/viewer/text/search.c:1094
 #, c-format
 msgid "Could not compile regular expression '%s'"
 msgstr ""
 
-#: src/viewer/text/search.c:1065
+#: src/viewer/text/search.c:1137
 #, c-format
 msgid "No further matches for '%s'."
 msgstr ""
 
-#: src/viewer/text/search.c:1067
+#: src/viewer/text/search.c:1139
 #, c-format
 msgid "Could not find a link with the text '%s'."
 msgstr ""
 
-#: src/viewer/text/search.c:1069 src/viewer/text/search.c:1478
+#: src/viewer/text/search.c:1141 src/viewer/text/search.c:1549
 msgid "Typeahead"
 msgstr ""
 
-#: src/viewer/text/search.c:1480
+#: src/viewer/text/search.c:1551
 msgid "No links in current document"
 msgstr ""
 
-#: src/viewer/text/search.c:1558
+#: src/viewer/text/search.c:1629
 msgid "Search for text"
 msgstr "Etsi tekstiä"
 
-#: src/viewer/text/search.c:1588
+#: src/viewer/text/search.c:1660
 #, fuzzy
 msgid "Normal search"
 msgstr "Ei aikaisempaa hakua"
 
-#: src/viewer/text/search.c:1589
+#: src/viewer/text/search.c:1661
 msgid "Regexp search"
 msgstr ""
 
-#: src/viewer/text/search.c:1590
+#: src/viewer/text/search.c:1662
 msgid "Extended regexp search"
 msgstr ""
 
-#: src/viewer/text/search.c:1591
+#: src/viewer/text/search.c:1663
 msgid "Case sensitive"
 msgstr ""
 
-#: src/viewer/text/search.c:1592
+#: src/viewer/text/search.c:1664
 msgid "Case insensitive"
 msgstr ""
 
-#: src/viewer/text/search.c:1616
+#: src/viewer/text/search.c:1688
 msgid "Search backward"
 msgstr "Etsi takaisinpäin"
 
 #. name:
-#: src/viewer/text/search.c:1655
+#: src/viewer/text/search.c:1727
 msgid "Search History"
 msgstr "Etsintähistoria"
 
-#: src/viewer/text/textarea.c:332
+#: src/viewer/text/textarea.c:571
 msgid "You cannot launch an external editor in the anonymous mode."
 msgstr ""
 
 # Katso myös erilliset "master terminal" ja "slave terminal".
-#: src/viewer/text/textarea.c:339
+#: src/viewer/text/textarea.c:578
 msgid "You can do this only on the master terminal"
 msgstr "Voit tehdä tämän vain isäntäpäätteellä"
 
-#: src/viewer/text/textarea.c:388
+#: src/viewer/text/textarea.c:627
 #, c-format
 msgid ""
 "You have exceeded the textarea's size limit: your input is %d bytes, but the "
@@ -8101,19 +8106,19 @@ msgid ""
 "entered from this file: %s"
 msgstr ""
 
-#: src/viewer/text/view.c:722
+#: src/viewer/text/view.c:728
 msgid "Go to link"
 msgstr "Valitse linkki"
 
-#: src/viewer/text/view.c:722
+#: src/viewer/text/view.c:728
 msgid "Enter link number"
 msgstr "Valitse linkkinumero"
 
-#: src/viewer/text/view.c:1305
+#: src/viewer/text/view.c:1313
 msgid "Save error"
 msgstr "Talletusvirhe"
 
-#: src/viewer/text/view.c:1306
+#: src/viewer/text/view.c:1314
 msgid "Error writing to file"
 msgstr "Virhe tiedostoon kirjoittaessa"
 

From 0748ee8c92fb1b258511afcfa882366cf82ada64 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 19 Aug 2006 13:29:37 +0300
Subject: [PATCH 048/132] UTF-8: Split UCS_REPLACEMENT_CHARACTER off
 UCS_NO_CHAR.

In the previous version, invalid UTF-8 from a terminal caused
UCS_NO_CHAR (0xFFFFFFFD) to be stored in a term_event_key_T, resulting
in -3 which was then incidentally treated as an unassigned special key.

Now, invalid UTF-8 is instead mapped to UCS_REPLACEMENT_CHARACTER
and treated as a character.  The fact that handle_interlink_event
calls term_send_ucs when it receives invalid UTF-8 makes it pretty
clear that this is how it was intended.

src/viewer/text/link.c (not changed in this commit) already referred
to UCS_REPLACEMENT_CHARACTER in a comment even though it was not
previously defined.
---
 src/intl/charsets.c  |  4 ++--
 src/intl/charsets.h  | 12 +++++++++++-
 src/terminal/event.c | 15 ++++++++-------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index fb8faba3..11aedf28 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -491,7 +491,7 @@ cp2u_shared(const struct codepage_desc *from, unsigned char c)
 		if (from->table[j].c == c)
 			return from->table[j].u;
 
-	return UCS_NO_CHAR;
+	return UCS_REPLACEMENT_CHARACTER;
 }
 
 /* Slow algorithm, used for converting input from the terminal.  */
@@ -503,7 +503,7 @@ cp2u(int from, unsigned char c)
 	/* UTF-8 is a multibyte codepage and cannot be handled with
 	 * this function.  */
 	assert(codepages[from].table != table_utf_8);
-	if_assert_failed return UCS_NO_CHAR;
+	if_assert_failed return UCS_REPLACEMENT_CHARACTER;
 
 	if (c < 0x80) return c;
 	else return cp2u_shared(&codepages[from], c);
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index 6a28c8ae..095fe48e 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -3,7 +3,17 @@
 
 typedef uint32_t unicode_val_T;
 
-/* UCS/Unicode replacement character. */
+/* U+FFFD REPLACEMENT CHARACTER.  Used when no Unicode mapping is
+ * known for a byte in a codepage, or when invalid UTF-8 is received
+ * from a terminal.  After generating the character, ELinks then
+ * treats it like any other Unicode character.  The user can also type
+ * this character directly, and it can occur in documents.  */
+#define UCS_REPLACEMENT_CHARACTER ((unicode_val_T) 0xFFFD)
+
+/* A special value that fits in unicode_val_T but is outside the range
+ * of Unicode characters.  utf_8_to_unicode and cp_to_unicode return
+ * this if the input is too short.  This is also used as a placeholder
+ * for the second cell of a double-cell character.  */
 #define UCS_NO_CHAR ((unicode_val_T) 0xFFFFFFFD)
 
 /* &nbsp; replacement character. See u2cp(). */
diff --git a/src/terminal/event.c b/src/terminal/event.c
index 0f534e52..43a6105b 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -338,20 +338,21 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 					unicode_val_T u = interlink->utf_8.ucs;
 
 					if (u < interlink->utf_8.min)
-						u = UCS_NO_CHAR;
+						u = UCS_REPLACEMENT_CHARACTER;
 					term_send_ucs(term, u,
 						      term->interlink->utf_8.modifier);
 				}
 				break;
 
 			} else {
-				/* The byte sequence for this character is
-				 * ending prematurely.  Send UCS_NO_CHAR for the
-				 * terminated character, but don't break; let
-				 * this byte be handled below. */
+				/* The byte sequence for this character
+				 * is ending prematurely.  Send
+				 * UCS_REPLACEMENT_CHARACTER for the
+				 * terminated character, but don't break;
+				 * let this byte be handled below. */
 
 				interlink->utf_8.len = 0;
-				term_send_ucs(term, UCS_NO_CHAR,
+				term_send_ucs(term, UCS_REPLACEMENT_CHARACTER,
 					      term->interlink->utf_8.modifier);
 			}
 		}
@@ -404,7 +405,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 			break;
 		}
 
-		term_send_ucs(term, UCS_NO_CHAR, modifier);
+		term_send_ucs(term, UCS_REPLACEMENT_CHARACTER, modifier);
 		break;
 	}
 

From 484ffc4285fcf951952601806d881960ee80c697 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 19 Aug 2006 14:11:32 +0200
Subject: [PATCH 049/132] Polish translation was updated.

---
 po/pl.po | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index f75629f5..fc47f9be 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-08-18 19:30+0200\n"
+"POT-Creation-Date: 2006-08-19 14:09+0200\n"
 "PO-Revision-Date: 2006-08-18 20:00+0200\n"
 "Last-Translator: Witold Filipczyk <witekfl@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -1958,8 +1958,9 @@ msgid "Invalid keystroke."
 msgstr "Niepoprawny skrót klawiszowy."
 
 #: src/config/dialogs.c:888
-msgid "Need to select a keymap."
-msgstr "Trzeba wybrać mapowanie klawiatury."
+#, fuzzy
+msgid "Need to select an action."
+msgstr "Trzeba wybrać akcję."
 
 #: src/config/dialogs.c:910
 #, c-format
@@ -8518,12 +8519,12 @@ msgstr "Ostrze
 msgid "Failed to create session."
 msgstr "Nie udało się utworzyć sesji."
 
-#: src/terminal/event.c:416
+#: src/terminal/event.c:417
 #, c-format
 msgid "Bad event %d"
 msgstr "Błędne zdarzenie %d"
 
-#: src/terminal/event.c:456
+#: src/terminal/event.c:457
 #, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Nie można odczytać zdarzenia: %d (%s)"

From a85733cef3086f6b24e83f2ea43347d1290232a8 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 19 Aug 2006 14:14:06 +0200
Subject: [PATCH 050/132] Fixed previous commit.

---
 po/pl.po | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index fc47f9be..465a8ecd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-19 14:09+0200\n"
-"PO-Revision-Date: 2006-08-18 20:00+0200\n"
+"PO-Revision-Date: 2006-08-19 14:30+0200\n"
 "Last-Translator: Witold Filipczyk <witekfl@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -1958,7 +1958,6 @@ msgid "Invalid keystroke."
 msgstr "Niepoprawny skrót klawiszowy."
 
 #: src/config/dialogs.c:888
-#, fuzzy
 msgid "Need to select an action."
 msgstr "Trzeba wybrać akcję."
 

From 9238bd5df0fce1569f95265857ff13cedb403aad Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sat, 19 Aug 2006 16:40:47 +0200
Subject: [PATCH 051/132] French translation was updated.

---
 po/fr.po | 74 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index c109c306..0aae8fbb 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-08-13 15:22+0200\n"
-"PO-Revision-Date: 2006-08-13 15:24+0200\n"
+"POT-Creation-Date: 2006-08-19 16:38+0200\n"
+"PO-Revision-Date: 2006-08-19 16:39+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgstr "Erreur de suppression"
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
 #: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
-#: src/terminal/tab.c:213 src/terminal/tab.c:250
+#: src/terminal/tab.c:213 src/terminal/tab.c:256
 msgid "~Yes"
 msgstr "~Oui"
 
@@ -129,7 +129,7 @@ msgstr "~Oui"
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
 #: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
-#: src/terminal/tab.c:214 src/terminal/tab.c:251
+#: src/terminal/tab.c:214 src/terminal/tab.c:257
 msgid "~No"
 msgstr "~Non"
 
@@ -1133,7 +1133,7 @@ msgid "Submit form and reload"
 msgstr "Envoyer le formulaire et recharger"
 
 #: src/config/actions-main.inc:101 src/terminal/tab.c:210
-#: src/terminal/tab.c:247
+#: src/terminal/tab.c:253
 msgid "Close tab"
 msgstr "Fermer l'onglet"
 
@@ -1951,8 +1951,8 @@ msgid "Invalid keystroke."
 msgstr "Touche invalide."
 
 #: src/config/dialogs.c:888
-msgid "Need to select a keymap."
-msgstr "Vous devez sélectionner une table."
+msgid "Need to select an action."
+msgstr "Vous devez sélectionner une action."
 
 #: src/config/dialogs.c:910
 #, c-format
@@ -8356,25 +8356,25 @@ msgstr "Voulez-vous re-poster les donn
 msgid "Bad terminal size: %d, %d"
 msgstr "Mauvaise taille de terminal: %d, %d"
 
-#: src/terminal/event.c:169
+#: src/terminal/event.c:170
 msgid "Warning: terminal name contains illicit chars."
 msgstr "Attention: le nom du terminal contient des caractčres illicites."
 
-#: src/terminal/event.c:250
+#: src/terminal/event.c:251
 msgid "Failed to create session."
 msgstr "Echec de création de session."
 
-#: src/terminal/event.c:415
+#: src/terminal/event.c:417
 #, c-format
 msgid "Bad event %d"
 msgstr "Mauvais évčnement %d"
 
-#: src/terminal/event.c:455
+#: src/terminal/event.c:457
 #, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Impossible de lire l'évčnement: %d (%s)"
 
-#: src/terminal/kbd.c:1068
+#: src/terminal/kbd.c:1082
 msgid "Too many bytes read from the itrm!"
 msgstr "Trop d'octets lus en provenance de itrm!"
 
@@ -8382,7 +8382,7 @@ msgstr "Trop d'octets lus en provenance de itrm!"
 msgid "Do you really want to close the current tab?"
 msgstr "Ętes-vous sűr de vouloir fermer l'onglet courant ?"
 
-#: src/terminal/tab.c:248
+#: src/terminal/tab.c:254
 msgid "Do you really want to close all except the current tab?"
 msgstr "Ętes-vous sűr de vouloir fermer tout sauf l'onglet courant ?"
 
@@ -8495,114 +8495,114 @@ msgid "Submit button"
 msgstr "Bouton Soumettre"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1261
+#: src/viewer/text/link.c:1262
 msgid "Display ~usemap"
 msgstr "Afficher ~usemap"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1266
+#: src/viewer/text/link.c:1267
 msgid "~Follow link"
 msgstr "~Suivre le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1268
+#: src/viewer/text/link.c:1269
 msgid "Follow link and r~eload"
 msgstr "Suivre le lien et ~recharger"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1272
+#: src/viewer/text/link.c:1273
 msgid "Open in new ~window"
 msgstr "Ouvrir dans une nouvelle ~fenętre"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1274
+#: src/viewer/text/link.c:1275
 msgid "Open in new ~tab"
 msgstr "Ouvrir dans un nouvel ongle~t"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1276
+#: src/viewer/text/link.c:1277
 msgid "Open in new tab in ~background"
 msgstr "Ouvrir dans un nouvel onglet en arričre-~plan"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1281
+#: src/viewer/text/link.c:1282
 msgid "~Download link"
 msgstr "~Enregistrer le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1284
+#: src/viewer/text/link.c:1285
 msgid "~Add link to bookmarks"
 msgstr "~Ajouter ce lien aux signets"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1288
+#: src/viewer/text/link.c:1289
 msgid "Pass link URI to e~xternal command"
 msgstr "Passer l'URI du lien ŕ une commande e~xterne"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1299 src/viewer/text/link.c:1339
+#: src/viewer/text/link.c:1300 src/viewer/text/link.c:1340
 msgid "~Reset form"
 msgstr "Remettre ŕ ~zéro le formulaire"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1314
+#: src/viewer/text/link.c:1315
 msgid "Open in ~external editor"
 msgstr "Ouvrir dans un ~éditeur externe"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1322
+#: src/viewer/text/link.c:1323
 msgid "~Submit form"
 msgstr "~Envoyer le formulaire"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1323
+#: src/viewer/text/link.c:1324
 msgid "Submit form and rel~oad"
 msgstr "Envoyer le formulaire et ~recharger"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1327
+#: src/viewer/text/link.c:1328
 msgid "Submit form and open in new ~window"
 msgstr "Envoyer le formulaire et ouvrir dans une nouvelle ~fenętre"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1329
+#: src/viewer/text/link.c:1330
 msgid "Submit form and open in new ~tab"
 msgstr "Envoyer le formulaire et ouvrir un ~onglet"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1332
+#: src/viewer/text/link.c:1333
 msgid "Submit form and open in new tab in ~background"
 msgstr "Envoyer le formulaire et ouvrir un onglet en ~arričre-plan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1337
+#: src/viewer/text/link.c:1338
 msgid "Submit form and ~download"
 msgstr "Envoyer le formulaire et ~télécharger"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1344
+#: src/viewer/text/link.c:1345
 msgid "Form f~ields"
 msgstr "C~hamps de formulaire"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1351
+#: src/viewer/text/link.c:1352
 msgid "V~iew image"
 msgstr "~Voir l'image"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1353
+#: src/viewer/text/link.c:1354
 msgid "Download ima~ge"
 msgstr "Enregistrer l'~image"
 
-#: src/viewer/text/link.c:1362
+#: src/viewer/text/link.c:1363
 msgid "No link selected"
 msgstr "Aucun lien sélectionné"
 
-#: src/viewer/text/link.c:1432
+#: src/viewer/text/link.c:1433
 msgid "Image"
 msgstr "Image"
 
-#: src/viewer/text/link.c:1437
+#: src/viewer/text/link.c:1438
 msgid "Usemap"
 msgstr "Usemap"
 
@@ -8716,4 +8716,4 @@ msgstr "Erreur lors de l'
 #. name:
 #: src/viewer/viewer.c:25
 msgid "Viewer"
-msgstr "Viewer"
+msgstr "Visualisateur"

From 4f78b0dda13c98be3be711d84c17ce12de269780 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 19 Aug 2006 23:39:40 +0200
Subject: [PATCH 052/132] True color mode. See new konsole. TODO: dump

---
 Makefile.config.in     |   1 +
 configure.in           |   2 +
 features.conf          |   8 +++
 src/config/options.inc |  49 +++++++++++++--
 src/dialogs/options.c  |  26 ++++++--
 src/terminal/color.c   |  14 +++++
 src/terminal/color.h   |   4 +-
 src/terminal/draw.c    |   5 +-
 src/terminal/draw.h    |   6 +-
 src/terminal/screen.c  | 138 ++++++++++++++++++++++++++++++++++++++++-
 10 files changed, 235 insertions(+), 18 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index e7f17b29..f14fa04d 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -155,6 +155,7 @@ CONFIG_SMB = @CONFIG_SMB@
 CONFIG_SPIDERMONKEY = @CONFIG_SPIDERMONKEY@
 CONFIG_SSL = @CONFIG_SSL@
 CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
+CONFIG_TRUE_COLOR = @CONFIG_TRUE_COLOR@
 CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@
 CONFIG_UTF_8 = @CONFIG_UTF_8@
 CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
diff --git a/configure.in b/configure.in
index a15a01d5..884f1e49 100644
--- a/configure.in
+++ b/configure.in
@@ -1239,6 +1239,8 @@ EL_ARG_ENABLE(CONFIG_88_COLORS, 88-colors, [88 colors],
 EL_ARG_ENABLE(CONFIG_256_COLORS, 256-colors, [256 colors],
 	      [  --enable-256-colors     enable 256 color support])
 
+EL_ARG_ENABLE(CONFIG_TRUE_COLOR, true-color, [true color],
+	      [  --enable-true-color     enable true color support])
 
 EL_ARG_ENABLE(CONFIG_EXMODE, exmode, [Exmode interface],
 	      [  --enable-exmode         enable exmode (CLI) interface])
diff --git a/features.conf b/features.conf
index 5ee749e4..5b0d9d51 100644
--- a/features.conf
+++ b/features.conf
@@ -497,6 +497,14 @@ CONFIG_88_COLORS=no
 
 CONFIG_256_COLORS=no
 
+### True color
+#
+# Define to add support for True color. Note that only terminal capable to show
+# it is konsole from kdebase-3.5.4. This mode eats a lot of memory.
+#
+# Default: disabled
+
+CONFIG_TRUE_COLOR=no
 
 ### Ex-mode Interface
 #
diff --git a/src/config/options.inc b/src/config/options.inc
index 97b1c9b6..15e80b44 100644
--- a/src/config/options.inc
+++ b/src/config/options.inc
@@ -636,7 +636,8 @@ static struct option_info config_options_info[] = {
 	 * the INIT_OPT_INT macro; that wouldn't be standard C.
 	 * And they especially cannot be inside the argument list of N_;
 	 * xgettext (GNU gettext-tools) 0.14.3 wouldn't support that. */
-#if defined(CONFIG_88_COLORS) && defined(CONFIG_256_COLORS)
+	 /* FIXME: It's totally brainless --witekfl */
+#if defined(CONFIG_88_COLORS) && defined(CONFIG_256_COLORS) && !defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
 		"color_mode", 0, -1, 3, -1,
 		N_("Color mode for dumps:\n"
@@ -645,7 +646,7 @@ static struct option_info config_options_info[] = {
 		"1 is 16 color mode\n"
 		"2 is 88 color mode\n"
 		"3 is 256 color mode")),
-#elif defined(CONFIG_88_COLORS) /* && !defined(CONFIG_256_COLORS) */
+#elif defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) && !defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
 		"color_mode", 0, -1, 2, -1,
 		N_("Color mode for dumps:\n"
@@ -653,7 +654,7 @@ static struct option_info config_options_info[] = {
 		"0 is mono mode\n"
 		"1 is 16 color mode\n"
 		"2 is 88 color mode")),
-#elif defined(CONFIG_256_COLORS) /* && !defined(CONFIG_88_COLORS) */
+#elif defined(CONFIG_256_COLORS) && !defined(CONFIG_88_COLORS) && !defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
 		"color_mode", 0, -1, 2, -1,
 		N_("Color mode for dumps:\n"
@@ -661,15 +662,50 @@ static struct option_info config_options_info[] = {
 		"0 is mono mode\n"
 		"1 is 16 color mode\n"
 		"2 is 256 color mode")),
-#else /* !defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) */
+#elif !defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) && !defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
 		"color_mode", 0, -1, 1, -1,
 		N_("Color mode for dumps:\n"
 		"-1 is standard dump mode\n"
 		"0 is mono mode\n"
 		"1 is 16 color mode")),
+#elif defined(CONFIG_88_COLORS) && defined(CONFIG_256_COLORS) && defined(CONFIG_TRUE_COLOR)
+	INIT_OPT_INT("document.dump", N_("Color mode"),
+		"color_mode", 0, -1, 3, -1,
+		N_("Color mode for dumps:\n"
+		"-1 is standard dump mode\n"
+		"0 is mono mode\n"
+		"1 is 16 color mode\n"
+		"2 is 88 color mode\n"
+		"3 is 256 color mode\n"
+		"4 is true color mode")),
+#elif defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) && defined(CONFIG_TRUE_COLOR)
+	INIT_OPT_INT("document.dump", N_("Color mode"),
+		"color_mode", 0, -1, 2, -1,
+		N_("Color mode for dumps:\n"
+		"-1 is standard dump mode\n"
+		"0 is mono mode\n"
+		"1 is 16 color mode\n"
+		"2 is 88 color mode\n"
+		"3 is true color mode\n")),
+#elif defined(CONFIG_256_COLORS) && !defined(CONFIG_88_COLORS) && defined(CONFIG_TRUE_COLOR)
+	INIT_OPT_INT("document.dump", N_("Color mode"),
+		"color_mode", 0, -1, 2, -1,
+		N_("Color mode for dumps:\n"
+		"-1 is standard dump mode\n"
+		"0 is mono mode\n"
+		"1 is 16 color mode\n"
+		"2 is 256 color mode\n"
+		"3 is true color mode")),
+#elif !defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) && defined(CONFIG_TRUE_COLOR)
+	INIT_OPT_INT("document.dump", N_("Color mode"),
+		"color_mode", 0, -1, 1, -1,
+		N_("Color mode for dumps:\n"
+		"-1 is standard dump mode\n"
+		"0 is mono mode\n"
+		"1 is 16 color mode\n"
+		"2 is true color mode")),
 #endif /* !defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) */
-
 	INIT_OPT_STRING("document.dump", N_("Footer"),
 		"footer", 0, "",
 		N_("Footer string used in dumps. %u is substituted by URL.")),
@@ -862,7 +898,8 @@ static struct option_info config_options_info[] = {
 		"output to the terminal. The color modes are:\n"
 		"0 is mono mode, only 2 colors are used\n"
 		"1 is 16 color mode, uses the common ANSI colors\n"
-		"2 is 256 color mode, uses XTerm RGB codes")),
+		"2 is 256 color mode, uses XTerm RGB codes\n"
+		"3 is true color mode, uses konsole RGB codes.")),
 
 	INIT_OPT_BOOL("terminal._template_", N_("Transparency"),
 		"transparency", 0, 1,
diff --git a/src/dialogs/options.c b/src/dialogs/options.c
index da341ae0..91111f96 100644
--- a/src/dialogs/options.c
+++ b/src/dialogs/options.c
@@ -131,14 +131,26 @@ push_save_button(struct dialog_data *dlg_data, struct widget_data *button)
 	return EVENT_PROCESSED;
 }
 
-#if	defined(CONFIG_88_COLORS) && defined(CONFIG_256_COLORS)
-#define TERMOPT_WIDGETS_COUNT 21
-#elif	defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
-#define TERMOPT_WIDGETS_COUNT 20
+#if	defined(CONFIG_88_COLORS)
+#define	RADIO_88 1
 #else
-#define TERMOPT_WIDGETS_COUNT 19
+#define	RADIO_88 0
 #endif
 
+#if	defined(CONFIG_256_COLORS)
+#define	RADIO_256 1
+#else
+#define	RADIO_256 0
+#endif
+
+#if	defined(CONFIG_TRUE_COLOR)
+#define	RADIO_TRUE 1
+#else
+#define	RADIO_TRUE 0
+#endif
+
+#define TERMOPT_WIDGETS_COUNT (19 + RADIO_88 + RADIO_256 + RADIO_TRUE)
+
 #define TERM_OPTION_VALUE_SIZE (sizeof(union option_value) * TERM_OPTIONS)
 
 void
@@ -209,7 +221,9 @@ terminal_options(struct terminal *term, void *xxx, struct session *ses)
 #ifdef CONFIG_256_COLORS
 	add_dlg_radio(dlg, _("256 colors", term), 2, COLOR_MODE_256, &values[TERM_OPT_COLORS].number);
 #endif
-
+#ifdef CONFIG_TRUE_COLOR
+	add_dlg_radio(dlg, _("true color", term), 2, COLOR_MODE_TRUE_COLOR, &values[TERM_OPT_COLORS].number);
+#endif
 	add_dlg_checkbox(dlg, _("Switch fonts for line drawing", term), &values[TERM_OPT_M11_HACK].number);
 	add_dlg_checkbox(dlg, _("Restrict frames in cp850/852", term), &values[TERM_OPT_RESTRICT_852].number);
 	add_dlg_checkbox(dlg, _("Block cursor", term), &values[TERM_OPT_BLOCK_CURSOR].number);
diff --git a/src/terminal/color.c b/src/terminal/color.c
index aaeb69b9..2ecdae68 100644
--- a/src/terminal/color.c
+++ b/src/terminal/color.c
@@ -325,6 +325,16 @@ set_term_color(struct screen_char *schar, struct color_pair *pair,
 		/* TODO: Handle decrease lightness by converting to
 		 * hue-ligthness-saturation color model */
 		break;
+#endif
+#ifdef CONFIG_TRUE_COLOR
+	case COLOR_MODE_TRUE_COLOR:
+		schar->color[0] = (pair->foreground >> 16) & 255; /* r */
+		schar->color[1] = (pair->foreground >> 8) & 255; /* g */
+		schar->color[2] = pair->foreground & 255; /* b */
+		schar->color[3] = (pair->background >> 16) & 255; /* r */
+		schar->color[4] = (pair->background >> 8) & 255; /* g */
+		schar->color[5] = pair->background & 255; /* b */
+		return;
 #endif
 	case COLOR_MODE_DUMP:
 		return;
@@ -371,6 +381,10 @@ set_term_color(struct screen_char *schar, struct color_pair *pair,
 		TERM_COLOR_FOREGROUND(schar->color) = fg;
 		TERM_COLOR_BACKGROUND(schar->color) = bg;
 		break;
+#endif
+#ifdef CONFIG_TRUE_COLOR
+	case COLOR_MODE_TRUE_COLOR:
+		return;
 #endif
 	case COLOR_MODE_MONO:
 	case COLOR_MODE_16:
diff --git a/src/terminal/color.h b/src/terminal/color.h
index e72066d1..527454ff 100644
--- a/src/terminal/color.h
+++ b/src/terminal/color.h
@@ -51,7 +51,9 @@ enum color_mode {
 #ifdef CONFIG_256_COLORS
 	COLOR_MODE_256,
 #endif
-
+#ifdef CONFIG_TRUE_COLOR
+	COLOR_MODE_TRUE_COLOR,
+#endif
 	COLOR_MODES, /* XXX: Keep last */
 };
 
diff --git a/src/terminal/draw.c b/src/terminal/draw.c
index 774f166e..ea5b0d0a 100644
--- a/src/terminal/draw.c
+++ b/src/terminal/draw.c
@@ -21,8 +21,9 @@
 		int_bounds(&(x), 0, (term)->width - 1); \
 		int_bounds(&(y), 0, (term)->height - 1); \
 	} while (0)
-
-#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
+#if defined(CONFIG_TRUE_COLOR)
+#define clear_screen_char_color(schar) do { memset((schar)->color, 0, 6); } while (0)
+#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
 #define clear_screen_char_color(schar) do { memset((schar)->color, 0, 2); } while (0)
 #else
 #define clear_screen_char_color(schar) do { (schar)->color[0] = 0; } while (0)
diff --git a/src/terminal/draw.h b/src/terminal/draw.h
index fcb6be18..75f1bdae 100644
--- a/src/terminal/draw.h
+++ b/src/terminal/draw.h
@@ -30,8 +30,12 @@ struct screen_char {
 	/* Attributes are screen_char_attr bits. */
 	unsigned char attr;
 
+#if defined(CONFIG_TRUE_COLOR)
+	/* 0, 1, 2 - rgb foreground,
+	3, 4, 5 - rgb background */
+	unsigned char color[6];
 	/* The encoded fore- and background color. */
-#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
+#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
 	unsigned char color[2];
 #else
 	unsigned char color[1];
diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 47487c0e..8d49ff9c 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -422,14 +422,23 @@ struct screen_state {
 	unsigned char bold;
 	unsigned char attr;
 	/* Following should match struct screen_char color field. */
-#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
+#if defined(CONFIG_TRUE_COLOR)
+	unsigned char color[6];
+#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
 	unsigned char color[2];
 #else
 	unsigned char color[1];
 #endif
 };
 
-#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
+#if defined(CONFIG_TRUE_COLOR)
+#define compare_color(a, b)	((a)[0] == (b)[0] && (a)[1] == (b)[1] && (a)[2] == (b)[2] \
+				&& (a)[3] == (b)[3] && (a)[4] == (b)[4] && (a)[5] == (b)[5])
+#define copy_color(a, b)	do { (a)[0] = (b)[0]; (a)[1] = (b)[1]; (a)[2] = (b)[2]; \
+				(a)[3] = (b)[3]; (a)[4] = (b)[4]; (a)[5] = (b)[5];} while (0)
+#define INIT_SCREEN_STATE 	{ 0xFF, 0xFF, 0xFF, 0, { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF} }
+
+#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
 #define compare_color(a, b)	((a)[0] == (b)[0] && (a)[1] == (b)[1])
 #define copy_color(a, b)	do { (a)[0] = (b)[0]; (a)[1] = (b)[1]; } while (0)
 #define INIT_SCREEN_STATE 	{ 0xFF, 0xFF, 0xFF, 0, { 0xFF, 0xFF } }
@@ -439,8 +448,13 @@ struct screen_state {
 #define INIT_SCREEN_STATE 	{ 0xFF, 0xFF, 0xFF, 0, { 0xFF } }
 #endif
 
+#if defined(CONFIG_TRUE_COLOR)
+#define compare_bg_color(a, b)	((a)[3] == (b[3]) && (a)[4] == (b)[4] && (a)[5] == (b)[5])
+#define compare_fg_color(a, b)	((a)[0] == (b[0]) && (a)[1] == (b)[1] && (a)[2] == (b)[2])
+#else
 #define compare_bg_color(a, b)	(TERM_COLOR_BACKGROUND(a) == TERM_COLOR_BACKGROUND(b))
 #define compare_fg_color(a, b)	(TERM_COLOR_FOREGROUND(a) == TERM_COLOR_FOREGROUND(b))
+#endif
 
 #ifdef CONFIG_UTF_8
 static inline void
@@ -683,6 +697,121 @@ add_char256(struct string *screen, struct screen_driver *driver,
 }
 #endif
 
+#ifdef CONFIG_TRUE_COLOR
+static struct string color_true_seqs[] = {
+	/* foreground: */	TERM_STRING("\033[0;38;2"),
+	/* background: */	TERM_STRING("\033[48;2"),
+};
+#define add_true_background_color(str, seq, chr) add_char_true_color(str, &(seq)[1], &(chr)->color[3])
+#define add_true_foreground_color(str, seq, chr) add_char_true_color(str, &(seq)[0], &(chr)->color[0])
+static inline void
+add_char_true_color(struct string *screen, struct string *seq, unsigned char *colors)
+{
+	unsigned char color_buf[3];
+	int i;
+
+	check_string_magic(seq);
+	add_string_to_string(screen, seq);
+	for (i = 0; i < 3; i++) {
+		unsigned char *color_pos = color_buf;
+		int color_len = 1;
+		unsigned char color = colors[i];
+
+		add_char_to_string(screen, ';');
+
+		if (color < 10) {
+			color_pos += 2;
+		} else {
+			int color2;
+
+			++color_len;
+			if (color < 100) {
+				++color_pos;
+			} else {
+				++color_len;
+
+				if (color < 200) {
+					color_buf[0] = '1';
+					color -= 100;
+				} else {
+					color_buf[0] = '2';
+					color -= 200;
+				}
+			}
+
+			color2 = (color % 10);
+			color /= 10;
+			color_buf[1] = '0' + color;
+			color = color2;
+		}
+		color_buf[2] = '0' + color;
+
+		add_bytes_to_string(screen, color_pos, color_len);
+	}
+	add_char_to_string(screen, 'm');
+}
+
+/* Time critical section. */
+static inline void
+add_char_true(struct string *screen, struct screen_driver *driver,
+	    struct screen_char *ch, struct screen_state *state)
+{
+	unsigned char attr_delta = (ch->attr ^ state->attr);
+
+	if (
+#ifdef CONFIG_UTF_8
+	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
+#endif /* CONFIG_UTF_8 */
+	    attr_delta
+	   ) {
+		if ((attr_delta & SCREEN_ATTR_FRAME) && driver->frame_seqs) {
+			state->border = !!(ch->attr & SCREEN_ATTR_FRAME);
+			add_term_string(screen, driver->frame_seqs[state->border]);
+		}
+
+		if ((attr_delta & SCREEN_ATTR_UNDERLINE) && driver->underline) {
+			state->underline = !!(ch->attr & SCREEN_ATTR_UNDERLINE);
+			add_term_string(screen, driver->underline[state->underline]);
+		}
+
+		if (attr_delta & SCREEN_ATTR_BOLD) {
+			if (ch->attr & SCREEN_ATTR_BOLD) {
+				add_bytes_to_string(screen, "\033[1m", 4);
+			} else {
+				/* Force repainting of the other attributes. */
+				state->color[0] = ch->color[0] + 1;
+			}
+		}
+
+		state->attr = ch->attr;
+	}
+
+	if (
+#ifdef CONFIG_UTF_8
+	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
+#endif /* CONFIG_UTF_8 */
+	    !compare_color(ch->color, state->color)
+	   ) {
+		copy_color(state->color, ch->color);
+
+		add_true_foreground_color(screen, color_true_seqs, ch);
+		if (!driver->transparent || ch->color[1] != 0) {
+			add_true_background_color(screen, color_true_seqs, ch);
+		}
+
+		if (ch->attr & SCREEN_ATTR_BOLD)
+			add_bytes_to_string(screen, "\033[1m", 4);
+
+		if (ch->attr & SCREEN_ATTR_UNDERLINE && driver->underline) {
+			state->underline = !!(ch->attr & SCREEN_ATTR_UNDERLINE);
+			add_term_string(screen, driver->underline[state->underline]);
+		}
+	}
+
+	add_char_data(screen, driver, ch->data, ch->attr & SCREEN_ATTR_FRAME);
+}
+#endif
+
 #define add_chars(image_, term_, driver_, state_, ADD_CHAR)			\
 {										\
 	struct terminal_screen *screen = (term_)->screen;			\
@@ -774,6 +903,11 @@ redraw_screen(struct terminal *term)
 	case COLOR_MODE_256:
 		add_chars(&image, term, driver, &state, add_char256);
 		break;
+#endif
+#ifdef CONFIG_TRUE_COLOR
+	case COLOR_MODE_TRUE_COLOR:
+		add_chars(&image, term, driver, &state, add_char_true);
+		break;
 #endif
 	case COLOR_MODES:
 	case COLOR_MODE_DUMP:

From 13dc5f01ea252e638e5c8b92396e8ba180dd16e3 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 19 Aug 2006 23:57:50 +0200
Subject: [PATCH 053/132] Note about efficiency. I know that normal 16 color
 mode is broken (menu). Maybe someone knows how to fix it.

---
 src/terminal/screen.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 8d49ff9c..794a1bd9 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -431,6 +431,9 @@ struct screen_state {
 #endif
 };
 
+/* FIXME: This is inefficient. When CONFIG_TRUE_COLOR is defined even in 16 color mode
+ * all 6 bytes are copied or compared. */
+
 #if defined(CONFIG_TRUE_COLOR)
 #define compare_color(a, b)	((a)[0] == (b)[0] && (a)[1] == (b)[1] && (a)[2] == (b)[2] \
 				&& (a)[3] == (b)[3] && (a)[4] == (b)[4] && (a)[5] == (b)[5])

From 4a638c2e847443c64db16ab4ff7ead5c916b6514 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 20 Aug 2006 12:02:03 +0300
Subject: [PATCH 054/132] ECMAScript: Added a test for the accessKey property.

ELinks currently fails this test.
---
 test/ecmascript/accesskey.html | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 test/ecmascript/accesskey.html

diff --git a/test/ecmascript/accesskey.html b/test/ecmascript/accesskey.html
new file mode 100644
index 00000000..9ba4b7aa
--- /dev/null
+++ b/test/ecmascript/accesskey.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
+	"http://www.w3.org/TR/REC-html40/strict.dtd">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Script-Type" content="application/ecmascript">
+<title>accessKey test</title>
+<form action="#">
+<p><input type="button" onclick="run()" value="Test"> <input id="result" value="not run">
+<input type="reset">
+<table>
+<tr><td><input id="a" accesskey="a"><td>U+0020<td>must not become "Space"
+<tr><td><input id="b" accesskey="b"><td>U+0025<td>ASCII punctuation
+<tr><td><input id="c" accesskey="c"><td>U+007A<td>ASCII letter
+<tr><td><input id="d" accesskey="d"><td>U+00E5<td>Latin-1
+<tr><td><input id="e" accesskey="e"><td>U+0161<td>Latin-9
+<tr><td><input id="f" accesskey="f"><td>U+3042<td>Hiragana
+<tr><td><input id="g" accesskey="g"><td>U+10A55<td>Kharoshthi
+</table>
+</form>
+
+<script type="application/ecmascript">
+function run() {
+  var form = window.document.forms[0];
+  form.elements["result"].value = "running";
+  var ok = true;
+  var probe = function(element, accessKey) {
+    element.accessKey = accessKey;
+    if (element.accessKey != accessKey) {
+      ok = false;
+      element.value = "failed " + accessKey + " " + element.accessKey;
+    } else {
+      element.value = "passed " + accessKey + " " + element.accessKey;
+    }
+  }
+  probe(form.elements["a"], " ");
+  probe(form.elements["b"], "%");
+  probe(form.elements["c"], "z");
+  probe(form.elements["d"], "\u00E5");
+  probe(form.elements["e"], "\u0161");
+  probe(form.elements["f"], "\u3042");
+  probe(form.elements["g"], "\uD802\uDE55");
+  form.elements["result"].value = ok ? "passed" : "failed";
+  return false;
+}
+</script>

From e054a159605f58218fd017ce37b10bac74e16048 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 20 Aug 2006 13:04:00 +0300
Subject: [PATCH 055/132] Change the description of the connection.try_ipv4
 option.

Use "e.g." rather than "i.e." because the syntax cannot be deduced
from the preceding text.
---
 src/config/options.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/options.inc b/src/config/options.inc
index 15e80b44..964a991a 100644
--- a/src/config/options.inc
+++ b/src/config/options.inc
@@ -103,7 +103,7 @@ static struct option_info config_options_info[] = {
 		"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"
-		"in the style of i.e. http4://elinks.or.cz/.")),
+		"in the style of e.g. http4://elinks.or.cz/.")),
 #else
 	INIT_OPT_BOOL("connection", N_("Try IPv4 when connecting"),
 		"try_ipv4", 0, 1,
@@ -111,7 +111,7 @@ static struct option_info config_options_info[] = {
 		"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"
-		"in the style of i.e. http4://elinks.or.cz/.")),
+		"in the style of e.g. http4://elinks.or.cz/.")),
 #endif
 
 #ifdef CONFIG_IPV6

From 35290f92e94f76bb35e9bd6cfb0d4227cdf89faa Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 20 Aug 2006 13:05:47 +0300
Subject: [PATCH 056/132] parse_keystroke: Fold the case of Ctrl-letter only if
 the letter is ASCII.

---
 src/config/kbdbind.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index d8d597d8..93921efe 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -400,8 +400,33 @@ parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 		}
 	}
 
-	if ((kbd->modifier & KBD_MOD_CTRL) != 0 && s[0] && !s[1]) {
-		/* Ctrl-a == Ctrl-A */
+	if ((kbd->modifier & KBD_MOD_CTRL) != 0
+	    && s[0] && s[0] <= 0x7F && !s[1]) {
+		/* Convert Ctrl-letter keystrokes to upper case,
+		 * e.g. Ctrl-a to Ctrl-A.  Do this because terminals
+		 * typically generate the same ASCII control
+		 * characters regardless of Shift and Caps Lock.
+		 *
+		 * However, that applies only to ASCII letters.  For
+		 * other Ctrl-letter combinations, there seems to be
+		 * no standard of what the terminal should generate.
+		 * Because it is possible that the terminal does not
+		 * fold case then, ELinks should treat upper-case and
+		 * lower-case variants of such keystrokes as different
+		 * and let the user bind them to separate actions.
+		 * Besides, toupper() might not understand the charset
+		 * of s[0].
+		 *
+		 * FIXME: Actually, it is possible that some terminals
+		 * preserve case in all Ctrl-letter keystrokes, even
+		 * for ASCII letters.  In particular, the Win32
+		 * console API looks like it might do this.  When the
+		 * terminal handling part of ELinks is eventually
+		 * extended to fully support that, it could be a good
+		 * idea to change parse_keystroke() not to fold case,
+		 * and instead make kbd_ev_lookup() or its callers
+		 * search for different variants of the keystroke if
+		 * the original one is not bound to any action.  */
 		ctrlbuf[0] = toupper(s[0]);
 		ctrlbuf[1] = '\0';
 		s = ctrlbuf;

From 245c8cb0202509d7d28233ebe3ebc27227f36694 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 19 Aug 2006 18:16:33 +0300
Subject: [PATCH 057/132] parse_keystroke: Fold the case of Ctrl-letter after
 read_key(), not before.

---
 src/config/kbdbind.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index 93921efe..fc2f0ab5 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -375,8 +375,6 @@ read_key(const unsigned char *key_str)
 int
 parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 {
-	unsigned char ctrlbuf[2];
-
 	kbd->modifier = KBD_MOD_NONE;
 	while (1) {
 		if (!strncasecmp(s, "Shift", 5) && (s[5] == '-' || s[5] == '+')) {
@@ -400,8 +398,10 @@ parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 		}
 	}
 
+	kbd->key = read_key(s);
+
 	if ((kbd->modifier & KBD_MOD_CTRL) != 0
-	    && s[0] && s[0] <= 0x7F && !s[1]) {
+	    && is_kbd_character(kbd->key) && kbd->key <= 0x7F) {
 		/* Convert Ctrl-letter keystrokes to upper case,
 		 * e.g. Ctrl-a to Ctrl-A.  Do this because terminals
 		 * typically generate the same ASCII control
@@ -415,7 +415,7 @@ parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 		 * lower-case variants of such keystrokes as different
 		 * and let the user bind them to separate actions.
 		 * Besides, toupper() might not understand the charset
-		 * of s[0].
+		 * of kbd->key.
 		 *
 		 * FIXME: Actually, it is possible that some terminals
 		 * preserve case in all Ctrl-letter keystrokes, even
@@ -427,12 +427,9 @@ parse_keystroke(const unsigned char *s, struct term_event_keyboard *kbd)
 		 * and instead make kbd_ev_lookup() or its callers
 		 * search for different variants of the keystroke if
 		 * the original one is not bound to any action.  */
-		ctrlbuf[0] = toupper(s[0]);
-		ctrlbuf[1] = '\0';
-		s = ctrlbuf;
+		kbd->key = toupper(kbd->key);
 	}
 
-	kbd->key = read_key(s);
 	return (kbd->key == KBD_UNDEF) ? -1 : 0;
 }
 

From 00a5b88371945df945ef10623a863cbe1a19a983 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 20 Aug 2006 13:37:03 +0300
Subject: [PATCH 058/132] ECMAScript: Preserve all of Unicode when reading the
 accessKey property.

Setting the property does not yet support Unicode.
---
 src/ecmascript/see/form.c          | 10 ++++----
 src/ecmascript/see/input.c         | 22 ++++++++++++++++
 src/ecmascript/see/input.h         |  2 ++
 src/ecmascript/spidermonkey/form.c | 41 ++++++++++++++++++++++++++----
 4 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index 604a0ef6..c42ef025 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -182,15 +182,15 @@ input_get(struct SEE_interpreter *interp, struct SEE_object *o,
 	SEE_SET_UNDEFINED(res);
 
 	if (p == s_accessKey) {
-		struct string keystr;
+		struct SEE_string *keystr;
 		if (!link)
 			return;
 
-		init_string(&keystr);
-		add_accesskey_to_string(&keystr, link->accesskey);
-		str = string_to_SEE_string(interp, keystr.source);
+		keystr = SEE_string_new(interp, 0);
+		if (link->accesskey)
+			append_unicode_to_SEE_string(interp, keystr,
+						     link->accesskey);
 		SEE_SET_STRING(res, str);
-		done_string(&keystr);
 	} else if (p == s_alt) {
 		str = string_to_SEE_string(interp, fc->alt);
 		SEE_SET_STRING(res, str);
diff --git a/src/ecmascript/see/input.c b/src/ecmascript/see/input.c
index 34b0f0bc..38048ac2 100644
--- a/src/ecmascript/see/input.c
+++ b/src/ecmascript/see/input.c
@@ -101,3 +101,25 @@ string_to_SEE_string(struct SEE_interpreter *interp, unsigned char *s)
 		str->data[i] = s[i];
 	return str;
 }
+
+void
+append_unicode_to_SEE_string(struct SEE_interpreter *interp,
+			     struct SEE_string *str,
+			     unicode_val_T u)
+{
+	if (u <= 0xFFFF) {
+		/* TODO: Should this reject code points in the
+		 * surrogate range? */
+		SEE_string_addch(str, u);
+	} else if (u <= 0x10FFFF) {
+		SEE_string_addch(0xD800 + ((u - 0x10000) >> 10));
+		SEE_string_addch(0xDC00 + (u & 0x3FF));
+	} else {
+		/* str->interpreter exists but is not documented, so don't
+		 * use it; use a separate @interp parameter instead.
+		 * Also, SEE does not support "%lX".  */
+		SEE_error_throw(interp, interp->RangeError,
+				"UTF-16 cannot encode U+%.4X",
+				(unsigned int) u);
+	}
+}
diff --git a/src/ecmascript/see/input.h b/src/ecmascript/see/input.h
index 78236e52..05e35586 100644
--- a/src/ecmascript/see/input.h
+++ b/src/ecmascript/see/input.h
@@ -9,5 +9,7 @@ struct SEE_input *SEE_input_elinks(struct SEE_interpreter *, unsigned char *);
 unsigned char *SEE_string_to_unsigned_char(struct SEE_string *);
 unsigned char *SEE_value_to_unsigned_char(struct SEE_interpreter *, struct SEE_value *);
 struct SEE_string *string_to_SEE_string(struct SEE_interpreter *, unsigned char *);
+void append_unicode_to_SEE_string(struct SEE_interpreter *, struct SEE_string *,
+				  unicode_val_T);
 
 #endif
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index 7234f82f..d57f912e 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -117,6 +117,8 @@ static const JSFunctionSpec input_funcs[] = {
 	{ NULL }
 };
 
+static JSString *unicode_to_jsstring(JSContext *ctx, unicode_val_T u);
+
 static JSBool
 input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 {
@@ -146,14 +148,19 @@ input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 	switch (JSVAL_TO_INT(id)) {
 	case JSP_INPUT_ACCESSKEY:
 	{
-		struct string keystr;
+		JSString *keystr;
 
 		if (!link) break;
 
-		init_string(&keystr);
-		add_accesskey_to_string(&keystr, link->accesskey);
-		string_to_jsval(ctx, vp, keystr.source);
-		done_string(&keystr);
+		if (!link->accesskey) {
+			*vp = JS_GetEmptyStringValue(ctx);
+		} else {
+			keystr = unicode_to_jsstring(ctx, link->accesskey);
+			if (keystr)
+				*vp = STRING_TO_JSVAL(keystr);
+			else
+				return JS_FALSE;
+		}
 		break;
 	}
 	case JSP_INPUT_ALT:
@@ -970,3 +977,27 @@ forms_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *r
 
 	return JS_TRUE;
 }
+
+
+static JSString *
+unicode_to_jsstring(JSContext *ctx, unicode_val_T u)
+{
+	jschar buf[2];
+
+	/* If JS_NewUCStringCopyN hits a null character, it truncates
+	 * the string there and pads it with more nulls.  However,
+	 * that is not a problem here, because if there is a null
+	 * character in buf[], then it must be the only character.  */
+	if (u <= 0xFFFF) {
+		/* TODO: Should this reject code points in the
+		 * surrogate range? */
+		buf[0] = u;
+		return JS_NewUCStringCopyN(ctx, buf, 1);
+	} else if (u <= 0x10FFFF) {
+		buf[0] = 0xD800 + ((u - 0x10000) >> 10);
+		buf[1] = 0xDC00 + (u & 0x3FF);
+		return JS_NewUCStringCopyN(ctx, buf, 2);
+	} else {
+		return NULL;
+	}
+}

From 60544f748eba186bd1f93bf81d17502e6cd0d5bf Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 20 Aug 2006 14:51:06 +0200
Subject: [PATCH 059/132] Fixed issue with CONFIG_TRUE_COLOR and 16 colors
 mode. inline functions used instead of macros. Still problems with
 transparency in true color mode.

---
 src/terminal/color.c  |   4 +-
 src/terminal/color.h  |   5 +-
 src/terminal/screen.c | 119 +++++++++++++++++++++++++++++++-----------
 3 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/src/terminal/color.c b/src/terminal/color.c
index 2ecdae68..c23f42e0 100644
--- a/src/terminal/color.c
+++ b/src/terminal/color.c
@@ -269,7 +269,7 @@ set_term_color16(struct screen_char *schar, enum color_flags flags,
 	if (use_inverse(bg, fg)) {
 		schar->attr |= SCREEN_ATTR_STANDOUT;
 	}
-
+#if 0
 #if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
 	/* With 256 color support we use memcmp() when comparing color in
 	 * terminal/screen.c:add_char*() so we need to clear this byte. */
@@ -278,6 +278,8 @@ set_term_color16(struct screen_char *schar, enum color_flags flags,
 #else
 	schar->color[0] = (bg << 4 | fg);
 #endif
+#endif
+	schar->color[0] = (bg << 4 | fg);
 }
 
 void
diff --git a/src/terminal/color.h b/src/terminal/color.h
index 527454ff..4dd99fce 100644
--- a/src/terminal/color.h
+++ b/src/terminal/color.h
@@ -17,10 +17,9 @@ struct screen_char;
 #if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
 #define TERM_COLOR_FOREGROUND(color) ((color)[0])
 #define TERM_COLOR_BACKGROUND(color) ((color)[1])
-#else
-#define TERM_COLOR_FOREGROUND(color) ((color)[0] & TERM_COLOR_MASK)
-#define TERM_COLOR_BACKGROUND(color) (((color)[0] >> 4) & TERM_COLOR_MASK)
 #endif
+#define TERM_COLOR_FOREGROUND_16(color) ((color)[0] & TERM_COLOR_MASK)
+#define TERM_COLOR_BACKGROUND_16(color) (((color)[0] >> 4) & TERM_COLOR_MASK)
 
 /* Bit flags to control how the colors are handled. */
 enum color_flags {
diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 794a1bd9..40082302 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -431,34 +431,91 @@ struct screen_state {
 #endif
 };
 
-/* FIXME: This is inefficient. When CONFIG_TRUE_COLOR is defined even in 16 color mode
- * all 6 bytes are copied or compared. */
-
 #if defined(CONFIG_TRUE_COLOR)
-#define compare_color(a, b)	((a)[0] == (b)[0] && (a)[1] == (b)[1] && (a)[2] == (b)[2] \
-				&& (a)[3] == (b)[3] && (a)[4] == (b)[4] && (a)[5] == (b)[5])
-#define copy_color(a, b)	do { (a)[0] = (b)[0]; (a)[1] = (b)[1]; (a)[2] = (b)[2]; \
-				(a)[3] = (b)[3]; (a)[4] = (b)[4]; (a)[5] = (b)[5];} while (0)
 #define INIT_SCREEN_STATE 	{ 0xFF, 0xFF, 0xFF, 0, { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF} }
-
 #elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
-#define compare_color(a, b)	((a)[0] == (b)[0] && (a)[1] == (b)[1])
-#define copy_color(a, b)	do { (a)[0] = (b)[0]; (a)[1] = (b)[1]; } while (0)
 #define INIT_SCREEN_STATE 	{ 0xFF, 0xFF, 0xFF, 0, { 0xFF, 0xFF } }
 #else
-#define compare_color(a, b)	((a)[0] == (b)[0])
-#define copy_color(a, b)	do { (a)[0] = (b)[0]; } while (0)
 #define INIT_SCREEN_STATE 	{ 0xFF, 0xFF, 0xFF, 0, { 0xFF } }
 #endif
 
-#if defined(CONFIG_TRUE_COLOR)
-#define compare_bg_color(a, b)	((a)[3] == (b[3]) && (a)[4] == (b)[4] && (a)[5] == (b)[5])
-#define compare_fg_color(a, b)	((a)[0] == (b[0]) && (a)[1] == (b)[1] && (a)[2] == (b)[2])
-#else
-#define compare_bg_color(a, b)	(TERM_COLOR_BACKGROUND(a) == TERM_COLOR_BACKGROUND(b))
-#define compare_fg_color(a, b)	(TERM_COLOR_FOREGROUND(a) == TERM_COLOR_FOREGROUND(b))
+#ifdef CONFIG_TRUE_COLOR
+static inline int
+compare_color_true(unsigned char *a, unsigned char *b)
+{
+	return !memcmp(a, b, 6);
+}
+
+static inline int
+compare_bg_color_true(unsigned char *a, unsigned char *b)
+{
+	return (a[3] == b[3] && a[4] == b[4] && a[5] == b[5]);
+}
+
+static inline int
+compare_fg_color_true(unsigned char *a, unsigned char *b)
+{
+	return (a[0] == b[0] && a[1] == b[1] && a[2] == b[2]);
+}
+
+static inline void
+copy_color_true(unsigned char *a, unsigned char *b)
+{
+	memcpy(a, b, 6);
+}
 #endif
 
+#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
+static inline int
+compare_color_256(unsigned char *a, unsigned char *b)
+{
+	return (a[0] == b[0] && a[1] == b[1]);
+}
+
+static inline int
+compare_bg_color_256(unsigned char *a, unsigned char *b)
+{
+	return (a[1] == b[1]);
+}
+
+static inline int
+compare_fg_color_256(unsigned char *a, unsigned char *b)
+{
+	return (a[0] == b[0]);
+}
+
+static inline void
+copy_color_256(unsigned char *a, unsigned char *b)
+{
+	a[0] = b[0];
+	a[1] = b[1];
+}
+#endif
+
+static inline int
+compare_color_16(unsigned char *a, unsigned char *b)
+{
+	return (a[0] == b[0]);
+}
+
+static inline int
+compare_bg_color_16(unsigned char *a, unsigned char *b)
+{
+	return (TERM_COLOR_BACKGROUND_16(a) == TERM_COLOR_BACKGROUND_16(b));
+}
+
+static inline int
+compare_fg_color_16(unsigned char *a, unsigned char *b)
+{
+	return (TERM_COLOR_FOREGROUND_16(a) == TERM_COLOR_FOREGROUND_16(b));
+}
+
+static inline void
+copy_color_16(unsigned char *a, unsigned char *b)
+{
+	a[0] = b[0];
+}
+
 #ifdef CONFIG_UTF_8
 static inline void
 add_char_data(struct string *screen, struct screen_driver *driver,
@@ -543,17 +600,17 @@ add_char16(struct string *screen, struct screen_driver *driver,
 #ifdef CONFIG_UTF_8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
 #endif /* CONFIG_UTF_8 */
-	    !compare_color(ch->color, state->color)
+	    !compare_color_16(ch->color, state->color)
 	   ) {
-		copy_color(state->color, ch->color);
+		copy_color_16(state->color, ch->color);
 
 		add_bytes_to_string(screen, "\033[0", 3);
 
 		if (driver->color_mode == COLOR_MODE_16) {
 			unsigned char code[6] = ";30;40";
-			unsigned char bgcolor = TERM_COLOR_BACKGROUND(ch->color);
+			unsigned char bgcolor = TERM_COLOR_BACKGROUND_16(ch->color);
 
-			code[2] += TERM_COLOR_FOREGROUND(ch->color);
+			code[2] += TERM_COLOR_FOREGROUND_16(ch->color);
 
 			if (!driver->transparent || bgcolor != 0) {
 				code[5] += bgcolor;
@@ -678,9 +735,9 @@ add_char256(struct string *screen, struct screen_driver *driver,
 #ifdef CONFIG_UTF_8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
 #endif /* CONFIG_UTF_8 */
-	    !compare_color(ch->color, state->color)
+	    !compare_color_256(ch->color, state->color)
 	   ) {
-		copy_color(state->color, ch->color);
+		copy_color_256(state->color, ch->color);
 
 		add_foreground_color(screen, color256_seqs, ch);
 		if (!driver->transparent || ch->color[1] != 0) {
@@ -793,9 +850,9 @@ add_char_true(struct string *screen, struct screen_driver *driver,
 #ifdef CONFIG_UTF_8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
 #endif /* CONFIG_UTF_8 */
-	    !compare_color(ch->color, state->color)
+	    !compare_color_true(ch->color, state->color)
 	   ) {
-		copy_color(state->color, ch->color);
+		copy_color_true(state->color, ch->color);
 
 		add_true_foreground_color(screen, color_true_seqs, ch);
 		if (!driver->transparent || ch->color[1] != 0) {
@@ -815,7 +872,7 @@ add_char_true(struct string *screen, struct screen_driver *driver,
 }
 #endif
 
-#define add_chars(image_, term_, driver_, state_, ADD_CHAR)			\
+#define add_chars(image_, term_, driver_, state_, ADD_CHAR, compare_bg_color, compare_fg_color)			\
 {										\
 	struct terminal_screen *screen = (term_)->screen;			\
 	int y = screen->dirty_from;					\
@@ -895,21 +952,21 @@ redraw_screen(struct terminal *term)
 	switch (driver->color_mode) {
 	case COLOR_MODE_MONO:
 	case COLOR_MODE_16:
-		add_chars(&image, term, driver, &state, add_char16);
+		add_chars(&image, term, driver, &state, add_char16, compare_bg_color_16, compare_fg_color_16);
 		break;
 #ifdef CONFIG_88_COLORS
 	case COLOR_MODE_88:
-		add_chars(&image, term, driver, &state, add_char256);
+		add_chars(&image, term, driver, &state, add_char256, compare_bg_color_256, compare_fg_color_256);
 		break;
 #endif
 #ifdef CONFIG_256_COLORS
 	case COLOR_MODE_256:
-		add_chars(&image, term, driver, &state, add_char256);
+		add_chars(&image, term, driver, &state, add_char256, compare_bg_color_256, compare_fg_color_256);
 		break;
 #endif
 #ifdef CONFIG_TRUE_COLOR
 	case COLOR_MODE_TRUE_COLOR:
-		add_chars(&image, term, driver, &state, add_char_true);
+		add_chars(&image, term, driver, &state, add_char_true, compare_bg_color_true, compare_fg_color_true);
 		break;
 #endif
 	case COLOR_MODES:

From 77d7741726a5ce54a37f3d9b7a6824770bf9a6c8 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 20 Aug 2006 15:19:25 +0200
Subject: [PATCH 060/132] Fixed transparency in true color mode.

---
 src/terminal/screen.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 40082302..94d25b6f 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -463,6 +463,14 @@ copy_color_true(unsigned char *a, unsigned char *b)
 {
 	memcpy(a, b, 6);
 }
+
+static inline int
+background_is_black(unsigned char *a)
+{
+	static unsigned char b[6] = {0, 0, 0, 0, 0, 0};
+
+	return compare_bg_color_true(a, b);
+}
 #endif
 
 #if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
@@ -855,7 +863,7 @@ add_char_true(struct string *screen, struct screen_driver *driver,
 		copy_color_true(state->color, ch->color);
 
 		add_true_foreground_color(screen, color_true_seqs, ch);
-		if (!driver->transparent || ch->color[1] != 0) {
+		if (!driver->transparent || !background_is_black(ch->color)) {
 			add_true_background_color(screen, color_true_seqs, ch);
 		}
 

From 1c0598d5ba86a8abc877c63349cdf4ff0553576f Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 20 Aug 2006 17:07:26 +0300
Subject: [PATCH 061/132] ECMAScript: More accessKey tests.

---
 test/ecmascript/accesskey.html | 113 ++++++++++++++++++++++++++-------
 1 file changed, 89 insertions(+), 24 deletions(-)

diff --git a/test/ecmascript/accesskey.html b/test/ecmascript/accesskey.html
index 9ba4b7aa..65d62618 100644
--- a/test/ecmascript/accesskey.html
+++ b/test/ecmascript/accesskey.html
@@ -2,43 +2,108 @@
 	"http://www.w3.org/TR/REC-html40/strict.dtd">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta http-equiv="Content-Script-Type" content="application/ecmascript">
-<title>accessKey test</title>
-<form action="#">
-<p><input type="button" onclick="run()" value="Test"> <input id="result" value="not run">
+<title>ECMAScript accessKey tests</title>
+<h1>ECMAScript accessKey tests</h1>
+
+<h2>Set valid access keys and read them back</h2>
+
+<p>This does not automatically test that the assigned access keys
+actually work.</p>
+<form name="form1" action="#">
+<p><input type="button" onclick="run1()" value="Test"> <input id="result1" value="not run">
 <input type="reset">
 <table>
-<tr><td><input id="a" accesskey="a"><td>U+0020<td>must not become "Space"
-<tr><td><input id="b" accesskey="b"><td>U+0025<td>ASCII punctuation
-<tr><td><input id="c" accesskey="c"><td>U+007A<td>ASCII letter
-<tr><td><input id="d" accesskey="d"><td>U+00E5<td>Latin-1
-<tr><td><input id="e" accesskey="e"><td>U+0161<td>Latin-9
-<tr><td><input id="f" accesskey="f"><td>U+3042<td>Hiragana
-<tr><td><input id="g" accesskey="g"><td>U+10A55<td>Kharoshthi
+<tr><td><input id="a1" accesskey="a"><td><td>empty string
+<tr><td><input id="b1" accesskey="b"><td>U+0020<td>must not become "Space"
+<tr><td><input id="c1" accesskey="c"><td>U+0025<td>ASCII punctuation
+<tr><td><input id="d1" accesskey="d"><td>U+007A<td>ASCII letter
+<tr><td><input id="e1" accesskey="e"><td>U+00E5<td>Latin-1
+<tr><td><input id="f1" accesskey="f"><td>U+0161<td>Latin-9
+<tr><td><input id="g1" accesskey="g"><td>U+3042<td>Hiragana
+<tr><td><input id="h1" accesskey="h"><td>U+10A55<td>Kharoshthi
 </table>
 </form>
-
 <script type="application/ecmascript">
-function run() {
-  var form = window.document.forms[0];
-  form.elements["result"].value = "running";
+function run1() {
+  var form = window.document.forms["form1"];
+  form.elements["result1"].value = "running";
   var ok = true;
   var probe = function(element, accessKey) {
     element.accessKey = accessKey;
     if (element.accessKey != accessKey) {
       ok = false;
-      element.value = "failed " + accessKey + " " + element.accessKey;
+      element.value = "failed " + accessKey + "/" + element.accessKey;
     } else {
-      element.value = "passed " + accessKey + " " + element.accessKey;
+      element.value = "passed " + accessKey + "/" + element.accessKey;
     }
   }
-  probe(form.elements["a"], " ");
-  probe(form.elements["b"], "%");
-  probe(form.elements["c"], "z");
-  probe(form.elements["d"], "\u00E5");
-  probe(form.elements["e"], "\u0161");
-  probe(form.elements["f"], "\u3042");
-  probe(form.elements["g"], "\uD802\uDE55");
-  form.elements["result"].value = ok ? "passed" : "failed";
+  probe(form.elements["a1"], "");
+  probe(form.elements["b1"], " ");
+  probe(form.elements["c1"], "%");
+  probe(form.elements["d1"], "z");
+  probe(form.elements["e1"], "\u00E5");
+  probe(form.elements["f1"], "\u0161");
+  probe(form.elements["g1"], "\u3042");
+  probe(form.elements["h1"], "\uD802\uDE55");
+  form.elements["result1"].value = ok ? "passed" : "failed";
+  return false;
+}
+</script>
+
+<h2>These might throw errors</h2>
+<form name="form2" action="#">
+<table>
+<tr><td><input type="button" value="Test" onclick='run2("a2",-273.15)'><td><input id="a2"><td>number -273.15
+<tr><td><input type="button" value="Test" onclick='run2("b2","\u0000")'><td><input id="b2"><td>U+0000
+<tr><td><input type="button" value="Test" onclick='run2("c2","\u0001")'><td><input id="c2"><td>U+0001
+<tr><td><input type="button" value="Test" onclick='run2("d2","\u000A")'><td><input id="d2"><td>U+000A
+<tr><td><input type="button" value="Test" onclick='run2("e2","hyi")'><td><input id="e2"><td>"hyi"
+<tr><td><input type="reset">
+</table>
+</form>
+<script type="application/ecmascript">
+function run2(name, accessKey) {
+  var form = window.document.forms["form2"];
+  var element = form.elements[name];
+  element.accessKey = accessKey;
+  if (element.accessKey != accessKey)
+     element.value = "different " + accessKey + "/" + element.accessKey;
+  else
+     element.value = "same " + accessKey + "/" + element.accessKey;
+  return false;
+}
+</script>
+
+<h2>Invalid uses of surrogates</h2>
+<form name="form3" action="#">
+<table>
+<tr><td><input type="button" value="Test" onclick='run3("a3","\uD800")'><td><input id="a3"><td>U+D800
+<tr><td><input type="button" value="Test" onclick='run3("b3","\uD800.")'><td><input id="b3"><td>U+D800 U+002E
+<tr><td><input type="button" value="Test" onclick='run3("c3","\uD800\uD800")'><td><input id="c3"><td>U+D800 U+D800
+<tr><td><input type="button" value="Test" onclick='run3("d3","\uD800\uDBFF")'><td><input id="d3"><td>U+D800 U+DBFF
+<tr><td><input type="button" value="Test" onclick='run3("e3","\uD800\uE000")'><td><input id="e3"><td>U+D800 U+E000
+<tr><td><input type="button" value="Test" onclick='run3("f3","\uDBFF\uDBFF")'><td><input id="f3"><td>U+DBFF U+DBFF
+<tr><td><input type="button" value="Test" onclick='run3("g3","\uDC00")'><td><input id="g3"><td>U+DC00
+<tr><td><input type="button" value="Test" onclick='run3("h3","\uDC00.")'><td><input id="h3"><td>U+DC00 U+002E
+<tr><td><input type="button" value="Test" onclick='run3("i3","\uDC00\uD800")'><td><input id="i3"><td>U+DC00 U+D800
+<tr><td><input type="button" value="Test" onclick='run3("j3","\uDC00\uDBFF")'><td><input id="j3"><td>U+DC00 U+DBFF
+<tr><td><input type="button" value="Test" onclick='run3("k3","\uDC00\uDC00")'><td><input id="k3"><td>U+DC00 U+DC00
+<tr><td><input type="button" value="Test" onclick='run3("l3","\uDC00\uDFFF")'><td><input id="l3"><td>U+DC00 U+DFFF
+<tr><td><input type="button" value="Test" onclick='run3("m3","\uDC00\uFF20")'><td><input id="m3"><td>U+DC00 U+FF20
+<tr><td><input type="button" value="Test" onclick='run3("n3","\uDFFF")'><td><input id="n3"><td>U+DFFF
+<tr><td><input type="button" value="Test" onclick='run3("o3","\uDFFF\uDFFF")'><td><input id="o3"><td>U+DFFF U+DFFF
+<tr><td><input type="reset">
+</table>
+</form>
+<script type="application/ecmascript">
+function run3(name, accessKey) {
+  var form = window.document.forms["form3"];
+  var element = form.elements[name];
+  element.accessKey = accessKey;
+  if (element.accessKey != accessKey)
+     element.value = "different " + accessKey + "/" + element.accessKey;
+  else
+     element.value = "same " + accessKey + "/" + element.accessKey;
   return false;
 }
 </script>

From 45b194d1e77b45e722f370f53e96b606e5e752a5 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 20 Aug 2006 17:29:03 +0300
Subject: [PATCH 062/132] ECMAScript: Fix previous careless SEE changes.

---
 src/ecmascript/see/input.c | 4 ++--
 src/ecmascript/see/input.h | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ecmascript/see/input.c b/src/ecmascript/see/input.c
index 38048ac2..477dc6b4 100644
--- a/src/ecmascript/see/input.c
+++ b/src/ecmascript/see/input.c
@@ -112,8 +112,8 @@ append_unicode_to_SEE_string(struct SEE_interpreter *interp,
 		 * surrogate range? */
 		SEE_string_addch(str, u);
 	} else if (u <= 0x10FFFF) {
-		SEE_string_addch(0xD800 + ((u - 0x10000) >> 10));
-		SEE_string_addch(0xDC00 + (u & 0x3FF));
+		SEE_string_addch(str, 0xD800 + ((u - 0x10000) >> 10));
+		SEE_string_addch(str, 0xDC00 + (u & 0x3FF));
 	} else {
 		/* str->interpreter exists but is not documented, so don't
 		 * use it; use a separate @interp parameter instead.
diff --git a/src/ecmascript/see/input.h b/src/ecmascript/see/input.h
index 05e35586..7fd719c5 100644
--- a/src/ecmascript/see/input.h
+++ b/src/ecmascript/see/input.h
@@ -1,6 +1,8 @@
 #ifndef EL__ECMASCRIPT_SEE_INPUT_H
 #define EL__ECMASCRIPT_SEE_INPUT_H
 
+#include "intl/charsets.h"
+
 struct SEE_interpreter;
 struct SEE_string;
 struct SEE_value;

From 2d898272c12cb1a3c471b765080a5faae3ea1ed7 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 20 Aug 2006 17:10:08 +0300
Subject: [PATCH 063/132] ECMAScript: Preserve all of Unicode when setting the
 accessKey property.

Well, almost all.  U+0000 cannot be used because ELinks thinks that
means the link has no access key.
---
 src/ecmascript/see/form.c          | 18 +++++++++------
 src/ecmascript/see/input.c         | 21 +++++++++++++++++
 src/ecmascript/see/input.h         |  1 +
 src/ecmascript/spidermonkey/form.c | 36 ++++++++++++++++++++++++++++--
 4 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index c42ef025..b8d4bdc6 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -283,13 +283,17 @@ input_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	if (linknum >= 0) link = &document->links[linknum];
 
 	if (p == s_accessKey) {
-		if (link) {
-			string = SEE_value_to_unsigned_char(interp, val);
-			if (!string)
-				return;
-			link->accesskey = accesskey_string_to_unicode(string);
-			mem_free(string);
-		}
+		struct SEE_value conv;
+		unicode_val_T accesskey;
+
+		SEE_ToString(interp, val, &conv);
+		if (conv.u.string->length)
+			accesskey = SEE_string_to_unicode(interp, conv.u.string);
+		else
+			accesskey = 0;
+
+		if (link)
+			link->accesskey = accesskey;
 	} else if (p == s_alt) {
 		string = SEE_value_to_unsigned_char(interp, val);
 		mem_free_set(&fc->alt, string);
diff --git a/src/ecmascript/see/input.c b/src/ecmascript/see/input.c
index 477dc6b4..5d3b91f5 100644
--- a/src/ecmascript/see/input.c
+++ b/src/ecmascript/see/input.c
@@ -123,3 +123,24 @@ append_unicode_to_SEE_string(struct SEE_interpreter *interp,
 				(unsigned int) u);
 	}
 }
+
+unicode_val_T
+SEE_string_to_unicode(struct SEE_interpreter *interp, struct SEE_string *S)
+{
+	/* This implementation ignores extra characters in the string.  */
+	if (S->length < 1) {
+		SEE_error_throw(interp, interp->Error,
+				"String is empty");
+	} else if (S->data[0] < 0xD800 || S->data[0] > 0xDFFF) {
+		return S->data[0];
+	} else if (S->length >= 2
+		   && S->data[0] >= 0xD800 && S->data[0] <= 0xDBFF
+		   && S->data[1] >= 0xDC00 && S->data[1] <= 0xDFFF) {
+		return 0x10000
+			+ ((S->data[0] & 0x3FF) << 10)
+			+ (S->data[1] & 0x3FF);
+	} else {
+		SEE_error_throw(interp, interp->Error,
+				"Invalid UTF-16 sequence");
+	}
+}
diff --git a/src/ecmascript/see/input.h b/src/ecmascript/see/input.h
index 7fd719c5..6813bcd5 100644
--- a/src/ecmascript/see/input.h
+++ b/src/ecmascript/see/input.h
@@ -13,5 +13,6 @@ unsigned char *SEE_value_to_unsigned_char(struct SEE_interpreter *, struct SEE_v
 struct SEE_string *string_to_SEE_string(struct SEE_interpreter *, unsigned char *);
 void append_unicode_to_SEE_string(struct SEE_interpreter *, struct SEE_string *,
 				  unicode_val_T);
+unicode_val_T SEE_string_to_unicode(struct SEE_interpreter *, struct SEE_string *);
 
 #endif
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index d57f912e..643503a0 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -118,6 +118,7 @@ static const JSFunctionSpec input_funcs[] = {
 };
 
 static JSString *unicode_to_jsstring(JSContext *ctx, unicode_val_T u);
+static unicode_val_T jsval_to_accesskey(JSContext *ctx, jsval *vp);
 
 static JSBool
 input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
@@ -253,6 +254,7 @@ input_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 	struct form_control *fc = find_form_control(document, fs);
 	int linknum;
 	struct link *link = NULL;
+	unicode_val_T accesskey;
 
 	assert(fc);
 	assert(fc->form && fs);
@@ -266,8 +268,11 @@ input_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
 
 	switch (JSVAL_TO_INT(id)) {
 	case JSP_INPUT_ACCESSKEY:
-		if (link)
-			link->accesskey = accesskey_string_to_unicode(jsval_to_string(ctx, vp));
+		accesskey = jsval_to_accesskey(ctx, vp);
+		if (accesskey == UCS_NO_CHAR)
+			return JS_FALSE;
+		else if (link)
+			link->accesskey = accesskey;
 		break;
 	case JSP_INPUT_ALT:
 		mem_free_set(&fc->alt, stracpy(jsval_to_string(ctx, vp)));
@@ -1001,3 +1006,30 @@ unicode_to_jsstring(JSContext *ctx, unicode_val_T u)
 		return NULL;
 	}
 }
+
+/* Convert the string *@vp to an access key.  Return 0 for no access
+ * key, UCS_NO_CHAR on error, or the access key otherwise.  */
+static unicode_val_T
+jsval_to_accesskey(JSContext *ctx, jsval *vp)
+{
+	size_t len;
+	const jschar *chr;
+
+	/* Convert the value in place, to protect the result from GC.  */
+	if (JS_ConvertValue(ctx, *vp, JSTYPE_STRING, vp) == JS_FALSE)
+		return UCS_NO_CHAR;
+	len = JS_GetStringLength(JSVAL_TO_STRING(*vp));
+	chr = JS_GetStringChars(JSVAL_TO_STRING(*vp));
+
+	/* This implementation ignores extra characters in the string.  */
+	if (len < 1)
+		return 0;	/* which means no access key */
+	if (chr[0] < 0xD800 || chr[0] > 0xDFFF)
+		return chr[0];
+	if (len >= 2
+	    && chr[0] >= 0xD800 && chr[0] <= 0xDBFF
+	    && chr[1] >= 0xDC00 && chr[1] <= 0xDFFF)
+		return 0x10000 + ((chr[0] & 0x3FF) << 10) + (chr[1] & 0x3FF);
+	JS_ReportError(ctx, "Invalid UTF-16 sequence");
+	return UCS_NO_CHAR;	/* which the caller will reject */
+}

From 0ae69652dda9e11fcc0a46d6ebd8c9be8ced80dc Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Sun, 20 Aug 2006 21:24:20 +0200
Subject: [PATCH 064/132] Define SCREEN_COLOR_SIZE to hold the number of bytes
 in screen_char->color

---
 src/terminal/draw.c   | 11 ++++++-----
 src/terminal/draw.h   | 22 ++++++++++++----------
 src/terminal/screen.c |  8 +-------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/terminal/draw.c b/src/terminal/draw.c
index ea5b0d0a..58923945 100644
--- a/src/terminal/draw.c
+++ b/src/terminal/draw.c
@@ -21,12 +21,13 @@
 		int_bounds(&(x), 0, (term)->width - 1); \
 		int_bounds(&(y), 0, (term)->height - 1); \
 	} while (0)
-#if defined(CONFIG_TRUE_COLOR)
-#define clear_screen_char_color(schar) do { memset((schar)->color, 0, 6); } while (0)
-#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
-#define clear_screen_char_color(schar) do { memset((schar)->color, 0, 2); } while (0)
+
+#if SCREEN_COLOR_SIZE > 1
+#define clear_screen_char_color(schar) \
+	do { memset((schar)->color, 0, SCREEN_COLOR_SIZE); } while (0)
 #else
-#define clear_screen_char_color(schar) do { (schar)->color[0] = 0; } while (0)
+#define clear_screen_char_color(schar) \
+	do { (schar)->color[0] = 0; } while (0)
 #endif
 
 
diff --git a/src/terminal/draw.h b/src/terminal/draw.h
index 75f1bdae..965a0a01 100644
--- a/src/terminal/draw.h
+++ b/src/terminal/draw.h
@@ -7,6 +7,16 @@ struct color_pair;
 struct box;
 struct terminal;
 
+#if defined(CONFIG_TRUE_COLOR)
+/* 0, 1, 2 - rgb foreground; 3, 4, 5 - rgb background */
+#define SCREEN_COLOR_SIZE	6
+#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
+/* 0 is foreground; 1 is background */
+#define SCREEN_COLOR_SIZE	2
+#else
+#define SCREEN_COLOR_SIZE	1
+#endif
+
 /* All attributes should fit inside an unsigned char. */
 /* XXX: The bold mask is used as part of the color encoding. */
 enum screen_char_attr {
@@ -30,16 +40,8 @@ struct screen_char {
 	/* Attributes are screen_char_attr bits. */
 	unsigned char attr;
 
-#if defined(CONFIG_TRUE_COLOR)
-	/* 0, 1, 2 - rgb foreground,
-	3, 4, 5 - rgb background */
-	unsigned char color[6];
-	/* The encoded fore- and background color. */
-#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
-	unsigned char color[2];
-#else
-	unsigned char color[1];
-#endif
+	/* The fore- and background color. */
+	unsigned char color[SCREEN_COLOR_SIZE];
 };
 
 #define copy_screen_chars(to, from, amount) \
diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 94d25b6f..4e302aad 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -422,13 +422,7 @@ struct screen_state {
 	unsigned char bold;
 	unsigned char attr;
 	/* Following should match struct screen_char color field. */
-#if defined(CONFIG_TRUE_COLOR)
-	unsigned char color[6];
-#elif defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
-	unsigned char color[2];
-#else
-	unsigned char color[1];
-#endif
+	unsigned char color[SCREEN_COLOR_SIZE];
 };
 
 #if defined(CONFIG_TRUE_COLOR)

From a74b2ead48a07c89a2cd76880c16b27dca156b11 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 20 Aug 2006 21:57:31 +0200
Subject: [PATCH 065/132] French translation was updated.

---
 po/fr.po | 594 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 333 insertions(+), 261 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 0aae8fbb..74333c54 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-08-19 16:38+0200\n"
-"PO-Revision-Date: 2006-08-19 16:39+0200\n"
+"POT-Creation-Date: 2006-08-20 21:52+0200\n"
+"PO-Revision-Date: 2006-08-20 21:53+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "Pressez espace pour d
 #: src/bfu/hierbox.c:441 src/bfu/inpfield.c:256 src/bfu/msgbox.c:173
 #: src/bfu/msgbox.c:191 src/config/dialogs.c:58 src/config/dialogs.c:393
 #: src/cookies/dialogs.c:356 src/cookies/dialogs.c:454 src/dialogs/edit.c:98
-#: src/dialogs/info.c:134 src/dialogs/options.c:220 src/dialogs/options.c:301
+#: 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/protocol/protocol.c:236 src/scripting/lua/core.c:379
 #: src/scripting/lua/core.c:460 src/session/session.c:806
@@ -175,7 +175,7 @@ msgstr "Cha
 #. 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:394 src/cookies/dialogs.c:357
 #: src/cookies/dialogs.c:455 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:223 src/dialogs/options.c:302 src/mime/dialogs.c:132
+#: 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:380 src/scripting/lua/core.c:461
 #: src/session/download.c:637 src/session/download.c:1236
@@ -191,8 +191,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:1166
-#: src/config/options.inc:1173 src/ecmascript/ecmascript.c:44
+#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1203
+#: src/config/options.inc:1210 src/ecmascript/ecmascript.c:44
 #: 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"
@@ -365,7 +365,7 @@ msgstr ""
 "\n"
 "Cette fonctionnalité requiert le support des signets."
 
-#: src/bookmarks/dialogs.c:72 src/config/options.inc:1018
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1055
 #: src/dialogs/document.c:145 src/globhist/dialogs.c:65
 msgid "Title"
 msgstr "Titre"
@@ -605,7 +605,7 @@ msgstr "Expiration"
 msgid "ID"
 msgstr "ID"
 
-#: src/cache/dialogs.c:134 src/config/options.inc:677
+#: src/cache/dialogs.c:134 src/config/options.inc:713
 msgid "Header"
 msgstr "En-tęte"
 
@@ -1839,7 +1839,7 @@ msgid "(expand by pressing space)"
 msgstr "(déployer en pressant espace)"
 
 #: src/config/dialogs.c:177 src/config/dialogs.c:360
-#: src/config/options.inc:827
+#: src/config/options.inc:863
 msgid "Type"
 msgstr "Type"
 
@@ -1908,7 +1908,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:222 src/formhist/dialogs.c:214
+#: src/dialogs/options.c:236 src/formhist/dialogs.c:214
 #: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
 msgstr "Enre~gistrer"
@@ -1921,7 +1921,7 @@ msgstr "Gestionnaire d'options"
 msgid "Keystroke"
 msgstr "Touches"
 
-#: src/config/dialogs.c:704 src/config/options.inc:1186
+#: src/config/dialogs.c:704 src/config/options.inc:1223
 msgid "Action"
 msgstr "Action"
 
@@ -2018,19 +2018,19 @@ msgstr "Edition"
 msgid "Menu mapping"
 msgstr "Menu"
 
-#: src/config/kbdbind.c:566
+#: src/config/kbdbind.c:588
 msgid "Unrecognised keymap"
 msgstr "Table d'associations de touches non reconnue"
 
-#: src/config/kbdbind.c:569
+#: src/config/kbdbind.c:591
 msgid "Error parsing keystroke"
 msgstr "Erreur d'interprétation de touche"
 
-#: src/config/kbdbind.c:573
+#: src/config/kbdbind.c:595
 msgid "Unrecognised action (internal error)"
 msgstr "Action non reconnue (erreur interne)"
 
-#: src/config/kbdbind.c:589
+#: src/config/kbdbind.c:611
 msgid "Error registering event"
 msgstr "Erreur d'enregistrement d'événement"
 
@@ -2210,7 +2210,7 @@ msgid ""
 "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"
-"in the style of i.e. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.or.cz/."
 msgstr ""
 "Essayer ou non de se connecter en IPv4 ŕ un hôte.\n"
 "Notez que si connection.try_ipv6 est activé aussi,\n"
@@ -2226,7 +2226,7 @@ msgid ""
 "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"
-"in the style of i.e. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.or.cz/."
 msgstr ""
 "Essayer ou non de se connecter en IPv4 ŕ un hôte.\n"
 "Ne touchez pas ŕ ça du tout ŕ moins de savoir ce\n"
@@ -2553,12 +2553,12 @@ msgid "Active link colors."
 msgstr "Couleurs du lien actif."
 
 #: src/config/options.inc:274 src/config/options.inc:539
-#: src/config/options.inc:912
+#: src/config/options.inc:949
 msgid "Background color"
 msgstr "Couleur du fond"
 
 #: src/config/options.inc:276 src/config/options.inc:541
-#: src/config/options.inc:913
+#: src/config/options.inc:950
 msgid "Default background color."
 msgstr "Couleur par défaut du fond."
 
@@ -2571,12 +2571,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:535
-#: src/config/options.inc:910
+#: src/config/options.inc:947
 msgid "Text color"
 msgstr "Couleur du texte"
 
 #: src/config/options.inc:280 src/config/options.inc:537
-#: src/config/options.inc:911
+#: src/config/options.inc:948
 msgid "Default text color."
 msgstr "Couleur du texte par défaut."
 
@@ -2610,8 +2610,8 @@ 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:875
-#: src/dialogs/options.c:217
+#: src/config/options.inc:296 src/config/options.inc:912
+#: src/dialogs/options.c:231
 msgid "Underline"
 msgstr "Souligné"
 
@@ -3245,7 +3245,7 @@ msgstr "Sortie (dump)"
 msgid "Dump output options."
 msgstr "Options de sortie (dump)."
 
-#: src/config/options.inc:630 src/config/options.inc:879
+#: src/config/options.inc:630 src/config/options.inc:916
 #: src/config/opttypes.c:407 src/dialogs/document.c:163
 msgid "Codepage"
 msgstr "Jeu de caractčres"
@@ -3259,13 +3259,15 @@ msgstr ""
 "'System' indique que celui-ci sera déterminé par la locale\n"
 "en cours."
 
-#: src/config/options.inc:640 src/config/options.inc:649
-#: src/config/options.inc:657 src/config/options.inc:665
-#: src/config/options.inc:859
+#: src/config/options.inc:641 src/config/options.inc:650
+#: src/config/options.inc:658 src/config/options.inc:666
+#: src/config/options.inc:673 src/config/options.inc:683
+#: src/config/options.inc:692 src/config/options.inc:701
+#: src/config/options.inc:895
 msgid "Color mode"
 msgstr "Mode couleurs"
 
-#: src/config/options.inc:642
+#: src/config/options.inc:643
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3281,7 +3283,7 @@ msgstr ""
 "2 mode 88 couleurs\n"
 "3 mode 256 couleurs"
 
-#: src/config/options.inc:651
+#: src/config/options.inc:652
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3295,7 +3297,7 @@ msgstr ""
 "1 mode 16 couleurs\n"
 "2 mode 88 couleurs"
 
-#: src/config/options.inc:659
+#: src/config/options.inc:660
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3309,7 +3311,7 @@ msgstr ""
 "1 mode 16 couleurs\n"
 "2 mode 256 couleurs"
 
-#: src/config/options.inc:667
+#: src/config/options.inc:668
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3321,119 +3323,183 @@ msgstr ""
 "0 mode monochrome\n"
 "1 mode 16 couleurs"
 
-#: src/config/options.inc:673
+#: src/config/options.inc:675
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is 256 color mode\n"
+"4 is true color mode"
+msgstr ""
+"Mode couleurs pour la sortie (option -dump):\n"
+"-1 pas de couleurs (normal)\n"
+"0 mode monochrome\n"
+"1 mode 16 couleurs\n"
+"2 mode 88 couleurs\n"
+"3 mode 256 couleurs\n"
+"4 mode vraies couleurs"
+
+#: src/config/options.inc:685
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is true color mode\n"
+msgstr ""
+"Mode couleurs pour la sortie (option -dump):\n"
+"-1 pas de couleurs (normal)\n"
+"0 mode monochrome\n"
+"1 mode 16 couleurs\n"
+"2 mode 88 couleurs\n"
+"3 mode vraies couleurs\n"
+
+#: src/config/options.inc:694
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 256 color mode\n"
+"3 is true color mode"
+msgstr ""
+"Mode couleurs pour la sortie (option -dump):\n"
+"-1 pas de couleurs (normal)\n"
+"0 mode monochrome\n"
+"1 mode 16 couleurs\n"
+"2 mode 256 couleurs\n"
+"3 mode vraies couleurs"
+
+#: src/config/options.inc:703
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is true color mode"
+msgstr ""
+"Mode couleurs pour la sortie (option -dump):\n"
+"-1 pas de couleurs (normal)\n"
+"0 mode monochrome\n"
+"1 mode 16 couleurs\n"
+"2 mode vraies couleurs"
+
+#: src/config/options.inc:709
 msgid "Footer"
 msgstr "Pied de page"
 
-#: src/config/options.inc:675
+#: src/config/options.inc:711
 #, c-format
 msgid "Footer string used in dumps. %u is substituted by URL."
 msgstr ""
 "Chaîne de pied de page utilisée lors des dumps.\n"
 "%u est remplacé par l'URL du document."
 
-#: src/config/options.inc:679
+#: src/config/options.inc:715
 #, c-format
 msgid "Header string used in dumps. %u is substituted by URL."
 msgstr ""
 "Chaîne d'en-tęte utilisée lors des dumps.\n"
 "%u est remplacé par l'URL du document."
 
-#: src/config/options.inc:681
+#: src/config/options.inc:717
 msgid "Numbering"
 msgstr "Numérotation"
 
-#: src/config/options.inc:683
+#: src/config/options.inc:719
 msgid "Whether to print link numbers in dump output."
 msgstr "Numéroter ou non les liens en sortie (dump)."
 
-#: src/config/options.inc:685
+#: src/config/options.inc:721
 msgid "References"
 msgstr "Références"
 
-#: src/config/options.inc:687
+#: src/config/options.inc:723
 msgid ""
 "Whether to print references (URIs) of document links\n"
 "in dump output."
 msgstr "Afficher ou non les références (URIs) des liens en sortie (dump)."
 
-#: src/config/options.inc:690
+#: src/config/options.inc:726
 msgid "Separator"
 msgstr "Séparateur"
 
-#: src/config/options.inc:692
+#: src/config/options.inc:728
 msgid "String which separates two dumps."
 msgstr "Chaîne qui sépare deux dumps."
 
-#: src/config/options.inc:694
+#: src/config/options.inc:730
 msgid "Width"
 msgstr "Largeur"
 
-#: src/config/options.inc:696
+#: src/config/options.inc:732
 msgid "Width of screen in characters when dumping documents."
 msgstr "Largeur de l'écran en caractčres pour les dumps."
 
-#: src/config/options.inc:700
+#: src/config/options.inc:736
 msgid "History"
 msgstr "Historique"
 
-#: src/config/options.inc:702
+#: src/config/options.inc:738
 msgid "History options."
 msgstr "Options de l'historique."
 
-#: src/config/options.inc:704
+#: src/config/options.inc:740
 msgid "Keep unhistory"
 msgstr "Historique inverse"
 
-#: src/config/options.inc:706
+#: src/config/options.inc:742
 msgid "Keep unhistory (\"forward history\")."
 msgstr "Historique inverse (\"forward history\")."
 
-#: src/config/options.inc:709
+#: src/config/options.inc:745
 msgid "HTML rendering"
 msgstr "Rendu HTML"
 
-#: src/config/options.inc:711
+#: src/config/options.inc:747
 msgid "Options concerning the display of HTML pages."
 msgstr "Options d'affichage des pages HTML."
 
-#: src/config/options.inc:713
+#: src/config/options.inc:749
 msgid "Display frames"
 msgstr "Afficher les cadres"
 
-#: src/config/options.inc:715
+#: src/config/options.inc:751
 msgid "Display frames."
 msgstr "Afficher les cadres."
 
-#: src/config/options.inc:717
+#: src/config/options.inc:753
 msgid "Display tables"
 msgstr "Afficher les tableaux"
 
-#: src/config/options.inc:719
+#: src/config/options.inc:755
 msgid "Display tables."
 msgstr "Afficher les tableaux."
 
-#: src/config/options.inc:721
+#: src/config/options.inc:757
 msgid "Display subscripts"
 msgstr "Afficher subscripts"
 
-#: src/config/options.inc:723
+#: src/config/options.inc:759
 msgid "Display subscripts (as [thing])."
 msgstr "Afficher subscripts (comme [chose])."
 
-#: src/config/options.inc:725
+#: src/config/options.inc:761
 msgid "Display superscripts"
 msgstr "Afficher superscripts"
 
-#: src/config/options.inc:727
+#: src/config/options.inc:763
 msgid "Display superscripts (as ^thing)."
 msgstr "Afficher superscripts (comme ^chose)."
 
-#: src/config/options.inc:729
+#: src/config/options.inc:765
 msgid "Rendering of html link element"
 msgstr "Rendu des éléments html link"
 
-#: src/config/options.inc:731
+#: src/config/options.inc:767
 msgid ""
 "How to render <link> tags from the HTML header:\n"
 "0 is nothing\n"
@@ -3451,19 +3517,19 @@ msgstr ""
 "4 type de contenu en plus\n"
 "5 tout"
 
-#: src/config/options.inc:739
+#: src/config/options.inc:775
 msgid "Underline links"
 msgstr "Souligner les liens"
 
-#: src/config/options.inc:741
+#: src/config/options.inc:777
 msgid "Underline links."
 msgstr "Souligner les liens."
 
-#: src/config/options.inc:743
+#: src/config/options.inc:779
 msgid "Wrap non breaking space"
 msgstr "Césure sur les espaces non sécables (nbsp)"
 
-#: src/config/options.inc:745
+#: src/config/options.inc:781
 msgid ""
 "If set do not honour non breaking space (the nbsp entity)\n"
 "but allow to wrap the text. This can help keeping the width\n"
@@ -3473,35 +3539,35 @@ msgstr ""
 "(entité nbsp). Cela peut aider ŕ garder la largeur des documents\n"
 "ŕ une valeur basse, limitant ainsi le besoin de déroulement horizontal."
 
-#: src/config/options.inc:750
+#: src/config/options.inc:786
 msgid "Plain rendering"
 msgstr "Rendu plein texte"
 
-#: src/config/options.inc:752
+#: src/config/options.inc:788
 msgid "Options concerning the display of plain text pages."
 msgstr "Options d'affichage des pages plein texte."
 
-#: src/config/options.inc:754
+#: src/config/options.inc:790
 msgid "Display URIs"
 msgstr "Afficher les URIs"
 
-#: src/config/options.inc:756
+#: src/config/options.inc:792
 msgid "Display URIs in the document as links."
 msgstr "Afficher les URIs dans le document en tant que liens."
 
-#: src/config/options.inc:758
+#: src/config/options.inc:794
 msgid "Compress empty lines"
 msgstr "Compresser les lignes vides"
 
-#: src/config/options.inc:760
+#: src/config/options.inc:796
 msgid "Compress successive empty lines to only one in displayed text."
 msgstr "Compresser les lignes vides successives en une dans le texte affiché."
 
-#: src/config/options.inc:763
+#: src/config/options.inc:799
 msgid "URI passing"
 msgstr "Passage d'URI"
 
-#: src/config/options.inc:765
+#: src/config/options.inc:801
 msgid ""
 "Rules for passing URIs to external commands. When one rule\n"
 "is defined the link and tab menu will have a menu item that\n"
@@ -3526,7 +3592,7 @@ msgstr ""
 "frame-external-command, link-external-command,\n"
 "et tab-external-command."
 
-#: src/config/options.inc:778
+#: src/config/options.inc:814
 msgid ""
 "A rule for passing URI to an external command.\n"
 "The format is:\n"
@@ -3541,19 +3607,19 @@ msgstr ""
 "Ne mettez pas de simples ou doubles guillemets autour de %c."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:788
+#: src/config/options.inc:824
 msgid "Information files"
 msgstr "Fichiers d'information"
 
-#: src/config/options.inc:790
+#: src/config/options.inc:826
 msgid "Options for information files in ~/.elinks."
 msgstr "Options concernant les fichiers d'information dans ~/.elinks."
 
-#: src/config/options.inc:792
+#: src/config/options.inc:828
 msgid "Save interval"
 msgstr "Intervalle pour la sauvegarde automatique"
 
-#: src/config/options.inc:794
+#: src/config/options.inc:830
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
 "to be saved to disk if they has changed (seconds; 0 to disable)"
@@ -3561,11 +3627,11 @@ msgstr ""
 "Intervalle pour la sauvegarde des fichiers d'information dans ~/.elinks\n"
 "lorsque ceux-ci ont été modifiés (en secondes; 0 pour désactiver)"
 
-#: src/config/options.inc:797
+#: src/config/options.inc:833
 msgid "Use secure file saving"
 msgstr "Fiabiliser la sauvegarde des fichiers"
 
-#: src/config/options.inc:799
+#: src/config/options.inc:835
 msgid ""
 "First write data to unique temporary file, then rename this file\n"
 "upon successfully finishing this. Note that this relates only to\n"
@@ -3588,11 +3654,11 @@ msgstr ""
 "destination n'existe pas au moment de l'appel ŕ rename(3), cela casse\n"
 "l'atomicité de l'opération et réduit la fiabilité de cette fonctionnalité."
 
-#: src/config/options.inc:808
+#: src/config/options.inc:844
 msgid "Use fsync(3) with secure file saving"
 msgstr "Utiliser fsync(3) avec la sauvegarde fiable des fichiers"
 
-#: src/config/options.inc:810
+#: src/config/options.inc:846
 msgid ""
 "When using secure file saving, call fsync(3), if the OS\n"
 "supports it, to force the OS immediately to write the data\n"
@@ -3606,21 +3672,21 @@ msgstr ""
 "éviter une utilisation excessive des entrées/sorties disque."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:819
+#: src/config/options.inc:855
 msgid "Terminals"
 msgstr "Terminaux"
 
-#: src/config/options.inc:821
+#: src/config/options.inc:857
 msgid "Terminal options."
 msgstr "Options du terminal."
 
-#: src/config/options.inc:825
+#: src/config/options.inc:861
 msgid "Options specific to this terminal type (according to $TERM value)."
 msgstr ""
 "Options spécifiques ŕ ce type de terminal (conformément ŕ la valeur de "
 "$TERM)."
 
-#: src/config/options.inc:829
+#: src/config/options.inc:865
 msgid ""
 "Terminal type; matters mostly only when drawing frames and\n"
 "dialog box borders:\n"
@@ -3637,11 +3703,11 @@ msgstr ""
 "3 KOI-8\n"
 "4 FreeBSD"
 
-#: src/config/options.inc:837 src/dialogs/options.c:213
+#: src/config/options.inc:873 src/dialogs/options.c:227
 msgid "Switch fonts for line drawing"
 msgstr "Echanger les fontes pour dessiner les lignes"
 
-#: src/config/options.inc:839
+#: src/config/options.inc:875
 msgid ""
 "Switch fonts when drawing lines, enabling both local characters\n"
 "and lines working at the same time. Makes sense only with linux\n"
@@ -3650,11 +3716,11 @@ msgstr ""
 "Echanger les fontes de caractčres pour le dessin des lignes, seulement\n"
 "intéressant avec le terminal de type linux."
 
-#: src/config/options.inc:843 src/dialogs/options.c:218
+#: src/config/options.inc:879 src/dialogs/options.c:232
 msgid "UTF-8 I/O"
 msgstr "E/S UTF-8"
 
-#: src/config/options.inc:845
+#: src/config/options.inc:881
 msgid ""
 "Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
 "only the subset of UTF8 according to terminal codepage is used."
@@ -3664,11 +3730,11 @@ msgstr ""
 "seule une partie de l'UTF8 est utilisée, en accord avec le jeu de caractčres "
 "du terminal."
 
-#: src/config/options.inc:848 src/dialogs/options.c:214
+#: src/config/options.inc:884 src/dialogs/options.c:228
 msgid "Restrict frames in cp850/852"
 msgstr "Limiter les cadres dans cp850/852"
 
-#: src/config/options.inc:850
+#: src/config/options.inc:886
 msgid ""
 "Restrict the characters used when drawing lines. Makes sense\n"
 "only with linux terminals using the cp850/852 character sets."
@@ -3677,11 +3743,11 @@ msgstr ""
 "N'a du sens que pour les terminaux linux utilisant les jeux de\n"
 "caractčres cp850/852."
 
-#: src/config/options.inc:853 src/dialogs/options.c:215
+#: src/config/options.inc:889 src/dialogs/options.c:229
 msgid "Block cursor"
 msgstr "Bloquer le curseur"
 
-#: src/config/options.inc:855
+#: src/config/options.inc:891
 msgid ""
 "Move cursor to bottom right corner when done drawing.\n"
 "This is particularly useful when we have a block cursor,\n"
@@ -3692,25 +3758,27 @@ msgstr ""
 "en forme de bloc est utilisé, ainsi le texte inversé\n"
 "est affiché correctement."
 
-#: src/config/options.inc:861
+#: src/config/options.inc:897
 msgid ""
 "The color mode controls what colors are used and how they are\n"
 "output to the terminal. The color modes are:\n"
 "0 is mono mode, only 2 colors are used\n"
 "1 is 16 color mode, uses the common ANSI colors\n"
-"2 is 256 color mode, uses XTerm RGB codes"
+"2 is 256 color mode, uses XTerm RGB codes\n"
+"3 is true color mode, uses konsole RGB codes."
 msgstr ""
 "Le mode couleurs définit le nombre de couleurs affichées.\n"
 "Les choix possibles sont:\n"
 "0 mode monochrome, 2 couleurs seulement sont utilisées\n"
 "1 mode 16 couleurs, les couleurs ANSI sont utilisées\n"
-"2 mode 256 couleurs, utilise les codes RGB d'XTerm"
+"2 mode 256 couleurs, utilise les codes RGB d'XTerm\n"
+"3 mode vraies couleurs, utilise les codes RGB de konsole."
 
-#: src/config/options.inc:867 src/dialogs/options.c:216
+#: src/config/options.inc:904 src/dialogs/options.c:230
 msgid "Transparency"
 msgstr "Transparence"
 
-#: src/config/options.inc:869
+#: src/config/options.inc:906
 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"
@@ -3721,11 +3789,11 @@ 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."
 
-#: src/config/options.inc:877
+#: src/config/options.inc:914
 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:881
+#: src/config/options.inc:918
 msgid ""
 "Codepage of charset used for displaying content on terminal.\n"
 "'System' stands for a codepage determined by a selected locale."
@@ -3735,374 +3803,374 @@ msgstr ""
 "sélectionnée."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:888
+#: src/config/options.inc:925
 msgid "User interface"
 msgstr "Interface utilisateur"
 
-#: src/config/options.inc:890
+#: src/config/options.inc:927
 msgid "User interface options."
 msgstr "Options de l'interface utilisateur."
 
-#: src/config/options.inc:894
+#: src/config/options.inc:931
 msgid "Color settings"
 msgstr "Configuration des couleurs"
 
-#: src/config/options.inc:896
+#: src/config/options.inc:933
 msgid "Default user interface color settings."
 msgstr "Configuration des couleurs de l'interface utilisateur."
 
-#: src/config/options.inc:923
+#: src/config/options.inc:960
 msgid "Color terminals"
 msgstr "Terminaux couleur"
 
-#: src/config/options.inc:925
+#: src/config/options.inc:962
 msgid "Color settings for color terminal."
 msgstr "Configuration des couleurs des terminaux couleur."
 
-#: src/config/options.inc:927
+#: src/config/options.inc:964
 msgid "Non-color terminals"
 msgstr "Terminaux monochromes"
 
-#: src/config/options.inc:929
+#: src/config/options.inc:966
 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:932
+#: src/config/options.inc:969
 msgid "Main menu bar"
 msgstr "Barre du menu principal"
 
-#: src/config/options.inc:934
+#: src/config/options.inc:971
 msgid "Main menu bar colors."
 msgstr "Couleurs de la barre du menu principal."
 
-#: src/config/options.inc:936
+#: src/config/options.inc:973
 msgid "Unselected main menu bar item"
 msgstr "Item non sélectionné de la barre de menu"
 
-#: src/config/options.inc:938
+#: src/config/options.inc:975
 msgid "Unselected main menu bar item colors."
 msgstr "Couleurs des items non sélectionnés de la barre de menu."
 
-#: src/config/options.inc:940
+#: src/config/options.inc:977
 msgid "Selected main menu bar item"
 msgstr "Item sélectionné de la barre de menu"
 
-#: src/config/options.inc:942
+#: src/config/options.inc:979
 msgid "Selected main menu bar item colors."
 msgstr "Couleurs de l'item sélectionné de la barre de menu."
 
-#: src/config/options.inc:944 src/config/options.inc:973
+#: src/config/options.inc:981 src/config/options.inc:1010
 msgid "Hotkey"
 msgstr "Raccourci clavier"
 
-#: src/config/options.inc:946
+#: src/config/options.inc:983
 msgid "Main menu hotkey colors."
 msgstr "Couleurs des raccourcis de la barre du menu principal."
 
-#: src/config/options.inc:948 src/config/options.inc:977
+#: src/config/options.inc:985 src/config/options.inc:1014
 msgid "Unselected hotkey"
 msgstr "Raccourci non sélectionné"
 
-#: src/config/options.inc:950
+#: src/config/options.inc:987
 msgid "Main menu unselected hotkey colors."
 msgstr "Couleurs des raccourcis non sélectionnés du menu principal."
 
-#: src/config/options.inc:952 src/config/options.inc:981
+#: src/config/options.inc:989 src/config/options.inc:1018
 msgid "Selected hotkey"
 msgstr "Raccourci sélectionné"
 
-#: src/config/options.inc:954
+#: src/config/options.inc:991
 msgid "Main menu selected hotkey colors."
 msgstr "Couleurs des raccourcis sélectionnés du menu principal."
 
-#: src/config/options.inc:957
+#: src/config/options.inc:994
 msgid "Menu bar"
 msgstr "Barre de menu"
 
-#: src/config/options.inc:959
+#: src/config/options.inc:996
 msgid "Menu bar colors."
 msgstr "Couleurs de la barre de menu."
 
-#: src/config/options.inc:961
+#: src/config/options.inc:998
 msgid "Unselected menu item"
 msgstr "Item non sélectionné du menu"
 
-#: src/config/options.inc:963
+#: src/config/options.inc:1000
 msgid "Unselected menu item colors."
 msgstr "Couleurs des items non sélectionnés du menu."
 
-#: src/config/options.inc:965
+#: src/config/options.inc:1002
 msgid "Selected menu item"
 msgstr "Item sélectionné du menu"
 
-#: src/config/options.inc:967
+#: src/config/options.inc:1004
 msgid "Selected menu item colors."
 msgstr "Couleurs de l'item sélectionnés du menu."
 
-#: src/config/options.inc:969
+#: src/config/options.inc:1006
 msgid "Marked menu item"
 msgstr "Item de menu marqué"
 
-#: src/config/options.inc:971
+#: src/config/options.inc:1008
 msgid "Marked menu item colors."
 msgstr "Couleurs de l'item du menu marqué."
 
-#: src/config/options.inc:975
+#: src/config/options.inc:1012
 msgid "Menu item hotkey colors."
 msgstr "Couleurs des raccourcis dans les menus."
 
-#: src/config/options.inc:979
+#: src/config/options.inc:1016
 msgid "Menu item unselected hotkey colors."
 msgstr "Couleurs des raccourcis non sélectionnés dans les menus."
 
-#: src/config/options.inc:983
+#: src/config/options.inc:1020
 msgid "Menu item selected hotkey colors."
 msgstr "Couleurs des raccourcis sélectionnés dans les menus."
 
-#: src/config/options.inc:985
+#: src/config/options.inc:1022
 msgid "Menu frame"
 msgstr "Bordure du menu"
 
-#: src/config/options.inc:987
+#: src/config/options.inc:1024
 msgid "Menu frame colors."
 msgstr "Couleurs de la bordure du menu."
 
-#: src/config/options.inc:990
+#: src/config/options.inc:1027
 msgid "Dialog"
 msgstr "Dialogue"
 
-#: src/config/options.inc:992
+#: src/config/options.inc:1029
 msgid "Dialog colors."
 msgstr "Couleurs des dialogues."
 
-#: src/config/options.inc:1002
+#: src/config/options.inc:1039
 msgid "Generic"
 msgstr "Générique"
 
-#: src/config/options.inc:1004
+#: src/config/options.inc:1041
 msgid "Generic dialog colors."
 msgstr "Couleurs des dialogues génériques."
 
-#: src/config/options.inc:1006
+#: src/config/options.inc:1043
 msgid "Frame"
 msgstr "Bordure"
 
-#: src/config/options.inc:1008
+#: src/config/options.inc:1045
 msgid "Dialog frame colors."
 msgstr "Couleurs de la bordure des dialogues."
 
-#: src/config/options.inc:1010
+#: src/config/options.inc:1047
 msgid "Scrollbar"
 msgstr "Barre de défilement"
 
-#: src/config/options.inc:1012
+#: src/config/options.inc:1049
 msgid "Scrollbar colors."
 msgstr "Couleurs de la barre de défilement."
 
-#: src/config/options.inc:1014
+#: src/config/options.inc:1051
 msgid "Selected scrollbar"
 msgstr "Barre de défilement sélectionnée"
 
-#: src/config/options.inc:1016
+#: src/config/options.inc:1053
 msgid "Scrollbar selected colors."
 msgstr "Couleurs de la barre de défilement sélectionnée."
 
-#: src/config/options.inc:1020
+#: src/config/options.inc:1057
 msgid "Dialog title colors."
 msgstr "Couleurs du titre des dialogues."
 
-#: src/config/options.inc:1022
+#: src/config/options.inc:1059
 msgid "Text"
 msgstr "Texte"
 
-#: src/config/options.inc:1024
+#: src/config/options.inc:1061
 msgid "Dialog text colors."
 msgstr "Couleurs du texte des dialogues."
 
-#: src/config/options.inc:1026 src/viewer/text/form.c:1780
+#: src/config/options.inc:1063 src/viewer/text/form.c:1780
 msgid "Checkbox"
 msgstr "Case ŕ cocher"
 
-#: src/config/options.inc:1028
+#: src/config/options.inc:1065
 msgid "Dialog checkbox colors."
 msgstr "Couleurs des cases ŕ cocher dans les dialogues."
 
-#: src/config/options.inc:1030
+#: src/config/options.inc:1067
 msgid "Selected checkbox"
 msgstr "Case ŕ cocher sélectionnée"
 
-#: src/config/options.inc:1032
+#: src/config/options.inc:1069
 msgid "Dialog selected checkbox colors."
 msgstr "Couleurs de la case ŕ cocher sélectionnée dans les dialogues."
 
-#: src/config/options.inc:1034
+#: src/config/options.inc:1071
 msgid "Checkbox label"
 msgstr "Label de case ŕ cocher"
 
-#: src/config/options.inc:1036
+#: src/config/options.inc:1073
 msgid "Dialog checkbox label colors."
 msgstr "Couleurs des labels des cases ŕ cocher dans les dialogues."
 
-#: src/config/options.inc:1038
+#: src/config/options.inc:1075
 msgid "Button"
 msgstr "Bouton"
 
-#: src/config/options.inc:1040 src/config/options.inc:1048
+#: src/config/options.inc:1077 src/config/options.inc:1085
 msgid "Dialog button colors."
 msgstr "Couleurs des boutons des dialogues."
 
-#: src/config/options.inc:1042
+#: src/config/options.inc:1079
 msgid "Selected button"
 msgstr "Bouton sélectionné"
 
-#: src/config/options.inc:1044 src/config/options.inc:1052
+#: src/config/options.inc:1081 src/config/options.inc:1089
 msgid "Dialog selected button colors."
 msgstr "Couleurs du bouton sélectionné dans les dialogues."
 
-#: src/config/options.inc:1046
+#: src/config/options.inc:1083
 msgid "Button shortcut"
 msgstr "Raccourci du bouton"
 
-#: src/config/options.inc:1050
+#: src/config/options.inc:1087
 msgid "Selected button shortcut"
 msgstr "Raccourci du bouton sélectionné"
 
-#: src/config/options.inc:1054 src/viewer/text/form.c:1784
+#: src/config/options.inc:1091 src/viewer/text/form.c:1784
 msgid "Text field"
 msgstr "Champ texte"
 
-#: src/config/options.inc:1056
+#: src/config/options.inc:1093
 msgid "Dialog text field colors."
 msgstr "Couleurs des champs texte dans les dialogues."
 
-#: src/config/options.inc:1058
+#: src/config/options.inc:1095
 msgid "Text field text"
 msgstr "Texte des champs texte"
 
-#: src/config/options.inc:1060
+#: src/config/options.inc:1097
 msgid "Dialog field text colors."
 msgstr "Couleurs de texte des champs texte dans les dialogues."
 
-#: src/config/options.inc:1062
+#: src/config/options.inc:1099
 msgid "Meter"
 msgstr "Barre de progression"
 
-#: src/config/options.inc:1064
+#: src/config/options.inc:1101
 msgid "Dialog meter colors."
 msgstr "Couleurs des barres de progression."
 
-#: src/config/options.inc:1066
+#: src/config/options.inc:1103
 msgid "Shadow"
 msgstr "Ombrage"
 
-#: src/config/options.inc:1068
+#: src/config/options.inc:1105
 msgid "Dialog shadow colors (see ui.shadows option)."
 msgstr "Couleurs des ombres des dialogues (voir l'option ui.shadows)."
 
-#: src/config/options.inc:1070
+#: src/config/options.inc:1107
 msgid "Title bar"
 msgstr "Barre de titre"
 
-#: src/config/options.inc:1072
+#: src/config/options.inc:1109
 msgid "Title bar colors."
 msgstr "Couleurs de la barre de titre."
 
-#: src/config/options.inc:1074
+#: src/config/options.inc:1111
 msgid "Generic title bar"
 msgstr "Barre de titre générique"
 
-#: src/config/options.inc:1076
+#: src/config/options.inc:1113
 msgid "Generic title bar colors."
 msgstr "Couleurs de la barre de titre générique."
 
-#: src/config/options.inc:1078
+#: src/config/options.inc:1115
 msgid "Title bar text"
 msgstr "Texte de la barre de titre"
 
-#: src/config/options.inc:1080
+#: src/config/options.inc:1117
 msgid "Title bar text colors."
 msgstr "Couleurs du texte de la barre de titre."
 
-#: src/config/options.inc:1083
+#: src/config/options.inc:1120
 msgid "Status bar"
 msgstr "Barre d'état"
 
-#: src/config/options.inc:1085
+#: src/config/options.inc:1122
 msgid "Status bar colors."
 msgstr "Couleurs de la barre d'état."
 
-#: src/config/options.inc:1087
+#: src/config/options.inc:1124
 msgid "Generic status bar"
 msgstr "Barre d'état générique"
 
-#: src/config/options.inc:1089
+#: src/config/options.inc:1126
 msgid "Generic status bar colors."
 msgstr "Couleurs de la barre d'état générique."
 
-#: src/config/options.inc:1091
+#: src/config/options.inc:1128
 msgid "Status bar text"
 msgstr "Texte de la barre d'état"
 
-#: src/config/options.inc:1093
+#: src/config/options.inc:1130
 msgid "Status bar text colors."
 msgstr "Couleurs du texte de la barre d'état."
 
-#: src/config/options.inc:1096
+#: src/config/options.inc:1133
 msgid "Tabs bar"
 msgstr "Barre d'onglets"
 
-#: src/config/options.inc:1098
+#: src/config/options.inc:1135
 msgid "Tabs bar colors."
 msgstr "Couleurs de la barre d'onglets."
 
-#: src/config/options.inc:1100
+#: src/config/options.inc:1137
 msgid "Unvisited tab"
 msgstr "Onglet non visité"
 
-#: src/config/options.inc:1102
+#: src/config/options.inc:1139
 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:1105
+#: src/config/options.inc:1142
 msgid "Unselected tab"
 msgstr "Onglet non sélectionné"
 
-#: src/config/options.inc:1107
+#: src/config/options.inc:1144
 msgid "Unselected tab colors."
 msgstr "Couleurs des onglets non sélectionnés."
 
-#: src/config/options.inc:1109
+#: src/config/options.inc:1146
 msgid "Loading tab"
 msgstr "Onglet en cours de chargement"
 
-#: src/config/options.inc:1111
+#: src/config/options.inc:1148
 msgid "Tab colors for tabs that are loading in the background."
 msgstr "Couleurs pour les onglets en cours de chargement."
 
-#: src/config/options.inc:1113
+#: src/config/options.inc:1150
 msgid "Selected tab"
 msgstr "Onglet sélectionné"
 
-#: src/config/options.inc:1115
+#: src/config/options.inc:1152
 msgid "Selected tab colors."
 msgstr "Couleurs de l'onglet sélectionné."
 
-#: src/config/options.inc:1117
+#: src/config/options.inc:1154
 msgid "Tab separator"
 msgstr "Séparateur d'onglets"
 
-#: src/config/options.inc:1119
+#: src/config/options.inc:1156
 msgid "Tab separator colors."
 msgstr "Couleurs du séparateur d'onglets."
 
-#: src/config/options.inc:1122
+#: src/config/options.inc:1159
 msgid "Searched strings"
 msgstr "Chaînes recherchées"
 
-#: src/config/options.inc:1124
+#: src/config/options.inc:1161
 msgid "Searched string highlight colors."
 msgstr "Couleurs de mise en évidence des chaînes recherchées."
 
@@ -4110,19 +4178,19 @@ msgstr "Couleurs de mise en 
 #. ============= BORING PART (colors) END ===================
 #. ==========================================================
 #. Keep options in alphabetical order.
-#: src/config/options.inc:1133
+#: src/config/options.inc:1170
 msgid "Dialog settings"
 msgstr "Configuration des dialogues"
 
-#: src/config/options.inc:1135
+#: src/config/options.inc:1172
 msgid "Dialogs-specific appearance and behaviour settings."
 msgstr "Configuration de l'apparence et du fonctionnement des dialogues."
 
-#: src/config/options.inc:1138
+#: src/config/options.inc:1175
 msgid "Minimal height of listbox widget"
 msgstr "Hauteur minimale des boîtes liste"
 
-#: src/config/options.inc:1140
+#: src/config/options.inc:1177
 msgid ""
 "Minimal height of the listbox widget (used e.g. for bookmarks\n"
 "or global history)."
@@ -4130,11 +4198,11 @@ msgstr ""
 "Hauteur minimale des boîtes liste (utilisée par exemple pour les\n"
 "signets ou l'historique global)."
 
-#: src/config/options.inc:1143
+#: src/config/options.inc:1180
 msgid "Drop shadows"
 msgstr "Porter des ombres"
 
-#: src/config/options.inc:1145
+#: src/config/options.inc:1182
 msgid ""
 "Make dialogs drop shadows (the shadows are solid, you can\n"
 "adjust their color by ui.colors.*.dialog.shadow). You may\n"
@@ -4144,11 +4212,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:1149
+#: src/config/options.inc:1186
 msgid "Underline menu hotkeys"
 msgstr "Souligner les raccourcis des menus"
 
-#: src/config/options.inc:1151
+#: src/config/options.inc:1188
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4156,11 +4224,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:1154
+#: src/config/options.inc:1191
 msgid "Underline button shortcuts"
 msgstr "Souligner les raccourcis des boutons"
 
-#: src/config/options.inc:1156
+#: src/config/options.inc:1193
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4168,11 +4236,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:1160
+#: src/config/options.inc:1197
 msgid "Timer options"
 msgstr "Options des timers"
 
-#: src/config/options.inc:1162
+#: src/config/options.inc:1199
 msgid ""
 "Timed action after certain interval of user inactivity. Someone can\n"
 "even find this useful, although you may not believe that."
@@ -4180,7 +4248,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:1168
+#: src/config/options.inc:1205
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4192,7 +4260,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:1175
+#: src/config/options.inc:1212
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4204,11 +4272,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:1181
+#: src/config/options.inc:1218
 msgid "Duration"
 msgstr "Durée"
 
-#: src/config/options.inc:1183
+#: src/config/options.inc:1220
 msgid ""
 "Inactivity timeout in seconds. The maximum of one day\n"
 "should be enough for just everyone (TM)."
@@ -4216,23 +4284,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:1188
+#: src/config/options.inc:1225
 msgid "Keybinding action to be triggered when timer reaches zero."
 msgstr "Action ŕ déclencher lorsque le timer atteint zéro."
 
-#: src/config/options.inc:1191
+#: src/config/options.inc:1228
 msgid "Window tabs"
 msgstr "Onglets"
 
-#: src/config/options.inc:1193
+#: src/config/options.inc:1230
 msgid "Window tabs settings."
 msgstr "Configuration des onglets."
 
-#: src/config/options.inc:1195
+#: src/config/options.inc:1232
 msgid "Display tabs bar"
 msgstr "Afficher la barre d'onglets"
 
-#: src/config/options.inc:1197
+#: src/config/options.inc:1234
 msgid ""
 "Show tabs bar on the screen:\n"
 "0 means never\n"
@@ -4244,20 +4312,20 @@ msgstr ""
 "1 seulement si deux onglets ou plus sont ouverts\n"
 "2 toujours"
 
-#: src/config/options.inc:1202
+#: src/config/options.inc:1239
 msgid "Tab bar at top"
 msgstr "Barre d'onglets en haut"
 
-#: src/config/options.inc:1204
+#: src/config/options.inc:1241
 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:1206
+#: src/config/options.inc:1243
 msgid "Wrap-around tabs cycling"
 msgstr "Navigation cyclique dans les onglets"
 
-#: src/config/options.inc:1208
+#: src/config/options.inc:1245
 msgid ""
 "When moving right from the last tab, jump at the first one, and\n"
 "vice versa."
@@ -4265,20 +4333,20 @@ msgstr ""
 "En cas de déplacement ŕ droite sur le dernier onglet, saute au premier\n"
 "et vice-versa."
 
-#: src/config/options.inc:1211
+#: src/config/options.inc:1248
 msgid "Confirm tab closing"
 msgstr "Confirmer la fermeture d'onglet"
 
-#: src/config/options.inc:1213
+#: src/config/options.inc:1250
 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:1217 src/config/opttypes.c:408
+#: src/config/options.inc:1254 src/config/opttypes.c:408
 msgid "Language"
 msgstr "Langue"
 
-#: src/config/options.inc:1219
+#: src/config/options.inc:1256
 msgid ""
 "Language of user interface. 'System' means that the language will\n"
 "be extracted from the environment dynamically."
@@ -4286,35 +4354,35 @@ msgstr ""
 "Langue de l'interface utilisateur. 'System' signifie que la langue\n"
 "sera dynamiquement extraite de l'environnement."
 
-#: src/config/options.inc:1222
+#: src/config/options.inc:1259
 msgid "Display menu bar always"
 msgstr "Toujours afficher la barre de menu"
 
-#: src/config/options.inc:1224
+#: src/config/options.inc:1261
 msgid "Always show menu bar on the screen."
 msgstr "Toujours montrer la barre de menu ŕ l'écran."
 
-#: src/config/options.inc:1226
+#: src/config/options.inc:1263
 msgid "Display status bar"
 msgstr "Afficher la barre d'état"
 
-#: src/config/options.inc:1228
+#: src/config/options.inc:1265
 msgid "Show status bar on the screen."
 msgstr "Montrer la barre d'état."
 
-#: src/config/options.inc:1230
+#: src/config/options.inc:1267
 msgid "Display title bar"
 msgstr "Afficher la barre de titre"
 
-#: src/config/options.inc:1232
+#: src/config/options.inc:1269
 msgid "Show title bar on the screen."
 msgstr "Montrer la barre de titre."
 
-#: src/config/options.inc:1234
+#: src/config/options.inc:1271
 msgid "Display goto dialog in new tabs"
 msgstr "Afficher le dialogue \"Atteindre l'URL\" dans les nouveaux onglets"
 
-#: src/config/options.inc:1236
+#: src/config/options.inc:1273
 msgid ""
 "Pop up goto dialog in newly created tabs when there's no homepage\n"
 "set. This means also showing goto dialog on startup."
@@ -4323,11 +4391,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:1239
+#: src/config/options.inc:1276
 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:1241
+#: src/config/options.inc:1278
 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"
@@ -4337,27 +4405,27 @@ msgstr ""
 "option active un dialogue qui confirme que l'opération s'est déroulée\n"
 "correctement."
 
-#: src/config/options.inc:1246
+#: src/config/options.inc:1283
 msgid "Sessions"
 msgstr "Sessions"
 
-#: src/config/options.inc:1248
+#: src/config/options.inc:1285
 msgid "Sessions settings."
 msgstr "Configuration des sessions."
 
-#: src/config/options.inc:1250
+#: src/config/options.inc:1287
 msgid "Keep session active"
 msgstr "Garder la session active"
 
-#: src/config/options.inc:1252
+#: src/config/options.inc:1289
 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:1254
+#: src/config/options.inc:1291
 msgid "Auto save session"
 msgstr "Sauver automatiquement la session"
 
-#: src/config/options.inc:1256
+#: src/config/options.inc:1293
 msgid ""
 "Automatically save the session when quitting.\n"
 "This feature requires bookmark support."
@@ -4365,11 +4433,11 @@ msgstr ""
 "Sauvegarder automatiquement la session au moment de quitter.\n"
 "Cette fonctionnalité nécessite le support des signets."
 
-#: src/config/options.inc:1259
+#: src/config/options.inc:1296
 msgid "Auto restore session"
 msgstr "Restaurer automatiquement la session"
 
-#: src/config/options.inc:1261
+#: src/config/options.inc:1298
 msgid ""
 "Automatically restore the session at start.\n"
 "This feature requires bookmark support."
@@ -4377,11 +4445,11 @@ msgstr ""
 "Restaurer automatiquement la session au démarrage.\n"
 "Cette fonctionnalité nécessite le support des signets."
 
-#: src/config/options.inc:1264
+#: src/config/options.inc:1301
 msgid "Auto save and restore session folder name"
 msgstr "Nom du dossier pour la session automatique"
 
-#: src/config/options.inc:1266
+#: src/config/options.inc:1303
 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"
@@ -4391,11 +4459,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:1270
+#: src/config/options.inc:1307
 msgid "Homepage URI"
 msgstr "URI de la page d'accueil"
 
-#: src/config/options.inc:1272
+#: src/config/options.inc:1309
 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"
@@ -4407,19 +4475,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:1278
+#: src/config/options.inc:1315
 msgid "Date format"
 msgstr "Format des dates"
 
-#: src/config/options.inc:1280
+#: src/config/options.inc:1317
 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:1283
+#: src/config/options.inc:1320
 msgid "Set window title"
 msgstr "Modifier le titre de la fenętre"
 
-#: src/config/options.inc:1285
+#: src/config/options.inc:1322
 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"
@@ -5422,7 +5490,7 @@ msgid "Files:"
 msgstr "Fichiers:"
 
 #. 2 '\n' + 1 '\0'
-#: src/dialogs/options.c:161
+#: src/dialogs/options.c:173
 #, c-format
 msgid ""
 "The environmental variable TERM is set to '%s'.\n"
@@ -5439,63 +5507,67 @@ msgstr ""
 "valeur de TERM. Cela vous permet de configurer indépendemment\n"
 "chacun des terminaux oů vous utilisez ELinks."
 
-#: src/dialogs/options.c:187
+#: src/dialogs/options.c:199
 msgid "Terminal options"
 msgstr "Options du terminal"
 
-#: src/dialogs/options.c:196
+#: src/dialogs/options.c:208
 msgid "Frame handling:"
 msgstr "Gestion des cadres:"
 
-#: src/dialogs/options.c:197
+#: src/dialogs/options.c:209
 msgid "No frames"
 msgstr "Aucun cadre"
 
-#: src/dialogs/options.c:198
+#: src/dialogs/options.c:210
 msgid "VT 100 frames"
 msgstr "Cadres VT 100"
 
-#: src/dialogs/options.c:199
+#: src/dialogs/options.c:211
 msgid "Linux or OS/2 frames"
 msgstr "Cadres Linux ou OS/2"
 
-#: src/dialogs/options.c:200
+#: src/dialogs/options.c:212
 msgid "FreeBSD frames"
 msgstr "Cadres FreeBSD"
 
-#: src/dialogs/options.c:201
+#: src/dialogs/options.c:213
 msgid "KOI8-R frames"
 msgstr "Cadres KOI8-R"
 
-#: src/dialogs/options.c:203
+#: src/dialogs/options.c:215
 msgid "Color mode:"
 msgstr "Mode couleurs:"
 
-#: src/dialogs/options.c:204
+#: src/dialogs/options.c:216
 msgid "No colors (mono)"
 msgstr "Monochrome"
 
-#: src/dialogs/options.c:205
+#: src/dialogs/options.c:217
 msgid "16 colors"
 msgstr "16 couleurs"
 
-#: src/dialogs/options.c:207
+#: src/dialogs/options.c:219
 msgid "88 colors"
 msgstr "88 couleurs"
 
-#: src/dialogs/options.c:210
+#: src/dialogs/options.c:222
 msgid "256 colors"
 msgstr "256 couleurs"
 
-#: src/dialogs/options.c:295
+#: src/dialogs/options.c:225
+msgid "true color"
+msgstr "vraies couleurs"
+
+#: src/dialogs/options.c:309
 msgid "Resize terminal"
 msgstr "Redimensionner le terminal"
 
-#: src/dialogs/options.c:298
+#: src/dialogs/options.c:312
 msgid "Width="
 msgstr "Largeur="
 
-#: src/dialogs/options.c:299
+#: src/dialogs/options.c:313
 msgid "Height="
 msgstr "Hauteur="
 

From 463cce0b667fe13db18cd525e29286bd4fd086a5 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 20 Aug 2006 21:59:12 +0200
Subject: [PATCH 066/132] French translation was updated.

---
 po/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/fr.po b/po/fr.po
index 74333c54..b67631a8 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: 2006-08-20 21:52+0200\n"
+"POT-Creation-Date: 2006-08-20 21:59+0200\n"
 "PO-Revision-Date: 2006-08-20 21:53+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"

From b9d66bd9bd6fbd5422dd3891bfb4239b77194c2c Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <fonseca@diku.dk>
Date: Tue, 22 Aug 2006 11:10:14 +0200
Subject: [PATCH 067/132] Fix compilation on Minix3

 - Include arpa/inet.h to get hton* ntoh* functions.
 - Use socklen_t instead of int.
 - Try to define PF_INET to AF_INET if it doesn't exist.

Reported-by: Andy Tanenbaum <ast@cs.vu.nl>
---
 src/network/socket.c                | 8 ++++++--
 src/osdep/generic.h                 | 7 +++++++
 src/protocol/bittorrent/bencoding.c | 4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/network/socket.c b/src/network/socket.c
index 8eb272e1..732f782e 100644
--- a/src/network/socket.c
+++ b/src/network/socket.c
@@ -32,6 +32,10 @@
 #endif
 #endif				/* HAVE_GETIFADDRS */
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #include "elinks.h"
 
 #include "config/options.h"
@@ -275,7 +279,7 @@ get_pasv_socket(struct socket *ctrl_socket, struct sockaddr_storage *addr)
 	struct sockaddr *pasv_addr = (struct sockaddr *) addr;
 	size_t addrlen;
 	int sock = -1;
-	int len;
+	socklen_t len;
 #ifdef CONFIG_IPV6
 	struct sockaddr_in6 bind_addr6;
 
@@ -449,7 +453,7 @@ static void
 connected(struct socket *socket)
 {
 	int err = 0;
-	int len = sizeof(err);
+	socklen_t len = sizeof(err);
 
 	assertm(socket->connect_info, "Lost connect_info!");
 	if_assert_failed return;
diff --git a/src/osdep/generic.h b/src/osdep/generic.h
index 0dbc4856..9223cd50 100644
--- a/src/osdep/generic.h
+++ b/src/osdep/generic.h
@@ -37,6 +37,13 @@
 #define IP_ADDRESS_BUFFER_SIZE INET_ADDRSTRLEN
 #endif
 
+#ifndef PF_INET
+#define PF_INET AF_INET
+#endif
+
+#ifndef PF_INET6
+#define PF_INET6 AF_INET6
+#endif
 
 /* Attempt to workaround the EINTR mess. */
 #if defined(EINTR) && !defined(CONFIG_OS_WIN32)
diff --git a/src/protocol/bittorrent/bencoding.c b/src/protocol/bittorrent/bencoding.c
index f1d9206e..6a7d0aae 100644
--- a/src/protocol/bittorrent/bencoding.c
+++ b/src/protocol/bittorrent/bencoding.c
@@ -15,6 +15,10 @@
 #include <netinet/in.h> /* OS/2 needs this after sys/types.h */
 #endif
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 #include "elinks.h"
 
 #include "protocol/bittorrent/bencoding.h"

From 38fe5b72f74ec2b87e2fa006756754bc8f2e465c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Thu, 24 Aug 2006 23:30:41 +0300
Subject: [PATCH 068/132] Define and use macros for handling UTF-16 surrogates.

---
 src/ecmascript/see/input.c         | 16 +++++++---------
 src/ecmascript/spidermonkey/form.c | 14 +++++++-------
 src/intl/charsets.h                | 12 ++++++++++++
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/ecmascript/see/input.c b/src/ecmascript/see/input.c
index 5d3b91f5..cba24355 100644
--- a/src/ecmascript/see/input.c
+++ b/src/ecmascript/see/input.c
@@ -111,9 +111,9 @@ append_unicode_to_SEE_string(struct SEE_interpreter *interp,
 		/* TODO: Should this reject code points in the
 		 * surrogate range? */
 		SEE_string_addch(str, u);
-	} else if (u <= 0x10FFFF) {
-		SEE_string_addch(str, 0xD800 + ((u - 0x10000) >> 10));
-		SEE_string_addch(str, 0xDC00 + (u & 0x3FF));
+	} else if (needs_utf16_surrogates(u)) {
+		SEE_string_addch(str, get_utf16_high_surrogate(u));
+		SEE_string_addch(str, get_utf16_low_surrogate(u));
 	} else {
 		/* str->interpreter exists but is not documented, so don't
 		 * use it; use a separate @interp parameter instead.
@@ -131,14 +131,12 @@ SEE_string_to_unicode(struct SEE_interpreter *interp, struct SEE_string *S)
 	if (S->length < 1) {
 		SEE_error_throw(interp, interp->Error,
 				"String is empty");
-	} else if (S->data[0] < 0xD800 || S->data[0] > 0xDFFF) {
+	} else if (!is_utf16_surrogate(S->data[0])) {
 		return S->data[0];
 	} else if (S->length >= 2
-		   && S->data[0] >= 0xD800 && S->data[0] <= 0xDBFF
-		   && S->data[1] >= 0xDC00 && S->data[1] <= 0xDFFF) {
-		return 0x10000
-			+ ((S->data[0] & 0x3FF) << 10)
-			+ (S->data[1] & 0x3FF);
+		   && is_utf16_high_surrogate(S->data[0])
+		   && is_utf16_low_surrogate(S->data[1])) {
+		return join_utf16_surrogates(S->data[0], S->data[1]);
 	} else {
 		SEE_error_throw(interp, interp->Error,
 				"Invalid UTF-16 sequence");
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index 643503a0..6da9b49c 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -998,9 +998,9 @@ unicode_to_jsstring(JSContext *ctx, unicode_val_T u)
 		 * surrogate range? */
 		buf[0] = u;
 		return JS_NewUCStringCopyN(ctx, buf, 1);
-	} else if (u <= 0x10FFFF) {
-		buf[0] = 0xD800 + ((u - 0x10000) >> 10);
-		buf[1] = 0xDC00 + (u & 0x3FF);
+	} else if (needs_utf16_surrogates(u)) {
+		buf[0] = get_utf16_high_surrogate(u);
+		buf[1] = get_utf16_low_surrogate(u);
 		return JS_NewUCStringCopyN(ctx, buf, 2);
 	} else {
 		return NULL;
@@ -1024,12 +1024,12 @@ jsval_to_accesskey(JSContext *ctx, jsval *vp)
 	/* This implementation ignores extra characters in the string.  */
 	if (len < 1)
 		return 0;	/* which means no access key */
-	if (chr[0] < 0xD800 || chr[0] > 0xDFFF)
+	if (!is_utf16_surrogate(chr[0]))
 		return chr[0];
 	if (len >= 2
-	    && chr[0] >= 0xD800 && chr[0] <= 0xDBFF
-	    && chr[1] >= 0xDC00 && chr[1] <= 0xDFFF)
-		return 0x10000 + ((chr[0] & 0x3FF) << 10) + (chr[1] & 0x3FF);
+	    && is_utf16_high_surrogate(chr[0])
+	    && is_utf16_low_surrogate(chr[1]))
+		return join_utf16_surrogates(chr[0], chr[1]);
 	JS_ReportError(ctx, "Invalid UTF-16 sequence");
 	return UCS_NO_CHAR;	/* which the caller will reject */
 }
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index 095fe48e..c0452aff 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -88,4 +88,16 @@ unsigned char *u2cp_(unicode_val_T, int, int no_nbsp_hack);
 void init_charsets_lookup(void);
 void free_charsets_lookup(void);
 
+/* UTF-16 encodes each Unicode character U+0000...U+FFFF as a single
+ * 16-bit code unit, and each character U+10000...U+10FFFF as a pair
+ * of two code units: a high surrogate followed by a low surrogate.
+ * The range U+D800...U+DFFF is reserved for these surrogates.  */
+#define is_utf16_surrogate(u)           (((u) & 0xFFFFF800) == 0xD800)
+#define is_utf16_high_surrogate(u)      (((u) & 0xFFFFFC00) == 0xD800)
+#define is_utf16_low_surrogate(u)       (((u) & 0xFFFFFC00) == 0xDC00)
+#define join_utf16_surrogates(high,low) (0x10000 + (((high) - 0xD800L) << 10) + ((low) - 0xDC00))
+#define needs_utf16_surrogates(u)       ((uint32_t) ((u) - 0x10000) < 0x100000)
+#define get_utf16_high_surrogate(u)     (0xD800 + (((u) - 0x10000) >> 10))
+#define get_utf16_low_surrogate(u)      (0xDC00 + ((u) & 0x3FF))
+
 #endif

From e333fb37ab6eb4fd371ce00e7168d4ecdb9f2181 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 21 Aug 2006 00:41:27 +0300
Subject: [PATCH 069/132] terminal UTF-8: Have an array for the
 interlink->utf_8.min values.

The previous scheme incorrectly accepted 0xC1 0x80 as U+0040.
That could have been fixed by tweaking the loop, but the constant
array is surely easier to verify.
---
 src/terminal/event.c | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/terminal/event.c b/src/terminal/event.c
index 43a6105b..08098ff0 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -43,7 +43,7 @@ struct terminal_interlink {
 	struct {
 		unicode_val_T ucs;
 		int len;
-		int min;
+		unicode_val_T min;
 		/* Modifier keys from the key event that carried the
 		 * first byte of the character.  We need this because
 		 * ELinks sees e.g. ESC U+00F6 as 0x1B 0xC3 0xB6 and
@@ -385,26 +385,43 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 		} else if ((key & 0xC0) == 0xC0 && (key & 0xFE) != 0xFE) {
 			/* This is a UTF-8 start byte. */
 
-			unsigned int mask, cov = 0x80;
+			/* Minimum character values for UTF-8 octet
+			 * sequences of each length, from RFC 2279.
+			 * According to the RFC, UTF-8 decoders should
+			 * reject characters that are encoded with
+			 * more octets than necessary.  (RFC 3629,
+			 * which ELinks does not yet otherwise follow,
+			 * tightened the "should" to "MUST".)  */
+			static const unicode_val_T min[] = {
+				0x00000080, /* ... 0x000007FF with 2 octets */
+				0x00000800, /* ... 0x0000FFFF with 3 octets */
+				0x00010000, /* ... 0x001FFFFF with 4 octets */
+				0x00200000, /* ... 0x03FFFFFF with 5 octets */
+				0x04000000  /* ... 0x7FFFFFFF with 6 octets */
+			};
+			unsigned int mask;
 			int len = 0;
 
-			/* The number of 1's between the first bit and first
-			 * 0 bit (exclusive) is the number of remaining
-			 * continuation bytes in the encoding of the character
-			 * that is now being processed, which number will be
-			 * stored in interlink->utf_8.len. */
-			for (mask = 0x80; key & mask; mask >>= 1) {
+			/* Set @len = the number of contiguous 1's
+			 * in the most significant bits of the first
+			 * octet, i.e. @key.  It is also the number
+			 * of octets in the character.  Leave @mask
+			 * pointing to the first 0 bit found.  */
+			for (mask = 0x80; key & mask; mask >>= 1)
 				len++;
-				interlink->utf_8.min = cov;
-				cov = 1 << (1 + 5 * len);
-			}
 
+			/* This will hold because @key was checked above.  */
+			assert(len >= 2 && len <= 6);
+			if_assert_failed goto invalid_utf_8_start_byte;
+
+			interlink->utf_8.min = min[len - 2];
 			interlink->utf_8.len = len - 1;
 			interlink->utf_8.ucs = key & (mask - 1);
 			interlink->utf_8.modifier = modifier;
 			break;
 		}
 
+	invalid_utf_8_start_byte:
 		term_send_ucs(term, UCS_REPLACEMENT_CHARACTER, modifier);
 		break;
 	}

From be7526d00a4c2609238324372cbe6400ff0f9640 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 25 Aug 2006 22:25:55 +0300
Subject: [PATCH 070/132] terminal UTF-8: Reject code points reserved for
 UTF-16 surrogates.

Those code points are allowed in CESU-8 but not in UTF-8.
---
 src/terminal/event.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/terminal/event.c b/src/terminal/event.c
index 08098ff0..55931789 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -337,7 +337,10 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 				if (! --interlink->utf_8.len) {
 					unicode_val_T u = interlink->utf_8.ucs;
 
-					if (u < interlink->utf_8.min)
+					/* UTF-8 allows neither overlong
+					 * sequences nor surrogates.  */
+					if (u < interlink->utf_8.min
+					    || is_utf16_surrogate(u))
 						u = UCS_REPLACEMENT_CHARACTER;
 					term_send_ucs(term, u,
 						      term->interlink->utf_8.modifier);

From a094bddd1bde200cd6452b19d758cab7bdff2ce9 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 26 Aug 2006 19:05:31 +0200
Subject: [PATCH 071/132] Removed dead code. Add suffix _256 to
 TERM_COLOR_(BACK|FORE)GROUND.

---
 src/terminal/color.c | 14 ++------------
 src/terminal/color.h |  4 ++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/terminal/color.c b/src/terminal/color.c
index c23f42e0..a4f3ab07 100644
--- a/src/terminal/color.c
+++ b/src/terminal/color.c
@@ -269,16 +269,6 @@ set_term_color16(struct screen_char *schar, enum color_flags flags,
 	if (use_inverse(bg, fg)) {
 		schar->attr |= SCREEN_ATTR_STANDOUT;
 	}
-#if 0
-#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
-	/* With 256 color support we use memcmp() when comparing color in
-	 * terminal/screen.c:add_char*() so we need to clear this byte. */
-	TERM_COLOR_FOREGROUND(schar->color) = (fg & TERM_COLOR_MASK);
-	TERM_COLOR_BACKGROUND(schar->color) = bg;
-#else
-	schar->color[0] = (bg << 4 | fg);
-#endif
-#endif
 	schar->color[0] = (bg << 4 | fg);
 }
 
@@ -380,8 +370,8 @@ set_term_color(struct screen_char *schar, struct color_pair *pair,
 			}
 		}
 
-		TERM_COLOR_FOREGROUND(schar->color) = fg;
-		TERM_COLOR_BACKGROUND(schar->color) = bg;
+		TERM_COLOR_FOREGROUND_256(schar->color) = fg;
+		TERM_COLOR_BACKGROUND_256(schar->color) = bg;
 		break;
 #endif
 #ifdef CONFIG_TRUE_COLOR
diff --git a/src/terminal/color.h b/src/terminal/color.h
index 4dd99fce..a5d88ef7 100644
--- a/src/terminal/color.h
+++ b/src/terminal/color.h
@@ -15,8 +15,8 @@ struct screen_char;
 #define TERM_COLOR_MASK	0x07
 
 #if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
-#define TERM_COLOR_FOREGROUND(color) ((color)[0])
-#define TERM_COLOR_BACKGROUND(color) ((color)[1])
+#define TERM_COLOR_FOREGROUND_256(color) ((color)[0])
+#define TERM_COLOR_BACKGROUND_256(color) ((color)[1])
 #endif
 #define TERM_COLOR_FOREGROUND_16(color) ((color)[0] & TERM_COLOR_MASK)
 #define TERM_COLOR_BACKGROUND_16(color) (((color)[0] >> 4) & TERM_COLOR_MASK)

From d2995010769718237d97883e5cb0f8ceaea69e2a Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 26 Aug 2006 19:21:08 +0200
Subject: [PATCH 072/132] Avoided white on white and similar cases in true
 color mode.

---
 src/terminal/color.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/terminal/color.c b/src/terminal/color.c
index a4f3ab07..f9c09b81 100644
--- a/src/terminal/color.c
+++ b/src/terminal/color.c
@@ -320,6 +320,14 @@ set_term_color(struct screen_char *schar, struct color_pair *pair,
 #endif
 #ifdef CONFIG_TRUE_COLOR
 	case COLOR_MODE_TRUE_COLOR:
+        	/* TODO: make it better */
+        	if (pair->foreground == pair->background && (flags & COLOR_ENSURE_CONTRAST)) {
+			if (flags & COLOR_ENSURE_INVERTED_CONTRAST) {
+				pair->background = (pair->foreground == 0) ? 0xffffff : 0;
+			} else {
+				pair->foreground = (pair->background == 0) ? 0xffffff : 0;
+			}
+                }
 		schar->color[0] = (pair->foreground >> 16) & 255; /* r */
 		schar->color[1] = (pair->foreground >> 8) & 255; /* g */
 		schar->color[2] = pair->foreground & 255; /* b */

From 7a84967453f1084f77037c8378db9eb5c7dea9ce Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 26 Aug 2006 19:34:14 +0200
Subject: [PATCH 073/132] Unification. Removed trailing '\n' from last line.

---
 src/config/options.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/options.inc b/src/config/options.inc
index 964a991a..68eea6fe 100644
--- a/src/config/options.inc
+++ b/src/config/options.inc
@@ -687,7 +687,7 @@ static struct option_info config_options_info[] = {
 		"0 is mono mode\n"
 		"1 is 16 color mode\n"
 		"2 is 88 color mode\n"
-		"3 is true color mode\n")),
+		"3 is true color mode")),
 #elif defined(CONFIG_256_COLORS) && !defined(CONFIG_88_COLORS) && defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
 		"color_mode", 0, -1, 2, -1,

From cf79dfdeb624affbbfb4ebbcfe6ecd790a33c30c Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 26 Aug 2006 19:35:47 +0200
Subject: [PATCH 074/132] Polish translation was updated.

---
 po/pl.po | 599 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 336 insertions(+), 263 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 465a8ecd..599e7b14 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-19 14:09+0200\n"
-"PO-Revision-Date: 2006-08-19 14:30+0200\n"
+"POT-Creation-Date: 2006-08-26 19:34+0200\n"
+"PO-Revision-Date: 2006-08-26 20:00+0200\n"
 "Last-Translator: Witold Filipczyk <witekfl@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr "Wci
 #: src/bfu/hierbox.c:441 src/bfu/inpfield.c:256 src/bfu/msgbox.c:173
 #: src/bfu/msgbox.c:191 src/config/dialogs.c:58 src/config/dialogs.c:393
 #: src/cookies/dialogs.c:356 src/cookies/dialogs.c:454 src/dialogs/edit.c:98
-#: src/dialogs/info.c:134 src/dialogs/options.c:220 src/dialogs/options.c:301
+#: 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/protocol/protocol.c:236 src/scripting/lua/core.c:379
 #: src/scripting/lua/core.c:460 src/session/session.c:806
@@ -181,7 +181,7 @@ msgstr "Musisz wpisa
 #. 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:394 src/cookies/dialogs.c:357
 #: src/cookies/dialogs.c:455 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:223 src/dialogs/options.c:302 src/mime/dialogs.c:132
+#: 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:380 src/scripting/lua/core.c:461
 #: src/session/download.c:637 src/session/download.c:1236
@@ -198,8 +198,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:1166
-#: src/config/options.inc:1173 src/ecmascript/ecmascript.c:44
+#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1203
+#: src/config/options.inc:1210 src/ecmascript/ecmascript.c:44
 #: 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"
@@ -373,7 +373,7 @@ msgstr ""
 "\n"
 "Wymagana jest obsługa zakładek."
 
-#: src/bookmarks/dialogs.c:72 src/config/options.inc:1018
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1055
 #: src/dialogs/document.c:145 src/globhist/dialogs.c:65
 msgid "Title"
 msgstr "Tytuł"
@@ -614,7 +614,7 @@ msgstr "Wygasa"
 msgid "ID"
 msgstr "ID"
 
-#: src/cache/dialogs.c:134 src/config/options.inc:677
+#: src/cache/dialogs.c:134 src/config/options.inc:713
 msgid "Header"
 msgstr "Nagłówek"
 
@@ -1847,7 +1847,7 @@ msgid "(expand by pressing space)"
 msgstr "(rozwiń przyciskając spację)"
 
 #: src/config/dialogs.c:177 src/config/dialogs.c:360
-#: src/config/options.inc:827
+#: src/config/options.inc:863
 msgid "Type"
 msgstr "Typ"
 
@@ -1915,7 +1915,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:222 src/formhist/dialogs.c:214
+#: src/dialogs/options.c:236 src/formhist/dialogs.c:214
 #: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
 msgstr "~Zapisz"
@@ -1928,7 +1928,7 @@ msgstr "Menad
 msgid "Keystroke"
 msgstr "Skrót klawiszowy"
 
-#: src/config/dialogs.c:704 src/config/options.inc:1186
+#: src/config/dialogs.c:704 src/config/options.inc:1223
 msgid "Action"
 msgstr "Akcja"
 
@@ -2026,19 +2026,19 @@ msgstr "Mapa klawiszy edycji"
 msgid "Menu mapping"
 msgstr "Mapa klawiszy menu"
 
-#: src/config/kbdbind.c:566
+#: src/config/kbdbind.c:588
 msgid "Unrecognised keymap"
 msgstr "Nierozpoznana mapa klawiszy"
 
-#: src/config/kbdbind.c:569
+#: src/config/kbdbind.c:591
 msgid "Error parsing keystroke"
 msgstr "Błąd przy odczytywaniu kombinacji klawiszy"
 
-#: src/config/kbdbind.c:573
+#: src/config/kbdbind.c:595
 msgid "Unrecognised action (internal error)"
 msgstr "Nierozpoznana akcja (błąd wewnętrzny)"
 
-#: src/config/kbdbind.c:589
+#: src/config/kbdbind.c:611
 msgid "Error registering event"
 msgstr "Błąd przy rejestrowaniu zdarzenia"
 
@@ -2224,7 +2224,7 @@ msgid ""
 "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"
-"in the style of i.e. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.or.cz/."
 msgstr ""
 "Czy próbować połączyć się z serwerem przy pomocy IPv4?\n"
 "Jeśli connection.try_ipv6 jest także włączone, to ma\n"
@@ -2238,7 +2238,7 @@ msgid ""
 "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"
-"in the style of i.e. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.or.cz/."
 msgstr ""
 "Czy próbować połączyć się z serwerem przy pomocy IPv4?\n"
 "Nie dotykaj tej opcji.\n"
@@ -2572,13 +2572,13 @@ msgstr "Kolory aktywnego odno
 
 #
 #: src/config/options.inc:274 src/config/options.inc:539
-#: src/config/options.inc:912
+#: src/config/options.inc:949
 msgid "Background color"
 msgstr "Kolor tła"
 
 #
 #: src/config/options.inc:276 src/config/options.inc:541
-#: src/config/options.inc:913
+#: src/config/options.inc:950
 msgid "Default background color."
 msgstr "Domyślny kolor tła."
 
@@ -2592,12 +2592,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:535
-#: src/config/options.inc:910
+#: src/config/options.inc:947
 msgid "Text color"
 msgstr "Kolor tekstu"
 
 #: src/config/options.inc:280 src/config/options.inc:537
-#: src/config/options.inc:911
+#: src/config/options.inc:948
 msgid "Default text color."
 msgstr "Domyślny kolor tekstu."
 
@@ -2631,8 +2631,8 @@ 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:875
-#: src/dialogs/options.c:217
+#: src/config/options.inc:296 src/config/options.inc:912
+#: src/dialogs/options.c:231
 msgid "Underline"
 msgstr "Podkreślenie"
 
@@ -3297,7 +3297,7 @@ msgstr "Zrzuty"
 msgid "Dump output options."
 msgstr "Ustawienia dotyczące zrzutów."
 
-#: src/config/options.inc:630 src/config/options.inc:879
+#: src/config/options.inc:630 src/config/options.inc:916
 #: src/config/opttypes.c:407 src/dialogs/document.c:163
 msgid "Codepage"
 msgstr "Strona kodowa"
@@ -3310,13 +3310,15 @@ msgstr ""
 "Strona kodowa użyta podczasu zrzutu. 'System' oznacza\n"
 "iż zostanie określona przez wybrane locale."
 
-#: src/config/options.inc:640 src/config/options.inc:649
-#: src/config/options.inc:657 src/config/options.inc:665
-#: src/config/options.inc:859
+#: src/config/options.inc:641 src/config/options.inc:650
+#: src/config/options.inc:658 src/config/options.inc:666
+#: src/config/options.inc:673 src/config/options.inc:683
+#: src/config/options.inc:692 src/config/options.inc:701
+#: src/config/options.inc:895
 msgid "Color mode"
 msgstr "Tryb kolorowy"
 
-#: src/config/options.inc:642
+#: src/config/options.inc:643
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3332,7 +3334,7 @@ msgstr ""
 " 2 - tryb 88-kolorowy\n"
 " 3 - tryb 256-kolorowy"
 
-#: src/config/options.inc:651
+#: src/config/options.inc:652
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3346,7 +3348,7 @@ msgstr ""
 " 1 - tryb 16-kolorowy\n"
 " 2 - tryb 88-kolorowy"
 
-#: src/config/options.inc:659
+#: src/config/options.inc:660
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3360,7 +3362,7 @@ msgstr ""
 " 1 - tryb 16-kolorowy\n"
 " 2 - tryb 256-kolorowy"
 
-#: src/config/options.inc:667
+#: src/config/options.inc:668
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3372,34 +3374,98 @@ msgstr ""
 " 0 - tryb monochromatyczny\n"
 " 1 - tryb 16-kolorowy"
 
-#: src/config/options.inc:673
+#: src/config/options.inc:675
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is 256 color mode\n"
+"4 is true color mode"
+msgstr ""
+"Tryb koloru dla zrzutów:\n"
+"-1 - tryb standardowy\n"
+" 0 - tryb monochromatyczny\n"
+" 1 - tryb 16-kolorowy\n"
+" 2 - tryb 88-kolorowy\n"
+" 3 - tryb 256-kolorowy\n"
+" 4 - tryb koloru 24-bitowy"
+
+#: src/config/options.inc:685
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is true color mode"
+msgstr ""
+"Tryb koloru dla zrzutów:\n"
+"-1 - tryb standardowy\n"
+" 0 - tryb monochromatyczny\n"
+" 1 - tryb 16-kolorowy\n"
+" 2 - tryb 88-kolorowy\n"
+" 3 - tryb koloru 24-bitowy"
+
+#: src/config/options.inc:694
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 256 color mode\n"
+"3 is true color mode"
+msgstr ""
+"Tryb koloru dla zrzutów:\n"
+"-1 - tryb standardowy\n"
+" 0 - tryb monochromatyczny\n"
+" 1 - tryb 16-kolorowy\n"
+" 2 - tryb 88-kolorowy\n"
+" 3 - tryb koloru 24-bitowy"
+
+#: src/config/options.inc:703
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is true color mode"
+msgstr ""
+"Tryb koloru dla zrzutów:\n"
+"-1 - tryb standardowy\n"
+" 0 - tryb monochromatyczny\n"
+" 1 - tryb 16-kolorowy\n"
+" 2 - tryb koloru 24-bitowy"
+
+#: src/config/options.inc:709
 msgid "Footer"
 msgstr "Stopka"
 
-#: src/config/options.inc:675
+#: src/config/options.inc:711
 #, c-format
 msgid "Footer string used in dumps. %u is substituted by URL."
 msgstr "Łańcuch stopki używany przy zrzutach. %u jest zastępowane przez URL."
 
-#: src/config/options.inc:679
+#: src/config/options.inc:715
 #, c-format
 msgid "Header string used in dumps. %u is substituted by URL."
 msgstr "Łańcuch nagłówka używany przy zrzutach. %u jest zastępowane przez URL."
 
 #
-#: src/config/options.inc:681
+#: src/config/options.inc:717
 msgid "Numbering"
 msgstr "Numerowanie"
 
-#: src/config/options.inc:683
+#: src/config/options.inc:719
 msgid "Whether to print link numbers in dump output."
 msgstr "Czy wypisywać numery odnośników przy zrzutach."
 
-#: src/config/options.inc:685
+#: src/config/options.inc:721
 msgid "References"
 msgstr "Referencje"
 
-#: src/config/options.inc:687
+#: src/config/options.inc:723
 msgid ""
 "Whether to print references (URIs) of document links\n"
 "in dump output."
@@ -3407,92 +3473,92 @@ msgstr ""
 "Czy wypisywać referencje (URI) odnośników dokumentu\n"
 "przy zrzutach."
 
-#: src/config/options.inc:690
+#: src/config/options.inc:726
 msgid "Separator"
 msgstr "Separator"
 
-#: src/config/options.inc:692
+#: src/config/options.inc:728
 msgid "String which separates two dumps."
 msgstr "Łańcuch, który rozdziela dwa zrzuty."
 
-#: src/config/options.inc:694
+#: src/config/options.inc:730
 msgid "Width"
 msgstr "Szerokość"
 
-#: src/config/options.inc:696
+#: src/config/options.inc:732
 msgid "Width of screen in characters when dumping documents."
 msgstr "Szerokość ekranu w znakach przy zrzutach dokumentów."
 
 #
-#: src/config/options.inc:700
+#: src/config/options.inc:736
 msgid "History"
 msgstr "Historia"
 
-#: src/config/options.inc:702
+#: src/config/options.inc:738
 msgid "History options."
 msgstr "Ustawienia dotyczące historii."
 
 #
-#: src/config/options.inc:704
+#: src/config/options.inc:740
 msgid "Keep unhistory"
 msgstr "Zapamiętuj historię powrotów"
 
-#: src/config/options.inc:706
+#: src/config/options.inc:742
 msgid "Keep unhistory (\"forward history\")."
 msgstr "Czy pamiętać historię powrotów."
 
 #
-#: src/config/options.inc:709
+#: src/config/options.inc:745
 msgid "HTML rendering"
 msgstr "Formatowanie HTML-a"
 
-#: src/config/options.inc:711
+#: src/config/options.inc:747
 msgid "Options concerning the display of HTML pages."
 msgstr "Ustawienia dotyczące wyświetlania stron HTML."
 
 #
-#: src/config/options.inc:713
+#: src/config/options.inc:749
 msgid "Display frames"
 msgstr "Wyświetlanie ramek"
 
 #
-#: src/config/options.inc:715
+#: src/config/options.inc:751
 msgid "Display frames."
 msgstr "Wyświetlaj ramki."
 
 #
-#: src/config/options.inc:717
+#: src/config/options.inc:753
 msgid "Display tables"
 msgstr "Wyświetlanie tabel"
 
 #
-#: src/config/options.inc:719
+#: src/config/options.inc:755
 msgid "Display tables."
 msgstr "Wyświetlaj tabele."
 
 #
-#: src/config/options.inc:721
+#: src/config/options.inc:757
 msgid "Display subscripts"
 msgstr "Wyświetlanie indeksów dolnych"
 
-#: src/config/options.inc:723
+#: src/config/options.inc:759
 msgid "Display subscripts (as [thing])."
 msgstr "Pokazuj indeks dolny (jako [coś])."
 
 #
-#: src/config/options.inc:725
+#: src/config/options.inc:761
 msgid "Display superscripts"
 msgstr "Wyświetlanie indeksów górnych"
 
-#: src/config/options.inc:727
+#: src/config/options.inc:763
 msgid "Display superscripts (as ^thing)."
 msgstr "Pokazuj indeks górny (jako ^coś)."
 
-#: src/config/options.inc:729
+#: src/config/options.inc:765
 msgid "Rendering of html link element"
 msgstr "Wyświetlanie elementu odnośnika html"
 
-#: src/config/options.inc:731
+#: src/config/options.inc:767
 msgid ""
 "How to render <link> tags from the HTML header:\n"
 "0 is nothing\n"
@@ -3510,19 +3576,19 @@ msgstr ""
 "4 - dodatkowo typ\n"
 "5 - wszystko"
 
-#: src/config/options.inc:739
+#: src/config/options.inc:775
 msgid "Underline links"
 msgstr "Podkreślanie odnośników"
 
-#: src/config/options.inc:741
+#: src/config/options.inc:777
 msgid "Underline links."
 msgstr "Podkreślaj odnośniki."
 
-#: src/config/options.inc:743
+#: src/config/options.inc:779
 msgid "Wrap non breaking space"
 msgstr "Zawijanie nie łamiących spacji"
 
-#: src/config/options.inc:745
+#: src/config/options.inc:781
 msgid ""
 "If set do not honour non breaking space (the nbsp entity)\n"
 "but allow to wrap the text. This can help keeping the width\n"
@@ -3533,37 +3599,37 @@ msgstr ""
 "szerokość dokumentów tak, żeby nie było potrzebne przewijanie w poziomie."
 
 #
-#: src/config/options.inc:750
+#: src/config/options.inc:786
 msgid "Plain rendering"
 msgstr "Formatowanie zwykłego tekstu"
 
-#: src/config/options.inc:752
+#: src/config/options.inc:788
 msgid "Options concerning the display of plain text pages."
 msgstr "Ustawienia dotyczące wyświetlania zwykłego tekstu."
 
-#: src/config/options.inc:754
+#: src/config/options.inc:790
 msgid "Display URIs"
 msgstr "Wyświetlanie URI"
 
-#: src/config/options.inc:756
+#: src/config/options.inc:792
 msgid "Display URIs in the document as links."
 msgstr "Wyświetlanie URI w dokumencie jako odnośników."
 
-#: src/config/options.inc:758
+#: src/config/options.inc:794
 msgid "Compress empty lines"
 msgstr "Usuwanie pustych linii"
 
-#: src/config/options.inc:760
+#: src/config/options.inc:796
 msgid "Compress successive empty lines to only one in displayed text."
 msgstr ""
 "Usuwaj następne puste linie, tak żeby tylko jedna pusta linia była "
 "wyświetlana."
 
-#: src/config/options.inc:763
+#: src/config/options.inc:799
 msgid "URI passing"
 msgstr "Przekazywanie URI"
 
-#: src/config/options.inc:765
+#: src/config/options.inc:801
 msgid ""
 "Rules for passing URIs to external commands. When one rule\n"
 "is defined the link and tab menu will have a menu item that\n"
@@ -3587,7 +3653,7 @@ msgstr ""
 "przez dowiązanie akcji do klawiatury dla frame-external-command,\n"
 "link-external-command i tab-external-command."
 
-#: src/config/options.inc:778
+#: src/config/options.inc:814
 msgid ""
 "A rule for passing URI to an external command.\n"
 "The format is:\n"
@@ -3602,19 +3668,19 @@ msgstr ""
 "Nie dodawaj apostrofów lub cudzysłowiów wokół %c."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:788
+#: src/config/options.inc:824
 msgid "Information files"
 msgstr "Pliki informacyjne"
 
-#: src/config/options.inc:790
+#: src/config/options.inc:826
 msgid "Options for information files in ~/.elinks."
 msgstr "Ustawienia plików informacyjnych w ~/.elinks."
 
-#: src/config/options.inc:792
+#: src/config/options.inc:828
 msgid "Save interval"
 msgstr "Przedział czasu pomiędzy automatycznymi zapisami"
 
-#: src/config/options.inc:794
+#: src/config/options.inc:830
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
 "to be saved to disk if they has changed (seconds; 0 to disable)"
@@ -3622,11 +3688,11 @@ msgstr ""
 "Przedział czasu po krórym w razie potrzeby następuje zapis\n"
 "plików informacyjnych w ~/.elinks (w sekundach: 0 aby wyłączyć)"
 
-#: src/config/options.inc:797
+#: src/config/options.inc:833
 msgid "Use secure file saving"
 msgstr "Używanie bezpiecznego zapisu plików"
 
-#: src/config/options.inc:799
+#: src/config/options.inc:835
 msgid ""
 "First write data to unique temporary file, then rename this file\n"
 "upon successfully finishing this. Note that this relates only to\n"
@@ -3648,11 +3714,11 @@ msgstr ""
 "by docelowy plik nie istniał, gdy rename() jest wywoływane,\n"
 "łamiąc atomowość i redukując pewność zapisu."
 
-#: src/config/options.inc:808
+#: src/config/options.inc:844
 msgid "Use fsync(3) with secure file saving"
 msgstr "Używanie fsync(3) przy bezpiecznym zapisie plików"
 
-#: src/config/options.inc:810
+#: src/config/options.inc:846
 msgid ""
 "When using secure file saving, call fsync(3), if the OS\n"
 "supports it, to force the OS immediately to write the data\n"
@@ -3666,21 +3732,21 @@ msgstr ""
 
 #
 #. Keep options in alphabetical order.
-#: src/config/options.inc:819
+#: src/config/options.inc:855
 msgid "Terminals"
 msgstr "Terminale"
 
 #
-#: src/config/options.inc:821
+#: src/config/options.inc:857
 msgid "Terminal options."
 msgstr "Ustawienia terminala."
 
-#: src/config/options.inc:825
+#: src/config/options.inc:861
 msgid "Options specific to this terminal type (according to $TERM value)."
 msgstr ""
 "Ustawienia specyficzne dla danego typu terminala (nawiązując do $TERM)."
 
-#: src/config/options.inc:829
+#: src/config/options.inc:865
 msgid ""
 "Terminal type; matters mostly only when drawing frames and\n"
 "dialog box borders:\n"
@@ -3698,11 +3764,11 @@ msgstr ""
 "3 - KOI-8\n"
 "4 - FreeBSD"
 
-#: src/config/options.inc:837 src/dialogs/options.c:213
+#: src/config/options.inc:873 src/dialogs/options.c:227
 msgid "Switch fonts for line drawing"
 msgstr "Zmiana fontu do rysowania linii"
 
-#: src/config/options.inc:839
+#: src/config/options.inc:875
 msgid ""
 "Switch fonts when drawing lines, enabling both local characters\n"
 "and lines working at the same time. Makes sense only with linux\n"
@@ -3711,11 +3777,11 @@ msgstr ""
 "Zmienia font podczas rysowania linii, włączając oba zestawy\n"
 "znaków. Ma sens jedynie na linuksowym terminalu."
 
-#: src/config/options.inc:843 src/dialogs/options.c:218
+#: src/config/options.inc:879 src/dialogs/options.c:232
 msgid "UTF-8 I/O"
 msgstr "I/O w UTF-8"
 
-#: src/config/options.inc:845
+#: src/config/options.inc:881
 msgid ""
 "Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
 "only the subset of UTF8 according to terminal codepage is used."
@@ -3724,11 +3790,11 @@ msgstr ""
 "jedynie podzbiór UTF8 jest używany w zależności od używanej\n"
 "strony kodowej."
 
-#: src/config/options.inc:848 src/dialogs/options.c:214
+#: src/config/options.inc:884 src/dialogs/options.c:228
 msgid "Restrict frames in cp850/852"
 msgstr "Ogranicz ramki w cp850/852"
 
-#: src/config/options.inc:850
+#: src/config/options.inc:886
 msgid ""
 "Restrict the characters used when drawing lines. Makes sense\n"
 "only with linux terminals using the cp850/852 character sets."
@@ -3737,11 +3803,11 @@ msgstr ""
 "z terminalami linuksowymi używającymi stron kodowych cp850/852."
 
 #
-#: src/config/options.inc:853 src/dialogs/options.c:215
+#: src/config/options.inc:889 src/dialogs/options.c:229
 msgid "Block cursor"
 msgstr "Kursor blokowy"
 
-#: src/config/options.inc:855
+#: src/config/options.inc:891
 msgid ""
 "Move cursor to bottom right corner when done drawing.\n"
 "This is particularly useful when we have a block cursor,\n"
@@ -3751,26 +3817,28 @@ msgstr ""
 "rysowania. Jest to szczególnie użyteczne z kursorem\n"
 "blokowym, tekst z inwersją jest wyświetlany poprawnie."
 
-#: src/config/options.inc:861
+#: src/config/options.inc:897
 msgid ""
 "The color mode controls what colors are used and how they are\n"
 "output to the terminal. The color modes are:\n"
 "0 is mono mode, only 2 colors are used\n"
 "1 is 16 color mode, uses the common ANSI colors\n"
-"2 is 256 color mode, uses XTerm RGB codes"
+"2 is 256 color mode, uses XTerm RGB codes\n"
+"3 is true color mode, uses konsole RGB codes."
 msgstr ""
 "Tryb kolorowy kontroluje, które kolory są używane i w jaki\n"
 "sposób są wyświetlane na terminalu. Możliwe do użycia tryby\n"
 "kolorowe to:\n"
 "0 - tryb monochromatyczny\n"
 "1 - tryb 16 kolorowy, używa standardowych kolorów ANSI\n"
-"2 - tryb 256 kolorowy, używa kodów RGB xterma"
+"2 - tryb 256 kolorowy, używa kodów RGB xterma\n"
+"3 - tryb koloru 24-bitowy, używa kodów RGB konsole."
 
-#: src/config/options.inc:867 src/dialogs/options.c:216
+#: src/config/options.inc:904 src/dialogs/options.c:230
 msgid "Transparency"
 msgstr "Przezroczystość"
 
-#: src/config/options.inc:869
+#: src/config/options.inc:906
 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"
@@ -3785,11 +3853,11 @@ msgstr ""
 "Wiedz, że to ustawienie ma sens jedynie, gdy używanie\n"
 "kolorów jest włączone."
 
-#: src/config/options.inc:877
+#: src/config/options.inc:914
 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:881
+#: src/config/options.inc:918
 msgid ""
 "Codepage of charset used for displaying content on terminal.\n"
 "'System' stands for a codepage determined by a selected locale."
@@ -3798,347 +3866,347 @@ msgstr ""
 "'System' oznacza iż zostanie okreslona przez wybrane locale."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:888
+#: src/config/options.inc:925
 msgid "User interface"
 msgstr "Interfejs użytkownika"
 
 #
-#: src/config/options.inc:890
+#: src/config/options.inc:927
 msgid "User interface options."
 msgstr "Ustawienia interfejsu użytkownika."
 
-#: src/config/options.inc:894
+#: src/config/options.inc:931
 msgid "Color settings"
 msgstr "Ustawienia kolorów"
 
-#: src/config/options.inc:896
+#: src/config/options.inc:933
 msgid "Default user interface color settings."
 msgstr "Domyślne ustawienia kolorów interfejsu użytkownika."
 
 #
-#: src/config/options.inc:923
+#: src/config/options.inc:960
 msgid "Color terminals"
 msgstr "Kolorowe terminale"
 
-#: src/config/options.inc:925
+#: src/config/options.inc:962
 msgid "Color settings for color terminal."
 msgstr "Ustawienia kolorów dla kolorowych terminali."
 
-#: src/config/options.inc:927
+#: src/config/options.inc:964
 msgid "Non-color terminals"
 msgstr "Terminale monochromatyczne"
 
-#: src/config/options.inc:929
+#: src/config/options.inc:966
 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:932
+#: src/config/options.inc:969
 msgid "Main menu bar"
 msgstr "Pasek menu głównego"
 
-#: src/config/options.inc:934
+#: src/config/options.inc:971
 msgid "Main menu bar colors."
 msgstr "Kolory głównego paska menu."
 
-#: src/config/options.inc:936
+#: src/config/options.inc:973
 msgid "Unselected main menu bar item"
 msgstr "Pasek niewybranego elementu menu"
 
-#: src/config/options.inc:938
+#: src/config/options.inc:975
 msgid "Unselected main menu bar item colors."
 msgstr "Kolory dla paska niewybranego elementu menu."
 
-#: src/config/options.inc:940
+#: src/config/options.inc:977
 msgid "Selected main menu bar item"
 msgstr "Pasek wybranego elementu menu"
 
-#: src/config/options.inc:942
+#: src/config/options.inc:979
 msgid "Selected main menu bar item colors."
 msgstr "Kolory dla paska wybranego elementu menu."
 
-#: src/config/options.inc:944 src/config/options.inc:973
+#: src/config/options.inc:981 src/config/options.inc:1010
 msgid "Hotkey"
 msgstr "Klawisz skrótu"
 
-#: src/config/options.inc:946
+#: src/config/options.inc:983
 msgid "Main menu hotkey colors."
 msgstr "Kolory klawiszy skrótu głównego paska menu."
 
-#: src/config/options.inc:948 src/config/options.inc:977
+#: src/config/options.inc:985 src/config/options.inc:1014
 msgid "Unselected hotkey"
 msgstr "Niewybrany klawisz skrótu"
 
-#: src/config/options.inc:950
+#: src/config/options.inc:987
 msgid "Main menu unselected hotkey colors."
 msgstr "Kolory niewybranych klawiszy skrótu głównego menu."
 
 #
-#: src/config/options.inc:952 src/config/options.inc:981
+#: src/config/options.inc:989 src/config/options.inc:1018
 msgid "Selected hotkey"
 msgstr "Wybrany klawisz skrótu"
 
-#: src/config/options.inc:954
+#: src/config/options.inc:991
 msgid "Main menu selected hotkey colors."
 msgstr "Kolory wybranych klawiszy skrótu głównego menu."
 
-#: src/config/options.inc:957
+#: src/config/options.inc:994
 msgid "Menu bar"
 msgstr "Pasek menu"
 
-#: src/config/options.inc:959
+#: src/config/options.inc:996
 msgid "Menu bar colors."
 msgstr "Kolory paska menu."
 
-#: src/config/options.inc:961
+#: src/config/options.inc:998
 msgid "Unselected menu item"
 msgstr "Niewybrane elementy menu"
 
-#: src/config/options.inc:963
+#: src/config/options.inc:1000
 msgid "Unselected menu item colors."
 msgstr "Kolory niewybranego elementu menu."
 
 #
-#: src/config/options.inc:965
+#: src/config/options.inc:1002
 msgid "Selected menu item"
 msgstr "Podświetlone elementy menu"
 
-#: src/config/options.inc:967
+#: src/config/options.inc:1004
 msgid "Selected menu item colors."
 msgstr "Kolory wybranych elementów menu."
 
 #
-#: src/config/options.inc:969
+#: src/config/options.inc:1006
 msgid "Marked menu item"
 msgstr "Podświetlone elementy menu"
 
-#: src/config/options.inc:971
+#: src/config/options.inc:1008
 msgid "Marked menu item colors."
 msgstr "Kolory podświetlonych elementów menu."
 
-#: src/config/options.inc:975
+#: src/config/options.inc:1012
 msgid "Menu item hotkey colors."
 msgstr "Kolory klawiszy skrótu menu."
 
-#: src/config/options.inc:979
+#: src/config/options.inc:1016
 msgid "Menu item unselected hotkey colors."
 msgstr "Kolory niewybranych klawiszy skrótu menu."
 
-#: src/config/options.inc:983
+#: src/config/options.inc:1020
 msgid "Menu item selected hotkey colors."
 msgstr "Kolory wybranych klawiszy skrótu menu."
 
 #
-#: src/config/options.inc:985
+#: src/config/options.inc:1022
 msgid "Menu frame"
 msgstr "Ramka menu"
 
-#: src/config/options.inc:987
+#: src/config/options.inc:1024
 msgid "Menu frame colors."
 msgstr "Kolory ramki menu."
 
-#: src/config/options.inc:990
+#: src/config/options.inc:1027
 msgid "Dialog"
 msgstr "Okno dialogowe"
 
-#: src/config/options.inc:992
+#: src/config/options.inc:1029
 msgid "Dialog colors."
 msgstr "Kolory okna dialogowego."
 
-#: src/config/options.inc:1002
+#: src/config/options.inc:1039
 msgid "Generic"
 msgstr "Zwykłe"
 
-#: src/config/options.inc:1004
+#: src/config/options.inc:1041
 msgid "Generic dialog colors."
 msgstr "Zwykłe kolory okienka dialogowego."
 
 #
-#: src/config/options.inc:1006
+#: src/config/options.inc:1043
 msgid "Frame"
 msgstr "Ramka"
 
-#: src/config/options.inc:1008
+#: src/config/options.inc:1045
 msgid "Dialog frame colors."
 msgstr "Kolory ramki okna dialogowego."
 
-#: src/config/options.inc:1010
+#: src/config/options.inc:1047
 msgid "Scrollbar"
 msgstr "Pasek przewijania"
 
-#: src/config/options.inc:1012
+#: src/config/options.inc:1049
 msgid "Scrollbar colors."
 msgstr "Kolory paska przewijania."
 
-#: src/config/options.inc:1014
+#: src/config/options.inc:1051
 msgid "Selected scrollbar"
 msgstr "Wybrany pasek przewijania"
 
-#: src/config/options.inc:1016
+#: src/config/options.inc:1053
 msgid "Scrollbar selected colors."
 msgstr "Kolory wybranego paska przewijania."
 
-#: src/config/options.inc:1020
+#: src/config/options.inc:1057
 msgid "Dialog title colors."
 msgstr "Kolory tytułu okna dialogowego."
 
 #
-#: src/config/options.inc:1022
+#: src/config/options.inc:1059
 msgid "Text"
 msgstr "Tekst"
 
-#: src/config/options.inc:1024
+#: src/config/options.inc:1061
 msgid "Dialog text colors."
 msgstr "Kolory tekstu w oknie dialogowym."
 
-#: src/config/options.inc:1026 src/viewer/text/form.c:1780
+#: src/config/options.inc:1063 src/viewer/text/form.c:1780
 msgid "Checkbox"
 msgstr "Przycisk wyboru"
 
-#: src/config/options.inc:1028
+#: src/config/options.inc:1065
 msgid "Dialog checkbox colors."
 msgstr "Kolory przycisku wyboru."
 
 #
-#: src/config/options.inc:1030
+#: src/config/options.inc:1067
 msgid "Selected checkbox"
 msgstr "Wybrany przycisk wyboru"
 
-#: src/config/options.inc:1032
+#: src/config/options.inc:1069
 msgid "Dialog selected checkbox colors."
 msgstr "Kolory wybranego przycisku wyboru."
 
 #
-#: src/config/options.inc:1034
+#: src/config/options.inc:1071
 msgid "Checkbox label"
 msgstr "Etykieta przycisku wyboru"
 
-#: src/config/options.inc:1036
+#: src/config/options.inc:1073
 msgid "Dialog checkbox label colors."
 msgstr "Kolory etykiety przycisku wyboru."
 
-#: src/config/options.inc:1038
+#: src/config/options.inc:1075
 msgid "Button"
 msgstr "Przycisk"
 
-#: src/config/options.inc:1040 src/config/options.inc:1048
+#: src/config/options.inc:1077 src/config/options.inc:1085
 msgid "Dialog button colors."
 msgstr "Kolory przycisku."
 
 #
-#: src/config/options.inc:1042
+#: src/config/options.inc:1079
 msgid "Selected button"
 msgstr "Wybrany przycisk"
 
-#: src/config/options.inc:1044 src/config/options.inc:1052
+#: src/config/options.inc:1081 src/config/options.inc:1089
 msgid "Dialog selected button colors."
 msgstr "Kolory wybranego przycisku."
 
-#: src/config/options.inc:1046
+#: src/config/options.inc:1083
 msgid "Button shortcut"
 msgstr "Klawisz skrótu przycisku"
 
 #
-#: src/config/options.inc:1050
+#: src/config/options.inc:1087
 msgid "Selected button shortcut"
 msgstr "Klawisz skrótu wybranego przycisku"
 
-#: src/config/options.inc:1054 src/viewer/text/form.c:1784
+#: src/config/options.inc:1091 src/viewer/text/form.c:1784
 msgid "Text field"
 msgstr "Pole tekstowe"
 
-#: src/config/options.inc:1056
+#: src/config/options.inc:1093
 msgid "Dialog text field colors."
 msgstr "Kolory pola tekstowego."
 
 #
-#: src/config/options.inc:1058
+#: src/config/options.inc:1095
 msgid "Text field text"
 msgstr "Tekst w polu tekstowym"
 
-#: src/config/options.inc:1060
+#: src/config/options.inc:1097
 msgid "Dialog field text colors."
 msgstr "Kolory tekstu w polu tekstowym."
 
-#: src/config/options.inc:1062
+#: src/config/options.inc:1099
 msgid "Meter"
 msgstr "Licznik"
 
-#: src/config/options.inc:1064
+#: src/config/options.inc:1101
 msgid "Dialog meter colors."
 msgstr "Kolory licznika."
 
-#: src/config/options.inc:1066
+#: src/config/options.inc:1103
 msgid "Shadow"
 msgstr "Cień"
 
-#: src/config/options.inc:1068
+#: src/config/options.inc:1105
 msgid "Dialog shadow colors (see ui.shadows option)."
 msgstr "Kolory cienia (zobacz opcję ui.shadows)."
 
 #
-#: src/config/options.inc:1070
+#: src/config/options.inc:1107
 msgid "Title bar"
 msgstr "Pasek tytułowy"
 
-#: src/config/options.inc:1072
+#: src/config/options.inc:1109
 msgid "Title bar colors."
 msgstr "Kolory paska tytułowego."
 
-#: src/config/options.inc:1074
+#: src/config/options.inc:1111
 msgid "Generic title bar"
 msgstr "Zwykły pasek tytułowy"
 
-#: src/config/options.inc:1076
+#: src/config/options.inc:1113
 msgid "Generic title bar colors."
 msgstr "Kolory zwykłego paska tytułowego."
 
-#: src/config/options.inc:1078
+#: src/config/options.inc:1115
 msgid "Title bar text"
 msgstr "Tekst na pasku tytułowym"
 
-#: src/config/options.inc:1080
+#: src/config/options.inc:1117
 msgid "Title bar text colors."
 msgstr "Kolory tekstu na pasku tytułowym."
 
-#: src/config/options.inc:1083
+#: src/config/options.inc:1120
 msgid "Status bar"
 msgstr "Pasek statusu"
 
-#: src/config/options.inc:1085
+#: src/config/options.inc:1122
 msgid "Status bar colors."
 msgstr "Kolory paska statusu."
 
-#: src/config/options.inc:1087
+#: src/config/options.inc:1124
 msgid "Generic status bar"
 msgstr "Zwykły pasek statusu"
 
-#: src/config/options.inc:1089
+#: src/config/options.inc:1126
 msgid "Generic status bar colors."
 msgstr "Kolory zwykłego paska statusu."
 
 #
-#: src/config/options.inc:1091
+#: src/config/options.inc:1128
 msgid "Status bar text"
 msgstr "Tekst na pasku statusu"
 
-#: src/config/options.inc:1093
+#: src/config/options.inc:1130
 msgid "Status bar text colors."
 msgstr "Kolory tekstu na pasku statusu."
 
-#: src/config/options.inc:1096
+#: src/config/options.inc:1133
 msgid "Tabs bar"
 msgstr "Pasek kart"
 
-#: src/config/options.inc:1098
+#: src/config/options.inc:1135
 msgid "Tabs bar colors."
 msgstr "Kolory paska kart."
 
-#: src/config/options.inc:1100
+#: src/config/options.inc:1137
 msgid "Unvisited tab"
 msgstr "Nieodwiedzana karta"
 
-#: src/config/options.inc:1102
+#: src/config/options.inc:1139
 msgid ""
 "Tab colors for tabs that have not been\n"
 "selected since they completed loading."
@@ -4146,44 +4214,44 @@ msgstr ""
 "Kolory karty dla kart, które nie zostały\n"
 "wybrane od zakończenia ładowania."
 
-#: src/config/options.inc:1105
+#: src/config/options.inc:1142
 msgid "Unselected tab"
 msgstr "Niewybrana karta"
 
-#: src/config/options.inc:1107
+#: src/config/options.inc:1144
 msgid "Unselected tab colors."
 msgstr "Kolory niewybranych kart."
 
-#: src/config/options.inc:1109
+#: src/config/options.inc:1146
 msgid "Loading tab"
 msgstr "Karta, do której wczytywany jest dokument"
 
-#: src/config/options.inc:1111
+#: src/config/options.inc:1148
 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:1113
+#: src/config/options.inc:1150
 msgid "Selected tab"
 msgstr "Wybrana karta"
 
-#: src/config/options.inc:1115
+#: src/config/options.inc:1152
 msgid "Selected tab colors."
 msgstr "Kolory wybranej karty."
 
-#: src/config/options.inc:1117
+#: src/config/options.inc:1154
 msgid "Tab separator"
 msgstr "Separator kart"
 
-#: src/config/options.inc:1119
+#: src/config/options.inc:1156
 msgid "Tab separator colors."
 msgstr "Kolory separatora kart."
 
-#: src/config/options.inc:1122
+#: src/config/options.inc:1159
 msgid "Searched strings"
 msgstr "Szukane łańcuchy"
 
-#: src/config/options.inc:1124
+#: src/config/options.inc:1161
 msgid "Searched string highlight colors."
 msgstr "Kolory podświetlenia szukanych łańcuchów."
 
@@ -4191,19 +4259,19 @@ msgstr "Kolory pod
 #. ============= BORING PART (colors) END ===================
 #. ==========================================================
 #. Keep options in alphabetical order.
-#: src/config/options.inc:1133
+#: src/config/options.inc:1170
 msgid "Dialog settings"
 msgstr "Ustawienia okien dialogowych"
 
-#: src/config/options.inc:1135
+#: src/config/options.inc:1172
 msgid "Dialogs-specific appearance and behaviour settings."
 msgstr "Ustawienia dotyczące wyglądu i zachowania okien dialogowych."
 
-#: src/config/options.inc:1138
+#: src/config/options.inc:1175
 msgid "Minimal height of listbox widget"
 msgstr "Minimalna wysokość listy wyboru"
 
-#: src/config/options.inc:1140
+#: src/config/options.inc:1177
 msgid ""
 "Minimal height of the listbox widget (used e.g. for bookmarks\n"
 "or global history)."
@@ -4211,11 +4279,11 @@ msgstr ""
 "Minimalna wysokość listy wyboru (używanej np. przy zakładkach\n"
 "czy globalnej historii)."
 
-#: src/config/options.inc:1143
+#: src/config/options.inc:1180
 msgid "Drop shadows"
 msgstr "Rzucanie cienia"
 
-#: src/config/options.inc:1145
+#: src/config/options.inc:1182
 msgid ""
 "Make dialogs drop shadows (the shadows are solid, you can\n"
 "adjust their color by ui.colors.*.dialog.shadow). You may\n"
@@ -4226,11 +4294,11 @@ msgstr ""
 "ui.colors.*.dialog.shadow). Możesz też wyeliminować szerokie\n"
 "obrzeża przez dostosowanie pliku setup.h."
 
-#: src/config/options.inc:1149
+#: src/config/options.inc:1186
 msgid "Underline menu hotkeys"
 msgstr "Podkreślanie klawiszy skrótu menu"
 
-#: src/config/options.inc:1151
+#: src/config/options.inc:1188
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4238,11 +4306,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:1154
+#: src/config/options.inc:1191
 msgid "Underline button shortcuts"
 msgstr "Podkreślanie klawiszy skrótu przycisku"
 
-#: src/config/options.inc:1156
+#: src/config/options.inc:1193
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4251,11 +4319,11 @@ msgstr ""
 "widoczne? Wymaga włączenia podkreślania dla terminala."
 
 #
-#: src/config/options.inc:1160
+#: src/config/options.inc:1197
 msgid "Timer options"
 msgstr "Ustawienia stopera"
 
-#: src/config/options.inc:1162
+#: src/config/options.inc:1199
 msgid ""
 "Timed action after certain interval of user inactivity. Someone can\n"
 "even find this useful, although you may not believe that."
@@ -4263,7 +4331,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:1168
+#: src/config/options.inc:1205
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4275,7 +4343,7 @@ msgstr ""
 "1 - odlicza, ale nie pokazuje stopera\n"
 "2 - odlicza i pokazuje stoper w pobliżu LEDów"
 
-#: src/config/options.inc:1175
+#: src/config/options.inc:1212
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4288,37 +4356,37 @@ msgstr ""
 "2 - odlicza i pokazuje stoper w pobliżu LEDów (WYŁĄCZONE)"
 
 #
-#: src/config/options.inc:1181
+#: src/config/options.inc:1218
 msgid "Duration"
 msgstr "Czas trwania"
 
-#: src/config/options.inc:1183
+#: src/config/options.inc:1220
 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:1188
+#: src/config/options.inc:1225
 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:1191
+#: src/config/options.inc:1228
 msgid "Window tabs"
 msgstr "Karty"
 
-#: src/config/options.inc:1193
+#: src/config/options.inc:1230
 msgid "Window tabs settings."
 msgstr "Ustawienia kart."
 
 #
-#: src/config/options.inc:1195
+#: src/config/options.inc:1232
 msgid "Display tabs bar"
 msgstr "Wyświetl pasek kart"
 
-#: src/config/options.inc:1197
+#: src/config/options.inc:1234
 msgid ""
 "Show tabs bar on the screen:\n"
 "0 means never\n"
@@ -4330,39 +4398,39 @@ msgstr ""
 "1 - tylko gdy więcej niż jedna karta jest otwarta\n"
 "2 - zawsze"
 
-#: src/config/options.inc:1202
+#: src/config/options.inc:1239
 msgid "Tab bar at top"
 msgstr "Pasek kart u góry"
 
-#: src/config/options.inc:1204
+#: src/config/options.inc:1241
 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:1206
+#: src/config/options.inc:1243
 msgid "Wrap-around tabs cycling"
 msgstr "Cykliczność kart"
 
-#: src/config/options.inc:1208
+#: src/config/options.inc:1245
 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:1211
+#: src/config/options.inc:1248
 msgid "Confirm tab closing"
 msgstr "Potwierdzenie zamknięcia karty"
 
-#: src/config/options.inc:1213
+#: src/config/options.inc:1250
 msgid "When closing a tab show confirmation dialog."
 msgstr "Przy zamykaniu karty pokazuj okienko dialogowe potwierdzania."
 
-#: src/config/options.inc:1217 src/config/opttypes.c:408
+#: src/config/options.inc:1254 src/config/opttypes.c:408
 msgid "Language"
 msgstr "Język"
 
-#: src/config/options.inc:1219
+#: src/config/options.inc:1256
 msgid ""
 "Language of user interface. 'System' means that the language will\n"
 "be extracted from the environment dynamically."
@@ -4371,37 +4439,37 @@ msgstr ""
 "zostanie uzyskany ze środowiska w sposób dynamiczny."
 
 #
-#: src/config/options.inc:1222
+#: src/config/options.inc:1259
 msgid "Display menu bar always"
 msgstr "Wyświetlanie paska tytułowego na stałe"
 
-#: src/config/options.inc:1224
+#: src/config/options.inc:1261
 msgid "Always show menu bar on the screen."
 msgstr "Zawsze pokazuj pasek tytułowy na ekranie."
 
 #
-#: src/config/options.inc:1226
+#: src/config/options.inc:1263
 msgid "Display status bar"
 msgstr "Wyświetlanie paska statusu"
 
-#: src/config/options.inc:1228
+#: src/config/options.inc:1265
 msgid "Show status bar on the screen."
 msgstr "Pokazuje pasek statusu na ekranie."
 
 #
-#: src/config/options.inc:1230
+#: src/config/options.inc:1267
 msgid "Display title bar"
 msgstr "Wyświetlanie paska tytułowego"
 
-#: src/config/options.inc:1232
+#: src/config/options.inc:1269
 msgid "Show title bar on the screen."
 msgstr "Pokazuje pasek tytułowy na ekranie."
 
-#: src/config/options.inc:1234
+#: src/config/options.inc:1271
 msgid "Display goto dialog in new tabs"
 msgstr "Wyświetlanie okienka \"goto\" w nowych kartach"
 
-#: src/config/options.inc:1236
+#: src/config/options.inc:1273
 msgid ""
 "Pop up goto dialog in newly created tabs when there's no homepage\n"
 "set. This means also showing goto dialog on startup."
@@ -4410,11 +4478,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:1239
+#: src/config/options.inc:1276
 msgid "Show a message box when file is saved successfully"
 msgstr "Pokazuj okienko dialogowe, gdy plik zostanie pomyślnie zapisany"
 
-#: src/config/options.inc:1241
+#: src/config/options.inc:1278
 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"
@@ -4424,27 +4492,27 @@ msgstr ""
 "te ustawienie zapewni, że pojawi się okienko potwierdzające\n"
 "pomyślne wykonanie operacji."
 
-#: src/config/options.inc:1246
+#: src/config/options.inc:1283
 msgid "Sessions"
 msgstr "Sesje"
 
-#: src/config/options.inc:1248
+#: src/config/options.inc:1285
 msgid "Sessions settings."
 msgstr "Ustawienia sesji."
 
-#: src/config/options.inc:1250
+#: src/config/options.inc:1287
 msgid "Keep session active"
 msgstr "Utrzymuj aktywną sesję"
 
-#: src/config/options.inc:1252
+#: src/config/options.inc:1289
 msgid "Keep the session active even if the last terminal exits."
 msgstr "Utrzymuj sesję nawet po zamknięciu ostatniego terminala."
 
-#: src/config/options.inc:1254
+#: src/config/options.inc:1291
 msgid "Auto save session"
 msgstr "Automatyczne zapisywanie sesji"
 
-#: src/config/options.inc:1256
+#: src/config/options.inc:1293
 msgid ""
 "Automatically save the session when quitting.\n"
 "This feature requires bookmark support."
@@ -4452,11 +4520,11 @@ msgstr ""
 "Automatycznie zapisuj sesję przy kończeniu działania.\n"
 "Wymagana jest obsługa zakładek."
 
-#: src/config/options.inc:1259
+#: src/config/options.inc:1296
 msgid "Auto restore session"
 msgstr "Automatyczne odtwarzanie sesji"
 
-#: src/config/options.inc:1261
+#: src/config/options.inc:1298
 msgid ""
 "Automatically restore the session at start.\n"
 "This feature requires bookmark support."
@@ -4464,11 +4532,11 @@ msgstr ""
 "Automatycznie odtwarzaj sesję na starcie.\n"
 "Wymagana jest obsługa zakładek."
 
-#: src/config/options.inc:1264
+#: src/config/options.inc:1301
 msgid "Auto save and restore session folder name"
 msgstr "Nazwa foldera do automatycznego zapisywania i odtwarzania sesji"
 
-#: src/config/options.inc:1266
+#: src/config/options.inc:1303
 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 +4547,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:1270
+#: src/config/options.inc:1307
 msgid "Homepage URI"
 msgstr "URI strony domowej"
 
-#: src/config/options.inc:1272
+#: src/config/options.inc:1309
 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"
@@ -4496,20 +4564,20 @@ msgstr ""
 "środowiskowej WWW_HOME powinna być użyta jako strona domowa."
 
 #
-#: src/config/options.inc:1278
+#: src/config/options.inc:1315
 msgid "Date format"
 msgstr "Format daty"
 
-#: src/config/options.inc:1280
+#: src/config/options.inc:1317
 msgid "Date format to use in dialogs. See strftime(3)."
 msgstr "Format daty używany w dialog. Zobacz strftime(3)."
 
 #
-#: src/config/options.inc:1283
+#: src/config/options.inc:1320
 msgid "Set window title"
 msgstr "Ustalenie tytułu okna"
 
-#: src/config/options.inc:1285
+#: src/config/options.inc:1322
 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"
@@ -5542,7 +5610,7 @@ msgid "Files:"
 msgstr "Pliki:"
 
 #. 2 '\n' + 1 '\0'
-#: src/dialogs/options.c:161
+#: src/dialogs/options.c:173
 #, c-format
 msgid ""
 "The environmental variable TERM is set to '%s'.\n"
@@ -5559,63 +5627,68 @@ msgstr ""
 "Pozwala to na konfigurację tych ustawień dla każdego z\n"
 "terminali, w których uruchamiasz ELinksa."
 
-#: src/dialogs/options.c:187
+#: src/dialogs/options.c:199
 msgid "Terminal options"
 msgstr "Opcje terminala"
 
-#: src/dialogs/options.c:196
+#: src/dialogs/options.c:208
 msgid "Frame handling:"
 msgstr "Rysowanie ramek:"
 
-#: src/dialogs/options.c:197
+#: src/dialogs/options.c:209
 msgid "No frames"
 msgstr "Brak ramek"
 
-#: src/dialogs/options.c:198
+#: src/dialogs/options.c:210
 msgid "VT 100 frames"
 msgstr "Ramki VT100"
 
-#: src/dialogs/options.c:199
+#: src/dialogs/options.c:211
 msgid "Linux or OS/2 frames"
 msgstr "Ramki typu Linux lub OS/2"
 
-#: src/dialogs/options.c:200
+#: src/dialogs/options.c:212
 msgid "FreeBSD frames"
 msgstr "Ramki FreeBSD"
 
-#: src/dialogs/options.c:201
+#: src/dialogs/options.c:213
 msgid "KOI8-R frames"
 msgstr "Ramki KOI8-R"
 
-#: src/dialogs/options.c:203
+#: src/dialogs/options.c:215
 msgid "Color mode:"
 msgstr "Tryb kolorowy:"
 
-#: src/dialogs/options.c:204
+#: src/dialogs/options.c:216
 msgid "No colors (mono)"
 msgstr "Brak kolorów (mono)"
 
-#: src/dialogs/options.c:205
+#: src/dialogs/options.c:217
 msgid "16 colors"
 msgstr "16 kolorów"
 
-#: src/dialogs/options.c:207
+#: src/dialogs/options.c:219
 msgid "88 colors"
 msgstr "88 kolorów"
 
-#: src/dialogs/options.c:210
+#: src/dialogs/options.c:222
 msgid "256 colors"
 msgstr "256 kolorów"
 
-#: src/dialogs/options.c:295
+#
+#: src/dialogs/options.c:225
+msgid "true color"
+msgstr "kolor 24-bitowy"
+
+#: src/dialogs/options.c:309
 msgid "Resize terminal"
 msgstr "Zmień rozmiar terminala"
 
-#: src/dialogs/options.c:298
+#: src/dialogs/options.c:312
 msgid "Width="
 msgstr "Szerokość="
 
-#: src/dialogs/options.c:299
+#: src/dialogs/options.c:313
 msgid "Height="
 msgstr "Wysokość="
 
@@ -8518,12 +8591,12 @@ msgstr "Ostrze
 msgid "Failed to create session."
 msgstr "Nie udało się utworzyć sesji."
 
-#: src/terminal/event.c:417
+#: src/terminal/event.c:437
 #, c-format
 msgid "Bad event %d"
 msgstr "Błędne zdarzenie %d"
 
-#: src/terminal/event.c:457
+#: src/terminal/event.c:477
 #, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Nie można odczytać zdarzenia: %d (%s)"

From 9d4b68a26b77e26a60918b3896217e665cc1703e Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 26 Aug 2006 20:03:30 +0200
Subject: [PATCH 075/132] Adjusted max values for true color dumps.

---
 src/config/options.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/config/options.inc b/src/config/options.inc
index 68eea6fe..9b34d4f7 100644
--- a/src/config/options.inc
+++ b/src/config/options.inc
@@ -671,7 +671,7 @@ static struct option_info config_options_info[] = {
 		"1 is 16 color mode")),
 #elif defined(CONFIG_88_COLORS) && defined(CONFIG_256_COLORS) && defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
-		"color_mode", 0, -1, 3, -1,
+		"color_mode", 0, -1, 4, -1,
 		N_("Color mode for dumps:\n"
 		"-1 is standard dump mode\n"
 		"0 is mono mode\n"
@@ -681,7 +681,7 @@ static struct option_info config_options_info[] = {
 		"4 is true color mode")),
 #elif defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) && defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
-		"color_mode", 0, -1, 2, -1,
+		"color_mode", 0, -1, 3, -1,
 		N_("Color mode for dumps:\n"
 		"-1 is standard dump mode\n"
 		"0 is mono mode\n"
@@ -690,7 +690,7 @@ static struct option_info config_options_info[] = {
 		"3 is true color mode")),
 #elif defined(CONFIG_256_COLORS) && !defined(CONFIG_88_COLORS) && defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
-		"color_mode", 0, -1, 2, -1,
+		"color_mode", 0, -1, 3, -1,
 		N_("Color mode for dumps:\n"
 		"-1 is standard dump mode\n"
 		"0 is mono mode\n"
@@ -699,7 +699,7 @@ static struct option_info config_options_info[] = {
 		"3 is true color mode")),
 #elif !defined(CONFIG_88_COLORS) && !defined(CONFIG_256_COLORS) && defined(CONFIG_TRUE_COLOR)
 	INIT_OPT_INT("document.dump", N_("Color mode"),
-		"color_mode", 0, -1, 1, -1,
+		"color_mode", 0, -1, 2, -1,
 		N_("Color mode for dumps:\n"
 		"-1 is standard dump mode\n"
 		"0 is mono mode\n"

From 9597d403eea3c22691eb355250f0bae383e4eefa Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 26 Aug 2006 20:04:09 +0200
Subject: [PATCH 076/132] True color mode dumps. TODO: UTF-8

---
 src/viewer/dump/dump.c | 139 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/src/viewer/dump/dump.c b/src/viewer/dump/dump.c
index aa9159d7..53847e69 100644
--- a/src/viewer/dump/dump.c
+++ b/src/viewer/dump/dump.c
@@ -55,6 +55,9 @@ static int dump_to_file_16(struct document *document, int fd);
 #if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
 static int dump_to_file_256(struct document *document, int fd);
 #endif
+#ifdef CONFIG_TRUE_COLOR
+static int dump_to_file_true_color(struct document *document, int fd);
+#endif
 
 /* This dumps the given @cached's source onto @fd nothing more. It returns 0 if it
  * all went fine and 1 if something isn't quite right and we should terminate
@@ -141,6 +144,11 @@ dump_formatted(int fd, struct download *download, struct cache_entry *cached)
 	case COLOR_MODE_256:
 		dump_to_file_256(formatted.document, fd);
 		break;
+#endif
+#ifdef CONFIG_TRUE_COLOR
+	case COLOR_MODE_TRUE_COLOR:
+		dump_to_file_true_color(formatted.document, fd);
+		break;
 #endif
 	default:
 		break;
@@ -701,6 +709,137 @@ fail:
 
 #endif /* defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS) */
 
+#ifdef CONFIG_TRUE_COLOR
+
+static int
+write_true_color(unsigned char *str, unsigned char *color, int fd, unsigned char *buf, int *bptr)
+{
+	unsigned char bufor[24];
+	unsigned char *data = bufor;
+
+	snprintf(bufor, 24, "\033[%s;2;%d;%d;%dm", str, color[0], color[1], color[2]);
+	while(*data) {
+		if (write_char(*data++, fd, buf, bptr)) return -1;
+	}
+	return 0;
+}
+
+static int
+dump_to_file_true_color(struct document *document, int fd)
+{
+	static unsigned char color[6] = {255, 255, 255, 0, 0, 0};
+	int y;
+	int bptr = 0;
+	unsigned char *buf = mem_alloc(D_BUF);
+	unsigned char *foreground = &color[0];
+	unsigned char *background = &color[3];
+	int width = get_opt_int("document.dump.width");
+
+	if (!buf) return -1;
+
+	for (y = 0; y < document->height; y++) {
+		int white = 0;
+		int x;
+		write_true_color("38", foreground, fd, buf, &bptr);
+		write_true_color("48", background, fd, buf, &bptr);
+
+		for (x = 0; x < document->data[y].length; x++) {
+			unsigned char c;
+			unsigned char attr = document->data[y].chars[x].attr;
+			unsigned char *new_foreground = &document->data[y].chars[x].color[0];
+			unsigned char *new_background = &document->data[y].chars[x].color[3];
+
+			if (memcmp(foreground, new_foreground, 3)) {
+				foreground = new_foreground;
+				if (write_true_color("38", foreground, fd, buf, &bptr))
+					goto fail;
+			}
+
+			if (memcmp(background, new_background, 3)) {
+				background = new_background;
+				if (write_true_color("48", background, fd, buf, &bptr))
+					goto fail;
+			}
+
+			c = document->data[y].chars[x].data;
+
+			if ((attr & SCREEN_ATTR_FRAME)
+			    && c >= 176 && c < 224)
+				c = frame_dumb[c - 176];
+
+			if (c <= ' ') {
+				/* Count spaces. */
+				white++;
+				continue;
+			}
+
+			/* Print spaces if any. */
+			while (white) {
+				if (write_char(' ', fd, buf, &bptr))
+					goto fail;
+				white--;
+			}
+
+			/* Print normal char. */
+			if (write_char(c, fd, buf, &bptr))
+				goto fail;
+		}
+		for (;x < width; x++) {
+			if (write_char(' ', fd, buf, &bptr))
+				goto fail;
+		}
+
+		/* Print end of line. */
+		if (write_char('\n', fd, buf, &bptr))
+			goto fail;
+	}
+
+	if (hard_write(fd, buf, bptr) != bptr) {
+fail:
+		mem_free(buf);
+		return -1;
+	}
+
+	if (document->nlinks && get_opt_bool("document.dump.references")) {
+		int x;
+		unsigned char *header = "\nReferences\n\n   Visible links\n";
+		int headlen = strlen(header);
+
+		if (hard_write(fd, header, headlen) != headlen)
+			goto fail;
+
+		for (x = 0; x < document->nlinks; x++) {
+			struct link *link = &document->links[x];
+			unsigned char *where = link->where;
+
+			if (!where) continue;
+
+			if (document->options.links_numbering) {
+				if (link->title && *link->title)
+					snprintf(buf, D_BUF, "%4d. %s\n\t%s\n",
+						 x + 1, link->title, where);
+				else
+					snprintf(buf, D_BUF, "%4d. %s\n",
+						 x + 1, where);
+			} else {
+				if (link->title && *link->title)
+					snprintf(buf, D_BUF, "   . %s\n\t%s\n",
+						 link->title, where);
+				else
+					snprintf(buf, D_BUF, "   . %s\n", where);
+			}
+
+			bptr = strlen(buf);
+			if (hard_write(fd, buf, bptr) != bptr)
+				goto fail;
+		}
+	}
+
+	mem_free(buf);
+	return 0;
+}
+
+#endif /* CONFIG_TRUE_COLOR */
 int
 dump_to_file(struct document *document, int fd)
 {

From 55212827c77225c1f92755ef6f0b1139a33e6da4 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 27 Aug 2006 09:56:06 +0300
Subject: [PATCH 077/132] Outdent labels as instructed in doc/hacking.txt.

Reported by Jonas Fonseca.

Also add an empty line above the label in init_tab; but there are
still several labels elsewhere that don't have empty lines above them.
---
 src/terminal/event.c | 2 +-
 src/terminal/tab.c   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/terminal/event.c b/src/terminal/event.c
index 55931789..79afd584 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -424,7 +424,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 			break;
 		}
 
-	invalid_utf_8_start_byte:
+invalid_utf_8_start_byte:
 		term_send_ucs(term, UCS_REPLACEMENT_CHARACTER, modifier);
 		break;
 	}
diff --git a/src/terminal/tab.c b/src/terminal/tab.c
index e6825b55..d5b82a3c 100644
--- a/src/terminal/tab.c
+++ b/src/terminal/tab.c
@@ -51,7 +51,8 @@ init_tab(struct terminal *term, void *data, window_handler_T handler)
 	 * above it if it were inactive, or below if it were active.  */
 	assert(term->main_menu == NULL);
 	pos = (struct window *) term->windows.prev;
- found_pos:
+
+found_pos:
 	add_at_pos(pos, win);
 
 	assert_window_stacking(term);

From 8850d8599815032390d508a0585f8ac05e27991c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 27 Aug 2006 11:45:11 +0300
Subject: [PATCH 078/132] ECMAScript: If accessKey is a surrogate, throw an
 error when reading it.

Surrogates are now treated the same way as out-of-range characters
like U+110000; if a link has such an access key, then the ECMAScript
accessKey property cannot be read.  It seems currently impossible to
set such an access key though, because accesskey_string_to_unicode()
doesn't support multibyte characters yet.
---
 src/document/document.h            |  4 +++-
 src/ecmascript/see/input.c         |  8 +++++---
 src/ecmascript/spidermonkey/form.c | 11 +++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/document/document.h b/src/document/document.h
index 466a9240..dd7b9685 100644
--- a/src/document/document.h
+++ b/src/document/document.h
@@ -231,7 +231,9 @@ void shrink_format_cache(int);
 extern struct module document_module;
 
 /* FIXME: support for entities and all Unicode characters.
- * For now, we only support simple printable character. */
+ * (Unpaired surrogates should be rejected, so that the ECMAScript
+ * interface can convert the access key to UTF-16.)
+ * For now, we only support simple printable character.  */
 #define accesskey_string_to_unicode(s) (((s)[0] && !(s)[1] && isprint((s)[0])) ? (s)[0] : 0)
 
 #endif
diff --git a/src/ecmascript/see/input.c b/src/ecmascript/see/input.c
index cba24355..59c6d909 100644
--- a/src/ecmascript/see/input.c
+++ b/src/ecmascript/see/input.c
@@ -107,9 +107,11 @@ append_unicode_to_SEE_string(struct SEE_interpreter *interp,
 			     struct SEE_string *str,
 			     unicode_val_T u)
 {
-	if (u <= 0xFFFF) {
-		/* TODO: Should this reject code points in the
-		 * surrogate range? */
+	/* This is supposed to make a string from which
+	 * SEE_string_to_unicode() can get the original @u back.
+	 * If @u is a surrogate, then that is not possible, so
+	 * throw an error instead.  */
+	if (u <= 0xFFFF && !is_utf16_surrogate(u)) {
 		SEE_string_addch(str, u);
 	} else if (needs_utf16_surrogates(u)) {
 		SEE_string_addch(str, get_utf16_high_surrogate(u));
diff --git a/src/ecmascript/spidermonkey/form.c b/src/ecmascript/spidermonkey/form.c
index 6da9b49c..5e5eabab 100644
--- a/src/ecmascript/spidermonkey/form.c
+++ b/src/ecmascript/spidermonkey/form.c
@@ -989,13 +989,16 @@ unicode_to_jsstring(JSContext *ctx, unicode_val_T u)
 {
 	jschar buf[2];
 
-	/* If JS_NewUCStringCopyN hits a null character, it truncates
+	/* This is supposed to make a string from which
+	 * jsval_to_accesskey() can get the original @u back.
+	 * If @u is a surrogate, then that is not possible, so
+	 * return NULL to indicate an error instead.
+	 *
+	 * If JS_NewUCStringCopyN hits a null character, it truncates
 	 * the string there and pads it with more nulls.  However,
 	 * that is not a problem here, because if there is a null
 	 * character in buf[], then it must be the only character.  */
-	if (u <= 0xFFFF) {
-		/* TODO: Should this reject code points in the
-		 * surrogate range? */
+	if (u <= 0xFFFF && !is_utf16_surrogate(u)) {
 		buf[0] = u;
 		return JS_NewUCStringCopyN(ctx, buf, 1);
 	} else if (needs_utf16_surrogates(u)) {

From c1c494bd4b9ba7f70600dfc20111efd68be560bc Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 27 Aug 2006 14:18:02 +0200
Subject: [PATCH 079/132] Preserved Linux console mode. When console was in one
 char mode, restore it. When console was in UTF-8 mode, restore it, too.

---
 src/terminal/kbd.c      |  2 +-
 src/terminal/kbd.h      |  1 +
 src/terminal/terminal.c | 35 +++++++++++++++++++++++++++++++++--
 src/terminal/terminal.h |  3 +++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index 016efabd..ee203aa1 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -206,7 +206,7 @@ resize_terminal(void)
 	itrm_queue_event(ditrm, (char *) &ev, sizeof(ev));
 }
 
-static void
+void
 get_terminal_name(unsigned char name[MAX_TERM_LEN])
 {
 	unsigned char *term = getenv("TERM");
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index b369155a..1ffddfd3 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -125,6 +125,7 @@ void resize_terminal(void);
 void dispatch_special(unsigned char *);
 void kbd_ctrl_c(void);
 int is_blocked(void);
+void get_terminal_name(unsigned char *);
 
 #define kbd_get_key(kbd_)	((kbd_)->key)
 #define kbd_key_is(kbd_, key)	(kbd_get_key(kbd_) == (key))
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index d5aab281..f604e5c8 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -38,9 +38,24 @@
 
 INIT_LIST_HEAD(terminals);
 
-
 static void check_if_no_terminal(void);
 
+static int
+was_utf8(int in, int out)
+{
+	/* taken from setedit */
+	static unsigned char *str = "\033[1;1H\357\200\240\033[6n";
+	unsigned char buf[20];
+	int x, y;
+
+	hard_write(out, str, strlen(str));
+	buf[0] = '\0';
+	read(in, buf, 6);
+	if (sscanf(buf,"\033[%d;%dR",&y,&x)==2) {
+		if (x > 2) return 0;
+	}
+	return 1;
+}
 
 void
 redraw_terminal(struct terminal *term)
@@ -72,6 +87,7 @@ cls_redraw_all_terminals(void)
 struct terminal *
 init_term(int fdin, int fdout)
 {
+	unsigned char name[MAX_TERM_LEN + 9] = "terminal.";
 	struct terminal *term = mem_calloc(1, sizeof(*term));
 
 	if (!term) {
@@ -91,9 +107,16 @@ init_term(int fdin, int fdout)
 	term->fdout = fdout;
 	term->master = (term->fdout == get_output_handle());
 	term->blocked = -1;
-	term->spec = get_opt_rec(config_options, "terminal._template_");
+
+	get_terminal_name(name + 9);
+	term->spec = get_opt_rec(config_options, name);
 	object_lock(term->spec);
 
+	/* The hack to restore console in the right mode */
+	if (get_opt_int_tree(term->spec, "type") == TERM_LINUX) {
+		term->linux_was_utf8 = was_utf8(get_input_handle(), term->fdout);
+	}
+
 	add_to_list(terminals, term);
 
 	set_handlers(fdin, (select_handler_T) in_term, NULL,
@@ -141,6 +164,14 @@ destroy_terminal(struct terminal *term)
 	del_from_list(term);
 	close(term->fdin);
 
+	if (get_opt_int_tree(term->spec, "type") == TERM_LINUX) {
+		if (term->linux_was_utf8) {
+			hard_write(term->fdout, "\033%G", 3);
+		} else {
+			hard_write(term->fdout, "\033%@", 3);
+		}
+	}
+
 	if (term->fdout != 1) {
 		if (term->fdout != term->fdin) close(term->fdout);
 	} else {
diff --git a/src/terminal/terminal.h b/src/terminal/terminal.h
index 69c5aa46..e9b26253 100644
--- a/src/terminal/terminal.h
+++ b/src/terminal/terminal.h
@@ -131,6 +131,9 @@ struct terminal {
 	unsigned int utf8:1;
 #endif /* CONFIG_UTF_8 */
 
+	/* Indicates whether Linux console was in UTF-8 mode on startup */
+	unsigned int linux_was_utf8:1;
+
 	/* The current tab number. */
 	int current_tab;
 

From b860e1e29e7ad00b65e7ca6e2eea7c288102c575 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Tue, 29 Aug 2006 15:50:04 +0200
Subject: [PATCH 080/132] French translation was updated.

---
 po/fr.po | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index b67631a8..00071fd6 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-08-20 21:59+0200\n"
-"PO-Revision-Date: 2006-08-20 21:53+0200\n"
+"POT-Creation-Date: 2006-08-29 15:48+0200\n"
+"PO-Revision-Date: 2006-08-29 15:50+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -121,7 +121,7 @@ msgstr "Erreur de suppression"
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
 #: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
-#: src/terminal/tab.c:213 src/terminal/tab.c:256
+#: src/terminal/tab.c:214 src/terminal/tab.c:257
 msgid "~Yes"
 msgstr "~Oui"
 
@@ -129,7 +129,7 @@ msgstr "~Oui"
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
 #: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
-#: src/terminal/tab.c:214 src/terminal/tab.c:257
+#: src/terminal/tab.c:215 src/terminal/tab.c:258
 msgid "~No"
 msgstr "~Non"
 
@@ -1132,8 +1132,8 @@ msgstr "Envoyer le formulaire"
 msgid "Submit form and reload"
 msgstr "Envoyer le formulaire et recharger"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:210
-#: src/terminal/tab.c:253
+#: src/config/actions-main.inc:101 src/terminal/tab.c:211
+#: src/terminal/tab.c:254
 msgid "Close tab"
 msgstr "Fermer l'onglet"
 
@@ -3348,14 +3348,14 @@ msgid ""
 "0 is mono mode\n"
 "1 is 16 color mode\n"
 "2 is 88 color mode\n"
-"3 is true color mode\n"
+"3 is true color mode"
 msgstr ""
 "Mode couleurs pour la sortie (option -dump):\n"
 "-1 pas de couleurs (normal)\n"
 "0 mode monochrome\n"
 "1 mode 16 couleurs\n"
 "2 mode 88 couleurs\n"
-"3 mode vraies couleurs\n"
+"3 mode vraies couleurs"
 
 #: src/config/options.inc:694
 msgid ""
@@ -8436,12 +8436,12 @@ msgstr "Attention: le nom du terminal contient des caract
 msgid "Failed to create session."
 msgstr "Echec de création de session."
 
-#: src/terminal/event.c:417
+#: src/terminal/event.c:437
 #, c-format
 msgid "Bad event %d"
 msgstr "Mauvais évčnement %d"
 
-#: src/terminal/event.c:457
+#: src/terminal/event.c:477
 #, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Impossible de lire l'évčnement: %d (%s)"
@@ -8450,24 +8450,24 @@ msgstr "Impossible de lire l'
 msgid "Too many bytes read from the itrm!"
 msgstr "Trop d'octets lus en provenance de itrm!"
 
-#: src/terminal/tab.c:211
+#: src/terminal/tab.c:212
 msgid "Do you really want to close the current tab?"
 msgstr "Ętes-vous sűr de vouloir fermer l'onglet courant ?"
 
-#: src/terminal/tab.c:254
+#: src/terminal/tab.c:255
 msgid "Do you really want to close all except the current tab?"
 msgstr "Ętes-vous sűr de vouloir fermer tout sauf l'onglet courant ?"
 
-#: src/viewer/dump/dump.c:84
+#: src/viewer/dump/dump.c:87
 #, c-format
 msgid "Can't write to stdout: %s"
 msgstr "Ne peut écrire sur la sortie standard: %s"
 
-#: src/viewer/dump/dump.c:87
+#: src/viewer/dump/dump.c:90
 msgid "Can't write to stdout."
 msgstr "Ne peut écrire sur la sortie standard."
 
-#: src/viewer/dump/dump.c:277
+#: src/viewer/dump/dump.c:285
 #, c-format
 msgid "URL protocol not supported (%s)."
 msgstr "Protocole de l'URL non supporté (%s)."

From d9037cc4c3fcc838f00cb54db52d88c3192cb74e Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Fri, 1 Sep 2006 21:06:08 +0200
Subject: [PATCH 081/132] Small comment about UTF-8 detection.

---
 src/terminal/terminal.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index f604e5c8..e9860a77 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -43,7 +43,10 @@ static void check_if_no_terminal(void);
 static int
 was_utf8(int in, int out)
 {
-	/* taken from setedit */
+	/* Taken from setedit.
+	 * Set cursor in the up left corner. Write "\357\200\240" == U+F020.
+	 * Read cursor position. For UTF-8 x will be 2.
+	 * For normal mode it will be 4. */
 	static unsigned char *str = "\033[1;1H\357\200\240\033[6n";
 	unsigned char buf[20];
 	int x, y;

From c5a6e58e642642a5bea327eb2a041476189be7fd Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 2 Sep 2006 12:07:29 +0200
Subject: [PATCH 082/132] Added google_redirect. Speedup.

---
 contrib/python/hooks.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/contrib/python/hooks.py b/contrib/python/hooks.py
index 03e4585e..a36167eb 100644
--- a/contrib/python/hooks.py
+++ b/contrib/python/hooks.py
@@ -1,11 +1,12 @@
 import re
+import sys
 
 dumbprefixes = {
 	"7th" : "http://7thguard.net/",
-	"b" : "http://babelfish.altavista.com/babelfish/tr",
-	"bz" : "http://bugzilla.elinks.cz",
-	"bug" : "http://bugzilla.elinks.cz",
-	"d" : "http://www.dict.org",
+	"b" : "http://babelfish.altavista.com/babelfish/tr/",
+	"bz" : "http://bugzilla.elinks.cz/",
+	"bug" : "http://bugzilla.elinks.cz/",
+	"d" : "http://www.dict.org/",
 	"g" : "http://www.google.com/",
 	"gg" : "http://www.google.com/",
 	"go" : "http://www.google.com/",
@@ -21,6 +22,14 @@ dumbprefixes = {
 	"sd" : "http://www.slashdot.org/"
 }
 
+cygwin = re.compile("cygwin\.com")
+cygwin_sub1 = re.compile('<body bgcolor="#000000" color="#000000"')
+cygwin_sub2 = re.compile('<body bgcolor="#ffffff" color="#000000"')
+mbank = re.compile('https://www\.mbank\.com\.pl/ib_navibar_3\.asp')
+mbank_sub1 = re.compile('<td valign="top"><img')
+mbank_sub2 = re.compile('<tr><td valign="top"><img')
+google_redirect = re.compile('^http://www\.google\.com/url\?sa=D&q=(.*)')
+
 def goto_url_hook(url, current_url):
 	global dumbprefixes
 
@@ -30,14 +39,17 @@ def goto_url_hook(url, current_url):
 		return None
 
 def follow_url_hook(url):
+	m = google_redirect.search(url)
+	if m:
+		return m.group(1)
 	return None
 
 def pre_format_html_hook(url, html):
-	if re.search("cygwin\.com", url):
-		html2 = re.sub("<body bgcolor=\"#000000\" color=\"#000000\"", "<body bgcolor=\"#ffffff\" color=\"#000000\"", html)
+	if cygwin.search(url):
+		re.sub(cygwin_sub1, cygwin_sub2, html)
 		return html2
-	if re.search("https://www.mbank.com.pl/ib_navibar_3.asp", url):
-		html2 = re.sub("<td valign=\"top\"><img", "<tr><td valign=\"top\"><img", html)
+	if mbank.search(url):
+		html2 = re.sub(mbank_sub1, mbank_sub2, html)
 		return html2
 	return None
 

From c201ecbb46f984b3f9ef9367b82506a06bd5a40b Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 2 Sep 2006 12:18:27 +0200
Subject: [PATCH 083/132] Fixed.

---
 contrib/python/hooks.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/python/hooks.py b/contrib/python/hooks.py
index a36167eb..02ff3889 100644
--- a/contrib/python/hooks.py
+++ b/contrib/python/hooks.py
@@ -24,10 +24,10 @@ dumbprefixes = {
 
 cygwin = re.compile("cygwin\.com")
 cygwin_sub1 = re.compile('<body bgcolor="#000000" color="#000000"')
-cygwin_sub2 = re.compile('<body bgcolor="#ffffff" color="#000000"')
+cygwin_sub2 = '<body bgcolor="#ffffff" color="#000000"'
 mbank = re.compile('https://www\.mbank\.com\.pl/ib_navibar_3\.asp')
 mbank_sub1 = re.compile('<td valign="top"><img')
-mbank_sub2 = re.compile('<tr><td valign="top"><img')
+mbank_sub2 = '<tr><td valign="top"><img'
 google_redirect = re.compile('^http://www\.google\.com/url\?sa=D&q=(.*)')
 
 def goto_url_hook(url, current_url):
@@ -46,10 +46,10 @@ def follow_url_hook(url):
 
 def pre_format_html_hook(url, html):
 	if cygwin.search(url):
-		re.sub(cygwin_sub1, cygwin_sub2, html)
+		html2 = cygwin_sub1.sub(cygwin_sub2, html)
 		return html2
 	if mbank.search(url):
-		html2 = re.sub(mbank_sub1, mbank_sub2, html)
+		html2 = mbank_sub1.sub(mbank_sub2, html)
 		return html2
 	return None
 

From 8c0af4e4032f2bbdf972301621e1fd11bd5987cd Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 2 Sep 2006 12:26:55 +0200
Subject: [PATCH 084/132] Minor optimization in hooks.py

---
 contrib/python/hooks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/python/hooks.py b/contrib/python/hooks.py
index 02ff3889..34a751b5 100644
--- a/contrib/python/hooks.py
+++ b/contrib/python/hooks.py
@@ -25,7 +25,7 @@ dumbprefixes = {
 cygwin = re.compile("cygwin\.com")
 cygwin_sub1 = re.compile('<body bgcolor="#000000" color="#000000"')
 cygwin_sub2 = '<body bgcolor="#ffffff" color="#000000"'
-mbank = re.compile('https://www\.mbank\.com\.pl/ib_navibar_3\.asp')
+mbank = re.compile('^https://www\.mbank\.com\.pl/ib_navibar_3\.asp')
 mbank_sub1 = re.compile('<td valign="top"><img')
 mbank_sub2 = '<tr><td valign="top"><img'
 google_redirect = re.compile('^http://www\.google\.com/url\?sa=D&q=(.*)')

From 2d19e5ed949518a1b72f4f9c259de59cb160e00b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 2 Sep 2006 17:50:53 +0300
Subject: [PATCH 085/132] Change elinks.or.cz to elinks.cz and one i.e. to e.g.
 in option docs.

Some other instances of elinks.or.cz still remain in the tree.
---
 src/config/options.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/options.inc b/src/config/options.inc
index 9b34d4f7..b3b95474 100644
--- a/src/config/options.inc
+++ b/src/config/options.inc
@@ -103,7 +103,7 @@ static struct option_info config_options_info[] = {
 		"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"
-		"in the style of e.g. http4://elinks.or.cz/.")),
+		"in the style of e.g. http4://elinks.cz/.")),
 #else
 	INIT_OPT_BOOL("connection", N_("Try IPv4 when connecting"),
 		"try_ipv4", 0, 1,
@@ -111,7 +111,7 @@ static struct option_info config_options_info[] = {
 		"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"
-		"in the style of e.g. http4://elinks.or.cz/.")),
+		"in the style of e.g. http4://elinks.cz/.")),
 #endif
 
 #ifdef CONFIG_IPV6
@@ -120,7 +120,7 @@ static struct option_info config_options_info[] = {
 		N_("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"
-		"in the style of i.e. http6://elinks.or.cz/.")),
+		"in the style of e.g. http6://elinks.cz/.")),
 #endif
 
 	INIT_OPT_INT("connection", N_("Timeout for non-restartable connections"),

From 527898687a7102af57850365fb069ff679276372 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 2 Sep 2006 17:51:55 +0300
Subject: [PATCH 086/132] fi.po: minor update

---
 po/fi.po | 848 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 438 insertions(+), 410 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index e358b76c..a090e9ad 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ELinks 0.5pre0.CVS\n"
+"Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-19 10:40+0300\n"
-"PO-Revision-Date: 2006-08-19 12:17+0300\n"
+"POT-Creation-Date: 2006-09-02 17:41+0300\n"
+"PO-Revision-Date: 2006-09-02 17:42+0300\n"
 "Last-Translator: Kalle Olavi Niemitalo <kon@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "Voit laventaa kansion painamalla v
 #: src/bfu/hierbox.c:441 src/bfu/inpfield.c:256 src/bfu/msgbox.c:173
 #: src/bfu/msgbox.c:191 src/config/dialogs.c:58 src/config/dialogs.c:393
 #: src/cookies/dialogs.c:356 src/cookies/dialogs.c:454 src/dialogs/edit.c:98
-#: src/dialogs/info.c:134 src/dialogs/options.c:220 src/dialogs/options.c:301
+#: 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/protocol/protocol.c:236 src/scripting/lua/core.c:379
 #: src/scripting/lua/core.c:460 src/session/session.c:806
@@ -123,7 +123,7 @@ msgstr "Poistovirhe"
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
 #: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
-#: src/terminal/tab.c:213 src/terminal/tab.c:256
+#: src/terminal/tab.c:214 src/terminal/tab.c:257
 msgid "~Yes"
 msgstr "~Kyllä"
 
@@ -131,7 +131,7 @@ msgstr "~Kyll
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
 #: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
-#: src/terminal/tab.c:214 src/terminal/tab.c:257
+#: src/terminal/tab.c:215 src/terminal/tab.c:258
 msgid "~No"
 msgstr "~Ei"
 
@@ -180,7 +180,7 @@ 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:394 src/cookies/dialogs.c:357
 #: src/cookies/dialogs.c:455 src/dialogs/edit.c:102 src/dialogs/edit.c:105
-#: src/dialogs/options.c:223 src/dialogs/options.c:302 src/mime/dialogs.c:132
+#: 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:380 src/scripting/lua/core.c:461
 #: src/session/download.c:637 src/session/download.c:1236
@@ -197,8 +197,8 @@ msgstr "Kello"
 msgid "Digital clock in the status bar."
 msgstr "Digitaalikello tilapalkissa."
 
-#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1166
-#: src/config/options.inc:1173 src/ecmascript/ecmascript.c:44
+#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1203
+#: src/config/options.inc:1210 src/ecmascript/ecmascript.c:44
 #: 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 ""
 "Tämä ominaisuus toimii vain sellaisissa ELinksin versioissa, jotka tukevat\n"
 "kirjanmerkkejä."
 
-#: src/bookmarks/dialogs.c:72 src/config/options.inc:1018
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1055
 #: src/dialogs/document.c:145 src/globhist/dialogs.c:65
 msgid "Title"
 msgstr "Otsikko"
@@ -614,7 +614,7 @@ msgstr "Vanhenee"
 msgid "ID"
 msgstr ""
 
-#: src/cache/dialogs.c:134 src/config/options.inc:677
+#: src/cache/dialogs.c:134 src/config/options.inc:713
 #, fuzzy
 msgid "Header"
 msgstr "Otsikkotieto"
@@ -1166,8 +1166,8 @@ msgstr "L
 msgid "Submit form and reload"
 msgstr "Lähetä lomake ja lataa"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:210
-#: src/terminal/tab.c:253
+#: src/config/actions-main.inc:101 src/terminal/tab.c:211
+#: src/terminal/tab.c:254
 msgid "Close tab"
 msgstr "Sulje välilehti"
 
@@ -1804,7 +1804,7 @@ msgid "(expand by pressing space)"
 msgstr "(lavenna painamalla välilyöntiä)"
 
 #: src/config/dialogs.c:177 src/config/dialogs.c:360
-#: src/config/options.inc:827
+#: src/config/options.inc:863
 msgid "Type"
 msgstr "Tyyppi"
 
@@ -1868,7 +1868,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:535 src/config/dialogs.c:963 src/cookies/dialogs.c:479
-#: src/dialogs/options.c:222 src/formhist/dialogs.c:214
+#: src/dialogs/options.c:236 src/formhist/dialogs.c:214
 #: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1220
 msgid "Sa~ve"
 msgstr "~Tallenna"
@@ -1879,19 +1879,19 @@ msgstr "Asetusten hallinta"
 
 #: src/config/dialogs.c:702
 msgid "Keystroke"
-msgstr ""
+msgstr "Näppäily"
 
-#: src/config/dialogs.c:704 src/config/options.inc:1186
+#: src/config/dialogs.c:704 src/config/options.inc:1223
 msgid "Action"
-msgstr ""
+msgstr "Toiminto"
 
 #: src/config/dialogs.c:705
 msgid "Keymap"
-msgstr ""
+msgstr "Näppäinkartta"
 
 #: src/config/dialogs.c:844
 msgid "Keystroke already used"
-msgstr ""
+msgstr "Näppäily on jo käytössä"
 
 #: src/config/dialogs.c:845
 #, c-format
@@ -1899,6 +1899,8 @@ msgid ""
 "The keystroke \"%s\" is currently used for \"%s\".\n"
 "Are you sure you want to replace it?"
 msgstr ""
+"Näppäilyn \"%s\" nykyinen toiminto on \"%s\".\n"
+"Haluatko varmasti korvata sen?"
 
 #: src/config/dialogs.c:870 src/config/dialogs.c:887 src/config/dialogs.c:923
 msgid "Add keybinding"
@@ -1970,20 +1972,20 @@ msgstr ""
 msgid "Menu mapping"
 msgstr ""
 
-#: src/config/kbdbind.c:566
+#: src/config/kbdbind.c:588
 msgid "Unrecognised keymap"
-msgstr ""
+msgstr "Tunnistamaton näppäinkartta"
 
-#: src/config/kbdbind.c:569
+#: src/config/kbdbind.c:591
 #, fuzzy
 msgid "Error parsing keystroke"
 msgstr "Töpseliin kirjoitus ei onnistu"
 
-#: src/config/kbdbind.c:573
+#: src/config/kbdbind.c:595
 msgid "Unrecognised action (internal error)"
 msgstr ""
 
-#: src/config/kbdbind.c:589
+#: src/config/kbdbind.c:611
 #, fuzzy
 msgid "Error registering event"
 msgstr "Töpseliin kirjoitus ei onnistu"
@@ -1991,7 +1993,7 @@ msgstr "T
 #.
 #: src/config/options.inc:19
 msgid "Configuration system"
-msgstr ""
+msgstr "Asetusjärjestelmä"
 
 #: src/config/options.inc:21
 msgid "Configuration handling options."
@@ -2111,9 +2113,8 @@ msgid "Maximum number of concurrent connections."
 msgstr "Samanaikaisten yhteyksien enimmäismäärä."
 
 #: src/config/options.inc:84
-#, fuzzy
 msgid "Maximum connections per host"
-msgstr "Yhdistää"
+msgstr "Yhteyksiä samaan palvelimeen enintään"
 
 #: src/config/options.inc:86
 msgid "Maximum number of concurrent connections to a given host."
@@ -2142,7 +2143,6 @@ msgstr "Vastaanoton aikakatkaisu (sekunteina)."
 msgid "Try IPv4 when connecting"
 msgstr "Yritä yhteyttä IPv4:llä"
 
-# Täällä "i.e." pitäisi kai olla "e.g.".
 #: src/config/options.inc:100
 msgid ""
 "Whether to try to connect to a host over IPv4.\n"
@@ -2151,7 +2151,7 @@ msgid ""
 "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"
-"in the style of i.e. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Yrittääkö ottaa isäntään yhteyttä IPv4:llä.\n"
 "Huomaa, että jos connection.try_ipv6 on myös päällä,\n"
@@ -2159,7 +2159,7 @@ msgstr ""
 "ollenkaan, ellet ole varma mitä teet.\n"
 "Huomaa, että voit myös pakottaa yksittäisen yhteyden\n"
 "käyttämään valitsemaasi yhteyskäytäntöä käyttämällä\n"
-"esim. \"http4://elinks.or.cz/\"-muotoista URL:ää."
+"esim. \"http4://elinks.cz/\"-muotoista URL:ää."
 
 #: src/config/options.inc:110
 msgid ""
@@ -2167,20 +2167,29 @@ msgid ""
 "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"
-"in the style of i.e. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.cz/."
 msgstr ""
+"Yrittääkö ottaa isäntään yhteyttä IPv4:llä.\n"
+"Älä kajoa tähän asetukseen.\n"
+"Huomaa, että voit myös pakottaa yksittäisen yhteyden\n"
+"käyttämään valitsemaasi yhteyskäytäntöä käyttämällä\n"
+"esim. \"http4://elinks.cz/\"-muotoista URL:ää."
 
 #: src/config/options.inc:118
 msgid "Try IPv6 when connecting"
-msgstr ""
+msgstr "Yritä yhteyttä IPv6:lla"
 
 #: src/config/options.inc:120
 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"
-"in the style of i.e. http6://elinks.or.cz/."
+"in the style of e.g. http6://elinks.cz/."
 msgstr ""
+"Yrittääkö ottaa isäntään yhteyttä IPv6:lla.\n"
+"Huomaa, että voit myös pakottaa yksittäisen yhteyden\n"
+"käyttämään valitsemaasi yhteyskäytäntöä käyttämällä\n"
+"esim. \"http6://elinks.cz/\"-muotoista URL:ää."
 
 #: src/config/options.inc:126
 msgid "Timeout for non-restartable connections"
@@ -2314,9 +2323,8 @@ msgid ""
 msgstr ""
 
 #: src/config/options.inc:203
-#, fuzzy
 msgid "Images"
-msgstr "Kuva"
+msgstr "Kuvat"
 
 #: src/config/options.inc:205
 msgid "Options for handling of images."
@@ -2338,7 +2346,7 @@ msgstr ""
 
 #: src/config/options.inc:215
 msgid "Maximum length for image filename"
-msgstr ""
+msgstr "Kuvatiedoston nimen enimmäispituus"
 
 #: src/config/options.inc:217
 msgid ""
@@ -2437,12 +2445,12 @@ msgid "Active link colors."
 msgstr "Poista taustayhteydet"
 
 #: src/config/options.inc:274 src/config/options.inc:539
-#: src/config/options.inc:912
+#: src/config/options.inc:949
 msgid "Background color"
 msgstr "Taustaväri"
 
 #: src/config/options.inc:276 src/config/options.inc:541
-#: src/config/options.inc:913
+#: src/config/options.inc:950
 msgid "Default background color."
 msgstr "Oletustaustaväri."
 
@@ -2455,13 +2463,12 @@ msgstr "Oletustaustav
 #. 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:535
-#: src/config/options.inc:910
-#, fuzzy
+#: src/config/options.inc:947
 msgid "Text color"
-msgstr "Tekstialue"
+msgstr "Tekstin väri"
 
 #: src/config/options.inc:280 src/config/options.inc:537
-#: src/config/options.inc:911
+#: src/config/options.inc:948
 msgid "Default text color."
 msgstr ""
 
@@ -2485,17 +2492,17 @@ msgstr "Lihavoi"
 msgid "Make the active link text bold."
 msgstr ""
 
+# TODO: Tähän pitäisi kai saada verbi.
 #: src/config/options.inc:291
-#, fuzzy
 msgid "Invert colors"
-msgstr "Tekstialue"
+msgstr "Käänteiset värit"
 
 #: src/config/options.inc:293
 msgid "Invert the fore- and background color so the link stands out."
 msgstr ""
 
-#: src/config/options.inc:296 src/config/options.inc:875
-#: src/dialogs/options.c:217
+#: src/config/options.inc:296 src/config/options.inc:912
+#: src/dialogs/options.c:231
 msgid "Underline"
 msgstr "Alleviivaa"
 
@@ -2703,9 +2710,8 @@ msgid ""
 msgstr ""
 
 #: src/config/options.inc:417
-#, fuzzy
 msgid "Typeahead searching"
-msgstr "Laiton merkkijono"
+msgstr ""
 
 #: src/config/options.inc:419
 msgid ""
@@ -2806,9 +2812,8 @@ msgid ""
 msgstr ""
 
 #: src/config/options.inc:485
-#, fuzzy
 msgid "Formatted documents"
-msgstr "Muotoiltu dokumentin välimuisti"
+msgstr "Muotoillut dokumentit"
 
 #: src/config/options.inc:487
 msgid "Format cache options."
@@ -3029,7 +3034,7 @@ msgstr ""
 msgid "Dump output options."
 msgstr ""
 
-#: src/config/options.inc:630 src/config/options.inc:879
+#: src/config/options.inc:630 src/config/options.inc:916
 #: src/config/opttypes.c:407 src/dialogs/document.c:163
 msgid "Codepage"
 msgstr "Merkistö"
@@ -3040,14 +3045,16 @@ msgid ""
 "a codepage determined by a selected locale."
 msgstr ""
 
-#: src/config/options.inc:640 src/config/options.inc:649
-#: src/config/options.inc:657 src/config/options.inc:665
-#: src/config/options.inc:859
+#: src/config/options.inc:641 src/config/options.inc:650
+#: src/config/options.inc:658 src/config/options.inc:666
+#: src/config/options.inc:673 src/config/options.inc:683
+#: src/config/options.inc:692 src/config/options.inc:701
+#: src/config/options.inc:895
 #, fuzzy
 msgid "Color mode"
 msgstr "Väri"
 
-#: src/config/options.inc:642
+#: src/config/options.inc:643
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3057,7 +3064,7 @@ msgid ""
 "3 is 256 color mode"
 msgstr ""
 
-#: src/config/options.inc:651
+#: src/config/options.inc:652
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3066,7 +3073,7 @@ msgid ""
 "2 is 88 color mode"
 msgstr ""
 
-#: src/config/options.inc:659
+#: src/config/options.inc:660
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3075,7 +3082,7 @@ msgid ""
 "2 is 256 color mode"
 msgstr ""
 
-#: src/config/options.inc:667
+#: src/config/options.inc:668
 msgid ""
 "Color mode for dumps:\n"
 "-1 is standard dump mode\n"
@@ -3083,123 +3090,161 @@ msgid ""
 "1 is 16 color mode"
 msgstr ""
 
-#: src/config/options.inc:673
+#: src/config/options.inc:675
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is 256 color mode\n"
+"4 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:685
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:694
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 256 color mode\n"
+"3 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:703
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:709
 msgid "Footer"
 msgstr ""
 
-#: src/config/options.inc:675
+#: src/config/options.inc:711
 #, c-format
 msgid "Footer string used in dumps. %u is substituted by URL."
 msgstr ""
 
-#: src/config/options.inc:679
+#: src/config/options.inc:715
 #, c-format
 msgid "Header string used in dumps. %u is substituted by URL."
 msgstr ""
 
-#: src/config/options.inc:681
+#: src/config/options.inc:717
 #, fuzzy
 msgid "Numbering"
 msgstr "Määrä"
 
-#: src/config/options.inc:683
+#: src/config/options.inc:719
 msgid "Whether to print link numbers in dump output."
 msgstr ""
 
 # TODO?
-#: src/config/options.inc:685
+#: src/config/options.inc:721
 #, fuzzy
 msgid "References"
 msgstr "Lähteet"
 
-#: src/config/options.inc:687
+#: src/config/options.inc:723
 msgid ""
 "Whether to print references (URIs) of document links\n"
 "in dump output."
 msgstr ""
 
-#: src/config/options.inc:690
+#: src/config/options.inc:726
 msgid "Separator"
 msgstr "Erotin"
 
-#: src/config/options.inc:692
+#: src/config/options.inc:728
 msgid "String which separates two dumps."
 msgstr ""
 
-#: src/config/options.inc:694
+#: src/config/options.inc:730
 msgid "Width"
 msgstr "Leveys"
 
-#: src/config/options.inc:696
+#: src/config/options.inc:732
 msgid "Width of screen in characters when dumping documents."
 msgstr ""
 
-#: src/config/options.inc:700
+#: src/config/options.inc:736
 msgid "History"
 msgstr "Historia"
 
-#: src/config/options.inc:702
+#: src/config/options.inc:738
 msgid "History options."
 msgstr ""
 
-#: src/config/options.inc:704
+#: src/config/options.inc:740
 #, fuzzy
 msgid "Keep unhistory"
 msgstr "Ei historiaa"
 
-#: src/config/options.inc:706
+#: src/config/options.inc:742
 msgid "Keep unhistory (\"forward history\")."
 msgstr ""
 
-#: src/config/options.inc:709
+#: src/config/options.inc:745
 msgid "HTML rendering"
 msgstr ""
 
-#: src/config/options.inc:711
+#: src/config/options.inc:747
 msgid "Options concerning the display of HTML pages."
 msgstr ""
 
-#: src/config/options.inc:713
+#: src/config/options.inc:749
 msgid "Display frames"
 msgstr "Näytä kehykset"
 
-#: src/config/options.inc:715
-#, fuzzy
+#: src/config/options.inc:751
 msgid "Display frames."
-msgstr "Näytä"
+msgstr "Näytä kehykset."
 
-#: src/config/options.inc:717
+#: src/config/options.inc:753
 msgid "Display tables"
 msgstr "Näytä taulukot"
 
-#: src/config/options.inc:719
-#, fuzzy
+#: src/config/options.inc:755
 msgid "Display tables."
-msgstr "Näytä"
+msgstr "Näytä taulukot."
 
-#: src/config/options.inc:721
+#: src/config/options.inc:757
 #, fuzzy
 msgid "Display subscripts"
 msgstr "Näytä kartta"
 
-#: src/config/options.inc:723
+#: src/config/options.inc:759
 msgid "Display subscripts (as [thing])."
 msgstr ""
 
-#: src/config/options.inc:725
+#: src/config/options.inc:761
 #, fuzzy
 msgid "Display superscripts"
 msgstr "Näytä kartta"
 
-#: src/config/options.inc:727
+#: src/config/options.inc:763
 msgid "Display superscripts (as ^thing)."
 msgstr ""
 
-#: src/config/options.inc:729
+#: src/config/options.inc:765
 msgid "Rendering of html link element"
 msgstr ""
 
-#: src/config/options.inc:731
+#: src/config/options.inc:767
 msgid ""
 "How to render <link> tags from the HTML header:\n"
 "0 is nothing\n"
@@ -3210,55 +3255,55 @@ msgid ""
 "5 is everything"
 msgstr ""
 
-#: src/config/options.inc:739
+#: src/config/options.inc:775
 msgid "Underline links"
 msgstr "Alleviivaa linkit"
 
-#: src/config/options.inc:741
+#: src/config/options.inc:777
 msgid "Underline links."
 msgstr ""
 
-#: src/config/options.inc:743
+#: src/config/options.inc:779
 msgid "Wrap non breaking space"
 msgstr ""
 
-#: src/config/options.inc:745
+#: src/config/options.inc:781
 msgid ""
 "If set do not honour non breaking space (the nbsp entity)\n"
 "but allow to wrap the text. This can help keeping the width\n"
 "of documents down so no horizontal scrolling is needed."
 msgstr ""
 
-#: src/config/options.inc:750
+#: src/config/options.inc:786
 #, fuzzy
 msgid "Plain rendering"
 msgstr "Siirtää"
 
-#: src/config/options.inc:752
+#: src/config/options.inc:788
 msgid "Options concerning the display of plain text pages."
 msgstr ""
 
-#: src/config/options.inc:754
+#: src/config/options.inc:790
 msgid "Display URIs"
 msgstr "Näytä URIt"
 
-#: src/config/options.inc:756
+#: src/config/options.inc:792
 msgid "Display URIs in the document as links."
 msgstr ""
 
-#: src/config/options.inc:758
+#: src/config/options.inc:794
 msgid "Compress empty lines"
 msgstr "Tiivistä tyhjät rivit"
 
-#: src/config/options.inc:760
+#: src/config/options.inc:796
 msgid "Compress successive empty lines to only one in displayed text."
 msgstr ""
 
-#: src/config/options.inc:763
+#: src/config/options.inc:799
 msgid "URI passing"
 msgstr ""
 
-#: src/config/options.inc:765
+#: src/config/options.inc:801
 msgid ""
 "Rules for passing URIs to external commands. When one rule\n"
 "is defined the link and tab menu will have a menu item that\n"
@@ -3272,7 +3317,7 @@ msgid ""
 "the tab-external-command actions."
 msgstr ""
 
-#: src/config/options.inc:778
+#: src/config/options.inc:814
 msgid ""
 "A rule for passing URI to an external command.\n"
 "The format is:\n"
@@ -3282,29 +3327,29 @@ msgid ""
 msgstr ""
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:788
+#: src/config/options.inc:824
 msgid "Information files"
 msgstr ""
 
-#: src/config/options.inc:790
+#: src/config/options.inc:826
 msgid "Options for information files in ~/.elinks."
 msgstr ""
 
-#: src/config/options.inc:792
+#: src/config/options.inc:828
 msgid "Save interval"
 msgstr "Tallennusväli"
 
-#: src/config/options.inc:794
+#: src/config/options.inc:830
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
 "to be saved to disk if they has changed (seconds; 0 to disable)"
 msgstr ""
 
-#: src/config/options.inc:797
+#: src/config/options.inc:833
 msgid "Use secure file saving"
 msgstr ""
 
-#: src/config/options.inc:799
+#: src/config/options.inc:835
 msgid ""
 "First write data to unique temporary file, then rename this file\n"
 "upon successfully finishing this. Note that this relates only to\n"
@@ -3316,11 +3361,11 @@ msgid ""
 "and reducing reliability of this feature."
 msgstr ""
 
-#: src/config/options.inc:808
+#: src/config/options.inc:844
 msgid "Use fsync(3) with secure file saving"
 msgstr ""
 
-#: src/config/options.inc:810
+#: src/config/options.inc:846
 msgid ""
 "When using secure file saving, call fsync(3), if the OS\n"
 "supports it, to force the OS immediately to write the data\n"
@@ -3329,20 +3374,20 @@ msgid ""
 msgstr ""
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:819
+#: src/config/options.inc:855
 msgid "Terminals"
 msgstr "Päätteet"
 
 # voisi olla myös "päätekohtaiset asetukset" mutta ei "päätteen asetukset"
-#: src/config/options.inc:821
+#: src/config/options.inc:857
 msgid "Terminal options."
 msgstr "Pääteasetukset."
 
-#: src/config/options.inc:825
+#: src/config/options.inc:861
 msgid "Options specific to this terminal type (according to $TERM value)."
 msgstr ""
 
-#: src/config/options.inc:829
+#: src/config/options.inc:865
 msgid ""
 "Terminal type; matters mostly only when drawing frames and\n"
 "dialog box borders:\n"
@@ -3353,63 +3398,64 @@ msgid ""
 "4 is FreeBSD"
 msgstr ""
 
-#: src/config/options.inc:837 src/dialogs/options.c:213
+#: src/config/options.inc:873 src/dialogs/options.c:227
 msgid "Switch fonts for line drawing"
 msgstr ""
 
-#: src/config/options.inc:839
+#: src/config/options.inc:875
 msgid ""
 "Switch fonts when drawing lines, enabling both local characters\n"
 "and lines working at the same time. Makes sense only with linux\n"
 "terminal."
 msgstr ""
 
-#: src/config/options.inc:843 src/dialogs/options.c:218
+#: src/config/options.inc:879 src/dialogs/options.c:232
 msgid "UTF-8 I/O"
 msgstr ""
 
-#: src/config/options.inc:845
+#: src/config/options.inc:881
 msgid ""
 "Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
 "only the subset of UTF8 according to terminal codepage is used."
 msgstr ""
 
-#: src/config/options.inc:848 src/dialogs/options.c:214
+#: src/config/options.inc:884 src/dialogs/options.c:228
 msgid "Restrict frames in cp850/852"
 msgstr "Rajoita kehykset näihin: cp850/852"
 
-#: src/config/options.inc:850
+#: src/config/options.inc:886
 msgid ""
 "Restrict the characters used when drawing lines. Makes sense\n"
 "only with linux terminals using the cp850/852 character sets."
 msgstr ""
 
-#: src/config/options.inc:853 src/dialogs/options.c:215
+#: src/config/options.inc:889 src/dialogs/options.c:229
 #, fuzzy
 msgid "Block cursor"
 msgstr "Neliöosoitin"
 
-#: src/config/options.inc:855
+#: src/config/options.inc:891
 msgid ""
 "Move cursor to bottom right corner when done drawing.\n"
 "This is particularly useful when we have a block cursor,\n"
 "so that inversed text is displayed correctly."
 msgstr ""
 
-#: src/config/options.inc:861
+#: src/config/options.inc:897
 msgid ""
 "The color mode controls what colors are used and how they are\n"
 "output to the terminal. The color modes are:\n"
 "0 is mono mode, only 2 colors are used\n"
 "1 is 16 color mode, uses the common ANSI colors\n"
-"2 is 256 color mode, uses XTerm RGB codes"
+"2 is 256 color mode, uses XTerm RGB codes\n"
+"3 is true color mode, uses konsole RGB codes."
 msgstr ""
 
-#: src/config/options.inc:867 src/dialogs/options.c:216
+#: src/config/options.inc:904 src/dialogs/options.c:230
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
-#: src/config/options.inc:869
+#: src/config/options.inc:906
 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"
@@ -3418,405 +3464,405 @@ msgid ""
 "sense only when colors are enabled."
 msgstr ""
 
-#: src/config/options.inc:877
+#: src/config/options.inc:914
 msgid "If we should use underline or enhance the color instead."
 msgstr ""
 
-#: src/config/options.inc:881
+#: src/config/options.inc:918
 msgid ""
 "Codepage of charset used for displaying content on terminal.\n"
 "'System' stands for a codepage determined by a selected locale."
 msgstr ""
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:888
+#: src/config/options.inc:925
 msgid "User interface"
 msgstr "Käyttöliittymä"
 
-#: src/config/options.inc:890
+#: src/config/options.inc:927
 #, fuzzy
 msgid "User interface options."
 msgstr "Terminaaliasetukset"
 
-#: src/config/options.inc:894
+#: src/config/options.inc:931
 msgid "Color settings"
 msgstr ""
 
-#: src/config/options.inc:896
+#: src/config/options.inc:933
 msgid "Default user interface color settings."
 msgstr ""
 
-#: src/config/options.inc:923
+#: src/config/options.inc:960
 msgid "Color terminals"
 msgstr "Värilliset päätteet"
 
-#: src/config/options.inc:925
+#: src/config/options.inc:962
 msgid "Color settings for color terminal."
 msgstr ""
 
-#: src/config/options.inc:927
+#: src/config/options.inc:964
 msgid "Non-color terminals"
 msgstr ""
 
-#: src/config/options.inc:929
+#: src/config/options.inc:966
 msgid "Color settings for non-color terminal."
 msgstr ""
 
 #. FIXME: obsolete, how to alias them correctly ? --Zas
-#: src/config/options.inc:932
+#: src/config/options.inc:969
 msgid "Main menu bar"
 msgstr ""
 
-#: src/config/options.inc:934
+#: src/config/options.inc:971
 msgid "Main menu bar colors."
 msgstr ""
 
-#: src/config/options.inc:936
+#: src/config/options.inc:973
 msgid "Unselected main menu bar item"
 msgstr ""
 
-#: src/config/options.inc:938
+#: src/config/options.inc:975
 msgid "Unselected main menu bar item colors."
 msgstr ""
 
-#: src/config/options.inc:940
+#: src/config/options.inc:977
 msgid "Selected main menu bar item"
 msgstr ""
 
-#: src/config/options.inc:942
+#: src/config/options.inc:979
 msgid "Selected main menu bar item colors."
 msgstr ""
 
-#: src/config/options.inc:944 src/config/options.inc:973
+#: src/config/options.inc:981 src/config/options.inc:1010
 msgid "Hotkey"
 msgstr ""
 
-#: src/config/options.inc:946
+#: src/config/options.inc:983
 msgid "Main menu hotkey colors."
 msgstr ""
 
-#: src/config/options.inc:948 src/config/options.inc:977
+#: src/config/options.inc:985 src/config/options.inc:1014
 msgid "Unselected hotkey"
 msgstr ""
 
-#: src/config/options.inc:950
+#: src/config/options.inc:987
 msgid "Main menu unselected hotkey colors."
 msgstr ""
 
-#: src/config/options.inc:952 src/config/options.inc:981
+#: src/config/options.inc:989 src/config/options.inc:1018
 #, fuzzy
 msgid "Selected hotkey"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:954
+#: src/config/options.inc:991
 msgid "Main menu selected hotkey colors."
 msgstr ""
 
-#: src/config/options.inc:957
+#: src/config/options.inc:994
 msgid "Menu bar"
 msgstr ""
 
-#: src/config/options.inc:959
+#: src/config/options.inc:996
 msgid "Menu bar colors."
 msgstr ""
 
-#: src/config/options.inc:961
+#: src/config/options.inc:998
 msgid "Unselected menu item"
 msgstr ""
 
-#: src/config/options.inc:963
+#: src/config/options.inc:1000
 msgid "Unselected menu item colors."
 msgstr ""
 
-#: src/config/options.inc:965
+#: src/config/options.inc:1002
 #, fuzzy
 msgid "Selected menu item"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:967
+#: src/config/options.inc:1004
 msgid "Selected menu item colors."
 msgstr ""
 
-#: src/config/options.inc:969
+#: src/config/options.inc:1006
 #, fuzzy
 msgid "Marked menu item"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:971
+#: src/config/options.inc:1008
 msgid "Marked menu item colors."
 msgstr ""
 
-#: src/config/options.inc:975
+#: src/config/options.inc:1012
 msgid "Menu item hotkey colors."
 msgstr ""
 
-#: src/config/options.inc:979
+#: src/config/options.inc:1016
 msgid "Menu item unselected hotkey colors."
 msgstr ""
 
-#: src/config/options.inc:983
-msgid "Menu item selected hotkey colors."
-msgstr ""
-
-#: src/config/options.inc:985
-#, fuzzy
-msgid "Menu frame"
-msgstr "Ei kehyksiä"
-
-#: src/config/options.inc:987
-msgid "Menu frame colors."
-msgstr ""
-
-#: src/config/options.inc:990
-msgid "Dialog"
-msgstr ""
-
-#: src/config/options.inc:992
-msgid "Dialog colors."
-msgstr ""
-
-#: src/config/options.inc:1002
-msgid "Generic"
-msgstr ""
-
-#: src/config/options.inc:1004
-#, fuzzy
-msgid "Generic dialog colors."
-msgstr "Poista taustayhteydet"
-
-#: src/config/options.inc:1006
-msgid "Frame"
-msgstr "Kehys"
-
-#: src/config/options.inc:1008
-msgid "Dialog frame colors."
-msgstr ""
-
-#: src/config/options.inc:1010
-msgid "Scrollbar"
-msgstr ""
-
-#: src/config/options.inc:1012
-msgid "Scrollbar colors."
-msgstr ""
-
-#: src/config/options.inc:1014
-#, fuzzy
-msgid "Selected scrollbar"
-msgstr "Poista taustayhteydet"
-
-#: src/config/options.inc:1016
-#, fuzzy
-msgid "Scrollbar selected colors."
-msgstr "Poista taustayhteydet"
-
 #: src/config/options.inc:1020
-msgid "Dialog title colors."
+msgid "Menu item selected hotkey colors."
 msgstr ""
 
 #: src/config/options.inc:1022
 #, fuzzy
+msgid "Menu frame"
+msgstr "Ei kehyksiä"
+
+#: src/config/options.inc:1024
+msgid "Menu frame colors."
+msgstr ""
+
+#: src/config/options.inc:1027
+msgid "Dialog"
+msgstr ""
+
+#: src/config/options.inc:1029
+msgid "Dialog colors."
+msgstr ""
+
+#: src/config/options.inc:1039
+msgid "Generic"
+msgstr ""
+
+#: src/config/options.inc:1041
+#, fuzzy
+msgid "Generic dialog colors."
+msgstr "Poista taustayhteydet"
+
+#: src/config/options.inc:1043
+msgid "Frame"
+msgstr "Kehys"
+
+#: src/config/options.inc:1045
+msgid "Dialog frame colors."
+msgstr ""
+
+#: src/config/options.inc:1047
+msgid "Scrollbar"
+msgstr ""
+
+#: src/config/options.inc:1049
+msgid "Scrollbar colors."
+msgstr ""
+
+#: src/config/options.inc:1051
+#, fuzzy
+msgid "Selected scrollbar"
+msgstr "Poista taustayhteydet"
+
+#: src/config/options.inc:1053
+#, fuzzy
+msgid "Scrollbar selected colors."
+msgstr "Poista taustayhteydet"
+
+#: src/config/options.inc:1057
+msgid "Dialog title colors."
+msgstr ""
+
+#: src/config/options.inc:1059
+#, fuzzy
 msgid "Text"
 msgstr "Tekstialue"
 
-#: src/config/options.inc:1024
+#: src/config/options.inc:1061
 msgid "Dialog text colors."
 msgstr ""
 
-#: src/config/options.inc:1026 src/viewer/text/form.c:1780
+#: src/config/options.inc:1063 src/viewer/text/form.c:1780
 msgid "Checkbox"
 msgstr "Valintalaatikko"
 
-#: src/config/options.inc:1028
+#: src/config/options.inc:1065
 msgid "Dialog checkbox colors."
 msgstr ""
 
-#: src/config/options.inc:1030
+#: src/config/options.inc:1067
 #, fuzzy
 msgid "Selected checkbox"
 msgstr "Valittu välilehti"
 
-#: src/config/options.inc:1032
+#: src/config/options.inc:1069
 #, fuzzy
 msgid "Dialog selected checkbox colors."
 msgstr "Poista taustayhteydet"
 
-#: src/config/options.inc:1034
+#: src/config/options.inc:1071
 #, fuzzy
 msgid "Checkbox label"
 msgstr "Valintalaatikko"
 
-#: src/config/options.inc:1036
+#: src/config/options.inc:1073
 msgid "Dialog checkbox label colors."
 msgstr ""
 
-#: src/config/options.inc:1038
+#: src/config/options.inc:1075
 msgid "Button"
 msgstr "Painike"
 
-#: src/config/options.inc:1040 src/config/options.inc:1048
+#: src/config/options.inc:1077 src/config/options.inc:1085
 msgid "Dialog button colors."
 msgstr ""
 
-#: src/config/options.inc:1042
+#: src/config/options.inc:1079
 msgid "Selected button"
 msgstr ""
 
-#: src/config/options.inc:1044 src/config/options.inc:1052
+#: src/config/options.inc:1081 src/config/options.inc:1089
 msgid "Dialog selected button colors."
 msgstr ""
 
-#: src/config/options.inc:1046
+#: src/config/options.inc:1083
 msgid "Button shortcut"
 msgstr ""
 
-#: src/config/options.inc:1050
+#: src/config/options.inc:1087
 #, fuzzy
 msgid "Selected button shortcut"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:1054 src/viewer/text/form.c:1784
+#: src/config/options.inc:1091 src/viewer/text/form.c:1784
 msgid "Text field"
 msgstr "Tekstikenttä"
 
-#: src/config/options.inc:1056
+#: src/config/options.inc:1093
 msgid "Dialog text field colors."
 msgstr ""
 
-#: src/config/options.inc:1058
+#: src/config/options.inc:1095
 #, fuzzy
 msgid "Text field text"
 msgstr "Tekstikenttä"
 
-#: src/config/options.inc:1060
+#: src/config/options.inc:1097
 msgid "Dialog field text colors."
 msgstr ""
 
-#: src/config/options.inc:1062
+#: src/config/options.inc:1099
 msgid "Meter"
 msgstr ""
 
-#: src/config/options.inc:1064
+#: src/config/options.inc:1101
 msgid "Dialog meter colors."
 msgstr ""
 
-#: src/config/options.inc:1066
+#: src/config/options.inc:1103
 msgid "Shadow"
 msgstr ""
 
-#: src/config/options.inc:1068
+#: src/config/options.inc:1105
 msgid "Dialog shadow colors (see ui.shadows option)."
 msgstr ""
 
-#: src/config/options.inc:1070
+#: src/config/options.inc:1107
 msgid "Title bar"
 msgstr ""
 
-#: src/config/options.inc:1072
+#: src/config/options.inc:1109
 msgid "Title bar colors."
 msgstr ""
 
-#: src/config/options.inc:1074
+#: src/config/options.inc:1111
 msgid "Generic title bar"
 msgstr ""
 
-#: src/config/options.inc:1076
+#: src/config/options.inc:1113
 msgid "Generic title bar colors."
 msgstr ""
 
-#: src/config/options.inc:1078
+#: src/config/options.inc:1115
 msgid "Title bar text"
 msgstr ""
 
-#: src/config/options.inc:1080
+#: src/config/options.inc:1117
 msgid "Title bar text colors."
 msgstr ""
 
-#: src/config/options.inc:1083
+#: src/config/options.inc:1120
 msgid "Status bar"
 msgstr ""
 
-#: src/config/options.inc:1085
+#: src/config/options.inc:1122
 msgid "Status bar colors."
 msgstr ""
 
-#: src/config/options.inc:1087
+#: src/config/options.inc:1124
 msgid "Generic status bar"
 msgstr ""
 
-#: src/config/options.inc:1089
+#: src/config/options.inc:1126
 msgid "Generic status bar colors."
 msgstr ""
 
-#: src/config/options.inc:1091
+#: src/config/options.inc:1128
 #, fuzzy
 msgid "Status bar text"
 msgstr "Etsi tekstiä"
 
-#: src/config/options.inc:1093
+#: src/config/options.inc:1130
 msgid "Status bar text colors."
 msgstr ""
 
-#: src/config/options.inc:1096
+#: src/config/options.inc:1133
 msgid "Tabs bar"
 msgstr ""
 
-#: src/config/options.inc:1098
+#: src/config/options.inc:1135
 msgid "Tabs bar colors."
 msgstr ""
 
-#: src/config/options.inc:1100
+#: src/config/options.inc:1137
 #, fuzzy
 msgid "Unvisited tab"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:1102
+#: src/config/options.inc:1139
 msgid ""
 "Tab colors for tabs that have not been\n"
 "selected since they completed loading."
 msgstr ""
 
-#: src/config/options.inc:1105
+#: src/config/options.inc:1142
 #, fuzzy
 msgid "Unselected tab"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:1107
+#: src/config/options.inc:1144
 #, fuzzy
 msgid "Unselected tab colors."
 msgstr "Poista taustayhteydet"
 
-#: src/config/options.inc:1109
+#: src/config/options.inc:1146
 msgid "Loading tab"
 msgstr "Latautuva välilehti"
 
-#: src/config/options.inc:1111
+#: src/config/options.inc:1148
 msgid "Tab colors for tabs that are loading in the background."
 msgstr ""
 
-#: src/config/options.inc:1113
+#: src/config/options.inc:1150
 msgid "Selected tab"
 msgstr "Valittu välilehti"
 
-#: src/config/options.inc:1115
+#: src/config/options.inc:1152
 #, fuzzy
 msgid "Selected tab colors."
 msgstr "Poista taustayhteydet"
 
-#: src/config/options.inc:1117
+#: src/config/options.inc:1154
 msgid "Tab separator"
 msgstr ""
 
-#: src/config/options.inc:1119
+#: src/config/options.inc:1156
 msgid "Tab separator colors."
 msgstr ""
 
-#: src/config/options.inc:1122
+#: src/config/options.inc:1159
 #, fuzzy
 msgid "Searched strings"
 msgstr "Laiton merkkijono"
 
-#: src/config/options.inc:1124
+#: src/config/options.inc:1161
 #, fuzzy
 msgid "Searched string highlight colors."
 msgstr "Hakumerkkijonoa ei löytynyt"
@@ -3825,68 +3871,68 @@ msgstr "Hakumerkkijonoa ei l
 #. ============= BORING PART (colors) END ===================
 #. ==========================================================
 #. Keep options in alphabetical order.
-#: src/config/options.inc:1133
+#: src/config/options.inc:1170
 msgid "Dialog settings"
 msgstr ""
 
-#: src/config/options.inc:1135
+#: src/config/options.inc:1172
 msgid "Dialogs-specific appearance and behaviour settings."
 msgstr ""
 
-#: src/config/options.inc:1138
+#: src/config/options.inc:1175
 msgid "Minimal height of listbox widget"
 msgstr ""
 
-#: src/config/options.inc:1140
+#: src/config/options.inc:1177
 msgid ""
 "Minimal height of the listbox widget (used e.g. for bookmarks\n"
 "or global history)."
 msgstr ""
 
-#: src/config/options.inc:1143
+#: src/config/options.inc:1180
 msgid "Drop shadows"
 msgstr ""
 
-#: src/config/options.inc:1145
+#: src/config/options.inc:1182
 msgid ""
 "Make dialogs drop shadows (the shadows are solid, you can\n"
 "adjust their color by ui.colors.*.dialog.shadow). You may\n"
 "also want to eliminate the wide borders by adjusting setup.h."
 msgstr ""
 
-#: src/config/options.inc:1149
+#: src/config/options.inc:1186
 msgid "Underline menu hotkeys"
 msgstr "Alleviivaa pikanäppäimet valikossa"
 
-#: src/config/options.inc:1151
+#: src/config/options.inc:1188
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
 msgstr ""
 
-#: src/config/options.inc:1154
+#: src/config/options.inc:1191
 #, fuzzy
 msgid "Underline button shortcuts"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:1156
+#: src/config/options.inc:1193
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
 msgstr ""
 
-#: src/config/options.inc:1160
+#: src/config/options.inc:1197
 #, fuzzy
 msgid "Timer options"
 msgstr "Terminaaliasetukset"
 
-#: src/config/options.inc:1162
+#: src/config/options.inc:1199
 msgid ""
 "Timed action after certain interval of user inactivity. Someone can\n"
 "even find this useful, although you may not believe that."
 msgstr ""
 
-#: src/config/options.inc:1168
+#: src/config/options.inc:1205
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -3894,7 +3940,7 @@ msgid ""
 "2 is count down and show the timer near LEDs"
 msgstr ""
 
-#: src/config/options.inc:1175
+#: src/config/options.inc:1212
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -3902,35 +3948,35 @@ msgid ""
 "2 is count down and show the timer near LEDs (DISABLED)"
 msgstr ""
 
-#: src/config/options.inc:1181
+#: src/config/options.inc:1218
 msgid "Duration"
 msgstr ""
 
-#: src/config/options.inc:1183
+#: src/config/options.inc:1220
 msgid ""
 "Inactivity timeout in seconds. The maximum of one day\n"
 "should be enough for just everyone (TM)."
 msgstr ""
 
-#: src/config/options.inc:1188
+#: src/config/options.inc:1225
 msgid "Keybinding action to be triggered when timer reaches zero."
 msgstr ""
 
-#: src/config/options.inc:1191
+#: src/config/options.inc:1228
 #, fuzzy
 msgid "Window tabs"
 msgstr "Ikkuna"
 
-#: src/config/options.inc:1193
+#: src/config/options.inc:1230
 msgid "Window tabs settings."
 msgstr ""
 
-#: src/config/options.inc:1195
+#: src/config/options.inc:1232
 #, fuzzy
 msgid "Display tabs bar"
 msgstr "Näytä kartta"
 
-#: src/config/options.inc:1197
+#: src/config/options.inc:1234
 msgid ""
 "Show tabs bar on the screen:\n"
 "0 means never\n"
@@ -3938,144 +3984,144 @@ msgid ""
 "2 means always"
 msgstr ""
 
-#: src/config/options.inc:1202
+#: src/config/options.inc:1239
 msgid "Tab bar at top"
 msgstr ""
 
-#: src/config/options.inc:1204
+#: src/config/options.inc:1241
 msgid "Whether display tab bar at top like other browsers do."
 msgstr ""
 
-#: src/config/options.inc:1206
+#: src/config/options.inc:1243
 msgid "Wrap-around tabs cycling"
 msgstr ""
 
-#: src/config/options.inc:1208
+#: src/config/options.inc:1245
 msgid ""
 "When moving right from the last tab, jump at the first one, and\n"
 "vice versa."
 msgstr ""
 
-#: src/config/options.inc:1211
+#: src/config/options.inc:1248
 msgid "Confirm tab closing"
 msgstr ""
 
-#: src/config/options.inc:1213
+#: src/config/options.inc:1250
 msgid "When closing a tab show confirmation dialog."
 msgstr ""
 
-#: src/config/options.inc:1217 src/config/opttypes.c:408
+#: src/config/options.inc:1254 src/config/opttypes.c:408
 msgid "Language"
 msgstr ""
 
-#: src/config/options.inc:1219
+#: src/config/options.inc:1256
 msgid ""
 "Language of user interface. 'System' means that the language will\n"
 "be extracted from the environment dynamically."
 msgstr ""
 
-#: src/config/options.inc:1222
+#: src/config/options.inc:1259
 #, fuzzy
 msgid "Display menu bar always"
 msgstr "Näytä kartta"
 
-#: src/config/options.inc:1224
+#: src/config/options.inc:1261
 msgid "Always show menu bar on the screen."
 msgstr ""
 
-#: src/config/options.inc:1226
+#: src/config/options.inc:1263
 #, fuzzy
 msgid "Display status bar"
 msgstr "Näytä kartta"
 
-#: src/config/options.inc:1228
+#: src/config/options.inc:1265
 msgid "Show status bar on the screen."
 msgstr ""
 
-#: src/config/options.inc:1230
+#: src/config/options.inc:1267
 #, fuzzy
 msgid "Display title bar"
 msgstr "Näytä kartta"
 
-#: src/config/options.inc:1232
+#: src/config/options.inc:1269
 msgid "Show title bar on the screen."
 msgstr ""
 
-#: src/config/options.inc:1234
+#: src/config/options.inc:1271
 msgid "Display goto dialog in new tabs"
 msgstr ""
 
-#: src/config/options.inc:1236
+#: src/config/options.inc:1273
 msgid ""
 "Pop up goto dialog in newly created tabs when there's no homepage\n"
 "set. This means also showing goto dialog on startup."
 msgstr ""
 
-#: src/config/options.inc:1239
+#: src/config/options.inc:1276
 msgid "Show a message box when file is saved successfully"
 msgstr ""
 
-#: src/config/options.inc:1241
+#: src/config/options.inc:1278
 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"
 "pop up."
 msgstr ""
 
-#: src/config/options.inc:1246
+#: src/config/options.inc:1283
 #, fuzzy
 msgid "Sessions"
 msgstr "Tiedostopäätteet"
 
-#: src/config/options.inc:1248
+#: src/config/options.inc:1285
 msgid "Sessions settings."
 msgstr ""
 
-#: src/config/options.inc:1250
+#: src/config/options.inc:1287
 msgid "Keep session active"
 msgstr ""
 
-#: src/config/options.inc:1252
+#: src/config/options.inc:1289
 msgid "Keep the session active even if the last terminal exits."
 msgstr ""
 
-#: src/config/options.inc:1254
+#: src/config/options.inc:1291
 msgid "Auto save session"
 msgstr ""
 
-#: src/config/options.inc:1256
+#: src/config/options.inc:1293
 msgid ""
 "Automatically save the session when quitting.\n"
 "This feature requires bookmark support."
 msgstr ""
 
-#: src/config/options.inc:1259
+#: src/config/options.inc:1296
 msgid "Auto restore session"
 msgstr ""
 
-#: src/config/options.inc:1261
+#: src/config/options.inc:1298
 msgid ""
 "Automatically restore the session at start.\n"
 "This feature requires bookmark support."
 msgstr ""
 
-#: src/config/options.inc:1264
+#: src/config/options.inc:1301
 msgid "Auto save and restore session folder name"
 msgstr ""
 
-#: src/config/options.inc:1266
+#: src/config/options.inc:1303
 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"
 "This only makes sense with bookmark support."
 msgstr ""
 
-#: src/config/options.inc:1270
+#: src/config/options.inc:1307
 #, fuzzy
 msgid "Homepage URI"
 msgstr "Merkistö"
 
-#: src/config/options.inc:1272
+#: src/config/options.inc:1309
 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"
@@ -4083,20 +4129,20 @@ msgid ""
 "as homepage URI instead."
 msgstr ""
 
-#: src/config/options.inc:1278
+#: src/config/options.inc:1315
 #, fuzzy
 msgid "Date format"
 msgstr "Tiedoston lähetys"
 
-#: src/config/options.inc:1280
+#: src/config/options.inc:1317
 msgid "Date format to use in dialogs. See strftime(3)."
 msgstr ""
 
-#: src/config/options.inc:1283
+#: src/config/options.inc:1320
 msgid "Set window title"
 msgstr ""
 
-#: src/config/options.inc:1285
+#: src/config/options.inc:1322
 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"
@@ -4169,7 +4215,7 @@ msgstr "Kansio"
 #. name:
 #: src/config/timer.c:73
 msgid "Periodic Saving"
-msgstr ""
+msgstr "Ajoittainen tallennus"
 
 #. name:
 #: src/config/urlhist.c:61
@@ -4180,7 +4226,7 @@ msgstr "Ei historiaa"
 #. name:
 #: src/cookies/cookies.c:80 src/cookies/cookies.c:858
 msgid "Cookies"
-msgstr ""
+msgstr "Evästeet"
 
 #: src/cookies/cookies.c:82
 msgid "Cookies options."
@@ -4226,9 +4272,8 @@ msgid ""
 msgstr ""
 
 #: src/cookies/cookies.c:109
-#, fuzzy
 msgid "Saving"
-msgstr "km"
+msgstr "Tallennus"
 
 #: src/cookies/cookies.c:111
 msgid "Whether cookies should be loaded from and save to disk."
@@ -4270,13 +4315,13 @@ msgid "no"
 msgstr "ei"
 
 #: src/cookies/dialogs.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to accept a cookie from %s?"
-msgstr "Haluatko tosiaan poistaa kaikki evästeet?"
+msgstr "Sallitko evästeen verkkoalueelta %s??"
 
 #: src/cookies/dialogs.c:78
 msgid "Accept cookie?"
-msgstr ""
+msgstr "Sallitko evästeen?"
 
 #. accelerator_context(accept_cookie_dialog)
 #: src/cookies/dialogs.c:81
@@ -4391,7 +4436,7 @@ msgstr "Linkki"
 
 #: src/dialogs/document.c:71
 msgid "Link title"
-msgstr ""
+msgstr "Linkin otsikko"
 
 #: src/dialogs/document.c:88
 #, fuzzy
@@ -4404,7 +4449,7 @@ msgstr ""
 
 #: src/dialogs/document.c:109
 msgid "Link title (from history)"
-msgstr ""
+msgstr "Linkin otsikko (historiasta)"
 
 #: src/dialogs/document.c:167
 msgid "assumed"
@@ -4481,12 +4526,12 @@ msgstr "Ik
 #. delete_marked_items_title
 #: src/dialogs/download.c:431
 msgid "Interrupt marked downloads"
-msgstr ""
+msgstr "Keskeytä merkityt lataukset"
 
 #. delete_marked_items
 #: src/dialogs/download.c:433
 msgid "Interrupt marked downloads?"
-msgstr ""
+msgstr "Keskeytätkö merkityt lataukset?"
 
 #. delete_item_title
 #: src/dialogs/download.c:439
@@ -4496,7 +4541,7 @@ msgstr "Keskeyt
 #: src/dialogs/download.c:441
 #, c-format
 msgid "Interrupt this download?"
-msgstr ""
+msgstr "Keskeytätkö tämän latauksen?"
 
 #. clear_all_items_title
 #: src/dialogs/download.c:443
@@ -5085,7 +5130,7 @@ msgid "Files:"
 msgstr "Tiedostot:"
 
 #. 2 '\n' + 1 '\0'
-#: src/dialogs/options.c:161
+#: src/dialogs/options.c:173
 #, c-format
 msgid ""
 "The environmental variable TERM is set to '%s'.\n"
@@ -5096,64 +5141,68 @@ msgid ""
 "each terminal in which you run ELinks."
 msgstr ""
 
-#: src/dialogs/options.c:187
+#: src/dialogs/options.c:199
 msgid "Terminal options"
 msgstr "Terminaaliasetukset"
 
-#: src/dialogs/options.c:196
+#: src/dialogs/options.c:208
 msgid "Frame handling:"
 msgstr "Kehysten käsittely:"
 
-#: src/dialogs/options.c:197
+#: src/dialogs/options.c:209
 msgid "No frames"
 msgstr "Ei kehyksiä"
 
-#: src/dialogs/options.c:198
+#: src/dialogs/options.c:210
 msgid "VT 100 frames"
 msgstr "VT 100 -kehykset"
 
-#: src/dialogs/options.c:199
+#: src/dialogs/options.c:211
 msgid "Linux or OS/2 frames"
 msgstr "Linux- tai OS/2-kehykset"
 
-#: src/dialogs/options.c:200
+#: src/dialogs/options.c:212
 msgid "FreeBSD frames"
 msgstr "FreeBSD-kehykset"
 
-#: src/dialogs/options.c:201
+#: src/dialogs/options.c:213
 msgid "KOI8-R frames"
 msgstr "KOI8-R-kehykset"
 
-#: src/dialogs/options.c:203
+#: src/dialogs/options.c:215
 msgid "Color mode:"
 msgstr "Värit:"
 
-#: src/dialogs/options.c:204
+#: src/dialogs/options.c:216
 msgid "No colors (mono)"
 msgstr "Ei värejä (yksiväri)"
 
-#: src/dialogs/options.c:205
+#: src/dialogs/options.c:217
 msgid "16 colors"
 msgstr "16 väriä"
 
-#: src/dialogs/options.c:207
-#, fuzzy
+#: src/dialogs/options.c:219
 msgid "88 colors"
-msgstr "16 väriä"
+msgstr "88 väriä"
 
-#: src/dialogs/options.c:210
+#: src/dialogs/options.c:222
 msgid "256 colors"
 msgstr "256 väriä"
 
-#: src/dialogs/options.c:295
+#: src/dialogs/options.c:225
+#, fuzzy
+msgid "true color"
+msgstr "Tekstialue"
+
+#: src/dialogs/options.c:309
 msgid "Resize terminal"
 msgstr "Aseta päätteen koko"
 
-#: src/dialogs/options.c:298
+#: src/dialogs/options.c:312
 msgid "Width="
 msgstr "Leveys="
 
-#: src/dialogs/options.c:299
+#: src/dialogs/options.c:313
 msgid "Height="
 msgstr "Korkeus="
 
@@ -5378,31 +5427,28 @@ msgstr "Ik
 
 #. delete_marked_items_title
 #: src/formhist/dialogs.c:128
-#, fuzzy
 msgid "Delete marked forms"
-msgstr "Valitse kenttä"
+msgstr "Poista merkityt lomakkeet"
 
 #. delete_marked_items
 #: src/formhist/dialogs.c:130
-#, fuzzy
 msgid "Delete marked forms?"
-msgstr "Valitse kenttä"
+msgstr "Poistatko merkityt lomakkeet?"
 
 #. delete_item_title
 #: src/formhist/dialogs.c:136
-#, fuzzy
 msgid "Delete form"
-msgstr "Poista kirjanmerkki"
+msgstr "Poista lomake"
 
 #: src/formhist/dialogs.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Delete this form?"
-msgstr "Poista kirjanmerkki"
+msgstr "Poistatko tämän lomakkeen?"
 
 #. clear_all_items_title
 #: src/formhist/dialogs.c:140
 msgid "Clear all forms"
-msgstr ""
+msgstr "Tyhjennä kaikki lomakkeet"
 
 #. clear_all_items_title
 #: src/formhist/dialogs.c:142
@@ -5519,7 +5565,7 @@ msgstr "Haluatko varmasti poistaa kaikki historiatiedot?"
 
 #: src/globhist/dialogs.c:169
 msgid "Search history"
-msgstr ""
+msgstr "Etsi historiasta"
 
 #. accelerator_context(src/globhist/dialogs.c:globhist_buttons)
 #: src/globhist/dialogs.c:227
@@ -5532,7 +5578,7 @@ msgstr "Yleishistorian hallinta"
 
 #: src/globhist/globhist.c:60
 msgid "Global history"
-msgstr ""
+msgstr "Yleishistoria"
 
 #: src/globhist/globhist.c:62
 msgid "Global history options."
@@ -5563,9 +5609,8 @@ msgstr ""
 
 #. name:
 #: src/globhist/globhist.c:448
-#, fuzzy
 msgid "Global History"
-msgstr "Ei historiaa"
+msgstr "Yleishistoria"
 
 # ympäristömuuttujilla määrätty
 #: src/intl/gettext/libintl.c:27
@@ -5673,11 +5718,9 @@ msgstr "romania"
 msgid "Russian"
 msgstr "venäjä"
 
-# TODO: vai "Haku"?
 #: src/intl/gettext/libintl.c:54
-#, fuzzy
 msgid "Serbian"
-msgstr "Etsintä"
+msgstr ""
 
 #: src/intl/gettext/libintl.c:55
 msgid "Slovak"
@@ -5763,9 +5806,8 @@ msgid "Debug"
 msgstr ""
 
 #: src/main/version.c:99
-#, fuzzy
 msgid "Fastmem"
-msgstr "nimi"
+msgstr ""
 
 #: src/main/version.c:102
 msgid "Own Libc Routines"
@@ -5846,7 +5888,6 @@ msgid "Block the terminal when the handler is running."
 msgstr ""
 
 #: src/mime/backend/default.c:71
-#, fuzzy
 msgid "Program"
 msgstr "Ohjelma"
 
@@ -5860,9 +5901,8 @@ msgstr ""
 "%-merkki korvataan tiedoston nimellä."
 
 #: src/mime/backend/default.c:78
-#, fuzzy
 msgid "File extension associations"
-msgstr "Ti~edostopäätteet"
+msgstr "Tiedostopäätteiden kytkennät"
 
 #: src/mime/backend/default.c:80
 msgid "Extension <-> MIME type association."
@@ -5877,7 +5917,7 @@ msgstr ""
 #. name:
 #: src/mime/backend/default.c:215
 msgid "Option system"
-msgstr ""
+msgstr "Asetusjärjestelmä"
 
 #. name:
 #: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
@@ -6287,9 +6327,8 @@ msgid ""
 msgstr ""
 
 #: src/network/state.c:122
-#, fuzzy
 msgid "BitTorrent error"
-msgstr "Sisäinen virhe"
+msgstr "BitTorrent-virhe"
 
 #: src/network/state.c:123
 msgid "The BitTorrent metainfo file contained errors"
@@ -6310,7 +6349,6 @@ msgstr "~Xterm"
 
 #. accelerator_context(open_in_new.beos, open_in_new.os2, open_in_new.win32)
 #: src/osdep/newwin.c:28
-#, fuzzy
 msgid "T~wterm"
 msgstr "~Twterm"
 
@@ -6428,17 +6466,15 @@ msgid "BitTorrent"
 msgstr "BitTorrent"
 
 #: src/protocol/bittorrent/bittorrent.c:28
-#, fuzzy
 msgid "BitTorrent specific options."
-msgstr "Ei ohjelmaa osoitettu"
+msgstr ""
 
 #. ******************************************************************
 #. Listening socket options:
 #. ******************************************************************
 #: src/protocol/bittorrent/bittorrent.c:34
-#, fuzzy
 msgid "Port range"
-msgstr "portugali"
+msgstr "Porttialue"
 
 #: src/protocol/bittorrent/bittorrent.c:36
 msgid "Port range allowed to be used for listening on."
@@ -6446,16 +6482,15 @@ msgstr ""
 
 #: src/protocol/bittorrent/bittorrent.c:38
 msgid "Minimum port"
-msgstr ""
+msgstr "Pienin porttinumero"
 
 #: src/protocol/bittorrent/bittorrent.c:40
 msgid "The minimum port to try and listen on."
 msgstr ""
 
 #: src/protocol/bittorrent/bittorrent.c:42
-#, fuzzy
 msgid "Maximum port"
-msgstr "Enimmäisikä"
+msgstr "Suurin porttinumero"
 
 #: src/protocol/bittorrent/bittorrent.c:44
 msgid "The maximum port to try and listen on."
@@ -6590,7 +6625,7 @@ msgstr ""
 
 #: src/protocol/bittorrent/bittorrent.c:120
 msgid "Length of requests"
-msgstr ""
+msgstr "Pyyntöjen pituus"
 
 #: src/protocol/bittorrent/bittorrent.c:122
 msgid ""
@@ -6637,9 +6672,8 @@ msgid ""
 msgstr ""
 
 #: src/protocol/bittorrent/bittorrent.c:154
-#, fuzzy
 msgid "Sharing rate"
-msgstr "Tallennustapa"
+msgstr ""
 
 #: src/protocol/bittorrent/bittorrent.c:156
 msgid ""
@@ -6762,14 +6796,12 @@ msgid "Directory"
 msgstr "Historia"
 
 #: src/protocol/bittorrent/dialogs.c:170
-#, fuzzy
 msgid "Files"
-msgstr "Tiedostot:"
+msgstr "Tiedostot"
 
 #: src/protocol/bittorrent/dialogs.c:183
-#, fuzzy
 msgid "Comment"
-msgstr "Kommentit"
+msgstr "Kommentti"
 
 #: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:399
 #, c-format
@@ -6856,9 +6888,8 @@ msgid "Upload"
 msgstr "Lataa uudelleen"
 
 #: src/protocol/bittorrent/dialogs.c:367
-#, fuzzy
 msgid "average"
-msgstr "Keskinopeus"
+msgstr "keskiarvo"
 
 #: src/protocol/bittorrent/dialogs.c:372
 msgid "1:1 in"
@@ -6866,9 +6897,8 @@ msgstr ""
 
 #. Sharing:
 #: src/protocol/bittorrent/dialogs.c:378
-#, fuzzy
 msgid "Sharing"
-msgstr "km"
+msgstr "Jakaminen:"
 
 #: src/protocol/bittorrent/dialogs.c:387
 #, fuzzy
@@ -6886,25 +6916,25 @@ msgid "Pieces"
 msgstr ""
 
 #: src/protocol/bittorrent/dialogs.c:397
-#, fuzzy, c-format
+#, c-format
 msgid "%u completed"
 msgid_plural "%u completed"
-msgstr[0] "epätäydellinen"
-msgstr[1] "epätäydellinen"
+msgstr[0] "%u kokonainen"
+msgstr[1] "%u kokonaista"
 
 #: src/protocol/bittorrent/dialogs.c:403
 #, c-format
 msgid "%u in progress"
 msgid_plural "%u in progress"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u kesken"
+msgstr[1] "%u kesken"
 
 #: src/protocol/bittorrent/dialogs.c:414
 #, c-format
 msgid "%u remaining"
 msgid_plural "%u remaining"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u jäljellä"
+msgstr[1] "%u jäljellä"
 
 #. Statistics:
 #: src/protocol/bittorrent/dialogs.c:419
@@ -6978,9 +7008,8 @@ msgid "Local CGI"
 msgstr "Paikallinen CGI"
 
 #: src/protocol/file/cgi.c:41
-#, fuzzy
 msgid "Local CGI specific options."
-msgstr "Ei ohjelmaa osoitettu"
+msgstr "Paikallista CGI:tä koskevat asetukset."
 
 #: src/protocol/file/cgi.c:45
 msgid "Colon separated list of directories, where CGI scripts are stored."
@@ -7672,7 +7701,7 @@ msgstr "Varaa p
 #: src/session/download.c:1192
 #, c-format
 msgid "The file will be opened with the program '%s'."
-msgstr ""
+msgstr "Tiedosto avataan ohjelmalla \"%s\"."
 
 #. accelerator_context(src/session/download.c:do_type_query)
 #: src/session/download.c:1213
@@ -7772,12 +7801,12 @@ msgstr ""
 msgid "Failed to create session."
 msgstr ""
 
-#: src/terminal/event.c:416
+#: src/terminal/event.c:437
 #, c-format
 msgid "Bad event %d"
 msgstr ""
 
-#: src/terminal/event.c:456
+#: src/terminal/event.c:477
 #, fuzzy, c-format
 msgid "Could not read event: %d (%s)"
 msgstr "Tiedostoon kirjoitus epäonnistui"
@@ -7786,25 +7815,25 @@ msgstr "Tiedostoon kirjoitus ep
 msgid "Too many bytes read from the itrm!"
 msgstr ""
 
-#: src/terminal/tab.c:211
+#: src/terminal/tab.c:212
 msgid "Do you really want to close the current tab?"
 msgstr "Haluatko varmasti sulkea nykyisen välilehden?"
 
-#: src/terminal/tab.c:254
+#: src/terminal/tab.c:255
 msgid "Do you really want to close all except the current tab?"
 msgstr "Haluatko varmasti sulkea kaikki paitsi nykyisen välilehden?"
 
-#: src/viewer/dump/dump.c:84
+#: src/viewer/dump/dump.c:87
 #, fuzzy, c-format
 msgid "Can't write to stdout: %s"
 msgstr "Töpseliin kirjoitus ei onnistu"
 
-#: src/viewer/dump/dump.c:87
+#: src/viewer/dump/dump.c:90
 #, fuzzy
 msgid "Can't write to stdout."
 msgstr "Töpseliin kirjoitus ei onnistu"
 
-#: src/viewer/dump/dump.c:277
+#: src/viewer/dump/dump.c:285
 #, c-format
 msgid "URL protocol not supported (%s)."
 msgstr ""
@@ -8058,9 +8087,8 @@ msgid "Search for text"
 msgstr "Etsi tekstiä"
 
 #: src/viewer/text/search.c:1660
-#, fuzzy
 msgid "Normal search"
-msgstr "Ei aikaisempaa hakua"
+msgstr "Tavallinen haku"
 
 #: src/viewer/text/search.c:1661
 msgid "Regexp search"

From a8c573a17409a7b0803b9534bd8d32b794be8130 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 2 Sep 2006 18:58:24 +0300
Subject: [PATCH 087/132] viewer: Document some members of struct form_state.

The new comments describe how the members were apparently intended to
be used.  However, the implementation does not actually work when
CONFIG_UTF_8 is defined, and the current semantics do not even allow
an efficient implementation of long (mostly scrolled out) strings.
---
 src/viewer/text/form.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/viewer/text/form.h b/src/viewer/text/form.h
index b813d77a..ed6164c8 100644
--- a/src/viewer/text/form.h
+++ b/src/viewer/text/form.h
@@ -37,11 +37,31 @@ struct form_state {
 	int position;
 	enum form_type type;
 
+	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @value is the text
+	 * string that the user can edit.  The string is null-terminated;
+	 * its length is not stored separately.  The size of the buffer
+	 * is not stored anywhere; extending the string always requires
+	 * calling realloc().  The string is not normally allowed to grow
+	 * past @form_control.maxlength bytes (not counting the null),
+	 * but there may be ways to get longer strings.  */
 	unsigned char *value;
+	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state is the byte
+	 * position of the insertion point in @value.
+	 * For FC_CHECKBOX and FC_RADIO, @state is 1 or 0.
+	 * For FC_SELECT, @state is the index of the selected item
+	 * in @form_control.labels.  */
 	int state;
 #ifdef CONFIG_UTF_8
+	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state_cell is the
+	 * number of cells needed for the text before the insertion
+	 * point.  (For FC_PASSWORD, each character is one cell.)
+	 * When CONFIG_UTF_8 is not defined, @state_cell is assumed
+	 * to be the same as @state.  */
 	int state_cell;
 #endif /* CONFIG_UTF_8 */
+	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @vpos is the number
+	 * of cells that scrolling has hidden at the left.  Thus, the
+	 * X offset of the cursor is @state_cell - @vpos.  */
 	int vpos;
 	int vypos;
 

From 216495188a0b326dd0524635806e983a6c8913eb Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 2 Sep 2006 18:28:31 +0300
Subject: [PATCH 088/132] UTF-8: New functions for stepping forward and
 backward in a string.

---
 src/intl/charsets.c | 140 ++++++++++++++++++++++++++++++++++++++++++++
 src/intl/charsets.h |  20 +++++++
 2 files changed, 160 insertions(+)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 11aedf28..edd9e484 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -376,6 +376,146 @@ utf8_cells2bytes(unsigned char *string, int max_cells, unsigned char *end)
 	return bytes;
 }
 
+/* Take @max steps forward from @string in the specified @way, but
+ * not going past @end.  Return the resulting address.  Store the
+ * number of steps taken to *@count, unless @count is NULL.
+ *
+ * This assumes the text is valid UTF-8, and @string and @end point to
+ * character boundaries.  If not, it doesn't crash but the results may
+ * be inconsistent.
+ *
+ * This function can do some of the same jobs as utf8charlen(),
+ * utf8_cells2bytes(), and strlen_utf8().  */
+unsigned char *
+utf8_step_forward(unsigned char *string, unsigned char *end,
+		  int max, enum utf8_step way, int *count)
+{
+	int steps = 0;
+	unsigned char *current = string;
+
+	assert(string);
+	assert(max >= 0);
+	if_assert_failed return string;
+	if (end == NULL)
+		end = strchr(string, '\0');
+
+	switch (way) {
+	case utf8_step_characters:
+		while (steps < max && current < end) {
+			++current;
+			if (utf8_islead(*current))
+				++steps;
+		}
+		break;
+
+	case utf8_step_cells_fewer:
+	case utf8_step_cells_more:
+		while (steps < max) {
+			unicode_val_T u;
+			unsigned char *prev = current;
+			int width;
+
+			u = utf_8_to_unicode(&current, end);
+			if (u == UCS_NO_CHAR) {
+				/* Assume the incomplete sequence
+				 * costs one cell.  */
+				current = end;
+				++steps;
+				break;
+			}
+
+			width = unicode_to_cell(u);
+			if (way == utf8_step_cells_fewer
+			    && steps + width > max) {
+				/* Back off.  */
+				current = prev;
+				break;
+			}
+			steps += width;
+		}
+		break;
+
+	default:
+		INTERNAL("impossible enum utf8_step");
+	}
+
+	if (count)
+		*count = steps;
+	return current;
+}
+
+/* Take @max steps backward from @string in the specified @way, but
+ * not going past @start.  Return the resulting address.  Store the
+ * number of steps taken to *@count, unless @count is NULL.
+ *
+ * This assumes the text is valid UTF-8, and @string and @start point
+ * to character boundaries.  If not, it doesn't crash but the results
+ * may be inconsistent.
+ *
+ * This function can do some of the same jobs as utf8_prevchar().  */
+unsigned char *
+utf8_step_backward(unsigned char *string, unsigned char *start,
+		   int max, enum utf8_step way, int *count)
+{
+	int steps = 0;
+	unsigned char *current = string;
+
+	assert(string);
+	assert(start);
+	assert(max >= 0);
+	if_assert_failed return string;
+
+	switch (way) {
+	case utf8_step_characters:
+		while (steps < max && current > start) {
+			--current;
+			if (utf8_islead(*current))
+				++steps;
+		}
+		break;
+
+	case utf8_step_cells_fewer:
+	case utf8_step_cells_more:
+		while (steps < max) {
+			unsigned char *prev = current;
+			unsigned char *look;
+			unicode_val_T u;
+			int width;
+
+			if (current <= start)
+				break;
+			do {
+				--current;
+			} while (current > start && !utf8_islead(*current));
+
+			look = current;
+			u = utf_8_to_unicode(&look, prev);
+			if (u == UCS_NO_CHAR) {
+				/* Assume the incomplete sequence
+				 * costs one cell.  */
+				width = 1;
+			} else
+				width = unicode_to_cell(u);
+
+			if (way == utf8_step_cells_fewer
+			    && steps + width > max) {
+				/* Back off.  */
+				current = prev;
+				break;
+			}
+			steps += width;
+		}
+		break;
+
+	default:
+		INTERNAL("impossible enum utf8_step");
+	}
+
+	if (count)
+		*count = steps;
+	return current;
+}
+
 /*
  * Find out number of standard terminal collumns needed for displaying symbol
  * (glyph) which represents Unicode character c.
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index c0452aff..84ce2e2f 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -71,6 +71,26 @@ int utf8_char2cells(unsigned char *, unsigned char *);
 int utf8_ptr2cells(unsigned char *, unsigned char *);
 int utf8_ptr2chars(unsigned char *, unsigned char *);
 int utf8_cells2bytes(unsigned char *, int, unsigned char *);
+/* How utf8_step_forward and utf8_step_backward count steps.  */
+enum utf8_step {
+	/* Each step is one character, even if it is a combining or
+	 * double-width character.  */
+	utf8_step_characters,
+
+	/* Each step is one cell.  If the specified number of steps
+	 * would end in the middle of a double-width character, do not
+	 * include the character.  */
+	utf8_step_cells_fewer,
+
+	/* Each step is one cell.  If the specified number of steps
+	 * would end in the middle of a double-width character,
+	 * include the whole character.  */
+	utf8_step_cells_more
+};
+unsigned char *utf8_step_forward(unsigned char *, unsigned char *,
+				 int, enum utf8_step, int *);
+unsigned char *utf8_step_backward(unsigned char *, unsigned char *,
+				  int, enum utf8_step, int *);
 inline int unicode_to_cell(unicode_val_T);
 unicode_val_T unicode_fold_label_case(unicode_val_T);
 inline int strlen_utf8(unsigned char **);

From e2685ae7b21501565f23bdaaa48660babd2ed416 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 2 Sep 2006 19:05:26 +0300
Subject: [PATCH 089/132] New function colspan_is_in_box()

---
 src/util/box.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/util/box.h b/src/util/box.h
index 112f1f39..dcb57274 100644
--- a/src/util/box.h
+++ b/src/util/box.h
@@ -28,6 +28,13 @@ col_is_in_box(struct box *box, int x)
 	return (x >= box->x && x < box->x + box->width);
 }
 
+/* Mainly intended for use with double-width characters.  */
+static inline int
+colspan_is_in_box(struct box *box, int x, int span)
+{
+	return (x >= box->x && x + span <= box->x + box->width);
+}
+
 
 static inline void
 set_box(struct box *box, int x, int y, int width, int height)

From 92845d0b56620bcb232250492a61e82aa64e3c88 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 2 Sep 2006 19:41:06 +0300
Subject: [PATCH 090/132] UTF-8: Reformat get_link_cursor_offset() a little.

---
 src/viewer/text/link.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 42d5c39b..1e507e23 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -128,12 +128,15 @@ get_link_cursor_offset(struct document_view *doc_view, struct link *link)
 		case LINK_FIELD:
 			fc = get_link_form_control(link);
 			fs = find_form_state(doc_view, fc);
+			if (!fs)
+				return 0;
 #ifdef CONFIG_UTF_8
-			if (utf8) {
-				return fs ? fs->state_cell - fs->vpos : 0;
-			} else
+			else if (utf8) {
+				return fs->state_cell - fs->vpos;
+			}
 #endif /* CONFIG_UTF_8 */
-				return fs ? fs->state - fs->vpos : 0;
+			else
+				return fs->state - fs->vpos;
 
 		case LINK_AREA:
 			fc = get_link_form_control(link);

From 8d77387f6f3d5ba10168b277b9d32c020439bdcc Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 27 Aug 2006 23:41:41 +0300
Subject: [PATCH 091/132] UTF-8: Fix scrolling of input fields.

form_state.state_cell is no longer used for FC_TEXT, FC_PASSWORD, nor FC_FILE.
Instead, get_link_cursor_offset() computes the cell with utf8_ptr2chars
(a new function) or utf8_ptr2cells.  This shouldn't slow down ELinks too
much, as it's done only for the selected link and only once per redraw.

The left side of a scrolled input field is always aligned at a
character boundary.  The right side might not be.
---
 src/viewer/text/form.c | 133 +++++++++++++++++++++++++++++++++--------
 src/viewer/text/form.h |  14 ++---
 src/viewer/text/link.c |  10 +++-
 3 files changed, 121 insertions(+), 36 deletions(-)

diff --git a/src/viewer/text/form.c b/src/viewer/text/form.c
index ee3ad333..e2248d68 100644
--- a/src/viewer/text/form.c
+++ b/src/viewer/text/form.c
@@ -342,7 +342,8 @@ draw_form_entry(struct terminal *term, struct document_view *doc_view,
 	switch (fc->type) {
 		unsigned char *s;
 #ifdef CONFIG_UTF_8
-		unsigned char *text, *end;
+		unsigned char *text, *end, *last_in_view;
+		int retried;
 #endif /* CONFIG_UTF_8 */
 		int len;
 		int i, x, y;
@@ -379,38 +380,118 @@ draw_form_entry(struct terminal *term, struct document_view *doc_view,
 			break;
 #ifdef CONFIG_UTF_8
 utf_8:
-			end = NULL; /* Shut up the compiler. */
-			int_bounds(&fs->vpos, fs->state_cell - fc->size + 1, fs->state_cell);
-			if (fc->type == FC_PASSWORD)
-				len = utf8_ptr2chars(fs->value + fs->vpos, NULL);
-			else
-				len = utf8_ptr2cells(fs->value + fs->vpos, NULL);
+			retried = 0;
+
+retry_after_scroll:
 			text = fs->value;
-			end = strchr(text, '\0');
+			if (!text) text = "";
+			len = strlen(text);
+			int_bounds(&fs->state, 0, len);
+			int_bounds(&fs->vpos, 0, fs->state);
+			end = text + len;
+			text += fs->vpos;
+			last_in_view = NULL;
 
-
-			for (i = 0; i < fc->size; i++, x++) {
+			for (i = 0; i < fc->size; ) {
 				unicode_val_T data;
+				int cells, cell;
+				unsigned char *maybe_in_view = text;
 
-				if (!col_is_in_box(box, x)) continue;
-
-				if (fs->value && i >= -fs->vpos && i < len) {
-					if (fc->type != FC_PASSWORD)
-						data = utf_8_to_unicode(&text, end);
-					else
-						data = '*';
-				} else
+				data = utf_8_to_unicode(&text, end);
+				if (data == UCS_NO_CHAR) /* end of string */
 					data = '_';
+				else if (fc->type == FC_PASSWORD)
+					data = '*';
 
-				if (unicode_to_cell(data) == 2) {
-					if (i + 1 < fc->size) {
-						draw_char_data(term, x++, y, data);
-						data = UCS_NO_CHAR;
-						i++;
-					} else
-						data = ' ';
+				cells = unicode_to_cell(data);
+				if (i + cells <= fc->size) {
+					last_in_view = maybe_in_view;
+					if (colspan_is_in_box(box, x + i, cells)) {
+						/* The character fits completely.
+						 * Draw the character, and mark any
+						 * further cells with UCS_NO_CHAR.  */
+						draw_char_data(term, x + i, y, data);
+						for (cell = 1; cell < cells; cell++)
+							draw_char_data(term, x + i + cell,
+								       y, UCS_NO_CHAR);
+						goto drew_char;
+					}
+				}
+
+				/* The character does not fit completely.
+				 * Write spaces to the cells that do fit.  */
+				for (cell = 0; cell < cells; cell++) {
+					if (col_is_in_box(box, x + i + cell)
+					    && i + cell < fc->size)
+						draw_char_data(term,
+							       x + i + cell,
+							       y, ' ');
+				}
+
+drew_char:
+				i += cells;
+			}
+
+			/* The int_bounds calls above ensured that the
+			 * insertion point cannot be at the left side
+			 * of the scrolled-visible part of the text.
+			 * However it can still be at the right side.
+			 * Check whether we need to change fs->vpos.
+			 *
+			 * This implementation attempts to follow
+			 * these rules:
+			 * - If the insertion point is at the end of
+			 *   the string, leave at least one empty cell
+			 *   so that there is a place for the cursor.
+			 * - If a character follows the insertion
+			 *   point, make that character fully visible;
+			 *   note the character may be double-width.
+			 * - If fc->size < 2, it is not possible to
+			 *   make a double-width character fully
+			 *   visible.  In this case, it is OK if the
+			 *   output is ugly, but ELinks must not fall
+			 *   into an infinite loop or crash.
+			 * - The length of the string should not affect
+			 *   how long this function takes.  The width
+			 *   of the widget naturally will.
+			 * - Optimize the case where fields are drawn
+			 *   several times without being modified.
+			 *
+			 * It follows that:
+			 * - If the "for i" loop above hit UCS_NO_CHAR,
+			 *   then there is no need to scroll.
+			 * - When the string ends with a double-width
+			 *   character that fits in only partially,
+			 *   then text==end, but the field may have
+			 *   to be scrolled.  */
+			if (fs->value && last_in_view
+			    && last_in_view < fs->value + fs->state) {
+				unsigned char *ptr = fs->value + fs->state;
+				int cells = fc->size;
+				enum utf8_step how = (fc->type == FC_PASSWORD)
+					? utf8_step_characters
+					: utf8_step_cells_fewer;
+
+				/* The insertion point is at the right
+				 * side of the scrolled-visible part
+				 * of the text.  Decide a new fs->vpos
+				 * by counting cells backwards from
+				 * @ptr.  But first advance @ptr past
+				 * the character that follows the
+				 * insertion point, so that it will be
+				 * fully displayed.  If there is no
+				 * such character, reserve one cell
+				 * for the cursor anyway.  */
+				if (utf_8_to_unicode(&ptr, end) == UCS_NO_CHAR)
+					--cells;
+				ptr = utf8_step_backward(ptr, fs->value,
+							 cells, how, NULL);
+
+				if (fs->vpos != ptr - fs->value) {
+					fs->vpos = ptr - fs->value;
+					retried = 1;
+					goto retry_after_scroll;
 				}
-				draw_char_data(term, x, y, data);
 			}
 			break;
 #endif /* CONFIG_UTF_8 */
diff --git a/src/viewer/text/form.h b/src/viewer/text/form.h
index ed6164c8..dc8c7c2c 100644
--- a/src/viewer/text/form.h
+++ b/src/viewer/text/form.h
@@ -52,16 +52,14 @@ struct form_state {
 	 * in @form_control.labels.  */
 	int state;
 #ifdef CONFIG_UTF_8
-	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state_cell is the
-	 * number of cells needed for the text before the insertion
-	 * point.  (For FC_PASSWORD, each character is one cell.)
-	 * When CONFIG_UTF_8 is not defined, @state_cell is assumed
-	 * to be the same as @state.  */
+	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state_cell is not
+	 * used.  There is still code that updates it; such code
+	 * should be removed.  */
 	int state_cell;
 #endif /* CONFIG_UTF_8 */
-	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @vpos is the number
-	 * of cells that scrolling has hidden at the left.  Thus, the
-	 * X offset of the cursor is @state_cell - @vpos.  */
+	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @vpos is the index
+	 * of the first displayed byte in @value.  It should never be
+	 * in the middle of a character.  */
 	int vpos;
 	int vypos;
 
diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 1e507e23..2fef6c6f 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -128,11 +128,17 @@ get_link_cursor_offset(struct document_view *doc_view, struct link *link)
 		case LINK_FIELD:
 			fc = get_link_form_control(link);
 			fs = find_form_state(doc_view, fc);
-			if (!fs)
+			if (!fs || !fs->value)
 				return 0;
 #ifdef CONFIG_UTF_8
 			else if (utf8) {
-				return fs->state_cell - fs->vpos;
+				unsigned char *scroll = fs->value + fs->vpos;
+				unsigned char *point = fs->value + fs->state;
+
+				if (fs->type == FC_PASSWORD)
+					return utf8_ptr2chars(scroll, point);
+				else
+					return utf8_ptr2cells(scroll, point);
 			}
 #endif /* CONFIG_UTF_8 */
 			else

From cc6939b9f8eb1cddec77d1f70bd630d652093101 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 2 Sep 2006 23:16:32 +0300
Subject: [PATCH 092/132] UTF-8: Don't update form_state.state_cell if it is
 not used.

FC_TEXT, FC_PASSWORD, and FC_FILE do not use state_cell.
FC_TEXTAREA does use it.
---
 src/viewer/text/form.c | 78 ++++--------------------------------------
 src/viewer/text/form.h |  3 +-
 2 files changed, 8 insertions(+), 73 deletions(-)

diff --git a/src/viewer/text/form.c b/src/viewer/text/form.c
index e2248d68..70059ebd 100644
--- a/src/viewer/text/form.c
+++ b/src/viewer/text/form.c
@@ -164,10 +164,6 @@ init_form_state(struct form_control *fc, struct form_state *fs)
 			fs->value = stracpy(fc->default_value);
 			fs->state = strlen(fc->default_value);
 #ifdef CONFIG_UTF_8
-			if (fc->type == FC_TEXT)
-				fs->state_cell = utf8_ptr2cells(fs->value, NULL);
-			if (fc->type == FC_PASSWORD)
-				fs->state_cell = utf8_ptr2chars(fs->value, NULL);
 			if (fc->type == FC_TEXTAREA)
 				fs->state_cell = 0;
 #endif /* CONFIG_UTF_8 */
@@ -176,9 +172,6 @@ init_form_state(struct form_control *fc, struct form_state *fs)
 		case FC_FILE:
 			fs->value = stracpy("");
 			fs->state = 0;
-#ifdef CONFIG_UTF_8
-			fs->state_cell = 0;
-#endif /* CONFIG_UTF_8 */
 			fs->vpos = 0;
 			break;
 		case FC_SELECT:
@@ -1391,20 +1384,10 @@ field_op(struct session *ses, struct document_view *doc_view,
 				break;
 			}
 			if (utf8) {
-				int old_state = fs->state;
 				unsigned char *new_value;
-				int cells;
 
 				new_value = utf8_prevchar(fs->value + fs->state, 1, fs->value);
 				fs->state = new_value - fs->value;
-
-				if (old_state != fs->state) {
-					if (fc->type == FC_PASSWORD)
-						cells = 1;
-					else
-						cells = utf8_char2cells(new_value, NULL);
-					fs->state_cell = int_max(fs->state_cell - cells, 0);
-				}
 			} else
 #endif /* CONFIG_UTF_8 */
 				fs->state = int_max(fs->state - 1, 0);
@@ -1418,17 +1401,9 @@ field_op(struct session *ses, struct document_view *doc_view,
 			if (utf8) {
 				unsigned char *text = fs->value + fs->state;
 				unsigned char *end = strchr(text, '\0');
-				int old_state = fs->state;
-				unicode_val_T data = utf_8_to_unicode(&text, end);
 
+				utf_8_to_unicode(&text, end);
 				fs->state = (int)(text - fs->value);
-				if (old_state != fs->state) {
-					if (fc->type == FC_PASSWORD)
-						fs->state_cell = int_min(fs->state_cell + 1,
-								         utf8_ptr2cells(fs->value, NULL));
-					else
-						fs->state_cell += unicode_to_cell(data);
-				}
 			} else
 #endif /* CONFIG_UTF_8 */
 				fs->state = int_min(fs->state + 1, strlen(fs->value));
@@ -1439,7 +1414,6 @@ field_op(struct session *ses, struct document_view *doc_view,
 				status = textarea_op_home(fs, fc, utf8);
 			} else {
 				fs->state = 0;
-				fs->state_cell = 0;
 			}
 #else
 			if (fc->type == FC_TEXTAREA) {
@@ -1479,29 +1453,19 @@ field_op(struct session *ses, struct document_view *doc_view,
 #endif /* CONFIG_UTF_8 */
 			} else {
 				fs->state = strlen(fs->value);
-#ifdef CONFIG_UTF_8
-				if (utf8 && fc->type != FC_PASSWORD)
-					fs->state_cell = utf8_ptr2cells(fs->value,
-									fs->value + fs->state);
-				else if(utf8)
-					fs->state_cell = utf8_ptr2chars(fs->value,
-									fs->value + fs->state);
-#endif /* CONFIG_UTF_8 */
 			}
 			break;
 		case ACT_EDIT_BEGINNING_OF_BUFFER:
 			if (fc->type == FC_TEXTAREA) {
 #ifdef CONFIG_UTF_8
 				status = textarea_op_bob(fs, fc, utf8);
+				fs->state_cell = 0;
 #else
 				status = textarea_op_bob(fs, fc);
 #endif /* CONFIG_UTF_8 */
 			} else {
 				fs->state = 0;
 			}
-#ifdef CONFIG_UTF_8
-				fs->state_cell = 0;
-#endif /* CONFIG_UTF_8 */
 			break;
 		case ACT_EDIT_END_OF_BUFFER:
 			if (fc->type == FC_TEXTAREA) {
@@ -1512,15 +1476,6 @@ field_op(struct session *ses, struct document_view *doc_view,
 #endif /* CONFIG_UTF_8 */
 			} else {
 				fs->state = strlen(fs->value);
-#ifdef CONFIG_UTF_8
-				if (utf8 && fc->type != FC_PASSWORD)
-					fs->state_cell = utf8_ptr2cells(fs->value,
-									fs->value + fs->state);
-				else if(utf8)
-					fs->state_cell = utf8_ptr2chars(fs->value,
-									fs->value + fs->state);
-
-#endif /* CONFIG_UTF_8 */
 			}
 			break;
 		case ACT_EDIT_OPEN_EXTERNAL:
@@ -1539,7 +1494,8 @@ field_op(struct session *ses, struct document_view *doc_view,
 				fs->value[0] = 0;
 			fs->state = 0;
 #ifdef CONFIG_UTF_8
-			fs->state_cell = 0;
+			if (fc->type == FC_TEXTAREA)
+				fs->state_cell = 0;
 #endif /* CONFIG_UTF_8 */
 			break;
 		case ACT_EDIT_PASTE_CLIPBOARD:
@@ -1557,14 +1513,8 @@ field_op(struct session *ses, struct document_view *doc_view,
 					memmove(v, text, length + 1);
 					fs->state = strlen(fs->value);
 #ifdef CONFIG_UTF_8
-					if(utf8 && fc->type == FC_PASSWORD)
-						fs->state_cell = utf8_ptr2chars(fs->value,
-										fs->value + fs->state);
-					else if (utf8 && fc->type == FC_TEXTAREA)
+					if (utf8 && fc->type == FC_TEXTAREA)
 						fs->state_cell = 0;
-					else if (utf8)
-						fs->state_cell = utf8_ptr2cells(fs->value,
-										fs->value + fs->state);
 #endif /* CONFIG_UTF_8 */
 				}
 			}
@@ -1612,10 +1562,6 @@ field_op(struct session *ses, struct document_view *doc_view,
 				if (old_state != fs->state) {
 					if (fc->type == FC_TEXTAREA)
 						fs->state_cell = 0;
-					else if (fc->type == FC_PASSWORD)
-						fs->state_cell = int_max(fs->state_cell - 1, 0);
-					else
-						fs->state_cell -= utf8_char2cells(new_value, NULL);
 					length = strlen(fs->value + old_state) + 1;
 					memmove(new_value, fs->value + old_state, length);
 				}
@@ -1685,14 +1631,8 @@ field_op(struct session *ses, struct document_view *doc_view,
 			fs->state = (int) (text - fs->value);
 #ifdef CONFIG_UTF_8
 			if (utf8) {
-				if(fc->type == FC_PASSWORD)
-					fs->state_cell = utf8_ptr2cells(fs->value,
-									fs->value + fs->state);
-				else if (fc->type == FC_TEXTAREA)
+				if (fc->type == FC_TEXTAREA)
 					fs->state_cell = 0;
-				else
-					fs->state_cell = utf8_ptr2cells(fs->value,
-									fs->value + fs->state);
 			}
 #endif /* CONFIG_UTF_8 */
 			break;
@@ -1821,12 +1761,8 @@ field_op(struct session *ses, struct document_view *doc_view,
 				}
 
 				fs->state += length;
-				if (fc->type == FC_PASSWORD)
-					fs->state_cell += (is_cp_utf8(cp) ? 1 : length);
-				else if (fc->type == FC_TEXTAREA)
+				if (fc->type == FC_TEXTAREA)
 					fs->state_cell = 0;
-				else
-					fs->state_cell += (is_cp_utf8(cp) ? unicode_to_cell(get_kbd_key(ev)) : length);
 			}
 #else
 			fs->value[fs->state++] = get_kbd_key(ev);
diff --git a/src/viewer/text/form.h b/src/viewer/text/form.h
index dc8c7c2c..81e87ce7 100644
--- a/src/viewer/text/form.h
+++ b/src/viewer/text/form.h
@@ -53,8 +53,7 @@ struct form_state {
 	int state;
 #ifdef CONFIG_UTF_8
 	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state_cell is not
-	 * used.  There is still code that updates it; such code
-	 * should be removed.  */
+	 * used.  */
 	int state_cell;
 #endif /* CONFIG_UTF_8 */
 	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @vpos is the index

From 86c9cb01ba955a668d88d06ff2d7d222f2a8f76e Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 27 Aug 2006 13:14:30 +0300
Subject: [PATCH 093/132] add_accesskey_to_string: Add the Alt modifier to the
 string, too.

The link information window will now display e.g. "(Alt-f)" rather
than just "(f)", becoming easier to understand.
---
 src/config/kbdbind.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/config/kbdbind.h b/src/config/kbdbind.h
index 9f42847a..c2965844 100644
--- a/src/config/kbdbind.h
+++ b/src/config/kbdbind.h
@@ -187,7 +187,9 @@ void add_keystroke_to_string(struct string *str, struct term_event_keyboard *kbd
 	 * converted from unicode_val_T to that.		\
 	 * #ifdef CONFIG_UTF_8, the code is correct.  */	\
 	kbd.key = accesskey;					\
-	kbd.modifier = KBD_MOD_NONE;				\
+	/* try_document_key() recognizes only Alt-accesskey	\
+	 * combos.  */						\
+	kbd.modifier = KBD_MOD_ALT;				\
 	add_keystroke_to_string(str, &kbd, 0); 			\
 } while (0)
 

From a01be8bd6b5d3150e897d4c57e90b6d2e8d81f8d Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 3 Sep 2006 03:08:56 +0300
Subject: [PATCH 094/132] UTF-8: Stepping functions set *count even if an
 assertion fails.

Previously, utf8_step_forward() and utf8_step_backward() left *count
unchanged if some parameter was invalid.  Now, they properly store 0.
This flaw had no effect in practice, because all current callers pass
count=NULL, and invalid parameters shouldn't be used anyway.
---
 src/intl/charsets.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index edd9e484..d8ecaa2d 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -395,7 +395,7 @@ utf8_step_forward(unsigned char *string, unsigned char *end,
 
 	assert(string);
 	assert(max >= 0);
-	if_assert_failed return string;
+	if_assert_failed goto invalid_arg;
 	if (end == NULL)
 		end = strchr(string, '\0');
 
@@ -439,6 +439,7 @@ utf8_step_forward(unsigned char *string, unsigned char *end,
 		INTERNAL("impossible enum utf8_step");
 	}
 
+invalid_arg:
 	if (count)
 		*count = steps;
 	return current;
@@ -463,7 +464,7 @@ utf8_step_backward(unsigned char *string, unsigned char *start,
 	assert(string);
 	assert(start);
 	assert(max >= 0);
-	if_assert_failed return string;
+	if_assert_failed goto invalid_arg;
 
 	switch (way) {
 	case utf8_step_characters:
@@ -511,6 +512,7 @@ utf8_step_backward(unsigned char *string, unsigned char *start,
 		INTERNAL("impossible enum utf8_step");
 	}
 
+invalid_arg:
 	if (count)
 		*count = steps;
 	return current;

From 521944db17bddf11d3cb6df82ec91381036b2377 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 3 Sep 2006 08:27:50 +0200
Subject: [PATCH 095/132] Polish translation was updated.

---
 po/pl.po | 124 +++++++++++++++++++++++++++----------------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 599e7b14..1d6f95f0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-26 19:34+0200\n"
-"PO-Revision-Date: 2006-08-26 20:00+0200\n"
+"POT-Creation-Date: 2006-09-03 08:24+0200\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"
 "MIME-Version: 1.0\n"
@@ -127,7 +127,7 @@ msgstr "B
 #: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
 #: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
 #: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
-#: src/terminal/tab.c:213 src/terminal/tab.c:256
+#: src/terminal/tab.c:214 src/terminal/tab.c:257
 msgid "~Yes"
 msgstr "~Tak"
 
@@ -135,7 +135,7 @@ msgstr "~Tak"
 #: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
 #: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
 #: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
-#: src/terminal/tab.c:214 src/terminal/tab.c:257
+#: src/terminal/tab.c:215 src/terminal/tab.c:258
 msgid "~No"
 msgstr "~Nie"
 
@@ -1143,8 +1143,8 @@ msgstr "Prze
 msgid "Submit form and reload"
 msgstr "Prześlij formularz i przeładuj"
 
-#: src/config/actions-main.inc:101 src/terminal/tab.c:210
-#: src/terminal/tab.c:253
+#: src/config/actions-main.inc:101 src/terminal/tab.c:211
+#: src/terminal/tab.c:254
 msgid "Close tab"
 msgstr "Zamknij kartę"
 
@@ -2224,13 +2224,13 @@ msgid ""
 "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"
-"in the style of e.g. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Czy próbować połączyć się z serwerem przy pomocy IPv4?\n"
 "Jeśli connection.try_ipv6 jest także włączone, to ma\n"
 "pierwszeństwo. Lepiej nie dotykaj tego, dopóki nie wiesz\n"
 "co robisz. Pamiętaj, że możesz wymusić dany protokół\n"
-"przy połączeniu używając URL-a w stylu np. http4://elinks.or.cz/."
+"przy połączeniu używając URL-a w stylu np. http4://elinks.cz/."
 
 #: src/config/options.inc:110
 msgid ""
@@ -2238,12 +2238,12 @@ msgid ""
 "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"
-"in the style of e.g. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Czy próbować połączyć się z serwerem przy pomocy IPv4?\n"
 "Nie dotykaj tej opcji.\n"
 "Pamiętaj, żę możesz wymusić dany protokół przy połączeniu\n"
-"używając URL-a w stylu np. http4://elinks.or.cz/."
+"używając URL-a w stylu np. http4://elinks.cz/."
 
 #: src/config/options.inc:118
 msgid "Try IPv6 when connecting"
@@ -2254,11 +2254,11 @@ 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"
-"in the style of i.e. http6://elinks.or.cz/."
+"in the style of e.g. http6://elinks.cz/."
 msgstr ""
 "Czy próbować połączyć się z serwerem przy pomocy IPv6?\n"
 "Pamiętaj, że możesz także wymusić dany protokół przy\n"
-"połączeniu używając URL-a w stylu np. http6://elinks.or.cz/."
+"połączeniu używając URL-a w stylu np. http6://elinks.cz/."
 
 #: src/config/options.inc:126
 msgid "Timeout for non-restartable connections"
@@ -4059,7 +4059,7 @@ msgstr "Tekst"
 msgid "Dialog text colors."
 msgstr "Kolory tekstu w oknie dialogowym."
 
-#: src/config/options.inc:1063 src/viewer/text/form.c:1780
+#: src/config/options.inc:1063 src/viewer/text/form.c:1797
 msgid "Checkbox"
 msgstr "Przycisk wyboru"
 
@@ -4111,7 +4111,7 @@ msgstr "Klawisz skr
 msgid "Selected button shortcut"
 msgstr "Klawisz skrótu wybranego przycisku"
 
-#: src/config/options.inc:1091 src/viewer/text/form.c:1784
+#: src/config/options.inc:1091 src/viewer/text/form.c:1801
 msgid "Text field"
 msgstr "Pole tekstowe"
 
@@ -8605,24 +8605,24 @@ msgstr "Nie mo
 msgid "Too many bytes read from the itrm!"
 msgstr "Zbyt dużo bajtów przeczytanych z itrm!"
 
-#: src/terminal/tab.c:211
+#: src/terminal/tab.c:212
 msgid "Do you really want to close the current tab?"
 msgstr "Czy na pewno chcesz zamknąć bieżącą kartę?"
 
-#: src/terminal/tab.c:254
+#: src/terminal/tab.c:255
 msgid "Do you really want to close all except the current tab?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie karty za wyjątkiem bieżącej?"
 
-#: src/viewer/dump/dump.c:84
+#: src/viewer/dump/dump.c:87
 #, c-format
 msgid "Can't write to stdout: %s"
 msgstr "Błąd przy zapisywaniu na standardowe wyjście: %s"
 
-#: src/viewer/dump/dump.c:87
+#: src/viewer/dump/dump.c:90
 msgid "Can't write to stdout."
 msgstr "Nie można zapisać na standardowe wyjście."
 
-#: src/viewer/dump/dump.c:277
+#: src/viewer/dump/dump.c:285
 #, c-format
 msgid "URL protocol not supported (%s)."
 msgstr "Protokół URL-a nie obsługiwany (%s)."
@@ -8637,202 +8637,202 @@ msgstr "Brakuj
 msgid "The requested fragment \"#%s\" doesn't exist."
 msgstr "Wybrany fragment \"#%s\" nie istnieje."
 
-#: src/viewer/text/form.c:949
+#: src/viewer/text/form.c:1023
 msgid "Error while posting form"
 msgstr "Wystąpił błąd podczas wysyłania formularza"
 
-#: src/viewer/text/form.c:950
+#: src/viewer/text/form.c:1024
 #, c-format
 msgid "Could not load file %s: %s"
 msgstr "Nie można wczytać pliku %s: %s"
 
-#: src/viewer/text/form.c:1765
+#: src/viewer/text/form.c:1782
 msgid "Reset form"
 msgstr "Wyczyść formularz"
 
 #
-#: src/viewer/text/form.c:1767
+#: src/viewer/text/form.c:1784
 msgid "Harmless button"
 msgstr "Nieszkodliwy przycisk"
 
-#: src/viewer/text/form.c:1775
+#: src/viewer/text/form.c:1792
 msgid "Submit form to"
 msgstr "Prześlij formularz do"
 
-#: src/viewer/text/form.c:1776
+#: src/viewer/text/form.c:1793
 msgid "Post form to"
 msgstr "Wyślij formularz do"
 
-#: src/viewer/text/form.c:1778
+#: src/viewer/text/form.c:1795
 msgid "Radio button"
 msgstr "Okrągły przycisk"
 
-#: src/viewer/text/form.c:1782
+#: src/viewer/text/form.c:1799
 msgid "Select field"
 msgstr "Pole wyboru"
 
-#: src/viewer/text/form.c:1786
+#: src/viewer/text/form.c:1803
 msgid "Text area"
 msgstr "Pole tekstowe"
 
-#: src/viewer/text/form.c:1788
+#: src/viewer/text/form.c:1805
 msgid "File upload"
 msgstr "Ładowanie pliku"
 
-#: src/viewer/text/form.c:1790
+#: src/viewer/text/form.c:1807
 msgid "Password field"
 msgstr "Pole hasła"
 
-#: src/viewer/text/form.c:1828
+#: src/viewer/text/form.c:1845
 msgid "name"
 msgstr "nazwa"
 
-#: src/viewer/text/form.c:1840
+#: src/viewer/text/form.c:1857
 msgid "value"
 msgstr "wartość"
 
-#: src/viewer/text/form.c:1853
+#: src/viewer/text/form.c:1870
 msgid "read only"
 msgstr "tylko do odczytu"
 
-#: src/viewer/text/form.c:1864
+#: src/viewer/text/form.c:1881
 #, c-format
 msgid "press %s to navigate"
 msgstr "wciśnij %s aby nawigować"
 
-#: src/viewer/text/form.c:1866
+#: src/viewer/text/form.c:1883
 #, c-format
 msgid "press %s to edit"
 msgstr "wciśnij %s aby edytować"
 
-#: src/viewer/text/form.c:1902
+#: src/viewer/text/form.c:1919
 #, c-format
 msgid "press %s to submit to %s"
 msgstr "wciśnij %s aby wysłać do %s"
 
-#: src/viewer/text/form.c:1904
+#: src/viewer/text/form.c:1921
 #, c-format
 msgid "press %s to post to %s"
 msgstr "wciśnij %s aby wysłać do %s"
 
 #
-#: src/viewer/text/form.c:2006
+#: src/viewer/text/form.c:2023
 msgid "Useless button"
 msgstr "Bezużyteczny przycisk"
 
-#: src/viewer/text/form.c:2008
+#: src/viewer/text/form.c:2025
 msgid "Submit button"
 msgstr "Przycisk wysłania formularza"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1262
+#: src/viewer/text/link.c:1271
 msgid "Display ~usemap"
 msgstr "Pokaż ~mapę obrazków"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1267
+#: src/viewer/text/link.c:1276
 msgid "~Follow link"
 msgstr "Wybierz od~nośnik"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1269
+#: src/viewer/text/link.c:1278
 msgid "Follow link and r~eload"
 msgstr "Wybierz odnośnik i p~rzeładuj"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1273
+#: src/viewer/text/link.c:1282
 msgid "Open in new ~window"
 msgstr "Otwórz w no~wym oknie"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1275
+#: src/viewer/text/link.c:1284
 msgid "Open in new ~tab"
 msgstr "Otwórz w nowej ~karcie"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1277
+#: src/viewer/text/link.c:1286
 msgid "Open in new tab in ~background"
 msgstr "Otwórz w nowej k~arcie w tle"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1282
+#: src/viewer/text/link.c:1291
 msgid "~Download link"
 msgstr "~Pobierz"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1285
+#: src/viewer/text/link.c:1294
 msgid "~Add link to bookmarks"
 msgstr "~Dodaj zakładkę"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1289
+#: src/viewer/text/link.c:1298
 msgid "Pass link URI to e~xternal command"
 msgstr "Przekaż URI odnośnika do z~ewnętrznego polecenia"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1300 src/viewer/text/link.c:1340
+#: src/viewer/text/link.c:1309 src/viewer/text/link.c:1349
 msgid "~Reset form"
 msgstr "Wy~czyść formularz"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1315
+#: src/viewer/text/link.c:1324
 msgid "Open in ~external editor"
 msgstr "Otwórz w zewnętrznym ~edytorze"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1323
+#: src/viewer/text/link.c:1332
 msgid "~Submit form"
 msgstr "~Prześlij formularz"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1324
+#: src/viewer/text/link.c:1333
 msgid "Submit form and rel~oad"
 msgstr "Prześlij fo~rmularz i przeładuj"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1328
+#: src/viewer/text/link.c:1337
 msgid "Submit form and open in new ~window"
 msgstr "Prześlij ~formularz i otwórz w nowym oknie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1330
+#: src/viewer/text/link.c:1339
 msgid "Submit form and open in new ~tab"
 msgstr "Prześlij formularz i otwórz na nowej ~karcie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1333
+#: src/viewer/text/link.c:1342
 msgid "Submit form and open in new tab in ~background"
 msgstr "Prześlij formularz i otwórz w ~tle na nowej karcie"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1338
+#: src/viewer/text/link.c:1347
 msgid "Submit form and ~download"
 msgstr "Prześlij formu~larz i ściągnij"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1345
+#: src/viewer/text/link.c:1354
 msgid "Form f~ields"
 msgstr "Pola form~ularza"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1352
+#: src/viewer/text/link.c:1361
 msgid "V~iew image"
 msgstr "Pokaż o~brazek"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1354
+#: src/viewer/text/link.c:1363
 msgid "Download ima~ge"
 msgstr "Pobierz ~obrazek"
 
-#: src/viewer/text/link.c:1363
+#: src/viewer/text/link.c:1372
 msgid "No link selected"
 msgstr "Nie wybrano żadnego odnośnika"
 
-#: src/viewer/text/link.c:1433
+#: src/viewer/text/link.c:1442
 msgid "Image"
 msgstr "Obrazek"
 
-#: src/viewer/text/link.c:1438
+#: src/viewer/text/link.c:1447
 msgid "Usemap"
 msgstr "Mapa obrazków"
 

From fcc00bcfd97ffbecd150c854f56eefe3ad501062 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 3 Sep 2006 09:27:21 +0200
Subject: [PATCH 096/132] Added uninstall target to the Makefile.

---
 Makefile.config.in |  1 +
 Makefile.lib       | 19 ++++++++++++++++++-
 po/Makefile        |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index f14fa04d..8c245ace 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -42,6 +42,7 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+UNINSTALL = rm -f
 
 host = @host@
 
diff --git a/Makefile.lib b/Makefile.lib
index 09fa3c9e..446c1e62 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -8,6 +8,7 @@ ifdef MAKE_COLOR
 	PO_COLOR      = $(shell tput setaf 6)
 	LINK_COLOR    = $(shell tput bold;tput setaf 4)
 	INSTALL_COLOR = $(shell tput setaf 3)
+	UNINSTALL_COLOR = $(shell tput setaf 1)
 	END_COLOR     = $(shell tput sgr0)
 endif
 
@@ -65,6 +66,8 @@ quiet_cmd_installdata = "     [$(INSTALL_COLOR)INSTALL$(END_COLOR)]   $(RELPATH)
 quiet_cmd_installprog = "     [$(INSTALL_COLOR)INSTALL$(END_COLOR)]   $(RELPATH)$(2) -> $(3)"
       cmd_installprog = $(INSTALL_PROGRAM) $(2) $(3)
 
+quiet_cmd_uninstall = "     [$(UNINSTALL_COLOR)UNINSTALL$(END_COLOR)]   $(3)/$(2)"
+      cmd_uninstall = $(UNINSTALL) $(3)/$(2)
 
 #############################################################################
 # Special handling of conditional variables
@@ -166,6 +169,19 @@ ifdef MAN5
 		$(call ncmd,installdata,$(file),$(DESTDIR)$(mandir)/man5);)
 endif
 
+uninstall-default:
+ifdef PROGS
+	@$(foreach file,$(PROGS), \
+		$(call ncmd,uninstall,$(file),$(DESTDIR)$(bindir));)
+endif		
+ifdef MAN1
+	@$(foreach file,$(MAN1), \
+		$(call ncmd,uninstall,$(file),$(DESTDIR)$(mandir)/man1);)
+endif
+ifdef MAN5
+	@$(foreach file,$(MAN5), \
+		$(call ncmd,uninstall,$(file),$(DESTDIR)$(mandir)/man5);)
+endif
 ##############################################################################
 # Auto-testing infrastructure
 
@@ -205,7 +221,7 @@ endif
 #############################################################################
 # Basic recursion and dependencies setup
 
-RULES	 = all install clean cleanall init check test
+RULES	 = all install clean cleanall init check test uninstall
 
 RULES_LOCAL = $(addsuffix -local,$(RULES))
 RULES_REC   = $(addsuffix -recursive,$(RULES))
@@ -238,6 +254,7 @@ cleanall: $(call rule_deps,cleanall)
 init:	  $(call rule_deps,init)
 check:	  $(call rule_deps,check)
 test:	  $(call rule_deps,test)
+uninstall: $(call rule_deps,uninstall)
 
 #############################################################################
 # Misc
diff --git a/po/Makefile b/po/Makefile
index 5cf25b13..4d76c8d8 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -108,6 +108,11 @@ install-local: all-local
 		$(call ncmd,installdata,$(lang).gmo,$(DESTDIR)$(localedir)/$(lang)/LC_MESSAGES/$(PACKAGE).mo); \
 	)
 
+uninstall-local:
+	@$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(CATALOGS))), \
+		$(call ncmd,uninstall,$(PACKAGE).mo,$(DESTDIR)$(localedir)/$(lang)/LC_MESSAGES); \
+	)
+
 clean-local:
 	@rm -f $(PACKAGE).po *.new.po $(srcdir)$(POTFILES_ABS_LIST)
 

From 73d703400d4acb70f3bb551b91f81ed365d37ae7 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 3 Sep 2006 13:52:44 +0300
Subject: [PATCH 097/132] fi.po: minor update

---
 po/fi.po | 170 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 91 insertions(+), 79 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index a090e9ad..4a6db48b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-02 17:41+0300\n"
-"PO-Revision-Date: 2006-09-02 17:42+0300\n"
+"POT-Creation-Date: 2006-09-03 13:50+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"
 "MIME-Version: 1.0\n"
@@ -3669,7 +3669,7 @@ msgstr "Tekstialue"
 msgid "Dialog text colors."
 msgstr ""
 
-#: src/config/options.inc:1063 src/viewer/text/form.c:1780
+#: src/config/options.inc:1063 src/viewer/text/form.c:1797
 msgid "Checkbox"
 msgstr "Valintalaatikko"
 
@@ -3721,7 +3721,7 @@ msgstr ""
 msgid "Selected button shortcut"
 msgstr "Valitse kenttä"
 
-#: src/config/options.inc:1091 src/viewer/text/form.c:1784
+#: src/config/options.inc:1091 src/viewer/text/form.c:1801
 msgid "Text field"
 msgstr "Tekstikenttä"
 
@@ -4317,7 +4317,7 @@ msgstr "ei"
 #: src/cookies/dialogs.c:70
 #, c-format
 msgid "Do you want to accept a cookie from %s?"
-msgstr "Sallitko evästeen verkkoalueelta %s??"
+msgstr "Sallitko evästeen verkkoalueelta %s?"
 
 #: src/cookies/dialogs.c:78
 msgid "Accept cookie?"
@@ -5627,10 +5627,9 @@ msgstr "valkoven
 
 #: src/intl/gettext/libintl.c:31
 msgid "Brazilian Portuguese"
-msgstr ""
+msgstr "brasilianportugali"
 
 #: src/intl/gettext/libintl.c:32
-#, fuzzy
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -5688,7 +5687,7 @@ msgstr "islanti"
 
 #: src/intl/gettext/libintl.c:46
 msgid "Indonesian"
-msgstr ""
+msgstr "indonesia"
 
 #: src/intl/gettext/libintl.c:47
 msgid "Italian"
@@ -5720,7 +5719,7 @@ msgstr "ven
 
 #: src/intl/gettext/libintl.c:54
 msgid "Serbian"
-msgstr ""
+msgstr "serbia"
 
 #: src/intl/gettext/libintl.c:55
 msgid "Slovak"
@@ -6298,9 +6297,8 @@ msgid "No such article"
 msgstr "Ei otsikkoa"
 
 #: src/network/state.c:103
-#, fuzzy
 msgid "Transfer failed"
-msgstr "Siirtää"
+msgstr "Siirto epäonnistui"
 
 #: src/network/state.c:104
 msgid "Authorization required"
@@ -6791,9 +6789,8 @@ msgid "Creation date"
 msgstr ""
 
 #: src/protocol/bittorrent/dialogs.c:160
-#, fuzzy
 msgid "Directory"
-msgstr "Historia"
+msgstr "Hakemisto"
 
 #: src/protocol/bittorrent/dialogs.c:170
 msgid "Files"
@@ -6939,35 +6936,39 @@ msgstr[1] "%u j
 #. Statistics:
 #: src/protocol/bittorrent/dialogs.c:419
 msgid "Statistics"
-msgstr ""
+msgstr "Tilasto"
 
 #: src/protocol/bittorrent/dialogs.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "%u in memory"
 msgid_plural "%u in memory"
-msgstr[0] "Muisti loppu"
-msgstr[1] "Muisti loppu"
+msgstr[0] "%u muistissa"
+msgstr[1] "%u muistissa"
 
 #: src/protocol/bittorrent/dialogs.c:429
 #, c-format
 msgid "%u locked"
 msgid_plural "%u locked"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u lukossa"
+msgstr[1] "%u lukossa"
 
+# Tilasto: 42 muistissa, 69 hylätty
+# Tilasto: 42 muistissa, 69 hylättyä
+# "hylätty" on parempi, koska hylättyjä tietoja ei säilytetä.
 #: src/protocol/bittorrent/dialogs.c:436
 #, c-format
 msgid "%u rejected"
 msgid_plural "%u rejected"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u hylätty"
+msgstr[1] "%u hylätty"
 
+# kadoksissa?
 #: src/protocol/bittorrent/dialogs.c:443
-#, fuzzy, c-format
+#, c-format
 msgid "%u unavailable"
 msgid_plural "%u unavailable"
-msgstr[0] "FTP-palvelin ei vastaa"
-msgstr[1] "FTP-palvelin ei vastaa"
+msgstr[0] "%u ei saatavana"
+msgstr[1] "%u ei saatavana"
 
 #: src/protocol/bittorrent/dialogs.c:584 src/session/session.c:278
 #, fuzzy, c-format
@@ -6977,7 +6978,7 @@ msgstr "Asetustiedoston kirjoitus ei onnistu"
 #: src/protocol/bittorrent/dialogs.c:736
 #, c-format
 msgid "What would you like to do with the file '%s'?"
-msgstr ""
+msgstr "Mitä haluat tehdä tiedostolla \"%s\"?"
 
 #: src/protocol/bittorrent/dialogs.c:752
 #, fuzzy
@@ -7093,9 +7094,8 @@ msgid "FSP specific options."
 msgstr "Ei ohjelmaa osoitettu"
 
 #: src/protocol/fsp/fsp.c:48
-#, fuzzy
 msgid "Sort entries"
-msgstr "Yhteydet"
+msgstr "Lajittele"
 
 # Unixissa tiedosto on piilossa, jos sen nimi alkaa pisteellä.
 # Tiedostoa ei siis voi piilottaa muuttamatta sen nimeä.
@@ -7262,9 +7262,11 @@ msgstr ""
 msgid "Proxy authentication password."
 msgstr ""
 
+# Koska tämä on "Referer" eikä "Referrer", kyseessä lienee HTTP:ssä
+# käytetty otsakkeen nimi, joten en suomenna.
 #: src/protocol/http/http.c:145
 msgid "Referer sending"
-msgstr ""
+msgstr "Refererin lähetys"
 
 #: src/protocol/http/http.c:147
 msgid ""
@@ -7377,9 +7379,8 @@ msgid "NNTP"
 msgstr "NNTP"
 
 #: src/protocol/nntp/nntp.c:34
-#, fuzzy
 msgid "NNTP and news specific options."
-msgstr "Ei ohjelmaa osoitettu"
+msgstr ""
 
 #: src/protocol/nntp/nntp.c:36
 msgid "Default news server"
@@ -7402,6 +7403,7 @@ msgid ""
 "All header entries can be read in the header info dialog."
 msgstr ""
 
+# protokollan?
 #: src/protocol/protocol.c:232
 #, fuzzy, c-format
 msgid "This version of ELinks does not contain %s protocol support"
@@ -7601,7 +7603,7 @@ msgstr "Kirjoita lauseke"
 
 #: src/scripting/ruby/core.c:131 src/scripting/ruby/core.c:184
 msgid "Ruby Message"
-msgstr ""
+msgstr "Ruby-viesti"
 
 #: src/scripting/scripting.c:59
 #, c-format
@@ -7627,19 +7629,24 @@ msgid "Download error"
 msgstr "Vastaanottovirhe"
 
 #: src/session/download.c:236 src/session/download.c:680
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not create file '%s':\n"
 "%s"
-msgstr "Tiedostoon kirjoitus epäonnistui"
+msgstr ""
+"Tiedostoa \"%s\" ei voi perustaa:\n"
+"%s"
 
 #: src/session/download.c:360
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error downloading %s:\n"
 "\n"
 "%s"
-msgstr "Virhe ladattaessa"
+msgstr ""
+"Virhe ladattaessa %s:\n"
+"\n"
+"%s"
 
 #: src/session/download.c:592
 #, c-format
@@ -7659,6 +7666,11 @@ msgid ""
 "The alternative filename is:\n"
 "%s"
 msgstr ""
+"Tämä tiedosto on jo olemassa:\n"
+"%s\n"
+"\n"
+"Vaihtoehtoinen nimi on:\n"
+"%s"
 
 #. accelerator_context(src/session/download.c:lookup_unique_name)
 #: src/session/download.c:634
@@ -7682,7 +7694,7 @@ msgstr "Tuntematon tyyppi"
 #: src/session/download.c:1146
 #, c-format
 msgid "What would you like to do with the file '%s' (type: %s%s%s)?"
-msgstr ""
+msgstr "Mitä haluat tehdä tiedostolla \"%s\" (tyyppi: %s%s%s)?"
 
 #: src/session/download.c:1176
 #, no-c-format
@@ -7848,202 +7860,202 @@ msgstr "Ei kehyksi
 msgid "The requested fragment \"#%s\" doesn't exist."
 msgstr ""
 
-#: src/viewer/text/form.c:949
+#: src/viewer/text/form.c:1023
 msgid "Error while posting form"
 msgstr "Virhe lomaketta lähetettäessä"
 
-#: src/viewer/text/form.c:950
+#: src/viewer/text/form.c:1024
 #, fuzzy, c-format
 msgid "Could not load file %s: %s"
 msgstr "Tiedoston haku epäonnistui"
 
-#: src/viewer/text/form.c:1765
+#: src/viewer/text/form.c:1782
 #, fuzzy
 msgid "Reset form"
 msgstr "Tyhjennä lomake"
 
-#: src/viewer/text/form.c:1767
+#: src/viewer/text/form.c:1784
 msgid "Harmless button"
 msgstr "Harmiton painike"
 
-#: src/viewer/text/form.c:1775
+#: src/viewer/text/form.c:1792
 msgid "Submit form to"
 msgstr "Hyväksy lomake:"
 
-#: src/viewer/text/form.c:1776
+#: src/viewer/text/form.c:1793
 msgid "Post form to"
 msgstr "Lähetä lomake:"
 
-#: src/viewer/text/form.c:1778
+#: src/viewer/text/form.c:1795
 msgid "Radio button"
 msgstr "Radionäppäin"
 
 # kenttä, jossa on joukko arvoja, joista pitää valita yksi
-#: src/viewer/text/form.c:1782
+#: src/viewer/text/form.c:1799
 msgid "Select field"
 msgstr "Valintakenttä"
 
-#: src/viewer/text/form.c:1786
+#: src/viewer/text/form.c:1803
 msgid "Text area"
 msgstr "Tekstialue"
 
-#: src/viewer/text/form.c:1788
+#: src/viewer/text/form.c:1805
 msgid "File upload"
 msgstr "Tiedoston lähetys"
 
-#: src/viewer/text/form.c:1790
+#: src/viewer/text/form.c:1807
 msgid "Password field"
 msgstr "Salasanakenttä"
 
-#: src/viewer/text/form.c:1828
+#: src/viewer/text/form.c:1845
 msgid "name"
 msgstr "nimi"
 
-#: src/viewer/text/form.c:1840
+#: src/viewer/text/form.c:1857
 msgid "value"
 msgstr "arvo"
 
-#: src/viewer/text/form.c:1853
+#: src/viewer/text/form.c:1870
 msgid "read only"
 msgstr ""
 
-#: src/viewer/text/form.c:1864
+#: src/viewer/text/form.c:1881
 #, c-format
 msgid "press %s to navigate"
 msgstr ""
 
-#: src/viewer/text/form.c:1866
+#: src/viewer/text/form.c:1883
 #, c-format
 msgid "press %s to edit"
 msgstr "paina %s muokataksesi"
 
-#: src/viewer/text/form.c:1902
+#: src/viewer/text/form.c:1919
 #, fuzzy, c-format
 msgid "press %s to submit to %s"
 msgstr "hyväksy"
 
-#: src/viewer/text/form.c:1904
+#: src/viewer/text/form.c:1921
 #, fuzzy, c-format
 msgid "press %s to post to %s"
 msgstr "hyväksy"
 
-#: src/viewer/text/form.c:2006
+#: src/viewer/text/form.c:2023
 msgid "Useless button"
 msgstr "Hyödytön painike"
 
-#: src/viewer/text/form.c:2008
+#: src/viewer/text/form.c:2025
 msgid "Submit button"
 msgstr "Lähetyspainike"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1262
+#: src/viewer/text/link.c:1271
 msgid "Display ~usemap"
 msgstr "Näytä kuvan linkit (~usemap)"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1267
+#: src/viewer/text/link.c:1276
 msgid "~Follow link"
 msgstr "~Seuraa linkkiä"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1269
+#: src/viewer/text/link.c:1278
 msgid "Follow link and r~eload"
 msgstr "Seuraa linkkiä ja lataa ~uudestaan"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1273
+#: src/viewer/text/link.c:1282
 msgid "Open in new ~window"
 msgstr "Avaa uuteen ~ikkunaan"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1275
+#: src/viewer/text/link.c:1284
 msgid "Open in new ~tab"
 msgstr "Avaa uuteen ~välilehteen"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1277
+#: src/viewer/text/link.c:1286
 msgid "Open in new tab in ~background"
 msgstr "Avaa uuteen välilehteen ~taustalla"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1282
+#: src/viewer/text/link.c:1291
 msgid "~Download link"
 msgstr "~Lataa linkki tiedostoksi"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1285
+#: src/viewer/text/link.c:1294
 msgid "~Add link to bookmarks"
 msgstr "Lisää linkki ~kirjanmerkkeihin"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1289
+#: src/viewer/text/link.c:1298
 msgid "Pass link URI to e~xternal command"
 msgstr "Anna linkin U~RI ulkoiselle komennolle"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1300 src/viewer/text/link.c:1340
+#: src/viewer/text/link.c:1309 src/viewer/text/link.c:1349
 msgid "~Reset form"
 msgstr "T~yhjennä lomake"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1315
+#: src/viewer/text/link.c:1324
 msgid "Open in ~external editor"
 msgstr "~Avaa ulkoisessa muokkausohjelmassa"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1323
+#: src/viewer/text/link.c:1332
 msgid "~Submit form"
 msgstr "~Lähetä lomake"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1324
+#: src/viewer/text/link.c:1333
 msgid "Submit form and rel~oad"
 msgstr "Lähetä lomake ja lataa ~uudestaan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1328
+#: src/viewer/text/link.c:1337
 msgid "Submit form and open in new ~window"
 msgstr "Lähetä lomake ja avaa uuteen ~ikkunaan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1330
+#: src/viewer/text/link.c:1339
 msgid "Submit form and open in new ~tab"
 msgstr "Lähetä lomake ja avaa uuteen ~välilehteen"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1333
+#: src/viewer/text/link.c:1342
 msgid "Submit form and open in new tab in ~background"
 msgstr "Lähetä lomake ja avaa uuteen välilehteen ~taustalla"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1338
+#: src/viewer/text/link.c:1347
 msgid "Submit form and ~download"
 msgstr "Lähetä lomake ~ja lataa tiedostoksi"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1345
+#: src/viewer/text/link.c:1354
 msgid "Form f~ields"
 msgstr "Lomakkeen k~entät"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1352
+#: src/viewer/text/link.c:1361
 msgid "V~iew image"
 msgstr "~Näytä kuva"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1354
+#: src/viewer/text/link.c:1363
 msgid "Download ima~ge"
 msgstr "Lataa kuv~a tiedostoksi"
 
-#: src/viewer/text/link.c:1363
+#: src/viewer/text/link.c:1372
 msgid "No link selected"
 msgstr "Ei linkkiä"
 
-#: src/viewer/text/link.c:1433
+#: src/viewer/text/link.c:1442
 msgid "Image"
 msgstr "Kuva"
 
-#: src/viewer/text/link.c:1438
+#: src/viewer/text/link.c:1447
 msgid "Usemap"
 msgstr "Kartta"
 

From c961564d0b104a0a02008bce328e45d9b7df2149 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 3 Sep 2006 13:21:23 +0200
Subject: [PATCH 098/132] SEE: use keystr as return value. Killed warning.

---
 src/ecmascript/see/form.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c
index b8d4bdc6..7897f92c 100644
--- a/src/ecmascript/see/form.c
+++ b/src/ecmascript/see/form.c
@@ -190,7 +190,7 @@ input_get(struct SEE_interpreter *interp, struct SEE_object *o,
 		if (link->accesskey)
 			append_unicode_to_SEE_string(interp, keystr,
 						     link->accesskey);
-		SEE_SET_STRING(res, str);
+		SEE_SET_STRING(res, keystr);
 	} else if (p == s_alt) {
 		str = string_to_SEE_string(interp, fc->alt);
 		SEE_SET_STRING(res, str);

From 1a5f37bfcbf7564b6153908ee24d448a7bd972e4 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Sun, 3 Sep 2006 15:22:38 +0200
Subject: [PATCH 099/132] French translation was updated.

---
 po/fr.po | 106 +++++++++++++++++++++++++++----------------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 00071fd6..560842f0 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-08-29 15:48+0200\n"
-"PO-Revision-Date: 2006-08-29 15:50+0200\n"
+"POT-Creation-Date: 2006-09-03 15:20+0200\n"
+"PO-Revision-Date: 2006-09-03 15:22+0200\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -2210,7 +2210,7 @@ msgid ""
 "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"
-"in the style of e.g. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Essayer ou non de se connecter en IPv4 ŕ un hôte.\n"
 "Notez que si connection.try_ipv6 est activé aussi,\n"
@@ -2218,7 +2218,7 @@ msgstr ""
 "tout ŕ moins de savoir ce que vous faites.\n"
 "Vous pouvez toujours forcer l'utilisation d'un\n"
 "protocole pour une connexion en utilisant une URL\n"
-"du style http4://elinks.or.cz/."
+"du style http4://elinks.cz/."
 
 #: src/config/options.inc:110
 msgid ""
@@ -2226,14 +2226,14 @@ msgid ""
 "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"
-"in the style of e.g. http4://elinks.or.cz/."
+"in the style of e.g. http4://elinks.cz/."
 msgstr ""
 "Essayer ou non de se connecter en IPv4 ŕ un hôte.\n"
 "Ne touchez pas ŕ ça du tout ŕ moins de savoir ce\n"
 "que vous faites.\n"
 "Vous pouvez toujours forcer l'utilisation d'un\n"
 "protocole pour une connexion en utilisant une URL\n"
-"du style http4://elinks.or.cz/."
+"du style http4://elinks.cz/."
 
 #: src/config/options.inc:118
 msgid "Try IPv6 when connecting"
@@ -2244,12 +2244,12 @@ 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"
-"in the style of i.e. http6://elinks.or.cz/."
+"in the style of e.g. http6://elinks.cz/."
 msgstr ""
 "Essayer ou non de se connecter en IPv6 ŕ un hôte.\n"
 "Vous pouvez toujours forcer l'utilisation d'un\n"
 "protocole pour une connexion en utilisant une URL\n"
-"du style http6://elinks.or.cz/."
+"du style http6://elinks.cz/."
 
 #: src/config/options.inc:126
 msgid "Timeout for non-restartable connections"
@@ -3988,7 +3988,7 @@ msgstr "Texte"
 msgid "Dialog text colors."
 msgstr "Couleurs du texte des dialogues."
 
-#: src/config/options.inc:1063 src/viewer/text/form.c:1780
+#: src/config/options.inc:1063 src/viewer/text/form.c:1797
 msgid "Checkbox"
 msgstr "Case ŕ cocher"
 
@@ -4036,7 +4036,7 @@ msgstr "Raccourci du bouton"
 msgid "Selected button shortcut"
 msgstr "Raccourci du bouton sélectionné"
 
-#: src/config/options.inc:1091 src/viewer/text/form.c:1784
+#: src/config/options.inc:1091 src/viewer/text/form.c:1801
 msgid "Text field"
 msgstr "Champ texte"
 
@@ -8481,200 +8481,200 @@ msgstr "Ancre manquante"
 msgid "The requested fragment \"#%s\" doesn't exist."
 msgstr "L'ancre recherchée \"#%s\" n'existe pas."
 
-#: src/viewer/text/form.c:949
+#: src/viewer/text/form.c:1023
 msgid "Error while posting form"
 msgstr "Erreur lors de l'envoi du formulaire"
 
-#: src/viewer/text/form.c:950
+#: src/viewer/text/form.c:1024
 #, c-format
 msgid "Could not load file %s: %s"
 msgstr "Impossible de charger le fichier %s: %s"
 
-#: src/viewer/text/form.c:1765
+#: src/viewer/text/form.c:1782
 msgid "Reset form"
 msgstr "Réinitialiser le formulaire"
 
-#: src/viewer/text/form.c:1767
+#: src/viewer/text/form.c:1784
 msgid "Harmless button"
 msgstr "Bouton sans impact"
 
-#: src/viewer/text/form.c:1775
+#: src/viewer/text/form.c:1792
 msgid "Submit form to"
 msgstr "Envoi du formulaire ŕ"
 
-#: src/viewer/text/form.c:1776
+#: src/viewer/text/form.c:1793
 msgid "Post form to"
 msgstr "Transfert du formulaire ŕ"
 
-#: src/viewer/text/form.c:1778
+#: src/viewer/text/form.c:1795
 msgid "Radio button"
 msgstr "Bouton radio"
 
-#: src/viewer/text/form.c:1782
+#: src/viewer/text/form.c:1799
 msgid "Select field"
 msgstr "Liste"
 
-#: src/viewer/text/form.c:1786
+#: src/viewer/text/form.c:1803
 msgid "Text area"
 msgstr "Champ texte multiligne"
 
-#: src/viewer/text/form.c:1788
+#: src/viewer/text/form.c:1805
 msgid "File upload"
 msgstr "Envoi de fichier"
 
-#: src/viewer/text/form.c:1790
+#: src/viewer/text/form.c:1807
 msgid "Password field"
 msgstr "Champ mot de passe"
 
-#: src/viewer/text/form.c:1828
+#: src/viewer/text/form.c:1845
 msgid "name"
 msgstr "Nom"
 
-#: src/viewer/text/form.c:1840
+#: src/viewer/text/form.c:1857
 msgid "value"
 msgstr "Valeur"
 
-#: src/viewer/text/form.c:1853
+#: src/viewer/text/form.c:1870
 msgid "read only"
 msgstr "lecture seule"
 
-#: src/viewer/text/form.c:1864
+#: src/viewer/text/form.c:1881
 #, c-format
 msgid "press %s to navigate"
 msgstr "pressez %s pour naviguer"
 
-#: src/viewer/text/form.c:1866
+#: src/viewer/text/form.c:1883
 #, c-format
 msgid "press %s to edit"
 msgstr "pressez %s pour éditer"
 
-#: src/viewer/text/form.c:1902
+#: src/viewer/text/form.c:1919
 #, c-format
 msgid "press %s to submit to %s"
 msgstr "pressez %s pour soumettre ŕ %s"
 
-#: src/viewer/text/form.c:1904
+#: src/viewer/text/form.c:1921
 #, c-format
 msgid "press %s to post to %s"
 msgstr "pressez %s pour poster ŕ %s"
 
-#: src/viewer/text/form.c:2006
+#: src/viewer/text/form.c:2023
 msgid "Useless button"
 msgstr "Bouton inutile"
 
-#: src/viewer/text/form.c:2008
+#: src/viewer/text/form.c:2025
 msgid "Submit button"
 msgstr "Bouton Soumettre"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1262
+#: src/viewer/text/link.c:1271
 msgid "Display ~usemap"
 msgstr "Afficher ~usemap"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1267
+#: src/viewer/text/link.c:1276
 msgid "~Follow link"
 msgstr "~Suivre le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1269
+#: src/viewer/text/link.c:1278
 msgid "Follow link and r~eload"
 msgstr "Suivre le lien et ~recharger"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1273
+#: src/viewer/text/link.c:1282
 msgid "Open in new ~window"
 msgstr "Ouvrir dans une nouvelle ~fenętre"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1275
+#: src/viewer/text/link.c:1284
 msgid "Open in new ~tab"
 msgstr "Ouvrir dans un nouvel ongle~t"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1277
+#: src/viewer/text/link.c:1286
 msgid "Open in new tab in ~background"
 msgstr "Ouvrir dans un nouvel onglet en arričre-~plan"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1282
+#: src/viewer/text/link.c:1291
 msgid "~Download link"
 msgstr "~Enregistrer le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1285
+#: src/viewer/text/link.c:1294
 msgid "~Add link to bookmarks"
 msgstr "~Ajouter ce lien aux signets"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1289
+#: src/viewer/text/link.c:1298
 msgid "Pass link URI to e~xternal command"
 msgstr "Passer l'URI du lien ŕ une commande e~xterne"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1300 src/viewer/text/link.c:1340
+#: src/viewer/text/link.c:1309 src/viewer/text/link.c:1349
 msgid "~Reset form"
 msgstr "Remettre ŕ ~zéro le formulaire"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1315
+#: src/viewer/text/link.c:1324
 msgid "Open in ~external editor"
 msgstr "Ouvrir dans un ~éditeur externe"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1323
+#: src/viewer/text/link.c:1332
 msgid "~Submit form"
 msgstr "~Envoyer le formulaire"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1324
+#: src/viewer/text/link.c:1333
 msgid "Submit form and rel~oad"
 msgstr "Envoyer le formulaire et ~recharger"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1328
+#: src/viewer/text/link.c:1337
 msgid "Submit form and open in new ~window"
 msgstr "Envoyer le formulaire et ouvrir dans une nouvelle ~fenętre"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1330
+#: src/viewer/text/link.c:1339
 msgid "Submit form and open in new ~tab"
 msgstr "Envoyer le formulaire et ouvrir un ~onglet"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1333
+#: src/viewer/text/link.c:1342
 msgid "Submit form and open in new tab in ~background"
 msgstr "Envoyer le formulaire et ouvrir un onglet en ~arričre-plan"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1338
+#: src/viewer/text/link.c:1347
 msgid "Submit form and ~download"
 msgstr "Envoyer le formulaire et ~télécharger"
 
 #. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
-#: src/viewer/text/link.c:1345
+#: src/viewer/text/link.c:1354
 msgid "Form f~ields"
 msgstr "C~hamps de formulaire"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1352
+#: src/viewer/text/link.c:1361
 msgid "V~iew image"
 msgstr "~Voir l'image"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1354
+#: src/viewer/text/link.c:1363
 msgid "Download ima~ge"
 msgstr "Enregistrer l'~image"
 
-#: src/viewer/text/link.c:1363
+#: src/viewer/text/link.c:1372
 msgid "No link selected"
 msgstr "Aucun lien sélectionné"
 
-#: src/viewer/text/link.c:1433
+#: src/viewer/text/link.c:1442
 msgid "Image"
 msgstr "Image"
 
-#: src/viewer/text/link.c:1438
+#: src/viewer/text/link.c:1447
 msgid "Usemap"
 msgstr "Usemap"
 

From d1fb65120ddbfaf3be31a2bf883ce83fd51b3220 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 9 Sep 2006 22:47:48 +0300
Subject: [PATCH 100/132] "Resize terminal" tries to use the window size
 increment.

Previously, the window sizes computed for xterm were a few pixels off,
and this could result in too few character cells being displayed.
This new version tries to read the window size increment from the
WM_NORMAL_HINTS property set by xterm, and base the computations on
that.
---
 src/osdep/osdep.c | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/osdep/osdep.c b/src/osdep/osdep.c
index 1df9e332..ea36824a 100644
--- a/src/osdep/osdep.c
+++ b/src/osdep/osdep.c
@@ -570,13 +570,41 @@ resize_window(int width, int height, int old_width, int old_height)
 	}
 
 	if (!x_error && status) {
-		double ratio_width = (double) attributes.width  / old_width;
-		double ratio_height = (double) attributes.height / old_height;
+		XSizeHints *size_hints;
+		long mask;
+		int px_width = 0;
+		int px_height = 0;
 
-		width  = (int) ((double) width * ratio_width);
-		height = (int) ((double) height * ratio_height);
+		/* With xterm 210, a window with 80x24 characters at
+		 * a 6x13 font appears to have 484x316 pixels; both
+		 * the width and height include four extra pixels.
+		 * Computing a new size by scaling these values often
+		 * results in windows that cannot display as many
+		 * characters as was intended.  We can do better if we
+		 * can find out the actual size of character cells.
+		 * If the terminal emulator has set a window size
+		 * increment, assume that is the cell size.  */
+		size_hints = XAllocSizeHints();
+		if (size_hints != NULL
+		    && XGetWMNormalHints(display, window, size_hints, &mask)
+		    && (mask & PResizeInc) != 0) {
+			px_width = attributes.width
+				+ (width - old_width) * size_hints->width_inc;
+			px_height = attributes.height
+				+ (height - old_height) * size_hints->height_inc;
+		}
+		if (px_width <= 0 || px_height <= 0) {
+			double ratio_width = (double) attributes.width  / old_width;
+			double ratio_height = (double) attributes.height / old_height;
 
-		status = XResizeWindow(display, window, width, height);
+			px_width  = (int) ((double) width * ratio_width);
+			px_height = (int) ((double) height * ratio_height);
+		}
+
+		if (size_hints)
+			XFree(size_hints);
+
+		status = XResizeWindow(display, window, px_width, px_height);
 		while (!x_error && !status) {
 			Window root, parent, *children;
 			unsigned int num_children;
@@ -588,7 +616,7 @@ resize_window(int width, int height, int old_width, int old_height)
 			if (parent == root || parent == 0)
 				break;
 			window = parent;
-			status = XResizeWindow(display, window, width, height);
+			status = XResizeWindow(display, window, px_width, px_height);
 		}
 	}
 

From 57a9871ea1c36f2a378dca139ff4fea8980bb1f6 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 10 Sep 2006 08:57:55 +0300
Subject: [PATCH 101/132] Prepend $(top_builddir) to @INSTALL@ if it is
 relative.

Reported to elinks-users on 2006-08-23.
---
 Makefile.config.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 8c245ace..b8cc68a5 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -38,7 +38,10 @@ ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 
-INSTALL = @INSTALL@
+# The INSTALL substituted by configure can be either absolute or
+# relative to the top build directory.  Adjust it so that it can
+# be used in build subdirectories.
+INSTALL = $(if $(patsubst /%,,$(firstword @INSTALL@)),$(top_builddir)/)@INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@

From 07cee4edee9c7e054d1f2deafd4fd47faf6f8deb Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 10 Sep 2006 23:38:02 +0300
Subject: [PATCH 102/132] sig_tstp: Use _exit() rather than exit().

---
 src/osdep/signals.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/osdep/signals.c b/src/osdep/signals.c
index 54412f0e..72bc31cc 100644
--- a/src/osdep/signals.c
+++ b/src/osdep/signals.c
@@ -78,7 +78,12 @@ sig_tstp(struct terminal *term)
 	if (!fork()) {
 		sleep(1);
 		kill(pid, SIGCONT);
-		exit(0);
+		/* Use _exit() rather than exit(), so that atexit
+		 * functions are not called, and stdio output buffers
+		 * are not flushed.  Any such things must have been
+		 * inherited from the parent process, which will take
+		 * care of them when appropriate.  */
+		_exit(0);
 	}
 #endif
 	raise(SIGSTOP);

From c6f871b3af708bccca080ec4e1e9cb3afd71171b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 12:23:34 +0300
Subject: [PATCH 103/132] terminal doc: Explain the "ECMA-48 Terminfo $TERM"
 comments.

---
 src/terminal/kbd.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index ee203aa1..a07e0d84 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -692,6 +692,26 @@ decode_terminal_escape_sequence(struct itrm *itrm, struct interlink_event *ev)
 	fflush(stderr);
 #endif
 
+	/* The following information should be listed for each escape
+	 * sequence recognized here:
+	 *
+	 * 1. Which control function ECMA-48 assigns to the sequence.
+	 *    Put parentheses around this if the control function
+	 *    seems unrelated to how ELinks actually treats the
+	 *    sequence.  Write "private" if it is a control sequence
+	 *    reserved for private or experimental use in ECMA-48.
+	 *    (Those have a Final Byte in the range 0x70 to 0x7F,
+	 *    optionally preceded by a single Intermediate Byte 0x20.)
+	 *
+	 * 2. The capname used by Terminfo, if any.  These should help
+	 *    when ELinks is eventually changed to read escape
+	 *    sequences from Terminfo (bug 96).
+	 *
+	 * 3. The $TERM identifier of some terminal that generates
+	 *    this escape sequence with the meaning expected by
+	 *    ELinks.  Escape sequences with no known terminal may end
+	 *    up being removed from ELinks when bug 96 is fixed.
+	 */
 	switch (c) {				/* ECMA-48 Terminfo $TERM */
 	case 0: return -1;			/* ------- -------- ----- */
 	case 'A': kbd.key = KBD_UP; break;	/*    CUU  kcuu1    vt200 */

From b42f0ba153dd5e8685999049198cd7eed2b871fb Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 12:38:23 +0300
Subject: [PATCH 104/132] Bug 772: Recognize ESC [ Z as Shift-Tab, and bind it
 like Alt-Tab by default.

---
 src/config/kbdbind.c | 3 +++
 src/terminal/kbd.c   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index fc2f0ab5..eaf89059 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -712,6 +712,7 @@ static struct default_kb default_main_keymap[] = {
 	{ { KBD_RIGHT,	 KBD_MOD_CTRL }, ACT_MAIN_LINK_FOLLOW_RELOAD },
 	{ { KBD_TAB,	 KBD_MOD_NONE }, ACT_MAIN_FRAME_NEXT },
 	{ { KBD_TAB,	 KBD_MOD_ALT  }, ACT_MAIN_FRAME_PREV },
+	{ { KBD_TAB,     KBD_MOD_SHIFT}, ACT_MAIN_FRAME_PREV },
 	{ { KBD_UP,	 KBD_MOD_NONE }, ACT_MAIN_MOVE_LINK_PREV },
 	{ { 0, 0 }, 0 }
 };
@@ -749,6 +750,7 @@ static struct default_kb default_edit_keymap[] = {
 	{ { KBD_RIGHT,	 KBD_MOD_NONE }, ACT_EDIT_RIGHT },
 	{ { KBD_TAB,	 KBD_MOD_NONE }, ACT_EDIT_NEXT_ITEM },
 	{ { KBD_TAB,	 KBD_MOD_ALT  }, ACT_EDIT_PREVIOUS_ITEM },
+	{ { KBD_TAB,	 KBD_MOD_SHIFT}, ACT_EDIT_PREVIOUS_ITEM },
 	{ { KBD_UP,	 KBD_MOD_NONE }, ACT_EDIT_UP },
 	{ { 0, 0 }, 0 }
 };
@@ -785,6 +787,7 @@ static struct default_kb default_menu_keymap[] = {
 	{ { KBD_RIGHT,	 KBD_MOD_NONE }, ACT_MENU_RIGHT },
 	{ { KBD_TAB,	 KBD_MOD_NONE }, ACT_MENU_NEXT_ITEM },
 	{ { KBD_TAB,	 KBD_MOD_ALT  }, ACT_MENU_PREVIOUS_ITEM },
+	{ { KBD_TAB,	 KBD_MOD_SHIFT}, ACT_MENU_PREVIOUS_ITEM },
 	{ { KBD_UP,	 KBD_MOD_NONE }, ACT_MENU_UP },
 	{ { 0, 0 }, 0}
 };
diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c
index a07e0d84..4e0dfd9d 100644
--- a/src/terminal/kbd.c
+++ b/src/terminal/kbd.c
@@ -737,6 +737,9 @@ decode_terminal_escape_sequence(struct itrm *itrm, struct interlink_event *ev)
 	case 'W': kbd.key = KBD_F11; break;	/*   (CTC) kf11     cons25 */
 	case 'X': kbd.key = KBD_F12; break;	/*   (ECH) kf12     cons25 */
 
+	case 'Z':				/*    CBT  kcbt     cons25 */
+		kbd.key = KBD_TAB; kbd.modifier = KBD_MOD_SHIFT; break;
+
 	case 'z': switch (v) {			/* private */
 		case 247: kbd.key = KBD_INS; break;     /* kich1 */
 		case 214: kbd.key = KBD_HOME; break;	/* khome    sun */

From e8462980e5fd8860b97d57d5628d8fb24d59ed67 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 16:06:22 +0300
Subject: [PATCH 105/132] Change "utf_8" to "utf8" in most identifiers.

Suggested by Miciah on #elinks.

What was renamed:
  add_utf_8                      => add_utf8
  cp2utf_8                       => cp2utf8
  encode_utf_8                   => encode_utf8
  get_translation_table_to_utf_8 => get_translation_table_to_utf8
  goto invalid_utf_8_start_byte  => goto invalid_utf8_start_byte
  goto utf_8                     => goto utf8
  goto utf_8_select              => goto utf8_select
  terminal_interlink.utf_8       => terminal_interlink.utf8
  utf_8_to_unicode               => utf8_to_unicode

What was not renamed:
  terminal._template_.utf_8_io option, TERM_OPT_UTF_8_IO
    Compatibility with existing elinks.conf files would require an alias.
  --enable-utf-8
    Because the name of the charset is UTF-8, --enable-utf-8 looks better
    than --enable-utf8.
  CONFIG_UTF_8
    Will be renamed in a later commit.
  Unicode/utf_8.cp, table_utf_8, aliases_utf_8
    Will be renamed in a later commit.
---
 src/bfu/inpfield.c            |  8 +++----
 src/bfu/menu.c                |  2 +-
 src/document/dom/renderer.c   |  2 +-
 src/document/html/renderer.c  | 10 ++++-----
 src/document/plain/renderer.c |  8 +++----
 src/intl/charsets.c           | 40 +++++++++++++++++------------------
 src/intl/charsets.h           |  8 +++----
 src/terminal/draw.c           |  4 ++--
 src/terminal/event.c          | 32 ++++++++++++++--------------
 src/terminal/screen.c         |  4 ++--
 src/viewer/dump/dump.c        | 12 +++++------
 src/viewer/text/form.c        | 18 ++++++++--------
 src/viewer/text/search.c      |  2 +-
 src/viewer/text/textarea.c    |  6 +++---
 14 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/bfu/inpfield.c b/src/bfu/inpfield.c
index dcb948a3..6b67b073 100644
--- a/src/bfu/inpfield.c
+++ b/src/bfu/inpfield.c
@@ -478,7 +478,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 					unsigned char *next = widget_data->cdata + widget_data->info.field.cpos;
 					unsigned char *end = strchr(next, '\0');
 
-					utf_8_to_unicode(&next, end);
+					utf8_to_unicode(&next, end);
 					widget_data->info.field.cpos = (int)(next - widget_data->cdata);
 				} else
 #endif /* CONFIG_UTF_8 */
@@ -528,7 +528,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 				int old = widget_data->info.field.cpos;
 
 				while(1) {
-					data = utf_8_to_unicode(&text, end);
+					data = utf8_to_unicode(&text, end);
 					if (data == UCS_NO_CHAR)
 						break;
 				}
@@ -564,7 +564,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 					unsigned char *text = widget_data->cdata + widget_data->info.field.cpos;
 					unsigned char *old = text;
 
-					utf_8_to_unicode(&text, end);
+					utf8_to_unicode(&text, end);
 					if (old != text) {
 						memmove(old, text,
 								(int)(end - text) + 1);
@@ -681,7 +681,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 				unsigned char *text = widget_data->cdata;
 				int textlen = strlen(text);
 #ifdef CONFIG_UTF_8
-				const unsigned char *ins = encode_utf_8(get_kbd_key(ev));
+				const unsigned char *ins = encode_utf8(get_kbd_key(ev));
 				int inslen = utf8charlen(ins);
 #else  /* !CONFIG_UTF_8 */
 				const int inslen = 1;
diff --git a/src/bfu/menu.c b/src/bfu/menu.c
index 0782d97b..d91450bd 100644
--- a/src/bfu/menu.c
+++ b/src/bfu/menu.c
@@ -461,7 +461,7 @@ utf8:
 	for (x = 0; x - !!hk_state < w && *text2; x++) {
 		unicode_val_T data;
 
-		data = utf_8_to_unicode(&text2, end);
+		data = utf8_to_unicode(&text2, end);
 		if (!hk_state && (int)(text2 - text) == hotkey_pos) {
 			hk_state = 1;
 			continue;
diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index 77509de1..a7543ab7 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -311,7 +311,7 @@ render_dom_line(struct dom_renderer *renderer, struct screen_char *template,
 			if (utf8) {
 				unicode_val_T data;
 				charlen = utf8charlen(text);
-				data = utf_8_to_unicode(&text, end);
+				data = utf8_to_unicode(&text, end);
 
 				template->data = (unicode_val_T)data;
 
diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
index 88df3d3a..b987e98f 100644
--- a/src/document/html/renderer.c
+++ b/src/document/html/renderer.c
@@ -422,7 +422,7 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
 				}
 				part->document->buf_length = i;
 				part->document->buf[i] = '\0';
-				data = utf_8_to_unicode(&buf_ptr, buf_ptr + i);
+				data = utf8_to_unicode(&buf_ptr, buf_ptr + i);
 				if (data != UCS_NO_CHAR) {
 					part->document->buf_length = 0;
 					goto good_char;
@@ -440,7 +440,7 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
 					chars++;
 				} else {
 					part->spaces[x] = (*chars == ' ');
-					data = utf_8_to_unicode(&chars, end);
+					data = utf8_to_unicode(&chars, end);
 					if (data == UCS_NO_CHAR) {
 						if (charslen == 1) {
 							/* HR */
@@ -467,7 +467,7 @@ good_char:
 							schar->data = (unicode_val_T)data;
 							part->char_width[x] = 2;
 							copy_screen_chars(&POS(x++, y), schar, 1);
-							data = utf_8_to_unicode(&chars, end);
+							data = utf8_to_unicode(&chars, end);
 							if (data == UCS_NO_CHAR) goto broken_char;
 							schar->data = (unicode_val_T)data;
 							part->spaces[x] = 0;
@@ -503,13 +503,13 @@ good_char:
 				unicode_val_T data;
 
 				part->spaces[x] = (*chars == ' ');
-				data = utf_8_to_unicode(&chars, end);
+				data = utf8_to_unicode(&chars, end);
 				part->char_width[x] = unicode_to_cell(data);
 				if (part->char_width[x] == 2) {
 					x++;
 					part->spaces[x] = 0;
 					part->char_width[x] = 0;
-					data = utf_8_to_unicode(&chars, end);
+					data = utf8_to_unicode(&chars, end);
 				}
 				if (data == UCS_NO_CHAR) {
 					/* this is at the end only */
diff --git a/src/document/plain/renderer.c b/src/document/plain/renderer.c
index ce1d1e28..d32b43e9 100644
--- a/src/document/plain/renderer.c
+++ b/src/document/plain/renderer.c
@@ -259,7 +259,7 @@ add_document_line(struct plain_renderer *renderer,
 		if (utf8) {
 			unsigned char *line_char2 = &line[line_pos];
 			charlen = utf8charlen(&line_char);
-			data = utf_8_to_unicode(&line_char2, &line[width]);
+			data = utf8_to_unicode(&line_char2, &line[width]);
 
 			if (data == UCS_NO_CHAR) {
 				line_pos += charlen;
@@ -319,7 +319,7 @@ add_document_line(struct plain_renderer *renderer,
 		if (utf8) {
 			unsigned char *line_char2 = &line[line_pos];
 			charlen = utf8charlen(&line_char);
-			data = utf_8_to_unicode(&line_char2, &line[width]);
+			data = utf8_to_unicode(&line_char2, &line[width]);
 
 			if (data == UCS_NO_CHAR) {
 				line_pos += charlen;
@@ -437,7 +437,7 @@ add_document_line(struct plain_renderer *renderer,
 				if (utf8) {
 					unsigned char *text = &line[line_pos];
 					unicode_val_T data =
-						utf_8_to_unicode(&text,
+						utf8_to_unicode(&text,
 								&line[width]);
 
 					if (data == UCS_NO_CHAR) {
@@ -555,7 +555,7 @@ add_document_lines(struct plain_renderer *renderer)
 #ifdef CONFIG_UTF_8
 			if (utf8) {
 				unsigned char *text = &source[width];
-				unicode_val_T data = utf_8_to_unicode(&text,
+				unicode_val_T data = utf8_to_unicode(&text,
 							&source[length]);
 
 				if (data == UCS_NO_CHAR) return;
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index d8ecaa2d..49ba53cc 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -148,7 +148,7 @@ u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
 
 #ifdef CONFIG_UTF_8
 	if (codepages[to].table == table_utf_8)
-		return encode_utf_8(u);
+		return encode_utf8(u);
 #endif /* CONFIG_UTF_8 */
 
 	/* To mark non breaking spaces, we use a special char NBSP_CHAR. */
@@ -177,10 +177,10 @@ static unsigned char utf_buffer[7];
 
 #ifdef CONFIG_UTF_8
 inline unsigned char *
-encode_utf_8(unicode_val_T u)
+encode_utf8(unicode_val_T u)
 #else
 static unsigned char *
-encode_utf_8(unicode_val_T u)
+encode_utf8(unicode_val_T u)
 #endif /* CONFIG_UTF_8 */
 {
 	memset(utf_buffer, 0, 7);
@@ -281,7 +281,7 @@ utf8_char2cells(unsigned char *utf8_char, unsigned char *end)
 	if(!utf8_char || !end)
 		return -1;
 
-	u = utf_8_to_unicode(&utf8_char, end);
+	u = utf8_to_unicode(&utf8_char, end);
 
 	return unicode_to_cell(u);
 }
@@ -415,7 +415,7 @@ utf8_step_forward(unsigned char *string, unsigned char *end,
 			unsigned char *prev = current;
 			int width;
 
-			u = utf_8_to_unicode(&current, end);
+			u = utf8_to_unicode(&current, end);
 			if (u == UCS_NO_CHAR) {
 				/* Assume the incomplete sequence
 				 * costs one cell.  */
@@ -490,7 +490,7 @@ utf8_step_backward(unsigned char *string, unsigned char *start,
 			} while (current > start && !utf8_islead(*current));
 
 			look = current;
-			u = utf_8_to_unicode(&look, prev);
+			u = utf8_to_unicode(&look, prev);
 			if (u == UCS_NO_CHAR) {
 				/* Assume the incomplete sequence
 				 * costs one cell.  */
@@ -570,7 +570,7 @@ unicode_fold_label_case(unicode_val_T c)
 }
 
 inline unicode_val_T
-utf_8_to_unicode(unsigned char **string, unsigned char *end)
+utf8_to_unicode(unsigned char **string, unsigned char *end)
 {
 	unsigned char *str = *string;
 	unicode_val_T u;
@@ -623,7 +623,7 @@ utf_8_to_unicode(unsigned char **string, unsigned char *end)
 }
 #endif /* CONFIG_UTF_8 */
 
-/* Slow algorithm, the common part of cp2u and cp2utf_8.  */
+/* Slow algorithm, the common part of cp2u and cp2utf8.  */
 static unicode_val_T
 cp2u_shared(const struct codepage_desc *from, unsigned char c)
 {
@@ -653,14 +653,14 @@ cp2u(int from, unsigned char c)
 
 /* This slow and ugly code is used by the terminal utf_8_io */
 unsigned char *
-cp2utf_8(int from, int c)
+cp2utf8(int from, int c)
 {
 	from &= ~SYSTEM_CHARSET_FLAG;
 
 	if (codepages[from].table == table_utf_8 || c < 128)
 		return strings[c];
 
-	return encode_utf_8(cp2u_shared(&codepages[from], c));
+	return encode_utf8(cp2u_shared(&codepages[from], c));
 }
 
 #ifdef CONFIG_UTF_8
@@ -670,7 +670,7 @@ cp_to_unicode(int codepage, unsigned char **string, unsigned char *end)
 	unicode_val_T ret;
 
 	if (is_cp_utf8(codepage))
-		return utf_8_to_unicode(string, end);
+		return utf8_to_unicode(string, end);
 
 	if (*string >= end)
 		return UCS_NO_CHAR;
@@ -683,9 +683,9 @@ cp_to_unicode(int codepage, unsigned char **string, unsigned char *end)
 
 
 static void
-add_utf_8(struct conv_table *ct, unicode_val_T u, unsigned char *str)
+add_utf8(struct conv_table *ct, unicode_val_T u, unsigned char *str)
 {
-	unsigned char *p = encode_utf_8(u);
+	unsigned char *p = encode_utf8(u);
 
 	while (p[1]) {
 		if (ct[*p].t) ct = ct[*p].u.tbl;
@@ -725,7 +725,7 @@ free_utf_table(void)
 }
 
 static struct conv_table *
-get_translation_table_to_utf_8(int from)
+get_translation_table_to_utf8(int from)
 {
 	int i;
 	static int lfr = -1;
@@ -757,7 +757,7 @@ get_translation_table_to_utf_8(int from)
 
 		if (!utf_table[codepages[from].table[i].c].u.str)
 			utf_table[codepages[from].table[i].c].u.str =
-				stracpy(encode_utf_8(u));
+				stracpy(encode_utf8(u));
 	}
 
 	for (i = 128; i < 256; i++)
@@ -797,7 +797,7 @@ get_translation_table(int from, int to)
 	if (/*from == to ||*/ from == -1 || to == -1)
 		return NULL;
 	if (codepages[to].table == table_utf_8)
-		return get_translation_table_to_utf_8(from);
+		return get_translation_table_to_utf8(from);
 	if (from == lfr && to == lto)
 		return table;
 	lfr = from;
@@ -808,13 +808,13 @@ get_translation_table(int from, int to)
 		int i;
 
 		for (i = 0; codepages[to].table[i].c; i++)
-			add_utf_8(table, codepages[to].table[i].u,
-				  strings[codepages[to].table[i].c]);
+			add_utf8(table, codepages[to].table[i].u,
+				 strings[codepages[to].table[i].c]);
 
 		for (i = 0; unicode_7b[i].x != -1; i++)
 			if (unicode_7b[i].x >= 0x80)
-				add_utf_8(table, unicode_7b[i].x,
-					  unicode_7b[i].s);
+				add_utf8(table, unicode_7b[i].x,
+					 unicode_7b[i].s);
 
 	} else {
 		int i;
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index 84ce2e2f..9c59555d 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -11,7 +11,7 @@ typedef uint32_t unicode_val_T;
 #define UCS_REPLACEMENT_CHARACTER ((unicode_val_T) 0xFFFD)
 
 /* A special value that fits in unicode_val_T but is outside the range
- * of Unicode characters.  utf_8_to_unicode and cp_to_unicode return
+ * of Unicode characters.  utf8_to_unicode and cp_to_unicode return
  * this if the input is too short.  This is also used as a placeholder
  * for the second cell of a double-cell character.  */
 #define UCS_NO_CHAR ((unicode_val_T) 0xFFFFFFFD)
@@ -64,7 +64,7 @@ unsigned char *get_cp_mime_name(int);
 int is_cp_utf8(int);
 void free_conv_table(void);
 #ifdef CONFIG_UTF_8
-inline unsigned char *encode_utf_8(unicode_val_T);
+inline unsigned char *encode_utf8(unicode_val_T);
 inline unsigned char *utf8_prevchar(unsigned char *, int, unsigned char *);
 inline int utf8charlen(const unsigned char *);
 int utf8_char2cells(unsigned char *, unsigned char *);
@@ -94,12 +94,12 @@ unsigned char *utf8_step_backward(unsigned char *, unsigned char *,
 inline int unicode_to_cell(unicode_val_T);
 unicode_val_T unicode_fold_label_case(unicode_val_T);
 inline int strlen_utf8(unsigned char **);
-inline unicode_val_T utf_8_to_unicode(unsigned char **, unsigned char *);
+inline unicode_val_T utf8_to_unicode(unsigned char **, unsigned char *);
 unicode_val_T cp_to_unicode(int, unsigned char **, unsigned char *);
 #endif /* CONFIG_UTF_8 */
 
 unicode_val_T cp2u(int, unsigned char);
-unsigned char *cp2utf_8(int, int);
+unsigned char *cp2utf8(int, int);
 
 unsigned char *u2cp_(unicode_val_T, int, int no_nbsp_hack);
 #define u2cp(u, to) u2cp_(u, to, 0)
diff --git a/src/terminal/draw.c b/src/terminal/draw.c
index 58923945..4274c4d1 100644
--- a/src/terminal/draw.c
+++ b/src/terminal/draw.c
@@ -423,7 +423,7 @@ draw_text_utf8(struct terminal *term, int x, int y,
 	if (length <= 0) return;
 	if (x >= term->width) return;
 
-	data = utf_8_to_unicode(&text, end);
+	data = utf8_to_unicode(&text, end);
 	if (data == UCS_NO_CHAR) return;
 	start = get_char(term, x, y);
 	if (color) {
@@ -456,7 +456,7 @@ draw_text_utf8(struct terminal *term, int x, int y,
 	x++;
 
 	for (; x < term->width; x++, pos++) {
-		data = utf_8_to_unicode(&text, end);
+		data = utf8_to_unicode(&text, end);
 		if (data == UCS_NO_CHAR) break;
 		if (color) copy_screen_chars(pos, start, 1);
 
diff --git a/src/terminal/event.c b/src/terminal/event.c
index 79afd584..082f754b 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -50,7 +50,7 @@ struct terminal_interlink {
 		 * converts it to Alt-0xC3 0xB6, attaching the
 		 * modifier to the first byte only.  */
 		term_event_modifier_T modifier;
-	} utf_8;
+	} utf8;
 
 	/* This is the queue of events as coming from the other ELinks instance
 	 * owning the hosting terminal. */
@@ -325,25 +325,25 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 		 * it is between 0x00 and 0x7F and it is straight ASCII.
 		 * (All 'betweens' are inclusive.) */
 
-		if (interlink->utf_8.len) {
+		if (interlink->utf8.len) {
 			/* A previous call to handle_interlink_event
 			 * got a UTF-8 start byte. */
 
 			if (key >= 0x80 && key <= 0xBF && utf8_io) {
 				/* This is a UTF-8 continuation byte. */
 
-				interlink->utf_8.ucs <<= 6;
-				interlink->utf_8.ucs |= key & 0x3F;
-				if (! --interlink->utf_8.len) {
-					unicode_val_T u = interlink->utf_8.ucs;
+				interlink->utf8.ucs <<= 6;
+				interlink->utf8.ucs |= key & 0x3F;
+				if (! --interlink->utf8.len) {
+					unicode_val_T u = interlink->utf8.ucs;
 
 					/* UTF-8 allows neither overlong
 					 * sequences nor surrogates.  */
-					if (u < interlink->utf_8.min
+					if (u < interlink->utf8.min
 					    || is_utf16_surrogate(u))
 						u = UCS_REPLACEMENT_CHARACTER;
 					term_send_ucs(term, u,
-						      term->interlink->utf_8.modifier);
+						      term->interlink->utf8.modifier);
 				}
 				break;
 
@@ -354,9 +354,9 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 				 * terminated character, but don't break;
 				 * let this byte be handled below. */
 
-				interlink->utf_8.len = 0;
+				interlink->utf8.len = 0;
 				term_send_ucs(term, UCS_REPLACEMENT_CHARACTER,
-					      term->interlink->utf_8.modifier);
+					      term->interlink->utf8.modifier);
 			}
 		}
 
@@ -415,16 +415,16 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 
 			/* This will hold because @key was checked above.  */
 			assert(len >= 2 && len <= 6);
-			if_assert_failed goto invalid_utf_8_start_byte;
+			if_assert_failed goto invalid_utf8_start_byte;
 
-			interlink->utf_8.min = min[len - 2];
-			interlink->utf_8.len = len - 1;
-			interlink->utf_8.ucs = key & (mask - 1);
-			interlink->utf_8.modifier = modifier;
+			interlink->utf8.min = min[len - 2];
+			interlink->utf8.len = len - 1;
+			interlink->utf8.ucs = key & (mask - 1);
+			interlink->utf8.modifier = modifier;
 			break;
 		}
 
-invalid_utf_8_start_byte:
+invalid_utf8_start_byte:
 		term_send_ucs(term, UCS_REPLACEMENT_CHARACTER, modifier);
 		break;
 	}
diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 4e302aad..9bafc6d0 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -542,11 +542,11 @@ add_char_data(struct string *screen, struct screen_driver *driver,
 			add_char_to_string(screen, (unsigned char)data);
 		else
 			if (data != UCS_NO_CHAR)
-				add_to_string(screen, encode_utf_8(data));
+				add_to_string(screen, encode_utf8(data));
 #else
 		int charset = driver->charsets[!!border];
 
-		add_to_string(screen, cp2utf_8(charset, data));
+		add_to_string(screen, cp2utf8(charset, data));
 #endif /* CONFIG_UTF_8 */
 		return;
 	}
diff --git a/src/viewer/dump/dump.c b/src/viewer/dump/dump.c
index 53847e69..c3d05b26 100644
--- a/src/viewer/dump/dump.c
+++ b/src/viewer/dump/dump.c
@@ -357,7 +357,7 @@ add_document_to_string(struct string *string, struct document *document)
 
 #ifdef CONFIG_UTF_8
 	if (is_cp_utf8(document->options.cp))
-		goto utf_8;
+		goto utf8;
 #endif /* CONFIG_UTF_8 */
 
 	for (y = 0; y < document->height; y++) {
@@ -394,7 +394,7 @@ add_document_to_string(struct string *string, struct document *document)
 	}
 #ifdef CONFIG_UTF_8
 	goto end;
-utf_8:
+utf8:
 	for (y = 0; y < document->height; y++) {
 		struct screen_char *pos = document->data[y].chars;
 		int white = 0;
@@ -422,7 +422,7 @@ utf_8:
 					if (frame)
 						add_char_to_string(string, data);
 					else
-						add_to_string(string, encode_utf_8(data));
+						add_to_string(string, encode_utf8(data));
 				}
 			}
 		}
@@ -851,7 +851,7 @@ dump_to_file(struct document *document, int fd)
 
 #ifdef CONFIG_UTF_8
 	if (is_cp_utf8(document->options.cp))
-		goto utf_8;
+		goto utf8;
 #endif /* CONFIG_UTF_8 */
 
 	for (y = 0; y < document->height; y++) {
@@ -892,7 +892,7 @@ dump_to_file(struct document *document, int fd)
 	}
 #ifdef CONFIG_UTF_8
 	goto ref;
-utf_8:
+utf8:
 	for (y = 0; y < document->height; y++) {
 		int white = 0;
 		int x;
@@ -907,7 +907,7 @@ utf_8:
 			    && c >= 176 && c < 224)
 				c = frame_dumb[c - 176];
 			else {
-				unsigned char *utf8_buf = encode_utf_8(c);
+				unsigned char *utf8_buf = encode_utf8(c);
 
 				while (*utf8_buf) {
 					if (write_char(*utf8_buf++,
diff --git a/src/viewer/text/form.c b/src/viewer/text/form.c
index 70059ebd..6b079f14 100644
--- a/src/viewer/text/form.c
+++ b/src/viewer/text/form.c
@@ -352,7 +352,7 @@ draw_form_entry(struct terminal *term, struct document_view *doc_view,
 
 			x = link->points[0].x + dx;
 #ifdef CONFIG_UTF_8
-			if (term->utf8) goto utf_8;
+			if (term->utf8) goto utf8;
 #endif /* CONFIG_UTF_8 */
 			int_bounds(&fs->vpos, fs->state - fc->size + 1, fs->state);
 			len = strlen(fs->value) - fs->vpos;
@@ -372,7 +372,7 @@ draw_form_entry(struct terminal *term, struct document_view *doc_view,
 			}
 			break;
 #ifdef CONFIG_UTF_8
-utf_8:
+utf8:
 			retried = 0;
 
 retry_after_scroll:
@@ -390,7 +390,7 @@ retry_after_scroll:
 				int cells, cell;
 				unsigned char *maybe_in_view = text;
 
-				data = utf_8_to_unicode(&text, end);
+				data = utf8_to_unicode(&text, end);
 				if (data == UCS_NO_CHAR) /* end of string */
 					data = '_';
 				else if (fc->type == FC_PASSWORD)
@@ -475,7 +475,7 @@ drew_char:
 				 * fully displayed.  If there is no
 				 * such character, reserve one cell
 				 * for the cursor anyway.  */
-				if (utf_8_to_unicode(&ptr, end) == UCS_NO_CHAR)
+				if (utf8_to_unicode(&ptr, end) == UCS_NO_CHAR)
 					--cells;
 				ptr = utf8_step_backward(ptr, fs->value,
 							 cells, how, NULL);
@@ -507,7 +507,7 @@ drew_char:
 				/* XXX: when can this happen? --pasky */
 				s = "";
 #ifdef CONFIG_UTF_8
-			if (term->utf8) goto utf_8_select;
+			if (term->utf8) goto utf8_select;
 #endif /* CONFIG_UTF_8 */
 			len = s ? strlen(s) : 0;
 			for (i = 0; i < link->npoints; i++) {
@@ -518,7 +518,7 @@ drew_char:
 			}
 			break;
 #ifdef CONFIG_UTF_8
-utf_8_select:
+utf8_select:
 			text = s;
 			end = strchr(s, '\0');
 			len = utf8_ptr2cells(text, end);
@@ -530,7 +530,7 @@ utf_8_select:
 					if (i < len) {
 						int cell;
 
-						data = utf_8_to_unicode(&s, end);
+						data = utf8_to_unicode(&s, end);
 						cell = unicode_to_cell(data);
 						if (i + 1 < len && cell == 2) {
 							draw_char_data(term, x++, y, data);
@@ -1402,7 +1402,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 				unsigned char *text = fs->value + fs->state;
 				unsigned char *end = strchr(text, '\0');
 
-				utf_8_to_unicode(&text, end);
+				utf8_to_unicode(&text, end);
 				fs->state = (int)(text - fs->value);
 			} else
 #endif /* CONFIG_UTF_8 */
@@ -1592,7 +1592,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 				unsigned char *text = fs->value + fs->state;
 				unsigned char *old = text;
 
-				utf_8_to_unicode(&text, end);
+				utf8_to_unicode(&text, end);
 				if (old != text) {
 					memmove(old, text,
 						(int)(end - text) + 1);
diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c
index d812414d..491412f2 100644
--- a/src/viewer/text/search.c
+++ b/src/viewer/text/search.c
@@ -464,7 +464,7 @@ memacpy_u(unsigned char *text, int textlen, int utf8)
 		int i;
 
 		for (i = 0; i < textlen; i++)
-			mem[i] = utf_8_to_unicode(&text, text + 7);
+			mem[i] = utf8_to_unicode(&text, text + 7);
 	} else {
 		int i;
 
diff --git a/src/viewer/text/textarea.c b/src/viewer/text/textarea.c
index 944c257f..751bc995 100644
--- a/src/viewer/text/textarea.c
+++ b/src/viewer/text/textarea.c
@@ -367,7 +367,7 @@ draw_textarea_utf8(struct terminal *term, struct form_state *fs,
 			if (i >= -fs->vpos && text < end) {
 				int cell;
 
-				data = utf_8_to_unicode(&text, end);
+				data = utf8_to_unicode(&text, end);
 				cell = unicode_to_cell(data);
 				if (cell == 2) {
 					draw_char_data(term, x++, y, data);
@@ -754,7 +754,7 @@ new_pos(struct form_state *fs, struct line_info *line, int current, int max_cell
 	int cells = 0;
 
 	while(cells < max_cells) {
-		unicode_val_T data = utf_8_to_unicode(&text, end);
+		unicode_val_T data = utf8_to_unicode(&text, end);
 
 		if (data == UCS_NO_CHAR) break;
 		cells += unicode_to_cell(data);
@@ -1135,7 +1135,7 @@ do_op_right(struct form_state *fs, struct line_info *line, int current, int utf8
 	text = fs->value + fs->state;
 	end = strchr(text, '\0');
 	old_state = fs->state;
-	utf_8_to_unicode(&text, end);
+	utf8_to_unicode(&text, end);
 
 	fs->state = text - fs->value;
 

From 92cb452a9e64b321ea342274226717739746342f Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 16:12:47 +0300
Subject: [PATCH 106/132] Rename CONFIG_UTF_8 to CONFIG_UTF8.

The configure script no longer recognizes "CONFIG_UTF_8=yes" lines
in custom features.conf files.  They will have to be changed to
"CONFIG_UTF8=yes".  This incompatibility was deemed acceptable
because no released version of ELinks supports CONFIG_UTF_8.

The --enable-utf-8 option was not renamed.
---
 Makefile.config.in                |   2 +-
 configure.in                      |   2 +-
 features.conf                     |   2 +-
 src/bfu/button.c                  |  40 +++++------
 src/bfu/dialog.c                  |  26 +++----
 src/bfu/group.c                   |  20 +++---
 src/bfu/hotkey.c                  |   6 +-
 src/bfu/inpfield.c                |  48 ++++++-------
 src/bfu/listbox.c                 |   4 +-
 src/bfu/menu.c                    |  36 +++++-----
 src/bfu/text.c                    |  28 ++++----
 src/config/kbdbind.h              |   4 +-
 src/dialogs/download.c            |   8 +--
 src/dialogs/menu.c                |   4 +-
 src/dialogs/options.c             |   4 +-
 src/dialogs/status.c              |   8 +--
 src/document/document.h           |   4 +-
 src/document/dom/renderer.c       |  16 ++---
 src/document/html/parser/forms.c  |   4 +-
 src/document/html/renderer.c      |  62 ++++++++--------
 src/document/html/renderer.h      |   2 +-
 src/document/options.h            |   4 +-
 src/document/plain/renderer.c     |  26 +++----
 src/document/renderer.c           |   4 +-
 src/intl/charsets.c               |  28 ++++----
 src/intl/charsets.h               |   4 +-
 src/main/version.c                |   2 +-
 src/protocol/bittorrent/dialogs.c |   8 +--
 src/session/download.c            |   4 +-
 src/session/session.c             |   4 +-
 src/terminal/draw.c               |  24 +++----
 src/terminal/draw.h               |  16 ++---
 src/terminal/event.c              |  18 ++---
 src/terminal/kbd.h                |   2 +-
 src/terminal/screen.c             | 116 +++++++++++++++---------------
 src/terminal/terminal.h           |   4 +-
 src/viewer/dump/dump.c            |  16 ++---
 src/viewer/text/form.c            |  92 ++++++++++++------------
 src/viewer/text/form.h            |   4 +-
 src/viewer/text/link.c            |  26 +++----
 src/viewer/text/search.c          |  20 +++---
 src/viewer/text/textarea.c        | 102 +++++++++++++-------------
 src/viewer/text/textarea.h        |   8 +--
 src/viewer/text/view.c            |   2 +-
 44 files changed, 432 insertions(+), 432 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index b8cc68a5..896fa718 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -161,7 +161,7 @@ CONFIG_SSL = @CONFIG_SSL@
 CONFIG_SYSMOUSE = @CONFIG_SYSMOUSE@
 CONFIG_TRUE_COLOR = @CONFIG_TRUE_COLOR@
 CONFIG_URI_REWRITE = @CONFIG_URI_REWRITE@
-CONFIG_UTF_8 = @CONFIG_UTF_8@
+CONFIG_UTF8 = @CONFIG_UTF8@
 CONFIG_XBEL_BOOKMARKS = @CONFIG_XBEL_BOOKMARKS@
 CONFIG_XMLTO = @CONFIG_XMLTO@
 CONFIG_GSSAPI = @CONFIG_GSSAPI@
diff --git a/configure.in b/configure.in
index 884f1e49..751bc891 100644
--- a/configure.in
+++ b/configure.in
@@ -1281,7 +1281,7 @@ EL_ARG_ENABLE(CONFIG_OWN_LIBC, own-libc, [Own libc stubs],
 EL_ARG_ENABLE(CONFIG_SMALL, small, [Small binary],
 	      [  --enable-small          reduce binary size as far as possible (but see the bottom of doc/small.txt!)])
 
-EL_ARG_ENABLE(CONFIG_UTF_8, utf-8, [UTF-8],
+EL_ARG_ENABLE(CONFIG_UTF8, utf-8, [UTF-8],
 	      [  --enable-utf-8          enable UTF-8 support])
 
 
diff --git a/features.conf b/features.conf
index 5b0d9d51..067be180 100644
--- a/features.conf
+++ b/features.conf
@@ -626,7 +626,7 @@ CONFIG_SMALL=no
 #
 # Default: disabled
 
-CONFIG_UTF_8=no
+CONFIG_UTF8=no
 
 
 
diff --git a/src/bfu/button.c b/src/bfu/button.c
index 327c73fa..8b84110a 100644
--- a/src/bfu/button.c
+++ b/src/bfu/button.c
@@ -77,7 +77,7 @@ add_dlg_button_do(struct dialog *dlg, unsigned char *text, int flags,
 	}
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static void
 buttons_width(struct widget_data *widget_data, int n,
 	      int *minwidth, int *maxwidth, int utf8)
@@ -85,25 +85,25 @@ buttons_width(struct widget_data *widget_data, int n,
 static void
 buttons_width(struct widget_data *widget_data, int n,
 	      int *minwidth, int *maxwidth)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	int maxw = -BUTTON_HSPACING;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int button_lr_len = utf8_ptr2cells(BUTTON_LEFT, NULL)
 			  + utf8_ptr2cells(BUTTON_RIGHT, NULL);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	assert(n > 0);
 	if_assert_failed return;
 
 	while (n--) {
 		int minw;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (utf8)
 			minw = utf8_ptr2cells((widget_data++)->widget->text, NULL)
 			       + BUTTON_HSPACING + button_lr_len;
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			minw = (widget_data++)->widget->info.button.textlen
 				+ BUTTON_HSPACING + BUTTON_LR_LEN;
 
@@ -128,41 +128,41 @@ dlg_format_buttons(struct terminal *term,
 
 		while (i2 < n) {
 			mw = 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			buttons_width(widget_data1, i2 - i1 + 1, NULL, &mw,
 				      term->utf8);
 #else
 			buttons_width(widget_data1, i2 - i1 + 1, NULL, &mw);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			if (mw <= w) i2++;
 			else break;
 		}
 
 		mw = 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		buttons_width(widget_data1, i2 - i1, NULL, &mw, term->utf8);
 #else
 		buttons_width(widget_data1, i2 - i1, NULL, &mw);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		if (rw) int_bounds(rw, mw, w);
 
 		if (!format_only) {
 			int i;
 			int p = x + (align == ALIGN_CENTER ? (w - mw) / 2 : 0);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			int button_lr_len = utf8_ptr2cells(BUTTON_LEFT, NULL)
 					  + utf8_ptr2cells(BUTTON_RIGHT, NULL);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 			for (i = i1; i < i2; i++) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				if (term->utf8)
 					set_box(&widget_data[i].box,
 						p, *y,
 						utf8_ptr2cells(widget_data[i].widget->text, NULL)
 						+ button_lr_len, BUTTON_HEIGHT);
 				else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 					set_box(&widget_data[i].box,
 						p, *y,
 						widget_data[i].widget->info.button.textlen
@@ -195,7 +195,7 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 	}
 	if (!color || !shortcut_color) return EVENT_PROCESSED;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) {
 		int button_left_len = utf8_ptr2cells(BUTTON_LEFT, NULL);
 		int button_right_len = utf8_ptr2cells(BUTTON_RIGHT, NULL);
@@ -205,7 +205,7 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 			(button_left_len + button_right_len);
 
 	} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	{
 		x = pos->x + BUTTON_LEFT_LEN;
 		len = widget_data->box.width - BUTTON_LR_LEN;
@@ -221,7 +221,7 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 		attr = get_opt_bool("ui.dialogs.underline_button_shortcuts")
 		     ? SCREEN_ATTR_UNDERLINE : 0;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8) {
 			if (hk_pos >= 0) {
 				int hk_bytes = utf8charlen(&text[hk_pos+1]);
@@ -266,7 +266,7 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 					  0, color);
 			}
 		} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		if (hk_pos >= 0) {
 			int right = widget_data->widget->info.button.truetextlen - hk_pos - 1;
 
@@ -285,7 +285,7 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 			draw_text(term, x + 1, pos->y, &text[1], len - 1, 0, color);
 		}
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) {
 		int text_cells = utf8_ptr2cells(widget_data->widget->text, NULL);
 		int hk = (widget_data->widget->info.button.hotkey_pos >= 0);
@@ -293,7 +293,7 @@ display_button(struct dialog_data *dlg_data, struct widget_data *widget_data)
 		draw_text(term, x + text_cells - hk, pos->y,
 			  BUTTON_RIGHT, BUTTON_RIGHT_LEN, 0, color);
 	} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		draw_text(term, x + len, pos->y, BUTTON_RIGHT,
 			  BUTTON_RIGHT_LEN, 0, color);
 	if (sel) {
diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index fad2d7dd..89e3ed3f 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -101,19 +101,19 @@ redraw_dialog(struct dialog_data *dlg_data, int layout)
 			int titlecells = titlelen;
 			int x, y;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (term->utf8)
 				titlecells = utf8_ptr2cells(title,
 							    &title[titlelen]);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 			titlecells = int_min(box.width - 2, titlecells);
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (term->utf8)
 				titlelen = utf8_cells2bytes(title, titlecells,
 							    NULL);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 			x = (box.width - titlecells) / 2 + box.x;
 			y = box.y - 1;
@@ -286,7 +286,7 @@ static void
 select_button_by_key(struct dialog_data *dlg_data)
 {
 	term_event_char_T key;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int codepage;
 #endif
 	
@@ -295,7 +295,7 @@ select_button_by_key(struct dialog_data *dlg_data)
 
 	if (!check_kbd_label_key(ev)) return;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	key = unicode_fold_label_case(get_kbd_key(ev));
 	codepage = get_opt_codepage_tree(dlg_data->win->term->spec, "charset");
 #else
@@ -319,7 +319,7 @@ select_button_by_key(struct dialog_data *dlg_data)
 		else
 			hk_ptr = widget_data->widget->text;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		hk_char = cp_to_unicode(codepage, &hk_ptr,
 					strchr(hk_ptr, '\0'));
 		hk_char = unicode_fold_label_case(hk_char);
@@ -611,11 +611,11 @@ generic_dialog_layouter(struct dialog_data *dlg_data)
 	int height = dialog_max_height(term);
 	int x = 0, y, rw;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8)
 		rw = int_min(w, utf8_ptr2cells(dlg_data->dlg->title, NULL));
 	else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		rw = int_min(w, strlen(dlg_data->dlg->title));
 	y = dlg_data->dlg->layout.padding_top ? 0 : -1;
 
@@ -656,15 +656,15 @@ draw_dialog(struct dialog_data *dlg_data, int width, int height)
 		/* Draw shadow */
 		draw_shadow(term, &dlg_data->box,
 			    get_bfu_color(term, "dialog.shadow"), 2, 1);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			fix_dwchar_around_box(term, &dlg_data->box, 0, 2, 1);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	else if(term->utf8)
 		fix_dwchar_around_box(term, &dlg_data->box, 0, 0, 0);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 }
 
 static void
diff --git a/src/bfu/group.c b/src/bfu/group.c
index 38673867..3d34e7c7 100644
--- a/src/bfu/group.c
+++ b/src/bfu/group.c
@@ -39,14 +39,14 @@ dlg_format_group(struct terminal *term,
 		int label_length;
 		int label_padding;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8) {
 			if (text && *text)
 				label_length = utf8_ptr2cells(text, NULL);
 			else
 				label_length = 0;
 		} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			label_length = (text && *text) ? strlen(text) : 0;
 
 		label_padding = (label_length > 0);
@@ -54,12 +54,12 @@ dlg_format_group(struct terminal *term,
 		if (widget_data->widget->type == WIDGET_CHECKBOX) {
 			width = CHECKBOX_LEN;
 		} else if (widget_is_textfield(widget_data)) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (term->utf8) {
 				width = utf8_ptr2cells(widget_data->widget->data,
 						       NULL);
 			} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				width = widget_data->widget->datalen;
 		} else {
 			/* TODO: handle all widget types. */
@@ -81,7 +81,7 @@ dlg_format_group(struct terminal *term,
 			if (widget_data->widget->type == WIDGET_CHECKBOX) {
 				/* Draw text at right of checkbox. */
 				if (label_length) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 					if (term->utf8) {
 						int lb = utf8_cells2bytes(
 								text,
@@ -92,7 +92,7 @@ dlg_format_group(struct terminal *term,
 							  *y, text, lb, 0,
 							  color);
 					} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 					{
 						draw_text(term, xpos + width
 								+ label_padding,
@@ -107,7 +107,7 @@ dlg_format_group(struct terminal *term,
 			} else if (widget_is_textfield(widget_data)) {
 				/* Draw label at left of widget. */
 				if (label_length) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 					if (term->utf8) {
 						int lb = utf8_cells2bytes(
 								text,
@@ -116,7 +116,7 @@ dlg_format_group(struct terminal *term,
 						draw_text(term, xpos, *y,
 							  text, lb, 0, color);
 					} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 					{
 						draw_text(term, xpos, *y,
 							  text, label_length,
@@ -148,11 +148,11 @@ group_layouter(struct dialog_data *dlg_data)
 	int y = 0;
 	int n = dlg_data->number_of_widgets - 2;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8)
 		rw = int_min(w, utf8_ptr2cells(dlg_data->dlg->title, NULL));
 	else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		rw = int_min(w, strlen(dlg_data->dlg->title));
 
 	dlg_format_group(term, dlg_data->widgets_data, n,
diff --git a/src/bfu/hotkey.c b/src/bfu/hotkey.c
index 4feaac79..9bfc7681 100644
--- a/src/bfu/hotkey.c
+++ b/src/bfu/hotkey.c
@@ -125,7 +125,7 @@ static int
 check_hotkeys_common(struct menu *menu, term_event_char_T hotkey, struct terminal *term,
 		     int check_mode)
 {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	unicode_val_T key = unicode_fold_label_case(hotkey);
 	int codepage = get_opt_codepage_tree(term->spec, "charset");
 #else
@@ -143,7 +143,7 @@ check_hotkeys_common(struct menu *menu, term_event_char_T hotkey, struct termina
 	do {
 		struct menu_item *item;
 		unsigned char *text;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		unicode_val_T items_hotkey;
 #endif
 		int found;
@@ -176,7 +176,7 @@ check_hotkeys_common(struct menu *menu, term_event_char_T hotkey, struct termina
 		}
 
 		/* Compare @key to the character to which @text points.  */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		items_hotkey = cp_to_unicode(codepage, &text,
 					     strchr(text, '\0'));
 		found = (unicode_fold_label_case(items_hotkey) == key);
diff --git a/src/bfu/inpfield.c b/src/bfu/inpfield.c
index 6b67b073..297b84b5 100644
--- a/src/bfu/inpfield.c
+++ b/src/bfu/inpfield.c
@@ -266,11 +266,11 @@ display_field_do(struct dialog_data *dlg_data, struct widget_data *widget_data,
 	struct terminal *term = dlg_data->win->term;
 	struct color_pair *color;
 	int sel = is_selected_widget(dlg_data, widget_data);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int len = 0, left = 0;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) {
 		unsigned char *t = widget_data->cdata;
 		int p = widget_data->info.field.cpos;
@@ -280,7 +280,7 @@ display_field_do(struct dialog_data *dlg_data, struct widget_data *widget_data,
 		int_lower_bound(&left, 0);
 		widget_data->info.field.vpos = utf8_cells2bytes(t, left, NULL);
 	} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	{
 		int_bounds(&widget_data->info.field.vpos,
 		   widget_data->info.field.cpos - widget_data->box.width + 1,
@@ -297,21 +297,21 @@ display_field_do(struct dialog_data *dlg_data, struct widget_data *widget_data,
 		unsigned char *text = widget_data->cdata + widget_data->info.field.vpos;
 		int len, w;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8 && !hide)
 			len = utf8_ptr2cells(text, NULL);
 		else if (term->utf8)
 			len = utf8_ptr2chars(text, NULL);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			len = strlen(text);
 		w = int_min(len, widget_data->box.width);
 
 		if (!hide) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (term->utf8)
 				w = utf8_cells2bytes(text, w, NULL);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			draw_text(term, widget_data->box.x, widget_data->box.y,
 				  text, w, 0, color);
 		} else {
@@ -327,11 +327,11 @@ display_field_do(struct dialog_data *dlg_data, struct widget_data *widget_data,
 	if (sel) {
 		int x;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			x = widget_data->box.x + len - left;
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			x = widget_data->box.x + widget_data->info.field.cpos - widget_data->info.field.vpos;
 
 		set_cursor(term, x, widget_data->box.y, 0);
@@ -473,7 +473,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 
 		case ACT_EDIT_RIGHT:
 			if (widget_data->info.field.cpos < strlen(widget_data->cdata)) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				if (term->utf8) {
 					unsigned char *next = widget_data->cdata + widget_data->info.field.cpos;
 					unsigned char *end = strchr(next, '\0');
@@ -481,7 +481,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 					utf8_to_unicode(&next, end);
 					widget_data->info.field.cpos = (int)(next - widget_data->cdata);
 				} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				{
 					widget_data->info.field.cpos++;
 				}
@@ -491,7 +491,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 		case ACT_EDIT_LEFT:
 			if (widget_data->info.field.cpos > 0)
 				widget_data->info.field.cpos--;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (widget_data->info.field.cpos && term->utf8) {
 				unsigned char *t = widget_data->cdata;
 				unsigned char *t2 = t;
@@ -504,7 +504,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 				widget_data->info.field.cpos = (int)(t2 - t);
 
 			}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			goto display_field;
 
 		case ACT_EDIT_HOME:
@@ -516,7 +516,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 			goto display_field;
 
 		case ACT_EDIT_BACKSPACE:
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (widget_data->info.field.cpos && term->utf8) {
 				/* XXX: stolen from src/viewer/text/form.c */
 				/* FIXME: This isn't nice. We remove last byte
@@ -543,7 +543,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 				}
 				goto display_field;
 			}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			if (widget_data->info.field.cpos) {
 				memmove(widget_data->cdata + widget_data->info.field.cpos - 1,
 					widget_data->cdata + widget_data->info.field.cpos,
@@ -558,7 +558,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 
 				if (widget_data->info.field.cpos >= cdata_len) goto display_field;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				if (term->utf8) {
 					unsigned char *end = widget_data->cdata + cdata_len;
 					unsigned char *text = widget_data->cdata + widget_data->info.field.cpos;
@@ -571,7 +571,7 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 					}
 					goto display_field;
 				}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				memmove(widget_data->cdata + widget_data->info.field.cpos,
 					widget_data->cdata + widget_data->info.field.cpos + 1,
 					cdata_len - widget_data->info.field.cpos + 1);
@@ -680,12 +680,12 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 			if (check_kbd_textinput_key(ev)) {
 				unsigned char *text = widget_data->cdata;
 				int textlen = strlen(text);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				const unsigned char *ins = encode_utf8(get_kbd_key(ev));
 				int inslen = utf8charlen(ins);
-#else  /* !CONFIG_UTF_8 */
+#else  /* !CONFIG_UTF8 */
 				const int inslen = 1;
-#endif /* !CONFIG_UTF_8 */
+#endif /* !CONFIG_UTF8 */
 
 				if (textlen >= widget_data->widget->datalen - inslen)
 					goto display_field;
@@ -695,11 +695,11 @@ kbd_field(struct dialog_data *dlg_data, struct widget_data *widget_data)
 				text	+= widget_data->info.field.cpos;
 
 				memmove(text + inslen, text, textlen + 1);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				memcpy(text, ins, inslen);
-#else  /* !CONFIG_UTF_8 */
+#else  /* !CONFIG_UTF8 */
 				*text = get_kbd_key(ev);
-#endif /* !CONFIG_UTF_8 */
+#endif /* !CONFIG_UTF8 */
 				widget_data->info.field.cpos += inslen;
 				goto display_field;
 			}
diff --git a/src/bfu/listbox.c b/src/bfu/listbox.c
index 59015a1a..f59fbef8 100644
--- a/src/bfu/listbox.c
+++ b/src/bfu/listbox.c
@@ -462,11 +462,11 @@ display_listbox_item(struct listbox_item *item, void *data_, int *offset)
 
 		len = strlen(text);
 		int_upper_bound(&len, int_max(0, data->widget_data->box.width - depth * 5));
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (data->term->utf8)
 			len_bytes = utf8_cells2bytes(text, len, NULL);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			len_bytes = len;
 
 		draw_text(data->term, x, y, text, len_bytes, 0, text_color);
diff --git a/src/bfu/menu.c b/src/bfu/menu.c
index d91450bd..b4c56590 100644
--- a/src/bfu/menu.c
+++ b/src/bfu/menu.c
@@ -200,12 +200,12 @@ get_menuitem_text_width(struct terminal *term, struct menu_item *mi)
 
 	if (!text[0]) return 0;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8)
 		return L_TEXT_SPACE + utf8_ptr2cells(text, NULL)
 		       - !!mi->hotkey_pos + R_TEXT_SPACE;
 	else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		return L_TEXT_SPACE + strlen(text)
 		       - !!mi->hotkey_pos + R_TEXT_SPACE;
 }
@@ -382,13 +382,13 @@ draw_menu_left_text(struct terminal *term, unsigned char *text, int len,
 	if (len < 0) len = strlen(text);
 	if (!len) return;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) {
 		max_len = utf8_cells2bytes(text, w, NULL);
 		if (max_len <= 0)
 			return;
 	} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		max_len = w;
 
 	if (len > max_len) len = max_len;
@@ -410,7 +410,7 @@ draw_menu_left_text_hk(struct terminal *term, unsigned char *text,
 	int xbase = x + L_TEXT_SPACE;
 	int w = width - (L_TEXT_SPACE + R_TEXT_SPACE);
 	int hk_state = 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	unsigned char *text2, *end;
 #endif
 
@@ -430,9 +430,9 @@ draw_menu_left_text_hk(struct terminal *term, unsigned char *text,
 		hk_color_sel = tmp;
 	}
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) goto utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	for (x = 0; x - !!hk_state < w && (c = text[x]); x++) {
 		if (!hk_state && x == hotkey_pos - 1) {
@@ -454,7 +454,7 @@ draw_menu_left_text_hk(struct terminal *term, unsigned char *text,
 	}
 	return;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 utf8:
 	end = strchr(text, '\0');
 	text2 = text;
@@ -517,7 +517,7 @@ utf8:
 		}
 
 	}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 }
 
 static inline void
@@ -560,15 +560,15 @@ display_menu(struct terminal *term, struct menu *menu)
 		/* Draw shadow */
 		draw_shadow(term, &menu->box,
 			    get_bfu_color(term, "dialog.shadow"), 2, 1);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			fix_dwchar_around_box(term, &box, 1, 2, 1);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	else if(term->utf8)
 		fix_dwchar_around_box(term, &box, 1, 0, 0);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	menu_height = box.height;
 	box.height = 1;
@@ -1114,23 +1114,23 @@ display_mainmenu(struct terminal *term, struct menu *menu)
 			text = _(text, term);
 
 		textlen = strlen(text) - !!l;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			screencnt = utf8_ptr2cells(text, NULL) - !!l;
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			screencnt = textlen;
 
 		if (selected) {
 			color = selected_color;
 			box.x = p;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (term->utf8)
 				box.width = L_MAINTEXT_SPACE + L_TEXT_SPACE
 					+ screencnt
 					+ R_TEXT_SPACE + R_MAINTEXT_SPACE;
 			else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				box.width = L_MAINTEXT_SPACE + L_TEXT_SPACE
 					+ textlen
 					+ R_TEXT_SPACE + R_MAINTEXT_SPACE;
@@ -1163,7 +1163,7 @@ display_mainmenu(struct terminal *term, struct menu *menu)
 	menu->last = i - 1;
 	int_lower_bound(&menu->last, menu->first);
 	if (menu->last < menu->size - 1) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8) {
 			struct screen_char *schar;
 
diff --git a/src/bfu/text.c b/src/bfu/text.c
index 8835ea0b..583d09fd 100644
--- a/src/bfu/text.c
+++ b/src/bfu/text.c
@@ -36,13 +36,13 @@ add_dlg_text(struct dialog *dlg, unsigned char *text,
 }
 
 /* Returns length of substring (from start of @text) before a split. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static inline int
 split_line(unsigned char *text, int max_width, int *cells, int utf8)
 #else
 static inline int
 split_line(unsigned char *text, int max_width, int *cells)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	unsigned char *split = text;
 	int cells_save = *cells;
@@ -52,7 +52,7 @@ split_line(unsigned char *text, int max_width, int *cells)
 	while (*split && *split != '\n') {
 		unsigned char *next_split;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (utf8) {
 			unsigned char *next_char_begin = split
 							 + utf8charlen(split);
@@ -74,7 +74,7 @@ split_line(unsigned char *text, int max_width, int *cells)
 				next_char_begin += utf8charlen(next_split);
 			}
 		} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		{
 			next_split = split + 1;
 
@@ -88,7 +88,7 @@ split_line(unsigned char *text, int max_width, int *cells)
 			 * meaning there's no splittable substring under
 			 * requested width. */
 			if (split == text) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				if (utf8) {
 					int m_bytes = utf8_cells2bytes(text,
 								       max_width,
@@ -97,7 +97,7 @@ split_line(unsigned char *text, int max_width, int *cells)
 					cells_save = utf8_ptr2cells(text,
 								    split);
 				} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				{
 					split = &text[max_width];
 					cells_save = max_width;
@@ -106,9 +106,9 @@ split_line(unsigned char *text, int max_width, int *cells)
 				/* FIXME: Function ispunct won't work correctly
 				 * with UTF-8 characters. We need some similar
 				 * function for UTF-8 characters. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				if (!utf8)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				{
 					/* Give preference to split on a
 					 * punctuation if any. Note that most
@@ -150,13 +150,13 @@ split_line(unsigned char *text, int max_width, int *cells)
 #define realloc_lines(x, o, n) mem_align_alloc(x, o, n, LINES_GRANULARITY)
 
 /* Find the start of each line with the current max width */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static unsigned char **
 split_lines(struct widget_data *widget_data, int max_width, int utf8)
 #else
 static unsigned char **
 split_lines(struct widget_data *widget_data, int max_width)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	unsigned char *text = widget_data->widget->text;
 	unsigned char **lines = (unsigned char **) widget_data->cdata;
@@ -175,7 +175,7 @@ split_lines(struct widget_data *widget_data, int max_width)
 		if (isspace(*text)) text++;
 		if (!*text) break;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		width = split_line(text, max_width, &cells, utf8);
 #else
 		width = split_line(text, max_width, &cells);
@@ -228,11 +228,11 @@ dlg_format_text_do(struct terminal *term, unsigned char *text,
 			firstline = 0;
 		if (!*text) break;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		line_width = split_line(text, width, &cells, term->utf8);
 #else
 		line_width = split_line(text, width, &cells);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 		/* split_line() may return 0. */
 		if (line_width < 1) {
@@ -286,7 +286,7 @@ dlg_format_text(struct terminal *term, struct widget_data *widget_data,
 
 		/* Ensure that the current split is valid but don't
 		 * split if we don't have to */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (widget_data->box.width != width
 		    && !split_lines(widget_data, width, term->utf8))
 			return;
diff --git a/src/config/kbdbind.h b/src/config/kbdbind.h
index c2965844..4ef6f1a2 100644
--- a/src/config/kbdbind.h
+++ b/src/config/kbdbind.h
@@ -182,10 +182,10 @@ void add_keystroke_to_string(struct string *str, struct term_event_keyboard *kbd
 /* void add_accesskey_to_string(struct string *str, unicode_val_T accesskey); */
 #define add_accesskey_to_string(str, accesskey) do { 		\
 	struct term_event_keyboard kbd; 			\
-	/* FIXME: #ifndef CONFIG_UTF_8, kbd.key is encoded in	\
+	/* FIXME: #ifndef CONFIG_UTF8, kbd.key is encoded in	\
 	 * the charset of the terminal, so accesskey should be	\
 	 * converted from unicode_val_T to that.		\
-	 * #ifdef CONFIG_UTF_8, the code is correct.  */	\
+	 * #ifdef CONFIG_UTF8, the code is correct.  */		\
 	kbd.key = accesskey;					\
 	/* try_document_key() recognizes only Alt-accesskey	\
 	 * combos.  */						\
diff --git a/src/dialogs/download.c b/src/dialogs/download.c
index 2eaefc78..a9369962 100644
--- a/src/dialogs/download.c
+++ b/src/dialogs/download.c
@@ -145,11 +145,11 @@ download_dialog_layouter(struct dialog_data *dlg_data)
 		mem_free(msg);
 		return;
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8)
 		decode_uri(url);
 	else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		decode_uri_for_display(url);
 	url_len = strlen(url);
 
@@ -302,11 +302,11 @@ get_file_download_text(struct listbox_item *item, struct terminal *term)
 
 	uristring = get_uri_string(file_download->uri, URI_PUBLIC);
 	if (uristring) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			decode_uri(uristring);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			decode_uri_for_display(uristring);
 	}
 
diff --git a/src/dialogs/menu.c b/src/dialogs/menu.c
index 56a5274f..8c996609 100644
--- a/src/dialogs/menu.c
+++ b/src/dialogs/menu.c
@@ -581,11 +581,11 @@ query_file(struct session *ses, struct uri *uri, void *data,
 	add_mime_filename_to_string(&def, uri);
 
 	/* Remove the %-ugliness for display */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (ses->tab->term->utf8)
 		decode_uri_string(&def);
 	else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		decode_uri_string_for_display(&def);
 
 	if (interactive) {
diff --git a/src/dialogs/options.c b/src/dialogs/options.c
index 91111f96..93ca7afb 100644
--- a/src/dialogs/options.c
+++ b/src/dialogs/options.c
@@ -60,9 +60,9 @@ charset_list(struct terminal *term, void *xxx, void *ses_)
 
 		if (!name) break;
 
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 		if (is_cp_utf8(i)) continue;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 		items++;
 		add_to_menu(&mi, name, NULL, ACT_MAIN_NONE,
diff --git a/src/dialogs/status.c b/src/dialogs/status.c
index 9dff84a5..6f569c5b 100644
--- a/src/dialogs/status.c
+++ b/src/dialogs/status.c
@@ -419,7 +419,7 @@ display_title_bar(struct session *ses, struct terminal *term)
 		int maxlen = int_max(term->width - 4 - buflen, 0);
 		int titlelen, titlewidth;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8) {
 			titlewidth = utf8_ptr2cells(document->title, NULL);
 			titlewidth = int_min(titlewidth, maxlen);
@@ -427,7 +427,7 @@ display_title_bar(struct session *ses, struct terminal *term)
 			titlelen = utf8_cells2bytes(document->title,
 							titlewidth, NULL);
 		} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		{
 			titlewidth = int_min(strlen(document->title), maxlen);
 			titlelen = titlewidth;
@@ -444,14 +444,14 @@ display_title_bar(struct session *ses, struct terminal *term)
 
 	if (title.length) {
 		int x;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8) {
 			x = int_max(term->width - 1
 				    - utf8_ptr2cells(title.source,
 						     title.source
 						     + title.length), 0);
 		} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			x = int_max(term->width - 1 - title.length, 0);
 
 		draw_text(term, x, 0, title.source, title.length, 0,
diff --git a/src/document/document.h b/src/document/document.h
index dd7b9685..bf9c2c85 100644
--- a/src/document/document.h
+++ b/src/document/document.h
@@ -118,7 +118,7 @@ struct link {
 #define get_link_name(link) \
 	(!link_is_form(link) ? (link)->data.name : NULL)
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 struct search {
 	int x, y;
 	signed int n;		/* RAM is cheap nowadays */
@@ -182,7 +182,7 @@ struct document {
 	struct search **slines1;
 	struct search **slines2;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	unsigned char buf[7];
 	unsigned char buf_length;
 #endif
diff --git a/src/document/dom/renderer.c b/src/document/dom/renderer.c
index a7543ab7..f11c9f3b 100644
--- a/src/document/dom/renderer.c
+++ b/src/document/dom/renderer.c
@@ -261,10 +261,10 @@ render_dom_line(struct dom_renderer *renderer, struct screen_char *template,
 	struct conv_table *convert = renderer->convert_table;
 	enum convert_string_mode mode = renderer->convert_mode;
 	int x, charlen;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int utf8 = document->options.utf8;
 	unsigned char *end;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 
 	assert(renderer && template && string && length);
@@ -280,9 +280,9 @@ render_dom_line(struct dom_renderer *renderer, struct screen_char *template,
 
 	add_search_node(renderer, length);
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	end = string + length;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	for (x = 0, charlen = 1; x < length;x += charlen, renderer->canvas_x++) {
 		unsigned char *text = &string[x];
 
@@ -307,7 +307,7 @@ render_dom_line(struct dom_renderer *renderer, struct screen_char *template,
 			break;
 		}
 		default:
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (utf8) {
 				unicode_val_T data;
 				charlen = utf8charlen(text);
@@ -324,7 +324,7 @@ render_dom_line(struct dom_renderer *renderer, struct screen_char *template,
 				}
 
 			} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				template->data = isscreensafe(*text) ? *text:'.';
 		}
 
@@ -1050,9 +1050,9 @@ render_dom_document(struct cache_entry *cached, struct document *document,
 	init_dom_renderer(&renderer, document, buffer, convert_table);
 
 	document->bgcolor = document->options.default_bg;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	document->options.utf8 = is_cp_utf8(document->options.cp);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	if (document->options.plain)
 		parser_type = SGML_PARSER_STREAM;
diff --git a/src/document/html/parser/forms.c b/src/document/html/parser/forms.c
index a2c7bc1a..51f975d1 100644
--- a/src/document/html/parser/forms.c
+++ b/src/document/html/parser/forms.c
@@ -497,12 +497,12 @@ end_parse:
 	max_width = 0;
 	for (i = 0; i < order; i++) {
 		if (!labels[i]) continue;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (html_context->options->utf8)
 			int_lower_bound(&max_width,
 					utf8_ptr2cells(labels[i], NULL));
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			int_lower_bound(&max_width, strlen(labels[i]));
 	}
 
diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
index b987e98f..9d316dfa 100644
--- a/src/document/html/renderer.c
+++ b/src/document/html/renderer.c
@@ -210,7 +210,7 @@ realloc_spaces(struct part *part, int length)
 
 	if (!ALIGN_SPACES(&part->spaces, part->spaces_len, length))
 		return -1;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (!ALIGN_SPACES(&part->char_width, part->spaces_len, length))
 		return -1;
 #endif
@@ -379,7 +379,7 @@ get_format_screen_char(struct html_context *html_context,
 	return &schar_cache;
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 /* First possibly do the format change and then find out what coordinates
  * to use since sub- or superscript might change them */
 static inline int
@@ -567,7 +567,7 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
 		}
 	}
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 static void
 move_links(struct html_context *html_context, int xf, int yf, int xt, int yt)
@@ -799,7 +799,7 @@ split_line_at(struct html_context *html_context, int width)
 	if (part->document) {
 		assert(part->document->data);
 		if_assert_failed return 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (html_context->options->utf8
 		    && width < part->spaces_len && part->char_width[width] == 2) {
 			move_chars(html_context, width, part->cy, par_format.leftmargin, part->cy + 1);
@@ -815,7 +815,7 @@ split_line_at(struct html_context *html_context, int width)
 		}
 	}
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (!(html_context->options->utf8
 	      && width < part->spaces_len
 	      && part->char_width[width] == 2))
@@ -826,7 +826,7 @@ split_line_at(struct html_context *html_context, int width)
 	if (tmp > 0) {
 		/* 0 is possible and I'm paranoid ... --Zas */
 		memmove(part->spaces, part->spaces + width, tmp);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		memmove(part->char_width, part->char_width + width, tmp);
 #endif
 	}
@@ -834,7 +834,7 @@ split_line_at(struct html_context *html_context, int width)
 	assert(tmp >= 0);
 	if_assert_failed tmp = 0;
 	memset(part->spaces + tmp, 0, width);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	memset(part->char_width + tmp, 0, width);
 #endif
 
@@ -843,7 +843,7 @@ split_line_at(struct html_context *html_context, int width)
 		assertm(tmp > 0, "part->spaces_len - par_format.leftmargin == %d", tmp);
 		/* So tmp is zero, memmove() should survive that. Don't recover. */
 		memmove(part->spaces + par_format.leftmargin, part->spaces, tmp);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		memmove(part->char_width + par_format.leftmargin, part->char_width, tmp);
 #endif
 	}
@@ -883,7 +883,7 @@ split_line(struct html_context *html_context)
 	assert(part);
 	if_assert_failed return 0;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (html_context->options->utf8) {
 		for (x = overlap(par_format); x >= par_format.leftmargin; x--) {
 
@@ -1343,7 +1343,7 @@ done_link_state_info(void)
 	       sizeof(renderer_context.link_state_info));
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static inline void
 process_link(struct html_context *html_context, enum link_state link_state,
 	     unsigned char *chars, int charslen, int cells)
@@ -1351,7 +1351,7 @@ process_link(struct html_context *html_context, enum link_state link_state,
 static inline void
 process_link(struct html_context *html_context, enum link_state link_state,
 		   unsigned char *chars, int charslen)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	struct part *part = html_context->part;
 	struct link *link;
@@ -1403,9 +1403,9 @@ process_link(struct html_context *html_context, enum link_state link_state,
 		if (x_offset) {
 			charslen -= x_offset;
 			chars += x_offset;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			cells -= x_offset;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		}
 
 		link = new_link(html_context, chars, charslen);
@@ -1420,17 +1420,17 @@ process_link(struct html_context *html_context, enum link_state link_state,
 	}
 
 	/* Add new canvas positions to the link. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (realloc_points(link, link->npoints + cells))
 #else
 	if (realloc_points(link, link->npoints + charslen))
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	{
 		struct point *point = &link->points[link->npoints];
 		int x = X(part->cx) + x_offset;
 		int y = Y(part->cy);
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		link->npoints += cells;
 
 		for (; cells > 0; cells--, point++, x++)
@@ -1438,7 +1438,7 @@ process_link(struct html_context *html_context, enum link_state link_state,
 		link->npoints += charslen;
 
 		for (; charslen > 0; charslen--, point++, x++)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		{
 			point->x = x;
 			point->y = y;
@@ -1490,9 +1490,9 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
 {
 	enum link_state link_state;
 	struct part *part;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int cells;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	assert(html_context);
 	if_assert_failed return;
@@ -1551,21 +1551,21 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
 		else if (html_context->options->links_numbering)
 			put_link_number(html_context);
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	cells =
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		set_hline(html_context, chars, charslen, link_state);
 
 	if (link_state != LINK_STATE_NONE) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		process_link(html_context, link_state, chars, charslen,
 			     cells);
 #else
 		process_link(html_context, link_state, chars, charslen);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	}
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (renderer_context.nowrap
 	    && part->cx + cells > overlap(par_format))
 		return;
@@ -1577,7 +1577,7 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
 		return;
 
 	part->cx += charslen;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	renderer_context.nobreak = 0;
 
@@ -1594,11 +1594,11 @@ put_chars(struct html_context *html_context, unsigned char *chars, int charslen)
 	}
 
 	assert(charslen > 0);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	part->xa += cells;
 #else
 	part->xa += charslen;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	int_lower_bound(&part->max_width, part->xa
 			+ par_format.leftmargin + par_format.rightmargin
 			- (chars[charslen - 1] == ' '
@@ -1657,7 +1657,7 @@ end:
 	part->cx = -1;
 	part->xa = 0;
    	memset(part->spaces, 0, part->spaces_len);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
    	memset(part->char_width, 0, part->spaces_len);
 #endif
 }
@@ -2079,7 +2079,7 @@ format_html_part(struct html_context *html_context,
 
 	done_link_state_info();
 	mem_free_if(part->spaces);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	mem_free_if(part->char_width);
 #endif
 
@@ -2165,9 +2165,9 @@ render_html_document(struct cache_entry *cached, struct document *document,
 							   &document->cp,
 							   &document->cp_status,
 							   document->options.hard_assume);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	html_context->options->utf8 = is_cp_utf8(document->options.cp);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	if (title.length) {
 		document->title = convert_string(renderer_context.convert_table,
diff --git a/src/document/html/renderer.h b/src/document/html/renderer.h
index ebba5cdf..6fc4eacd 100644
--- a/src/document/html/renderer.h
+++ b/src/document/html/renderer.h
@@ -23,7 +23,7 @@ struct part {
 
 	unsigned char *spaces;
 	int spaces_len;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	unsigned char *char_width;
 #endif
 
diff --git a/src/document/options.h b/src/document/options.h
index 54a821ef..11894d7d 100644
--- a/src/document/options.h
+++ b/src/document/options.h
@@ -101,9 +101,9 @@ struct document_options {
 	unsigned int no_cache:1;
 	unsigned int gradual_rerendering:1;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	unsigned int utf8:1;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	/* Active link coloring */
 	/* This is mostly here to make use of this option cache so link
 	 * drawing is faster. --jonas */
diff --git a/src/document/plain/renderer.c b/src/document/plain/renderer.c
index d32b43e9..074cd2d2 100644
--- a/src/document/plain/renderer.c
+++ b/src/document/plain/renderer.c
@@ -234,9 +234,9 @@ add_document_line(struct plain_renderer *renderer,
 	struct screen_char *template = &renderer->template;
 	struct screen_char saved_renderer_template = *template;
 	struct screen_char *pos, *startpos;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int utf8 = document->options.utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	int cells = 0;
 	int lineno = renderer->lineno;
 	int expanded = 0;
@@ -253,7 +253,7 @@ add_document_line(struct plain_renderer *renderer,
 		unsigned char line_char = line[line_pos];
 		int charlen = 1;
 		int cell = 1;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		unicode_val_T data;
 
 		if (utf8) {
@@ -268,7 +268,7 @@ add_document_line(struct plain_renderer *renderer,
 
 			cell = unicode_to_cell(data);
 		}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 		if (line_char == ASCII_TAB
 		    && (line_pos + charlen == width
@@ -313,7 +313,7 @@ add_document_line(struct plain_renderer *renderer,
 		unsigned char next_char, prev_char;
 		int charlen = 1;
 		int cell = 1;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		unicode_val_T data;
 
 		if (utf8) {
@@ -328,7 +328,7 @@ add_document_line(struct plain_renderer *renderer,
 
 			cell = unicode_to_cell(data);
 		}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 		prev_char = line_pos > 0 ? line[line_pos - 1] : '\0';
 		next_char = (line_pos + charlen < width) ?
@@ -433,7 +433,7 @@ add_document_line(struct plain_renderer *renderer,
 				cells += added_chars - 1;
 				pos += added_chars;
 			} else {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				if (utf8) {
 					unsigned char *text = &line[line_pos];
 					unicode_val_T data =
@@ -455,7 +455,7 @@ add_document_line(struct plain_renderer *renderer,
 						cell++;
 					}
 				} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				{
 					if (!isscreensafe(line_char))
 						line_char = '.';
@@ -520,7 +520,7 @@ add_document_lines(struct plain_renderer *renderer)
 	int length = renderer->length;
 	int was_empty_line = 0;
 	int was_wrapped = 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int utf8 = is_cp_utf8(renderer->document->cp);
 #endif
 	for (; length > 0; renderer->lineno++) {
@@ -552,7 +552,7 @@ add_document_lines(struct plain_renderer *renderer)
 				only_spaces = 0;
 				was_spaces = 0;
 			}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (utf8) {
 				unsigned char *text = &source[width];
 				unicode_val_T data = utf8_to_unicode(&text,
@@ -563,7 +563,7 @@ add_document_lines(struct plain_renderer *renderer)
 				cells += unicode_to_cell(data);
 				width += utf8charlen(&source[width]);
 			} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			{
 				cells++;
 				width++;
@@ -651,9 +651,9 @@ render_plain_document(struct cache_entry *cached, struct document *document,
 
 	document->bgcolor = document->options.default_bg;
 	document->width = 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	document->options.utf8 = is_cp_utf8(document->options.cp);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	/* Setup the style */
 	init_template(&renderer.template, &document->options);
diff --git a/src/document/renderer.c b/src/document/renderer.c
index e89152a7..cb94d885 100644
--- a/src/document/renderer.c
+++ b/src/document/renderer.c
@@ -346,11 +346,11 @@ render_document(struct view_state *vs, struct document_view *doc_view,
 
 			document->title = get_uri_string(document->uri, components);
 			if (document->title) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				if (doc_view->document->options.utf8)
 					decode_uri(document->title);
 				else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 					decode_uri_for_display(document->title);
 			}
 		}
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 49ba53cc..8461d4fa 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -146,10 +146,10 @@ u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
 
 	to &= ~SYSTEM_CHARSET_FLAG;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (codepages[to].table == table_utf_8)
 		return encode_utf8(u);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	/* To mark non breaking spaces, we use a special char NBSP_CHAR. */
 	if (u == 0xa0) return no_nbsp_hack ? " " : NBSP_CHAR_STRING;
@@ -175,13 +175,13 @@ u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
 
 static unsigned char utf_buffer[7];
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 inline unsigned char *
 encode_utf8(unicode_val_T u)
 #else
 static unsigned char *
 encode_utf8(unicode_val_T u)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	memset(utf_buffer, 0, 7);
 
@@ -215,7 +215,7 @@ encode_utf8(unicode_val_T u)
 	return utf_buffer;
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 /* Number of bytes utf8 character indexed by first byte. Illegal bytes are
  * equal ones and handled different. */
 static char utf8char_len_tab[256] = {
@@ -621,7 +621,7 @@ utf8_to_unicode(unsigned char **string, unsigned char *end)
 	*string = str + length;
 	return u;
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 /* Slow algorithm, the common part of cp2u and cp2utf8.  */
 static unicode_val_T
@@ -663,7 +663,7 @@ cp2utf8(int from, int c)
 	return encode_utf8(cp2u_shared(&codepages[from], c));
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 unicode_val_T
 cp_to_unicode(int codepage, unsigned char **string, unsigned char *end)
 {
@@ -679,7 +679,7 @@ cp_to_unicode(int codepage, unsigned char **string, unsigned char *end)
 	++*string;
 	return ret;
 }
-#endif	/* CONFIG_UTF_8 */
+#endif	/* CONFIG_UTF8 */
 
 
 static void
@@ -900,12 +900,12 @@ get_entity_string(const unsigned char *str, const int strlen, int encoding)
 
 	if (strlen <= 0) return NULL;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* TODO: caching UTF-8 */
 	encoding &= ~SYSTEM_CHARSET_FLAG;
 	if (codepages[encoding].table == table_utf_8)
 		goto skip;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	if (first_time) {
 		memset(&nb_entity_cache, 0, ENTITY_CACHE_MAXLEN * sizeof(unsigned int));
@@ -960,9 +960,9 @@ get_entity_string(const unsigned char *str, const int strlen, int encoding)
 		fprintf(stderr, "miss\n");
 #endif
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 skip:
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	if (*str == '#') { /* Numeric entity. */
 		int l = (int) strlen;
 		unsigned char *st = (unsigned char *) str;
@@ -1014,11 +1014,11 @@ skip:
 		if (element) result = u2cp(element->c, encoding);
 	}
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (codepages[encoding].table == table_utf_8) {
 		return result;
 	}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 end:
 	/* Take care of potential buffer overflow. */
 	if (strlen < sizeof(entity_cache[slen][0].str)) {
diff --git a/src/intl/charsets.h b/src/intl/charsets.h
index 9c59555d..841d3da2 100644
--- a/src/intl/charsets.h
+++ b/src/intl/charsets.h
@@ -63,7 +63,7 @@ unsigned char *get_cp_name(int);
 unsigned char *get_cp_mime_name(int);
 int is_cp_utf8(int);
 void free_conv_table(void);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 inline unsigned char *encode_utf8(unicode_val_T);
 inline unsigned char *utf8_prevchar(unsigned char *, int, unsigned char *);
 inline int utf8charlen(const unsigned char *);
@@ -96,7 +96,7 @@ unicode_val_T unicode_fold_label_case(unicode_val_T);
 inline int strlen_utf8(unsigned char **);
 inline unicode_val_T utf8_to_unicode(unsigned char **, unsigned char *);
 unicode_val_T cp_to_unicode(int, unsigned char **, unsigned char *);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 unicode_val_T cp2u(int, unsigned char);
 unsigned char *cp2utf8(int, int);
diff --git a/src/main/version.c b/src/main/version.c
index db529394..5f425037 100644
--- a/src/main/version.c
+++ b/src/main/version.c
@@ -119,7 +119,7 @@ get_dyn_full_version(struct terminal *term, int more)
 #ifndef CONFIG_MOUSE
 		comma, _("No mouse", term),
 #endif
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		comma, "UTF-8",
 #endif
 		comma,
diff --git a/src/protocol/bittorrent/dialogs.c b/src/protocol/bittorrent/dialogs.c
index 7a29ddb8..5b88b83c 100644
--- a/src/protocol/bittorrent/dialogs.c
+++ b/src/protocol/bittorrent/dialogs.c
@@ -574,11 +574,11 @@ bittorrent_message_dialog(struct session *ses, void *data)
 
 	uristring = get_uri_string(message->uri, URI_PUBLIC);
 	if (uristring) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (ses->tab->term->utf8)
 			decode_uri(uristring);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			decode_uri_for_display(uristring);
 		add_format_to_string(&string,
 			_("Unable to retrieve %s", ses->tab->term),
@@ -724,11 +724,11 @@ bittorrent_query_callback(void *data, enum connection_state state,
 
 		/* Let's make the filename pretty for display & save */
 		/* TODO: The filename can be the empty string here. See bug 396. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			decode_uri_string(&filename);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			decode_uri_string_for_display(&filename);
 	}
 
diff --git a/src/session/download.c b/src/session/download.c
index 19ed5f46..e4999e0a 100644
--- a/src/session/download.c
+++ b/src/session/download.c
@@ -1134,11 +1134,11 @@ do_type_query(struct type_query *type_query, unsigned char *ct, struct mime_hand
 
 		/* Let's make the filename pretty for display & save */
 		/* TODO: The filename can be the empty string here. See bug 396. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			decode_uri_string(&filename);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			decode_uri_string_for_display(&filename);
 	}
 
diff --git a/src/session/session.c b/src/session/session.c
index 6c54dadf..ceb720e7 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -268,11 +268,11 @@ print_error_dialog(struct session *ses, enum connection_state state,
 
 	uristring = uri ? get_uri_string(uri, URI_PUBLIC) : NULL;
 	if (uristring) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (ses->tab->term->utf8)
 			decode_uri(uristring);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			decode_uri_for_display(uristring);
 		add_format_to_string(&msg,
 			_("Unable to retrieve %s", ses->tab->term),
diff --git a/src/terminal/draw.c b/src/terminal/draw.c
index 4274c4d1..30c56508 100644
--- a/src/terminal/draw.c
+++ b/src/terminal/draw.c
@@ -105,11 +105,11 @@ draw_char_color(struct terminal *term, int x, int y, struct color_pair *color)
 }
 
 void
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 draw_char_data(struct terminal *term, int x, int y, unicode_val_T data)
 #else
 draw_char_data(struct terminal *term, int x, int y, unsigned char data)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	struct screen_char *screen_char = get_char(term, x, y);
 
@@ -117,7 +117,7 @@ draw_char_data(struct terminal *term, int x, int y, unsigned char data)
 
 	screen_char->data = data;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 #ifdef CONFIG_DEBUG
 	/* Detect attempt to draw double-width char on the last
 	 * column of terminal. */
@@ -127,7 +127,7 @@ draw_char_data(struct terminal *term, int x, int y, unsigned char data)
 
 	if (data == UCS_NO_CHAR)
 		screen_char->attr = 0;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	set_screen_dirty(term->screen, y, y);
 }
@@ -147,7 +147,7 @@ draw_line(struct terminal *term, int x, int y, int l, struct screen_char *line)
 	size = int_min(l, term->width - x);
 	if (size == 0) return;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) {
 		struct screen_char *sc;
 
@@ -250,7 +250,7 @@ draw_border(struct terminal *term, struct box *box,
 	set_screen_dirty(term->screen, borderbox.y, borderbox.y + borderbox.height);
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 /* Checks cells left and right to the box for broken double-width chars.
  * Replace it with ' '.
  * 1+---+3
@@ -321,7 +321,7 @@ fix_dwchar_around_box(struct terminal *term, struct box *box, int border,
 }
 #endif
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 void
 draw_char(struct terminal *term, int x, int y,
 	  unicode_val_T data, enum screen_char_attr attr,
@@ -331,7 +331,7 @@ void
 draw_char(struct terminal *term, int x, int y,
 		unsigned char data, enum screen_char_attr attr,
 	  struct color_pair *color)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	struct screen_char *screen_char = get_char(term, x, y);
 
@@ -407,7 +407,7 @@ draw_shadow(struct terminal *term, struct box *box,
 	draw_box(term, &dbox, ' ', 0, color);
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static void
 draw_text_utf8(struct terminal *term, int x, int y,
 	       unsigned char *text, int length,
@@ -479,7 +479,7 @@ draw_text_utf8(struct terminal *term, int x, int y,
 	set_screen_dirty(term->screen, y, y);
 
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 void
 draw_text(struct terminal *term, int x, int y,
@@ -492,12 +492,12 @@ draw_text(struct terminal *term, int x, int y,
 	assert(text && length >= 0);
 	if_assert_failed return;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) {
 		draw_text_utf8(term, x, y, text, length, attr, color);
 		return;
 	}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	if (length <= 0) return;
 	pos = get_char(term, x, y);
diff --git a/src/terminal/draw.h b/src/terminal/draw.h
index 965a0a01..aa7d4d66 100644
--- a/src/terminal/draw.h
+++ b/src/terminal/draw.h
@@ -31,11 +31,11 @@ enum screen_char_attr {
 /* One position in the terminal screen's image. */
 struct screen_char {
 	/* Contains either character value or frame data. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	unicode_val_T data;
 #else
 	unsigned char data;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	/* Attributes are screen_char_attr bits. */
 	unsigned char attr;
@@ -214,11 +214,11 @@ void draw_char_color(struct terminal *term, int x, int y,
 		     struct color_pair *color);
 
 /* Sets the data of a screen position. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 void draw_char_data(struct terminal *term, int x, int y, unicode_val_T data);
 #else
 void draw_char_data(struct terminal *term, int x, int y, unsigned char data);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 /* Sets the data to @border and of a screen position. */
 void draw_border_char(struct terminal *term, int x, int y,
@@ -229,7 +229,7 @@ void draw_border_cross(struct terminal *, int x, int y,
 		       enum border_cross_direction, struct color_pair *color);
 
 /* Draws a char. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 void draw_char(struct terminal *term, int x, int y,
 	       unicode_val_T data, enum screen_char_attr attr,
 	       struct color_pair *color);
@@ -237,7 +237,7 @@ void draw_char(struct terminal *term, int x, int y,
 void draw_char(struct terminal *term, int x, int y,
 	       unsigned char data, enum screen_char_attr attr,
 	       struct color_pair *color);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 /* Draws area defined by @box using the same colors and attributes. */
 void draw_box(struct terminal *term, struct box *box,
@@ -252,10 +252,10 @@ void draw_shadow(struct terminal *term, struct box *box,
 void draw_border(struct terminal *term, struct box *box,
 		 struct color_pair *color, int width);
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 void fix_dwchar_around_box(struct terminal *term, struct box *box, int border,
 			   int shadow_width, int shadow_height);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 /* Draws @length chars from @text. */
 void draw_text(struct terminal *term, int x, int y,
diff --git a/src/terminal/event.c b/src/terminal/event.c
index 082f754b..9d591016 100644
--- a/src/terminal/event.c
+++ b/src/terminal/event.c
@@ -136,12 +136,12 @@ static void
 term_send_ucs(struct terminal *term, unicode_val_T u,
 	      term_event_modifier_T modifier)
 {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	struct term_event ev;
 
 	set_kbd_term_event(&ev, u, modifier);
 	term_send_event(term, &ev);
-#else  /* !CONFIG_UTF_8 */
+#else  /* !CONFIG_UTF8 */
 	struct term_event ev;
 	unsigned char *recoded;
 
@@ -153,7 +153,7 @@ term_send_ucs(struct terminal *term, unicode_val_T u,
 		term_send_event(term, &ev);
 		recoded++;
 	}
-#endif /* !CONFIG_UTF_8 */
+#endif /* !CONFIG_UTF8 */
 }
 
 static void
@@ -178,12 +178,12 @@ check_terminal_name(struct terminal *term, struct terminal_info *info)
 	object_unlock(term->spec);
 	term->spec = get_opt_rec(config_options, name);
 	object_lock(term->spec);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* Probably not best place for set this. But now we finally have
 	 * term->spec and term->utf8 should be set before decode session info.
 	 * --Scrool */
 	term->utf8 = get_opt_bool_tree(term->spec, "utf_8_io");
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 }
 
 #ifdef CONFIG_MOUSE
@@ -295,7 +295,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 		}
 
 		/* Character Conversions.  */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		/* struct term_event_keyboard carries UCS-4.
 		 * - If the "utf_8_io" option (i.e. term->utf8) is
 		 *   true or the "charset" option refers to UTF-8,
@@ -317,7 +317,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 		 * - Otherwise, handle_interlink_event() passes the
 		 *   bytes straight through.  */
 		utf8_io = get_opt_bool_tree(term->spec, "utf_8_io");
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 		/* In UTF-8 byte sequences that have more than one byte, the
 		 * first byte is between 0xC0 and 0xFF and the remaining bytes
@@ -366,7 +366,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 			 * UTF-8 start and continuation bytes or UTF-8 I/O mode
 			 * is disabled. */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (key >= 0 && key <= 0xFF && !utf8_io) {
 				/* Not special and UTF-8 mode is disabled:
 				 * recode from the terminal charset to UCS-4. */
@@ -377,7 +377,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
 				term_send_ucs(term, key, modifier);
 				break;
 			}
-#endif /* !CONFIG_UTF_8 */
+#endif /* !CONFIG_UTF8 */
 
 			/* It must be special (e.g., F1 or Enter)
 			 * or a single-byte UTF-8 character. */
diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h
index 1ffddfd3..89d352b2 100644
--- a/src/terminal/kbd.h
+++ b/src/terminal/kbd.h
@@ -6,7 +6,7 @@
 struct itrm;
 
 /* A character received from a terminal.  */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 typedef unicode_val_T term_event_char_T; /* in UCS-4 */
 #else
 typedef unsigned char term_event_char_T; /* in the charset of the terminal */
diff --git a/src/terminal/screen.c b/src/terminal/screen.c
index 9bafc6d0..58181cff 100644
--- a/src/terminal/screen.c
+++ b/src/terminal/screen.c
@@ -31,7 +31,7 @@
 unsigned char frame_dumb[48] =	"   ||||++||++++++--|-+||++--|-+----++++++++     ";
 static unsigned char frame_vt100[48] =	"aaaxuuukkuxkjjjkmvwtqnttmlvwtqnvvwwmmllnnjla    ";
 
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 /* For UTF8 I/O */
 static unsigned char frame_vt100_u[48] = {
 	177, 177, 177, 179, 180, 180, 180, 191,
@@ -41,7 +41,7 @@ static unsigned char frame_vt100_u[48] = {
 	193, 194, 194, 192, 192, 218, 218, 197,
 	197, 217, 218, 177,  32, 32,  32,  32
 };
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 static unsigned char frame_freebsd[48] = {
 	130, 138, 128, 153, 150, 150, 150, 140,
@@ -81,12 +81,12 @@ static struct string m11_hack_frame_seqs[] = {
 	/* begin border: */	TERM_STRING("\033[11m"),
 };
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static struct string utf8_linux_frame_seqs[] = {
 	/* end border: */	TERM_STRING("\033[10m\033%G"),
 	/* begin border: */	TERM_STRING("\033%@\033[11m"),
 };
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 static struct string vt100_frame_seqs[] = {
 	/* end border: */	TERM_STRING("\x0f"),
@@ -109,12 +109,12 @@ struct screen_driver {
 	 * uniquely identify the screen_driver. */
 	enum term_mode_type type;
 
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 	/* Charsets when doing UTF8 I/O. */
 	/* [0] is the common charset and [1] is the frame charset.
 	 * Test wether to use UTF8 I/O using the use_utf8_io() macro. */
 	int charsets[2];
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	/* The frame translation table. May be NULL. */
 	unsigned char *frame;
@@ -131,10 +131,10 @@ struct screen_driver {
 	/* These are directly derived from the terminal options. */
 	unsigned int transparent:1;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* UTF-8 I/O */
 	unsigned int utf8:1;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	/* The terminal._template_ name. */
 	unsigned char name[1]; /* XXX: Keep last! */
@@ -143,81 +143,81 @@ struct screen_driver {
 static struct screen_driver dumb_screen_driver = {
 				NULL_LIST_HEAD,
 	/* type: */		TERM_DUMB,
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	/* frame: */		frame_dumb,
 	/* frame_seqs: */	NULL,
 	/* underline: */	underline_seqs,
 	/* color_mode: */	COLOR_MODE_16,
 	/* transparent: */	1,
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* utf-8: */		0,
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 };
 
 static struct screen_driver vt100_screen_driver = {
 				NULL_LIST_HEAD,
 	/* type: */		TERM_VT100,
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	/* frame: */		frame_vt100,
 	/* frame_seqs: */	vt100_frame_seqs,
 	/* underline: */	underline_seqs,
 	/* color_mode: */	COLOR_MODE_16,
 	/* transparent: */	1,
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* utf-8: */		0,
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 };
 
 static struct screen_driver linux_screen_driver = {
 				NULL_LIST_HEAD,
 	/* type: */		TERM_LINUX,
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	/* frame: */		NULL,		/* No restrict_852 */
 	/* frame_seqs: */	NULL,		/* No m11_hack */
 	/* underline: */	underline_seqs,
 	/* color_mode: */	COLOR_MODE_16,
 	/* transparent: */	1,
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* utf-8: */		0,
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 };
 
 static struct screen_driver koi8_screen_driver = {
 				NULL_LIST_HEAD,
 	/* type: */		TERM_KOI8,
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	/* frame: */		frame_koi,
 	/* frame_seqs: */	NULL,
 	/* underline: */	underline_seqs,
 	/* color_mode: */	COLOR_MODE_16,
 	/* transparent: */	1,
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* utf-8: */		0,
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 };
 
 static struct screen_driver freebsd_screen_driver = {
 				NULL_LIST_HEAD,
 	/* type: */		TERM_FREEBSD,
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 	/* charsets: */		{ -1, -1 },	/* No UTF8 I/O */
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	/* frame: */		frame_freebsd,
 	/* frame_seqs: */	NULL,		/* No m11_hack */
 	/* underline: */	underline_seqs,
 	/* color_mode: */	COLOR_MODE_16,
 	/* transparent: */	1,
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* utf-8: */		0,
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 };
 
 /* XXX: Keep in sync with enum term_mode_type. */
@@ -229,22 +229,22 @@ static struct screen_driver *screen_drivers[] = {
 	/* TERM_FREEBSD: */	&freebsd_screen_driver,
 };
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 #define use_utf8_io(driver)	((driver)->utf8)
 #else
 #define use_utf8_io(driver)	((driver)->charsets[0] != -1)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 static INIT_LIST_HEAD(active_screen_drivers);
 
 static void
 update_screen_driver(struct screen_driver *driver, struct option *term_spec)
 {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	driver->utf8 = get_opt_bool_tree(term_spec, "utf_8_io");
 #else
 	int utf8_io = get_opt_bool_tree(term_spec, "utf_8_io");
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	driver->color_mode = get_opt_int_tree(term_spec, "colors");
 	driver->transparent = get_opt_bool_tree(term_spec, "transparency");
@@ -255,7 +255,7 @@ update_screen_driver(struct screen_driver *driver, struct option *term_spec)
 		driver->underline = NULL;
 	}
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (driver->type == TERM_LINUX) {
 		if (get_opt_bool_tree(term_spec, "restrict_852"))
 			driver->frame = frame_restrict;
@@ -312,7 +312,7 @@ update_screen_driver(struct screen_driver *driver, struct option *term_spec)
 			driver->frame = frame_vt100;
 		}
  	}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 }
 
 static int
@@ -351,9 +351,9 @@ add_screen_driver(enum term_mode_type type, struct terminal *term, int env_len)
 
 	term->spec->change_hook = screen_driver_change_hook;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	term->utf8 = use_utf8_io(driver);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	return driver;
 }
@@ -373,9 +373,9 @@ get_screen_driver(struct terminal *term)
 		/* Some simple probably useless MRU ;) */
 		move_to_top_of_list(active_screen_drivers, driver);
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		term->utf8 = use_utf8_io(driver);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		return driver;
 	}
 
@@ -518,7 +518,7 @@ copy_color_16(unsigned char *a, unsigned char *b)
 	a[0] = b[0];
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static inline void
 add_char_data(struct string *screen, struct screen_driver *driver,
 	      unicode_val_T data, unsigned char border)
@@ -526,7 +526,7 @@ add_char_data(struct string *screen, struct screen_driver *driver,
 static inline void
 add_char_data(struct string *screen, struct screen_driver *driver,
 	      unsigned char data, unsigned char border)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	if (!isscreensafe(data)) {
 		add_char_to_string(screen, ' ');
@@ -537,7 +537,7 @@ add_char_data(struct string *screen, struct screen_driver *driver,
 		data = driver->frame[data - 176];
 
 	if (use_utf8_io(driver)) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (border)
 			add_char_to_string(screen, (unsigned char)data);
 		else
@@ -547,7 +547,7 @@ add_char_data(struct string *screen, struct screen_driver *driver,
 		int charset = driver->charsets[!!border];
 
 		add_to_string(screen, cp2utf8(charset, data));
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		return;
 	}
 
@@ -564,9 +564,9 @@ add_char16(struct string *screen, struct screen_driver *driver,
 	unsigned char bold = (ch->attr & SCREEN_ATTR_BOLD);
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    border != state->border && driver->frame_seqs
 	   ) {
 		state->border = border;
@@ -574,9 +574,9 @@ add_char16(struct string *screen, struct screen_driver *driver,
 	}
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    underline != state->underline && driver->underline
 	   ) {
 		state->underline = underline;
@@ -584,9 +584,9 @@ add_char16(struct string *screen, struct screen_driver *driver,
 	}
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    bold != state->bold
 	   ) {
 		state->bold = bold;
@@ -599,9 +599,9 @@ add_char16(struct string *screen, struct screen_driver *driver,
 	}
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    !compare_color_16(ch->color, state->color)
 	   ) {
 		copy_color_16(state->color, ch->color);
@@ -706,9 +706,9 @@ add_char256(struct string *screen, struct screen_driver *driver,
 	unsigned char attr_delta = (ch->attr ^ state->attr);
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    attr_delta
 	   ) {
 		if ((attr_delta & SCREEN_ATTR_FRAME) && driver->frame_seqs) {
@@ -734,9 +734,9 @@ add_char256(struct string *screen, struct screen_driver *driver,
 	}
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    !compare_color_256(ch->color, state->color)
 	   ) {
 		copy_color_256(state->color, ch->color);
@@ -821,9 +821,9 @@ add_char_true(struct string *screen, struct screen_driver *driver,
 	unsigned char attr_delta = (ch->attr ^ state->attr);
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    attr_delta
 	   ) {
 		if ((attr_delta & SCREEN_ATTR_FRAME) && driver->frame_seqs) {
@@ -849,9 +849,9 @@ add_char_true(struct string *screen, struct screen_driver *driver,
 	}
 
 	if (
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	    (!use_utf8_io(driver) || ch->data != UCS_NO_CHAR) &&
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	    !compare_color_true(ch->color, state->color)
 	   ) {
 		copy_color_true(state->color, ch->color);
diff --git a/src/terminal/terminal.h b/src/terminal/terminal.h
index e9b26253..e04fb1e7 100644
--- a/src/terminal/terminal.h
+++ b/src/terminal/terminal.h
@@ -126,10 +126,10 @@ struct terminal {
 	 * work and even maintaining these structures ;-). */
 	unsigned int master:1;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* Indicates whether UTF-8 I/O is used */
 	unsigned int utf8:1;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	/* Indicates whether Linux console was in UTF-8 mode on startup */
 	unsigned int linux_was_utf8:1;
diff --git a/src/viewer/dump/dump.c b/src/viewer/dump/dump.c
index c3d05b26..506b5e63 100644
--- a/src/viewer/dump/dump.c
+++ b/src/viewer/dump/dump.c
@@ -355,10 +355,10 @@ add_document_to_string(struct string *string, struct document *document)
 	assert(string && document);
 	if_assert_failed return NULL;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (is_cp_utf8(document->options.cp))
 		goto utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	for (y = 0; y < document->height; y++) {
 		int white = 0;
@@ -392,7 +392,7 @@ add_document_to_string(struct string *string, struct document *document)
 
 		add_char_to_string(string, '\n');
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	goto end;
 utf8:
 	for (y = 0; y < document->height; y++) {
@@ -430,7 +430,7 @@ utf8:
 		add_char_to_string(string, '\n');
 	}
 end:
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	return string;
 }
 
@@ -849,10 +849,10 @@ dump_to_file(struct document *document, int fd)
 
 	if (!buf) return -1;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (is_cp_utf8(document->options.cp))
 		goto utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	for (y = 0; y < document->height; y++) {
 		int white = 0;
@@ -890,7 +890,7 @@ dump_to_file(struct document *document, int fd)
 		if (write_char('\n', fd, buf, &bptr))
 			goto fail;
 	}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	goto ref;
 utf8:
 	for (y = 0; y < document->height; y++) {
@@ -939,7 +939,7 @@ utf8:
 			goto fail;
 	}
 ref:
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	if (hard_write(fd, buf, bptr) != bptr) {
 fail:
diff --git a/src/viewer/text/form.c b/src/viewer/text/form.c
index 6b079f14..5f28cbc6 100644
--- a/src/viewer/text/form.c
+++ b/src/viewer/text/form.c
@@ -163,10 +163,10 @@ init_form_state(struct form_control *fc, struct form_state *fs)
 		case FC_TEXTAREA:
 			fs->value = stracpy(fc->default_value);
 			fs->state = strlen(fc->default_value);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (fc->type == FC_TEXTAREA)
 				fs->state_cell = 0;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			fs->vpos = 0;
 			break;
 		case FC_FILE:
@@ -334,10 +334,10 @@ draw_form_entry(struct terminal *term, struct document_view *doc_view,
 	dy = box->y - vs->y;
 	switch (fc->type) {
 		unsigned char *s;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		unsigned char *text, *end, *last_in_view;
 		int retried;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		int len;
 		int i, x, y;
 
@@ -351,9 +351,9 @@ draw_form_entry(struct terminal *term, struct document_view *doc_view,
 				break;
 
 			x = link->points[0].x + dx;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (term->utf8) goto utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			int_bounds(&fs->vpos, fs->state - fc->size + 1, fs->state);
 			len = strlen(fs->value) - fs->vpos;
 
@@ -371,7 +371,7 @@ draw_form_entry(struct terminal *term, struct document_view *doc_view,
 				draw_char_data(term, x, y, data);
 			}
 			break;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 utf8:
 			retried = 0;
 
@@ -487,7 +487,7 @@ drew_char:
 				}
 			}
 			break;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		case FC_TEXTAREA:
 			draw_textarea(term, fs, doc_view, link);
 			break;
@@ -506,9 +506,9 @@ drew_char:
 			else
 				/* XXX: when can this happen? --pasky */
 				s = "";
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (term->utf8) goto utf8_select;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			len = s ? strlen(s) : 0;
 			for (i = 0; i < link->npoints; i++) {
 				x = link->points[i].x + dx;
@@ -517,7 +517,7 @@ drew_char:
 					draw_char_data(term, x, y, i < len ? s[i] : '_');
 			}
 			break;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 utf8_select:
 			text = s;
 			end = strchr(s, '\0');
@@ -546,7 +546,7 @@ utf8_select:
 				}
 			}
 			break;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		case FC_SUBMIT:
 		case FC_IMAGE:
 		case FC_RESET:
@@ -1356,9 +1356,9 @@ field_op(struct session *ses, struct document_view *doc_view,
 	unsigned char *text;
 	int length;
 	enum frame_event_status status = FRAME_EVENT_REFRESH;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int utf8 = ses->tab->term->utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	assert(ses && doc_view && link && ev);
 	if_assert_failed return FRAME_EVENT_OK;
@@ -1378,7 +1378,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 
 	switch (action_id) {
 		case ACT_EDIT_LEFT:
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (fc->type == FC_TEXTAREA) {
 				status = textarea_op_left(fs, fc, utf8);
 				break;
@@ -1389,11 +1389,11 @@ field_op(struct session *ses, struct document_view *doc_view,
 				new_value = utf8_prevchar(fs->value + fs->state, 1, fs->value);
 				fs->state = new_value - fs->value;
 			} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				fs->state = int_max(fs->state - 1, 0);
 			break;
 		case ACT_EDIT_RIGHT:
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (fc->type == FC_TEXTAREA) {
 				status = textarea_op_right(fs, fc, utf8);
 				break;
@@ -1405,11 +1405,11 @@ field_op(struct session *ses, struct document_view *doc_view,
 				utf8_to_unicode(&text, end);
 				fs->state = (int)(text - fs->value);
 			} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				fs->state = int_min(fs->state + 1, strlen(fs->value));
 			break;
 		case ACT_EDIT_HOME:
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (fc->type == FC_TEXTAREA) {
 				status = textarea_op_home(fs, fc, utf8);
 			} else {
@@ -1422,58 +1422,58 @@ field_op(struct session *ses, struct document_view *doc_view,
 				fs->state = 0;
 			}
 
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			break;
 		case ACT_EDIT_UP:
 			if (fc->type != FC_TEXTAREA)
 				status = FRAME_EVENT_IGNORED;
 			else
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				status = textarea_op_up(fs, fc, utf8);
 #else
 				status = textarea_op_up(fs, fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			break;
 		case ACT_EDIT_DOWN:
 			if (fc->type != FC_TEXTAREA)
 				status = FRAME_EVENT_IGNORED;
 			else
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				status = textarea_op_down(fs, fc, utf8);
 #else
 				status = textarea_op_down(fs, fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			break;
 		case ACT_EDIT_END:
 			if (fc->type == FC_TEXTAREA) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				status = textarea_op_end(fs, fc, utf8);
 #else
 				status = textarea_op_end(fs, fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			} else {
 				fs->state = strlen(fs->value);
 			}
 			break;
 		case ACT_EDIT_BEGINNING_OF_BUFFER:
 			if (fc->type == FC_TEXTAREA) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				status = textarea_op_bob(fs, fc, utf8);
 				fs->state_cell = 0;
 #else
 				status = textarea_op_bob(fs, fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			} else {
 				fs->state = 0;
 			}
 			break;
 		case ACT_EDIT_END_OF_BUFFER:
 			if (fc->type == FC_TEXTAREA) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				status = textarea_op_eob(fs, fc, utf8);
 #else
 				status = textarea_op_eob(fs, fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			} else {
 				fs->state = strlen(fs->value);
 			}
@@ -1493,10 +1493,10 @@ field_op(struct session *ses, struct document_view *doc_view,
 			if (!form_field_is_readonly(fc))
 				fs->value[0] = 0;
 			fs->state = 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (fc->type == FC_TEXTAREA)
 				fs->state_cell = 0;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			break;
 		case ACT_EDIT_PASTE_CLIPBOARD:
 			if (form_field_is_readonly(fc)) break;
@@ -1512,21 +1512,21 @@ field_op(struct session *ses, struct document_view *doc_view,
 					fs->value = v;
 					memmove(v, text, length + 1);
 					fs->state = strlen(fs->value);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 					if (utf8 && fc->type == FC_TEXTAREA)
 						fs->state_cell = 0;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				}
 			}
 			mem_free(text);
 			break;
 		case ACT_EDIT_ENTER:
 			if (fc->type == FC_TEXTAREA) {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 				status = textarea_op_enter(fs, fc, utf8);
 #else
 				status = textarea_op_enter(fs, fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 				break;
 			}
 
@@ -1551,7 +1551,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 				status = FRAME_EVENT_OK;
 				break;
 			}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (utf8) {
 				int old_state = fs->state;
 				unsigned char *new_value;
@@ -1566,7 +1566,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 					memmove(new_value, fs->value + old_state, length);
 				}
 			} else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			{
 				length = strlen(fs->value + fs->state) + 1;
 				text = fs->value + fs->state;
@@ -1586,7 +1586,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 				status = FRAME_EVENT_OK;
 				break;
 			}
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (utf8) {
 				unsigned char *end = fs->value + length;
 				unsigned char *text = fs->value + fs->state;
@@ -1599,7 +1599,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 				}
 				break;
 			}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			text = fs->value + fs->state;
 
 			memmove(text, text + 1, length - fs->state);
@@ -1629,12 +1629,12 @@ field_op(struct session *ses, struct document_view *doc_view,
 			memmove(text, fs->value + fs->state, length);
 
 			fs->state = (int) (text - fs->value);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			if (utf8) {
 				if (fc->type == FC_TEXTAREA)
 					fs->state_cell = 0;
 			}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			break;
 		case ACT_EDIT_KILL_TO_EOL:
 			if (form_field_is_readonly(fc)) {
@@ -1733,17 +1733,17 @@ field_op(struct session *ses, struct document_view *doc_view,
 			}
 
 			if (form_field_is_readonly(fc)
-#ifndef CONFIG_UTF_8
+#ifndef CONFIG_UTF8
 					|| strlen(fs->value) >= fc->maxlength
 					|| !insert_in_string(&fs->value, fs->state, "?", 1)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 					)
 					{
 				status = FRAME_EVENT_OK;
 				break;
 			}
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			{
 				/* The charset of the terminal; we assume
 				 * fs->value is in this charset.
@@ -1766,7 +1766,7 @@ field_op(struct session *ses, struct document_view *doc_view,
 			}
 #else
 			fs->value[fs->state++] = get_kbd_key(ev);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			break;
 	}
 
diff --git a/src/viewer/text/form.h b/src/viewer/text/form.h
index 81e87ce7..7691dc0f 100644
--- a/src/viewer/text/form.h
+++ b/src/viewer/text/form.h
@@ -51,11 +51,11 @@ struct form_state {
 	 * For FC_SELECT, @state is the index of the selected item
 	 * in @form_control.labels.  */
 	int state;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @state_cell is not
 	 * used.  */
 	int state_cell;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	/* For FC_TEXT, FC_PASSWORD, and FC_FILE, @vpos is the index
 	 * of the first displayed byte in @value.  It should never be
 	 * in the middle of a character.  */
diff --git a/src/viewer/text/link.c b/src/viewer/text/link.c
index 2fef6c6f..399c07c1 100644
--- a/src/viewer/text/link.c
+++ b/src/viewer/text/link.c
@@ -114,9 +114,9 @@ get_link_cursor_offset(struct document_view *doc_view, struct link *link)
 {
 	struct form_control *fc;
 	struct form_state *fs;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int utf8 = doc_view->document->options.utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	switch (link->type) {
 		case LINK_CHECKBOX:
@@ -130,7 +130,7 @@ get_link_cursor_offset(struct document_view *doc_view, struct link *link)
 			fs = find_form_state(doc_view, fc);
 			if (!fs || !fs->value)
 				return 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			else if (utf8) {
 				unsigned char *scroll = fs->value + fs->vpos;
 				unsigned char *point = fs->value + fs->state;
@@ -140,18 +140,18 @@ get_link_cursor_offset(struct document_view *doc_view, struct link *link)
 				else
 					return utf8_ptr2cells(scroll, point);
 			}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			else
 				return fs->state - fs->vpos;
 
 		case LINK_AREA:
 			fc = get_link_form_control(link);
 			fs = find_form_state(doc_view, fc);
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 			return fs ? area_cursor(fc, fs, utf8) : 0;
 #else
 			return fs ? area_cursor(fc, fs) : 0;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 		case LINK_HYPERTEXT:
 		case LINK_MAP:
@@ -1203,13 +1203,13 @@ try_document_key(struct session *ses, struct document_view *doc_view,
 
 	/* The key is a character.  Convert it to Unicode so that it
 	 * can be compared with link.accesskey.  */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	key = get_kbd_key(ev);
-#else  /* !CONFIG_UTF_8 */
+#else  /* !CONFIG_UTF8 */
 	key = cp2u(get_opt_codepage_tree(ses->tab->term->spec,
 					 "charset"),
 		   get_kbd_key(ev));
-#endif /* !CONFIG_UTF_8 */
+#endif /* !CONFIG_UTF8 */
 	/* If @key now is 0 (which is used in link.accesskey if there
 	 * is no access key) or UCS_REPLACEMENT_CHARACTER, then the
 	 * results may be a little odd, but not really harmful.  */
@@ -1402,9 +1402,9 @@ get_current_link_title(struct document_view *doc_view)
 					    doc_view->document->options.cp,
 					    CSM_DEFAULT, NULL, NULL, NULL);
 		/* Remove illicit chars. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (link_title && !doc_view->document->options.utf8)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			for (src = link_title; *src; src++)
 				if (!isprint(*src) || iscntrl(*src))
 					*src = '*';
@@ -1457,11 +1457,11 @@ get_current_link_info(struct session *ses, struct document_view *doc_view)
 			add_char_to_string(&str, ')');
 		}
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 		if (term->utf8)
 			decode_uri_string(&str);
 		else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 			decode_uri_string_for_display(&str);
 		return str.source;
 	}
diff --git a/src/viewer/text/search.c b/src/viewer/text/search.c
index 491412f2..d492a074 100644
--- a/src/viewer/text/search.c
+++ b/src/viewer/text/search.c
@@ -10,7 +10,7 @@
 
 #include <ctype.h> /* tolower(), isprint() */
 
-#if defined(CONFIG_UTF_8) && defined(HAVE_WCTYPE_H)
+#if defined(CONFIG_UTF8) && defined(HAVE_WCTYPE_H)
 #include <wctype.h>
 #endif
 
@@ -51,7 +51,7 @@
 static INIT_INPUT_HISTORY(search_history);
 
 #undef UCHAR
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 #define UCHAR unicode_val_T
 #else
 #define UCHAR unsigned char
@@ -456,7 +456,7 @@ is_in_range_regex(struct document *document, int y, int height,
 static UCHAR *
 memacpy_u(unsigned char *text, int textlen, int utf8)
 {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	UCHAR *mem = mem_alloc((textlen + 1) * sizeof(UCHAR));
 
 	if (!mem) return NULL;
@@ -481,7 +481,7 @@ memacpy_u(unsigned char *text, int textlen, int utf8)
 static int
 strlen_u(unsigned char *text, int utf8)
 {
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (utf8)
 		return strlen_utf8(&text);
 #endif
@@ -500,7 +500,7 @@ lowered_string(unsigned char *text, int textlen, int utf8)
 	ret = memacpy_u(text, textlen, utf8);
 	if (ret && textlen) {
 		do {
-#if defined(CONFIG_UTF_8) && defined(HAVE_WCTYPE_H)
+#if defined(CONFIG_UTF8) && defined(HAVE_WCTYPE_H)
 			ret[textlen] = utf8 ? towlower(ret[textlen]) : tolower(ret[textlen]);
 #else
 			ret[textlen] = tolower(ret[textlen]);
@@ -530,7 +530,7 @@ is_in_range_plain(struct document *document, int y, int height,
 	 * trivial, probably a starter; very fast as well) or Turbo-BM (or
 	 * maybe some other Boyer-Moore variant, I don't feel that strong in
 	 * this area), hmm?  >:) --pasky */
-#if defined(CONFIG_UTF_8) && defined(HAVE_WCTYPE_H)
+#if defined(CONFIG_UTF8) && defined(HAVE_WCTYPE_H)
 #define maybe_tolower(c) (case_sensitive ? (c) : utf8 ? towlower(c) : tolower(c))
 #else
 #define maybe_tolower(c) (case_sensitive ? (c) : tolower(c))
@@ -579,7 +579,7 @@ is_in_range(struct document *document, int y, int height,
 	assert(document && text && min && max);
 	if_assert_failed return -1;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	utf8 = document->options.utf8;
 #endif
 	*min = INT_MAX, *max = 0;
@@ -619,7 +619,7 @@ get_searched_plain(struct document_view *doc_view, struct point **pt, int *pl,
 	xoffset = box->x - doc_view->vs->x;
 	yoffset = box->y - doc_view->vs->y;
 
-#if defined(CONFIG_UTF_8) && defined(HAVE_WCTYPE_H)
+#if defined(CONFIG_UTF8) && defined(HAVE_WCTYPE_H)
 #define maybe_tolower(c) (case_sensitive ? (c) : utf8 ? towlower(c) : tolower(c))
 #else
 #define maybe_tolower(c) (case_sensitive ? (c) : tolower(c))
@@ -777,7 +777,7 @@ draw_searched(struct terminal *term, struct document_view *doc_view)
 	if (!has_search_word(doc_view))
 		return;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	utf8 = doc_view->document->options.utf8;
 #endif
 	get_searched(doc_view, &pt, &len, utf8);
@@ -924,7 +924,7 @@ static int
 find_next_link_in_search(struct document_view *doc_view, int direction)
 {
 	int utf8 = 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	utf8 = doc_view->document->options.utf8;
 #endif
 
diff --git a/src/viewer/text/textarea.c b/src/viewer/text/textarea.c
index 751bc995..07aa69e9 100644
--- a/src/viewer/text/textarea.c
+++ b/src/viewer/text/textarea.c
@@ -40,11 +40,11 @@
 struct line_info {
 	int start;
 	int end;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int last_char_width;
 	int split_prev:1;
 	int split_next:1;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 };
 
 /* We add two extra entries to the table so the ending info can be added
@@ -52,7 +52,7 @@ struct line_info {
 #define realloc_line_info(info, size) \
 	mem_align_alloc(info, size, (size) + 3, 0xFF)
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 /* Allocates a line_info table describing the layout of the textarea buffer.
  *
  * @width	is max width and the offset at which text will be wrapped
@@ -134,7 +134,7 @@ format_textutf8(unsigned char *text, int width, enum form_wrap wrap, int format)
 
 	return line;
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 /* Allocates a line_info table describing the layout of the textarea buffer.
  *
@@ -226,7 +226,7 @@ get_textarea_line_number(struct line_info *line, int cursor_position)
 
 /* Fixes up the vpos and vypos members of the form_state. Returns the
  * logical position in the textarea view. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 int
 area_cursor(struct form_control *fc, struct form_state *fs, int utf8)
 {
@@ -313,7 +313,7 @@ area_cursor(struct form_control *fc, struct form_state *fs)
 }
 #endif
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static void
 draw_textarea_utf8(struct terminal *term, struct form_state *fs,
 	      struct document_view *doc_view, struct link *link)
@@ -395,7 +395,7 @@ draw_textarea_utf8(struct terminal *term, struct form_state *fs,
 
 	mem_free(linex);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 void
 draw_textarea(struct terminal *term, struct form_state *fs,
@@ -411,12 +411,12 @@ draw_textarea(struct terminal *term, struct form_state *fs,
 	assert(term && doc_view && doc_view->document && doc_view->vs && link);
 	if_assert_failed return;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (term->utf8) {
 		draw_textarea_utf8(term, fs, doc_view, link);
 		return;
 	}
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	fc = get_link_form_control(link);
 	assertm(fc, "link %d has no form control", (int) (link - doc_view->document->links));
 	if_assert_failed return;
@@ -426,11 +426,11 @@ draw_textarea(struct terminal *term, struct form_state *fs,
 	vy = doc_view->vs->y;
 
 	if (!link->npoints) return;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	area_cursor(fc, fs, 0);
 #else
 	area_cursor(fc, fs);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 	linex = format_text(fs->value, fc->cols, fc->wrap, 0);
 	if (!linex) return;
 	line = linex;
@@ -686,7 +686,7 @@ menu_textarea_edit(struct terminal *term, void *xxx, void *ses_)
 	textarea_edit(0, term, fs, doc_view, link);
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static enum frame_event_status
 textarea_op(struct form_state *fs, struct form_control *fc, int utf8,
 	    int (*do_op)(struct form_state *, struct line_info *, int, int))
@@ -743,9 +743,9 @@ textarea_op(struct form_state *fs, struct form_control *fc,
 
 	return fs->state == state ? FRAME_EVENT_OK : FRAME_EVENT_REFRESH;
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 void
 new_pos(struct form_state *fs, struct line_info *line, int current, int max_cells)
 {
@@ -761,27 +761,27 @@ new_pos(struct form_state *fs, struct line_info *line, int current, int max_cell
 	}
 	fs->state = (int)(text - fs->value);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 static int
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 do_op_home(struct form_state *fs, struct line_info *line, int current, int utf8)
 #else
 do_op_home(struct form_state *fs, struct line_info *line, int current)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	if (current == -1)
 		return 0;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (utf8)
 		fs->state = line[current - !!fs->state_cell].start;
 	else
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 		fs->state = line[current].start;
 	return 0;
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static int
 do_op_up(struct form_state *fs, struct line_info *line, int current, int utf8)
 {
@@ -835,9 +835,9 @@ do_op_up(struct form_state *fs, struct line_info *line, int current)
 	int_upper_bound(&fs->state, line[current-1].end);
 	return 0;
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static int
 do_op_down(struct form_state *fs, struct line_info *line, int current, int utf8)
 {
@@ -889,9 +889,9 @@ do_op_down(struct form_state *fs, struct line_info *line, int current)
 	int_upper_bound(&fs->state, line[current+1].end);
 	return 0;
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static int
 do_op_end(struct form_state *fs, struct line_info *line, int current, int utf8)
 {
@@ -937,14 +937,14 @@ do_op_end(struct form_state *fs, struct line_info *line, int current)
 	}
 	return 0;
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 static int
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 do_op_bob(struct form_state *fs, struct line_info *line, int current, int utf8)
 #else
 do_op_bob(struct form_state *fs, struct line_info *line, int current)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	if (current == -1) return 0;
 
@@ -954,11 +954,11 @@ do_op_bob(struct form_state *fs, struct line_info *line, int current)
 }
 
 static int
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 do_op_eob(struct form_state *fs, struct line_info *line, int current, int utf8)
 #else
 do_op_eob(struct form_state *fs, struct line_info *line, int current)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	if (current == -1) {
 		fs->state = strlen(fs->value);
@@ -974,7 +974,7 @@ do_op_eob(struct form_state *fs, struct line_info *line, int current)
 	return 0;
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status
 textarea_op_home(struct form_state *fs, struct form_control *fc, int utf8)
 {
@@ -986,9 +986,9 @@ textarea_op_home(struct form_state *fs, struct form_control *fc)
 {
 	return textarea_op(fs, fc, do_op_home);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status
 textarea_op_up(struct form_state *fs, struct form_control *fc, int utf8)
 {
@@ -1000,9 +1000,9 @@ textarea_op_up(struct form_state *fs, struct form_control *fc)
 {
 	return textarea_op(fs, fc, do_op_up);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status
 textarea_op_down(struct form_state *fs, struct form_control *fc, int utf8)
 {
@@ -1014,9 +1014,9 @@ textarea_op_down(struct form_state *fs, struct form_control *fc)
 {
 	return textarea_op(fs, fc, do_op_down);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status
 textarea_op_end(struct form_state *fs, struct form_control *fc, int utf8)
 {
@@ -1028,11 +1028,11 @@ textarea_op_end(struct form_state *fs, struct form_control *fc)
 {
 	return textarea_op(fs, fc, do_op_end);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 /* Set the form state so the cursor is on the first line of the buffer.
  * Preserve the column if possible. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status
 textarea_op_bob(struct form_state *fs, struct form_control *fc, int utf8)
 {
@@ -1044,13 +1044,13 @@ textarea_op_bob(struct form_state *fs, struct form_control *fc)
 {
 	return textarea_op(fs, fc, do_op_bob);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 /* Set the form state so the cursor is on the last line of the buffer. Preserve
  * the column if possible. This is done by getting current and last line and
  * then shifting the state by the delta of both lines start position bounding
  * the whole thing to the end of the last line. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status
 textarea_op_eob(struct form_state *fs, struct form_control *fc, int utf8)
 {
@@ -1062,14 +1062,14 @@ textarea_op_eob(struct form_state *fs, struct form_control *fc)
 {
 	return textarea_op(fs, fc, do_op_eob);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 enum frame_event_status
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 textarea_op_enter(struct form_state *fs, struct form_control *fc, int utf8)
 #else
 textarea_op_enter(struct form_state *fs, struct form_control *fc)
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 {
 	assert(fs && fs->value && fc);
 	if_assert_failed return FRAME_EVENT_OK;
@@ -1083,7 +1083,7 @@ textarea_op_enter(struct form_state *fs, struct form_control *fc)
 	return FRAME_EVENT_REFRESH;
 }
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 static int
 do_op_left(struct form_state *fs, struct line_info *line, int current, int utf8)
 {
@@ -1147,9 +1147,9 @@ do_op_right(struct form_state *fs, struct line_info *line, int current, int utf8
 
 	return 0;
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status
 textarea_op_left(struct form_state *fs, struct form_control *fc, int utf8)
 {
@@ -1161,7 +1161,7 @@ textarea_op_right(struct form_state *fs, struct form_control *fc, int utf8)
 {
 	return textarea_op(fs, fc, utf8, do_op_right);
 }
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 void
 set_textarea(struct document_view *doc_view, int direction)
@@ -1169,9 +1169,9 @@ set_textarea(struct document_view *doc_view, int direction)
 	struct form_control *fc;
 	struct form_state *fs;
 	struct link *link;
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	int utf8 = doc_view->document->options.utf8;
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 	assert(doc_view && doc_view->vs && doc_view->document);
 	assert(direction == 1 || direction == -1);
@@ -1192,7 +1192,7 @@ set_textarea(struct document_view *doc_view, int direction)
 
 	/* Depending on which way we entered the textarea move cursor so that
 	 * it is available at end or start. */
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 	if (direction == 1)
 		textarea_op_eob(fs, fc, utf8);
 	else
@@ -1202,5 +1202,5 @@ set_textarea(struct document_view *doc_view, int direction)
 		textarea_op_eob(fs, fc);
 	else
 		textarea_op_bob(fs, fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 }
diff --git a/src/viewer/text/textarea.h b/src/viewer/text/textarea.h
index f9508553..6b6386f7 100644
--- a/src/viewer/text/textarea.h
+++ b/src/viewer/text/textarea.h
@@ -13,11 +13,11 @@ struct link;
 struct session;
 struct terminal;
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 int area_cursor(struct form_control *fc, struct form_state *fs, int utf8);
 #else
 int area_cursor(struct form_control *fc, struct form_state *fs);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 void draw_textarea(struct terminal *term, struct form_state *fs, struct document_view *doc_view, struct link *link);
 unsigned char *encode_textarea(struct submitted_value *sv);
 
@@ -25,7 +25,7 @@ extern int textarea_editor;
 void textarea_edit(int, struct terminal *, struct form_state *, struct document_view *, struct link *);
 void menu_textarea_edit(struct terminal *term, void *xxx, void *ses_);
 
-#ifdef CONFIG_UTF_8
+#ifdef CONFIG_UTF8
 enum frame_event_status textarea_op_home(struct form_state *fs, struct form_control *fc, int utf8);
 enum frame_event_status textarea_op_up(struct form_state *fs, struct form_control *fc, int utf8);
 enum frame_event_status textarea_op_down(struct form_state *fs, struct form_control *fc, int utf8);
@@ -43,7 +43,7 @@ enum frame_event_status textarea_op_end(struct form_state *fs, struct form_contr
 enum frame_event_status textarea_op_bob(struct form_state *fs, struct form_control *fc);
 enum frame_event_status textarea_op_eob(struct form_state *fs, struct form_control *fc);
 enum frame_event_status textarea_op_enter(struct form_state *fs, struct form_control *fc);
-#endif /* CONFIG_UTF_8 */
+#endif /* CONFIG_UTF8 */
 
 void set_textarea(struct document_view *doc_view, int direction);
 
diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c
index 71742847..5c247b02 100644
--- a/src/viewer/text/view.c
+++ b/src/viewer/text/view.c
@@ -645,7 +645,7 @@ try_mark_key(struct session *ses, struct document_view *doc_view,
 	 * is something else (i.e. a special key or a non-ASCII
 	 * character), map it to an ASCII character that the functions
 	 * will not accept, so the results are consistent.
-	 * When CONFIG_UTF_8 is not defined, this assumes that codes
+	 * When CONFIG_UTF8 is not defined, this assumes that codes
 	 * 0 to 0x7F in all codepages match ASCII.  */
 	if (key >= 0 && key <= 0x7F)
 		mark = (unsigned char) key;

From 9c94a896b76bf2ad2459c31386ba202fa85854da Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 16:23:17 +0300
Subject: [PATCH 107/132] Internally rename the utf_8 codepage to utf8.

---
 Unicode/index.txt             |  2 +-
 Unicode/{utf_8.cp => utf8.cp} |  0
 src/intl/charsets.c           | 18 +++++++++---------
 src/intl/codepage.inc         |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename Unicode/{utf_8.cp => utf8.cp} (100%)

diff --git a/Unicode/index.txt b/Unicode/index.txt
index 07b0606f..d1dd5029 100644
--- a/Unicode/index.txt
+++ b/Unicode/index.txt
@@ -32,4 +32,4 @@ koi8_u
 koi8_ru
 tcvn5712
 viscii
-utf_8
+utf8
diff --git a/Unicode/utf_8.cp b/Unicode/utf8.cp
similarity index 100%
rename from Unicode/utf_8.cp
rename to Unicode/utf8.cp
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 8461d4fa..140b49b6 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -147,7 +147,7 @@ u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
 	to &= ~SYSTEM_CHARSET_FLAG;
 
 #ifdef CONFIG_UTF8
-	if (codepages[to].table == table_utf_8)
+	if (codepages[to].table == table_utf8)
 		return encode_utf8(u);
 #endif /* CONFIG_UTF8 */
 
@@ -644,7 +644,7 @@ cp2u(int from, unsigned char c)
 
 	/* UTF-8 is a multibyte codepage and cannot be handled with
 	 * this function.  */
-	assert(codepages[from].table != table_utf_8);
+	assert(codepages[from].table != table_utf8);
 	if_assert_failed return UCS_REPLACEMENT_CHARACTER;
 
 	if (c < 0x80) return c;
@@ -657,7 +657,7 @@ cp2utf8(int from, int c)
 {
 	from &= ~SYSTEM_CHARSET_FLAG;
 
-	if (codepages[from].table == table_utf_8 || c < 128)
+	if (codepages[from].table == table_utf8 || c < 128)
 		return strings[c];
 
 	return encode_utf8(cp2u_shared(&codepages[from], c));
@@ -743,7 +743,7 @@ get_translation_table_to_utf8(int from)
 	for (i = 0; i < 128; i++)
 		utf_table[i].u.str = strings[i];
 
-	if (codepages[from].table == table_utf_8) {
+	if (codepages[from].table == table_utf8) {
 		for (i = 128; i < 256; i++)
 			utf_table[i].u.str = stracpy(strings[i]);
 		return utf_table;
@@ -796,7 +796,7 @@ get_translation_table(int from, int to)
 	}
 	if (/*from == to ||*/ from == -1 || to == -1)
 		return NULL;
-	if (codepages[to].table == table_utf_8)
+	if (codepages[to].table == table_utf8)
 		return get_translation_table_to_utf8(from);
 	if (from == lfr && to == lto)
 		return table;
@@ -804,7 +804,7 @@ get_translation_table(int from, int to)
 	lto = to;
 	new_translation_table(table);
 
-	if (codepages[from].table == table_utf_8) {
+	if (codepages[from].table == table_utf8) {
 		int i;
 
 		for (i = 0; codepages[to].table[i].c; i++)
@@ -903,7 +903,7 @@ get_entity_string(const unsigned char *str, const int strlen, int encoding)
 #ifdef CONFIG_UTF8
 	/* TODO: caching UTF-8 */
 	encoding &= ~SYSTEM_CHARSET_FLAG;
-	if (codepages[encoding].table == table_utf_8)
+	if (codepages[encoding].table == table_utf8)
 		goto skip;
 #endif /* CONFIG_UTF8 */
 
@@ -1015,7 +1015,7 @@ skip:
 	}
 
 #ifdef CONFIG_UTF8
-	if (codepages[encoding].table == table_utf_8) {
+	if (codepages[encoding].table == table_utf8) {
 		return result;
 	}
 #endif /* CONFIG_UTF8 */
@@ -1347,5 +1347,5 @@ int
 is_cp_utf8(int cp_index)
 {
 	cp_index &= ~SYSTEM_CHARSET_FLAG;
-	return codepages[cp_index].table == table_utf_8;
+	return codepages[cp_index].table == table_utf8;
 }
diff --git a/src/intl/codepage.inc b/src/intl/codepage.inc
index 1a48f559..a8606c78 100644
--- a/src/intl/codepage.inc
+++ b/src/intl/codepage.inc
@@ -4606,13 +4606,13 @@ unsigned char *aliases_viscii [] = {
 };
 
 
-/*** utf_8 ***/
+/*** utf8 ***/
 
-struct table_entry table_utf_8 [] = {
+struct table_entry table_utf8 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_utf_8 [] = {
+unsigned char *aliases_utf8 [] = {
 	"utf-8",
 	"utf8",
 	NULL
@@ -4653,7 +4653,7 @@ struct codepage_desc codepages [] = {
 	{"KOI8-RU", aliases_koi8_ru, table_koi8_ru},
 	{"TCVN-5712", aliases_tcvn5712, table_tcvn5712},
 	{"VISCII", aliases_viscii, table_viscii},
-	{"Unicode UTF-8", aliases_utf_8, table_utf_8},
+	{"Unicode UTF-8", aliases_utf8, table_utf8},
 	{NULL, NULL, NULL}
 };
 

From 9a695bfb0c1a505a425a073538ba6c2f62d83ee2 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 17:28:57 +0300
Subject: [PATCH 108/132] Explain why the configure script tries to use
 -rdynamic.

---
 configure.in | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/configure.in b/configure.in
index 751bc891..19eabed3 100644
--- a/configure.in
+++ b/configure.in
@@ -228,6 +228,32 @@ EL_CHECK_CODE([variadic macros], HAVE_VARIADIC_MACROS,
                 [a("foo");a("%s","bar");a("%s%s","baz","quux");])
 
 dnl Check for -rdynamic
+dnl
+dnl gcc -rdynamic calls ld -export-dynamic, which adds all symbols of
+dnl the executable to its dynamic symbol table.  ELinks uses this for
+dnl two purposes:
+dnl
+dnl 1. If ELinks detects a bug, it can try to display a backtrace by
+dnl    calling backtrace_symbols_fd() in the GNU libc.  The glibc-2.3.6
+dnl    manual states users of GNU ld must pass -rdynamic to make the
+dnl    symbols available to the program.
+dnl
+dnl 2. It would eventually be nice to dynamically load shared
+dnl    libraries as plugins (bug 73).  The plugins must be able to
+dnl    call ELinks functions.  This can be implemented either by
+dnl    registering all callable functions in ELinks-specific data
+dnl    structures, or by letting the dynamic linker handle them.
+dnl    The latter way requires something equivalent to -rdynamic.
+dnl
+dnl Because backtraces are not needed for correct operation, and bug
+dnl 73 is not yet being fixed, the configure script and makefiles
+dnl should not complain to the user if they find that -rdynamic does
+dnl not work.  Besides, it was reported at elinks-users on 2006-09-12
+dnl that gcc-3.4.2 with "ld: Software Generation Utilities - Solaris
+dnl Link Editors: 5.8-1.284" on Sun Solaris 8 Sparc does not support
+dnl -rdynamic but does something equivalent automatically.  (This was
+dnl tested with "nm -D elinks | grep redraw_from_window".)
+dnl
 dnl FIXME: This check doesn't work. Something to do with the compiler
 dnl happily ignoring it and stderr not being checked for error messages.
 AC_MSG_CHECKING([for -rdynamic])

From 9818f665a862a11e4dc3b0f195f75ca0fca0d0ac Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 17:32:07 +0300
Subject: [PATCH 109/132] Fix spelling in the "Python support is incomplete"
 warning.

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

diff --git a/configure.in b/configure.in
index 19eabed3..cb684414 100644
--- a/configure.in
+++ b/configure.in
@@ -838,7 +838,7 @@ if test "$enable_python" = "yes"; then
 			cat <<EOF
 ***********************************************************************
 The Python support is incomplete and not so well integrated to ELinks
-yet. That means, e.g.., that you have no Python console and there might
+yet. That means, e.g., that you have no Python console and there might
 not be all the necessary hooks. Also, the Python interface is not too
 well tested (success stories heartily welcomed!).
 ***********************************************************************

From 388b1b0efd3e621bcf5095f9dc2aa70470231565 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 17:55:53 +0300
Subject: [PATCH 110/132] Define datarootdir in Makefile.config.in, for better
 Autoconf compatibility.

With Autoconf 2.60a, the default values of datadir, infodir, and
mandir refer to ${datarootdir}.  If Makefile.config.in does not define
datarootdir, Autoconf detects this and expands ${datarootdir} when it
substitutes expressions like @datadir@, but it also outputs the
following warning:

config.status: creating Makefile.config
config.status: WARNING:  /home/Kalle/src/elinks/Makefile.config.in seems to ignore the --datarootdir setting

According to a comment in config.status, "This hack should be removed
a few years after 2.60."  So it seems best to prepare for that now by
defining datarootdir = @datarootdir@ in Makefile.config.in.  Earlier
versions of Autoconf may leave that line unexpanded; but because the
makefiles do not directly refer to ${datarootdir}, there's no harm.
---
 Makefile.config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.config.in b/Makefile.config.in
index 896fa718..98afd5b5 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -21,6 +21,7 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 sbindir = @sbindir@
 libexecdir = @libexecdir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@

From 677e5c7adc52a9915223d680354f436d4adeb162 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 17 Sep 2006 19:54:37 +0300
Subject: [PATCH 111/132] Callers of cp_to_unicode() assert that it didn't
 return UCS_NO_CHAR.

UCS_NO_CHAR here means the input was too short.  Because the strings
generally come from the source code or from PO files, they should not
end in the middle of a character.  However, the whole character may be
missing if the string is empty.  So select_button_by_key() now checks
for that case separately.

UCS_NO_CHAR must not be passed to unicode_fold_label_case() because
the result is undefined.
---
 src/bfu/dialog.c | 12 +++++++++---
 src/bfu/hotkey.c |  4 ++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index 89e3ed3f..a7051b1f 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -310,18 +310,24 @@ select_button_by_key(struct dialog_data *dlg_data)
 		if (widget_data->widget->type != WIDGET_BUTTON)
 			continue;
 
+		hk_ptr = widget_data->widget->text;
+		if (!*hk_ptr)
+			continue;
+
 		/* We first try to match marked hotkey if there is
 		 * one else we fallback to first character in button
 		 * name. */
 		hk_pos = widget_data->widget->info.button.hotkey_pos;
 		if (hk_pos >= 0)
-			hk_ptr = &widget_data->widget->text[hk_pos + 1];
-		else
-			hk_ptr = widget_data->widget->text;
+			hk_ptr += hk_pos + 1;
 
 #ifdef CONFIG_UTF8
 		hk_char = cp_to_unicode(codepage, &hk_ptr,
 					strchr(hk_ptr, '\0'));
+		/* hk_char can be UCS_NO_CHAR only if the text of the
+		 * widget is not in the expected codepage.  */
+		assert(hk_char != UCS_NO_CHAR);
+		if_assert_failed continue;
 		hk_char = unicode_fold_label_case(hk_char);
 #else
 		hk_char = toupper(*hk_ptr);
diff --git a/src/bfu/hotkey.c b/src/bfu/hotkey.c
index 9bfc7681..9ab50df6 100644
--- a/src/bfu/hotkey.c
+++ b/src/bfu/hotkey.c
@@ -179,6 +179,10 @@ check_hotkeys_common(struct menu *menu, term_event_char_T hotkey, struct termina
 #ifdef CONFIG_UTF8
 		items_hotkey = cp_to_unicode(codepage, &text,
 					     strchr(text, '\0'));
+		/* items_hotkey can be UCS_NO_CHAR only if the text of
+		 * the menu item is not in the expected codepage.  */
+		assert(items_hotkey != UCS_NO_CHAR);
+		if_assert_failed continue;
 		found = (unicode_fold_label_case(items_hotkey) == key);
 #else
 		found = (toupper(*text) == key);

From 359b131c6b7a6104d8affc6ae97831d94960041b Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 24 Sep 2006 00:21:03 +0300
Subject: [PATCH 112/132] Bug 810: Add a few comments pointing to the bug.

---
 src/config/kbdbind.c     |  2 +-
 src/main/event.h         |  3 ++-
 src/scripting/lua/core.c | 11 +++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/config/kbdbind.c b/src/config/kbdbind.c
index eaf89059..378ba8fa 100644
--- a/src/config/kbdbind.c
+++ b/src/config/kbdbind.c
@@ -108,7 +108,7 @@ free_keybinding(struct keybinding *keybinding)
 	}
 
 #ifdef CONFIG_SCRIPTING
-/* TODO: unref function must be implemented. */
+/* TODO: unref function must be implemented. This is part of bug 810. */
 /*	if (keybinding->event != EVENT_NONE)
 		scripting_unref(keybinding->event); */
 #endif
diff --git a/src/main/event.h b/src/main/event.h
index 3ee7a03b..145b95a3 100644
--- a/src/main/event.h
+++ b/src/main/event.h
@@ -60,7 +60,8 @@ int register_event(unsigned char *name);
 
 /* This unregisters an event number @event, freeing the resources it
  * occupied, chain of associated hooks and unallocating the event id for
- * further recyclation. */
+ * further recyclation.
+ * Bug 810: unregister_event has not yet been implemented. */
 int unregister_event(int event);
 
 int register_event_hook(int id, event_hook_T callback, int priority, void *data);
diff --git a/src/scripting/lua/core.c b/src/scripting/lua/core.c
index 432581ec..59f62709 100644
--- a/src/scripting/lua/core.c
+++ b/src/scripting/lua/core.c
@@ -268,6 +268,7 @@ run_lua_func(va_list ap, void *data)
 	return EVENT_HOOK_STATUS_NEXT;
 }
 
+/* bind_key (keymap, keystroke, function) */
 static int
 l_bind_key(LS)
 {
@@ -284,6 +285,16 @@ l_bind_key(LS)
 
 	if (!init_string(&event_name)) goto lua_error;
 
+	/* ELinks will need to call the Lua function when the user
+	 * presses the key.  However, ELinks cannot store a pointer
+	 * to the function, because the C API of Lua does not provide
+	 * one.  Instead, ask the "reference system" of Lua to
+	 * generate an integer key that ELinks can store.
+	 *
+	 * TODO: If l_bind_key() succeeds, then the function will
+	 * never be removed from the reference system again, because
+	 * the rest of ELinks does not tell this module if the
+	 * keybinding is removed.  This is part of bug 810.  */
 	lua_pushvalue(S, 3);
 	ref = luaL_ref(S, LUA_REGISTRYINDEX);
 	add_format_to_string(&event_name, "lua-run-func %i", ref);

From 62d6db44aa18bb79bd02b1e5c885f95aafb20e24 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 24 Sep 2006 11:59:23 +0300
Subject: [PATCH 113/132] Bug 381: Make codepage data const.

Before:

   text	   data	    bss	    dec	    hex	filename
  25726	  62992	   3343	  92061	  1679d	src/intl/charsets.o
 653856	 120020	  82144	 856020	  d0fd4	src/elinks

After:

   text	   data	    bss	    dec	    hex	filename
  60190	  28528	   3311	  92029	  1677d	src/intl/charsets.o
 688320	  85556	  82112	 855988	  d0fb4	src/elinks

So 34464 bytes were moved from the data section to the text section
and should be more likely to get shared between ELinks processes.

Measured on i686-pc-linux-gnu with: --disable-xbel --disable-nls
--disable-cookies --disable-formhist --disable-globhist
--disable-mailcap --disable-mimetypes --disable-smb --disable-mouse
--disable-sysmouse --disable-leds --disable-marks --disable-css
--enable-small --enable-utf-8 --without-gpm --without-bzlib
--without-idn --without-spidermonkey --without-lua --without-gnutls
--without-openssl CFLAGS="-O2 -ggdb -Wall"
---
 Unicode/gen-cp        |   6 +-
 src/intl/charsets.c   |   8 +--
 src/intl/codepage.inc | 142 +++++++++++++++++++++---------------------
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/Unicode/gen-cp b/Unicode/gen-cp
index 2c2d3022..3e95017b 100755
--- a/Unicode/gen-cp
+++ b/Unicode/gen-cp
@@ -23,7 +23,7 @@ for i in $codepages; do
 	echo "/*** $i ***/"
 	echo
 
-	echo 'struct table_entry table_'$i' [] = {'
+	echo 'const struct table_entry table_'$i' [] = {'
 
 	# TODO: Comments inside of the structure are ugliness in a pure clean
 	# form, and my aesthetical feeling shivers upon glancing at it. However
@@ -37,7 +37,7 @@ for i in $codepages; do
 	echo '};'
 	echo
 
-	echo 'unsigned char *aliases_'$i' [] = {'
+	echo 'unsigned char *const aliases_'$i' [] = {'
 	head -n 2 $i.cp | tail -n +2 | sed 's/ \+/ /g; s/ $//; s/\", /\",Ł/g; s/$/,/' | tr "Ł" "\n" \
 	| sed 's/^/Ł/g' | tr "Ł" "\t" 
 	echo '	NULL
@@ -46,7 +46,7 @@ for i in $codepages; do
 done
 
 echo
-echo 'struct codepage_desc codepages [] = {'
+echo 'const struct codepage_desc codepages [] = {'
 
 for i in $codepages; do
 	echo '	{"'`head -n 1 $i.cp`'", aliases_'$i', table_'$i'},'
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 140b49b6..76ee72e5 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -35,8 +35,8 @@ struct table_entry {
 
 struct codepage_desc {
 	unsigned char *name;
-	unsigned char **aliases;
-	struct table_entry *table;
+	unsigned char *const *aliases;
+	const struct table_entry *table;
 };
 
 #include "intl/codepage.inc"
@@ -1261,7 +1261,7 @@ charsets_list_next(void)
 	if (!codepages[i_name].name) return NULL;
 
 	kv.key = codepages[i_name].aliases[i_alias];
-	kv.data = &codepages[i_name];
+	kv.data = (void *) &codepages[i_name]; /* cast away const */
 
 	if (codepages[i_name].aliases[i_alias + 1])
 		i_alias++;
@@ -1281,7 +1281,7 @@ static struct fastfind_index ff_charsets_index
 int
 get_cp_index(unsigned char *name)
 {
-	struct codepage_desc *codepage;
+	const struct codepage_desc *codepage;
 	int syscp = 0;
 
 	if (!strcasecmp(name, "System")) {
diff --git a/src/intl/codepage.inc b/src/intl/codepage.inc
index a8606c78..d39173fc 100644
--- a/src/intl/codepage.inc
+++ b/src/intl/codepage.inc
@@ -5,11 +5,11 @@
 
 /*** 7bit ***/
 
-struct table_entry table_7bit [] = {
+const struct table_entry table_7bit [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_7bit [] = {
+unsigned char *const aliases_7bit [] = {
 	"us-ascii",
 	"ascii",
 	"7bit",
@@ -32,7 +32,7 @@ unsigned char *aliases_7bit [] = {
 
 /*** 8859_1 ***/
 
-struct table_entry table_8859_1 [] = {
+const struct table_entry table_8859_1 [] = {
 	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
 	{0xA1, 0x00A1 /* INVERTED EXCLAMATION MARK */ },
 	{0xA2, 0x00A2 /* CENT SIGN */ },
@@ -132,7 +132,7 @@ struct table_entry table_8859_1 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_1 [] = {
+unsigned char *const aliases_8859_1 [] = {
 	"ISO-8859-1",
 	"iso8859-1",
 	"8859-1",
@@ -153,7 +153,7 @@ unsigned char *aliases_8859_1 [] = {
 
 /*** 8859_2 ***/
 
-struct table_entry table_8859_2 [] = {
+const struct table_entry table_8859_2 [] = {
 	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
 	{0xA1, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
 	{0xA2, 0x02D8 /* BREVE */ },
@@ -253,7 +253,7 @@ struct table_entry table_8859_2 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_2 [] = {
+unsigned char *const aliases_8859_2 [] = {
 	"ISO-8859-2",
 	"iso8859-2",
 	"8859-2",
@@ -271,7 +271,7 @@ unsigned char *aliases_8859_2 [] = {
 
 /*** 8859_3 ***/
 
-struct table_entry table_8859_3 [] = {
+const struct table_entry table_8859_3 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -396,7 +396,7 @@ struct table_entry table_8859_3 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_3 [] = {
+unsigned char *const aliases_8859_3 [] = {
 	"ISO-8859-3",
 	"8859-3",
 	"ISO_8859-3:1988",
@@ -413,7 +413,7 @@ unsigned char *aliases_8859_3 [] = {
 
 /*** 8859_4 ***/
 
-struct table_entry table_8859_4 [] = {
+const struct table_entry table_8859_4 [] = {
 	{0x80, 0x0080 /* PADDING CHARACTER (PAD) */ },
 	{0x81, 0x0081 /* HIGH OCTET PRESET (HOP) */ },
 	{0x82, 0x0082 /* BREAK PERMITTED HERE (BPH) */ },
@@ -545,7 +545,7 @@ struct table_entry table_8859_4 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_4 [] = {
+unsigned char *const aliases_8859_4 [] = {
 	"ISO-8859-4",
 	"iso8859-4",
 	"8859-4",
@@ -563,7 +563,7 @@ unsigned char *aliases_8859_4 [] = {
 
 /*** 8859_5 ***/
 
-struct table_entry table_8859_5 [] = {
+const struct table_entry table_8859_5 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -695,7 +695,7 @@ struct table_entry table_8859_5 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_5 [] = {
+unsigned char *const aliases_8859_5 [] = {
 	"ISO-8859-5",
 	"iso8859-5",
 	"8859-5",
@@ -711,7 +711,7 @@ unsigned char *aliases_8859_5 [] = {
 
 /*** 8859_6 ***/
 
-struct table_entry table_8859_6 [] = {
+const struct table_entry table_8859_6 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -798,7 +798,7 @@ struct table_entry table_8859_6 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_6 [] = {
+unsigned char *const aliases_8859_6 [] = {
 	"ISO-8859-6",
 	"8859-6",
 	"ISO_8859-6",
@@ -816,7 +816,7 @@ unsigned char *aliases_8859_6 [] = {
 
 /*** 8859_7 ***/
 
-struct table_entry table_8859_7 [] = {
+const struct table_entry table_8859_7 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -942,7 +942,7 @@ struct table_entry table_8859_7 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_7 [] = {
+unsigned char *const aliases_8859_7 [] = {
 	"ISO-8859-7",
 	"iso8859-7",
 	"8859-7",
@@ -961,7 +961,7 @@ unsigned char *aliases_8859_7 [] = {
 
 /*** 8859_8 ***/
 
-struct table_entry table_8859_8 [] = {
+const struct table_entry table_8859_8 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -1057,7 +1057,7 @@ struct table_entry table_8859_8 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_8 [] = {
+unsigned char *const aliases_8859_8 [] = {
 	"ISO-8859-8",
 	"8859-8",
 	"ISO_8859-8:1988",
@@ -1072,7 +1072,7 @@ unsigned char *aliases_8859_8 [] = {
 
 /*** 8859_9 ***/
 
-struct table_entry table_8859_9 [] = {
+const struct table_entry table_8859_9 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -1204,7 +1204,7 @@ struct table_entry table_8859_9 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_9 [] = {
+unsigned char *const aliases_8859_9 [] = {
 	"ISO-8859-9",
 	"iso8859-9",
 	"8859-9",
@@ -1220,7 +1220,7 @@ unsigned char *aliases_8859_9 [] = {
 
 /*** 8859_10 ***/
 
-struct table_entry table_8859_10 [] = {
+const struct table_entry table_8859_10 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -1352,7 +1352,7 @@ struct table_entry table_8859_10 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_10 [] = {
+unsigned char *const aliases_8859_10 [] = {
 	"ISO-8859-10",
 	"8859-10",
 	"ISO_8859-10:1992",
@@ -1367,7 +1367,7 @@ unsigned char *aliases_8859_10 [] = {
 
 /*** 8859_13 ***/
 
-struct table_entry table_8859_13 [] = {
+const struct table_entry table_8859_13 [] = {
 	{0x80, 0x0080 /* PADDING CHARACTER (PAD) */ },
 	{0x81, 0x0081 /* HIGH OCTET PRESET (HOP) */ },
 	{0x82, 0x0082 /* BREAK PERMITTED HERE (BPH) */ },
@@ -1499,7 +1499,7 @@ struct table_entry table_8859_13 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_13 [] = {
+unsigned char *const aliases_8859_13 [] = {
 	"ISO-8859-13",
 	"iso8859-13",
 	"8859-13",
@@ -1514,7 +1514,7 @@ unsigned char *aliases_8859_13 [] = {
 
 /*** 8859_14 ***/
 
-struct table_entry table_8859_14 [] = {
+const struct table_entry table_8859_14 [] = {
 	{0x80, 0x0080 /* <control> */ },
 	{0x81, 0x0081 /* <control> */ },
 	{0x82, 0x0082 /* <control> */ },
@@ -1646,7 +1646,7 @@ struct table_entry table_8859_14 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_14 [] = {
+unsigned char *const aliases_8859_14 [] = {
 	"ISO-8859-14",
 	"8859-14",
 	"ISO_8859-14",
@@ -1660,7 +1660,7 @@ unsigned char *aliases_8859_14 [] = {
 
 /*** 8859_15 ***/
 
-struct table_entry table_8859_15 [] = {
+const struct table_entry table_8859_15 [] = {
 	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
 	{0xA1, 0x00A1 /* INVERTED EXCLAMATION MARK */ },
 	{0xA2, 0x00A2 /* CENT SIGN */ },
@@ -1760,7 +1760,7 @@ struct table_entry table_8859_15 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_15 [] = {
+unsigned char *const aliases_8859_15 [] = {
 	"ISO-8859-15",
 	"iso8859-15",
 	"8859-15",
@@ -1779,7 +1779,7 @@ unsigned char *aliases_8859_15 [] = {
 
 /*** 8859_16 ***/
 
-struct table_entry table_8859_16 [] = {
+const struct table_entry table_8859_16 [] = {
 	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
 	{0xA1, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
 	{0xA2, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
@@ -1879,7 +1879,7 @@ struct table_entry table_8859_16 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_8859_16 [] = {
+unsigned char *const aliases_8859_16 [] = {
 	"ISO-8859-16",
 	"iso8859-16",
 	"8859-16",
@@ -1896,7 +1896,7 @@ unsigned char *aliases_8859_16 [] = {
 
 /*** cp1250 ***/
 
-struct table_entry table_cp1250 [] = {
+const struct table_entry table_cp1250 [] = {
 	{0x80, 0x20AC /* EURO SIGN */ },
 	{0x81, 0x0000 /* UNDEFINED */ },
 	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
@@ -2028,7 +2028,7 @@ struct table_entry table_cp1250 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp1250 [] = {
+unsigned char *const aliases_cp1250 [] = {
 	"windows-1250",
 	"windows1250",
 	"1250",
@@ -2040,7 +2040,7 @@ unsigned char *aliases_cp1250 [] = {
 
 /*** cp1251 ***/
 
-struct table_entry table_cp1251 [] = {
+const struct table_entry table_cp1251 [] = {
 	{0x80, 0x0402 /* CYRILLIC CAPITAL LETTER DJE */ },
 	{0x81, 0x0403 /* CYRILLIC CAPITAL LETTER GJE */ },
 	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
@@ -2171,7 +2171,7 @@ struct table_entry table_cp1251 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp1251 [] = {
+unsigned char *const aliases_cp1251 [] = {
 	"windows-1251",
 	"windows1251",
 	"1251",
@@ -2183,7 +2183,7 @@ unsigned char *aliases_cp1251 [] = {
 
 /*** cp1252 ***/
 
-struct table_entry table_cp1252 [] = {
+const struct table_entry table_cp1252 [] = {
 	{0x80, 0x20AC /* EURO SIGN */ },
 	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
 	{0x83, 0x0192 /* LATIN SMALL LETTER F WITH HOOK */ },
@@ -2310,7 +2310,7 @@ struct table_entry table_cp1252 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp1252 [] = {
+unsigned char *const aliases_cp1252 [] = {
 	"windows-1252",
 	"1252",
 	NULL
@@ -2319,7 +2319,7 @@ unsigned char *aliases_cp1252 [] = {
 
 /*** cp1256 ***/
 
-struct table_entry table_cp1256 [] = {
+const struct table_entry table_cp1256 [] = {
 	{0x80, 0x20AC /* EURO SIGN */ },
 	{0x81, 0x067E /* ARABIC LETTER PEH */ },
 	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
@@ -2451,7 +2451,7 @@ struct table_entry table_cp1256 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp1256 [] = {
+unsigned char *const aliases_cp1256 [] = {
 	"windows-1256",
 	"1256",
 	"cp1256",
@@ -2462,7 +2462,7 @@ unsigned char *aliases_cp1256 [] = {
 
 /*** cp1257 ***/
 
-struct table_entry table_cp1257 [] = {
+const struct table_entry table_cp1257 [] = {
 	{0x80, 0x20AC /* EURO SIGN */ },
 	{0x81, 0x0000 /* UNDEFINED */ },
 	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
@@ -2594,7 +2594,7 @@ struct table_entry table_cp1257 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp1257 [] = {
+unsigned char *const aliases_cp1257 [] = {
 	"windows-1257",
 	"windows1257",
 	"1257",
@@ -2606,7 +2606,7 @@ unsigned char *aliases_cp1257 [] = {
 
 /*** cp437 ***/
 
-struct table_entry table_cp437 [] = {
+const struct table_entry table_cp437 [] = {
 	{0x80, 0x00c7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
 	{0x81, 0x00fc /* LATIN SMALL LETTER U WITH DIAERESIS */ },
 	{0x82, 0x00e9 /* LATIN SMALL LETTER E WITH ACUTE */ },
@@ -2738,7 +2738,7 @@ struct table_entry table_cp437 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp437 [] = {
+unsigned char *const aliases_cp437 [] = {
 	"cp437",
 	"437",
 	"IBM437",
@@ -2749,7 +2749,7 @@ unsigned char *aliases_cp437 [] = {
 
 /*** cp737 ***/
 
-struct table_entry table_cp737 [] = {
+const struct table_entry table_cp737 [] = {
 	{0x80, 0x0391 /* GREEK CAPITAL LETTER ALPHA */ },
 	{0x81, 0x0392 /* GREEK CAPITAL LETTER BETA */ },
 	{0x82, 0x0393 /* GREEK CAPITAL LETTER GAMMA */ },
@@ -2881,7 +2881,7 @@ struct table_entry table_cp737 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp737 [] = {
+unsigned char *const aliases_cp737 [] = {
 	"cp737",
 	"737",
 	NULL
@@ -2890,7 +2890,7 @@ unsigned char *aliases_cp737 [] = {
 
 /*** cp850 ***/
 
-struct table_entry table_cp850 [] = {
+const struct table_entry table_cp850 [] = {
 	{0x80, 0x00c7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
 	{0x81, 0x00fc /* LATIN SMALL LETTER U WITH DIAERESIS */ },
 	{0x82, 0x00e9 /* LATIN SMALL LETTER E WITH ACUTE */ },
@@ -3022,7 +3022,7 @@ struct table_entry table_cp850 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp850 [] = {
+unsigned char *const aliases_cp850 [] = {
 	"cp850",
 	"850",
 	"IBM850",
@@ -3033,7 +3033,7 @@ unsigned char *aliases_cp850 [] = {
 
 /*** cp852 ***/
 
-struct table_entry table_cp852 [] = {
+const struct table_entry table_cp852 [] = {
 	{0x80, 0x00c7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
 	{0x81, 0x00fc /* LATIN SMALL LETTER U WITH DIAERESIS */ },
 	{0x82, 0x00e9 /* LATIN SMALL LETTER E WITH ACUTE */ },
@@ -3165,7 +3165,7 @@ struct table_entry table_cp852 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp852 [] = {
+unsigned char *const aliases_cp852 [] = {
 	"cp852",
 	"852",
 	"csPCp852",
@@ -3175,7 +3175,7 @@ unsigned char *aliases_cp852 [] = {
 
 /*** cp866 ***/
 
-struct table_entry table_cp866 [] = {
+const struct table_entry table_cp866 [] = {
 	{0x80, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
 	{0x81, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
 	{0x82, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
@@ -3307,7 +3307,7 @@ struct table_entry table_cp866 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp866 [] = {
+unsigned char *const aliases_cp866 [] = {
 	"cp866",
 	"866",
 	"IBM866",
@@ -3318,7 +3318,7 @@ unsigned char *aliases_cp866 [] = {
 
 /*** cp1125 ***/
 
-struct table_entry table_cp1125 [] = {
+const struct table_entry table_cp1125 [] = {
 	{0x80, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
 	{0x81, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
 	{0x82, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
@@ -3450,7 +3450,7 @@ struct table_entry table_cp1125 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_cp1125 [] = {
+unsigned char *const aliases_cp1125 [] = {
 	"x-cp866-u",
 	"ruscii",
 	"1125",
@@ -3461,7 +3461,7 @@ unsigned char *aliases_cp1125 [] = {
 
 /*** macroman ***/
 
-struct table_entry table_macroman [] = {
+const struct table_entry table_macroman [] = {
 	{0x80, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
 	{0x81, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
 	{0x82, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
@@ -3593,7 +3593,7 @@ struct table_entry table_macroman [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_macroman [] = {
+unsigned char *const aliases_macroman [] = {
 	"x-mac",
 	"mac",
 	"macroman",
@@ -3605,7 +3605,7 @@ unsigned char *aliases_macroman [] = {
 
 /*** mac_lat2 ***/
 
-struct table_entry table_mac_lat2 [] = {
+const struct table_entry table_mac_lat2 [] = {
 	{0x80, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
 	{0x81, 0x0100 /* LATIN CAPITAL LETTER A WITH MACRON */ },
 	{0x82, 0x0101 /* LATIN SMALL LETTER A WITH MACRON */ },
@@ -3737,7 +3737,7 @@ struct table_entry table_mac_lat2 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_mac_lat2 [] = {
+unsigned char *const aliases_mac_lat2 [] = {
 	"x-mac-ce",
 	"mac-ce",
 	"maclatin2",
@@ -3749,7 +3749,7 @@ unsigned char *aliases_mac_lat2 [] = {
 
 /*** kamen ***/
 
-struct table_entry table_kamen [] = {
+const struct table_entry table_kamen [] = {
 	{0x80, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
 	{0x81, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
 	{0x82, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
@@ -3881,7 +3881,7 @@ struct table_entry table_kamen [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_kamen [] = {
+unsigned char *const aliases_kamen [] = {
 	"x-kam-cs",
 	"kam",
 	"867",
@@ -3892,7 +3892,7 @@ unsigned char *aliases_kamen [] = {
 
 /*** koi8_r ***/
 
-struct table_entry table_koi8_r [] = {
+const struct table_entry table_koi8_r [] = {
 	{0x80, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
 	{0x81, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
 	{0x82, 0x250C /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
@@ -4024,7 +4024,7 @@ struct table_entry table_koi8_r [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_koi8_r [] = {
+unsigned char *const aliases_koi8_r [] = {
 	"koi8-r",
 	"csKOI8R",
 	NULL
@@ -4033,7 +4033,7 @@ unsigned char *aliases_koi8_r [] = {
 
 /*** koi8_u ***/
 
-struct table_entry table_koi8_u [] = {
+const struct table_entry table_koi8_u [] = {
 	{0x80, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
 	{0x81, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
 	{0x82, 0x250C /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
@@ -4165,7 +4165,7 @@ struct table_entry table_koi8_u [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_koi8_u [] = {
+unsigned char *const aliases_koi8_u [] = {
 	"koi8-u",
 	NULL
 };
@@ -4173,7 +4173,7 @@ unsigned char *aliases_koi8_u [] = {
 
 /*** koi8_ru ***/
 
-struct table_entry table_koi8_ru [] = {
+const struct table_entry table_koi8_ru [] = {
 	{0x80, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
 	{0x81, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
 	{0x82, 0x250C /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
@@ -4305,7 +4305,7 @@ struct table_entry table_koi8_ru [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_koi8_ru [] = {
+unsigned char *const aliases_koi8_ru [] = {
 	"koi8-ru",
 	NULL
 };
@@ -4313,7 +4313,7 @@ unsigned char *aliases_koi8_ru [] = {
 
 /*** tcvn5712 ***/
 
-struct table_entry table_tcvn5712 [] = {
+const struct table_entry table_tcvn5712 [] = {
 	{0x80, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
 	{0x81, 0x1EA2 /* LATIN CAPITAL LETTER A WITH HOOK ABOVE */ },
 	{0x82, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
@@ -4447,7 +4447,7 @@ struct table_entry table_tcvn5712 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_tcvn5712 [] = {
+unsigned char *const aliases_tcvn5712 [] = {
 	"TCVN-5712",
 	"TCVN",
 	"TCVN-0",
@@ -4461,7 +4461,7 @@ unsigned char *aliases_tcvn5712 [] = {
 
 /*** viscii ***/
 
-struct table_entry table_viscii [] = {
+const struct table_entry table_viscii [] = {
 	{0x80, 0x1EA0 /* LATIN CAPITAL LETTER A WITH DOT BELOW */ },
 	{0x81, 0x1EAE /* LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */ },
 	{0x82, 0x1EB0 /* LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */ },
@@ -4595,7 +4595,7 @@ struct table_entry table_viscii [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_viscii [] = {
+unsigned char *const aliases_viscii [] = {
 	"VISCII",
 	"VISCII-1",
 	"VISCII 1.1",
@@ -4608,17 +4608,17 @@ unsigned char *aliases_viscii [] = {
 
 /*** utf8 ***/
 
-struct table_entry table_utf8 [] = {
+const struct table_entry table_utf8 [] = {
 	{0, 0}
 };
 
-unsigned char *aliases_utf8 [] = {
+unsigned char *const aliases_utf8 [] = {
 	"utf-8",
 	"utf8",
 	NULL
 };
 
-struct codepage_desc codepages [] = {
+const struct codepage_desc codepages [] = {
 	{"7-bit ASCII", aliases_7bit, table_7bit},
 	{"ISO 8859-1", aliases_8859_1, table_8859_1},
 	{"ISO 8859-2", aliases_8859_2, table_8859_2},

From e1fee49fb77fa1dc3ec7e76df02a2dee9b5087c6 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 24 Sep 2006 12:47:00 +0300
Subject: [PATCH 114/132] Bug 381: Halve sizeof(struct table_entry).

Before:

   text	   data	    bss	    dec	    hex	filename
  54920	  28528	   3311	  86759	  152e7	src/intl/charsets.o
 516064	  85568	  82112	 683744	  a6ee0	src/elinks

After:

   text	   data	    bss	    dec	    hex	filename
  38958	  28528	   3311	  70797	  1148d	src/intl/charsets.o
 500112	  85568	  82112	 667792	  a3090	src/elinks

So the text section shrank by 15962 bytes.

Measured on i686-pc-linux-gnu with: --disable-xbel --disable-nls
--disable-cookies --disable-formhist --disable-globhist
--disable-mailcap --disable-mimetypes --disable-smb --disable-mouse
--disable-sysmouse --disable-leds --disable-marks --disable-css
--enable-small --enable-utf-8 --without-gpm --without-bzlib
--without-idn --without-spidermonkey --without-lua --without-gnutls
--without-openssl CFLAGS="-Os -ggdb -Wall"
---
 src/intl/charsets.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 76ee72e5..aee850fd 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -30,7 +30,14 @@
 
 struct table_entry {
 	unsigned char c;
-	unicode_val_T u;
+	/* This should in principle be unicode_val_T, but because all
+	 * the values currently in codepage.inc fit in 16 bits, we can
+	 * as well use uint16_t and halve sizeof(struct table_entry)
+	 * from 8 bytes to 4.  Should other characters ever be needed,
+	 * unicode_val_T u : 24 might be a possibility, although it
+	 * seems a little unportable as bitfields are in principle
+	 * restricted to int, which may be 16-bit.  */
+	uint16_t u;
 };
 
 struct codepage_desc {

From 0e88f8ba283f9bc4cac9bee49dea15e0d51d8253 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 24 Sep 2006 13:33:58 +0300
Subject: [PATCH 115/132] Bug 381: New macro is_cp_ptr_utf8(cp_ptr).

This does not significantly change the generated code but should make
the next commit more readable.
---
 src/intl/charsets.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index aee850fd..290a877c 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -142,6 +142,7 @@ static const unicode_val_T strange_chars[32] = {
 };
 
 #define SYSTEM_CHARSET_FLAG 128
+#define is_cp_ptr_utf8(cp_ptr) ((cp_ptr)->table == table_utf8)
 
 unsigned char *
 u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
@@ -154,7 +155,7 @@ u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
 	to &= ~SYSTEM_CHARSET_FLAG;
 
 #ifdef CONFIG_UTF8
-	if (codepages[to].table == table_utf8)
+	if (is_cp_ptr_utf8(&codepages[to]))
 		return encode_utf8(u);
 #endif /* CONFIG_UTF8 */
 
@@ -651,7 +652,7 @@ cp2u(int from, unsigned char c)
 
 	/* UTF-8 is a multibyte codepage and cannot be handled with
 	 * this function.  */
-	assert(codepages[from].table != table_utf8);
+	assert(!is_cp_ptr_utf8(&codepages[from]));
 	if_assert_failed return UCS_REPLACEMENT_CHARACTER;
 
 	if (c < 0x80) return c;
@@ -664,7 +665,7 @@ cp2utf8(int from, int c)
 {
 	from &= ~SYSTEM_CHARSET_FLAG;
 
-	if (codepages[from].table == table_utf8 || c < 128)
+	if (is_cp_ptr_utf8(&codepages[from]) || c < 128)
 		return strings[c];
 
 	return encode_utf8(cp2u_shared(&codepages[from], c));
@@ -750,7 +751,7 @@ get_translation_table_to_utf8(int from)
 	for (i = 0; i < 128; i++)
 		utf_table[i].u.str = strings[i];
 
-	if (codepages[from].table == table_utf8) {
+	if (is_cp_ptr_utf8(&codepages[from])) {
 		for (i = 128; i < 256; i++)
 			utf_table[i].u.str = stracpy(strings[i]);
 		return utf_table;
@@ -803,7 +804,7 @@ get_translation_table(int from, int to)
 	}
 	if (/*from == to ||*/ from == -1 || to == -1)
 		return NULL;
-	if (codepages[to].table == table_utf8)
+	if (is_cp_ptr_utf8(&codepages[to]))
 		return get_translation_table_to_utf8(from);
 	if (from == lfr && to == lto)
 		return table;
@@ -811,7 +812,7 @@ get_translation_table(int from, int to)
 	lto = to;
 	new_translation_table(table);
 
-	if (codepages[from].table == table_utf8) {
+	if (is_cp_ptr_utf8(&codepages[from])) {
 		int i;
 
 		for (i = 0; codepages[to].table[i].c; i++)
@@ -910,7 +911,7 @@ get_entity_string(const unsigned char *str, const int strlen, int encoding)
 #ifdef CONFIG_UTF8
 	/* TODO: caching UTF-8 */
 	encoding &= ~SYSTEM_CHARSET_FLAG;
-	if (codepages[encoding].table == table_utf8)
+	if (is_cp_ptr_utf8(&codepages[encoding]))
 		goto skip;
 #endif /* CONFIG_UTF8 */
 
@@ -1022,7 +1023,7 @@ skip:
 	}
 
 #ifdef CONFIG_UTF8
-	if (codepages[encoding].table == table_utf8) {
+	if (is_cp_ptr_utf8(&codepages[encoding])) {
 		return result;
 	}
 #endif /* CONFIG_UTF8 */
@@ -1354,5 +1355,5 @@ int
 is_cp_utf8(int cp_index)
 {
 	cp_index &= ~SYSTEM_CHARSET_FLAG;
-	return codepages[cp_index].table == table_utf8;
+	return is_cp_ptr_utf8(&codepages[cp_index]);
 }

From 4a5af7fd2682ae5081b79ff47ce7c0e1cca7090c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 24 Sep 2006 16:55:29 +0300
Subject: [PATCH 116/132] Bug 381: Store codepage-to-Unicode mappings as dense
 arrays.

Previously, each mapping between a codepage byte and a Unicode
character was stored as a struct table_entry, which listed both the
byte and the character.  This representation may be optimal for sparse
mappings, but codepages map almost every possible byte to a character,
so it is more efficient to just have an array that lists the Unicode
character corresponding to each byte from 0x80 to 0xFF.  The bytes are
not stored but rather implied by the array index.  The tcvn5712 and
viscii codepages have a total of four mappings that do not fit in the
arrays, so we still use struct table_entry for those.

This change also makes cp2u() operate in O(1) time and may speed up
other functions as well.

The "sed | while read" concoction in Unicode/gen-cp looks rather
unhealthy.  It would probably be faster and more readable if rewritten
in Perl, but IMO that goes for the previous version as well, so I
suppose whoever wrote it had a reason not to use Perl here.

Before:

   text	   data	    bss	    dec	    hex	filename
  38948	  28528	   3311	  70787	  11483	src/intl/charsets.o
 500096	  85568	  82112	 667776	  a3080	src/elinks

After:

   text	   data	    bss	    dec	    hex	filename
  31558	  28528	   3311	  63397	   f7a5	src/intl/charsets.o
 492878	  85568	  82112	 660558	  a144e	src/elinks

So the text section shrank by 7390 bytes.

Measured on i686-pc-linux-gnu with: --disable-xbel --disable-nls
--disable-cookies --disable-formhist --disable-globhist
--disable-mailcap --disable-mimetypes --disable-smb --disable-mouse
--disable-sysmouse --disable-leds --disable-marks --disable-css
--enable-small --enable-utf-8 --without-gpm --without-bzlib
--without-idn --without-spidermonkey --without-lua --without-gnutls
--without-openssl CFLAGS="-Os -ggdb -Wall"
---
 Unicode/gen-cp        |   71 +-
 src/intl/charsets.c   |   66 +-
 src/intl/codepage.inc | 8496 +++++++++++++++++++++--------------------
 3 files changed, 4494 insertions(+), 4139 deletions(-)

diff --git a/Unicode/gen-cp b/Unicode/gen-cp
index 3e95017b..b1e289b2 100755
--- a/Unicode/gen-cp
+++ b/Unicode/gen-cp
@@ -23,19 +23,52 @@ for i in $codepages; do
 	echo "/*** $i ***/"
 	echo
 
-	echo 'const struct table_entry table_'$i' [] = {'
-
-	# TODO: Comments inside of the structure are ugliness in a pure clean
-	# form, and my aesthetical feeling shivers upon glancing at it. However
-	# we should handle commentless records. A loop with read inside would
-	# be ideal, I suppose. --pasky
-	tail -n +3 $i.cp | sed 's/# *\(.*\) *$/\/* \1 *\/ /' | grep '^0x[89a-zA-Z]' \
-	| sed 's/[ 	][ 	]*/ /g' | sed 's/[ 	]*$/ },/' | sed 's/ /, /' \
-	| sed 's/^[ 	]*/	{/' | grep '.*,.*,'
-
-	echo '	{0, 0}'
-	echo '};'
-	echo
+	sed '1,2d
+		/^[	 ]*\(#.*\)\{,1\}$/d
+		h
+		s/^[^#]*//
+		s!#[	 ]*\(.*\)!/* \1 */!
+		x
+		s/#.*//
+		y/Xabcdef/xABCDEF/
+		/^0x[01234567]/d
+		/[^0x0123456789ABCDEF	 ]/d
+		G
+		s/\n//' "$i.cp" | {
+		for left in 8 9 A B C D E F; do
+			for right in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do
+				eval "high0x$left$right="
+			done
+		done
+		table=
+		highuse=
+	    	while read byte unicode comment; do
+			if eval "[ \"\$high$byte\" ]"; then
+				table="$table	{$byte, $unicode},${comment+ }$comment
+"
+			else
+				eval "high$byte=\"\$unicode,\${comment+ }\$comment\""
+				highuse=1
+			fi
+		done
+		if [ "$highuse" ]; then
+			printf "const uint16_t highhalf_%s [] = {\n" "$i"
+			for left in 8 9 A B C D E F; do
+				for right in 0 1 2 3 4 5 6 7 8 9 A B C D E F; do
+					eval "printf \"\\t/* %s */ %s\\n\" \"0x$left$right\" \"\${high0x$left$right:-0xFFFF,}\""
+				done
+			done
+			printf "};\n\n"
+		else
+			printf "#define highhalf_%s highhalf_NULL\n\n" "$i"
+		fi
+		if [ "$table" ]; then
+			printf "const struct table_entry table_%s [] = {\n%s\t{0, 0}\n};\n" "$i" "$table"
+		else
+			printf "#define table_%s table_NULL\n" "$i"
+		fi
+		printf "\n"
+	}
 
 	echo 'unsigned char *const aliases_'$i' [] = {'
 	head -n 2 $i.cp | tail -n +2 | sed 's/ \+/ /g; s/ $//; s/\", /\",Ł/g; s/$/,/' | tr "Ł" "\n" \
@@ -45,11 +78,21 @@ for i in $codepages; do
 	n=`expr $n + 1`
 done
 
+printf "\n/*** NULL ***/\n\n"
+printf "const uint16_t highhalf_NULL [] = {\n"
+for r in `seq 16`; do
+	printf "\t0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,\n"
+done
+printf "};\n\n"
+printf "const struct table_entry table_NULL [] = {\n"
+printf "\t{0, 0}\n"
+printf "};\n"
+
 echo
 echo 'const struct codepage_desc codepages [] = {'
 
 for i in $codepages; do
-	echo '	{"'`head -n 1 $i.cp`'", aliases_'$i', table_'$i'},'
+	echo '	{"'`head -n 1 $i.cp`'", aliases_'$i', highhalf_'$i', table_'$i'},'
 done
 
 echo '	{NULL, NULL, NULL}'
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 290a877c..119b5328 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -43,6 +43,21 @@ struct table_entry {
 struct codepage_desc {
 	unsigned char *name;
 	unsigned char *const *aliases;
+ 
+ 	/* The Unicode mappings of codepage bytes 0x80...0xFF.
+ 	 * (0x00...0x7F are assumed to be ASCII in all codepages.)
+ 	 * Because all current values fit in 16 bits, we store them as
+ 	 * uint16_t rather than unicode_val_T.  If the codepage does
+ 	 * not use some byte, then @highhalf maps that byte to 0xFFFF,
+ 	 * which C code converts to UCS_REPLACEMENT_CHARACTER where
+ 	 * appropriate.  (U+FFFF is reserved and will never be
+ 	 * assigned as a character.)  */
+	const uint16_t *highhalf;
+ 
+ 	/* If some byte in the codepage corresponds to multiple Unicode
+ 	 * characters, then the preferred character is in @highhalf
+ 	 * above, and the rest are listed here in @extra.  This table
+ 	 * is not used for translating from the codepage to Unicode.  */
 	const struct table_entry *table;
 };
 
@@ -142,7 +157,7 @@ static const unicode_val_T strange_chars[32] = {
 };
 
 #define SYSTEM_CHARSET_FLAG 128
-#define is_cp_ptr_utf8(cp_ptr) ((cp_ptr)->table == table_utf8)
+#define is_cp_ptr_utf8(cp_ptr) ((cp_ptr)->aliases == aliases_utf8)
 
 unsigned char *
 u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
@@ -170,7 +185,10 @@ u2cp_(unicode_val_T u, int to, int no_nbsp_hack)
 		return u2cp_(strange, to, no_nbsp_hack);
 	}
 
-
+	if (u < 0xFFFF)
+		for (j = 0; j < 0x80; j++)
+			if (codepages[to].highhalf[j] == u)
+				return strings[0x80 + j];
 	for (j = 0; codepages[to].table[j].c; j++)
 		if (codepages[to].table[j].u == u)
 			return strings[codepages[to].table[j].c];
@@ -631,20 +649,17 @@ utf8_to_unicode(unsigned char **string, unsigned char *end)
 }
 #endif /* CONFIG_UTF8 */
 
-/* Slow algorithm, the common part of cp2u and cp2utf8.  */
+/* The common part of cp2u and cp2utf_8.  */
 static unicode_val_T
 cp2u_shared(const struct codepage_desc *from, unsigned char c)
 {
-	int j;
-
-	for (j = 0; from->table[j].c; j++)
-		if (from->table[j].c == c)
-			return from->table[j].u;
-
-	return UCS_REPLACEMENT_CHARACTER;
+	unicode_val_T u = from->highhalf[c - 0x80];
+	
+	if (u == 0xFFFF) u = UCS_REPLACEMENT_CHARACTER;
+	return u;
 }
 
-/* Slow algorithm, used for converting input from the terminal.  */
+/* Used for converting input from the terminal.  */
 unicode_val_T
 cp2u(int from, unsigned char c)
 {
@@ -757,8 +772,14 @@ get_translation_table_to_utf8(int from)
 		return utf_table;
 	}
 
-	for (i = 128; i < 256; i++)
-		utf_table[i].u.str = NULL;
+	for (i = 128; i < 256; i++) {
+		unicode_val_T u = codepages[from].highhalf[i - 0x80];
+
+		if (u == 0xFFFF)
+			utf_table[i].u.str = NULL;
+		else
+			utf_table[i].u.str = stracpy(encode_utf8(u));
+	}
 
 	for (i = 0; codepages[from].table[i].c; i++) {
 		unicode_val_T u = codepages[from].table[i].u;
@@ -815,6 +836,12 @@ get_translation_table(int from, int to)
 	if (is_cp_ptr_utf8(&codepages[from])) {
 		int i;
 
+		for (i = 0x80; i <= 0xFF; i++)
+			if (codepages[to].highhalf[i - 0x80] != 0xFFFF)
+				add_utf8(table,
+					 codepages[to].highhalf[i - 0x80],
+					 strings[i]);
+
 		for (i = 0; codepages[to].table[i].c; i++)
 			add_utf8(table, codepages[to].table[i].u,
 				 strings[codepages[to].table[i].c]);
@@ -828,16 +855,11 @@ get_translation_table(int from, int to)
 		int i;
 
 		for (i = 128; i < 256; i++) {
-			int j;
+			if (codepages[from].highhalf[i - 0x80] != 0xFFFF) {
+				unsigned char *u;
 
-			for (j = 0; codepages[from].table[j].c; j++) {
-				if (codepages[from].table[j].c == i) {
-					unsigned char *u;
-
-					u = u2cp(codepages[from].table[j].u, to);
-					if (u) table[i].u.str = u;
-					break;
-				}
+				u = u2cp(codepages[from].highhalf[i - 0x80], to);
+				if (u) table[i].u.str = u;
 			}
 		}
 	}
diff --git a/src/intl/codepage.inc b/src/intl/codepage.inc
index d39173fc..afe53df4 100644
--- a/src/intl/codepage.inc
+++ b/src/intl/codepage.inc
@@ -5,9 +5,9 @@
 
 /*** 7bit ***/
 
-const struct table_entry table_7bit [] = {
-	{0, 0}
-};
+#define highhalf_7bit highhalf_NULL
+
+#define table_7bit table_NULL
 
 unsigned char *const aliases_7bit [] = {
 	"us-ascii",
@@ -32,106 +32,139 @@ unsigned char *const aliases_7bit [] = {
 
 /*** 8859_1 ***/
 
-const struct table_entry table_8859_1 [] = {
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x00A1 /* INVERTED EXCLAMATION MARK */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x00A5 /* YEN SIGN */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x00AA /* FEMININE ORDINAL INDICATOR */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00AF /* MACRON */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x00BA /* MASCULINE ORDINAL INDICATOR */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x00BE /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xBF, 0x00BF /* INVERTED QUESTION MARK */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD0, 0x00D0 /* LATIN CAPITAL LETTER ETH */ },
-	{0xD1, 0x00D1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x00DE /* LATIN CAPITAL LETTER THORN */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x00F0 /* LATIN SMALL LETTER ETH */ },
-	{0xF1, 0x00F1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x00FE /* LATIN SMALL LETTER THORN */ },
-	{0xFF, 0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0, 0}
+const uint16_t highhalf_8859_1 [] = {
+	/* 0x80 */ 0xFFFF,
+	/* 0x81 */ 0xFFFF,
+	/* 0x82 */ 0xFFFF,
+	/* 0x83 */ 0xFFFF,
+	/* 0x84 */ 0xFFFF,
+	/* 0x85 */ 0xFFFF,
+	/* 0x86 */ 0xFFFF,
+	/* 0x87 */ 0xFFFF,
+	/* 0x88 */ 0xFFFF,
+	/* 0x89 */ 0xFFFF,
+	/* 0x8A */ 0xFFFF,
+	/* 0x8B */ 0xFFFF,
+	/* 0x8C */ 0xFFFF,
+	/* 0x8D */ 0xFFFF,
+	/* 0x8E */ 0xFFFF,
+	/* 0x8F */ 0xFFFF,
+	/* 0x90 */ 0xFFFF,
+	/* 0x91 */ 0xFFFF,
+	/* 0x92 */ 0xFFFF,
+	/* 0x93 */ 0xFFFF,
+	/* 0x94 */ 0xFFFF,
+	/* 0x95 */ 0xFFFF,
+	/* 0x96 */ 0xFFFF,
+	/* 0x97 */ 0xFFFF,
+	/* 0x98 */ 0xFFFF,
+	/* 0x99 */ 0xFFFF,
+	/* 0x9A */ 0xFFFF,
+	/* 0x9B */ 0xFFFF,
+	/* 0x9C */ 0xFFFF,
+	/* 0x9D */ 0xFFFF,
+	/* 0x9E */ 0xFFFF,
+	/* 0x9F */ 0xFFFF,
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x00A5, /* YEN SIGN */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x00AA, /* FEMININE ORDINAL INDICATOR */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00AF, /* MACRON */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x00BA, /* MASCULINE ORDINAL INDICATOR */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xBF */ 0x00BF, /* INVERTED QUESTION MARK */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0x00D0, /* LATIN CAPITAL LETTER ETH */
+	/* 0xD1 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x00DE, /* LATIN CAPITAL LETTER THORN */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x00F0, /* LATIN SMALL LETTER ETH */
+	/* 0xF1 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x00FE, /* LATIN SMALL LETTER THORN */
+	/* 0xFF */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 };
 
+#define table_8859_1 table_NULL
+
 unsigned char *const aliases_8859_1 [] = {
 	"ISO-8859-1",
 	"iso8859-1",
@@ -153,106 +186,139 @@ unsigned char *const aliases_8859_1 [] = {
 
 /*** 8859_2 ***/
 
-const struct table_entry table_8859_2 [] = {
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xA2, 0x02D8 /* BREVE */ },
-	{0xA3, 0x0141 /* LATIN CAPITAL LETTER L WITH STROKE */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x013D /* LATIN CAPITAL LETTER L WITH CARON */ },
-	{0xA6, 0x015A /* LATIN CAPITAL LETTER S WITH ACUTE */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xAA, 0x015E /* LATIN CAPITAL LETTER S WITH CEDILLA */ },
-	{0xAB, 0x0164 /* LATIN CAPITAL LETTER T WITH CARON */ },
-	{0xAC, 0x0179 /* LATIN CAPITAL LETTER Z WITH ACUTE */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xAF, 0x017B /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xB2, 0x02DB /* OGONEK */ },
-	{0xB3, 0x0142 /* LATIN SMALL LETTER L WITH STROKE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x013E /* LATIN SMALL LETTER L WITH CARON */ },
-	{0xB6, 0x015B /* LATIN SMALL LETTER S WITH ACUTE */ },
-	{0xB7, 0x02C7 /* CARON */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xBA, 0x015F /* LATIN SMALL LETTER S WITH CEDILLA */ },
-	{0xBB, 0x0165 /* LATIN SMALL LETTER T WITH CARON */ },
-	{0xBC, 0x017A /* LATIN SMALL LETTER Z WITH ACUTE */ },
-	{0xBD, 0x02DD /* DOUBLE ACUTE ACCENT */ },
-	{0xBE, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xBF, 0x017C /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xC0, 0x0154 /* LATIN CAPITAL LETTER R WITH ACUTE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x0102 /* LATIN CAPITAL LETTER A WITH BREVE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x0139 /* LATIN CAPITAL LETTER L WITH ACUTE */ },
-	{0xC6, 0x0106 /* LATIN CAPITAL LETTER C WITH ACUTE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x011A /* LATIN CAPITAL LETTER E WITH CARON */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x010E /* LATIN CAPITAL LETTER D WITH CARON */ },
-	{0xD0, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xD1, 0x0143 /* LATIN CAPITAL LETTER N WITH ACUTE */ },
-	{0xD2, 0x0147 /* LATIN CAPITAL LETTER N WITH CARON */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x0150 /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x0158 /* LATIN CAPITAL LETTER R WITH CARON */ },
-	{0xD9, 0x016E /* LATIN CAPITAL LETTER U WITH RING ABOVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x0170 /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x0162 /* LATIN CAPITAL LETTER T WITH CEDILLA */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x0155 /* LATIN SMALL LETTER R WITH ACUTE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x0103 /* LATIN SMALL LETTER A WITH BREVE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x013A /* LATIN SMALL LETTER L WITH ACUTE */ },
-	{0xE6, 0x0107 /* LATIN SMALL LETTER C WITH ACUTE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x011B /* LATIN SMALL LETTER E WITH CARON */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x010F /* LATIN SMALL LETTER D WITH CARON */ },
-	{0xF0, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xF1, 0x0144 /* LATIN SMALL LETTER N WITH ACUTE */ },
-	{0xF2, 0x0148 /* LATIN SMALL LETTER N WITH CARON */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x0151 /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x0159 /* LATIN SMALL LETTER R WITH CARON */ },
-	{0xF9, 0x016F /* LATIN SMALL LETTER U WITH RING ABOVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x0171 /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x0163 /* LATIN SMALL LETTER T WITH CEDILLA */ },
-	{0xFF, 0x02D9 /* DOT ABOVE */ },
-	{0, 0}
+const uint16_t highhalf_8859_2 [] = {
+	/* 0x80 */ 0xFFFF,
+	/* 0x81 */ 0xFFFF,
+	/* 0x82 */ 0xFFFF,
+	/* 0x83 */ 0xFFFF,
+	/* 0x84 */ 0xFFFF,
+	/* 0x85 */ 0xFFFF,
+	/* 0x86 */ 0xFFFF,
+	/* 0x87 */ 0xFFFF,
+	/* 0x88 */ 0xFFFF,
+	/* 0x89 */ 0xFFFF,
+	/* 0x8A */ 0xFFFF,
+	/* 0x8B */ 0xFFFF,
+	/* 0x8C */ 0xFFFF,
+	/* 0x8D */ 0xFFFF,
+	/* 0x8E */ 0xFFFF,
+	/* 0x8F */ 0xFFFF,
+	/* 0x90 */ 0xFFFF,
+	/* 0x91 */ 0xFFFF,
+	/* 0x92 */ 0xFFFF,
+	/* 0x93 */ 0xFFFF,
+	/* 0x94 */ 0xFFFF,
+	/* 0x95 */ 0xFFFF,
+	/* 0x96 */ 0xFFFF,
+	/* 0x97 */ 0xFFFF,
+	/* 0x98 */ 0xFFFF,
+	/* 0x99 */ 0xFFFF,
+	/* 0x9A */ 0xFFFF,
+	/* 0x9B */ 0xFFFF,
+	/* 0x9C */ 0xFFFF,
+	/* 0x9D */ 0xFFFF,
+	/* 0x9E */ 0xFFFF,
+	/* 0x9F */ 0xFFFF,
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xA2 */ 0x02D8, /* BREVE */
+	/* 0xA3 */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x013D, /* LATIN CAPITAL LETTER L WITH CARON */
+	/* 0xA6 */ 0x015A, /* LATIN CAPITAL LETTER S WITH ACUTE */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xAA */ 0x015E, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+	/* 0xAB */ 0x0164, /* LATIN CAPITAL LETTER T WITH CARON */
+	/* 0xAC */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xAF */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xB2 */ 0x02DB, /* OGONEK */
+	/* 0xB3 */ 0x0142, /* LATIN SMALL LETTER L WITH STROKE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x013E, /* LATIN SMALL LETTER L WITH CARON */
+	/* 0xB6 */ 0x015B, /* LATIN SMALL LETTER S WITH ACUTE */
+	/* 0xB7 */ 0x02C7, /* CARON */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xBA */ 0x015F, /* LATIN SMALL LETTER S WITH CEDILLA */
+	/* 0xBB */ 0x0165, /* LATIN SMALL LETTER T WITH CARON */
+	/* 0xBC */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
+	/* 0xBD */ 0x02DD, /* DOUBLE ACUTE ACCENT */
+	/* 0xBE */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xBF */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xC0 */ 0x0154, /* LATIN CAPITAL LETTER R WITH ACUTE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x0102, /* LATIN CAPITAL LETTER A WITH BREVE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x0139, /* LATIN CAPITAL LETTER L WITH ACUTE */
+	/* 0xC6 */ 0x0106, /* LATIN CAPITAL LETTER C WITH ACUTE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x011A, /* LATIN CAPITAL LETTER E WITH CARON */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x010E, /* LATIN CAPITAL LETTER D WITH CARON */
+	/* 0xD0 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xD1 */ 0x0143, /* LATIN CAPITAL LETTER N WITH ACUTE */
+	/* 0xD2 */ 0x0147, /* LATIN CAPITAL LETTER N WITH CARON */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x0150, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x0158, /* LATIN CAPITAL LETTER R WITH CARON */
+	/* 0xD9 */ 0x016E, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x0170, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x0162, /* LATIN CAPITAL LETTER T WITH CEDILLA */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x0155, /* LATIN SMALL LETTER R WITH ACUTE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x0103, /* LATIN SMALL LETTER A WITH BREVE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x013A, /* LATIN SMALL LETTER L WITH ACUTE */
+	/* 0xE6 */ 0x0107, /* LATIN SMALL LETTER C WITH ACUTE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x011B, /* LATIN SMALL LETTER E WITH CARON */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x010F, /* LATIN SMALL LETTER D WITH CARON */
+	/* 0xF0 */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xF1 */ 0x0144, /* LATIN SMALL LETTER N WITH ACUTE */
+	/* 0xF2 */ 0x0148, /* LATIN SMALL LETTER N WITH CARON */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x0151, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x0159, /* LATIN SMALL LETTER R WITH CARON */
+	/* 0xF9 */ 0x016F, /* LATIN SMALL LETTER U WITH RING ABOVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x0171, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x0163, /* LATIN SMALL LETTER T WITH CEDILLA */
+	/* 0xFF */ 0x02D9, /* DOT ABOVE */
 };
 
+#define table_8859_2 table_NULL
+
 unsigned char *const aliases_8859_2 [] = {
 	"ISO-8859-2",
 	"iso8859-2",
@@ -271,131 +337,139 @@ unsigned char *const aliases_8859_2 [] = {
 
 /*** 8859_3 ***/
 
-const struct table_entry table_8859_3 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0126 /* LATIN CAPITAL LETTER H WITH STROKE */ },
-	{0xA2, 0x02D8 /* BREVE */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA6, 0x0124 /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x0130 /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ },
-	{0xAA, 0x015E /* LATIN CAPITAL LETTER S WITH CEDILLA */ },
-	{0xAB, 0x011E /* LATIN CAPITAL LETTER G WITH BREVE */ },
-	{0xAC, 0x0134 /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAF, 0x017B /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x0127 /* LATIN SMALL LETTER H WITH STROKE */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x0125 /* LATIN SMALL LETTER H WITH CIRCUMFLEX */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x0131 /* LATIN SMALL LETTER DOTLESS I */ },
-	{0xBA, 0x015F /* LATIN SMALL LETTER S WITH CEDILLA */ },
-	{0xBB, 0x011F /* LATIN SMALL LETTER G WITH BREVE */ },
-	{0xBC, 0x0135 /* LATIN SMALL LETTER J WITH CIRCUMFLEX */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBF, 0x017C /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x010A /* LATIN CAPITAL LETTER C WITH DOT ABOVE */ },
-	{0xC6, 0x0108 /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD1, 0x00D1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x0120 /* LATIN CAPITAL LETTER G WITH DOT ABOVE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x011C /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x016C /* LATIN CAPITAL LETTER U WITH BREVE */ },
-	{0xDE, 0x015C /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x010B /* LATIN SMALL LETTER C WITH DOT ABOVE */ },
-	{0xE6, 0x0109 /* LATIN SMALL LETTER C WITH CIRCUMFLEX */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF1, 0x00F1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x0121 /* LATIN SMALL LETTER G WITH DOT ABOVE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x011D /* LATIN SMALL LETTER G WITH CIRCUMFLEX */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x016D /* LATIN SMALL LETTER U WITH BREVE */ },
-	{0xFE, 0x015D /* LATIN SMALL LETTER S WITH CIRCUMFLEX */ },
-	{0xFF, 0x02D9 /* DOT ABOVE */ },
-	{0, 0}
+const uint16_t highhalf_8859_3 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0126, /* LATIN CAPITAL LETTER H WITH STROKE */
+	/* 0xA2 */ 0x02D8, /* BREVE */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0xFFFF,
+	/* 0xA6 */ 0x0124, /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x0130, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */
+	/* 0xAA */ 0x015E, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+	/* 0xAB */ 0x011E, /* LATIN CAPITAL LETTER G WITH BREVE */
+	/* 0xAC */ 0x0134, /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0xFFFF,
+	/* 0xAF */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x0127, /* LATIN SMALL LETTER H WITH STROKE */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x0125, /* LATIN SMALL LETTER H WITH CIRCUMFLEX */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x0131, /* LATIN SMALL LETTER DOTLESS I */
+	/* 0xBA */ 0x015F, /* LATIN SMALL LETTER S WITH CEDILLA */
+	/* 0xBB */ 0x011F, /* LATIN SMALL LETTER G WITH BREVE */
+	/* 0xBC */ 0x0135, /* LATIN SMALL LETTER J WITH CIRCUMFLEX */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0xFFFF,
+	/* 0xBF */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0xFFFF,
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x010A, /* LATIN CAPITAL LETTER C WITH DOT ABOVE */
+	/* 0xC6 */ 0x0108, /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0xFFFF,
+	/* 0xD1 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x0120, /* LATIN CAPITAL LETTER G WITH DOT ABOVE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x011C, /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x016C, /* LATIN CAPITAL LETTER U WITH BREVE */
+	/* 0xDE */ 0x015C, /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0xFFFF,
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x010B, /* LATIN SMALL LETTER C WITH DOT ABOVE */
+	/* 0xE6 */ 0x0109, /* LATIN SMALL LETTER C WITH CIRCUMFLEX */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0xFFFF,
+	/* 0xF1 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x0121, /* LATIN SMALL LETTER G WITH DOT ABOVE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x011D, /* LATIN SMALL LETTER G WITH CIRCUMFLEX */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x016D, /* LATIN SMALL LETTER U WITH BREVE */
+	/* 0xFE */ 0x015D, /* LATIN SMALL LETTER S WITH CIRCUMFLEX */
+	/* 0xFF */ 0x02D9, /* DOT ABOVE */
 };
 
+#define table_8859_3 table_NULL
+
 unsigned char *const aliases_8859_3 [] = {
 	"ISO-8859-3",
 	"8859-3",
@@ -413,138 +487,139 @@ unsigned char *const aliases_8859_3 [] = {
 
 /*** 8859_4 ***/
 
-const struct table_entry table_8859_4 [] = {
-	{0x80, 0x0080 /* PADDING CHARACTER (PAD) */ },
-	{0x81, 0x0081 /* HIGH OCTET PRESET (HOP) */ },
-	{0x82, 0x0082 /* BREAK PERMITTED HERE (BPH) */ },
-	{0x83, 0x0083 /* NO BREAK HERE (NBH) */ },
-	{0x84, 0x0084 /* INDEX (IND) */ },
-	{0x85, 0x0085 /* NEXT LINE (NEL) */ },
-	{0x86, 0x0086 /* START OF SELECTED AREA (SSA) */ },
-	{0x87, 0x0087 /* END OF SELECTED AREA (ESA) */ },
-	{0x88, 0x0088 /* CHARACTER TABULATION SET (HTS) */ },
-	{0x89, 0x0089 /* CHARACTER TABULATION WITH JUSTIFICATION (HTJ) */ },
-	{0x8A, 0x008A /* LINE TABULATION SET (VTS) */ },
-	{0x8B, 0x008B /* PARTIAL LINE FORWARD (PLD) */ },
-	{0x8C, 0x008C /* PARTIAL LINE BACKWARD (PLU) */ },
-	{0x8D, 0x008D /* REVERSE LINE FEED (RI) */ },
-	{0x8E, 0x008E /* SINGLE-SHIFT TWO (SS2) */ },
-	{0x8F, 0x008F /* SINGLE-SHIFT THREE (SS3) */ },
-	{0x90, 0x0090 /* DEVICE CONTROL STRING (DCS) */ },
-	{0x91, 0x0091 /* PRIVATE USE ONE (PU1) */ },
-	{0x92, 0x0092 /* PRIVATE USE TWO (PU2) */ },
-	{0x93, 0x0093 /* SET TRANSMIT STATE (STS) */ },
-	{0x94, 0x0094 /* CANCEL CHARACTER (CCH) */ },
-	{0x95, 0x0095 /* MESSAGE WAITING (MW) */ },
-	{0x96, 0x0096 /* START OF GUARDED AREA (SPA) */ },
-	{0x97, 0x0097 /* END OF GUARDED AREA (EPA) */ },
-	{0x98, 0x0098 /* START OF STRING (SOS) */ },
-	{0x99, 0x0099 /* SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI) */ },
-	{0x9A, 0x009A /* SINGLE CHARACTER INTRODUCER (SCI) */ },
-	{0x9B, 0x009B /* CONTROL SEQUENCE INTRODUCER (CSI) */ },
-	{0x9C, 0x009C /* STRING TERMINATOR (ST) */ },
-	{0x9D, 0x009D /* OPERATING SYSTEM COMMAND (OSC) */ },
-	{0x9E, 0x009E /* PRIVACY MESSAGE (PM) */ },
-	{0x9F, 0x009F /* APPLICATION PROGRAM COMMAND (APC) */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xA2, 0x0138 /* LATIN SMALL LETTER KRA (Greenlandic) */ },
-	{0xA3, 0x0156 /* LATIN CAPITAL LETTER R WITH CEDILLA */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x0128 /* LATIN CAPITAL LETTER I WITH TILDE */ },
-	{0xA6, 0x013B /* LATIN CAPITAL LETTER L WITH CEDILLA */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xAA, 0x0112 /* LATIN CAPITAL LETTER E WITH MACRON */ },
-	{0xAB, 0x0122 /* LATIN CAPITAL LETTER G WITH CEDILLA */ },
-	{0xAC, 0x0166 /* LATIN CAPITAL LETTER T WITH STROKE */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xAF, 0x00AF /* MACRON */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xB2, 0x02DB /* OGONEK */ },
-	{0xB3, 0x0157 /* LATIN SMALL LETTER R WITH CEDILLA */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x0129 /* LATIN SMALL LETTER I WITH TILDE */ },
-	{0xB6, 0x013C /* LATIN SMALL LETTER L WITH CEDILLA */ },
-	{0xB7, 0x02C7 /* CARON (Mandarin Chinese third tone) */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xBA, 0x0113 /* LATIN SMALL LETTER E WITH MACRON */ },
-	{0xBB, 0x0123 /* LATIN SMALL LETTER G WITH CEDILLA */ },
-	{0xBC, 0x0167 /* LATIN SMALL LETTER T WITH STROKE */ },
-	{0xBD, 0x014A /* LATIN CAPITAL LETTER ENG (Sami) */ },
-	{0xBE, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xBF, 0x014B /* LATIN SMALL LETTER ENG (Sami) */ },
-	{0xC0, 0x0100 /* LATIN CAPITAL LETTER A WITH MACRON */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xC7, 0x012E /* LATIN CAPITAL LETTER I WITH OGONEK */ },
-	{0xC8, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x0116 /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x012A /* LATIN CAPITAL LETTER I WITH MACRON */ },
-	{0xD0, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xD1, 0x0145 /* LATIN CAPITAL LETTER N WITH CEDILLA */ },
-	{0xD2, 0x014C /* LATIN CAPITAL LETTER O WITH MACRON */ },
-	{0xD3, 0x0136 /* LATIN CAPITAL LETTER K WITH CEDILLA */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xD9, 0x0172 /* LATIN CAPITAL LETTER U WITH OGONEK */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x0168 /* LATIN CAPITAL LETTER U WITH TILDE */ },
-	{0xDE, 0x016A /* LATIN CAPITAL LETTER U WITH MACRON */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S (German) */ },
-	{0xE0, 0x0101 /* LATIN SMALL LETTER A WITH MACRON */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xE7, 0x012F /* LATIN SMALL LETTER I WITH OGONEK */ },
-	{0xE8, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x0117 /* LATIN SMALL LETTER E WITH DOT ABOVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x012B /* LATIN SMALL LETTER I WITH MACRON */ },
-	{0xF0, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xF1, 0x0146 /* LATIN SMALL LETTER N WITH CEDILLA */ },
-	{0xF2, 0x014D /* LATIN SMALL LETTER O WITH MACRON */ },
-	{0xF3, 0x0137 /* LATIN SMALL LETTER K WITH CEDILLA */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xF9, 0x0173 /* LATIN SMALL LETTER U WITH OGONEK */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x0169 /* LATIN SMALL LETTER U WITH TILDE */ },
-	{0xFE, 0x016B /* LATIN SMALL LETTER U WITH MACRON */ },
-	{0xFF, 0x02D9 /* DOT ABOVE (Mandarin Chinese light tone) */ },
-	{0, 0}
+const uint16_t highhalf_8859_4 [] = {
+	/* 0x80 */ 0x0080, /* PADDING CHARACTER (PAD) */
+	/* 0x81 */ 0x0081, /* HIGH OCTET PRESET (HOP) */
+	/* 0x82 */ 0x0082, /* BREAK PERMITTED HERE (BPH) */
+	/* 0x83 */ 0x0083, /* NO BREAK HERE (NBH) */
+	/* 0x84 */ 0x0084, /* INDEX (IND) */
+	/* 0x85 */ 0x0085, /* NEXT LINE (NEL) */
+	/* 0x86 */ 0x0086, /* START OF SELECTED AREA (SSA) */
+	/* 0x87 */ 0x0087, /* END OF SELECTED AREA (ESA) */
+	/* 0x88 */ 0x0088, /* CHARACTER TABULATION SET (HTS) */
+	/* 0x89 */ 0x0089, /* CHARACTER TABULATION WITH JUSTIFICATION (HTJ) */
+	/* 0x8A */ 0x008A, /* LINE TABULATION SET (VTS) */
+	/* 0x8B */ 0x008B, /* PARTIAL LINE FORWARD (PLD) */
+	/* 0x8C */ 0x008C, /* PARTIAL LINE BACKWARD (PLU) */
+	/* 0x8D */ 0x008D, /* REVERSE LINE FEED (RI) */
+	/* 0x8E */ 0x008E, /* SINGLE-SHIFT TWO (SS2) */
+	/* 0x8F */ 0x008F, /* SINGLE-SHIFT THREE (SS3) */
+	/* 0x90 */ 0x0090, /* DEVICE CONTROL STRING (DCS) */
+	/* 0x91 */ 0x0091, /* PRIVATE USE ONE (PU1) */
+	/* 0x92 */ 0x0092, /* PRIVATE USE TWO (PU2) */
+	/* 0x93 */ 0x0093, /* SET TRANSMIT STATE (STS) */
+	/* 0x94 */ 0x0094, /* CANCEL CHARACTER (CCH) */
+	/* 0x95 */ 0x0095, /* MESSAGE WAITING (MW) */
+	/* 0x96 */ 0x0096, /* START OF GUARDED AREA (SPA) */
+	/* 0x97 */ 0x0097, /* END OF GUARDED AREA (EPA) */
+	/* 0x98 */ 0x0098, /* START OF STRING (SOS) */
+	/* 0x99 */ 0x0099, /* SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI) */
+	/* 0x9A */ 0x009A, /* SINGLE CHARACTER INTRODUCER (SCI) */
+	/* 0x9B */ 0x009B, /* CONTROL SEQUENCE INTRODUCER (CSI) */
+	/* 0x9C */ 0x009C, /* STRING TERMINATOR (ST) */
+	/* 0x9D */ 0x009D, /* OPERATING SYSTEM COMMAND (OSC) */
+	/* 0x9E */ 0x009E, /* PRIVACY MESSAGE (PM) */
+	/* 0x9F */ 0x009F, /* APPLICATION PROGRAM COMMAND (APC) */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xA2 */ 0x0138, /* LATIN SMALL LETTER KRA (Greenlandic) */
+	/* 0xA3 */ 0x0156, /* LATIN CAPITAL LETTER R WITH CEDILLA */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x0128, /* LATIN CAPITAL LETTER I WITH TILDE */
+	/* 0xA6 */ 0x013B, /* LATIN CAPITAL LETTER L WITH CEDILLA */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xAA */ 0x0112, /* LATIN CAPITAL LETTER E WITH MACRON */
+	/* 0xAB */ 0x0122, /* LATIN CAPITAL LETTER G WITH CEDILLA */
+	/* 0xAC */ 0x0166, /* LATIN CAPITAL LETTER T WITH STROKE */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xAF */ 0x00AF, /* MACRON */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xB2 */ 0x02DB, /* OGONEK */
+	/* 0xB3 */ 0x0157, /* LATIN SMALL LETTER R WITH CEDILLA */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x0129, /* LATIN SMALL LETTER I WITH TILDE */
+	/* 0xB6 */ 0x013C, /* LATIN SMALL LETTER L WITH CEDILLA */
+	/* 0xB7 */ 0x02C7, /* CARON (Mandarin Chinese third tone) */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xBA */ 0x0113, /* LATIN SMALL LETTER E WITH MACRON */
+	/* 0xBB */ 0x0123, /* LATIN SMALL LETTER G WITH CEDILLA */
+	/* 0xBC */ 0x0167, /* LATIN SMALL LETTER T WITH STROKE */
+	/* 0xBD */ 0x014A, /* LATIN CAPITAL LETTER ENG (Sami) */
+	/* 0xBE */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xBF */ 0x014B, /* LATIN SMALL LETTER ENG (Sami) */
+	/* 0xC0 */ 0x0100, /* LATIN CAPITAL LETTER A WITH MACRON */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xC7 */ 0x012E, /* LATIN CAPITAL LETTER I WITH OGONEK */
+	/* 0xC8 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x0116, /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x012A, /* LATIN CAPITAL LETTER I WITH MACRON */
+	/* 0xD0 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xD1 */ 0x0145, /* LATIN CAPITAL LETTER N WITH CEDILLA */
+	/* 0xD2 */ 0x014C, /* LATIN CAPITAL LETTER O WITH MACRON */
+	/* 0xD3 */ 0x0136, /* LATIN CAPITAL LETTER K WITH CEDILLA */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xD9 */ 0x0172, /* LATIN CAPITAL LETTER U WITH OGONEK */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x0168, /* LATIN CAPITAL LETTER U WITH TILDE */
+	/* 0xDE */ 0x016A, /* LATIN CAPITAL LETTER U WITH MACRON */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S (German) */
+	/* 0xE0 */ 0x0101, /* LATIN SMALL LETTER A WITH MACRON */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xE7 */ 0x012F, /* LATIN SMALL LETTER I WITH OGONEK */
+	/* 0xE8 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x0117, /* LATIN SMALL LETTER E WITH DOT ABOVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x012B, /* LATIN SMALL LETTER I WITH MACRON */
+	/* 0xF0 */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xF1 */ 0x0146, /* LATIN SMALL LETTER N WITH CEDILLA */
+	/* 0xF2 */ 0x014D, /* LATIN SMALL LETTER O WITH MACRON */
+	/* 0xF3 */ 0x0137, /* LATIN SMALL LETTER K WITH CEDILLA */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xF9 */ 0x0173, /* LATIN SMALL LETTER U WITH OGONEK */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x0169, /* LATIN SMALL LETTER U WITH TILDE */
+	/* 0xFE */ 0x016B, /* LATIN SMALL LETTER U WITH MACRON */
+	/* 0xFF */ 0x02D9, /* DOT ABOVE (Mandarin Chinese light tone) */
 };
 
+#define table_8859_4 table_NULL
+
 unsigned char *const aliases_8859_4 [] = {
 	"ISO-8859-4",
 	"iso8859-4",
@@ -563,138 +638,139 @@ unsigned char *const aliases_8859_4 [] = {
 
 /*** 8859_5 ***/
 
-const struct table_entry table_8859_5 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0401 /* CYRILLIC CAPITAL LETTER IO */ },
-	{0xA2, 0x0402 /* CYRILLIC CAPITAL LETTER DJE */ },
-	{0xA3, 0x0403 /* CYRILLIC CAPITAL LETTER GJE */ },
-	{0xA4, 0x0404 /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ },
-	{0xA5, 0x0405 /* CYRILLIC CAPITAL LETTER DZE */ },
-	{0xA6, 0x0406 /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xA7, 0x0407 /* CYRILLIC CAPITAL LETTER YI */ },
-	{0xA8, 0x0408 /* CYRILLIC CAPITAL LETTER JE */ },
-	{0xA9, 0x0409 /* CYRILLIC CAPITAL LETTER LJE */ },
-	{0xAA, 0x040A /* CYRILLIC CAPITAL LETTER NJE */ },
-	{0xAB, 0x040B /* CYRILLIC CAPITAL LETTER TSHE */ },
-	{0xAC, 0x040C /* CYRILLIC CAPITAL LETTER KJE */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x040E /* CYRILLIC CAPITAL LETTER SHORT U */ },
-	{0xAF, 0x040F /* CYRILLIC CAPITAL LETTER DZHE */ },
-	{0xB0, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
-	{0xB1, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
-	{0xB2, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
-	{0xB3, 0x0413 /* CYRILLIC CAPITAL LETTER GHE */ },
-	{0xB4, 0x0414 /* CYRILLIC CAPITAL LETTER DE */ },
-	{0xB5, 0x0415 /* CYRILLIC CAPITAL LETTER IE */ },
-	{0xB6, 0x0416 /* CYRILLIC CAPITAL LETTER ZHE */ },
-	{0xB7, 0x0417 /* CYRILLIC CAPITAL LETTER ZE */ },
-	{0xB8, 0x0418 /* CYRILLIC CAPITAL LETTER I */ },
-	{0xB9, 0x0419 /* CYRILLIC CAPITAL LETTER SHORT I */ },
-	{0xBA, 0x041A /* CYRILLIC CAPITAL LETTER KA */ },
-	{0xBB, 0x041B /* CYRILLIC CAPITAL LETTER EL */ },
-	{0xBC, 0x041C /* CYRILLIC CAPITAL LETTER EM */ },
-	{0xBD, 0x041D /* CYRILLIC CAPITAL LETTER EN */ },
-	{0xBE, 0x041E /* CYRILLIC CAPITAL LETTER O */ },
-	{0xBF, 0x041F /* CYRILLIC CAPITAL LETTER PE */ },
-	{0xC0, 0x0420 /* CYRILLIC CAPITAL LETTER ER */ },
-	{0xC1, 0x0421 /* CYRILLIC CAPITAL LETTER ES */ },
-	{0xC2, 0x0422 /* CYRILLIC CAPITAL LETTER TE */ },
-	{0xC3, 0x0423 /* CYRILLIC CAPITAL LETTER U */ },
-	{0xC4, 0x0424 /* CYRILLIC CAPITAL LETTER EF */ },
-	{0xC5, 0x0425 /* CYRILLIC CAPITAL LETTER HA */ },
-	{0xC6, 0x0426 /* CYRILLIC CAPITAL LETTER TSE */ },
-	{0xC7, 0x0427 /* CYRILLIC CAPITAL LETTER CHE */ },
-	{0xC8, 0x0428 /* CYRILLIC CAPITAL LETTER SHA */ },
-	{0xC9, 0x0429 /* CYRILLIC CAPITAL LETTER SHCHA */ },
-	{0xCA, 0x042A /* CYRILLIC CAPITAL LETTER HARD SIGN */ },
-	{0xCB, 0x042B /* CYRILLIC CAPITAL LETTER YERU */ },
-	{0xCC, 0x042C /* CYRILLIC CAPITAL LETTER SOFT SIGN */ },
-	{0xCD, 0x042D /* CYRILLIC CAPITAL LETTER E */ },
-	{0xCE, 0x042E /* CYRILLIC CAPITAL LETTER YU */ },
-	{0xCF, 0x042F /* CYRILLIC CAPITAL LETTER YA */ },
-	{0xD0, 0x0430 /* CYRILLIC SMALL LETTER A */ },
-	{0xD1, 0x0431 /* CYRILLIC SMALL LETTER BE */ },
-	{0xD2, 0x0432 /* CYRILLIC SMALL LETTER VE */ },
-	{0xD3, 0x0433 /* CYRILLIC SMALL LETTER GHE */ },
-	{0xD4, 0x0434 /* CYRILLIC SMALL LETTER DE */ },
-	{0xD5, 0x0435 /* CYRILLIC SMALL LETTER IE */ },
-	{0xD6, 0x0436 /* CYRILLIC SMALL LETTER ZHE */ },
-	{0xD7, 0x0437 /* CYRILLIC SMALL LETTER ZE */ },
-	{0xD8, 0x0438 /* CYRILLIC SMALL LETTER I */ },
-	{0xD9, 0x0439 /* CYRILLIC SMALL LETTER SHORT I */ },
-	{0xDA, 0x043A /* CYRILLIC SMALL LETTER KA */ },
-	{0xDB, 0x043B /* CYRILLIC SMALL LETTER EL */ },
-	{0xDC, 0x043C /* CYRILLIC SMALL LETTER EM */ },
-	{0xDD, 0x043D /* CYRILLIC SMALL LETTER EN */ },
-	{0xDE, 0x043E /* CYRILLIC SMALL LETTER O */ },
-	{0xDF, 0x043F /* CYRILLIC SMALL LETTER PE */ },
-	{0xE0, 0x0440 /* CYRILLIC SMALL LETTER ER */ },
-	{0xE1, 0x0441 /* CYRILLIC SMALL LETTER ES */ },
-	{0xE2, 0x0442 /* CYRILLIC SMALL LETTER TE */ },
-	{0xE3, 0x0443 /* CYRILLIC SMALL LETTER U */ },
-	{0xE4, 0x0444 /* CYRILLIC SMALL LETTER EF */ },
-	{0xE5, 0x0445 /* CYRILLIC SMALL LETTER HA */ },
-	{0xE6, 0x0446 /* CYRILLIC SMALL LETTER TSE */ },
-	{0xE7, 0x0447 /* CYRILLIC SMALL LETTER CHE */ },
-	{0xE8, 0x0448 /* CYRILLIC SMALL LETTER SHA */ },
-	{0xE9, 0x0449 /* CYRILLIC SMALL LETTER SHCHA */ },
-	{0xEA, 0x044A /* CYRILLIC SMALL LETTER HARD SIGN */ },
-	{0xEB, 0x044B /* CYRILLIC SMALL LETTER YERU */ },
-	{0xEC, 0x044C /* CYRILLIC SMALL LETTER SOFT SIGN */ },
-	{0xED, 0x044D /* CYRILLIC SMALL LETTER E */ },
-	{0xEE, 0x044E /* CYRILLIC SMALL LETTER YU */ },
-	{0xEF, 0x044F /* CYRILLIC SMALL LETTER YA */ },
-	{0xF0, 0x2116 /* NUMERO SIGN */ },
-	{0xF1, 0x0451 /* CYRILLIC SMALL LETTER IO */ },
-	{0xF2, 0x0452 /* CYRILLIC SMALL LETTER DJE */ },
-	{0xF3, 0x0453 /* CYRILLIC SMALL LETTER GJE */ },
-	{0xF4, 0x0454 /* CYRILLIC SMALL LETTER UKRAINIAN IE */ },
-	{0xF5, 0x0455 /* CYRILLIC SMALL LETTER DZE */ },
-	{0xF6, 0x0456 /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xF7, 0x0457 /* CYRILLIC SMALL LETTER YI */ },
-	{0xF8, 0x0458 /* CYRILLIC SMALL LETTER JE */ },
-	{0xF9, 0x0459 /* CYRILLIC SMALL LETTER LJE */ },
-	{0xFA, 0x045A /* CYRILLIC SMALL LETTER NJE */ },
-	{0xFB, 0x045B /* CYRILLIC SMALL LETTER TSHE */ },
-	{0xFC, 0x045C /* CYRILLIC SMALL LETTER KJE */ },
-	{0xFD, 0x00A7 /* SECTION SIGN */ },
-	{0xFE, 0x045E /* CYRILLIC SMALL LETTER SHORT U */ },
-	{0xFF, 0x045F /* CYRILLIC SMALL LETTER DZHE */ },
-	{0, 0}
+const uint16_t highhalf_8859_5 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0401, /* CYRILLIC CAPITAL LETTER IO */
+	/* 0xA2 */ 0x0402, /* CYRILLIC CAPITAL LETTER DJE */
+	/* 0xA3 */ 0x0403, /* CYRILLIC CAPITAL LETTER GJE */
+	/* 0xA4 */ 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+	/* 0xA5 */ 0x0405, /* CYRILLIC CAPITAL LETTER DZE */
+	/* 0xA6 */ 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xA7 */ 0x0407, /* CYRILLIC CAPITAL LETTER YI */
+	/* 0xA8 */ 0x0408, /* CYRILLIC CAPITAL LETTER JE */
+	/* 0xA9 */ 0x0409, /* CYRILLIC CAPITAL LETTER LJE */
+	/* 0xAA */ 0x040A, /* CYRILLIC CAPITAL LETTER NJE */
+	/* 0xAB */ 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */
+	/* 0xAC */ 0x040C, /* CYRILLIC CAPITAL LETTER KJE */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x040E, /* CYRILLIC CAPITAL LETTER SHORT U */
+	/* 0xAF */ 0x040F, /* CYRILLIC CAPITAL LETTER DZHE */
+	/* 0xB0 */ 0x0410, /* CYRILLIC CAPITAL LETTER A */
+	/* 0xB1 */ 0x0411, /* CYRILLIC CAPITAL LETTER BE */
+	/* 0xB2 */ 0x0412, /* CYRILLIC CAPITAL LETTER VE */
+	/* 0xB3 */ 0x0413, /* CYRILLIC CAPITAL LETTER GHE */
+	/* 0xB4 */ 0x0414, /* CYRILLIC CAPITAL LETTER DE */
+	/* 0xB5 */ 0x0415, /* CYRILLIC CAPITAL LETTER IE */
+	/* 0xB6 */ 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
+	/* 0xB7 */ 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
+	/* 0xB8 */ 0x0418, /* CYRILLIC CAPITAL LETTER I */
+	/* 0xB9 */ 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
+	/* 0xBA */ 0x041A, /* CYRILLIC CAPITAL LETTER KA */
+	/* 0xBB */ 0x041B, /* CYRILLIC CAPITAL LETTER EL */
+	/* 0xBC */ 0x041C, /* CYRILLIC CAPITAL LETTER EM */
+	/* 0xBD */ 0x041D, /* CYRILLIC CAPITAL LETTER EN */
+	/* 0xBE */ 0x041E, /* CYRILLIC CAPITAL LETTER O */
+	/* 0xBF */ 0x041F, /* CYRILLIC CAPITAL LETTER PE */
+	/* 0xC0 */ 0x0420, /* CYRILLIC CAPITAL LETTER ER */
+	/* 0xC1 */ 0x0421, /* CYRILLIC CAPITAL LETTER ES */
+	/* 0xC2 */ 0x0422, /* CYRILLIC CAPITAL LETTER TE */
+	/* 0xC3 */ 0x0423, /* CYRILLIC CAPITAL LETTER U */
+	/* 0xC4 */ 0x0424, /* CYRILLIC CAPITAL LETTER EF */
+	/* 0xC5 */ 0x0425, /* CYRILLIC CAPITAL LETTER HA */
+	/* 0xC6 */ 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
+	/* 0xC7 */ 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
+	/* 0xC8 */ 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
+	/* 0xC9 */ 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */
+	/* 0xCA */ 0x042A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
+	/* 0xCB */ 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
+	/* 0xCC */ 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+	/* 0xCD */ 0x042D, /* CYRILLIC CAPITAL LETTER E */
+	/* 0xCE */ 0x042E, /* CYRILLIC CAPITAL LETTER YU */
+	/* 0xCF */ 0x042F, /* CYRILLIC CAPITAL LETTER YA */
+	/* 0xD0 */ 0x0430, /* CYRILLIC SMALL LETTER A */
+	/* 0xD1 */ 0x0431, /* CYRILLIC SMALL LETTER BE */
+	/* 0xD2 */ 0x0432, /* CYRILLIC SMALL LETTER VE */
+	/* 0xD3 */ 0x0433, /* CYRILLIC SMALL LETTER GHE */
+	/* 0xD4 */ 0x0434, /* CYRILLIC SMALL LETTER DE */
+	/* 0xD5 */ 0x0435, /* CYRILLIC SMALL LETTER IE */
+	/* 0xD6 */ 0x0436, /* CYRILLIC SMALL LETTER ZHE */
+	/* 0xD7 */ 0x0437, /* CYRILLIC SMALL LETTER ZE */
+	/* 0xD8 */ 0x0438, /* CYRILLIC SMALL LETTER I */
+	/* 0xD9 */ 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
+	/* 0xDA */ 0x043A, /* CYRILLIC SMALL LETTER KA */
+	/* 0xDB */ 0x043B, /* CYRILLIC SMALL LETTER EL */
+	/* 0xDC */ 0x043C, /* CYRILLIC SMALL LETTER EM */
+	/* 0xDD */ 0x043D, /* CYRILLIC SMALL LETTER EN */
+	/* 0xDE */ 0x043E, /* CYRILLIC SMALL LETTER O */
+	/* 0xDF */ 0x043F, /* CYRILLIC SMALL LETTER PE */
+	/* 0xE0 */ 0x0440, /* CYRILLIC SMALL LETTER ER */
+	/* 0xE1 */ 0x0441, /* CYRILLIC SMALL LETTER ES */
+	/* 0xE2 */ 0x0442, /* CYRILLIC SMALL LETTER TE */
+	/* 0xE3 */ 0x0443, /* CYRILLIC SMALL LETTER U */
+	/* 0xE4 */ 0x0444, /* CYRILLIC SMALL LETTER EF */
+	/* 0xE5 */ 0x0445, /* CYRILLIC SMALL LETTER HA */
+	/* 0xE6 */ 0x0446, /* CYRILLIC SMALL LETTER TSE */
+	/* 0xE7 */ 0x0447, /* CYRILLIC SMALL LETTER CHE */
+	/* 0xE8 */ 0x0448, /* CYRILLIC SMALL LETTER SHA */
+	/* 0xE9 */ 0x0449, /* CYRILLIC SMALL LETTER SHCHA */
+	/* 0xEA */ 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */
+	/* 0xEB */ 0x044B, /* CYRILLIC SMALL LETTER YERU */
+	/* 0xEC */ 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */
+	/* 0xED */ 0x044D, /* CYRILLIC SMALL LETTER E */
+	/* 0xEE */ 0x044E, /* CYRILLIC SMALL LETTER YU */
+	/* 0xEF */ 0x044F, /* CYRILLIC SMALL LETTER YA */
+	/* 0xF0 */ 0x2116, /* NUMERO SIGN */
+	/* 0xF1 */ 0x0451, /* CYRILLIC SMALL LETTER IO */
+	/* 0xF2 */ 0x0452, /* CYRILLIC SMALL LETTER DJE */
+	/* 0xF3 */ 0x0453, /* CYRILLIC SMALL LETTER GJE */
+	/* 0xF4 */ 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+	/* 0xF5 */ 0x0455, /* CYRILLIC SMALL LETTER DZE */
+	/* 0xF6 */ 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xF7 */ 0x0457, /* CYRILLIC SMALL LETTER YI */
+	/* 0xF8 */ 0x0458, /* CYRILLIC SMALL LETTER JE */
+	/* 0xF9 */ 0x0459, /* CYRILLIC SMALL LETTER LJE */
+	/* 0xFA */ 0x045A, /* CYRILLIC SMALL LETTER NJE */
+	/* 0xFB */ 0x045B, /* CYRILLIC SMALL LETTER TSHE */
+	/* 0xFC */ 0x045C, /* CYRILLIC SMALL LETTER KJE */
+	/* 0xFD */ 0x00A7, /* SECTION SIGN */
+	/* 0xFE */ 0x045E, /* CYRILLIC SMALL LETTER SHORT U */
+	/* 0xFF */ 0x045F, /* CYRILLIC SMALL LETTER DZHE */
 };
 
+#define table_8859_5 table_NULL
+
 unsigned char *const aliases_8859_5 [] = {
 	"ISO-8859-5",
 	"iso8859-5",
@@ -711,93 +787,139 @@ unsigned char *const aliases_8859_5 [] = {
 
 /*** 8859_6 ***/
 
-const struct table_entry table_8859_6 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xAC, 0x060C /* ARABIC COMMA */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xBB, 0x061B /* ARABIC SEMICOLON */ },
-	{0xBF, 0x061F /* ARABIC QUESTION MARK */ },
-	{0xC1, 0x0621 /* ARABIC LETTER HAMZA */ },
-	{0xC2, 0x0622 /* ARABIC LETTER ALEF WITH MADDA ABOVE */ },
-	{0xC3, 0x0623 /* ARABIC LETTER ALEF WITH HAMZA ABOVE */ },
-	{0xC4, 0x0624 /* ARABIC LETTER WAW WITH HAMZA ABOVE */ },
-	{0xC5, 0x0625 /* ARABIC LETTER ALEF WITH HAMZA BELOW */ },
-	{0xC6, 0x0626 /* ARABIC LETTER YEH WITH HAMZA ABOVE */ },
-	{0xC7, 0x0627 /* ARABIC LETTER ALEF */ },
-	{0xC8, 0x0628 /* ARABIC LETTER BEH */ },
-	{0xC9, 0x0629 /* ARABIC LETTER TEH MARBUTA */ },
-	{0xCA, 0x062A /* ARABIC LETTER TEH */ },
-	{0xCB, 0x062B /* ARABIC LETTER THEH */ },
-	{0xCC, 0x062C /* ARABIC LETTER JEEM */ },
-	{0xCD, 0x062D /* ARABIC LETTER HAH */ },
-	{0xCE, 0x062E /* ARABIC LETTER KHAH */ },
-	{0xCF, 0x062F /* ARABIC LETTER DAL */ },
-	{0xD0, 0x0630 /* ARABIC LETTER THAL */ },
-	{0xD1, 0x0631 /* ARABIC LETTER REH */ },
-	{0xD2, 0x0632 /* ARABIC LETTER ZAIN */ },
-	{0xD3, 0x0633 /* ARABIC LETTER SEEN */ },
-	{0xD4, 0x0634 /* ARABIC LETTER SHEEN */ },
-	{0xD5, 0x0635 /* ARABIC LETTER SAD */ },
-	{0xD6, 0x0636 /* ARABIC LETTER DAD */ },
-	{0xD7, 0x0637 /* ARABIC LETTER TAH */ },
-	{0xD8, 0x0638 /* ARABIC LETTER ZAH */ },
-	{0xD9, 0x0639 /* ARABIC LETTER AIN */ },
-	{0xDA, 0x063A /* ARABIC LETTER GHAIN */ },
-	{0xE0, 0x0640 /* ARABIC TATWEEL */ },
-	{0xE1, 0x0641 /* ARABIC LETTER FEH */ },
-	{0xE2, 0x0642 /* ARABIC LETTER QAF */ },
-	{0xE3, 0x0643 /* ARABIC LETTER KAF */ },
-	{0xE4, 0x0644 /* ARABIC LETTER LAM */ },
-	{0xE5, 0x0645 /* ARABIC LETTER MEEM */ },
-	{0xE6, 0x0646 /* ARABIC LETTER NOON */ },
-	{0xE7, 0x0647 /* ARABIC LETTER HEH */ },
-	{0xE8, 0x0648 /* ARABIC LETTER WAW */ },
-	{0xE9, 0x0649 /* ARABIC LETTER ALEF MAKSURA */ },
-	{0xEA, 0x064A /* ARABIC LETTER YEH */ },
-	{0xEB, 0x064B /* ARABIC FATHATAN */ },
-	{0xEC, 0x064C /* ARABIC DAMMATAN */ },
-	{0xED, 0x064D /* ARABIC KASRATAN */ },
-	{0xEE, 0x064E /* ARABIC FATHA */ },
-	{0xEF, 0x064F /* ARABIC DAMMA */ },
-	{0xF0, 0x0650 /* ARABIC KASRA */ },
-	{0xF1, 0x0651 /* ARABIC SHADDA */ },
-	{0xF2, 0x0652 /* ARABIC SUKUN */ },
-	{0, 0}
+const uint16_t highhalf_8859_6 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0xFFFF,
+	/* 0xA2 */ 0xFFFF,
+	/* 0xA3 */ 0xFFFF,
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0xFFFF,
+	/* 0xA6 */ 0xFFFF,
+	/* 0xA7 */ 0xFFFF,
+	/* 0xA8 */ 0xFFFF,
+	/* 0xA9 */ 0xFFFF,
+	/* 0xAA */ 0xFFFF,
+	/* 0xAB */ 0xFFFF,
+	/* 0xAC */ 0x060C, /* ARABIC COMMA */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0xFFFF,
+	/* 0xAF */ 0xFFFF,
+	/* 0xB0 */ 0xFFFF,
+	/* 0xB1 */ 0xFFFF,
+	/* 0xB2 */ 0xFFFF,
+	/* 0xB3 */ 0xFFFF,
+	/* 0xB4 */ 0xFFFF,
+	/* 0xB5 */ 0xFFFF,
+	/* 0xB6 */ 0xFFFF,
+	/* 0xB7 */ 0xFFFF,
+	/* 0xB8 */ 0xFFFF,
+	/* 0xB9 */ 0xFFFF,
+	/* 0xBA */ 0xFFFF,
+	/* 0xBB */ 0x061B, /* ARABIC SEMICOLON */
+	/* 0xBC */ 0xFFFF,
+	/* 0xBD */ 0xFFFF,
+	/* 0xBE */ 0xFFFF,
+	/* 0xBF */ 0x061F, /* ARABIC QUESTION MARK */
+	/* 0xC0 */ 0xFFFF,
+	/* 0xC1 */ 0x0621, /* ARABIC LETTER HAMZA */
+	/* 0xC2 */ 0x0622, /* ARABIC LETTER ALEF WITH MADDA ABOVE */
+	/* 0xC3 */ 0x0623, /* ARABIC LETTER ALEF WITH HAMZA ABOVE */
+	/* 0xC4 */ 0x0624, /* ARABIC LETTER WAW WITH HAMZA ABOVE */
+	/* 0xC5 */ 0x0625, /* ARABIC LETTER ALEF WITH HAMZA BELOW */
+	/* 0xC6 */ 0x0626, /* ARABIC LETTER YEH WITH HAMZA ABOVE */
+	/* 0xC7 */ 0x0627, /* ARABIC LETTER ALEF */
+	/* 0xC8 */ 0x0628, /* ARABIC LETTER BEH */
+	/* 0xC9 */ 0x0629, /* ARABIC LETTER TEH MARBUTA */
+	/* 0xCA */ 0x062A, /* ARABIC LETTER TEH */
+	/* 0xCB */ 0x062B, /* ARABIC LETTER THEH */
+	/* 0xCC */ 0x062C, /* ARABIC LETTER JEEM */
+	/* 0xCD */ 0x062D, /* ARABIC LETTER HAH */
+	/* 0xCE */ 0x062E, /* ARABIC LETTER KHAH */
+	/* 0xCF */ 0x062F, /* ARABIC LETTER DAL */
+	/* 0xD0 */ 0x0630, /* ARABIC LETTER THAL */
+	/* 0xD1 */ 0x0631, /* ARABIC LETTER REH */
+	/* 0xD2 */ 0x0632, /* ARABIC LETTER ZAIN */
+	/* 0xD3 */ 0x0633, /* ARABIC LETTER SEEN */
+	/* 0xD4 */ 0x0634, /* ARABIC LETTER SHEEN */
+	/* 0xD5 */ 0x0635, /* ARABIC LETTER SAD */
+	/* 0xD6 */ 0x0636, /* ARABIC LETTER DAD */
+	/* 0xD7 */ 0x0637, /* ARABIC LETTER TAH */
+	/* 0xD8 */ 0x0638, /* ARABIC LETTER ZAH */
+	/* 0xD9 */ 0x0639, /* ARABIC LETTER AIN */
+	/* 0xDA */ 0x063A, /* ARABIC LETTER GHAIN */
+	/* 0xDB */ 0xFFFF,
+	/* 0xDC */ 0xFFFF,
+	/* 0xDD */ 0xFFFF,
+	/* 0xDE */ 0xFFFF,
+	/* 0xDF */ 0xFFFF,
+	/* 0xE0 */ 0x0640, /* ARABIC TATWEEL */
+	/* 0xE1 */ 0x0641, /* ARABIC LETTER FEH */
+	/* 0xE2 */ 0x0642, /* ARABIC LETTER QAF */
+	/* 0xE3 */ 0x0643, /* ARABIC LETTER KAF */
+	/* 0xE4 */ 0x0644, /* ARABIC LETTER LAM */
+	/* 0xE5 */ 0x0645, /* ARABIC LETTER MEEM */
+	/* 0xE6 */ 0x0646, /* ARABIC LETTER NOON */
+	/* 0xE7 */ 0x0647, /* ARABIC LETTER HEH */
+	/* 0xE8 */ 0x0648, /* ARABIC LETTER WAW */
+	/* 0xE9 */ 0x0649, /* ARABIC LETTER ALEF MAKSURA */
+	/* 0xEA */ 0x064A, /* ARABIC LETTER YEH */
+	/* 0xEB */ 0x064B, /* ARABIC FATHATAN */
+	/* 0xEC */ 0x064C, /* ARABIC DAMMATAN */
+	/* 0xED */ 0x064D, /* ARABIC KASRATAN */
+	/* 0xEE */ 0x064E, /* ARABIC FATHA */
+	/* 0xEF */ 0x064F, /* ARABIC DAMMA */
+	/* 0xF0 */ 0x0650, /* ARABIC KASRA */
+	/* 0xF1 */ 0x0651, /* ARABIC SHADDA */
+	/* 0xF2 */ 0x0652, /* ARABIC SUKUN */
+	/* 0xF3 */ 0xFFFF,
+	/* 0xF4 */ 0xFFFF,
+	/* 0xF5 */ 0xFFFF,
+	/* 0xF6 */ 0xFFFF,
+	/* 0xF7 */ 0xFFFF,
+	/* 0xF8 */ 0xFFFF,
+	/* 0xF9 */ 0xFFFF,
+	/* 0xFA */ 0xFFFF,
+	/* 0xFB */ 0xFFFF,
+	/* 0xFC */ 0xFFFF,
+	/* 0xFD */ 0xFFFF,
+	/* 0xFE */ 0xFFFF,
+	/* 0xFF */ 0xFFFF,
 };
 
+#define table_8859_6 table_NULL
+
 unsigned char *const aliases_8859_6 [] = {
 	"ISO-8859-6",
 	"8859-6",
@@ -816,132 +938,139 @@ unsigned char *const aliases_8859_6 [] = {
 
 /*** 8859_7 ***/
 
-const struct table_entry table_8859_7 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0xA2, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAF, 0x2015 /* HORIZONTAL BAR */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x0384 /* GREEK TONOS */ },
-	{0xB5, 0x0385 /* GREEK DIALYTIKA TONOS */ },
-	{0xB6, 0x0386 /* GREEK CAPITAL LETTER ALPHA WITH TONOS */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x0388 /* GREEK CAPITAL LETTER EPSILON WITH TONOS */ },
-	{0xB9, 0x0389 /* GREEK CAPITAL LETTER ETA WITH TONOS */ },
-	{0xBA, 0x038A /* GREEK CAPITAL LETTER IOTA WITH TONOS */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x038C /* GREEK CAPITAL LETTER OMICRON WITH TONOS */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x038E /* GREEK CAPITAL LETTER UPSILON WITH TONOS */ },
-	{0xBF, 0x038F /* GREEK CAPITAL LETTER OMEGA WITH TONOS */ },
-	{0xC0, 0x0390 /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */ },
-	{0xC1, 0x0391 /* GREEK CAPITAL LETTER ALPHA */ },
-	{0xC2, 0x0392 /* GREEK CAPITAL LETTER BETA */ },
-	{0xC3, 0x0393 /* GREEK CAPITAL LETTER GAMMA */ },
-	{0xC4, 0x0394 /* GREEK CAPITAL LETTER DELTA */ },
-	{0xC5, 0x0395 /* GREEK CAPITAL LETTER EPSILON */ },
-	{0xC6, 0x0396 /* GREEK CAPITAL LETTER ZETA */ },
-	{0xC7, 0x0397 /* GREEK CAPITAL LETTER ETA */ },
-	{0xC8, 0x0398 /* GREEK CAPITAL LETTER THETA */ },
-	{0xC9, 0x0399 /* GREEK CAPITAL LETTER IOTA */ },
-	{0xCA, 0x039A /* GREEK CAPITAL LETTER KAPPA */ },
-	{0xCB, 0x039B /* GREEK CAPITAL LETTER LAMDA */ },
-	{0xCC, 0x039C /* GREEK CAPITAL LETTER MU */ },
-	{0xCD, 0x039D /* GREEK CAPITAL LETTER NU */ },
-	{0xCE, 0x039E /* GREEK CAPITAL LETTER XI */ },
-	{0xCF, 0x039F /* GREEK CAPITAL LETTER OMICRON */ },
-	{0xD0, 0x03A0 /* GREEK CAPITAL LETTER PI */ },
-	{0xD1, 0x03A1 /* GREEK CAPITAL LETTER RHO */ },
-	{0xD3, 0x03A3 /* GREEK CAPITAL LETTER SIGMA */ },
-	{0xD4, 0x03A4 /* GREEK CAPITAL LETTER TAU */ },
-	{0xD5, 0x03A5 /* GREEK CAPITAL LETTER UPSILON */ },
-	{0xD6, 0x03A6 /* GREEK CAPITAL LETTER PHI */ },
-	{0xD7, 0x03A7 /* GREEK CAPITAL LETTER CHI */ },
-	{0xD8, 0x03A8 /* GREEK CAPITAL LETTER PSI */ },
-	{0xD9, 0x03A9 /* GREEK CAPITAL LETTER OMEGA */ },
-	{0xDA, 0x03AA /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ },
-	{0xDB, 0x03AB /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ },
-	{0xDC, 0x03AC /* GREEK SMALL LETTER ALPHA WITH TONOS */ },
-	{0xDD, 0x03AD /* GREEK SMALL LETTER EPSILON WITH TONOS */ },
-	{0xDE, 0x03AE /* GREEK SMALL LETTER ETA WITH TONOS */ },
-	{0xDF, 0x03AF /* GREEK SMALL LETTER IOTA WITH TONOS */ },
-	{0xE0, 0x03B0 /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */ },
-	{0xE1, 0x03B1 /* GREEK SMALL LETTER ALPHA */ },
-	{0xE2, 0x03B2 /* GREEK SMALL LETTER BETA */ },
-	{0xE3, 0x03B3 /* GREEK SMALL LETTER GAMMA */ },
-	{0xE4, 0x03B4 /* GREEK SMALL LETTER DELTA */ },
-	{0xE5, 0x03B5 /* GREEK SMALL LETTER EPSILON */ },
-	{0xE6, 0x03B6 /* GREEK SMALL LETTER ZETA */ },
-	{0xE7, 0x03B7 /* GREEK SMALL LETTER ETA */ },
-	{0xE8, 0x03B8 /* GREEK SMALL LETTER THETA */ },
-	{0xE9, 0x03B9 /* GREEK SMALL LETTER IOTA */ },
-	{0xEA, 0x03BA /* GREEK SMALL LETTER KAPPA */ },
-	{0xEB, 0x03BB /* GREEK SMALL LETTER LAMDA */ },
-	{0xEC, 0x03BC /* GREEK SMALL LETTER MU */ },
-	{0xED, 0x03BD /* GREEK SMALL LETTER NU */ },
-	{0xEE, 0x03BE /* GREEK SMALL LETTER XI */ },
-	{0xEF, 0x03BF /* GREEK SMALL LETTER OMICRON */ },
-	{0xF0, 0x03C0 /* GREEK SMALL LETTER PI */ },
-	{0xF1, 0x03C1 /* GREEK SMALL LETTER RHO */ },
-	{0xF2, 0x03C2 /* GREEK SMALL LETTER FINAL SIGMA */ },
-	{0xF3, 0x03C3 /* GREEK SMALL LETTER SIGMA */ },
-	{0xF4, 0x03C4 /* GREEK SMALL LETTER TAU */ },
-	{0xF5, 0x03C5 /* GREEK SMALL LETTER UPSILON */ },
-	{0xF6, 0x03C6 /* GREEK SMALL LETTER PHI */ },
-	{0xF7, 0x03C7 /* GREEK SMALL LETTER CHI */ },
-	{0xF8, 0x03C8 /* GREEK SMALL LETTER PSI */ },
-	{0xF9, 0x03C9 /* GREEK SMALL LETTER OMEGA */ },
-	{0xFA, 0x03CA /* GREEK SMALL LETTER IOTA WITH DIALYTIKA */ },
-	{0xFB, 0x03CB /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ },
-	{0xFC, 0x03CC /* GREEK SMALL LETTER OMICRON WITH TONOS */ },
-	{0xFD, 0x03CD /* GREEK SMALL LETTER UPSILON WITH TONOS */ },
-	{0xFE, 0x03CE /* GREEK SMALL LETTER OMEGA WITH TONOS */ },
-	{0, 0}
+const uint16_t highhalf_8859_7 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0xA2 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0xFFFF,
+	/* 0xA5 */ 0xFFFF,
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0xFFFF,
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0xFFFF,
+	/* 0xAF */ 0x2015, /* HORIZONTAL BAR */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x0384, /* GREEK TONOS */
+	/* 0xB5 */ 0x0385, /* GREEK DIALYTIKA TONOS */
+	/* 0xB6 */ 0x0386, /* GREEK CAPITAL LETTER ALPHA WITH TONOS */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x0388, /* GREEK CAPITAL LETTER EPSILON WITH TONOS */
+	/* 0xB9 */ 0x0389, /* GREEK CAPITAL LETTER ETA WITH TONOS */
+	/* 0xBA */ 0x038A, /* GREEK CAPITAL LETTER IOTA WITH TONOS */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x038C, /* GREEK CAPITAL LETTER OMICRON WITH TONOS */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x038E, /* GREEK CAPITAL LETTER UPSILON WITH TONOS */
+	/* 0xBF */ 0x038F, /* GREEK CAPITAL LETTER OMEGA WITH TONOS */
+	/* 0xC0 */ 0x0390, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
+	/* 0xC1 */ 0x0391, /* GREEK CAPITAL LETTER ALPHA */
+	/* 0xC2 */ 0x0392, /* GREEK CAPITAL LETTER BETA */
+	/* 0xC3 */ 0x0393, /* GREEK CAPITAL LETTER GAMMA */
+	/* 0xC4 */ 0x0394, /* GREEK CAPITAL LETTER DELTA */
+	/* 0xC5 */ 0x0395, /* GREEK CAPITAL LETTER EPSILON */
+	/* 0xC6 */ 0x0396, /* GREEK CAPITAL LETTER ZETA */
+	/* 0xC7 */ 0x0397, /* GREEK CAPITAL LETTER ETA */
+	/* 0xC8 */ 0x0398, /* GREEK CAPITAL LETTER THETA */
+	/* 0xC9 */ 0x0399, /* GREEK CAPITAL LETTER IOTA */
+	/* 0xCA */ 0x039A, /* GREEK CAPITAL LETTER KAPPA */
+	/* 0xCB */ 0x039B, /* GREEK CAPITAL LETTER LAMDA */
+	/* 0xCC */ 0x039C, /* GREEK CAPITAL LETTER MU */
+	/* 0xCD */ 0x039D, /* GREEK CAPITAL LETTER NU */
+	/* 0xCE */ 0x039E, /* GREEK CAPITAL LETTER XI */
+	/* 0xCF */ 0x039F, /* GREEK CAPITAL LETTER OMICRON */
+	/* 0xD0 */ 0x03A0, /* GREEK CAPITAL LETTER PI */
+	/* 0xD1 */ 0x03A1, /* GREEK CAPITAL LETTER RHO */
+	/* 0xD2 */ 0xFFFF,
+	/* 0xD3 */ 0x03A3, /* GREEK CAPITAL LETTER SIGMA */
+	/* 0xD4 */ 0x03A4, /* GREEK CAPITAL LETTER TAU */
+	/* 0xD5 */ 0x03A5, /* GREEK CAPITAL LETTER UPSILON */
+	/* 0xD6 */ 0x03A6, /* GREEK CAPITAL LETTER PHI */
+	/* 0xD7 */ 0x03A7, /* GREEK CAPITAL LETTER CHI */
+	/* 0xD8 */ 0x03A8, /* GREEK CAPITAL LETTER PSI */
+	/* 0xD9 */ 0x03A9, /* GREEK CAPITAL LETTER OMEGA */
+	/* 0xDA */ 0x03AA, /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
+	/* 0xDB */ 0x03AB, /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
+	/* 0xDC */ 0x03AC, /* GREEK SMALL LETTER ALPHA WITH TONOS */
+	/* 0xDD */ 0x03AD, /* GREEK SMALL LETTER EPSILON WITH TONOS */
+	/* 0xDE */ 0x03AE, /* GREEK SMALL LETTER ETA WITH TONOS */
+	/* 0xDF */ 0x03AF, /* GREEK SMALL LETTER IOTA WITH TONOS */
+	/* 0xE0 */ 0x03B0, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
+	/* 0xE1 */ 0x03B1, /* GREEK SMALL LETTER ALPHA */
+	/* 0xE2 */ 0x03B2, /* GREEK SMALL LETTER BETA */
+	/* 0xE3 */ 0x03B3, /* GREEK SMALL LETTER GAMMA */
+	/* 0xE4 */ 0x03B4, /* GREEK SMALL LETTER DELTA */
+	/* 0xE5 */ 0x03B5, /* GREEK SMALL LETTER EPSILON */
+	/* 0xE6 */ 0x03B6, /* GREEK SMALL LETTER ZETA */
+	/* 0xE7 */ 0x03B7, /* GREEK SMALL LETTER ETA */
+	/* 0xE8 */ 0x03B8, /* GREEK SMALL LETTER THETA */
+	/* 0xE9 */ 0x03B9, /* GREEK SMALL LETTER IOTA */
+	/* 0xEA */ 0x03BA, /* GREEK SMALL LETTER KAPPA */
+	/* 0xEB */ 0x03BB, /* GREEK SMALL LETTER LAMDA */
+	/* 0xEC */ 0x03BC, /* GREEK SMALL LETTER MU */
+	/* 0xED */ 0x03BD, /* GREEK SMALL LETTER NU */
+	/* 0xEE */ 0x03BE, /* GREEK SMALL LETTER XI */
+	/* 0xEF */ 0x03BF, /* GREEK SMALL LETTER OMICRON */
+	/* 0xF0 */ 0x03C0, /* GREEK SMALL LETTER PI */
+	/* 0xF1 */ 0x03C1, /* GREEK SMALL LETTER RHO */
+	/* 0xF2 */ 0x03C2, /* GREEK SMALL LETTER FINAL SIGMA */
+	/* 0xF3 */ 0x03C3, /* GREEK SMALL LETTER SIGMA */
+	/* 0xF4 */ 0x03C4, /* GREEK SMALL LETTER TAU */
+	/* 0xF5 */ 0x03C5, /* GREEK SMALL LETTER UPSILON */
+	/* 0xF6 */ 0x03C6, /* GREEK SMALL LETTER PHI */
+	/* 0xF7 */ 0x03C7, /* GREEK SMALL LETTER CHI */
+	/* 0xF8 */ 0x03C8, /* GREEK SMALL LETTER PSI */
+	/* 0xF9 */ 0x03C9, /* GREEK SMALL LETTER OMEGA */
+	/* 0xFA */ 0x03CA, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA */
+	/* 0xFB */ 0x03CB, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
+	/* 0xFC */ 0x03CC, /* GREEK SMALL LETTER OMICRON WITH TONOS */
+	/* 0xFD */ 0x03CD, /* GREEK SMALL LETTER UPSILON WITH TONOS */
+	/* 0xFE */ 0x03CE, /* GREEK SMALL LETTER OMEGA WITH TONOS */
+	/* 0xFF */ 0xFFFF,
 };
 
+#define table_8859_7 table_NULL
+
 unsigned char *const aliases_8859_7 [] = {
 	"ISO-8859-7",
 	"iso8859-7",
@@ -961,102 +1090,139 @@ unsigned char *const aliases_8859_7 [] = {
 
 /*** 8859_8 ***/
 
-const struct table_entry table_8859_8 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x00A5 /* YEN SIGN */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00AF /* MACRON */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x00F7 /* DIVISION SIGN */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x00BE /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xDF, 0x2017 /* DOUBLE LOW LINE */ },
-	{0xE0, 0x05D0 /* HEBREW LETTER ALEF */ },
-	{0xE1, 0x05D1 /* HEBREW LETTER BET */ },
-	{0xE2, 0x05D2 /* HEBREW LETTER GIMEL */ },
-	{0xE3, 0x05D3 /* HEBREW LETTER DALET */ },
-	{0xE4, 0x05D4 /* HEBREW LETTER HE */ },
-	{0xE5, 0x05D5 /* HEBREW LETTER VAV */ },
-	{0xE6, 0x05D6 /* HEBREW LETTER ZAYIN */ },
-	{0xE7, 0x05D7 /* HEBREW LETTER HET */ },
-	{0xE8, 0x05D8 /* HEBREW LETTER TET */ },
-	{0xE9, 0x05D9 /* HEBREW LETTER YOD */ },
-	{0xEA, 0x05DA /* HEBREW LETTER FINAL KAF */ },
-	{0xEB, 0x05DB /* HEBREW LETTER KAF */ },
-	{0xEC, 0x05DC /* HEBREW LETTER LAMED */ },
-	{0xED, 0x05DD /* HEBREW LETTER FINAL MEM */ },
-	{0xEE, 0x05DE /* HEBREW LETTER MEM */ },
-	{0xEF, 0x05DF /* HEBREW LETTER FINAL NUN */ },
-	{0xF0, 0x05E0 /* HEBREW LETTER NUN */ },
-	{0xF1, 0x05E1 /* HEBREW LETTER SAMEKH */ },
-	{0xF2, 0x05E2 /* HEBREW LETTER AYIN */ },
-	{0xF3, 0x05E3 /* HEBREW LETTER FINAL PE */ },
-	{0xF4, 0x05E4 /* HEBREW LETTER PE */ },
-	{0xF5, 0x05E5 /* HEBREW LETTER FINAL TSADI */ },
-	{0xF6, 0x05E6 /* HEBREW LETTER TSADI */ },
-	{0xF7, 0x05E7 /* HEBREW LETTER QOF */ },
-	{0xF8, 0x05E8 /* HEBREW LETTER RESH */ },
-	{0xF9, 0x05E9 /* HEBREW LETTER SHIN */ },
-	{0xFA, 0x05EA /* HEBREW LETTER TAV */ },
-	{0xFD, 0x200E /* LEFT-TO-RIGHT MARK */ },
-	{0xFE, 0x200F /* RIGHT-TO-LEFT MARK */ },
-	{0, 0}
+const uint16_t highhalf_8859_8 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0xFFFF,
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x00A5, /* YEN SIGN */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00AF, /* MACRON */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x00F7, /* DIVISION SIGN */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xBF */ 0xFFFF,
+	/* 0xC0 */ 0xFFFF,
+	/* 0xC1 */ 0xFFFF,
+	/* 0xC2 */ 0xFFFF,
+	/* 0xC3 */ 0xFFFF,
+	/* 0xC4 */ 0xFFFF,
+	/* 0xC5 */ 0xFFFF,
+	/* 0xC6 */ 0xFFFF,
+	/* 0xC7 */ 0xFFFF,
+	/* 0xC8 */ 0xFFFF,
+	/* 0xC9 */ 0xFFFF,
+	/* 0xCA */ 0xFFFF,
+	/* 0xCB */ 0xFFFF,
+	/* 0xCC */ 0xFFFF,
+	/* 0xCD */ 0xFFFF,
+	/* 0xCE */ 0xFFFF,
+	/* 0xCF */ 0xFFFF,
+	/* 0xD0 */ 0xFFFF,
+	/* 0xD1 */ 0xFFFF,
+	/* 0xD2 */ 0xFFFF,
+	/* 0xD3 */ 0xFFFF,
+	/* 0xD4 */ 0xFFFF,
+	/* 0xD5 */ 0xFFFF,
+	/* 0xD6 */ 0xFFFF,
+	/* 0xD7 */ 0xFFFF,
+	/* 0xD8 */ 0xFFFF,
+	/* 0xD9 */ 0xFFFF,
+	/* 0xDA */ 0xFFFF,
+	/* 0xDB */ 0xFFFF,
+	/* 0xDC */ 0xFFFF,
+	/* 0xDD */ 0xFFFF,
+	/* 0xDE */ 0xFFFF,
+	/* 0xDF */ 0x2017, /* DOUBLE LOW LINE */
+	/* 0xE0 */ 0x05D0, /* HEBREW LETTER ALEF */
+	/* 0xE1 */ 0x05D1, /* HEBREW LETTER BET */
+	/* 0xE2 */ 0x05D2, /* HEBREW LETTER GIMEL */
+	/* 0xE3 */ 0x05D3, /* HEBREW LETTER DALET */
+	/* 0xE4 */ 0x05D4, /* HEBREW LETTER HE */
+	/* 0xE5 */ 0x05D5, /* HEBREW LETTER VAV */
+	/* 0xE6 */ 0x05D6, /* HEBREW LETTER ZAYIN */
+	/* 0xE7 */ 0x05D7, /* HEBREW LETTER HET */
+	/* 0xE8 */ 0x05D8, /* HEBREW LETTER TET */
+	/* 0xE9 */ 0x05D9, /* HEBREW LETTER YOD */
+	/* 0xEA */ 0x05DA, /* HEBREW LETTER FINAL KAF */
+	/* 0xEB */ 0x05DB, /* HEBREW LETTER KAF */
+	/* 0xEC */ 0x05DC, /* HEBREW LETTER LAMED */
+	/* 0xED */ 0x05DD, /* HEBREW LETTER FINAL MEM */
+	/* 0xEE */ 0x05DE, /* HEBREW LETTER MEM */
+	/* 0xEF */ 0x05DF, /* HEBREW LETTER FINAL NUN */
+	/* 0xF0 */ 0x05E0, /* HEBREW LETTER NUN */
+	/* 0xF1 */ 0x05E1, /* HEBREW LETTER SAMEKH */
+	/* 0xF2 */ 0x05E2, /* HEBREW LETTER AYIN */
+	/* 0xF3 */ 0x05E3, /* HEBREW LETTER FINAL PE */
+	/* 0xF4 */ 0x05E4, /* HEBREW LETTER PE */
+	/* 0xF5 */ 0x05E5, /* HEBREW LETTER FINAL TSADI */
+	/* 0xF6 */ 0x05E6, /* HEBREW LETTER TSADI */
+	/* 0xF7 */ 0x05E7, /* HEBREW LETTER QOF */
+	/* 0xF8 */ 0x05E8, /* HEBREW LETTER RESH */
+	/* 0xF9 */ 0x05E9, /* HEBREW LETTER SHIN */
+	/* 0xFA */ 0x05EA, /* HEBREW LETTER TAV */
+	/* 0xFB */ 0xFFFF,
+	/* 0xFC */ 0xFFFF,
+	/* 0xFD */ 0x200E, /* LEFT-TO-RIGHT MARK */
+	/* 0xFE */ 0x200F, /* RIGHT-TO-LEFT MARK */
+	/* 0xFF */ 0xFFFF,
 };
 
+#define table_8859_8 table_NULL
+
 unsigned char *const aliases_8859_8 [] = {
 	"ISO-8859-8",
 	"8859-8",
@@ -1072,138 +1238,139 @@ unsigned char *const aliases_8859_8 [] = {
 
 /*** 8859_9 ***/
 
-const struct table_entry table_8859_9 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x00A1 /* INVERTED EXCLAMATION MARK */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x00A5 /* YEN SIGN */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x00AA /* FEMININE ORDINAL INDICATOR */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00AF /* MACRON */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x00BA /* MASCULINE ORDINAL INDICATOR */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x00BE /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xBF, 0x00BF /* INVERTED QUESTION MARK */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD0, 0x011E /* LATIN CAPITAL LETTER G WITH BREVE */ },
-	{0xD1, 0x00D1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x0130 /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ },
-	{0xDE, 0x015E /* LATIN CAPITAL LETTER S WITH CEDILLA */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x011F /* LATIN SMALL LETTER G WITH BREVE */ },
-	{0xF1, 0x00F1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x0131 /* LATIN SMALL LETTER DOTLESS I */ },
-	{0xFE, 0x015F /* LATIN SMALL LETTER S WITH CEDILLA */ },
-	{0xFF, 0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0, 0}
+const uint16_t highhalf_8859_9 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x00A5, /* YEN SIGN */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x00AA, /* FEMININE ORDINAL INDICATOR */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00AF, /* MACRON */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x00BA, /* MASCULINE ORDINAL INDICATOR */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xBF */ 0x00BF, /* INVERTED QUESTION MARK */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0x011E, /* LATIN CAPITAL LETTER G WITH BREVE */
+	/* 0xD1 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x0130, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */
+	/* 0xDE */ 0x015E, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x011F, /* LATIN SMALL LETTER G WITH BREVE */
+	/* 0xF1 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x0131, /* LATIN SMALL LETTER DOTLESS I */
+	/* 0xFE */ 0x015F, /* LATIN SMALL LETTER S WITH CEDILLA */
+	/* 0xFF */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 };
 
+#define table_8859_9 table_NULL
+
 unsigned char *const aliases_8859_9 [] = {
 	"ISO-8859-9",
 	"iso8859-9",
@@ -1220,138 +1387,139 @@ unsigned char *const aliases_8859_9 [] = {
 
 /*** 8859_10 ***/
 
-const struct table_entry table_8859_10 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xA2, 0x0112 /* LATIN CAPITAL LETTER E WITH MACRON */ },
-	{0xA3, 0x0122 /* LATIN CAPITAL LETTER G WITH CEDILLA */ },
-	{0xA4, 0x012A /* LATIN CAPITAL LETTER I WITH MACRON */ },
-	{0xA5, 0x0128 /* LATIN CAPITAL LETTER I WITH TILDE */ },
-	{0xA6, 0x0136 /* LATIN CAPITAL LETTER K WITH CEDILLA */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x013B /* LATIN CAPITAL LETTER L WITH CEDILLA */ },
-	{0xA9, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xAA, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xAB, 0x0166 /* LATIN CAPITAL LETTER T WITH STROKE */ },
-	{0xAC, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x016A /* LATIN CAPITAL LETTER U WITH MACRON */ },
-	{0xAF, 0x014A /* LATIN CAPITAL LETTER ENG */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xB2, 0x0113 /* LATIN SMALL LETTER E WITH MACRON */ },
-	{0xB3, 0x0123 /* LATIN SMALL LETTER G WITH CEDILLA */ },
-	{0xB4, 0x012B /* LATIN SMALL LETTER I WITH MACRON */ },
-	{0xB5, 0x0129 /* LATIN SMALL LETTER I WITH TILDE */ },
-	{0xB6, 0x0137 /* LATIN SMALL LETTER K WITH CEDILLA */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x013C /* LATIN SMALL LETTER L WITH CEDILLA */ },
-	{0xB9, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xBA, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xBB, 0x0167 /* LATIN SMALL LETTER T WITH STROKE */ },
-	{0xBC, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xBD, 0x2015 /* HORIZONTAL BAR */ },
-	{0xBE, 0x016B /* LATIN SMALL LETTER U WITH MACRON */ },
-	{0xBF, 0x014B /* LATIN SMALL LETTER ENG */ },
-	{0xC0, 0x0100 /* LATIN CAPITAL LETTER A WITH MACRON */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xC7, 0x012E /* LATIN CAPITAL LETTER I WITH OGONEK */ },
-	{0xC8, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x0116 /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD0, 0x00D0 /* LATIN CAPITAL LETTER ETH (Icelandic) */ },
-	{0xD1, 0x0145 /* LATIN CAPITAL LETTER N WITH CEDILLA */ },
-	{0xD2, 0x014C /* LATIN CAPITAL LETTER O WITH MACRON */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x0168 /* LATIN CAPITAL LETTER U WITH TILDE */ },
-	{0xD8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xD9, 0x0172 /* LATIN CAPITAL LETTER U WITH OGONEK */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x00DE /* LATIN CAPITAL LETTER THORN (Icelandic) */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S (German) */ },
-	{0xE0, 0x0101 /* LATIN SMALL LETTER A WITH MACRON */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xE7, 0x012F /* LATIN SMALL LETTER I WITH OGONEK */ },
-	{0xE8, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x0117 /* LATIN SMALL LETTER E WITH DOT ABOVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x00F0 /* LATIN SMALL LETTER ETH (Icelandic) */ },
-	{0xF1, 0x0146 /* LATIN SMALL LETTER N WITH CEDILLA */ },
-	{0xF2, 0x014D /* LATIN SMALL LETTER O WITH MACRON */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x0169 /* LATIN SMALL LETTER U WITH TILDE */ },
-	{0xF8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xF9, 0x0173 /* LATIN SMALL LETTER U WITH OGONEK */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x00FE /* LATIN SMALL LETTER THORN (Icelandic) */ },
-	{0xFF, 0x0138 /* LATIN SMALL LETTER KRA */ },
-	{0, 0}
+const uint16_t highhalf_8859_10 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xA2 */ 0x0112, /* LATIN CAPITAL LETTER E WITH MACRON */
+	/* 0xA3 */ 0x0122, /* LATIN CAPITAL LETTER G WITH CEDILLA */
+	/* 0xA4 */ 0x012A, /* LATIN CAPITAL LETTER I WITH MACRON */
+	/* 0xA5 */ 0x0128, /* LATIN CAPITAL LETTER I WITH TILDE */
+	/* 0xA6 */ 0x0136, /* LATIN CAPITAL LETTER K WITH CEDILLA */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x013B, /* LATIN CAPITAL LETTER L WITH CEDILLA */
+	/* 0xA9 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xAA */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xAB */ 0x0166, /* LATIN CAPITAL LETTER T WITH STROKE */
+	/* 0xAC */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x016A, /* LATIN CAPITAL LETTER U WITH MACRON */
+	/* 0xAF */ 0x014A, /* LATIN CAPITAL LETTER ENG */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xB2 */ 0x0113, /* LATIN SMALL LETTER E WITH MACRON */
+	/* 0xB3 */ 0x0123, /* LATIN SMALL LETTER G WITH CEDILLA */
+	/* 0xB4 */ 0x012B, /* LATIN SMALL LETTER I WITH MACRON */
+	/* 0xB5 */ 0x0129, /* LATIN SMALL LETTER I WITH TILDE */
+	/* 0xB6 */ 0x0137, /* LATIN SMALL LETTER K WITH CEDILLA */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x013C, /* LATIN SMALL LETTER L WITH CEDILLA */
+	/* 0xB9 */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xBA */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xBB */ 0x0167, /* LATIN SMALL LETTER T WITH STROKE */
+	/* 0xBC */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xBD */ 0x2015, /* HORIZONTAL BAR */
+	/* 0xBE */ 0x016B, /* LATIN SMALL LETTER U WITH MACRON */
+	/* 0xBF */ 0x014B, /* LATIN SMALL LETTER ENG */
+	/* 0xC0 */ 0x0100, /* LATIN CAPITAL LETTER A WITH MACRON */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xC7 */ 0x012E, /* LATIN CAPITAL LETTER I WITH OGONEK */
+	/* 0xC8 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x0116, /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0x00D0, /* LATIN CAPITAL LETTER ETH (Icelandic) */
+	/* 0xD1 */ 0x0145, /* LATIN CAPITAL LETTER N WITH CEDILLA */
+	/* 0xD2 */ 0x014C, /* LATIN CAPITAL LETTER O WITH MACRON */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x0168, /* LATIN CAPITAL LETTER U WITH TILDE */
+	/* 0xD8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xD9 */ 0x0172, /* LATIN CAPITAL LETTER U WITH OGONEK */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x00DE, /* LATIN CAPITAL LETTER THORN (Icelandic) */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S (German) */
+	/* 0xE0 */ 0x0101, /* LATIN SMALL LETTER A WITH MACRON */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xE7 */ 0x012F, /* LATIN SMALL LETTER I WITH OGONEK */
+	/* 0xE8 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x0117, /* LATIN SMALL LETTER E WITH DOT ABOVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x00F0, /* LATIN SMALL LETTER ETH (Icelandic) */
+	/* 0xF1 */ 0x0146, /* LATIN SMALL LETTER N WITH CEDILLA */
+	/* 0xF2 */ 0x014D, /* LATIN SMALL LETTER O WITH MACRON */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x0169, /* LATIN SMALL LETTER U WITH TILDE */
+	/* 0xF8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xF9 */ 0x0173, /* LATIN SMALL LETTER U WITH OGONEK */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x00FE, /* LATIN SMALL LETTER THORN (Icelandic) */
+	/* 0xFF */ 0x0138, /* LATIN SMALL LETTER KRA */
 };
 
+#define table_8859_10 table_NULL
+
 unsigned char *const aliases_8859_10 [] = {
 	"ISO-8859-10",
 	"8859-10",
@@ -1367,138 +1535,139 @@ unsigned char *const aliases_8859_10 [] = {
 
 /*** 8859_13 ***/
 
-const struct table_entry table_8859_13 [] = {
-	{0x80, 0x0080 /* PADDING CHARACTER (PAD) */ },
-	{0x81, 0x0081 /* HIGH OCTET PRESET (HOP) */ },
-	{0x82, 0x0082 /* BREAK PERMITTED HERE (BPH) */ },
-	{0x83, 0x0083 /* NO BREAK HERE (NBH) */ },
-	{0x84, 0x0084 /* INDEX (IND) */ },
-	{0x85, 0x0085 /* NEXT LINE (NEL) */ },
-	{0x86, 0x0086 /* START OF SELECTED AREA (SSA) */ },
-	{0x87, 0x0087 /* END OF SELECTED AREA (ESA) */ },
-	{0x88, 0x0088 /* CHARACTER TABULATION SET (HTS) */ },
-	{0x89, 0x0089 /* CHARACTER TABULATION WITH JUSTIFICATION (HTJ) */ },
-	{0x8A, 0x008A /* LINE TABULATION SET (VTS) */ },
-	{0x8B, 0x008B /* PARTIAL LINE FORWARD (PLD) */ },
-	{0x8C, 0x008C /* PARTIAL LINE BACKWARD (PLU) */ },
-	{0x8D, 0x008D /* REVERSE LINE FEED (RI) */ },
-	{0x8E, 0x008E /* SINGLE-SHIFT TWO (SS2) */ },
-	{0x8F, 0x008F /* SINGLE-SHIFT THREE (SS3) */ },
-	{0x90, 0x0090 /* DEVICE CONTROL STRING (DCS) */ },
-	{0x91, 0x0091 /* PRIVATE USE ONE (PU1) */ },
-	{0x92, 0x0092 /* PRIVATE USE TWO (PU2) */ },
-	{0x93, 0x0093 /* SET TRANSMIT STATE (STS) */ },
-	{0x94, 0x0094 /* CANCEL CHARACTER (CCH) */ },
-	{0x95, 0x0095 /* MESSAGE WAITING (MW) */ },
-	{0x96, 0x0096 /* START OF GUARDED AREA (SPA) */ },
-	{0x97, 0x0097 /* END OF GUARDED AREA (EPA) */ },
-	{0x98, 0x0098 /* START OF STRING (SOS) */ },
-	{0x99, 0x0099 /* SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI) */ },
-	{0x9A, 0x009A /* SINGLE CHARACTER INTRODUCER (SCI) */ },
-	{0x9B, 0x009B /* CONTROL SEQUENCE INTRODUCER (CSI) */ },
-	{0x9C, 0x009C /* STRING TERMINATOR (ST) */ },
-	{0x9D, 0x009D /* OPERATING SYSTEM COMMAND (OSC) */ },
-	{0x9E, 0x009E /* PRIVACY MESSAGE (PM) */ },
-	{0x9F, 0x009F /* APPLICATION PROGRAM COMMAND (APC) */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x0156 /* LATIN CAPITAL LETTER R WITH CEDILLA */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x0157 /* LATIN SMALL LETTER R WITH CEDILLA */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x00BE /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xBF, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xC0, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xC1, 0x012E /* LATIN CAPITAL LETTER I WITH OGONEK */ },
-	{0xC2, 0x0100 /* LATIN CAPITAL LETTER A WITH MACRON */ },
-	{0xC3, 0x0106 /* LATIN CAPITAL LETTER C WITH ACUTE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xC7, 0x0112 /* LATIN CAPITAL LETTER E WITH MACRON */ },
-	{0xC8, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x0179 /* LATIN CAPITAL LETTER Z WITH ACUTE */ },
-	{0xCB, 0x0116 /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ },
-	{0xCC, 0x0122 /* LATIN CAPITAL LETTER G WITH CEDILLA */ },
-	{0xCD, 0x0136 /* LATIN CAPITAL LETTER K WITH CEDILLA */ },
-	{0xCE, 0x012A /* LATIN CAPITAL LETTER I WITH MACRON */ },
-	{0xCF, 0x013B /* LATIN CAPITAL LETTER L WITH CEDILLA */ },
-	{0xD0, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xD1, 0x0143 /* LATIN CAPITAL LETTER N WITH ACUTE */ },
-	{0xD2, 0x0145 /* LATIN CAPITAL LETTER N WITH CEDILLA */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x014C /* LATIN CAPITAL LETTER O WITH MACRON */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x0172 /* LATIN CAPITAL LETTER U WITH OGONEK */ },
-	{0xD9, 0x0141 /* LATIN CAPITAL LETTER L WITH STROKE */ },
-	{0xDA, 0x015A /* LATIN CAPITAL LETTER S WITH ACUTE */ },
-	{0xDB, 0x016A /* LATIN CAPITAL LETTER U WITH MACRON */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x017B /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xDE, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xE1, 0x012F /* LATIN SMALL LETTER I WITH OGONEK */ },
-	{0xE2, 0x0101 /* LATIN SMALL LETTER A WITH MACRON */ },
-	{0xE3, 0x0107 /* LATIN SMALL LETTER C WITH ACUTE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xE7, 0x0113 /* LATIN SMALL LETTER E WITH MACRON */ },
-	{0xE8, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x017A /* LATIN SMALL LETTER Z WITH ACUTE */ },
-	{0xEB, 0x0117 /* LATIN SMALL LETTER E WITH DOT ABOVE */ },
-	{0xEC, 0x0123 /* LATIN SMALL LETTER G WITH CEDILLA */ },
-	{0xED, 0x0137 /* LATIN SMALL LETTER K WITH CEDILLA */ },
-	{0xEE, 0x012B /* LATIN SMALL LETTER I WITH MACRON */ },
-	{0xEF, 0x013C /* LATIN SMALL LETTER L WITH CEDILLA */ },
-	{0xF0, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xF1, 0x0144 /* LATIN SMALL LETTER N WITH ACUTE */ },
-	{0xF2, 0x0146 /* LATIN SMALL LETTER N WITH CEDILLA */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x014D /* LATIN SMALL LETTER O WITH MACRON */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x0173 /* LATIN SMALL LETTER U WITH OGONEK */ },
-	{0xF9, 0x0142 /* LATIN SMALL LETTER L WITH STROKE */ },
-	{0xFA, 0x015B /* LATIN SMALL LETTER S WITH ACUTE */ },
-	{0xFB, 0x016B /* LATIN SMALL LETTER U WITH MACRON */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x017C /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xFE, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xFF, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0, 0}
+const uint16_t highhalf_8859_13 [] = {
+	/* 0x80 */ 0x0080, /* PADDING CHARACTER (PAD) */
+	/* 0x81 */ 0x0081, /* HIGH OCTET PRESET (HOP) */
+	/* 0x82 */ 0x0082, /* BREAK PERMITTED HERE (BPH) */
+	/* 0x83 */ 0x0083, /* NO BREAK HERE (NBH) */
+	/* 0x84 */ 0x0084, /* INDEX (IND) */
+	/* 0x85 */ 0x0085, /* NEXT LINE (NEL) */
+	/* 0x86 */ 0x0086, /* START OF SELECTED AREA (SSA) */
+	/* 0x87 */ 0x0087, /* END OF SELECTED AREA (ESA) */
+	/* 0x88 */ 0x0088, /* CHARACTER TABULATION SET (HTS) */
+	/* 0x89 */ 0x0089, /* CHARACTER TABULATION WITH JUSTIFICATION (HTJ) */
+	/* 0x8A */ 0x008A, /* LINE TABULATION SET (VTS) */
+	/* 0x8B */ 0x008B, /* PARTIAL LINE FORWARD (PLD) */
+	/* 0x8C */ 0x008C, /* PARTIAL LINE BACKWARD (PLU) */
+	/* 0x8D */ 0x008D, /* REVERSE LINE FEED (RI) */
+	/* 0x8E */ 0x008E, /* SINGLE-SHIFT TWO (SS2) */
+	/* 0x8F */ 0x008F, /* SINGLE-SHIFT THREE (SS3) */
+	/* 0x90 */ 0x0090, /* DEVICE CONTROL STRING (DCS) */
+	/* 0x91 */ 0x0091, /* PRIVATE USE ONE (PU1) */
+	/* 0x92 */ 0x0092, /* PRIVATE USE TWO (PU2) */
+	/* 0x93 */ 0x0093, /* SET TRANSMIT STATE (STS) */
+	/* 0x94 */ 0x0094, /* CANCEL CHARACTER (CCH) */
+	/* 0x95 */ 0x0095, /* MESSAGE WAITING (MW) */
+	/* 0x96 */ 0x0096, /* START OF GUARDED AREA (SPA) */
+	/* 0x97 */ 0x0097, /* END OF GUARDED AREA (EPA) */
+	/* 0x98 */ 0x0098, /* START OF STRING (SOS) */
+	/* 0x99 */ 0x0099, /* SINGLE GRAPHIC CHARACTER INTRODUCER (SGCI) */
+	/* 0x9A */ 0x009A, /* SINGLE CHARACTER INTRODUCER (SCI) */
+	/* 0x9B */ 0x009B, /* CONTROL SEQUENCE INTRODUCER (CSI) */
+	/* 0x9C */ 0x009C, /* STRING TERMINATOR (ST) */
+	/* 0x9D */ 0x009D, /* OPERATING SYSTEM COMMAND (OSC) */
+	/* 0x9E */ 0x009E, /* PRIVACY MESSAGE (PM) */
+	/* 0x9F */ 0x009F, /* APPLICATION PROGRAM COMMAND (APC) */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x0156, /* LATIN CAPITAL LETTER R WITH CEDILLA */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x0157, /* LATIN SMALL LETTER R WITH CEDILLA */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xBF */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xC0 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xC1 */ 0x012E, /* LATIN CAPITAL LETTER I WITH OGONEK */
+	/* 0xC2 */ 0x0100, /* LATIN CAPITAL LETTER A WITH MACRON */
+	/* 0xC3 */ 0x0106, /* LATIN CAPITAL LETTER C WITH ACUTE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xC7 */ 0x0112, /* LATIN CAPITAL LETTER E WITH MACRON */
+	/* 0xC8 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+	/* 0xCB */ 0x0116, /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
+	/* 0xCC */ 0x0122, /* LATIN CAPITAL LETTER G WITH CEDILLA */
+	/* 0xCD */ 0x0136, /* LATIN CAPITAL LETTER K WITH CEDILLA */
+	/* 0xCE */ 0x012A, /* LATIN CAPITAL LETTER I WITH MACRON */
+	/* 0xCF */ 0x013B, /* LATIN CAPITAL LETTER L WITH CEDILLA */
+	/* 0xD0 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xD1 */ 0x0143, /* LATIN CAPITAL LETTER N WITH ACUTE */
+	/* 0xD2 */ 0x0145, /* LATIN CAPITAL LETTER N WITH CEDILLA */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x014C, /* LATIN CAPITAL LETTER O WITH MACRON */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x0172, /* LATIN CAPITAL LETTER U WITH OGONEK */
+	/* 0xD9 */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
+	/* 0xDA */ 0x015A, /* LATIN CAPITAL LETTER S WITH ACUTE */
+	/* 0xDB */ 0x016A, /* LATIN CAPITAL LETTER U WITH MACRON */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xDE */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xE1 */ 0x012F, /* LATIN SMALL LETTER I WITH OGONEK */
+	/* 0xE2 */ 0x0101, /* LATIN SMALL LETTER A WITH MACRON */
+	/* 0xE3 */ 0x0107, /* LATIN SMALL LETTER C WITH ACUTE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xE7 */ 0x0113, /* LATIN SMALL LETTER E WITH MACRON */
+	/* 0xE8 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
+	/* 0xEB */ 0x0117, /* LATIN SMALL LETTER E WITH DOT ABOVE */
+	/* 0xEC */ 0x0123, /* LATIN SMALL LETTER G WITH CEDILLA */
+	/* 0xED */ 0x0137, /* LATIN SMALL LETTER K WITH CEDILLA */
+	/* 0xEE */ 0x012B, /* LATIN SMALL LETTER I WITH MACRON */
+	/* 0xEF */ 0x013C, /* LATIN SMALL LETTER L WITH CEDILLA */
+	/* 0xF0 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xF1 */ 0x0144, /* LATIN SMALL LETTER N WITH ACUTE */
+	/* 0xF2 */ 0x0146, /* LATIN SMALL LETTER N WITH CEDILLA */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x014D, /* LATIN SMALL LETTER O WITH MACRON */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x0173, /* LATIN SMALL LETTER U WITH OGONEK */
+	/* 0xF9 */ 0x0142, /* LATIN SMALL LETTER L WITH STROKE */
+	/* 0xFA */ 0x015B, /* LATIN SMALL LETTER S WITH ACUTE */
+	/* 0xFB */ 0x016B, /* LATIN SMALL LETTER U WITH MACRON */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xFE */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xFF */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
 };
 
+#define table_8859_13 table_NULL
+
 unsigned char *const aliases_8859_13 [] = {
 	"ISO-8859-13",
 	"iso8859-13",
@@ -1514,138 +1683,139 @@ unsigned char *const aliases_8859_13 [] = {
 
 /*** 8859_14 ***/
 
-const struct table_entry table_8859_14 [] = {
-	{0x80, 0x0080 /* <control> */ },
-	{0x81, 0x0081 /* <control> */ },
-	{0x82, 0x0082 /* <control> */ },
-	{0x83, 0x0083 /* <control> */ },
-	{0x84, 0x0084 /* <control> */ },
-	{0x85, 0x0085 /* <control> */ },
-	{0x86, 0x0086 /* <control> */ },
-	{0x87, 0x0087 /* <control> */ },
-	{0x88, 0x0088 /* <control> */ },
-	{0x89, 0x0089 /* <control> */ },
-	{0x8A, 0x008A /* <control> */ },
-	{0x8B, 0x008B /* <control> */ },
-	{0x8C, 0x008C /* <control> */ },
-	{0x8D, 0x008D /* <control> */ },
-	{0x8E, 0x008E /* <control> */ },
-	{0x8F, 0x008F /* <control> */ },
-	{0x90, 0x0090 /* <control> */ },
-	{0x91, 0x0091 /* <control> */ },
-	{0x92, 0x0092 /* <control> */ },
-	{0x93, 0x0093 /* <control> */ },
-	{0x94, 0x0094 /* <control> */ },
-	{0x95, 0x0095 /* <control> */ },
-	{0x96, 0x0096 /* <control> */ },
-	{0x97, 0x0097 /* <control> */ },
-	{0x98, 0x0098 /* <control> */ },
-	{0x99, 0x0099 /* <control> */ },
-	{0x9A, 0x009A /* <control> */ },
-	{0x9B, 0x009B /* <control> */ },
-	{0x9C, 0x009C /* <control> */ },
-	{0x9D, 0x009D /* <control> */ },
-	{0x9E, 0x009E /* <control> */ },
-	{0x9F, 0x009F /* <control> */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x1E02 /* LATIN CAPITAL LETTER B WITH DOT ABOVE */ },
-	{0xA2, 0x1E03 /* LATIN SMALL LETTER B WITH DOT ABOVE */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x010A /* LATIN CAPITAL LETTER C WITH DOT ABOVE */ },
-	{0xA5, 0x010B /* LATIN SMALL LETTER C WITH DOT ABOVE */ },
-	{0xA6, 0x1E0A /* LATIN CAPITAL LETTER D WITH DOT ABOVE */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x1E80 /* LATIN CAPITAL LETTER W WITH GRAVE */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x1E82 /* LATIN CAPITAL LETTER W WITH ACUTE */ },
-	{0xAB, 0x1E0B /* LATIN SMALL LETTER D WITH DOT ABOVE */ },
-	{0xAC, 0x1EF2 /* LATIN CAPITAL LETTER Y WITH GRAVE */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x0178 /* LATIN CAPITAL LETTER Y WITH DIAERESIS */ },
-	{0xB0, 0x1E1E /* LATIN CAPITAL LETTER F WITH DOT ABOVE */ },
-	{0xB1, 0x1E1F /* LATIN SMALL LETTER F WITH DOT ABOVE */ },
-	{0xB2, 0x0120 /* LATIN CAPITAL LETTER G WITH DOT ABOVE */ },
-	{0xB3, 0x0121 /* LATIN SMALL LETTER G WITH DOT ABOVE */ },
-	{0xB4, 0x1E40 /* LATIN CAPITAL LETTER M WITH DOT ABOVE */ },
-	{0xB5, 0x1E41 /* LATIN SMALL LETTER M WITH DOT ABOVE */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x1E56 /* LATIN CAPITAL LETTER P WITH DOT ABOVE */ },
-	{0xB8, 0x1E81 /* LATIN SMALL LETTER W WITH GRAVE */ },
-	{0xB9, 0x1E57 /* LATIN SMALL LETTER P WITH DOT ABOVE */ },
-	{0xBA, 0x1E83 /* LATIN SMALL LETTER W WITH ACUTE */ },
-	{0xBB, 0x1E60 /* LATIN CAPITAL LETTER S WITH DOT ABOVE */ },
-	{0xBC, 0x1EF3 /* LATIN SMALL LETTER Y WITH GRAVE */ },
-	{0xBD, 0x1E84 /* LATIN CAPITAL LETTER W WITH DIAERESIS */ },
-	{0xBE, 0x1E85 /* LATIN SMALL LETTER W WITH DIAERESIS */ },
-	{0xBF, 0x1E61 /* LATIN SMALL LETTER S WITH DOT ABOVE */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD0, 0x0174 /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX */ },
-	{0xD1, 0x00D1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x1E6A /* LATIN CAPITAL LETTER T WITH DOT ABOVE */ },
-	{0xD8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x0176 /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x0175 /* LATIN SMALL LETTER W WITH CIRCUMFLEX */ },
-	{0xF1, 0x00F1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x1E6B /* LATIN SMALL LETTER T WITH DOT ABOVE */ },
-	{0xF8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x0177 /* LATIN SMALL LETTER Y WITH CIRCUMFLEX */ },
-	{0xFF, 0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0, 0}
+const uint16_t highhalf_8859_14 [] = {
+	/* 0x80 */ 0x0080, /* <control> */
+	/* 0x81 */ 0x0081, /* <control> */
+	/* 0x82 */ 0x0082, /* <control> */
+	/* 0x83 */ 0x0083, /* <control> */
+	/* 0x84 */ 0x0084, /* <control> */
+	/* 0x85 */ 0x0085, /* <control> */
+	/* 0x86 */ 0x0086, /* <control> */
+	/* 0x87 */ 0x0087, /* <control> */
+	/* 0x88 */ 0x0088, /* <control> */
+	/* 0x89 */ 0x0089, /* <control> */
+	/* 0x8A */ 0x008A, /* <control> */
+	/* 0x8B */ 0x008B, /* <control> */
+	/* 0x8C */ 0x008C, /* <control> */
+	/* 0x8D */ 0x008D, /* <control> */
+	/* 0x8E */ 0x008E, /* <control> */
+	/* 0x8F */ 0x008F, /* <control> */
+	/* 0x90 */ 0x0090, /* <control> */
+	/* 0x91 */ 0x0091, /* <control> */
+	/* 0x92 */ 0x0092, /* <control> */
+	/* 0x93 */ 0x0093, /* <control> */
+	/* 0x94 */ 0x0094, /* <control> */
+	/* 0x95 */ 0x0095, /* <control> */
+	/* 0x96 */ 0x0096, /* <control> */
+	/* 0x97 */ 0x0097, /* <control> */
+	/* 0x98 */ 0x0098, /* <control> */
+	/* 0x99 */ 0x0099, /* <control> */
+	/* 0x9A */ 0x009A, /* <control> */
+	/* 0x9B */ 0x009B, /* <control> */
+	/* 0x9C */ 0x009C, /* <control> */
+	/* 0x9D */ 0x009D, /* <control> */
+	/* 0x9E */ 0x009E, /* <control> */
+	/* 0x9F */ 0x009F, /* <control> */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x1E02, /* LATIN CAPITAL LETTER B WITH DOT ABOVE */
+	/* 0xA2 */ 0x1E03, /* LATIN SMALL LETTER B WITH DOT ABOVE */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x010A, /* LATIN CAPITAL LETTER C WITH DOT ABOVE */
+	/* 0xA5 */ 0x010B, /* LATIN SMALL LETTER C WITH DOT ABOVE */
+	/* 0xA6 */ 0x1E0A, /* LATIN CAPITAL LETTER D WITH DOT ABOVE */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x1E80, /* LATIN CAPITAL LETTER W WITH GRAVE */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x1E82, /* LATIN CAPITAL LETTER W WITH ACUTE */
+	/* 0xAB */ 0x1E0B, /* LATIN SMALL LETTER D WITH DOT ABOVE */
+	/* 0xAC */ 0x1EF2, /* LATIN CAPITAL LETTER Y WITH GRAVE */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
+	/* 0xB0 */ 0x1E1E, /* LATIN CAPITAL LETTER F WITH DOT ABOVE */
+	/* 0xB1 */ 0x1E1F, /* LATIN SMALL LETTER F WITH DOT ABOVE */
+	/* 0xB2 */ 0x0120, /* LATIN CAPITAL LETTER G WITH DOT ABOVE */
+	/* 0xB3 */ 0x0121, /* LATIN SMALL LETTER G WITH DOT ABOVE */
+	/* 0xB4 */ 0x1E40, /* LATIN CAPITAL LETTER M WITH DOT ABOVE */
+	/* 0xB5 */ 0x1E41, /* LATIN SMALL LETTER M WITH DOT ABOVE */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x1E56, /* LATIN CAPITAL LETTER P WITH DOT ABOVE */
+	/* 0xB8 */ 0x1E81, /* LATIN SMALL LETTER W WITH GRAVE */
+	/* 0xB9 */ 0x1E57, /* LATIN SMALL LETTER P WITH DOT ABOVE */
+	/* 0xBA */ 0x1E83, /* LATIN SMALL LETTER W WITH ACUTE */
+	/* 0xBB */ 0x1E60, /* LATIN CAPITAL LETTER S WITH DOT ABOVE */
+	/* 0xBC */ 0x1EF3, /* LATIN SMALL LETTER Y WITH GRAVE */
+	/* 0xBD */ 0x1E84, /* LATIN CAPITAL LETTER W WITH DIAERESIS */
+	/* 0xBE */ 0x1E85, /* LATIN SMALL LETTER W WITH DIAERESIS */
+	/* 0xBF */ 0x1E61, /* LATIN SMALL LETTER S WITH DOT ABOVE */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0x0174, /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX */
+	/* 0xD1 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x1E6A, /* LATIN CAPITAL LETTER T WITH DOT ABOVE */
+	/* 0xD8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x0176, /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x0175, /* LATIN SMALL LETTER W WITH CIRCUMFLEX */
+	/* 0xF1 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x1E6B, /* LATIN SMALL LETTER T WITH DOT ABOVE */
+	/* 0xF8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x0177, /* LATIN SMALL LETTER Y WITH CIRCUMFLEX */
+	/* 0xFF */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 };
 
+#define table_8859_14 table_NULL
+
 unsigned char *const aliases_8859_14 [] = {
 	"ISO-8859-14",
 	"8859-14",
@@ -1660,106 +1830,139 @@ unsigned char *const aliases_8859_14 [] = {
 
 /*** 8859_15 ***/
 
-const struct table_entry table_8859_15 [] = {
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x00A1 /* INVERTED EXCLAMATION MARK */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x20AC /* EURO */ },
-	{0xA5, 0x00A5 /* YEN SIGN */ },
-	{0xA6, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x00AA /* FEMININE ORDINAL INDICATOR */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00AF /* MACRON */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x00BA /* MASCULINE ORDINAL INDICATOR */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x0152 /* LATIN CAPITAL LIGATURE OE */ },
-	{0xBD, 0x0153 /* LATIN SMALL LIGATURE OE */ },
-	{0xBE, 0x0178 /* LATIN CAPITAL LETTER Y WITH DIAERESIS */ },
-	{0xBF, 0x00BF /* INVERTED QUESTION MARK */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD0, 0x00D0 /* LATIN CAPITAL LETTER ETH */ },
-	{0xD1, 0x00D1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x00DE /* LATIN CAPITAL LETTER THORN */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x00F0 /* LATIN SMALL LETTER ETH */ },
-	{0xF1, 0x00F1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x00FE /* LATIN SMALL LETTER THORN */ },
-	{0xFF, 0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0, 0}
+const uint16_t highhalf_8859_15 [] = {
+	/* 0x80 */ 0xFFFF,
+	/* 0x81 */ 0xFFFF,
+	/* 0x82 */ 0xFFFF,
+	/* 0x83 */ 0xFFFF,
+	/* 0x84 */ 0xFFFF,
+	/* 0x85 */ 0xFFFF,
+	/* 0x86 */ 0xFFFF,
+	/* 0x87 */ 0xFFFF,
+	/* 0x88 */ 0xFFFF,
+	/* 0x89 */ 0xFFFF,
+	/* 0x8A */ 0xFFFF,
+	/* 0x8B */ 0xFFFF,
+	/* 0x8C */ 0xFFFF,
+	/* 0x8D */ 0xFFFF,
+	/* 0x8E */ 0xFFFF,
+	/* 0x8F */ 0xFFFF,
+	/* 0x90 */ 0xFFFF,
+	/* 0x91 */ 0xFFFF,
+	/* 0x92 */ 0xFFFF,
+	/* 0x93 */ 0xFFFF,
+	/* 0x94 */ 0xFFFF,
+	/* 0x95 */ 0xFFFF,
+	/* 0x96 */ 0xFFFF,
+	/* 0x97 */ 0xFFFF,
+	/* 0x98 */ 0xFFFF,
+	/* 0x99 */ 0xFFFF,
+	/* 0x9A */ 0xFFFF,
+	/* 0x9B */ 0xFFFF,
+	/* 0x9C */ 0xFFFF,
+	/* 0x9D */ 0xFFFF,
+	/* 0x9E */ 0xFFFF,
+	/* 0x9F */ 0xFFFF,
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x20AC, /* EURO */
+	/* 0xA5 */ 0x00A5, /* YEN SIGN */
+	/* 0xA6 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x00AA, /* FEMININE ORDINAL INDICATOR */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00AF, /* MACRON */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x00BA, /* MASCULINE ORDINAL INDICATOR */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x0152, /* LATIN CAPITAL LIGATURE OE */
+	/* 0xBD */ 0x0153, /* LATIN SMALL LIGATURE OE */
+	/* 0xBE */ 0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
+	/* 0xBF */ 0x00BF, /* INVERTED QUESTION MARK */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0x00D0, /* LATIN CAPITAL LETTER ETH */
+	/* 0xD1 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x00DE, /* LATIN CAPITAL LETTER THORN */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x00F0, /* LATIN SMALL LETTER ETH */
+	/* 0xF1 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x00FE, /* LATIN SMALL LETTER THORN */
+	/* 0xFF */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 };
 
+#define table_8859_15 table_NULL
+
 unsigned char *const aliases_8859_15 [] = {
 	"ISO-8859-15",
 	"iso8859-15",
@@ -1779,106 +1982,139 @@ unsigned char *const aliases_8859_15 [] = {
 
 /*** 8859_16 ***/
 
-const struct table_entry table_8859_16 [] = {
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xA2, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xA3, 0x0141 /* LATIN CAPITAL LETTER L WITH STROKE */ },
-	{0xA4, 0x20AC /* EURO SIGN */ },
-	{0xA5, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xA6, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x0218 /* LATIN CAPITAL LETTER S WITH COMMA BELOW */ },
-	{0xAB, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0xAC, 0x0179 /* LATIN CAPITAL LETTER Z WITH ACUTE */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x017A /* LATIN SMALL LETTER Z WITH ACUTE */ },
-	{0xAF, 0x017B /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xB3, 0x0142 /* LATIN SMALL LETTER L WITH STROKE */ },
-	{0xB4, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xB5, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xB9, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xBA, 0x0219 /* LATIN SMALL LETTER S WITH COMMA BELOW */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x0152 /* LATIN CAPITAL LIGATURE OE */ },
-	{0xBD, 0x0153 /* LATIN SMALL LIGATURE OE */ },
-	{0xBE, 0x0178 /* LATIN CAPITAL LETTER Y WITH DIAERESIS */ },
-	{0xBF, 0x017C /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x0102 /* LATIN CAPITAL LETTER A WITH BREVE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x0106 /* LATIN CAPITAL LETTER C WITH ACUTE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD0, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xD1, 0x0143 /* LATIN CAPITAL LETTER N WITH ACUTE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x0150 /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x015A /* LATIN CAPITAL LETTER S WITH ACUTE */ },
-	{0xD8, 0x0170 /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xDE, 0x021A /* LATIN CAPITAL LETTER T WITH COMMA BELOW */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x0103 /* LATIN SMALL LETTER A WITH BREVE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x0107 /* LATIN SMALL LETTER C WITH ACUTE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xF1, 0x0144 /* LATIN SMALL LETTER N WITH ACUTE */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x0151 /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x015B /* LATIN SMALL LETTER S WITH ACUTE */ },
-	{0xF8, 0x0171 /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xFE, 0x021B /* LATIN SMALL LETTER T WITH COMMA BELOW */ },
-	{0xFF, 0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0, 0}
+const uint16_t highhalf_8859_16 [] = {
+	/* 0x80 */ 0xFFFF,
+	/* 0x81 */ 0xFFFF,
+	/* 0x82 */ 0xFFFF,
+	/* 0x83 */ 0xFFFF,
+	/* 0x84 */ 0xFFFF,
+	/* 0x85 */ 0xFFFF,
+	/* 0x86 */ 0xFFFF,
+	/* 0x87 */ 0xFFFF,
+	/* 0x88 */ 0xFFFF,
+	/* 0x89 */ 0xFFFF,
+	/* 0x8A */ 0xFFFF,
+	/* 0x8B */ 0xFFFF,
+	/* 0x8C */ 0xFFFF,
+	/* 0x8D */ 0xFFFF,
+	/* 0x8E */ 0xFFFF,
+	/* 0x8F */ 0xFFFF,
+	/* 0x90 */ 0xFFFF,
+	/* 0x91 */ 0xFFFF,
+	/* 0x92 */ 0xFFFF,
+	/* 0x93 */ 0xFFFF,
+	/* 0x94 */ 0xFFFF,
+	/* 0x95 */ 0xFFFF,
+	/* 0x96 */ 0xFFFF,
+	/* 0x97 */ 0xFFFF,
+	/* 0x98 */ 0xFFFF,
+	/* 0x99 */ 0xFFFF,
+	/* 0x9A */ 0xFFFF,
+	/* 0x9B */ 0xFFFF,
+	/* 0x9C */ 0xFFFF,
+	/* 0x9D */ 0xFFFF,
+	/* 0x9E */ 0xFFFF,
+	/* 0x9F */ 0xFFFF,
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xA2 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xA3 */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
+	/* 0xA4 */ 0x20AC, /* EURO SIGN */
+	/* 0xA5 */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xA6 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x0218, /* LATIN CAPITAL LETTER S WITH COMMA BELOW */
+	/* 0xAB */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0xAC */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
+	/* 0xAF */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xB3 */ 0x0142, /* LATIN SMALL LETTER L WITH STROKE */
+	/* 0xB4 */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xB5 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xB9 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xBA */ 0x0219, /* LATIN SMALL LETTER S WITH COMMA BELOW */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x0152, /* LATIN CAPITAL LIGATURE OE */
+	/* 0xBD */ 0x0153, /* LATIN SMALL LIGATURE OE */
+	/* 0xBE */ 0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
+	/* 0xBF */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x0102, /* LATIN CAPITAL LETTER A WITH BREVE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x0106, /* LATIN CAPITAL LETTER C WITH ACUTE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xD1 */ 0x0143, /* LATIN CAPITAL LETTER N WITH ACUTE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x0150, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x015A, /* LATIN CAPITAL LETTER S WITH ACUTE */
+	/* 0xD8 */ 0x0170, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xDE */ 0x021A, /* LATIN CAPITAL LETTER T WITH COMMA BELOW */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x0103, /* LATIN SMALL LETTER A WITH BREVE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x0107, /* LATIN SMALL LETTER C WITH ACUTE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xF1 */ 0x0144, /* LATIN SMALL LETTER N WITH ACUTE */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x0151, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x015B, /* LATIN SMALL LETTER S WITH ACUTE */
+	/* 0xF8 */ 0x0171, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xFE */ 0x021B, /* LATIN SMALL LETTER T WITH COMMA BELOW */
+	/* 0xFF */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 };
 
+#define table_8859_16 table_NULL
+
 unsigned char *const aliases_8859_16 [] = {
 	"ISO-8859-16",
 	"iso8859-16",
@@ -1896,138 +2132,139 @@ unsigned char *const aliases_8859_16 [] = {
 
 /*** cp1250 ***/
 
-const struct table_entry table_cp1250 [] = {
-	{0x80, 0x20AC /* EURO SIGN */ },
-	{0x81, 0x0000 /* UNDEFINED */ },
-	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
-	{0x83, 0x0000 /* UNDEFINED */ },
-	{0x84, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0x85, 0x2026 /* HORIZONTAL ELLIPSIS */ },
-	{0x86, 0x2020 /* DAGGER */ },
-	{0x87, 0x2021 /* DOUBLE DAGGER */ },
-	{0x88, 0x0000 /* UNDEFINED */ },
-	{0x89, 0x2030 /* PER MILLE SIGN */ },
-	{0x8A, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0x8B, 0x2039 /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ },
-	{0x8C, 0x015A /* LATIN CAPITAL LETTER S WITH ACUTE */ },
-	{0x8D, 0x0164 /* LATIN CAPITAL LETTER T WITH CARON */ },
-	{0x8E, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0x8F, 0x0179 /* LATIN CAPITAL LETTER Z WITH ACUTE */ },
-	{0x90, 0x0000 /* UNDEFINED */ },
-	{0x91, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0x92, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0x93, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0x94, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0x95, 0x2022 /* BULLET */ },
-	{0x96, 0x2013 /* EN DASH */ },
-	{0x97, 0x2014 /* EM DASH */ },
-	{0x98, 0x0000 /* UNDEFINED */ },
-	{0x99, 0x2122 /* TRADE MARK SIGN */ },
-	{0x9A, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0x9B, 0x203A /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ },
-	{0x9C, 0x015B /* LATIN SMALL LETTER S WITH ACUTE */ },
-	{0x9D, 0x0165 /* LATIN SMALL LETTER T WITH CARON */ },
-	{0x9E, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0x9F, 0x017A /* LATIN SMALL LETTER Z WITH ACUTE */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x02C7 /* CARON */ },
-	{0xA2, 0x02D8 /* BREVE */ },
-	{0xA3, 0x0141 /* LATIN CAPITAL LETTER L WITH STROKE */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x015E /* LATIN CAPITAL LETTER S WITH CEDILLA */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x017B /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x02DB /* OGONEK */ },
-	{0xB3, 0x0142 /* LATIN SMALL LETTER L WITH STROKE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xBA, 0x015F /* LATIN SMALL LETTER S WITH CEDILLA */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x013D /* LATIN CAPITAL LETTER L WITH CARON */ },
-	{0xBD, 0x02DD /* DOUBLE ACUTE ACCENT */ },
-	{0xBE, 0x013E /* LATIN SMALL LETTER L WITH CARON */ },
-	{0xBF, 0x017C /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xC0, 0x0154 /* LATIN CAPITAL LETTER R WITH ACUTE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x0102 /* LATIN CAPITAL LETTER A WITH BREVE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x0139 /* LATIN CAPITAL LETTER L WITH ACUTE */ },
-	{0xC6, 0x0106 /* LATIN CAPITAL LETTER C WITH ACUTE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x011A /* LATIN CAPITAL LETTER E WITH CARON */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x010E /* LATIN CAPITAL LETTER D WITH CARON */ },
-	{0xD0, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xD1, 0x0143 /* LATIN CAPITAL LETTER N WITH ACUTE */ },
-	{0xD2, 0x0147 /* LATIN CAPITAL LETTER N WITH CARON */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x0150 /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x0158 /* LATIN CAPITAL LETTER R WITH CARON */ },
-	{0xD9, 0x016E /* LATIN CAPITAL LETTER U WITH RING ABOVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x0170 /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x0162 /* LATIN CAPITAL LETTER T WITH CEDILLA */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x0155 /* LATIN SMALL LETTER R WITH ACUTE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x0103 /* LATIN SMALL LETTER A WITH BREVE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x013A /* LATIN SMALL LETTER L WITH ACUTE */ },
-	{0xE6, 0x0107 /* LATIN SMALL LETTER C WITH ACUTE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x011B /* LATIN SMALL LETTER E WITH CARON */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x010F /* LATIN SMALL LETTER D WITH CARON */ },
-	{0xF0, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xF1, 0x0144 /* LATIN SMALL LETTER N WITH ACUTE */ },
-	{0xF2, 0x0148 /* LATIN SMALL LETTER N WITH CARON */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x0151 /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x0159 /* LATIN SMALL LETTER R WITH CARON */ },
-	{0xF9, 0x016F /* LATIN SMALL LETTER U WITH RING ABOVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x0171 /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x0163 /* LATIN SMALL LETTER T WITH CEDILLA */ },
-	{0xFF, 0x02D9 /* DOT ABOVE */ },
-	{0, 0}
+const uint16_t highhalf_cp1250 [] = {
+	/* 0x80 */ 0x20AC, /* EURO SIGN */
+	/* 0x81 */ 0x0000, /* UNDEFINED */
+	/* 0x82 */ 0x201A, /* SINGLE LOW-9 QUOTATION MARK */
+	/* 0x83 */ 0x0000, /* UNDEFINED */
+	/* 0x84 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0x85 */ 0x2026, /* HORIZONTAL ELLIPSIS */
+	/* 0x86 */ 0x2020, /* DAGGER */
+	/* 0x87 */ 0x2021, /* DOUBLE DAGGER */
+	/* 0x88 */ 0x0000, /* UNDEFINED */
+	/* 0x89 */ 0x2030, /* PER MILLE SIGN */
+	/* 0x8A */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0x8B */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+	/* 0x8C */ 0x015A, /* LATIN CAPITAL LETTER S WITH ACUTE */
+	/* 0x8D */ 0x0164, /* LATIN CAPITAL LETTER T WITH CARON */
+	/* 0x8E */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0x8F */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+	/* 0x90 */ 0x0000, /* UNDEFINED */
+	/* 0x91 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0x92 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0x93 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0x94 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0x95 */ 0x2022, /* BULLET */
+	/* 0x96 */ 0x2013, /* EN DASH */
+	/* 0x97 */ 0x2014, /* EM DASH */
+	/* 0x98 */ 0x0000, /* UNDEFINED */
+	/* 0x99 */ 0x2122, /* TRADE MARK SIGN */
+	/* 0x9A */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0x9B */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+	/* 0x9C */ 0x015B, /* LATIN SMALL LETTER S WITH ACUTE */
+	/* 0x9D */ 0x0165, /* LATIN SMALL LETTER T WITH CARON */
+	/* 0x9E */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0x9F */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x02C7, /* CARON */
+	/* 0xA2 */ 0x02D8, /* BREVE */
+	/* 0xA3 */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x015E, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x02DB, /* OGONEK */
+	/* 0xB3 */ 0x0142, /* LATIN SMALL LETTER L WITH STROKE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xBA */ 0x015F, /* LATIN SMALL LETTER S WITH CEDILLA */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x013D, /* LATIN CAPITAL LETTER L WITH CARON */
+	/* 0xBD */ 0x02DD, /* DOUBLE ACUTE ACCENT */
+	/* 0xBE */ 0x013E, /* LATIN SMALL LETTER L WITH CARON */
+	/* 0xBF */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xC0 */ 0x0154, /* LATIN CAPITAL LETTER R WITH ACUTE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x0102, /* LATIN CAPITAL LETTER A WITH BREVE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x0139, /* LATIN CAPITAL LETTER L WITH ACUTE */
+	/* 0xC6 */ 0x0106, /* LATIN CAPITAL LETTER C WITH ACUTE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x011A, /* LATIN CAPITAL LETTER E WITH CARON */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x010E, /* LATIN CAPITAL LETTER D WITH CARON */
+	/* 0xD0 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xD1 */ 0x0143, /* LATIN CAPITAL LETTER N WITH ACUTE */
+	/* 0xD2 */ 0x0147, /* LATIN CAPITAL LETTER N WITH CARON */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x0150, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x0158, /* LATIN CAPITAL LETTER R WITH CARON */
+	/* 0xD9 */ 0x016E, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x0170, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x0162, /* LATIN CAPITAL LETTER T WITH CEDILLA */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x0155, /* LATIN SMALL LETTER R WITH ACUTE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x0103, /* LATIN SMALL LETTER A WITH BREVE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x013A, /* LATIN SMALL LETTER L WITH ACUTE */
+	/* 0xE6 */ 0x0107, /* LATIN SMALL LETTER C WITH ACUTE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x011B, /* LATIN SMALL LETTER E WITH CARON */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x010F, /* LATIN SMALL LETTER D WITH CARON */
+	/* 0xF0 */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xF1 */ 0x0144, /* LATIN SMALL LETTER N WITH ACUTE */
+	/* 0xF2 */ 0x0148, /* LATIN SMALL LETTER N WITH CARON */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x0151, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x0159, /* LATIN SMALL LETTER R WITH CARON */
+	/* 0xF9 */ 0x016F, /* LATIN SMALL LETTER U WITH RING ABOVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x0171, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x0163, /* LATIN SMALL LETTER T WITH CEDILLA */
+	/* 0xFF */ 0x02D9, /* DOT ABOVE */
 };
 
+#define table_cp1250 table_NULL
+
 unsigned char *const aliases_cp1250 [] = {
 	"windows-1250",
 	"windows1250",
@@ -2040,137 +2277,139 @@ unsigned char *const aliases_cp1250 [] = {
 
 /*** cp1251 ***/
 
-const struct table_entry table_cp1251 [] = {
-	{0x80, 0x0402 /* CYRILLIC CAPITAL LETTER DJE */ },
-	{0x81, 0x0403 /* CYRILLIC CAPITAL LETTER GJE */ },
-	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
-	{0x83, 0x0453 /* CYRILLIC SMALL LETTER GJE */ },
-	{0x84, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0x85, 0x2026 /* HORIZONTAL ELLIPSIS */ },
-	{0x86, 0x2020 /* DAGGER */ },
-	{0x87, 0x2021 /* DOUBLE DAGGER */ },
-	{0x88, 0x20AC /* EURO SIGN */ },
-	{0x89, 0x2030 /* PER MILLE SIGN */ },
-	{0x8A, 0x0409 /* CYRILLIC CAPITAL LETTER LJE */ },
-	{0x8B, 0x2039 /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ },
-	{0x8C, 0x040A /* CYRILLIC CAPITAL LETTER NJE */ },
-	{0x8D, 0x040C /* CYRILLIC CAPITAL LETTER KJE */ },
-	{0x8E, 0x040B /* CYRILLIC CAPITAL LETTER TSHE */ },
-	{0x8F, 0x040F /* CYRILLIC CAPITAL LETTER DZHE */ },
-	{0x90, 0x0452 /* CYRILLIC SMALL LETTER DJE */ },
-	{0x91, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0x92, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0x93, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0x94, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0x95, 0x2022 /* BULLET */ },
-	{0x96, 0x2013 /* EN DASH */ },
-	{0x97, 0x2014 /* EM DASH */ },
-	{0x99, 0x2122 /* TRADE MARK SIGN */ },
-	{0x9A, 0x0459 /* CYRILLIC SMALL LETTER LJE */ },
-	{0x9B, 0x203A /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ },
-	{0x9C, 0x045A /* CYRILLIC SMALL LETTER NJE */ },
-	{0x9D, 0x045C /* CYRILLIC SMALL LETTER KJE */ },
-	{0x9E, 0x045B /* CYRILLIC SMALL LETTER TSHE */ },
-	{0x9F, 0x045F /* CYRILLIC SMALL LETTER DZHE */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x040E /* CYRILLIC CAPITAL LETTER SHORT U */ },
-	{0xA2, 0x045E /* CYRILLIC SMALL LETTER SHORT U */ },
-	{0xA3, 0x0408 /* CYRILLIC CAPITAL LETTER JE */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x0490 /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x0401 /* CYRILLIC CAPITAL LETTER IO */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x0404 /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x0407 /* CYRILLIC CAPITAL LETTER YI */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x0406 /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xB3, 0x0456 /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xB4, 0x0491 /* CYRILLIC SMALL LETTER GHE WITH UPTURN */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x0451 /* CYRILLIC SMALL LETTER IO */ },
-	{0xB9, 0x2116 /* NUMERO SIGN */ },
-	{0xBA, 0x0454 /* CYRILLIC SMALL LETTER UKRAINIAN IE */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x0458 /* CYRILLIC SMALL LETTER JE */ },
-	{0xBD, 0x0405 /* CYRILLIC CAPITAL LETTER DZE */ },
-	{0xBE, 0x0455 /* CYRILLIC SMALL LETTER DZE */ },
-	{0xBF, 0x0457 /* CYRILLIC SMALL LETTER YI */ },
-	{0xC0, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
-	{0xC1, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
-	{0xC2, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
-	{0xC3, 0x0413 /* CYRILLIC CAPITAL LETTER GHE */ },
-	{0xC4, 0x0414 /* CYRILLIC CAPITAL LETTER DE */ },
-	{0xC5, 0x0415 /* CYRILLIC CAPITAL LETTER IE */ },
-	{0xC6, 0x0416 /* CYRILLIC CAPITAL LETTER ZHE */ },
-	{0xC7, 0x0417 /* CYRILLIC CAPITAL LETTER ZE */ },
-	{0xC8, 0x0418 /* CYRILLIC CAPITAL LETTER I */ },
-	{0xC9, 0x0419 /* CYRILLIC CAPITAL LETTER SHORT I */ },
-	{0xCA, 0x041A /* CYRILLIC CAPITAL LETTER KA */ },
-	{0xCB, 0x041B /* CYRILLIC CAPITAL LETTER EL */ },
-	{0xCC, 0x041C /* CYRILLIC CAPITAL LETTER EM */ },
-	{0xCD, 0x041D /* CYRILLIC CAPITAL LETTER EN */ },
-	{0xCE, 0x041E /* CYRILLIC CAPITAL LETTER O */ },
-	{0xCF, 0x041F /* CYRILLIC CAPITAL LETTER PE */ },
-	{0xD0, 0x0420 /* CYRILLIC CAPITAL LETTER ER */ },
-	{0xD1, 0x0421 /* CYRILLIC CAPITAL LETTER ES */ },
-	{0xD2, 0x0422 /* CYRILLIC CAPITAL LETTER TE */ },
-	{0xD3, 0x0423 /* CYRILLIC CAPITAL LETTER U */ },
-	{0xD4, 0x0424 /* CYRILLIC CAPITAL LETTER EF */ },
-	{0xD5, 0x0425 /* CYRILLIC CAPITAL LETTER HA */ },
-	{0xD6, 0x0426 /* CYRILLIC CAPITAL LETTER TSE */ },
-	{0xD7, 0x0427 /* CYRILLIC CAPITAL LETTER CHE */ },
-	{0xD8, 0x0428 /* CYRILLIC CAPITAL LETTER SHA */ },
-	{0xD9, 0x0429 /* CYRILLIC CAPITAL LETTER SHCHA */ },
-	{0xDA, 0x042A /* CYRILLIC CAPITAL LETTER HARD SIGN */ },
-	{0xDB, 0x042B /* CYRILLIC CAPITAL LETTER YERU */ },
-	{0xDC, 0x042C /* CYRILLIC CAPITAL LETTER SOFT SIGN */ },
-	{0xDD, 0x042D /* CYRILLIC CAPITAL LETTER E */ },
-	{0xDE, 0x042E /* CYRILLIC CAPITAL LETTER YU */ },
-	{0xDF, 0x042F /* CYRILLIC CAPITAL LETTER YA */ },
-	{0xE0, 0x0430 /* CYRILLIC SMALL LETTER A */ },
-	{0xE1, 0x0431 /* CYRILLIC SMALL LETTER BE */ },
-	{0xE2, 0x0432 /* CYRILLIC SMALL LETTER VE */ },
-	{0xE3, 0x0433 /* CYRILLIC SMALL LETTER GHE */ },
-	{0xE4, 0x0434 /* CYRILLIC SMALL LETTER DE */ },
-	{0xE5, 0x0435 /* CYRILLIC SMALL LETTER IE */ },
-	{0xE6, 0x0436 /* CYRILLIC SMALL LETTER ZHE */ },
-	{0xE7, 0x0437 /* CYRILLIC SMALL LETTER ZE */ },
-	{0xE8, 0x0438 /* CYRILLIC SMALL LETTER I */ },
-	{0xE9, 0x0439 /* CYRILLIC SMALL LETTER SHORT I */ },
-	{0xEA, 0x043A /* CYRILLIC SMALL LETTER KA */ },
-	{0xEB, 0x043B /* CYRILLIC SMALL LETTER EL */ },
-	{0xEC, 0x043C /* CYRILLIC SMALL LETTER EM */ },
-	{0xED, 0x043D /* CYRILLIC SMALL LETTER EN */ },
-	{0xEE, 0x043E /* CYRILLIC SMALL LETTER O */ },
-	{0xEF, 0x043F /* CYRILLIC SMALL LETTER PE */ },
-	{0xF0, 0x0440 /* CYRILLIC SMALL LETTER ER */ },
-	{0xF1, 0x0441 /* CYRILLIC SMALL LETTER ES */ },
-	{0xF2, 0x0442 /* CYRILLIC SMALL LETTER TE */ },
-	{0xF3, 0x0443 /* CYRILLIC SMALL LETTER U */ },
-	{0xF4, 0x0444 /* CYRILLIC SMALL LETTER EF */ },
-	{0xF5, 0x0445 /* CYRILLIC SMALL LETTER HA */ },
-	{0xF6, 0x0446 /* CYRILLIC SMALL LETTER TSE */ },
-	{0xF7, 0x0447 /* CYRILLIC SMALL LETTER CHE */ },
-	{0xF8, 0x0448 /* CYRILLIC SMALL LETTER SHA */ },
-	{0xF9, 0x0449 /* CYRILLIC SMALL LETTER SHCHA */ },
-	{0xFA, 0x044A /* CYRILLIC SMALL LETTER HARD SIGN */ },
-	{0xFB, 0x044B /* CYRILLIC SMALL LETTER YERU */ },
-	{0xFC, 0x044C /* CYRILLIC SMALL LETTER SOFT SIGN */ },
-	{0xFD, 0x044D /* CYRILLIC SMALL LETTER E */ },
-	{0xFE, 0x044E /* CYRILLIC SMALL LETTER YU */ },
-	{0xFF, 0x044F /* CYRILLIC SMALL LETTER YA */ },
-	{0, 0}
+const uint16_t highhalf_cp1251 [] = {
+	/* 0x80 */ 0x0402, /* CYRILLIC CAPITAL LETTER DJE */
+	/* 0x81 */ 0x0403, /* CYRILLIC CAPITAL LETTER GJE */
+	/* 0x82 */ 0x201A, /* SINGLE LOW-9 QUOTATION MARK */
+	/* 0x83 */ 0x0453, /* CYRILLIC SMALL LETTER GJE */
+	/* 0x84 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0x85 */ 0x2026, /* HORIZONTAL ELLIPSIS */
+	/* 0x86 */ 0x2020, /* DAGGER */
+	/* 0x87 */ 0x2021, /* DOUBLE DAGGER */
+	/* 0x88 */ 0x20AC, /* EURO SIGN */
+	/* 0x89 */ 0x2030, /* PER MILLE SIGN */
+	/* 0x8A */ 0x0409, /* CYRILLIC CAPITAL LETTER LJE */
+	/* 0x8B */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+	/* 0x8C */ 0x040A, /* CYRILLIC CAPITAL LETTER NJE */
+	/* 0x8D */ 0x040C, /* CYRILLIC CAPITAL LETTER KJE */
+	/* 0x8E */ 0x040B, /* CYRILLIC CAPITAL LETTER TSHE */
+	/* 0x8F */ 0x040F, /* CYRILLIC CAPITAL LETTER DZHE */
+	/* 0x90 */ 0x0452, /* CYRILLIC SMALL LETTER DJE */
+	/* 0x91 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0x92 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0x93 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0x94 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0x95 */ 0x2022, /* BULLET */
+	/* 0x96 */ 0x2013, /* EN DASH */
+	/* 0x97 */ 0x2014, /* EM DASH */
+	/* 0x98 */ 0xFFFF,
+	/* 0x99 */ 0x2122, /* TRADE MARK SIGN */
+	/* 0x9A */ 0x0459, /* CYRILLIC SMALL LETTER LJE */
+	/* 0x9B */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+	/* 0x9C */ 0x045A, /* CYRILLIC SMALL LETTER NJE */
+	/* 0x9D */ 0x045C, /* CYRILLIC SMALL LETTER KJE */
+	/* 0x9E */ 0x045B, /* CYRILLIC SMALL LETTER TSHE */
+	/* 0x9F */ 0x045F, /* CYRILLIC SMALL LETTER DZHE */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x040E, /* CYRILLIC CAPITAL LETTER SHORT U */
+	/* 0xA2 */ 0x045E, /* CYRILLIC SMALL LETTER SHORT U */
+	/* 0xA3 */ 0x0408, /* CYRILLIC CAPITAL LETTER JE */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x0490, /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x0401, /* CYRILLIC CAPITAL LETTER IO */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x0407, /* CYRILLIC CAPITAL LETTER YI */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xB3 */ 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xB4 */ 0x0491, /* CYRILLIC SMALL LETTER GHE WITH UPTURN */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x0451, /* CYRILLIC SMALL LETTER IO */
+	/* 0xB9 */ 0x2116, /* NUMERO SIGN */
+	/* 0xBA */ 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x0458, /* CYRILLIC SMALL LETTER JE */
+	/* 0xBD */ 0x0405, /* CYRILLIC CAPITAL LETTER DZE */
+	/* 0xBE */ 0x0455, /* CYRILLIC SMALL LETTER DZE */
+	/* 0xBF */ 0x0457, /* CYRILLIC SMALL LETTER YI */
+	/* 0xC0 */ 0x0410, /* CYRILLIC CAPITAL LETTER A */
+	/* 0xC1 */ 0x0411, /* CYRILLIC CAPITAL LETTER BE */
+	/* 0xC2 */ 0x0412, /* CYRILLIC CAPITAL LETTER VE */
+	/* 0xC3 */ 0x0413, /* CYRILLIC CAPITAL LETTER GHE */
+	/* 0xC4 */ 0x0414, /* CYRILLIC CAPITAL LETTER DE */
+	/* 0xC5 */ 0x0415, /* CYRILLIC CAPITAL LETTER IE */
+	/* 0xC6 */ 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
+	/* 0xC7 */ 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
+	/* 0xC8 */ 0x0418, /* CYRILLIC CAPITAL LETTER I */
+	/* 0xC9 */ 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
+	/* 0xCA */ 0x041A, /* CYRILLIC CAPITAL LETTER KA */
+	/* 0xCB */ 0x041B, /* CYRILLIC CAPITAL LETTER EL */
+	/* 0xCC */ 0x041C, /* CYRILLIC CAPITAL LETTER EM */
+	/* 0xCD */ 0x041D, /* CYRILLIC CAPITAL LETTER EN */
+	/* 0xCE */ 0x041E, /* CYRILLIC CAPITAL LETTER O */
+	/* 0xCF */ 0x041F, /* CYRILLIC CAPITAL LETTER PE */
+	/* 0xD0 */ 0x0420, /* CYRILLIC CAPITAL LETTER ER */
+	/* 0xD1 */ 0x0421, /* CYRILLIC CAPITAL LETTER ES */
+	/* 0xD2 */ 0x0422, /* CYRILLIC CAPITAL LETTER TE */
+	/* 0xD3 */ 0x0423, /* CYRILLIC CAPITAL LETTER U */
+	/* 0xD4 */ 0x0424, /* CYRILLIC CAPITAL LETTER EF */
+	/* 0xD5 */ 0x0425, /* CYRILLIC CAPITAL LETTER HA */
+	/* 0xD6 */ 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
+	/* 0xD7 */ 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
+	/* 0xD8 */ 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
+	/* 0xD9 */ 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */
+	/* 0xDA */ 0x042A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
+	/* 0xDB */ 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
+	/* 0xDC */ 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+	/* 0xDD */ 0x042D, /* CYRILLIC CAPITAL LETTER E */
+	/* 0xDE */ 0x042E, /* CYRILLIC CAPITAL LETTER YU */
+	/* 0xDF */ 0x042F, /* CYRILLIC CAPITAL LETTER YA */
+	/* 0xE0 */ 0x0430, /* CYRILLIC SMALL LETTER A */
+	/* 0xE1 */ 0x0431, /* CYRILLIC SMALL LETTER BE */
+	/* 0xE2 */ 0x0432, /* CYRILLIC SMALL LETTER VE */
+	/* 0xE3 */ 0x0433, /* CYRILLIC SMALL LETTER GHE */
+	/* 0xE4 */ 0x0434, /* CYRILLIC SMALL LETTER DE */
+	/* 0xE5 */ 0x0435, /* CYRILLIC SMALL LETTER IE */
+	/* 0xE6 */ 0x0436, /* CYRILLIC SMALL LETTER ZHE */
+	/* 0xE7 */ 0x0437, /* CYRILLIC SMALL LETTER ZE */
+	/* 0xE8 */ 0x0438, /* CYRILLIC SMALL LETTER I */
+	/* 0xE9 */ 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
+	/* 0xEA */ 0x043A, /* CYRILLIC SMALL LETTER KA */
+	/* 0xEB */ 0x043B, /* CYRILLIC SMALL LETTER EL */
+	/* 0xEC */ 0x043C, /* CYRILLIC SMALL LETTER EM */
+	/* 0xED */ 0x043D, /* CYRILLIC SMALL LETTER EN */
+	/* 0xEE */ 0x043E, /* CYRILLIC SMALL LETTER O */
+	/* 0xEF */ 0x043F, /* CYRILLIC SMALL LETTER PE */
+	/* 0xF0 */ 0x0440, /* CYRILLIC SMALL LETTER ER */
+	/* 0xF1 */ 0x0441, /* CYRILLIC SMALL LETTER ES */
+	/* 0xF2 */ 0x0442, /* CYRILLIC SMALL LETTER TE */
+	/* 0xF3 */ 0x0443, /* CYRILLIC SMALL LETTER U */
+	/* 0xF4 */ 0x0444, /* CYRILLIC SMALL LETTER EF */
+	/* 0xF5 */ 0x0445, /* CYRILLIC SMALL LETTER HA */
+	/* 0xF6 */ 0x0446, /* CYRILLIC SMALL LETTER TSE */
+	/* 0xF7 */ 0x0447, /* CYRILLIC SMALL LETTER CHE */
+	/* 0xF8 */ 0x0448, /* CYRILLIC SMALL LETTER SHA */
+	/* 0xF9 */ 0x0449, /* CYRILLIC SMALL LETTER SHCHA */
+	/* 0xFA */ 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */
+	/* 0xFB */ 0x044B, /* CYRILLIC SMALL LETTER YERU */
+	/* 0xFC */ 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */
+	/* 0xFD */ 0x044D, /* CYRILLIC SMALL LETTER E */
+	/* 0xFE */ 0x044E, /* CYRILLIC SMALL LETTER YU */
+	/* 0xFF */ 0x044F, /* CYRILLIC SMALL LETTER YA */
 };
 
+#define table_cp1251 table_NULL
+
 unsigned char *const aliases_cp1251 [] = {
 	"windows-1251",
 	"windows1251",
@@ -2183,133 +2422,139 @@ unsigned char *const aliases_cp1251 [] = {
 
 /*** cp1252 ***/
 
-const struct table_entry table_cp1252 [] = {
-	{0x80, 0x20AC /* EURO SIGN */ },
-	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
-	{0x83, 0x0192 /* LATIN SMALL LETTER F WITH HOOK */ },
-	{0x84, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0x85, 0x2026 /* HORIZONTAL ELLIPSIS */ },
-	{0x86, 0x2020 /* DAGGER */ },
-	{0x87, 0x2021 /* DOUBLE DAGGER */ },
-	{0x88, 0x02C6 /* MODIFIER LETTER CIRCUMFLEX ACCENT */ },
-	{0x89, 0x2030 /* PER MILLE SIGN */ },
-	{0x8A, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0x8B, 0x2039 /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ },
-	{0x8C, 0x0152 /* LATIN CAPITAL LIGATURE OE */ },
-	{0x8E, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0x91, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0x92, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0x93, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0x94, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0x95, 0x2022 /* BULLET */ },
-	{0x96, 0x2013 /* EN DASH */ },
-	{0x97, 0x2014 /* EM DASH */ },
-	{0x98, 0x02DC /* SMALL TILDE */ },
-	{0x99, 0x2122 /* TRADE MARK SIGN */ },
-	{0x9A, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0x9B, 0x203A /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ },
-	{0x9C, 0x0153 /* LATIN SMALL LIGATURE OE */ },
-	{0x9E, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0x9F, 0x0178 /* LATIN CAPITAL LETTER Y WITH DIAERESIS */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x00A1 /* INVERTED EXCLAMATION MARK */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x00A5 /* YEN SIGN */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x00AA /* FEMININE ORDINAL INDICATOR */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00AF /* MACRON */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x00BA /* MASCULINE ORDINAL INDICATOR */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x00BE /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xBF, 0x00BF /* INVERTED QUESTION MARK */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x00C6 /* LATIN CAPITAL LIGATURE AE */ },
-	{0xC7, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xCF, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xD0, 0x00D0 /* LATIN CAPITAL LETTER ETH */ },
-	{0xD1, 0x00D1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x00DE /* LATIN CAPITAL LETTER THORN */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x00E6 /* LATIN SMALL LIGATURE AE */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x00F0 /* LATIN SMALL LETTER ETH */ },
-	{0xF1, 0x00F1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x00FE /* LATIN SMALL LETTER THORN */ },
-	{0xFF, 0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0, 0}
+const uint16_t highhalf_cp1252 [] = {
+	/* 0x80 */ 0x20AC, /* EURO SIGN */
+	/* 0x81 */ 0xFFFF,
+	/* 0x82 */ 0x201A, /* SINGLE LOW-9 QUOTATION MARK */
+	/* 0x83 */ 0x0192, /* LATIN SMALL LETTER F WITH HOOK */
+	/* 0x84 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0x85 */ 0x2026, /* HORIZONTAL ELLIPSIS */
+	/* 0x86 */ 0x2020, /* DAGGER */
+	/* 0x87 */ 0x2021, /* DOUBLE DAGGER */
+	/* 0x88 */ 0x02C6, /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+	/* 0x89 */ 0x2030, /* PER MILLE SIGN */
+	/* 0x8A */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0x8B */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+	/* 0x8C */ 0x0152, /* LATIN CAPITAL LIGATURE OE */
+	/* 0x8D */ 0xFFFF,
+	/* 0x8E */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0x8F */ 0xFFFF,
+	/* 0x90 */ 0xFFFF,
+	/* 0x91 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0x92 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0x93 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0x94 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0x95 */ 0x2022, /* BULLET */
+	/* 0x96 */ 0x2013, /* EN DASH */
+	/* 0x97 */ 0x2014, /* EM DASH */
+	/* 0x98 */ 0x02DC, /* SMALL TILDE */
+	/* 0x99 */ 0x2122, /* TRADE MARK SIGN */
+	/* 0x9A */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0x9B */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+	/* 0x9C */ 0x0153, /* LATIN SMALL LIGATURE OE */
+	/* 0x9D */ 0xFFFF,
+	/* 0x9E */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0x9F */ 0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x00A5, /* YEN SIGN */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x00AA, /* FEMININE ORDINAL INDICATOR */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00AF, /* MACRON */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x00BA, /* MASCULINE ORDINAL INDICATOR */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xBF */ 0x00BF, /* INVERTED QUESTION MARK */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x00C6, /* LATIN CAPITAL LIGATURE AE */
+	/* 0xC7 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xCF */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD0 */ 0x00D0, /* LATIN CAPITAL LETTER ETH */
+	/* 0xD1 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x00DE, /* LATIN CAPITAL LETTER THORN */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x00E6, /* LATIN SMALL LIGATURE AE */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x00F0, /* LATIN SMALL LETTER ETH */
+	/* 0xF1 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x00FE, /* LATIN SMALL LETTER THORN */
+	/* 0xFF */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
 };
 
+#define table_cp1252 table_NULL
+
 unsigned char *const aliases_cp1252 [] = {
 	"windows-1252",
 	"1252",
@@ -2319,138 +2564,139 @@ unsigned char *const aliases_cp1252 [] = {
 
 /*** cp1256 ***/
 
-const struct table_entry table_cp1256 [] = {
-	{0x80, 0x20AC /* EURO SIGN */ },
-	{0x81, 0x067E /* ARABIC LETTER PEH */ },
-	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
-	{0x83, 0x0192 /* LATIN SMALL LETTER F WITH HOOK */ },
-	{0x84, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0x85, 0x2026 /* HORIZONTAL ELLIPSIS */ },
-	{0x86, 0x2020 /* DAGGER */ },
-	{0x87, 0x2021 /* DOUBLE DAGGER */ },
-	{0x88, 0x02C6 /* MODIFIER LETTER CIRCUMFLEX ACCENT */ },
-	{0x89, 0x2030 /* PER MILLE SIGN */ },
-	{0x8A, 0x0679 /* ARABIC LETTER TTEH */ },
-	{0x8B, 0x2039 /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ },
-	{0x8C, 0x0152 /* LATIN CAPITAL LIGATURE OE */ },
-	{0x8D, 0x0686 /* ARABIC LETTER TCHEH */ },
-	{0x8E, 0x0698 /* ARABIC LETTER JEH */ },
-	{0x8F, 0x0688 /* ARABIC LETTER DDAL */ },
-	{0x90, 0x06AF /* ARABIC LETTER GAF */ },
-	{0x91, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0x92, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0x93, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0x94, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0x95, 0x2022 /* BULLET */ },
-	{0x96, 0x2013 /* EN DASH */ },
-	{0x97, 0x2014 /* EM DASH */ },
-	{0x98, 0x06A9 /* ARABIC LETTER KEHEH */ },
-	{0x99, 0x2122 /* TRADE MARK SIGN */ },
-	{0x9A, 0x0691 /* ARABIC LETTER RREH */ },
-	{0x9B, 0x203A /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ },
-	{0x9C, 0x0153 /* LATIN SMALL LIGATURE OE */ },
-	{0x9D, 0x200C /* ZERO WIDTH NON-JOINER */ },
-	{0x9E, 0x200D /* ZERO WIDTH JOINER */ },
-	{0x9F, 0x06BA /* ARABIC LETTER NOON GHUNNA */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x060C /* ARABIC COMMA */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x00A5 /* YEN SIGN */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00A8 /* DIAERESIS */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x06BE /* ARABIC LETTER HEH DOACHASHMEE */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00AF /* MACRON */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00B8 /* CEDILLA */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x061B /* ARABIC SEMICOLON */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x00BE /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xBF, 0x061F /* ARABIC QUESTION MARK */ },
-	{0xC0, 0x06C1 /* ARABIC LETTER HEH GOAL */ },
-	{0xC1, 0x0621 /* ARABIC LETTER HAMZA */ },
-	{0xC2, 0x0622 /* ARABIC LETTER ALEF WITH MADDA ABOVE */ },
-	{0xC3, 0x0623 /* ARABIC LETTER ALEF WITH HAMZA ABOVE */ },
-	{0xC4, 0x0624 /* ARABIC LETTER WAW WITH HAMZA ABOVE */ },
-	{0xC5, 0x0625 /* ARABIC LETTER ALEF WITH HAMZA BELOW */ },
-	{0xC6, 0x0626 /* ARABIC LETTER YEH WITH HAMZA ABOVE */ },
-	{0xC7, 0x0627 /* ARABIC LETTER ALEF */ },
-	{0xC8, 0x0628 /* ARABIC LETTER BEH */ },
-	{0xC9, 0x0629 /* ARABIC LETTER TEH MARBUTA */ },
-	{0xCA, 0x062A /* ARABIC LETTER TEH */ },
-	{0xCB, 0x062B /* ARABIC LETTER THEH */ },
-	{0xCC, 0x062C /* ARABIC LETTER JEEM */ },
-	{0xCD, 0x062D /* ARABIC LETTER HAH */ },
-	{0xCE, 0x062E /* ARABIC LETTER KHAH */ },
-	{0xCF, 0x062F /* ARABIC LETTER DAL */ },
-	{0xD0, 0x0630 /* ARABIC LETTER THAL */ },
-	{0xD1, 0x0631 /* ARABIC LETTER REH */ },
-	{0xD2, 0x0632 /* ARABIC LETTER ZAIN */ },
-	{0xD3, 0x0633 /* ARABIC LETTER SEEN */ },
-	{0xD4, 0x0634 /* ARABIC LETTER SHEEN */ },
-	{0xD5, 0x0635 /* ARABIC LETTER SAD */ },
-	{0xD6, 0x0636 /* ARABIC LETTER DAD */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x0637 /* ARABIC LETTER TAH */ },
-	{0xD9, 0x0638 /* ARABIC LETTER ZAH */ },
-	{0xDA, 0x0639 /* ARABIC LETTER AIN */ },
-	{0xDB, 0x063A /* ARABIC LETTER GHAIN */ },
-	{0xDC, 0x0640 /* ARABIC TATWEEL */ },
-	{0xDD, 0x0641 /* ARABIC LETTER FEH */ },
-	{0xDE, 0x0642 /* ARABIC LETTER QAF */ },
-	{0xDF, 0x0643 /* ARABIC LETTER KAF */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x0644 /* ARABIC LETTER LAM */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x0645 /* ARABIC LETTER MEEM */ },
-	{0xE4, 0x0646 /* ARABIC LETTER NOON */ },
-	{0xE5, 0x0647 /* ARABIC LETTER HEH */ },
-	{0xE6, 0x0648 /* ARABIC LETTER WAW */ },
-	{0xE7, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0xEC, 0x0649 /* ARABIC LETTER ALEF MAKSURA */ },
-	{0xED, 0x064A /* ARABIC LETTER YEH */ },
-	{0xEE, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0xEF, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0xF0, 0x064B /* ARABIC FATHATAN */ },
-	{0xF1, 0x064C /* ARABIC DAMMATAN */ },
-	{0xF2, 0x064D /* ARABIC KASRATAN */ },
-	{0xF3, 0x064E /* ARABIC FATHA */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x064F /* ARABIC DAMMA */ },
-	{0xF6, 0x0650 /* ARABIC KASRA */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x0651 /* ARABIC SHADDA */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x0652 /* ARABIC SUKUN */ },
-	{0xFB, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x200E /* LEFT-TO-RIGHT MARK */ },
-	{0xFE, 0x200F /* RIGHT-TO-LEFT MARK */ },
-	{0xFF, 0x06D2 /* ARABIC LETTER YEH BARREE */ },
-	{0, 0}
+const uint16_t highhalf_cp1256 [] = {
+	/* 0x80 */ 0x20AC, /* EURO SIGN */
+	/* 0x81 */ 0x067E, /* ARABIC LETTER PEH */
+	/* 0x82 */ 0x201A, /* SINGLE LOW-9 QUOTATION MARK */
+	/* 0x83 */ 0x0192, /* LATIN SMALL LETTER F WITH HOOK */
+	/* 0x84 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0x85 */ 0x2026, /* HORIZONTAL ELLIPSIS */
+	/* 0x86 */ 0x2020, /* DAGGER */
+	/* 0x87 */ 0x2021, /* DOUBLE DAGGER */
+	/* 0x88 */ 0x02C6, /* MODIFIER LETTER CIRCUMFLEX ACCENT */
+	/* 0x89 */ 0x2030, /* PER MILLE SIGN */
+	/* 0x8A */ 0x0679, /* ARABIC LETTER TTEH */
+	/* 0x8B */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+	/* 0x8C */ 0x0152, /* LATIN CAPITAL LIGATURE OE */
+	/* 0x8D */ 0x0686, /* ARABIC LETTER TCHEH */
+	/* 0x8E */ 0x0698, /* ARABIC LETTER JEH */
+	/* 0x8F */ 0x0688, /* ARABIC LETTER DDAL */
+	/* 0x90 */ 0x06AF, /* ARABIC LETTER GAF */
+	/* 0x91 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0x92 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0x93 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0x94 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0x95 */ 0x2022, /* BULLET */
+	/* 0x96 */ 0x2013, /* EN DASH */
+	/* 0x97 */ 0x2014, /* EM DASH */
+	/* 0x98 */ 0x06A9, /* ARABIC LETTER KEHEH */
+	/* 0x99 */ 0x2122, /* TRADE MARK SIGN */
+	/* 0x9A */ 0x0691, /* ARABIC LETTER RREH */
+	/* 0x9B */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+	/* 0x9C */ 0x0153, /* LATIN SMALL LIGATURE OE */
+	/* 0x9D */ 0x200C, /* ZERO WIDTH NON-JOINER */
+	/* 0x9E */ 0x200D, /* ZERO WIDTH JOINER */
+	/* 0x9F */ 0x06BA, /* ARABIC LETTER NOON GHUNNA */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x060C, /* ARABIC COMMA */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x00A5, /* YEN SIGN */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00A8, /* DIAERESIS */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x06BE, /* ARABIC LETTER HEH DOACHASHMEE */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00AF, /* MACRON */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00B8, /* CEDILLA */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x061B, /* ARABIC SEMICOLON */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xBF */ 0x061F, /* ARABIC QUESTION MARK */
+	/* 0xC0 */ 0x06C1, /* ARABIC LETTER HEH GOAL */
+	/* 0xC1 */ 0x0621, /* ARABIC LETTER HAMZA */
+	/* 0xC2 */ 0x0622, /* ARABIC LETTER ALEF WITH MADDA ABOVE */
+	/* 0xC3 */ 0x0623, /* ARABIC LETTER ALEF WITH HAMZA ABOVE */
+	/* 0xC4 */ 0x0624, /* ARABIC LETTER WAW WITH HAMZA ABOVE */
+	/* 0xC5 */ 0x0625, /* ARABIC LETTER ALEF WITH HAMZA BELOW */
+	/* 0xC6 */ 0x0626, /* ARABIC LETTER YEH WITH HAMZA ABOVE */
+	/* 0xC7 */ 0x0627, /* ARABIC LETTER ALEF */
+	/* 0xC8 */ 0x0628, /* ARABIC LETTER BEH */
+	/* 0xC9 */ 0x0629, /* ARABIC LETTER TEH MARBUTA */
+	/* 0xCA */ 0x062A, /* ARABIC LETTER TEH */
+	/* 0xCB */ 0x062B, /* ARABIC LETTER THEH */
+	/* 0xCC */ 0x062C, /* ARABIC LETTER JEEM */
+	/* 0xCD */ 0x062D, /* ARABIC LETTER HAH */
+	/* 0xCE */ 0x062E, /* ARABIC LETTER KHAH */
+	/* 0xCF */ 0x062F, /* ARABIC LETTER DAL */
+	/* 0xD0 */ 0x0630, /* ARABIC LETTER THAL */
+	/* 0xD1 */ 0x0631, /* ARABIC LETTER REH */
+	/* 0xD2 */ 0x0632, /* ARABIC LETTER ZAIN */
+	/* 0xD3 */ 0x0633, /* ARABIC LETTER SEEN */
+	/* 0xD4 */ 0x0634, /* ARABIC LETTER SHEEN */
+	/* 0xD5 */ 0x0635, /* ARABIC LETTER SAD */
+	/* 0xD6 */ 0x0636, /* ARABIC LETTER DAD */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x0637, /* ARABIC LETTER TAH */
+	/* 0xD9 */ 0x0638, /* ARABIC LETTER ZAH */
+	/* 0xDA */ 0x0639, /* ARABIC LETTER AIN */
+	/* 0xDB */ 0x063A, /* ARABIC LETTER GHAIN */
+	/* 0xDC */ 0x0640, /* ARABIC TATWEEL */
+	/* 0xDD */ 0x0641, /* ARABIC LETTER FEH */
+	/* 0xDE */ 0x0642, /* ARABIC LETTER QAF */
+	/* 0xDF */ 0x0643, /* ARABIC LETTER KAF */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x0644, /* ARABIC LETTER LAM */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x0645, /* ARABIC LETTER MEEM */
+	/* 0xE4 */ 0x0646, /* ARABIC LETTER NOON */
+	/* 0xE5 */ 0x0647, /* ARABIC LETTER HEH */
+	/* 0xE6 */ 0x0648, /* ARABIC LETTER WAW */
+	/* 0xE7 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0xEC */ 0x0649, /* ARABIC LETTER ALEF MAKSURA */
+	/* 0xED */ 0x064A, /* ARABIC LETTER YEH */
+	/* 0xEE */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0xEF */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0xF0 */ 0x064B, /* ARABIC FATHATAN */
+	/* 0xF1 */ 0x064C, /* ARABIC DAMMATAN */
+	/* 0xF2 */ 0x064D, /* ARABIC KASRATAN */
+	/* 0xF3 */ 0x064E, /* ARABIC FATHA */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x064F, /* ARABIC DAMMA */
+	/* 0xF6 */ 0x0650, /* ARABIC KASRA */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x0651, /* ARABIC SHADDA */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x0652, /* ARABIC SUKUN */
+	/* 0xFB */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x200E, /* LEFT-TO-RIGHT MARK */
+	/* 0xFE */ 0x200F, /* RIGHT-TO-LEFT MARK */
+	/* 0xFF */ 0x06D2, /* ARABIC LETTER YEH BARREE */
 };
 
+#define table_cp1256 table_NULL
+
 unsigned char *const aliases_cp1256 [] = {
 	"windows-1256",
 	"1256",
@@ -2462,138 +2708,139 @@ unsigned char *const aliases_cp1256 [] = {
 
 /*** cp1257 ***/
 
-const struct table_entry table_cp1257 [] = {
-	{0x80, 0x20AC /* EURO SIGN */ },
-	{0x81, 0x0000 /* UNDEFINED */ },
-	{0x82, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
-	{0x83, 0x0000 /* UNDEFINED */ },
-	{0x84, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0x85, 0x2026 /* HORIZONTAL ELLIPSIS */ },
-	{0x86, 0x2020 /* DAGGER */ },
-	{0x87, 0x2021 /* DOUBLE DAGGER */ },
-	{0x88, 0x0000 /* UNDEFINED */ },
-	{0x89, 0x2030 /* PER MILLE SIGN */ },
-	{0x8A, 0x0000 /* UNDEFINED */ },
-	{0x8B, 0x2039 /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ },
-	{0x8C, 0x0000 /* UNDEFINED */ },
-	{0x8D, 0x00A8 /* DIAERESIS */ },
-	{0x8E, 0x02C7 /* CARON */ },
-	{0x8F, 0x00B8 /* CEDILLA */ },
-	{0x90, 0x0000 /* UNDEFINED */ },
-	{0x91, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0x92, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0x93, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0x94, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0x95, 0x2022 /* BULLET */ },
-	{0x96, 0x2013 /* EN DASH */ },
-	{0x97, 0x2014 /* EM DASH */ },
-	{0x98, 0x0000 /* UNDEFINED */ },
-	{0x99, 0x2122 /* TRADE MARK SIGN */ },
-	{0x9A, 0x0000 /* UNDEFINED */ },
-	{0x9B, 0x203A /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ },
-	{0x9C, 0x0000 /* UNDEFINED */ },
-	{0x9D, 0x00AF /* MACRON */ },
-	{0x9E, 0x02DB /* OGONEK */ },
-	{0x9F, 0x0000 /* UNDEFINED */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0000 /* UNDEFINED */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A4 /* CURRENCY SIGN */ },
-	{0xA5, 0x0000 /* UNDEFINED */ },
-	{0xA6, 0x00A6 /* BROKEN BAR */ },
-	{0xA7, 0x00A7 /* SECTION SIGN */ },
-	{0xA8, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x0156 /* LATIN CAPITAL LETTER R WITH CEDILLA */ },
-	{0xAB, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAC, 0x00AC /* NOT SIGN */ },
-	{0xAD, 0x00AD /* SOFT HYPHEN */ },
-	{0xAE, 0x00AE /* REGISTERED SIGN */ },
-	{0xAF, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xB0, 0x00B0 /* DEGREE SIGN */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xB3, 0x00B3 /* SUPERSCRIPT THREE */ },
-	{0xB4, 0x00B4 /* ACUTE ACCENT */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x00B6 /* PILCROW SIGN */ },
-	{0xB7, 0x00B7 /* MIDDLE DOT */ },
-	{0xB8, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xB9, 0x00B9 /* SUPERSCRIPT ONE */ },
-	{0xBA, 0x0157 /* LATIN SMALL LETTER R WITH CEDILLA */ },
-	{0xBB, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xBC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xBD, 0x00BD /* VULGAR FRACTION ONE HALF */ },
-	{0xBE, 0x00BE /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xBF, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xC0, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xC1, 0x012E /* LATIN CAPITAL LETTER I WITH OGONEK */ },
-	{0xC2, 0x0100 /* LATIN CAPITAL LETTER A WITH MACRON */ },
-	{0xC3, 0x0106 /* LATIN CAPITAL LETTER C WITH ACUTE */ },
-	{0xC4, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0xC5, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0xC6, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xC7, 0x0112 /* LATIN CAPITAL LETTER E WITH MACRON */ },
-	{0xC8, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x0179 /* LATIN CAPITAL LETTER Z WITH ACUTE */ },
-	{0xCB, 0x0116 /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ },
-	{0xCC, 0x0122 /* LATIN CAPITAL LETTER G WITH CEDILLA */ },
-	{0xCD, 0x0136 /* LATIN CAPITAL LETTER K WITH CEDILLA */ },
-	{0xCE, 0x012A /* LATIN CAPITAL LETTER I WITH MACRON */ },
-	{0xCF, 0x013B /* LATIN CAPITAL LETTER L WITH CEDILLA */ },
-	{0xD0, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xD1, 0x0143 /* LATIN CAPITAL LETTER N WITH ACUTE */ },
-	{0xD2, 0x0145 /* LATIN CAPITAL LETTER N WITH CEDILLA */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x014C /* LATIN CAPITAL LETTER O WITH MACRON */ },
-	{0xD5, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xD6, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0xD7, 0x00D7 /* MULTIPLICATION SIGN */ },
-	{0xD8, 0x0172 /* LATIN CAPITAL LETTER U WITH OGONEK */ },
-	{0xD9, 0x0141 /* LATIN CAPITAL LETTER L WITH STROKE */ },
-	{0xDA, 0x015A /* LATIN CAPITAL LETTER S WITH ACUTE */ },
-	{0xDB, 0x016A /* LATIN CAPITAL LETTER U WITH MACRON */ },
-	{0xDC, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0xDD, 0x017B /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xDE, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xDF, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xE0, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xE1, 0x012F /* LATIN SMALL LETTER I WITH OGONEK */ },
-	{0xE2, 0x0101 /* LATIN SMALL LETTER A WITH MACRON */ },
-	{0xE3, 0x0107 /* LATIN SMALL LETTER C WITH ACUTE */ },
-	{0xE4, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0xE5, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0xE6, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xE7, 0x0113 /* LATIN SMALL LETTER E WITH MACRON */ },
-	{0xE8, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x017A /* LATIN SMALL LETTER Z WITH ACUTE */ },
-	{0xEB, 0x0117 /* LATIN SMALL LETTER E WITH DOT ABOVE */ },
-	{0xEC, 0x0123 /* LATIN SMALL LETTER G WITH CEDILLA */ },
-	{0xED, 0x0137 /* LATIN SMALL LETTER K WITH CEDILLA */ },
-	{0xEE, 0x012B /* LATIN SMALL LETTER I WITH MACRON */ },
-	{0xEF, 0x013C /* LATIN SMALL LETTER L WITH CEDILLA */ },
-	{0xF0, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xF1, 0x0144 /* LATIN SMALL LETTER N WITH ACUTE */ },
-	{0xF2, 0x0146 /* LATIN SMALL LETTER N WITH CEDILLA */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x014D /* LATIN SMALL LETTER O WITH MACRON */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0xF7, 0x00F7 /* DIVISION SIGN */ },
-	{0xF8, 0x0173 /* LATIN SMALL LETTER U WITH OGONEK */ },
-	{0xF9, 0x0142 /* LATIN SMALL LETTER L WITH STROKE */ },
-	{0xFA, 0x015B /* LATIN SMALL LETTER S WITH ACUTE */ },
-	{0xFB, 0x016B /* LATIN SMALL LETTER U WITH MACRON */ },
-	{0xFC, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xFD, 0x017C /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xFE, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xFF, 0x02D9 /* DOT ABOVE */ },
-	{0, 0}
+const uint16_t highhalf_cp1257 [] = {
+	/* 0x80 */ 0x20AC, /* EURO SIGN */
+	/* 0x81 */ 0x0000, /* UNDEFINED */
+	/* 0x82 */ 0x201A, /* SINGLE LOW-9 QUOTATION MARK */
+	/* 0x83 */ 0x0000, /* UNDEFINED */
+	/* 0x84 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0x85 */ 0x2026, /* HORIZONTAL ELLIPSIS */
+	/* 0x86 */ 0x2020, /* DAGGER */
+	/* 0x87 */ 0x2021, /* DOUBLE DAGGER */
+	/* 0x88 */ 0x0000, /* UNDEFINED */
+	/* 0x89 */ 0x2030, /* PER MILLE SIGN */
+	/* 0x8A */ 0x0000, /* UNDEFINED */
+	/* 0x8B */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+	/* 0x8C */ 0x0000, /* UNDEFINED */
+	/* 0x8D */ 0x00A8, /* DIAERESIS */
+	/* 0x8E */ 0x02C7, /* CARON */
+	/* 0x8F */ 0x00B8, /* CEDILLA */
+	/* 0x90 */ 0x0000, /* UNDEFINED */
+	/* 0x91 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0x92 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0x93 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0x94 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0x95 */ 0x2022, /* BULLET */
+	/* 0x96 */ 0x2013, /* EN DASH */
+	/* 0x97 */ 0x2014, /* EM DASH */
+	/* 0x98 */ 0x0000, /* UNDEFINED */
+	/* 0x99 */ 0x2122, /* TRADE MARK SIGN */
+	/* 0x9A */ 0x0000, /* UNDEFINED */
+	/* 0x9B */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+	/* 0x9C */ 0x0000, /* UNDEFINED */
+	/* 0x9D */ 0x00AF, /* MACRON */
+	/* 0x9E */ 0x02DB, /* OGONEK */
+	/* 0x9F */ 0x0000, /* UNDEFINED */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0000, /* UNDEFINED */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xA5 */ 0x0000, /* UNDEFINED */
+	/* 0xA6 */ 0x00A6, /* BROKEN BAR */
+	/* 0xA7 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA8 */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x0156, /* LATIN CAPITAL LETTER R WITH CEDILLA */
+	/* 0xAB */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAC */ 0x00AC, /* NOT SIGN */
+	/* 0xAD */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xAE */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAF */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xB0 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xB3 */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xB4 */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xB7 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xB8 */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xB9 */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xBA */ 0x0157, /* LATIN SMALL LETTER R WITH CEDILLA */
+	/* 0xBB */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xBC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xBD */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xBE */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xBF */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xC0 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xC1 */ 0x012E, /* LATIN CAPITAL LETTER I WITH OGONEK */
+	/* 0xC2 */ 0x0100, /* LATIN CAPITAL LETTER A WITH MACRON */
+	/* 0xC3 */ 0x0106, /* LATIN CAPITAL LETTER C WITH ACUTE */
+	/* 0xC4 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0xC5 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0xC6 */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xC7 */ 0x0112, /* LATIN CAPITAL LETTER E WITH MACRON */
+	/* 0xC8 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+	/* 0xCB */ 0x0116, /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
+	/* 0xCC */ 0x0122, /* LATIN CAPITAL LETTER G WITH CEDILLA */
+	/* 0xCD */ 0x0136, /* LATIN CAPITAL LETTER K WITH CEDILLA */
+	/* 0xCE */ 0x012A, /* LATIN CAPITAL LETTER I WITH MACRON */
+	/* 0xCF */ 0x013B, /* LATIN CAPITAL LETTER L WITH CEDILLA */
+	/* 0xD0 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xD1 */ 0x0143, /* LATIN CAPITAL LETTER N WITH ACUTE */
+	/* 0xD2 */ 0x0145, /* LATIN CAPITAL LETTER N WITH CEDILLA */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x014C, /* LATIN CAPITAL LETTER O WITH MACRON */
+	/* 0xD5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xD6 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0xD7 */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0xD8 */ 0x0172, /* LATIN CAPITAL LETTER U WITH OGONEK */
+	/* 0xD9 */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
+	/* 0xDA */ 0x015A, /* LATIN CAPITAL LETTER S WITH ACUTE */
+	/* 0xDB */ 0x016A, /* LATIN CAPITAL LETTER U WITH MACRON */
+	/* 0xDC */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0xDD */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xDE */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xDF */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE0 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xE1 */ 0x012F, /* LATIN SMALL LETTER I WITH OGONEK */
+	/* 0xE2 */ 0x0101, /* LATIN SMALL LETTER A WITH MACRON */
+	/* 0xE3 */ 0x0107, /* LATIN SMALL LETTER C WITH ACUTE */
+	/* 0xE4 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0xE5 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0xE6 */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xE7 */ 0x0113, /* LATIN SMALL LETTER E WITH MACRON */
+	/* 0xE8 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
+	/* 0xEB */ 0x0117, /* LATIN SMALL LETTER E WITH DOT ABOVE */
+	/* 0xEC */ 0x0123, /* LATIN SMALL LETTER G WITH CEDILLA */
+	/* 0xED */ 0x0137, /* LATIN SMALL LETTER K WITH CEDILLA */
+	/* 0xEE */ 0x012B, /* LATIN SMALL LETTER I WITH MACRON */
+	/* 0xEF */ 0x013C, /* LATIN SMALL LETTER L WITH CEDILLA */
+	/* 0xF0 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xF1 */ 0x0144, /* LATIN SMALL LETTER N WITH ACUTE */
+	/* 0xF2 */ 0x0146, /* LATIN SMALL LETTER N WITH CEDILLA */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x014D, /* LATIN SMALL LETTER O WITH MACRON */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0xF7 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF8 */ 0x0173, /* LATIN SMALL LETTER U WITH OGONEK */
+	/* 0xF9 */ 0x0142, /* LATIN SMALL LETTER L WITH STROKE */
+	/* 0xFA */ 0x015B, /* LATIN SMALL LETTER S WITH ACUTE */
+	/* 0xFB */ 0x016B, /* LATIN SMALL LETTER U WITH MACRON */
+	/* 0xFC */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xFD */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xFE */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xFF */ 0x02D9, /* DOT ABOVE */
 };
 
+#define table_cp1257 table_NULL
+
 unsigned char *const aliases_cp1257 [] = {
 	"windows-1257",
 	"windows1257",
@@ -2606,138 +2853,139 @@ unsigned char *const aliases_cp1257 [] = {
 
 /*** cp437 ***/
 
-const struct table_entry table_cp437 [] = {
-	{0x80, 0x00c7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0x81, 0x00fc /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0x82, 0x00e9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0x83, 0x00e2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0x84, 0x00e4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0x85, 0x00e0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0x86, 0x00e5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0x87, 0x00e7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0x88, 0x00ea /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0x89, 0x00eb /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0x8a, 0x00e8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0x8b, 0x00ef /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0x8c, 0x00ee /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0x8d, 0x00ec /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0x8e, 0x00c4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0x8f, 0x00c5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0x90, 0x00c9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0x91, 0x00e6 /* LATIN SMALL LIGATURE AE */ },
-	{0x92, 0x00c6 /* LATIN CAPITAL LIGATURE AE */ },
-	{0x93, 0x00f4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0x94, 0x00f6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0x95, 0x00f2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0x96, 0x00fb /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0x97, 0x00f9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0x98, 0x00ff /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0x99, 0x00d6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0x9a, 0x00dc /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0x9b, 0x00a2 /* CENT SIGN */ },
-	{0x9c, 0x00a3 /* POUND SIGN */ },
-	{0x9d, 0x00a5 /* YEN SIGN */ },
-	{0x9e, 0x20a7 /* PESETA SIGN */ },
-	{0x9f, 0x0192 /* LATIN SMALL LETTER F WITH HOOK */ },
-	{0xa0, 0x00e1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xa1, 0x00ed /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xa2, 0x00f3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xa3, 0x00fa /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xa4, 0x00f1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xa5, 0x00d1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xa6, 0x00aa /* FEMININE ORDINAL INDICATOR */ },
-	{0xa7, 0x00ba /* MASCULINE ORDINAL INDICATOR */ },
-	{0xa8, 0x00bf /* INVERTED QUESTION MARK */ },
-	{0xa9, 0x2310 /* REVERSED NOT SIGN */ },
-	{0xaa, 0x00ac /* NOT SIGN */ },
-	{0xab, 0x00bd /* VULGAR FRACTION ONE HALF */ },
-	{0xac, 0x00bc /* VULGAR FRACTION ONE QUARTER */ },
-	{0xad, 0x00a1 /* INVERTED EXCLAMATION MARK */ },
-	{0xae, 0x00ab /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xaf, 0x00bb /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xb0, 0x2591 /* LIGHT SHADE */ },
-	{0xb1, 0x2592 /* MEDIUM SHADE */ },
-	{0xb2, 0x2593 /* DARK SHADE */ },
-	{0xb3, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0xb4, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0xb5, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xb6, 0x2562 /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ },
-	{0xb7, 0x2556 /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ },
-	{0xb8, 0x2555 /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ },
-	{0xb9, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xba, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xbb, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xbc, 0x255d /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xbd, 0x255c /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ },
-	{0xbe, 0x255b /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xbf, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0xc0, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0xc1, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0xc2, 0x252c /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0xc3, 0x251c /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0xc4, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0xc5, 0x253c /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0xc6, 0x255e /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xc7, 0x255f /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xc8, 0x255a /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xc9, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xca, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xcb, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xcc, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xcd, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xce, 0x256c /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xcf, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd0, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd1, 0x2564 /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd2, 0x2565 /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd3, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xd4, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xd5, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xd6, 0x2553 /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ },
-	{0xd7, 0x256b /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd8, 0x256a /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd9, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0xda, 0x250c /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0xdb, 0x2588 /* FULL BLOCK */ },
-	{0xdc, 0x2584 /* LOWER HALF BLOCK */ },
-	{0xdd, 0x258c /* LEFT HALF BLOCK */ },
-	{0xde, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0xdf, 0x2580 /* UPPER HALF BLOCK */ },
-	{0xe0, 0x03b1 /* GREEK SMALL LETTER ALPHA */ },
-	{0xe1, 0x00df /* LATIN SMALL LETTER SHARP S */ },
-	{0xe2, 0x0393 /* GREEK CAPITAL LETTER GAMMA */ },
-	{0xe3, 0x03c0 /* GREEK SMALL LETTER PI */ },
-	{0xe4, 0x03a3 /* GREEK CAPITAL LETTER SIGMA */ },
-	{0xe5, 0x03c3 /* GREEK SMALL LETTER SIGMA */ },
-	{0xe6, 0x00b5 /* MICRO SIGN */ },
-	{0xe7, 0x03c4 /* GREEK SMALL LETTER TAU */ },
-	{0xe8, 0x03a6 /* GREEK CAPITAL LETTER PHI */ },
-	{0xe9, 0x0398 /* GREEK CAPITAL LETTER THETA */ },
-	{0xea, 0x03a9 /* GREEK CAPITAL LETTER OMEGA */ },
-	{0xeb, 0x03b4 /* GREEK SMALL LETTER DELTA */ },
-	{0xec, 0x221e /* INFINITY */ },
-	{0xed, 0x03c6 /* GREEK SMALL LETTER PHI */ },
-	{0xee, 0x03b5 /* GREEK SMALL LETTER EPSILON */ },
-	{0xef, 0x2229 /* INTERSECTION */ },
-	{0xf0, 0x2261 /* IDENTICAL TO */ },
-	{0xf1, 0x00b1 /* PLUS-MINUS SIGN */ },
-	{0xf2, 0x2265 /* GREATER-THAN OR EQUAL TO */ },
-	{0xf3, 0x2264 /* LESS-THAN OR EQUAL TO */ },
-	{0xf4, 0x2320 /* TOP HALF INTEGRAL */ },
-	{0xf5, 0x2321 /* BOTTOM HALF INTEGRAL */ },
-	{0xf6, 0x00f7 /* DIVISION SIGN */ },
-	{0xf7, 0x2248 /* ALMOST EQUAL TO */ },
-	{0xf8, 0x00b0 /* DEGREE SIGN */ },
-	{0xf9, 0x2219 /* BULLET OPERATOR */ },
-	{0xfa, 0x00b7 /* MIDDLE DOT */ },
-	{0xfb, 0x221a /* SQUARE ROOT */ },
-	{0xfc, 0x207f /* SUPERSCRIPT LATIN SMALL LETTER N */ },
-	{0xfd, 0x00b2 /* SUPERSCRIPT TWO */ },
-	{0xfe, 0x25a0 /* BLACK SQUARE */ },
-	{0xff, 0x00a0 /* NO-BREAK SPACE */ },
-	{0, 0}
+const uint16_t highhalf_cp437 [] = {
+	/* 0x80 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0x81 */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0x82 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0x83 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0x84 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0x85 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0x86 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0x87 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0x88 */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0x89 */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0x8A */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0x8B */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0x8C */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0x8D */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0x8E */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0x8F */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0x90 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0x91 */ 0x00E6, /* LATIN SMALL LIGATURE AE */
+	/* 0x92 */ 0x00C6, /* LATIN CAPITAL LIGATURE AE */
+	/* 0x93 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0x94 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0x95 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0x96 */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0x97 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0x98 */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
+	/* 0x99 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0x9A */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0x9B */ 0x00A2, /* CENT SIGN */
+	/* 0x9C */ 0x00A3, /* POUND SIGN */
+	/* 0x9D */ 0x00A5, /* YEN SIGN */
+	/* 0x9E */ 0x20A7, /* PESETA SIGN */
+	/* 0x9F */ 0x0192, /* LATIN SMALL LETTER F WITH HOOK */
+	/* 0xA0 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xA1 */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xA2 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xA3 */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xA4 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xA5 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xA6 */ 0x00AA, /* FEMININE ORDINAL INDICATOR */
+	/* 0xA7 */ 0x00BA, /* MASCULINE ORDINAL INDICATOR */
+	/* 0xA8 */ 0x00BF, /* INVERTED QUESTION MARK */
+	/* 0xA9 */ 0x2310, /* REVERSED NOT SIGN */
+	/* 0xAA */ 0x00AC, /* NOT SIGN */
+	/* 0xAB */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xAC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xAD */ 0x00A1, /* INVERTED EXCLAMATION MARK */
+	/* 0xAE */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAF */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xB0 */ 0x2591, /* LIGHT SHADE */
+	/* 0xB1 */ 0x2592, /* MEDIUM SHADE */
+	/* 0xB2 */ 0x2593, /* DARK SHADE */
+	/* 0xB3 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0xB4 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0xB5 */ 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB6 */ 0x2562, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */
+	/* 0xB7 */ 0x2556, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */
+	/* 0xB8 */ 0x2555, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */
+	/* 0xB9 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xBA */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xBB */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xBC */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xBD */ 0x255C, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */
+	/* 0xBE */ 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */
+	/* 0xBF */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0xC0 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0xC1 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0xC2 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0xC3 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0xC4 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0xC5 */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0xC6 */ 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xC7 */ 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xC8 */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xC9 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xCA */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xCB */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xCC */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xCD */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xCE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xCF */ 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD0 */ 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD1 */ 0x2564, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD2 */ 0x2565, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD3 */ 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */
+	/* 0xD4 */ 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */
+	/* 0xD5 */ 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xD6 */ 0x2553, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */
+	/* 0xD7 */ 0x256B, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD8 */ 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD9 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0xDA */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0xDB */ 0x2588, /* FULL BLOCK */
+	/* 0xDC */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0xDD */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0xDE */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0xDF */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0xE0 */ 0x03B1, /* GREEK SMALL LETTER ALPHA */
+	/* 0xE1 */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE2 */ 0x0393, /* GREEK CAPITAL LETTER GAMMA */
+	/* 0xE3 */ 0x03C0, /* GREEK SMALL LETTER PI */
+	/* 0xE4 */ 0x03A3, /* GREEK CAPITAL LETTER SIGMA */
+	/* 0xE5 */ 0x03C3, /* GREEK SMALL LETTER SIGMA */
+	/* 0xE6 */ 0x00B5, /* MICRO SIGN */
+	/* 0xE7 */ 0x03C4, /* GREEK SMALL LETTER TAU */
+	/* 0xE8 */ 0x03A6, /* GREEK CAPITAL LETTER PHI */
+	/* 0xE9 */ 0x0398, /* GREEK CAPITAL LETTER THETA */
+	/* 0xEA */ 0x03A9, /* GREEK CAPITAL LETTER OMEGA */
+	/* 0xEB */ 0x03B4, /* GREEK SMALL LETTER DELTA */
+	/* 0xEC */ 0x221E, /* INFINITY */
+	/* 0xED */ 0x03C6, /* GREEK SMALL LETTER PHI */
+	/* 0xEE */ 0x03B5, /* GREEK SMALL LETTER EPSILON */
+	/* 0xEF */ 0x2229, /* INTERSECTION */
+	/* 0xF0 */ 0x2261, /* IDENTICAL TO */
+	/* 0xF1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xF2 */ 0x2265, /* GREATER-THAN OR EQUAL TO */
+	/* 0xF3 */ 0x2264, /* LESS-THAN OR EQUAL TO */
+	/* 0xF4 */ 0x2320, /* TOP HALF INTEGRAL */
+	/* 0xF5 */ 0x2321, /* BOTTOM HALF INTEGRAL */
+	/* 0xF6 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF7 */ 0x2248, /* ALMOST EQUAL TO */
+	/* 0xF8 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xF9 */ 0x2219, /* BULLET OPERATOR */
+	/* 0xFA */ 0x00B7, /* MIDDLE DOT */
+	/* 0xFB */ 0x221A, /* SQUARE ROOT */
+	/* 0xFC */ 0x207F, /* SUPERSCRIPT LATIN SMALL LETTER N */
+	/* 0xFD */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xFE */ 0x25A0, /* BLACK SQUARE */
+	/* 0xFF */ 0x00A0, /* NO-BREAK SPACE */
 };
 
+#define table_cp437 table_NULL
+
 unsigned char *const aliases_cp437 [] = {
 	"cp437",
 	"437",
@@ -2749,138 +2997,139 @@ unsigned char *const aliases_cp437 [] = {
 
 /*** cp737 ***/
 
-const struct table_entry table_cp737 [] = {
-	{0x80, 0x0391 /* GREEK CAPITAL LETTER ALPHA */ },
-	{0x81, 0x0392 /* GREEK CAPITAL LETTER BETA */ },
-	{0x82, 0x0393 /* GREEK CAPITAL LETTER GAMMA */ },
-	{0x83, 0x0394 /* GREEK CAPITAL LETTER DELTA */ },
-	{0x84, 0x0395 /* GREEK CAPITAL LETTER EPSILON */ },
-	{0x85, 0x0396 /* GREEK CAPITAL LETTER ZETA */ },
-	{0x86, 0x0397 /* GREEK CAPITAL LETTER ETA */ },
-	{0x87, 0x0398 /* GREEK CAPITAL LETTER THETA */ },
-	{0x88, 0x0399 /* GREEK CAPITAL LETTER IOTA */ },
-	{0x89, 0x039a /* GREEK CAPITAL LETTER KAPPA */ },
-	{0x8a, 0x039b /* GREEK CAPITAL LETTER LAMDA */ },
-	{0x8b, 0x039c /* GREEK CAPITAL LETTER MU */ },
-	{0x8c, 0x039d /* GREEK CAPITAL LETTER NU */ },
-	{0x8d, 0x039e /* GREEK CAPITAL LETTER XI */ },
-	{0x8e, 0x039f /* GREEK CAPITAL LETTER OMICRON */ },
-	{0x8f, 0x03a0 /* GREEK CAPITAL LETTER PI */ },
-	{0x90, 0x03a1 /* GREEK CAPITAL LETTER RHO */ },
-	{0x91, 0x03a3 /* GREEK CAPITAL LETTER SIGMA */ },
-	{0x92, 0x03a4 /* GREEK CAPITAL LETTER TAU */ },
-	{0x93, 0x03a5 /* GREEK CAPITAL LETTER UPSILON */ },
-	{0x94, 0x03a6 /* GREEK CAPITAL LETTER PHI */ },
-	{0x95, 0x03a7 /* GREEK CAPITAL LETTER CHI */ },
-	{0x96, 0x03a8 /* GREEK CAPITAL LETTER PSI */ },
-	{0x97, 0x03a9 /* GREEK CAPITAL LETTER OMEGA */ },
-	{0x98, 0x03b1 /* GREEK SMALL LETTER ALPHA */ },
-	{0x99, 0x03b2 /* GREEK SMALL LETTER BETA */ },
-	{0x9a, 0x03b3 /* GREEK SMALL LETTER GAMMA */ },
-	{0x9b, 0x03b4 /* GREEK SMALL LETTER DELTA */ },
-	{0x9c, 0x03b5 /* GREEK SMALL LETTER EPSILON */ },
-	{0x9d, 0x03b6 /* GREEK SMALL LETTER ZETA */ },
-	{0x9e, 0x03b7 /* GREEK SMALL LETTER ETA */ },
-	{0x9f, 0x03b8 /* GREEK SMALL LETTER THETA */ },
-	{0xa0, 0x03b9 /* GREEK SMALL LETTER IOTA */ },
-	{0xa1, 0x03ba /* GREEK SMALL LETTER KAPPA */ },
-	{0xa2, 0x03bb /* GREEK SMALL LETTER LAMDA */ },
-	{0xa3, 0x03bc /* GREEK SMALL LETTER MU */ },
-	{0xa4, 0x03bd /* GREEK SMALL LETTER NU */ },
-	{0xa5, 0x03be /* GREEK SMALL LETTER XI */ },
-	{0xa6, 0x03bf /* GREEK SMALL LETTER OMICRON */ },
-	{0xa7, 0x03c0 /* GREEK SMALL LETTER PI */ },
-	{0xa8, 0x03c1 /* GREEK SMALL LETTER RHO */ },
-	{0xa9, 0x03c3 /* GREEK SMALL LETTER SIGMA */ },
-	{0xaa, 0x03c2 /* GREEK SMALL LETTER FINAL SIGMA */ },
-	{0xab, 0x03c4 /* GREEK SMALL LETTER TAU */ },
-	{0xac, 0x03c5 /* GREEK SMALL LETTER UPSILON */ },
-	{0xad, 0x03c6 /* GREEK SMALL LETTER PHI */ },
-	{0xae, 0x03c7 /* GREEK SMALL LETTER CHI */ },
-	{0xaf, 0x03c8 /* GREEK SMALL LETTER PSI */ },
-	{0xb0, 0x2591 /* LIGHT SHADE */ },
-	{0xb1, 0x2592 /* MEDIUM SHADE */ },
-	{0xb2, 0x2593 /* DARK SHADE */ },
-	{0xb3, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0xb4, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0xb5, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xb6, 0x2562 /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ },
-	{0xb7, 0x2556 /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ },
-	{0xb8, 0x2555 /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ },
-	{0xb9, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xba, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xbb, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xbc, 0x255d /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xbd, 0x255c /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ },
-	{0xbe, 0x255b /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xbf, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0xc0, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0xc1, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0xc2, 0x252c /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0xc3, 0x251c /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0xc4, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0xc5, 0x253c /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0xc6, 0x255e /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xc7, 0x255f /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xc8, 0x255a /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xc9, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xca, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xcb, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xcc, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xcd, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xce, 0x256c /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xcf, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd0, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd1, 0x2564 /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd2, 0x2565 /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd3, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xd4, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xd5, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xd6, 0x2553 /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ },
-	{0xd7, 0x256b /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd8, 0x256a /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd9, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0xda, 0x250c /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0xdb, 0x2588 /* FULL BLOCK */ },
-	{0xdc, 0x2584 /* LOWER HALF BLOCK */ },
-	{0xdd, 0x258c /* LEFT HALF BLOCK */ },
-	{0xde, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0xdf, 0x2580 /* UPPER HALF BLOCK */ },
-	{0xe0, 0x03c9 /* GREEK SMALL LETTER OMEGA */ },
-	{0xe1, 0x03ac /* GREEK SMALL LETTER ALPHA WITH TONOS */ },
-	{0xe2, 0x03ad /* GREEK SMALL LETTER EPSILON WITH TONOS */ },
-	{0xe3, 0x03ae /* GREEK SMALL LETTER ETA WITH TONOS */ },
-	{0xe4, 0x03ca /* GREEK SMALL LETTER IOTA WITH DIALYTIKA */ },
-	{0xe5, 0x03af /* GREEK SMALL LETTER IOTA WITH TONOS */ },
-	{0xe6, 0x03cc /* GREEK SMALL LETTER OMICRON WITH TONOS */ },
-	{0xe7, 0x03cd /* GREEK SMALL LETTER UPSILON WITH TONOS */ },
-	{0xe8, 0x03cb /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ },
-	{0xe9, 0x03ce /* GREEK SMALL LETTER OMEGA WITH TONOS */ },
-	{0xea, 0x0386 /* GREEK CAPITAL LETTER ALPHA WITH TONOS */ },
-	{0xeb, 0x0388 /* GREEK CAPITAL LETTER EPSILON WITH TONOS */ },
-	{0xec, 0x0389 /* GREEK CAPITAL LETTER ETA WITH TONOS */ },
-	{0xed, 0x038a /* GREEK CAPITAL LETTER IOTA WITH TONOS */ },
-	{0xee, 0x038c /* GREEK CAPITAL LETTER OMICRON WITH TONOS */ },
-	{0xef, 0x038e /* GREEK CAPITAL LETTER UPSILON WITH TONOS */ },
-	{0xf0, 0x038f /* GREEK CAPITAL LETTER OMEGA WITH TONOS */ },
-	{0xf1, 0x00b1 /* PLUS-MINUS SIGN */ },
-	{0xf2, 0x2265 /* GREATER-THAN OR EQUAL TO */ },
-	{0xf3, 0x2264 /* LESS-THAN OR EQUAL TO */ },
-	{0xf4, 0x03aa /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ },
-	{0xf5, 0x03ab /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ },
-	{0xf6, 0x00f7 /* DIVISION SIGN */ },
-	{0xf7, 0x2248 /* ALMOST EQUAL TO */ },
-	{0xf8, 0x00b0 /* DEGREE SIGN */ },
-	{0xf9, 0x2219 /* BULLET OPERATOR */ },
-	{0xfa, 0x00b7 /* MIDDLE DOT */ },
-	{0xfb, 0x221a /* SQUARE ROOT */ },
-	{0xfc, 0x207f /* SUPERSCRIPT LATIN SMALL LETTER N */ },
-	{0xfd, 0x00b2 /* SUPERSCRIPT TWO */ },
-	{0xfe, 0x25a0 /* BLACK SQUARE */ },
-	{0xff, 0x00a0 /* NO-BREAK SPACE */ },
-	{0, 0}
+const uint16_t highhalf_cp737 [] = {
+	/* 0x80 */ 0x0391, /* GREEK CAPITAL LETTER ALPHA */
+	/* 0x81 */ 0x0392, /* GREEK CAPITAL LETTER BETA */
+	/* 0x82 */ 0x0393, /* GREEK CAPITAL LETTER GAMMA */
+	/* 0x83 */ 0x0394, /* GREEK CAPITAL LETTER DELTA */
+	/* 0x84 */ 0x0395, /* GREEK CAPITAL LETTER EPSILON */
+	/* 0x85 */ 0x0396, /* GREEK CAPITAL LETTER ZETA */
+	/* 0x86 */ 0x0397, /* GREEK CAPITAL LETTER ETA */
+	/* 0x87 */ 0x0398, /* GREEK CAPITAL LETTER THETA */
+	/* 0x88 */ 0x0399, /* GREEK CAPITAL LETTER IOTA */
+	/* 0x89 */ 0x039A, /* GREEK CAPITAL LETTER KAPPA */
+	/* 0x8A */ 0x039B, /* GREEK CAPITAL LETTER LAMDA */
+	/* 0x8B */ 0x039C, /* GREEK CAPITAL LETTER MU */
+	/* 0x8C */ 0x039D, /* GREEK CAPITAL LETTER NU */
+	/* 0x8D */ 0x039E, /* GREEK CAPITAL LETTER XI */
+	/* 0x8E */ 0x039F, /* GREEK CAPITAL LETTER OMICRON */
+	/* 0x8F */ 0x03A0, /* GREEK CAPITAL LETTER PI */
+	/* 0x90 */ 0x03A1, /* GREEK CAPITAL LETTER RHO */
+	/* 0x91 */ 0x03A3, /* GREEK CAPITAL LETTER SIGMA */
+	/* 0x92 */ 0x03A4, /* GREEK CAPITAL LETTER TAU */
+	/* 0x93 */ 0x03A5, /* GREEK CAPITAL LETTER UPSILON */
+	/* 0x94 */ 0x03A6, /* GREEK CAPITAL LETTER PHI */
+	/* 0x95 */ 0x03A7, /* GREEK CAPITAL LETTER CHI */
+	/* 0x96 */ 0x03A8, /* GREEK CAPITAL LETTER PSI */
+	/* 0x97 */ 0x03A9, /* GREEK CAPITAL LETTER OMEGA */
+	/* 0x98 */ 0x03B1, /* GREEK SMALL LETTER ALPHA */
+	/* 0x99 */ 0x03B2, /* GREEK SMALL LETTER BETA */
+	/* 0x9A */ 0x03B3, /* GREEK SMALL LETTER GAMMA */
+	/* 0x9B */ 0x03B4, /* GREEK SMALL LETTER DELTA */
+	/* 0x9C */ 0x03B5, /* GREEK SMALL LETTER EPSILON */
+	/* 0x9D */ 0x03B6, /* GREEK SMALL LETTER ZETA */
+	/* 0x9E */ 0x03B7, /* GREEK SMALL LETTER ETA */
+	/* 0x9F */ 0x03B8, /* GREEK SMALL LETTER THETA */
+	/* 0xA0 */ 0x03B9, /* GREEK SMALL LETTER IOTA */
+	/* 0xA1 */ 0x03BA, /* GREEK SMALL LETTER KAPPA */
+	/* 0xA2 */ 0x03BB, /* GREEK SMALL LETTER LAMDA */
+	/* 0xA3 */ 0x03BC, /* GREEK SMALL LETTER MU */
+	/* 0xA4 */ 0x03BD, /* GREEK SMALL LETTER NU */
+	/* 0xA5 */ 0x03BE, /* GREEK SMALL LETTER XI */
+	/* 0xA6 */ 0x03BF, /* GREEK SMALL LETTER OMICRON */
+	/* 0xA7 */ 0x03C0, /* GREEK SMALL LETTER PI */
+	/* 0xA8 */ 0x03C1, /* GREEK SMALL LETTER RHO */
+	/* 0xA9 */ 0x03C3, /* GREEK SMALL LETTER SIGMA */
+	/* 0xAA */ 0x03C2, /* GREEK SMALL LETTER FINAL SIGMA */
+	/* 0xAB */ 0x03C4, /* GREEK SMALL LETTER TAU */
+	/* 0xAC */ 0x03C5, /* GREEK SMALL LETTER UPSILON */
+	/* 0xAD */ 0x03C6, /* GREEK SMALL LETTER PHI */
+	/* 0xAE */ 0x03C7, /* GREEK SMALL LETTER CHI */
+	/* 0xAF */ 0x03C8, /* GREEK SMALL LETTER PSI */
+	/* 0xB0 */ 0x2591, /* LIGHT SHADE */
+	/* 0xB1 */ 0x2592, /* MEDIUM SHADE */
+	/* 0xB2 */ 0x2593, /* DARK SHADE */
+	/* 0xB3 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0xB4 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0xB5 */ 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB6 */ 0x2562, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */
+	/* 0xB7 */ 0x2556, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */
+	/* 0xB8 */ 0x2555, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */
+	/* 0xB9 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xBA */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xBB */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xBC */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xBD */ 0x255C, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */
+	/* 0xBE */ 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */
+	/* 0xBF */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0xC0 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0xC1 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0xC2 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0xC3 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0xC4 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0xC5 */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0xC6 */ 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xC7 */ 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xC8 */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xC9 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xCA */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xCB */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xCC */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xCD */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xCE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xCF */ 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD0 */ 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD1 */ 0x2564, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD2 */ 0x2565, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD3 */ 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */
+	/* 0xD4 */ 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */
+	/* 0xD5 */ 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xD6 */ 0x2553, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */
+	/* 0xD7 */ 0x256B, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD8 */ 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD9 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0xDA */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0xDB */ 0x2588, /* FULL BLOCK */
+	/* 0xDC */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0xDD */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0xDE */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0xDF */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0xE0 */ 0x03C9, /* GREEK SMALL LETTER OMEGA */
+	/* 0xE1 */ 0x03AC, /* GREEK SMALL LETTER ALPHA WITH TONOS */
+	/* 0xE2 */ 0x03AD, /* GREEK SMALL LETTER EPSILON WITH TONOS */
+	/* 0xE3 */ 0x03AE, /* GREEK SMALL LETTER ETA WITH TONOS */
+	/* 0xE4 */ 0x03CA, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA */
+	/* 0xE5 */ 0x03AF, /* GREEK SMALL LETTER IOTA WITH TONOS */
+	/* 0xE6 */ 0x03CC, /* GREEK SMALL LETTER OMICRON WITH TONOS */
+	/* 0xE7 */ 0x03CD, /* GREEK SMALL LETTER UPSILON WITH TONOS */
+	/* 0xE8 */ 0x03CB, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA */
+	/* 0xE9 */ 0x03CE, /* GREEK SMALL LETTER OMEGA WITH TONOS */
+	/* 0xEA */ 0x0386, /* GREEK CAPITAL LETTER ALPHA WITH TONOS */
+	/* 0xEB */ 0x0388, /* GREEK CAPITAL LETTER EPSILON WITH TONOS */
+	/* 0xEC */ 0x0389, /* GREEK CAPITAL LETTER ETA WITH TONOS */
+	/* 0xED */ 0x038A, /* GREEK CAPITAL LETTER IOTA WITH TONOS */
+	/* 0xEE */ 0x038C, /* GREEK CAPITAL LETTER OMICRON WITH TONOS */
+	/* 0xEF */ 0x038E, /* GREEK CAPITAL LETTER UPSILON WITH TONOS */
+	/* 0xF0 */ 0x038F, /* GREEK CAPITAL LETTER OMEGA WITH TONOS */
+	/* 0xF1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xF2 */ 0x2265, /* GREATER-THAN OR EQUAL TO */
+	/* 0xF3 */ 0x2264, /* LESS-THAN OR EQUAL TO */
+	/* 0xF4 */ 0x03AA, /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
+	/* 0xF5 */ 0x03AB, /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
+	/* 0xF6 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF7 */ 0x2248, /* ALMOST EQUAL TO */
+	/* 0xF8 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xF9 */ 0x2219, /* BULLET OPERATOR */
+	/* 0xFA */ 0x00B7, /* MIDDLE DOT */
+	/* 0xFB */ 0x221A, /* SQUARE ROOT */
+	/* 0xFC */ 0x207F, /* SUPERSCRIPT LATIN SMALL LETTER N */
+	/* 0xFD */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xFE */ 0x25A0, /* BLACK SQUARE */
+	/* 0xFF */ 0x00A0, /* NO-BREAK SPACE */
 };
 
+#define table_cp737 table_NULL
+
 unsigned char *const aliases_cp737 [] = {
 	"cp737",
 	"737",
@@ -2890,138 +3139,139 @@ unsigned char *const aliases_cp737 [] = {
 
 /*** cp850 ***/
 
-const struct table_entry table_cp850 [] = {
-	{0x80, 0x00c7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0x81, 0x00fc /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0x82, 0x00e9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0x83, 0x00e2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0x84, 0x00e4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0x85, 0x00e0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0x86, 0x00e5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0x87, 0x00e7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0x88, 0x00ea /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0x89, 0x00eb /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0x8a, 0x00e8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0x8b, 0x00ef /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0x8c, 0x00ee /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0x8d, 0x00ec /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0x8e, 0x00c4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0x8f, 0x00c5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0x90, 0x00c9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0x91, 0x00e6 /* LATIN SMALL LIGATURE AE */ },
-	{0x92, 0x00c6 /* LATIN CAPITAL LIGATURE AE */ },
-	{0x93, 0x00f4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0x94, 0x00f6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0x95, 0x00f2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0x96, 0x00fb /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0x97, 0x00f9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0x98, 0x00ff /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0x99, 0x00d6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0x9a, 0x00dc /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0x9b, 0x00f8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0x9c, 0x00a3 /* POUND SIGN */ },
-	{0x9d, 0x00d8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0x9e, 0x00d7 /* MULTIPLICATION SIGN */ },
-	{0x9f, 0x0192 /* LATIN SMALL LETTER F WITH HOOK */ },
-	{0xa0, 0x00e1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xa1, 0x00ed /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xa2, 0x00f3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xa3, 0x00fa /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xa4, 0x00f1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0xa5, 0x00d1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0xa6, 0x00aa /* FEMININE ORDINAL INDICATOR */ },
-	{0xa7, 0x00ba /* MASCULINE ORDINAL INDICATOR */ },
-	{0xa8, 0x00bf /* INVERTED QUESTION MARK */ },
-	{0xa9, 0x00ae /* REGISTERED SIGN */ },
-	{0xaa, 0x00ac /* NOT SIGN */ },
-	{0xab, 0x00bd /* VULGAR FRACTION ONE HALF */ },
-	{0xac, 0x00bc /* VULGAR FRACTION ONE QUARTER */ },
-	{0xad, 0x00a1 /* INVERTED EXCLAMATION MARK */ },
-	{0xae, 0x00ab /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xaf, 0x00bb /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xb0, 0x2591 /* LIGHT SHADE */ },
-	{0xb1, 0x2592 /* MEDIUM SHADE */ },
-	{0xb2, 0x2593 /* DARK SHADE */ },
-	{0xb3, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0xb4, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0xb5, 0x00c1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xb6, 0x00c2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xb7, 0x00c0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xb8, 0x00a9 /* COPYRIGHT SIGN */ },
-	{0xb9, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xba, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xbb, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xbc, 0x255d /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xbd, 0x00a2 /* CENT SIGN */ },
-	{0xbe, 0x00a5 /* YEN SIGN */ },
-	{0xbf, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0xc0, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0xc1, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0xc2, 0x252c /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0xc3, 0x251c /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0xc4, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0xc5, 0x253c /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0xc6, 0x00e3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xc7, 0x00c3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xc8, 0x255a /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xc9, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xca, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xcb, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xcc, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xcd, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xce, 0x256c /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xcf, 0x00a4 /* CURRENCY SIGN */ },
-	{0xd0, 0x00f0 /* LATIN SMALL LETTER ETH */ },
-	{0xd1, 0x00d0 /* LATIN CAPITAL LETTER ETH */ },
-	{0xd2, 0x00ca /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xd3, 0x00cb /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xd4, 0x00c8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xd5, 0x0131 /* LATIN SMALL LETTER DOTLESS I */ },
-	{0xd6, 0x00cd /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xd7, 0x00ce /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xd8, 0x00cf /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xd9, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0xda, 0x250c /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0xdb, 0x2588 /* FULL BLOCK */ },
-	{0xdc, 0x2584 /* LOWER HALF BLOCK */ },
-	{0xdd, 0x00a6 /* BROKEN BAR */ },
-	{0xde, 0x00cc /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xdf, 0x2580 /* UPPER HALF BLOCK */ },
-	{0xe0, 0x00d3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xe1, 0x00df /* LATIN SMALL LETTER SHARP S */ },
-	{0xe2, 0x00d4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xe3, 0x00d2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xe4, 0x00f5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xe5, 0x00d5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xe6, 0x00b5 /* MICRO SIGN */ },
-	{0xe7, 0x00fe /* LATIN SMALL LETTER THORN */ },
-	{0xe8, 0x00de /* LATIN CAPITAL LETTER THORN */ },
-	{0xe9, 0x00da /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xea, 0x00db /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xeb, 0x00d9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xec, 0x00fd /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xed, 0x00dd /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xee, 0x00af /* MACRON */ },
-	{0xef, 0x00b4 /* ACUTE ACCENT */ },
-	{0xf0, 0x00ad /* SOFT HYPHEN */ },
-	{0xf1, 0x00b1 /* PLUS-MINUS SIGN */ },
-	{0xf2, 0x2017 /* DOUBLE LOW LINE */ },
-	{0xf3, 0x00be /* VULGAR FRACTION THREE QUARTERS */ },
-	{0xf4, 0x00b6 /* PILCROW SIGN */ },
-	{0xf5, 0x00a7 /* SECTION SIGN */ },
-	{0xf6, 0x00f7 /* DIVISION SIGN */ },
-	{0xf7, 0x00b8 /* CEDILLA */ },
-	{0xf8, 0x00b0 /* DEGREE SIGN */ },
-	{0xf9, 0x00a8 /* DIAERESIS */ },
-	{0xfa, 0x00b7 /* MIDDLE DOT */ },
-	{0xfb, 0x00b9 /* SUPERSCRIPT ONE */ },
-	{0xfc, 0x00b3 /* SUPERSCRIPT THREE */ },
-	{0xfd, 0x00b2 /* SUPERSCRIPT TWO */ },
-	{0xfe, 0x25a0 /* BLACK SQUARE */ },
-	{0xff, 0x00a0 /* NO-BREAK SPACE */ },
-	{0, 0}
+const uint16_t highhalf_cp850 [] = {
+	/* 0x80 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0x81 */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0x82 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0x83 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0x84 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0x85 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0x86 */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0x87 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0x88 */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0x89 */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0x8A */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0x8B */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0x8C */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0x8D */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0x8E */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0x8F */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0x90 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0x91 */ 0x00E6, /* LATIN SMALL LIGATURE AE */
+	/* 0x92 */ 0x00C6, /* LATIN CAPITAL LIGATURE AE */
+	/* 0x93 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0x94 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0x95 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0x96 */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0x97 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0x98 */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
+	/* 0x99 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0x9A */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0x9B */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0x9C */ 0x00A3, /* POUND SIGN */
+	/* 0x9D */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0x9E */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0x9F */ 0x0192, /* LATIN SMALL LETTER F WITH HOOK */
+	/* 0xA0 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xA1 */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xA2 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xA3 */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xA4 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0xA5 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0xA6 */ 0x00AA, /* FEMININE ORDINAL INDICATOR */
+	/* 0xA7 */ 0x00BA, /* MASCULINE ORDINAL INDICATOR */
+	/* 0xA8 */ 0x00BF, /* INVERTED QUESTION MARK */
+	/* 0xA9 */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xAA */ 0x00AC, /* NOT SIGN */
+	/* 0xAB */ 0x00BD, /* VULGAR FRACTION ONE HALF */
+	/* 0xAC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xAD */ 0x00A1, /* INVERTED EXCLAMATION MARK */
+	/* 0xAE */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAF */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xB0 */ 0x2591, /* LIGHT SHADE */
+	/* 0xB1 */ 0x2592, /* MEDIUM SHADE */
+	/* 0xB2 */ 0x2593, /* DARK SHADE */
+	/* 0xB3 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0xB4 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0xB5 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xB6 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xB7 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xB8 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xB9 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xBA */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xBB */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xBC */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xBD */ 0x00A2, /* CENT SIGN */
+	/* 0xBE */ 0x00A5, /* YEN SIGN */
+	/* 0xBF */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0xC0 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0xC1 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0xC2 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0xC3 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0xC4 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0xC5 */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0xC6 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xC7 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC8 */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xC9 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xCA */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xCB */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xCC */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xCD */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xCE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xCF */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xD0 */ 0x00F0, /* LATIN SMALL LETTER ETH */
+	/* 0xD1 */ 0x00D0, /* LATIN CAPITAL LETTER ETH */
+	/* 0xD2 */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xD3 */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xD4 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xD5 */ 0x0131, /* LATIN SMALL LETTER DOTLESS I */
+	/* 0xD6 */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xD7 */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xD8 */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xD9 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0xDA */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0xDB */ 0x2588, /* FULL BLOCK */
+	/* 0xDC */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0xDD */ 0x00A6, /* BROKEN BAR */
+	/* 0xDE */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xDF */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0xE0 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xE1 */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE2 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xE4 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xE5 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xE6 */ 0x00B5, /* MICRO SIGN */
+	/* 0xE7 */ 0x00FE, /* LATIN SMALL LETTER THORN */
+	/* 0xE8 */ 0x00DE, /* LATIN CAPITAL LETTER THORN */
+	/* 0xE9 */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xEA */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xEB */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xEC */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xED */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xEE */ 0x00AF, /* MACRON */
+	/* 0xEF */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xF0 */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xF1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xF2 */ 0x2017, /* DOUBLE LOW LINE */
+	/* 0xF3 */ 0x00BE, /* VULGAR FRACTION THREE QUARTERS */
+	/* 0xF4 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xF5 */ 0x00A7, /* SECTION SIGN */
+	/* 0xF6 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF7 */ 0x00B8, /* CEDILLA */
+	/* 0xF8 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xF9 */ 0x00A8, /* DIAERESIS */
+	/* 0xFA */ 0x00B7, /* MIDDLE DOT */
+	/* 0xFB */ 0x00B9, /* SUPERSCRIPT ONE */
+	/* 0xFC */ 0x00B3, /* SUPERSCRIPT THREE */
+	/* 0xFD */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xFE */ 0x25A0, /* BLACK SQUARE */
+	/* 0xFF */ 0x00A0, /* NO-BREAK SPACE */
 };
 
+#define table_cp850 table_NULL
+
 unsigned char *const aliases_cp850 [] = {
 	"cp850",
 	"850",
@@ -3033,138 +3283,139 @@ unsigned char *const aliases_cp850 [] = {
 
 /*** cp852 ***/
 
-const struct table_entry table_cp852 [] = {
-	{0x80, 0x00c7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0x81, 0x00fc /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0x82, 0x00e9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0x83, 0x00e2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0x84, 0x00e4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0x85, 0x016f /* LATIN SMALL LETTER U WITH RING ABOVE */ },
-	{0x86, 0x0107 /* LATIN SMALL LETTER C WITH ACUTE */ },
-	{0x87, 0x00e7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0x88, 0x0142 /* LATIN SMALL LETTER L WITH STROKE */ },
-	{0x89, 0x00eb /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0x8a, 0x0150 /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ },
-	{0x8b, 0x0151 /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */ },
-	{0x8c, 0x00ee /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0x8d, 0x0179 /* LATIN CAPITAL LETTER Z WITH ACUTE */ },
-	{0x8e, 0x00c4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0x8f, 0x0106 /* LATIN CAPITAL LETTER C WITH ACUTE */ },
-	{0x90, 0x00c9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0x91, 0x0139 /* LATIN CAPITAL LETTER L WITH ACUTE */ },
-	{0x92, 0x013a /* LATIN SMALL LETTER L WITH ACUTE */ },
-	{0x93, 0x00f4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0x94, 0x00f6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0x95, 0x013d /* LATIN CAPITAL LETTER L WITH CARON */ },
-	{0x96, 0x013e /* LATIN SMALL LETTER L WITH CARON */ },
-	{0x97, 0x015a /* LATIN CAPITAL LETTER S WITH ACUTE */ },
-	{0x98, 0x015b /* LATIN SMALL LETTER S WITH ACUTE */ },
-	{0x99, 0x00d6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0x9a, 0x00dc /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0x9b, 0x0164 /* LATIN CAPITAL LETTER T WITH CARON */ },
-	{0x9c, 0x0165 /* LATIN SMALL LETTER T WITH CARON */ },
-	{0x9d, 0x0141 /* LATIN CAPITAL LETTER L WITH STROKE */ },
-	{0x9e, 0x00d7 /* MULTIPLICATION SIGN */ },
-	{0x9f, 0x010d /* LATIN SMALL LETTER C WITH CARON */ },
-	{0xa0, 0x00e1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xa1, 0x00ed /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xa2, 0x00f3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xa3, 0x00fa /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xa4, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0xa5, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0xa6, 0x017d /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xa7, 0x017e /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xa8, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xa9, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xaa, 0x00ac /* NOT SIGN */ },
-	{0xab, 0x017a /* LATIN SMALL LETTER Z WITH ACUTE */ },
-	{0xac, 0x010c /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0xad, 0x015f /* LATIN SMALL LETTER S WITH CEDILLA */ },
-	{0xae, 0x00ab /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xaf, 0x00bb /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xb0, 0x2591 /* LIGHT SHADE */ },
-	{0xb1, 0x2592 /* MEDIUM SHADE */ },
-	{0xb2, 0x2593 /* DARK SHADE */ },
-	{0xb3, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0xb4, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0xb5, 0x00c1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xb6, 0x00c2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xb7, 0x011a /* LATIN CAPITAL LETTER E WITH CARON */ },
-	{0xb8, 0x015e /* LATIN CAPITAL LETTER S WITH CEDILLA */ },
-	{0xb9, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xba, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xbb, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xbc, 0x255d /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xbd, 0x017b /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xbe, 0x017c /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xbf, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0xc0, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0xc1, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0xc2, 0x252c /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0xc3, 0x251c /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0xc4, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0xc5, 0x253c /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0xc6, 0x0102 /* LATIN CAPITAL LETTER A WITH BREVE */ },
-	{0xc7, 0x0103 /* LATIN SMALL LETTER A WITH BREVE */ },
-	{0xc8, 0x255a /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xc9, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xca, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xcb, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xcc, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xcd, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xce, 0x256c /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xcf, 0x00a4 /* CURRENCY SIGN */ },
-	{0xd0, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xd1, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xd2, 0x010e /* LATIN CAPITAL LETTER D WITH CARON */ },
-	{0xd3, 0x00cb /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xd4, 0x010f /* LATIN SMALL LETTER D WITH CARON */ },
-	{0xd5, 0x0147 /* LATIN CAPITAL LETTER N WITH CARON */ },
-	{0xd6, 0x00cd /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xd7, 0x00ce /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xd8, 0x011b /* LATIN SMALL LETTER E WITH CARON */ },
-	{0xd9, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0xda, 0x250c /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0xdb, 0x2588 /* FULL BLOCK */ },
-	{0xdc, 0x2584 /* LOWER HALF BLOCK */ },
-	{0xdd, 0x0162 /* LATIN CAPITAL LETTER T WITH CEDILLA */ },
-	{0xde, 0x016e /* LATIN CAPITAL LETTER U WITH RING ABOVE */ },
-	{0xdf, 0x2580 /* UPPER HALF BLOCK */ },
-	{0xe0, 0x00d3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xe1, 0x00df /* LATIN SMALL LETTER SHARP S */ },
-	{0xe2, 0x00d4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xe3, 0x0143 /* LATIN CAPITAL LETTER N WITH ACUTE */ },
-	{0xe4, 0x0144 /* LATIN SMALL LETTER N WITH ACUTE */ },
-	{0xe5, 0x0148 /* LATIN SMALL LETTER N WITH CARON */ },
-	{0xe6, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xe7, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xe8, 0x0154 /* LATIN CAPITAL LETTER R WITH ACUTE */ },
-	{0xe9, 0x00da /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xea, 0x0155 /* LATIN SMALL LETTER R WITH ACUTE */ },
-	{0xeb, 0x0170 /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ },
-	{0xec, 0x00fd /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xed, 0x00dd /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xee, 0x0163 /* LATIN SMALL LETTER T WITH CEDILLA */ },
-	{0xef, 0x00b4 /* ACUTE ACCENT */ },
-	{0xf0, 0x00ad /* SOFT HYPHEN */ },
-	{0xf1, 0x02dd /* DOUBLE ACUTE ACCENT */ },
-	{0xf2, 0x02db /* OGONEK */ },
-	{0xf3, 0x02c7 /* CARON */ },
-	{0xf4, 0x02d8 /* BREVE */ },
-	{0xf5, 0x00a7 /* SECTION SIGN */ },
-	{0xf6, 0x00f7 /* DIVISION SIGN */ },
-	{0xf7, 0x00b8 /* CEDILLA */ },
-	{0xf8, 0x00b0 /* DEGREE SIGN */ },
-	{0xf9, 0x00a8 /* DIAERESIS */ },
-	{0xfa, 0x02d9 /* DOT ABOVE */ },
-	{0xfb, 0x0171 /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */ },
-	{0xfc, 0x0158 /* LATIN CAPITAL LETTER R WITH CARON */ },
-	{0xfd, 0x0159 /* LATIN SMALL LETTER R WITH CARON */ },
-	{0xfe, 0x25a0 /* BLACK SQUARE */ },
-	{0xff, 0x00a0 /* NO-BREAK SPACE */ },
-	{0, 0}
+const uint16_t highhalf_cp852 [] = {
+	/* 0x80 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0x81 */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0x82 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0x83 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0x84 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0x85 */ 0x016F, /* LATIN SMALL LETTER U WITH RING ABOVE */
+	/* 0x86 */ 0x0107, /* LATIN SMALL LETTER C WITH ACUTE */
+	/* 0x87 */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0x88 */ 0x0142, /* LATIN SMALL LETTER L WITH STROKE */
+	/* 0x89 */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0x8A */ 0x0150, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+	/* 0x8B */ 0x0151, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+	/* 0x8C */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0x8D */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+	/* 0x8E */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0x8F */ 0x0106, /* LATIN CAPITAL LETTER C WITH ACUTE */
+	/* 0x90 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0x91 */ 0x0139, /* LATIN CAPITAL LETTER L WITH ACUTE */
+	/* 0x92 */ 0x013A, /* LATIN SMALL LETTER L WITH ACUTE */
+	/* 0x93 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0x94 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0x95 */ 0x013D, /* LATIN CAPITAL LETTER L WITH CARON */
+	/* 0x96 */ 0x013E, /* LATIN SMALL LETTER L WITH CARON */
+	/* 0x97 */ 0x015A, /* LATIN CAPITAL LETTER S WITH ACUTE */
+	/* 0x98 */ 0x015B, /* LATIN SMALL LETTER S WITH ACUTE */
+	/* 0x99 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0x9A */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0x9B */ 0x0164, /* LATIN CAPITAL LETTER T WITH CARON */
+	/* 0x9C */ 0x0165, /* LATIN SMALL LETTER T WITH CARON */
+	/* 0x9D */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
+	/* 0x9E */ 0x00D7, /* MULTIPLICATION SIGN */
+	/* 0x9F */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0xA0 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xA1 */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xA2 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xA3 */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xA4 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0xA5 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0xA6 */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xA7 */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xA8 */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xA9 */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xAA */ 0x00AC, /* NOT SIGN */
+	/* 0xAB */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
+	/* 0xAC */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0xAD */ 0x015F, /* LATIN SMALL LETTER S WITH CEDILLA */
+	/* 0xAE */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAF */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xB0 */ 0x2591, /* LIGHT SHADE */
+	/* 0xB1 */ 0x2592, /* MEDIUM SHADE */
+	/* 0xB2 */ 0x2593, /* DARK SHADE */
+	/* 0xB3 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0xB4 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0xB5 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xB6 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xB7 */ 0x011A, /* LATIN CAPITAL LETTER E WITH CARON */
+	/* 0xB8 */ 0x015E, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+	/* 0xB9 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xBA */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xBB */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xBC */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xBD */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xBE */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xBF */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0xC0 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0xC1 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0xC2 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0xC3 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0xC4 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0xC5 */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0xC6 */ 0x0102, /* LATIN CAPITAL LETTER A WITH BREVE */
+	/* 0xC7 */ 0x0103, /* LATIN SMALL LETTER A WITH BREVE */
+	/* 0xC8 */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xC9 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xCA */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xCB */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xCC */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xCD */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xCE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xCF */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xD0 */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xD1 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xD2 */ 0x010E, /* LATIN CAPITAL LETTER D WITH CARON */
+	/* 0xD3 */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xD4 */ 0x010F, /* LATIN SMALL LETTER D WITH CARON */
+	/* 0xD5 */ 0x0147, /* LATIN CAPITAL LETTER N WITH CARON */
+	/* 0xD6 */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xD7 */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xD8 */ 0x011B, /* LATIN SMALL LETTER E WITH CARON */
+	/* 0xD9 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0xDA */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0xDB */ 0x2588, /* FULL BLOCK */
+	/* 0xDC */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0xDD */ 0x0162, /* LATIN CAPITAL LETTER T WITH CEDILLA */
+	/* 0xDE */ 0x016E, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+	/* 0xDF */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0xE0 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xE1 */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xE2 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x0143, /* LATIN CAPITAL LETTER N WITH ACUTE */
+	/* 0xE4 */ 0x0144, /* LATIN SMALL LETTER N WITH ACUTE */
+	/* 0xE5 */ 0x0148, /* LATIN SMALL LETTER N WITH CARON */
+	/* 0xE6 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xE7 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xE8 */ 0x0154, /* LATIN CAPITAL LETTER R WITH ACUTE */
+	/* 0xE9 */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xEA */ 0x0155, /* LATIN SMALL LETTER R WITH ACUTE */
+	/* 0xEB */ 0x0170, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+	/* 0xEC */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xED */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xEE */ 0x0163, /* LATIN SMALL LETTER T WITH CEDILLA */
+	/* 0xEF */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xF0 */ 0x00AD, /* SOFT HYPHEN */
+	/* 0xF1 */ 0x02DD, /* DOUBLE ACUTE ACCENT */
+	/* 0xF2 */ 0x02DB, /* OGONEK */
+	/* 0xF3 */ 0x02C7, /* CARON */
+	/* 0xF4 */ 0x02D8, /* BREVE */
+	/* 0xF5 */ 0x00A7, /* SECTION SIGN */
+	/* 0xF6 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF7 */ 0x00B8, /* CEDILLA */
+	/* 0xF8 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xF9 */ 0x00A8, /* DIAERESIS */
+	/* 0xFA */ 0x02D9, /* DOT ABOVE */
+	/* 0xFB */ 0x0171, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+	/* 0xFC */ 0x0158, /* LATIN CAPITAL LETTER R WITH CARON */
+	/* 0xFD */ 0x0159, /* LATIN SMALL LETTER R WITH CARON */
+	/* 0xFE */ 0x25A0, /* BLACK SQUARE */
+	/* 0xFF */ 0x00A0, /* NO-BREAK SPACE */
 };
 
+#define table_cp852 table_NULL
+
 unsigned char *const aliases_cp852 [] = {
 	"cp852",
 	"852",
@@ -3175,138 +3426,139 @@ unsigned char *const aliases_cp852 [] = {
 
 /*** cp866 ***/
 
-const struct table_entry table_cp866 [] = {
-	{0x80, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
-	{0x81, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
-	{0x82, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
-	{0x83, 0x0413 /* CYRILLIC CAPITAL LETTER GHE */ },
-	{0x84, 0x0414 /* CYRILLIC CAPITAL LETTER DE */ },
-	{0x85, 0x0415 /* CYRILLIC CAPITAL LETTER IE */ },
-	{0x86, 0x0416 /* CYRILLIC CAPITAL LETTER ZHE */ },
-	{0x87, 0x0417 /* CYRILLIC CAPITAL LETTER ZE */ },
-	{0x88, 0x0418 /* CYRILLIC CAPITAL LETTER I */ },
-	{0x89, 0x0419 /* CYRILLIC CAPITAL LETTER SHORT I */ },
-	{0x8a, 0x041a /* CYRILLIC CAPITAL LETTER KA */ },
-	{0x8b, 0x041b /* CYRILLIC CAPITAL LETTER EL */ },
-	{0x8c, 0x041c /* CYRILLIC CAPITAL LETTER EM */ },
-	{0x8d, 0x041d /* CYRILLIC CAPITAL LETTER EN */ },
-	{0x8e, 0x041e /* CYRILLIC CAPITAL LETTER O */ },
-	{0x8f, 0x041f /* CYRILLIC CAPITAL LETTER PE */ },
-	{0x90, 0x0420 /* CYRILLIC CAPITAL LETTER ER */ },
-	{0x91, 0x0421 /* CYRILLIC CAPITAL LETTER ES */ },
-	{0x92, 0x0422 /* CYRILLIC CAPITAL LETTER TE */ },
-	{0x93, 0x0423 /* CYRILLIC CAPITAL LETTER U */ },
-	{0x94, 0x0424 /* CYRILLIC CAPITAL LETTER EF */ },
-	{0x95, 0x0425 /* CYRILLIC CAPITAL LETTER HA */ },
-	{0x96, 0x0426 /* CYRILLIC CAPITAL LETTER TSE */ },
-	{0x97, 0x0427 /* CYRILLIC CAPITAL LETTER CHE */ },
-	{0x98, 0x0428 /* CYRILLIC CAPITAL LETTER SHA */ },
-	{0x99, 0x0429 /* CYRILLIC CAPITAL LETTER SHCHA */ },
-	{0x9a, 0x042a /* CYRILLIC CAPITAL LETTER HARD SIGN */ },
-	{0x9b, 0x042b /* CYRILLIC CAPITAL LETTER YERU */ },
-	{0x9c, 0x042c /* CYRILLIC CAPITAL LETTER SOFT SIGN */ },
-	{0x9d, 0x042d /* CYRILLIC CAPITAL LETTER E */ },
-	{0x9e, 0x042e /* CYRILLIC CAPITAL LETTER YU */ },
-	{0x9f, 0x042f /* CYRILLIC CAPITAL LETTER YA */ },
-	{0xa0, 0x0430 /* CYRILLIC SMALL LETTER A */ },
-	{0xa1, 0x0431 /* CYRILLIC SMALL LETTER BE */ },
-	{0xa2, 0x0432 /* CYRILLIC SMALL LETTER VE */ },
-	{0xa3, 0x0433 /* CYRILLIC SMALL LETTER GHE */ },
-	{0xa4, 0x0434 /* CYRILLIC SMALL LETTER DE */ },
-	{0xa5, 0x0435 /* CYRILLIC SMALL LETTER IE */ },
-	{0xa6, 0x0436 /* CYRILLIC SMALL LETTER ZHE */ },
-	{0xa7, 0x0437 /* CYRILLIC SMALL LETTER ZE */ },
-	{0xa8, 0x0438 /* CYRILLIC SMALL LETTER I */ },
-	{0xa9, 0x0439 /* CYRILLIC SMALL LETTER SHORT I */ },
-	{0xaa, 0x043a /* CYRILLIC SMALL LETTER KA */ },
-	{0xab, 0x043b /* CYRILLIC SMALL LETTER EL */ },
-	{0xac, 0x043c /* CYRILLIC SMALL LETTER EM */ },
-	{0xad, 0x043d /* CYRILLIC SMALL LETTER EN */ },
-	{0xae, 0x043e /* CYRILLIC SMALL LETTER O */ },
-	{0xaf, 0x043f /* CYRILLIC SMALL LETTER PE */ },
-	{0xb0, 0x2591 /* LIGHT SHADE */ },
-	{0xb1, 0x2592 /* MEDIUM SHADE */ },
-	{0xb2, 0x2593 /* DARK SHADE */ },
-	{0xb3, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0xb4, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0xb5, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xb6, 0x2562 /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ },
-	{0xb7, 0x2556 /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ },
-	{0xb8, 0x2555 /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ },
-	{0xb9, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xba, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xbb, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xbc, 0x255d /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xbd, 0x255c /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ },
-	{0xbe, 0x255b /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xbf, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0xc0, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0xc1, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0xc2, 0x252c /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0xc3, 0x251c /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0xc4, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0xc5, 0x253c /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0xc6, 0x255e /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xc7, 0x255f /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xc8, 0x255a /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xc9, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xca, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xcb, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xcc, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xcd, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xce, 0x256c /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xcf, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd0, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd1, 0x2564 /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd2, 0x2565 /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd3, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xd4, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xd5, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xd6, 0x2553 /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ },
-	{0xd7, 0x256b /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd8, 0x256a /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd9, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0xda, 0x250c /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0xdb, 0x2588 /* FULL BLOCK */ },
-	{0xdc, 0x2584 /* LOWER HALF BLOCK */ },
-	{0xdd, 0x258c /* LEFT HALF BLOCK */ },
-	{0xde, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0xdf, 0x2580 /* UPPER HALF BLOCK */ },
-	{0xe0, 0x0440 /* CYRILLIC SMALL LETTER ER */ },
-	{0xe1, 0x0441 /* CYRILLIC SMALL LETTER ES */ },
-	{0xe2, 0x0442 /* CYRILLIC SMALL LETTER TE */ },
-	{0xe3, 0x0443 /* CYRILLIC SMALL LETTER U */ },
-	{0xe4, 0x0444 /* CYRILLIC SMALL LETTER EF */ },
-	{0xe5, 0x0445 /* CYRILLIC SMALL LETTER HA */ },
-	{0xe6, 0x0446 /* CYRILLIC SMALL LETTER TSE */ },
-	{0xe7, 0x0447 /* CYRILLIC SMALL LETTER CHE */ },
-	{0xe8, 0x0448 /* CYRILLIC SMALL LETTER SHA */ },
-	{0xe9, 0x0449 /* CYRILLIC SMALL LETTER SHCHA */ },
-	{0xea, 0x044a /* CYRILLIC SMALL LETTER HARD SIGN */ },
-	{0xeb, 0x044b /* CYRILLIC SMALL LETTER YERU */ },
-	{0xec, 0x044c /* CYRILLIC SMALL LETTER SOFT SIGN */ },
-	{0xed, 0x044d /* CYRILLIC SMALL LETTER E */ },
-	{0xee, 0x044e /* CYRILLIC SMALL LETTER YU */ },
-	{0xef, 0x044f /* CYRILLIC SMALL LETTER YA */ },
-	{0xf0, 0x0401 /* CYRILLIC CAPITAL LETTER IO */ },
-	{0xf1, 0x0451 /* CYRILLIC SMALL LETTER IO */ },
-	{0xf2, 0x0404 /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ },
-	{0xf3, 0x0454 /* CYRILLIC SMALL LETTER UKRAINIAN IE */ },
-	{0xf4, 0x0407 /* CYRILLIC CAPITAL LETTER YI */ },
-	{0xf5, 0x0457 /* CYRILLIC SMALL LETTER YI */ },
-	{0xf6, 0x040e /* CYRILLIC CAPITAL LETTER SHORT U */ },
-	{0xf7, 0x045e /* CYRILLIC SMALL LETTER SHORT U */ },
-	{0xf8, 0x00b0 /* DEGREE SIGN */ },
-	{0xf9, 0x2219 /* BULLET OPERATOR */ },
-	{0xfa, 0x00b7 /* MIDDLE DOT */ },
-	{0xfb, 0x221a /* SQUARE ROOT */ },
-	{0xfc, 0x2116 /* NUMERO SIGN */ },
-	{0xfd, 0x00a4 /* CURRENCY SIGN */ },
-	{0xfe, 0x25a0 /* BLACK SQUARE */ },
-	{0xff, 0x00a0 /* NO-BREAK SPACE */ },
-	{0, 0}
+const uint16_t highhalf_cp866 [] = {
+	/* 0x80 */ 0x0410, /* CYRILLIC CAPITAL LETTER A */
+	/* 0x81 */ 0x0411, /* CYRILLIC CAPITAL LETTER BE */
+	/* 0x82 */ 0x0412, /* CYRILLIC CAPITAL LETTER VE */
+	/* 0x83 */ 0x0413, /* CYRILLIC CAPITAL LETTER GHE */
+	/* 0x84 */ 0x0414, /* CYRILLIC CAPITAL LETTER DE */
+	/* 0x85 */ 0x0415, /* CYRILLIC CAPITAL LETTER IE */
+	/* 0x86 */ 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
+	/* 0x87 */ 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
+	/* 0x88 */ 0x0418, /* CYRILLIC CAPITAL LETTER I */
+	/* 0x89 */ 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
+	/* 0x8A */ 0x041A, /* CYRILLIC CAPITAL LETTER KA */
+	/* 0x8B */ 0x041B, /* CYRILLIC CAPITAL LETTER EL */
+	/* 0x8C */ 0x041C, /* CYRILLIC CAPITAL LETTER EM */
+	/* 0x8D */ 0x041D, /* CYRILLIC CAPITAL LETTER EN */
+	/* 0x8E */ 0x041E, /* CYRILLIC CAPITAL LETTER O */
+	/* 0x8F */ 0x041F, /* CYRILLIC CAPITAL LETTER PE */
+	/* 0x90 */ 0x0420, /* CYRILLIC CAPITAL LETTER ER */
+	/* 0x91 */ 0x0421, /* CYRILLIC CAPITAL LETTER ES */
+	/* 0x92 */ 0x0422, /* CYRILLIC CAPITAL LETTER TE */
+	/* 0x93 */ 0x0423, /* CYRILLIC CAPITAL LETTER U */
+	/* 0x94 */ 0x0424, /* CYRILLIC CAPITAL LETTER EF */
+	/* 0x95 */ 0x0425, /* CYRILLIC CAPITAL LETTER HA */
+	/* 0x96 */ 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
+	/* 0x97 */ 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
+	/* 0x98 */ 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
+	/* 0x99 */ 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */
+	/* 0x9A */ 0x042A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
+	/* 0x9B */ 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
+	/* 0x9C */ 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+	/* 0x9D */ 0x042D, /* CYRILLIC CAPITAL LETTER E */
+	/* 0x9E */ 0x042E, /* CYRILLIC CAPITAL LETTER YU */
+	/* 0x9F */ 0x042F, /* CYRILLIC CAPITAL LETTER YA */
+	/* 0xA0 */ 0x0430, /* CYRILLIC SMALL LETTER A */
+	/* 0xA1 */ 0x0431, /* CYRILLIC SMALL LETTER BE */
+	/* 0xA2 */ 0x0432, /* CYRILLIC SMALL LETTER VE */
+	/* 0xA3 */ 0x0433, /* CYRILLIC SMALL LETTER GHE */
+	/* 0xA4 */ 0x0434, /* CYRILLIC SMALL LETTER DE */
+	/* 0xA5 */ 0x0435, /* CYRILLIC SMALL LETTER IE */
+	/* 0xA6 */ 0x0436, /* CYRILLIC SMALL LETTER ZHE */
+	/* 0xA7 */ 0x0437, /* CYRILLIC SMALL LETTER ZE */
+	/* 0xA8 */ 0x0438, /* CYRILLIC SMALL LETTER I */
+	/* 0xA9 */ 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
+	/* 0xAA */ 0x043A, /* CYRILLIC SMALL LETTER KA */
+	/* 0xAB */ 0x043B, /* CYRILLIC SMALL LETTER EL */
+	/* 0xAC */ 0x043C, /* CYRILLIC SMALL LETTER EM */
+	/* 0xAD */ 0x043D, /* CYRILLIC SMALL LETTER EN */
+	/* 0xAE */ 0x043E, /* CYRILLIC SMALL LETTER O */
+	/* 0xAF */ 0x043F, /* CYRILLIC SMALL LETTER PE */
+	/* 0xB0 */ 0x2591, /* LIGHT SHADE */
+	/* 0xB1 */ 0x2592, /* MEDIUM SHADE */
+	/* 0xB2 */ 0x2593, /* DARK SHADE */
+	/* 0xB3 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0xB4 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0xB5 */ 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB6 */ 0x2562, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */
+	/* 0xB7 */ 0x2556, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */
+	/* 0xB8 */ 0x2555, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */
+	/* 0xB9 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xBA */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xBB */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xBC */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xBD */ 0x255C, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */
+	/* 0xBE */ 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */
+	/* 0xBF */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0xC0 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0xC1 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0xC2 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0xC3 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0xC4 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0xC5 */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0xC6 */ 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xC7 */ 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xC8 */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xC9 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xCA */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xCB */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xCC */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xCD */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xCE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xCF */ 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD0 */ 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD1 */ 0x2564, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD2 */ 0x2565, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD3 */ 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */
+	/* 0xD4 */ 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */
+	/* 0xD5 */ 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xD6 */ 0x2553, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */
+	/* 0xD7 */ 0x256B, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD8 */ 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD9 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0xDA */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0xDB */ 0x2588, /* FULL BLOCK */
+	/* 0xDC */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0xDD */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0xDE */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0xDF */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0xE0 */ 0x0440, /* CYRILLIC SMALL LETTER ER */
+	/* 0xE1 */ 0x0441, /* CYRILLIC SMALL LETTER ES */
+	/* 0xE2 */ 0x0442, /* CYRILLIC SMALL LETTER TE */
+	/* 0xE3 */ 0x0443, /* CYRILLIC SMALL LETTER U */
+	/* 0xE4 */ 0x0444, /* CYRILLIC SMALL LETTER EF */
+	/* 0xE5 */ 0x0445, /* CYRILLIC SMALL LETTER HA */
+	/* 0xE6 */ 0x0446, /* CYRILLIC SMALL LETTER TSE */
+	/* 0xE7 */ 0x0447, /* CYRILLIC SMALL LETTER CHE */
+	/* 0xE8 */ 0x0448, /* CYRILLIC SMALL LETTER SHA */
+	/* 0xE9 */ 0x0449, /* CYRILLIC SMALL LETTER SHCHA */
+	/* 0xEA */ 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */
+	/* 0xEB */ 0x044B, /* CYRILLIC SMALL LETTER YERU */
+	/* 0xEC */ 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */
+	/* 0xED */ 0x044D, /* CYRILLIC SMALL LETTER E */
+	/* 0xEE */ 0x044E, /* CYRILLIC SMALL LETTER YU */
+	/* 0xEF */ 0x044F, /* CYRILLIC SMALL LETTER YA */
+	/* 0xF0 */ 0x0401, /* CYRILLIC CAPITAL LETTER IO */
+	/* 0xF1 */ 0x0451, /* CYRILLIC SMALL LETTER IO */
+	/* 0xF2 */ 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+	/* 0xF3 */ 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+	/* 0xF4 */ 0x0407, /* CYRILLIC CAPITAL LETTER YI */
+	/* 0xF5 */ 0x0457, /* CYRILLIC SMALL LETTER YI */
+	/* 0xF6 */ 0x040E, /* CYRILLIC CAPITAL LETTER SHORT U */
+	/* 0xF7 */ 0x045E, /* CYRILLIC SMALL LETTER SHORT U */
+	/* 0xF8 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xF9 */ 0x2219, /* BULLET OPERATOR */
+	/* 0xFA */ 0x00B7, /* MIDDLE DOT */
+	/* 0xFB */ 0x221A, /* SQUARE ROOT */
+	/* 0xFC */ 0x2116, /* NUMERO SIGN */
+	/* 0xFD */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xFE */ 0x25A0, /* BLACK SQUARE */
+	/* 0xFF */ 0x00A0, /* NO-BREAK SPACE */
 };
 
+#define table_cp866 table_NULL
+
 unsigned char *const aliases_cp866 [] = {
 	"cp866",
 	"866",
@@ -3318,138 +3570,139 @@ unsigned char *const aliases_cp866 [] = {
 
 /*** cp1125 ***/
 
-const struct table_entry table_cp1125 [] = {
-	{0x80, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
-	{0x81, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
-	{0x82, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
-	{0x83, 0x0413 /* CYRILLIC CAPITAL LETTER GHE */ },
-	{0x84, 0x0414 /* CYRILLIC CAPITAL LETTER DE */ },
-	{0x85, 0x0415 /* CYRILLIC CAPITAL LETTER IE */ },
-	{0x86, 0x0416 /* CYRILLIC CAPITAL LETTER ZHE */ },
-	{0x87, 0x0417 /* CYRILLIC CAPITAL LETTER ZE */ },
-	{0x88, 0x0418 /* CYRILLIC CAPITAL LETTER I */ },
-	{0x89, 0x0419 /* CYRILLIC CAPITAL LETTER SHORT I */ },
-	{0x8a, 0x041a /* CYRILLIC CAPITAL LETTER KA */ },
-	{0x8b, 0x041b /* CYRILLIC CAPITAL LETTER EL */ },
-	{0x8c, 0x041c /* CYRILLIC CAPITAL LETTER EM */ },
-	{0x8d, 0x041d /* CYRILLIC CAPITAL LETTER EN */ },
-	{0x8e, 0x041e /* CYRILLIC CAPITAL LETTER O */ },
-	{0x8f, 0x041f /* CYRILLIC CAPITAL LETTER PE */ },
-	{0x90, 0x0420 /* CYRILLIC CAPITAL LETTER ER */ },
-	{0x91, 0x0421 /* CYRILLIC CAPITAL LETTER ES */ },
-	{0x92, 0x0422 /* CYRILLIC CAPITAL LETTER TE */ },
-	{0x93, 0x0423 /* CYRILLIC CAPITAL LETTER U */ },
-	{0x94, 0x0424 /* CYRILLIC CAPITAL LETTER EF */ },
-	{0x95, 0x0425 /* CYRILLIC CAPITAL LETTER HA */ },
-	{0x96, 0x0426 /* CYRILLIC CAPITAL LETTER TSE */ },
-	{0x97, 0x0427 /* CYRILLIC CAPITAL LETTER CHE */ },
-	{0x98, 0x0428 /* CYRILLIC CAPITAL LETTER SHA */ },
-	{0x99, 0x0429 /* CYRILLIC CAPITAL LETTER SHCHA */ },
-	{0x9a, 0x042a /* CYRILLIC CAPITAL LETTER HARD SIGN */ },
-	{0x9b, 0x042b /* CYRILLIC CAPITAL LETTER YERU */ },
-	{0x9c, 0x042c /* CYRILLIC CAPITAL LETTER SOFT SIGN */ },
-	{0x9d, 0x042d /* CYRILLIC CAPITAL LETTER E */ },
-	{0x9e, 0x042e /* CYRILLIC CAPITAL LETTER YU */ },
-	{0x9f, 0x042f /* CYRILLIC CAPITAL LETTER YA */ },
-	{0xa0, 0x0430 /* CYRILLIC SMALL LETTER A */ },
-	{0xa1, 0x0431 /* CYRILLIC SMALL LETTER BE */ },
-	{0xa2, 0x0432 /* CYRILLIC SMALL LETTER VE */ },
-	{0xa3, 0x0433 /* CYRILLIC SMALL LETTER GHE */ },
-	{0xa4, 0x0434 /* CYRILLIC SMALL LETTER DE */ },
-	{0xa5, 0x0435 /* CYRILLIC SMALL LETTER IE */ },
-	{0xa6, 0x0436 /* CYRILLIC SMALL LETTER ZHE */ },
-	{0xa7, 0x0437 /* CYRILLIC SMALL LETTER ZE */ },
-	{0xa8, 0x0438 /* CYRILLIC SMALL LETTER I */ },
-	{0xa9, 0x0439 /* CYRILLIC SMALL LETTER SHORT I */ },
-	{0xaa, 0x043a /* CYRILLIC SMALL LETTER KA */ },
-	{0xab, 0x043b /* CYRILLIC SMALL LETTER EL */ },
-	{0xac, 0x043c /* CYRILLIC SMALL LETTER EM */ },
-	{0xad, 0x043d /* CYRILLIC SMALL LETTER EN */ },
-	{0xae, 0x043e /* CYRILLIC SMALL LETTER O */ },
-	{0xaf, 0x043f /* CYRILLIC SMALL LETTER PE */ },
-	{0xb0, 0x2591 /* LIGHT SHADE */ },
-	{0xb1, 0x2592 /* MEDIUM SHADE */ },
-	{0xb2, 0x2593 /* DARK SHADE */ },
-	{0xb3, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0xb4, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0xb5, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xb6, 0x2562 /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ },
-	{0xb7, 0x2556 /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ },
-	{0xb8, 0x2555 /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ },
-	{0xb9, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xba, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xbb, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xbc, 0x255d /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xbd, 0x255c /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ },
-	{0xbe, 0x255b /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xbf, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0xc0, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0xc1, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0xc2, 0x252c /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0xc3, 0x251c /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0xc4, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0xc5, 0x253c /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0xc6, 0x255e /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xc7, 0x255f /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xc8, 0x255a /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xc9, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xca, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xcb, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xcc, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xcd, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xce, 0x256c /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xcf, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd0, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd1, 0x2564 /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd2, 0x2565 /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd3, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xd4, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xd5, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xd6, 0x2553 /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ },
-	{0xd7, 0x256b /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xd8, 0x256a /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xd9, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0xda, 0x250c /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0xdb, 0x2588 /* FULL BLOCK */ },
-	{0xdc, 0x2584 /* LOWER HALF BLOCK */ },
-	{0xdd, 0x258c /* LEFT HALF BLOCK */ },
-	{0xde, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0xdf, 0x2580 /* UPPER HALF BLOCK */ },
-	{0xe0, 0x0440 /* CYRILLIC SMALL LETTER ER */ },
-	{0xe1, 0x0441 /* CYRILLIC SMALL LETTER ES */ },
-	{0xe2, 0x0442 /* CYRILLIC SMALL LETTER TE */ },
-	{0xe3, 0x0443 /* CYRILLIC SMALL LETTER U */ },
-	{0xe4, 0x0444 /* CYRILLIC SMALL LETTER EF */ },
-	{0xe5, 0x0445 /* CYRILLIC SMALL LETTER HA */ },
-	{0xe6, 0x0446 /* CYRILLIC SMALL LETTER TSE */ },
-	{0xe7, 0x0447 /* CYRILLIC SMALL LETTER CHE */ },
-	{0xe8, 0x0448 /* CYRILLIC SMALL LETTER SHA */ },
-	{0xe9, 0x0449 /* CYRILLIC SMALL LETTER SHCHA */ },
-	{0xea, 0x044a /* CYRILLIC SMALL LETTER HARD SIGN */ },
-	{0xeb, 0x044b /* CYRILLIC SMALL LETTER YERU */ },
-	{0xec, 0x044c /* CYRILLIC SMALL LETTER SOFT SIGN */ },
-	{0xed, 0x044d /* CYRILLIC SMALL LETTER E */ },
-	{0xee, 0x044e /* CYRILLIC SMALL LETTER YU */ },
-	{0xef, 0x044f /* CYRILLIC SMALL LETTER YA */ },
-	{0xf0, 0x0401 /* CYRILLIC CAPITAL LETTER IO */ },
-	{0xf1, 0x0451 /* CYRILLIC SMALL LETTER IO */ },
-	{0xf2, 0x0490 /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ },
-	{0xf3, 0x0491 /* CYRILLIC SMALL LETTER GHE WITH UPTURN */ },
-	{0xf4, 0x0404 /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ },
-	{0xf5, 0x0454 /* CYRILLIC SMALL LETTER UKRAINIAN IE */ },
-	{0xf6, 0x0406 /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xf7, 0x0456 /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xf8, 0x0407 /* CYRILLIC CAPITAL LETTER YI */ },
-	{0xf9, 0x0457 /* CYRILLIC SMALL LETTER YI */ },
-	{0xfa, 0x00b7 /* MIDDLE DOT */ },
-	{0xfb, 0x221a /* SQUARE ROOT */ },
-	{0xfc, 0x2116 /* NUMERO SIGN */ },
-	{0xfd, 0x00a4 /* CURRENCY SIGN */ },
-	{0xfe, 0x25a0 /* BLACK SQUARE */ },
-	{0xff, 0x00a0 /* NO-BREAK SPACE */ },
-	{0, 0}
+const uint16_t highhalf_cp1125 [] = {
+	/* 0x80 */ 0x0410, /* CYRILLIC CAPITAL LETTER A */
+	/* 0x81 */ 0x0411, /* CYRILLIC CAPITAL LETTER BE */
+	/* 0x82 */ 0x0412, /* CYRILLIC CAPITAL LETTER VE */
+	/* 0x83 */ 0x0413, /* CYRILLIC CAPITAL LETTER GHE */
+	/* 0x84 */ 0x0414, /* CYRILLIC CAPITAL LETTER DE */
+	/* 0x85 */ 0x0415, /* CYRILLIC CAPITAL LETTER IE */
+	/* 0x86 */ 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
+	/* 0x87 */ 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
+	/* 0x88 */ 0x0418, /* CYRILLIC CAPITAL LETTER I */
+	/* 0x89 */ 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
+	/* 0x8A */ 0x041A, /* CYRILLIC CAPITAL LETTER KA */
+	/* 0x8B */ 0x041B, /* CYRILLIC CAPITAL LETTER EL */
+	/* 0x8C */ 0x041C, /* CYRILLIC CAPITAL LETTER EM */
+	/* 0x8D */ 0x041D, /* CYRILLIC CAPITAL LETTER EN */
+	/* 0x8E */ 0x041E, /* CYRILLIC CAPITAL LETTER O */
+	/* 0x8F */ 0x041F, /* CYRILLIC CAPITAL LETTER PE */
+	/* 0x90 */ 0x0420, /* CYRILLIC CAPITAL LETTER ER */
+	/* 0x91 */ 0x0421, /* CYRILLIC CAPITAL LETTER ES */
+	/* 0x92 */ 0x0422, /* CYRILLIC CAPITAL LETTER TE */
+	/* 0x93 */ 0x0423, /* CYRILLIC CAPITAL LETTER U */
+	/* 0x94 */ 0x0424, /* CYRILLIC CAPITAL LETTER EF */
+	/* 0x95 */ 0x0425, /* CYRILLIC CAPITAL LETTER HA */
+	/* 0x96 */ 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
+	/* 0x97 */ 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
+	/* 0x98 */ 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
+	/* 0x99 */ 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */
+	/* 0x9A */ 0x042A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
+	/* 0x9B */ 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
+	/* 0x9C */ 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+	/* 0x9D */ 0x042D, /* CYRILLIC CAPITAL LETTER E */
+	/* 0x9E */ 0x042E, /* CYRILLIC CAPITAL LETTER YU */
+	/* 0x9F */ 0x042F, /* CYRILLIC CAPITAL LETTER YA */
+	/* 0xA0 */ 0x0430, /* CYRILLIC SMALL LETTER A */
+	/* 0xA1 */ 0x0431, /* CYRILLIC SMALL LETTER BE */
+	/* 0xA2 */ 0x0432, /* CYRILLIC SMALL LETTER VE */
+	/* 0xA3 */ 0x0433, /* CYRILLIC SMALL LETTER GHE */
+	/* 0xA4 */ 0x0434, /* CYRILLIC SMALL LETTER DE */
+	/* 0xA5 */ 0x0435, /* CYRILLIC SMALL LETTER IE */
+	/* 0xA6 */ 0x0436, /* CYRILLIC SMALL LETTER ZHE */
+	/* 0xA7 */ 0x0437, /* CYRILLIC SMALL LETTER ZE */
+	/* 0xA8 */ 0x0438, /* CYRILLIC SMALL LETTER I */
+	/* 0xA9 */ 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
+	/* 0xAA */ 0x043A, /* CYRILLIC SMALL LETTER KA */
+	/* 0xAB */ 0x043B, /* CYRILLIC SMALL LETTER EL */
+	/* 0xAC */ 0x043C, /* CYRILLIC SMALL LETTER EM */
+	/* 0xAD */ 0x043D, /* CYRILLIC SMALL LETTER EN */
+	/* 0xAE */ 0x043E, /* CYRILLIC SMALL LETTER O */
+	/* 0xAF */ 0x043F, /* CYRILLIC SMALL LETTER PE */
+	/* 0xB0 */ 0x2591, /* LIGHT SHADE */
+	/* 0xB1 */ 0x2592, /* MEDIUM SHADE */
+	/* 0xB2 */ 0x2593, /* DARK SHADE */
+	/* 0xB3 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0xB4 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0xB5 */ 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB6 */ 0x2562, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */
+	/* 0xB7 */ 0x2556, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */
+	/* 0xB8 */ 0x2555, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */
+	/* 0xB9 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xBA */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xBB */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xBC */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xBD */ 0x255C, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */
+	/* 0xBE */ 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */
+	/* 0xBF */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0xC0 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0xC1 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0xC2 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0xC3 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0xC4 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0xC5 */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0xC6 */ 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xC7 */ 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xC8 */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xC9 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xCA */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xCB */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xCC */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xCD */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xCE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xCF */ 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD0 */ 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD1 */ 0x2564, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD2 */ 0x2565, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD3 */ 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */
+	/* 0xD4 */ 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */
+	/* 0xD5 */ 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xD6 */ 0x2553, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */
+	/* 0xD7 */ 0x256B, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD8 */ 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD9 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0xDA */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0xDB */ 0x2588, /* FULL BLOCK */
+	/* 0xDC */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0xDD */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0xDE */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0xDF */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0xE0 */ 0x0440, /* CYRILLIC SMALL LETTER ER */
+	/* 0xE1 */ 0x0441, /* CYRILLIC SMALL LETTER ES */
+	/* 0xE2 */ 0x0442, /* CYRILLIC SMALL LETTER TE */
+	/* 0xE3 */ 0x0443, /* CYRILLIC SMALL LETTER U */
+	/* 0xE4 */ 0x0444, /* CYRILLIC SMALL LETTER EF */
+	/* 0xE5 */ 0x0445, /* CYRILLIC SMALL LETTER HA */
+	/* 0xE6 */ 0x0446, /* CYRILLIC SMALL LETTER TSE */
+	/* 0xE7 */ 0x0447, /* CYRILLIC SMALL LETTER CHE */
+	/* 0xE8 */ 0x0448, /* CYRILLIC SMALL LETTER SHA */
+	/* 0xE9 */ 0x0449, /* CYRILLIC SMALL LETTER SHCHA */
+	/* 0xEA */ 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */
+	/* 0xEB */ 0x044B, /* CYRILLIC SMALL LETTER YERU */
+	/* 0xEC */ 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */
+	/* 0xED */ 0x044D, /* CYRILLIC SMALL LETTER E */
+	/* 0xEE */ 0x044E, /* CYRILLIC SMALL LETTER YU */
+	/* 0xEF */ 0x044F, /* CYRILLIC SMALL LETTER YA */
+	/* 0xF0 */ 0x0401, /* CYRILLIC CAPITAL LETTER IO */
+	/* 0xF1 */ 0x0451, /* CYRILLIC SMALL LETTER IO */
+	/* 0xF2 */ 0x0490, /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
+	/* 0xF3 */ 0x0491, /* CYRILLIC SMALL LETTER GHE WITH UPTURN */
+	/* 0xF4 */ 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+	/* 0xF5 */ 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+	/* 0xF6 */ 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xF7 */ 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xF8 */ 0x0407, /* CYRILLIC CAPITAL LETTER YI */
+	/* 0xF9 */ 0x0457, /* CYRILLIC SMALL LETTER YI */
+	/* 0xFA */ 0x00B7, /* MIDDLE DOT */
+	/* 0xFB */ 0x221A, /* SQUARE ROOT */
+	/* 0xFC */ 0x2116, /* NUMERO SIGN */
+	/* 0xFD */ 0x00A4, /* CURRENCY SIGN */
+	/* 0xFE */ 0x25A0, /* BLACK SQUARE */
+	/* 0xFF */ 0x00A0, /* NO-BREAK SPACE */
 };
 
+#define table_cp1125 table_NULL
+
 unsigned char *const aliases_cp1125 [] = {
 	"x-cp866-u",
 	"ruscii",
@@ -3461,138 +3714,139 @@ unsigned char *const aliases_cp1125 [] = {
 
 /*** macroman ***/
 
-const struct table_entry table_macroman [] = {
-	{0x80, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0x81, 0x00C5 /* LATIN CAPITAL LETTER A WITH RING ABOVE */ },
-	{0x82, 0x00C7 /* LATIN CAPITAL LETTER C WITH CEDILLA */ },
-	{0x83, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0x84, 0x00D1 /* LATIN CAPITAL LETTER N WITH TILDE */ },
-	{0x85, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0x86, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0x87, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0x88, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0x89, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0x8A, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0x8B, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0x8C, 0x00E5 /* LATIN SMALL LETTER A WITH RING ABOVE */ },
-	{0x8D, 0x00E7 /* LATIN SMALL LETTER C WITH CEDILLA */ },
-	{0x8E, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0x8F, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0x90, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0x91, 0x00EB /* LATIN SMALL LETTER E WITH DIAERESIS */ },
-	{0x92, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0x93, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0x94, 0x00EE /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ },
-	{0x95, 0x00EF /* LATIN SMALL LETTER I WITH DIAERESIS */ },
-	{0x96, 0x00F1 /* LATIN SMALL LETTER N WITH TILDE */ },
-	{0x97, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0x98, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0x99, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0x9A, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0x9B, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0x9C, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0x9D, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0x9E, 0x00FB /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ },
-	{0x9F, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xA0, 0x2020 /* DAGGER */ },
-	{0xA1, 0x00B0 /* DEGREE SIGN */ },
-	{0xA2, 0x00A2 /* CENT SIGN */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A7 /* SECTION SIGN */ },
-	{0xA5, 0x2022 /* PUCE */ },
-	{0xA6, 0x00B6 /* PILCROW SIGN */ },
-	{0xA7, 0x00DF /* LATIN SMALL LETTER SHARP S (GERMAN) */ },
-	{0xA8, 0x00AE /* REGISTERED SIGN */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x2122 /* TRADE MARK SIGN */ },
-	{0xAB, 0x00B4 /* ACUTE ACCENT */ },
-	{0xAC, 0x00A8 /* DIAERESIS */ },
-	{0xAD, 0x2260 /* NOT EQUAL TO */ },
-	{0xAE, 0x00C6 /* LATIN CAPITAL LETTER AE */ },
-	{0xAF, 0x00D8 /* LATIN CAPITAL LETTER O WITH STROKE */ },
-	{0xB0, 0x221E /* INFINITY */ },
-	{0xB1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xB2, 0x2264 /* LESS-THAN OR EQUAL TO */ },
-	{0xB3, 0x2265 /* GREATER-THAN OR EQUAL TO */ },
-	{0xB4, 0x00A5 /* YEN SIGN */ },
-	{0xB5, 0x00B5 /* MICRO SIGN */ },
-	{0xB6, 0x2202 /* PARTIAL DIFFERENTIAL */ },
-	{0xB7, 0x2211 /* N-ARY SUMMATION */ },
-	{0xB8, 0x220F /* N-ARY PRODUCT */ },
-	{0xB9, 0x03C0 /* GREEK SMALL LETTER PI */ },
-	{0xBA, 0x222B /* INTEGRAL */ },
-	{0xBB, 0x00AA /* FEMININE ORDINAL INDICATOR */ },
-	{0xBC, 0x00BA /* MASCULINE ORDINAL INDICATOR */ },
-	{0xBD, 0x03A9 /* GREEK CAPITAL LETTER OMEGA */ },
-	{0xBE, 0x00E6 /* LATIN SMALL LETTER AE */ },
-	{0xBF, 0x00F8 /* LATIN SMALL LETTER O WITH STROKE */ },
-	{0xC0, 0x00BF /* INVERTED QUESTION MARK */ },
-	{0xC1, 0x00A1 /* INVERTED EXCLAMATION MARK */ },
-	{0xC2, 0x00AC /* NOT SIGN */ },
-	{0xC3, 0x221A /* SQUARE ROOT */ },
-	{0xC4, 0x0192 /* LETTRE MINUSCULE LATINE F HAMEçON */ },
-	{0xC5, 0x2248 /* ALMOST EQUAL TO */ },
-	{0xC6, 0x0394 /* GREEK CAPITAL LETTER DELTA */ },
-	{0xC7, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xC8, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xC9, 0x2026 /* MIDLINE HORIZONTAL ELLIPSIS */ },
-	{0xCA, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xCB, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xCC, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xCD, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xCE, 0x0152 /* LATIN CAPITAL LIGATURE OE */ },
-	{0xCF, 0x0153 /* LATIN SMALL LIGATURE OE */ },
-	{0xD0, 0x2013 /* EN DASH */ },
-	{0xD1, 0x2014 /* EM DASH */ },
-	{0xD2, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0xD3, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0xD4, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0xD5, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0xD6, 0x00F7 /* DIVISION SIGN */ },
-	{0xD7, 0x25CA /* LOZENGE */ },
-	{0xD8, 0x00FF /* LATIN SMALL LETTER Y WITH DIAERESIS */ },
-	{0xD9, 0x0178 /* LATIN CAPITAL LETTER Y WITH DIAERESIS */ },
-	{0xDA, 0x2044 /* FRACTION SLASH */ },
-	{0xDB, 0x20AC /* SYMBOLE EURO */ },
-	{0xDC, 0x2039 /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ },
-	{0xDD, 0x203A /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ },
-	{0xDE, 0xFB01 /* LATIN SMALL LIGATURE FI */ },
-	{0xDF, 0xFB02 /* LATIN SMALL LIGATURE FL */ },
-	{0xE0, 0x2021 /* DOUBLE DAGGER */ },
-	{0xE1, 0x00B7 /* MIDDLE DOT */ },
-	{0xE2, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
-	{0xE3, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0xE4, 0x2030 /* PER MILLE SIGN */ },
-	{0xE5, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xE6, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xE7, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xE8, 0x00CB /* LATIN CAPITAL LETTER E WITH DIAERESIS */ },
-	{0xE9, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xEA, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xEB, 0x00CE /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ },
-	{0xEC, 0x00CF /* LATIN CAPITAL LETTER I WITH DIAERESIS */ },
-	{0xED, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xEE, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xEF, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xF0, 0xF8FF /* Mac Logo (in Private Use Area) */ },
-	{0xF1, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xF2, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xF3, 0x00DB /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ },
-	{0xF4, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xF5, 0x0131 /* LATIN SMALL LETTER I DOTLESS */ },
-	{0xF6, 0x02C6 /* LETTRE MODIFICATIVE ACCENT CIRCONFLEXE */ },
-	{0xF7, 0x02DC /* PETIT TILDE */ },
-	{0xF8, 0x00AF /* MACRON */ },
-	{0xF9, 0x02D8 /* BREVE */ },
-	{0xFA, 0x02D9 /* DOT ABOVE */ },
-	{0xFB, 0x02DA /* RING ABOVE */ },
-	{0xFC, 0x00B8 /* CEDILLA */ },
-	{0xFD, 0x02DD /* DOUBLE ACUTE ACCENT */ },
-	{0xFE, 0x02DB /* OGONEK */ },
-	{0xFF, 0x02C7 /* CARON */ },
-	{0, 0}
+const uint16_t highhalf_macroman [] = {
+	/* 0x80 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0x81 */ 0x00C5, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+	/* 0x82 */ 0x00C7, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+	/* 0x83 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0x84 */ 0x00D1, /* LATIN CAPITAL LETTER N WITH TILDE */
+	/* 0x85 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0x86 */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0x87 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0x88 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0x89 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0x8A */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0x8B */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0x8C */ 0x00E5, /* LATIN SMALL LETTER A WITH RING ABOVE */
+	/* 0x8D */ 0x00E7, /* LATIN SMALL LETTER C WITH CEDILLA */
+	/* 0x8E */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0x8F */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0x90 */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0x91 */ 0x00EB, /* LATIN SMALL LETTER E WITH DIAERESIS */
+	/* 0x92 */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0x93 */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0x94 */ 0x00EE, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+	/* 0x95 */ 0x00EF, /* LATIN SMALL LETTER I WITH DIAERESIS */
+	/* 0x96 */ 0x00F1, /* LATIN SMALL LETTER N WITH TILDE */
+	/* 0x97 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0x98 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0x99 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0x9A */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0x9B */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0x9C */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0x9D */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0x9E */ 0x00FB, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+	/* 0x9F */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xA0 */ 0x2020, /* DAGGER */
+	/* 0xA1 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xA2 */ 0x00A2, /* CENT SIGN */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA5 */ 0x2022, /* PUCE */
+	/* 0xA6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xA7 */ 0x00DF, /* LATIN SMALL LETTER SHARP S (GERMAN) */
+	/* 0xA8 */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x2122, /* TRADE MARK SIGN */
+	/* 0xAB */ 0x00B4, /* ACUTE ACCENT */
+	/* 0xAC */ 0x00A8, /* DIAERESIS */
+	/* 0xAD */ 0x2260, /* NOT EQUAL TO */
+	/* 0xAE */ 0x00C6, /* LATIN CAPITAL LETTER AE */
+	/* 0xAF */ 0x00D8, /* LATIN CAPITAL LETTER O WITH STROKE */
+	/* 0xB0 */ 0x221E, /* INFINITY */
+	/* 0xB1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xB2 */ 0x2264, /* LESS-THAN OR EQUAL TO */
+	/* 0xB3 */ 0x2265, /* GREATER-THAN OR EQUAL TO */
+	/* 0xB4 */ 0x00A5, /* YEN SIGN */
+	/* 0xB5 */ 0x00B5, /* MICRO SIGN */
+	/* 0xB6 */ 0x2202, /* PARTIAL DIFFERENTIAL */
+	/* 0xB7 */ 0x2211, /* N-ARY SUMMATION */
+	/* 0xB8 */ 0x220F, /* N-ARY PRODUCT */
+	/* 0xB9 */ 0x03C0, /* GREEK SMALL LETTER PI */
+	/* 0xBA */ 0x222B, /* INTEGRAL */
+	/* 0xBB */ 0x00AA, /* FEMININE ORDINAL INDICATOR */
+	/* 0xBC */ 0x00BA, /* MASCULINE ORDINAL INDICATOR */
+	/* 0xBD */ 0x03A9, /* GREEK CAPITAL LETTER OMEGA */
+	/* 0xBE */ 0x00E6, /* LATIN SMALL LETTER AE */
+	/* 0xBF */ 0x00F8, /* LATIN SMALL LETTER O WITH STROKE */
+	/* 0xC0 */ 0x00BF, /* INVERTED QUESTION MARK */
+	/* 0xC1 */ 0x00A1, /* INVERTED EXCLAMATION MARK */
+	/* 0xC2 */ 0x00AC, /* NOT SIGN */
+	/* 0xC3 */ 0x221A, /* SQUARE ROOT */
+	/* 0xC4 */ 0x0192, /* LETTRE MINUSCULE LATINE F HAMEçON */
+	/* 0xC5 */ 0x2248, /* ALMOST EQUAL TO */
+	/* 0xC6 */ 0x0394, /* GREEK CAPITAL LETTER DELTA */
+	/* 0xC7 */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xC8 */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xC9 */ 0x2026, /* MIDLINE HORIZONTAL ELLIPSIS */
+	/* 0xCA */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xCB */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xCC */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xCD */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xCE */ 0x0152, /* LATIN CAPITAL LIGATURE OE */
+	/* 0xCF */ 0x0153, /* LATIN SMALL LIGATURE OE */
+	/* 0xD0 */ 0x2013, /* EN DASH */
+	/* 0xD1 */ 0x2014, /* EM DASH */
+	/* 0xD2 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0xD3 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0xD4 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0xD5 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0xD6 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xD7 */ 0x25CA, /* LOZENGE */
+	/* 0xD8 */ 0x00FF, /* LATIN SMALL LETTER Y WITH DIAERESIS */
+	/* 0xD9 */ 0x0178, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
+	/* 0xDA */ 0x2044, /* FRACTION SLASH */
+	/* 0xDB */ 0x20AC, /* SYMBOLE EURO */
+	/* 0xDC */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+	/* 0xDD */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+	/* 0xDE */ 0xFB01, /* LATIN SMALL LIGATURE FI */
+	/* 0xDF */ 0xFB02, /* LATIN SMALL LIGATURE FL */
+	/* 0xE0 */ 0x2021, /* DOUBLE DAGGER */
+	/* 0xE1 */ 0x00B7, /* MIDDLE DOT */
+	/* 0xE2 */ 0x201A, /* SINGLE LOW-9 QUOTATION MARK */
+	/* 0xE3 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0xE4 */ 0x2030, /* PER MILLE SIGN */
+	/* 0xE5 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xE6 */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xE7 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xE8 */ 0x00CB, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+	/* 0xE9 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xEA */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xEB */ 0x00CE, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+	/* 0xEC */ 0x00CF, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+	/* 0xED */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xEE */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xEF */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xF0 */ 0xF8FF, /* Mac Logo (in Private Use Area) */
+	/* 0xF1 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xF2 */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xF3 */ 0x00DB, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+	/* 0xF4 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xF5 */ 0x0131, /* LATIN SMALL LETTER I DOTLESS */
+	/* 0xF6 */ 0x02C6, /* LETTRE MODIFICATIVE ACCENT CIRCONFLEXE */
+	/* 0xF7 */ 0x02DC, /* PETIT TILDE */
+	/* 0xF8 */ 0x00AF, /* MACRON */
+	/* 0xF9 */ 0x02D8, /* BREVE */
+	/* 0xFA */ 0x02D9, /* DOT ABOVE */
+	/* 0xFB */ 0x02DA, /* RING ABOVE */
+	/* 0xFC */ 0x00B8, /* CEDILLA */
+	/* 0xFD */ 0x02DD, /* DOUBLE ACUTE ACCENT */
+	/* 0xFE */ 0x02DB, /* OGONEK */
+	/* 0xFF */ 0x02C7, /* CARON */
 };
 
+#define table_macroman table_NULL
+
 unsigned char *const aliases_macroman [] = {
 	"x-mac",
 	"mac",
@@ -3605,138 +3859,139 @@ unsigned char *const aliases_macroman [] = {
 
 /*** mac_lat2 ***/
 
-const struct table_entry table_mac_lat2 [] = {
-	{0x80, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0x81, 0x0100 /* LATIN CAPITAL LETTER A WITH MACRON */ },
-	{0x82, 0x0101 /* LATIN SMALL LETTER A WITH MACRON */ },
-	{0x83, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0x84, 0x0104 /* LATIN CAPITAL LETTER A WITH OGONEK */ },
-	{0x85, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0x86, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0x87, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0x88, 0x0105 /* LATIN SMALL LETTER A WITH OGONEK */ },
-	{0x89, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0x8A, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0x8B, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0x8C, 0x0106 /* LATIN CAPITAL LETTER C WITH ACUTE */ },
-	{0x8D, 0x0107 /* LATIN SMALL LETTER C WITH ACUTE */ },
-	{0x8E, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0x8F, 0x0179 /* LATIN CAPITAL LETTER Z WITH ACUTE */ },
-	{0x90, 0x017A /* LATIN SMALL LETTER Z WITH ACUTE */ },
-	{0x91, 0x010E /* LATIN CAPITAL LETTER D WITH CARON */ },
-	{0x92, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0x93, 0x010F /* LATIN SMALL LETTER D WITH CARON */ },
-	{0x94, 0x0112 /* LATIN CAPITAL LETTER E WITH MACRON */ },
-	{0x95, 0x0113 /* LATIN SMALL LETTER E WITH MACRON */ },
-	{0x96, 0x0116 /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ },
-	{0x97, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0x98, 0x0117 /* LATIN SMALL LETTER E WITH DOT ABOVE */ },
-	{0x99, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0x9A, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0x9B, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0x9C, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0x9D, 0x011A /* LATIN CAPITAL LETTER E WITH CARON */ },
-	{0x9E, 0x011B /* LATIN SMALL LETTER E WITH CARON */ },
-	{0x9F, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0xA0, 0x2020 /* DAGGER */ },
-	{0xA1, 0x00B0 /* DEGREE SIGN */ },
-	{0xA2, 0x0118 /* LATIN CAPITAL LETTER E WITH OGONEK */ },
-	{0xA3, 0x00A3 /* POUND SIGN */ },
-	{0xA4, 0x00A7 /* SECTION SIGN */ },
-	{0xA5, 0x2022 /* BULLET */ },
-	{0xA6, 0x00B6 /* PILCROW SIGN */ },
-	{0xA7, 0x00DF /* LATIN SMALL LETTER SHARP S */ },
-	{0xA8, 0x00AE /* REGISTERED SIGN */ },
-	{0xA9, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xAA, 0x2122 /* TRADE MARK SIGN */ },
-	{0xAB, 0x0119 /* LATIN SMALL LETTER E WITH OGONEK */ },
-	{0xAC, 0x00A8 /* DIAERESIS */ },
-	{0xAD, 0x2260 /* NOT EQUAL TO */ },
-	{0xAE, 0x0123 /* LATIN SMALL LETTER G WITH CEDILLA */ },
-	{0xAF, 0x012E /* LATIN CAPITAL LETTER I WITH OGONEK */ },
-	{0xB0, 0x012F /* LATIN SMALL LETTER I WITH OGONEK */ },
-	{0xB1, 0x012A /* LATIN CAPITAL LETTER I WITH MACRON */ },
-	{0xB2, 0x2264 /* LESS-THAN OR EQUAL TO */ },
-	{0xB3, 0x2265 /* GREATER-THAN OR EQUAL TO */ },
-	{0xB4, 0x012B /* LATIN SMALL LETTER I WITH MACRON */ },
-	{0xB5, 0x0136 /* LATIN CAPITAL LETTER K WITH CEDILLA */ },
-	{0xB6, 0x2202 /* PARTIAL DIFFERENTIAL */ },
-	{0xB7, 0x2211 /* N-ARY SUMMATION */ },
-	{0xB8, 0x0142 /* LATIN SMALL LETTER L WITH STROKE */ },
-	{0xB9, 0x013B /* LATIN CAPITAL LETTER L WITH CEDILLA */ },
-	{0xBA, 0x013C /* LATIN SMALL LETTER L WITH CEDILLA */ },
-	{0xBB, 0x013D /* LATIN CAPITAL LETTER L WITH CARON */ },
-	{0xBC, 0x013E /* LATIN SMALL LETTER L WITH CARON */ },
-	{0xBD, 0x0139 /* LATIN CAPITAL LETTER L WITH ACUTE */ },
-	{0xBE, 0x013A /* LATIN SMALL LETTER L WITH ACUTE */ },
-	{0xBF, 0x0145 /* LATIN CAPITAL LETTER N WITH CEDILLA */ },
-	{0xC0, 0x0146 /* LATIN SMALL LETTER N WITH CEDILLA */ },
-	{0xC1, 0x0143 /* LATIN CAPITAL LETTER N WITH ACUTE */ },
-	{0xC2, 0x00AC /* NOT SIGN */ },
-	{0xC3, 0x221A /* SQUARE ROOT */ },
-	{0xC4, 0x0144 /* LATIN SMALL LETTER N WITH ACUTE */ },
-	{0xC5, 0x0147 /* LATIN CAPITAL LETTER N WITH CARON */ },
-	{0xC6, 0x2206 /* INCREMENT */ },
-	{0xC7, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xC8, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xC9, 0x2026 /* HORIZONTAL ELLIPSIS */ },
-	{0xCA, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xCB, 0x0148 /* LATIN SMALL LETTER N WITH CARON */ },
-	{0xCC, 0x0150 /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ },
-	{0xCD, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xCE, 0x0151 /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */ },
-	{0xCF, 0x014C /* LATIN CAPITAL LETTER O WITH MACRON */ },
-	{0xD0, 0x2013 /* EN DASH */ },
-	{0xD1, 0x2014 /* EM DASH */ },
-	{0xD2, 0x201C /* LEFT DOUBLE QUOTATION MARK */ },
-	{0xD3, 0x201D /* RIGHT DOUBLE QUOTATION MARK */ },
-	{0xD4, 0x2018 /* LEFT SINGLE QUOTATION MARK */ },
-	{0xD5, 0x2019 /* RIGHT SINGLE QUOTATION MARK */ },
-	{0xD6, 0x00F7 /* DIVISION SIGN */ },
-	{0xD7, 0x25CA /* LOZENGE */ },
-	{0xD8, 0x014D /* LATIN SMALL LETTER O WITH MACRON */ },
-	{0xD9, 0x0154 /* LATIN CAPITAL LETTER R WITH ACUTE */ },
-	{0xDA, 0x0155 /* LATIN SMALL LETTER R WITH ACUTE */ },
-	{0xDB, 0x0158 /* LATIN CAPITAL LETTER R WITH CARON */ },
-	{0xDC, 0x2039 /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ },
-	{0xDD, 0x203A /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ },
-	{0xDE, 0x0159 /* LATIN SMALL LETTER R WITH CARON */ },
-	{0xDF, 0x0156 /* LATIN CAPITAL LETTER R WITH CEDILLA */ },
-	{0xE0, 0x0157 /* LATIN SMALL LETTER R WITH CEDILLA */ },
-	{0xE1, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0xE2, 0x201A /* SINGLE LOW-9 QUOTATION MARK */ },
-	{0xE3, 0x201E /* DOUBLE LOW-9 QUOTATION MARK */ },
-	{0xE4, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xE5, 0x015A /* LATIN CAPITAL LETTER S WITH ACUTE */ },
-	{0xE6, 0x015B /* LATIN SMALL LETTER S WITH ACUTE */ },
-	{0xE7, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xE8, 0x0164 /* LATIN CAPITAL LETTER T WITH CARON */ },
-	{0xE9, 0x0165 /* LATIN SMALL LETTER T WITH CARON */ },
-	{0xEA, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xEB, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0xEC, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0xED, 0x016A /* LATIN CAPITAL LETTER U WITH MACRON */ },
-	{0xEE, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xEF, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xF0, 0x016B /* LATIN SMALL LETTER U WITH MACRON */ },
-	{0xF1, 0x016E /* LATIN CAPITAL LETTER U WITH RING ABOVE */ },
-	{0xF2, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xF3, 0x016F /* LATIN SMALL LETTER U WITH RING ABOVE */ },
-	{0xF4, 0x0170 /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ },
-	{0xF5, 0x0171 /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */ },
-	{0xF6, 0x0172 /* LATIN CAPITAL LETTER U WITH OGONEK */ },
-	{0xF7, 0x0173 /* LATIN SMALL LETTER U WITH OGONEK */ },
-	{0xF8, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xF9, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFA, 0x0137 /* LATIN SMALL LETTER K WITH CEDILLA */ },
-	{0xFB, 0x017B /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ },
-	{0xFC, 0x0141 /* LATIN CAPITAL LETTER L WITH STROKE */ },
-	{0xFD, 0x017C /* LATIN SMALL LETTER Z WITH DOT ABOVE */ },
-	{0xFE, 0x0122 /* LATIN CAPITAL LETTER G WITH CEDILLA */ },
-	{0xFF, 0x02C7 /* CARON */ },
-	{0, 0}
+const uint16_t highhalf_mac_lat2 [] = {
+	/* 0x80 */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0x81 */ 0x0100, /* LATIN CAPITAL LETTER A WITH MACRON */
+	/* 0x82 */ 0x0101, /* LATIN SMALL LETTER A WITH MACRON */
+	/* 0x83 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0x84 */ 0x0104, /* LATIN CAPITAL LETTER A WITH OGONEK */
+	/* 0x85 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0x86 */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0x87 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0x88 */ 0x0105, /* LATIN SMALL LETTER A WITH OGONEK */
+	/* 0x89 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0x8A */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0x8B */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0x8C */ 0x0106, /* LATIN CAPITAL LETTER C WITH ACUTE */
+	/* 0x8D */ 0x0107, /* LATIN SMALL LETTER C WITH ACUTE */
+	/* 0x8E */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0x8F */ 0x0179, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+	/* 0x90 */ 0x017A, /* LATIN SMALL LETTER Z WITH ACUTE */
+	/* 0x91 */ 0x010E, /* LATIN CAPITAL LETTER D WITH CARON */
+	/* 0x92 */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0x93 */ 0x010F, /* LATIN SMALL LETTER D WITH CARON */
+	/* 0x94 */ 0x0112, /* LATIN CAPITAL LETTER E WITH MACRON */
+	/* 0x95 */ 0x0113, /* LATIN SMALL LETTER E WITH MACRON */
+	/* 0x96 */ 0x0116, /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
+	/* 0x97 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0x98 */ 0x0117, /* LATIN SMALL LETTER E WITH DOT ABOVE */
+	/* 0x99 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0x9A */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0x9B */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0x9C */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0x9D */ 0x011A, /* LATIN CAPITAL LETTER E WITH CARON */
+	/* 0x9E */ 0x011B, /* LATIN SMALL LETTER E WITH CARON */
+	/* 0x9F */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0xA0 */ 0x2020, /* DAGGER */
+	/* 0xA1 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xA2 */ 0x0118, /* LATIN CAPITAL LETTER E WITH OGONEK */
+	/* 0xA3 */ 0x00A3, /* POUND SIGN */
+	/* 0xA4 */ 0x00A7, /* SECTION SIGN */
+	/* 0xA5 */ 0x2022, /* BULLET */
+	/* 0xA6 */ 0x00B6, /* PILCROW SIGN */
+	/* 0xA7 */ 0x00DF, /* LATIN SMALL LETTER SHARP S */
+	/* 0xA8 */ 0x00AE, /* REGISTERED SIGN */
+	/* 0xA9 */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xAA */ 0x2122, /* TRADE MARK SIGN */
+	/* 0xAB */ 0x0119, /* LATIN SMALL LETTER E WITH OGONEK */
+	/* 0xAC */ 0x00A8, /* DIAERESIS */
+	/* 0xAD */ 0x2260, /* NOT EQUAL TO */
+	/* 0xAE */ 0x0123, /* LATIN SMALL LETTER G WITH CEDILLA */
+	/* 0xAF */ 0x012E, /* LATIN CAPITAL LETTER I WITH OGONEK */
+	/* 0xB0 */ 0x012F, /* LATIN SMALL LETTER I WITH OGONEK */
+	/* 0xB1 */ 0x012A, /* LATIN CAPITAL LETTER I WITH MACRON */
+	/* 0xB2 */ 0x2264, /* LESS-THAN OR EQUAL TO */
+	/* 0xB3 */ 0x2265, /* GREATER-THAN OR EQUAL TO */
+	/* 0xB4 */ 0x012B, /* LATIN SMALL LETTER I WITH MACRON */
+	/* 0xB5 */ 0x0136, /* LATIN CAPITAL LETTER K WITH CEDILLA */
+	/* 0xB6 */ 0x2202, /* PARTIAL DIFFERENTIAL */
+	/* 0xB7 */ 0x2211, /* N-ARY SUMMATION */
+	/* 0xB8 */ 0x0142, /* LATIN SMALL LETTER L WITH STROKE */
+	/* 0xB9 */ 0x013B, /* LATIN CAPITAL LETTER L WITH CEDILLA */
+	/* 0xBA */ 0x013C, /* LATIN SMALL LETTER L WITH CEDILLA */
+	/* 0xBB */ 0x013D, /* LATIN CAPITAL LETTER L WITH CARON */
+	/* 0xBC */ 0x013E, /* LATIN SMALL LETTER L WITH CARON */
+	/* 0xBD */ 0x0139, /* LATIN CAPITAL LETTER L WITH ACUTE */
+	/* 0xBE */ 0x013A, /* LATIN SMALL LETTER L WITH ACUTE */
+	/* 0xBF */ 0x0145, /* LATIN CAPITAL LETTER N WITH CEDILLA */
+	/* 0xC0 */ 0x0146, /* LATIN SMALL LETTER N WITH CEDILLA */
+	/* 0xC1 */ 0x0143, /* LATIN CAPITAL LETTER N WITH ACUTE */
+	/* 0xC2 */ 0x00AC, /* NOT SIGN */
+	/* 0xC3 */ 0x221A, /* SQUARE ROOT */
+	/* 0xC4 */ 0x0144, /* LATIN SMALL LETTER N WITH ACUTE */
+	/* 0xC5 */ 0x0147, /* LATIN CAPITAL LETTER N WITH CARON */
+	/* 0xC6 */ 0x2206, /* INCREMENT */
+	/* 0xC7 */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xC8 */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xC9 */ 0x2026, /* HORIZONTAL ELLIPSIS */
+	/* 0xCA */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xCB */ 0x0148, /* LATIN SMALL LETTER N WITH CARON */
+	/* 0xCC */ 0x0150, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+	/* 0xCD */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xCE */ 0x0151, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+	/* 0xCF */ 0x014C, /* LATIN CAPITAL LETTER O WITH MACRON */
+	/* 0xD0 */ 0x2013, /* EN DASH */
+	/* 0xD1 */ 0x2014, /* EM DASH */
+	/* 0xD2 */ 0x201C, /* LEFT DOUBLE QUOTATION MARK */
+	/* 0xD3 */ 0x201D, /* RIGHT DOUBLE QUOTATION MARK */
+	/* 0xD4 */ 0x2018, /* LEFT SINGLE QUOTATION MARK */
+	/* 0xD5 */ 0x2019, /* RIGHT SINGLE QUOTATION MARK */
+	/* 0xD6 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xD7 */ 0x25CA, /* LOZENGE */
+	/* 0xD8 */ 0x014D, /* LATIN SMALL LETTER O WITH MACRON */
+	/* 0xD9 */ 0x0154, /* LATIN CAPITAL LETTER R WITH ACUTE */
+	/* 0xDA */ 0x0155, /* LATIN SMALL LETTER R WITH ACUTE */
+	/* 0xDB */ 0x0158, /* LATIN CAPITAL LETTER R WITH CARON */
+	/* 0xDC */ 0x2039, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
+	/* 0xDD */ 0x203A, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */
+	/* 0xDE */ 0x0159, /* LATIN SMALL LETTER R WITH CARON */
+	/* 0xDF */ 0x0156, /* LATIN CAPITAL LETTER R WITH CEDILLA */
+	/* 0xE0 */ 0x0157, /* LATIN SMALL LETTER R WITH CEDILLA */
+	/* 0xE1 */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0xE2 */ 0x201A, /* SINGLE LOW-9 QUOTATION MARK */
+	/* 0xE3 */ 0x201E, /* DOUBLE LOW-9 QUOTATION MARK */
+	/* 0xE4 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xE5 */ 0x015A, /* LATIN CAPITAL LETTER S WITH ACUTE */
+	/* 0xE6 */ 0x015B, /* LATIN SMALL LETTER S WITH ACUTE */
+	/* 0xE7 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xE8 */ 0x0164, /* LATIN CAPITAL LETTER T WITH CARON */
+	/* 0xE9 */ 0x0165, /* LATIN SMALL LETTER T WITH CARON */
+	/* 0xEA */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xEB */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0xEC */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0xED */ 0x016A, /* LATIN CAPITAL LETTER U WITH MACRON */
+	/* 0xEE */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xEF */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xF0 */ 0x016B, /* LATIN SMALL LETTER U WITH MACRON */
+	/* 0xF1 */ 0x016E, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+	/* 0xF2 */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xF3 */ 0x016F, /* LATIN SMALL LETTER U WITH RING ABOVE */
+	/* 0xF4 */ 0x0170, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+	/* 0xF5 */ 0x0171, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+	/* 0xF6 */ 0x0172, /* LATIN CAPITAL LETTER U WITH OGONEK */
+	/* 0xF7 */ 0x0173, /* LATIN SMALL LETTER U WITH OGONEK */
+	/* 0xF8 */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xF9 */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFA */ 0x0137, /* LATIN SMALL LETTER K WITH CEDILLA */
+	/* 0xFB */ 0x017B, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+	/* 0xFC */ 0x0141, /* LATIN CAPITAL LETTER L WITH STROKE */
+	/* 0xFD */ 0x017C, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+	/* 0xFE */ 0x0122, /* LATIN CAPITAL LETTER G WITH CEDILLA */
+	/* 0xFF */ 0x02C7, /* CARON */
 };
 
+#define table_mac_lat2 table_NULL
+
 unsigned char *const aliases_mac_lat2 [] = {
 	"x-mac-ce",
 	"mac-ce",
@@ -3749,138 +4004,139 @@ unsigned char *const aliases_mac_lat2 [] = {
 
 /*** kamen ***/
 
-const struct table_entry table_kamen [] = {
-	{0x80, 0x010C /* LATIN CAPITAL LETTER C WITH CARON */ },
-	{0x81, 0x00FC /* LATIN SMALL LETTER U WITH DIAERESIS */ },
-	{0x82, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0x83, 0x010F /* LATIN SMALL LETTER D WITH CARON */ },
-	{0x84, 0x00E4 /* LATIN SMALL LETTER A WITH DIAERESIS */ },
-	{0x85, 0x010E /* LATIN CAPITAL LETTER D WITH CARON */ },
-	{0x86, 0x0164 /* LATIN CAPITAL LETTER T WITH CARON */ },
-	{0x87, 0x010D /* LATIN SMALL LETTER C WITH CARON */ },
-	{0x88, 0x011B /* LATIN SMALL LETTER E WITH CARON */ },
-	{0x89, 0x011A /* LATIN CAPITAL LETTER E WITH CARON */ },
-	{0x8A, 0x0139 /* LATIN CAPITAL LETTER L WITH ACUTE */ },
-	{0x8B, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0x8C, 0x013E /* LATIN SMALL LETTER L WITH CARON */ },
-	{0x8D, 0x013A /* LATIN SMALL LETTER L WITH ACUTE */ },
-	{0x8E, 0x00C4 /* LATIN CAPITAL LETTER A WITH DIAERESIS */ },
-	{0x8F, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0x90, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0x91, 0x017E /* LATIN SMALL LETTER Z WITH CARON */ },
-	{0x92, 0x017D /* LATIN CAPITAL LETTER Z WITH CARON */ },
-	{0x93, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0x94, 0x00F6 /* LATIN SMALL LETTER O WITH DIAERESIS */ },
-	{0x95, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0x96, 0x016F /* LATIN SMALL LETTER U WITH RING ABOVE */ },
-	{0x97, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0x98, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0x99, 0x00D6 /* LATIN CAPITAL LETTER O WITH DIAERESIS */ },
-	{0x9A, 0x00DC /* LATIN CAPITAL LETTER U WITH DIAERESIS */ },
-	{0x9B, 0x0160 /* LATIN CAPITAL LETTER S WITH CARON */ },
-	{0x9C, 0x013D /* LATIN CAPITAL LETTER L WITH CARON */ },
-	{0x9D, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0x9E, 0x0158 /* LATIN CAPITAL LETTER R WITH CARON */ },
-	{0x9F, 0x0165 /* LATIN SMALL LETTER T WITH CARON */ },
-	{0xA0, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xA1, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xA2, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xA3, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xA4, 0x0148 /* LATIN SMALL LETTER N WITH CARON */ },
-	{0xA5, 0x0147 /* LATIN CAPITAL LETTER N WITH CARON */ },
-	{0xA6, 0x016E /* LATIN CAPITAL LETTER U WITH RING ABOVE */ },
-	{0xA7, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xA8, 0x0161 /* LATIN SMALL LETTER S WITH CARON */ },
-	{0xA9, 0x0159 /* LATIN SMALL LETTER R WITH CARON */ },
-	{0xAA, 0x0155 /* LATIN SMALL LETTER R WITH ACUTE */ },
-	{0xAB, 0x0154 /* LATIN CAPITAL LETTER R WITH ACUTE */ },
-	{0xAC, 0x00BC /* VULGAR FRACTION ONE QUARTER */ },
-	{0xAD, 0x00A7 /* SECTION SIGN */ },
-	{0xAE, 0x00BB /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xAF, 0x00AB /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ },
-	{0xB0, 0x2591 /* LIGHT SHADE */ },
-	{0xB1, 0x2592 /* MEDIUM SHADE */ },
-	{0xB2, 0x2593 /* DARK SHADE */ },
-	{0xB3, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0xB4, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0xB5, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xB6, 0x2562 /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ },
-	{0xB7, 0x2556 /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ },
-	{0xB8, 0x2555 /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ },
-	{0xB9, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xBA, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xBB, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xBC, 0x255D /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xBD, 0x255C /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ },
-	{0xBE, 0x255B /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xBF, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0xC0, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0xC1, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0xC2, 0x252C /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0xC3, 0x251C /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0xC4, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0xC5, 0x253C /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0xC6, 0x255E /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xC7, 0x255F /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xC8, 0x255A /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xC9, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xCA, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xCB, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xCC, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xCD, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xCE, 0x256C /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xCF, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xD0, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xD1, 0x2564 /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xD2, 0x2565 /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xD3, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xD4, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xD5, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xD6, 0x2553 /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ },
-	{0xD7, 0x256B /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xD8, 0x256A /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xD9, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0xDA, 0x250C /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0xDB, 0x2588 /* FULL BLOCK */ },
-	{0xDC, 0x2584 /* LOWER HALF BLOCK */ },
-	{0xDD, 0x258C /* LEFT HALF BLOCK */ },
-	{0xDE, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0xDF, 0x2580 /* UPPER HALF BLOCK */ },
-	{0xE0, 0x03B1 /* GREEK SMALL LETTER ALPHA */ },
-	{0xE1, 0x03B2 /* GREEK SMALL LETTER BETA */ },
-	{0xE2, 0x0194 /* LATIN CAPITAL LETTER GAMMA */ },
-	{0xE3, 0x03C0 /* GREEK SMALL LETTER PI */ },
-	{0xE4, 0x03A3 /* GREEK CAPITAL LETTER SIGMA */ },
-	{0xE5, 0x03C3 /* GREEK SMALL LETTER SIGMA */ },
-	{0xE6, 0x03BC /* GREEK SMALL LETTER MU */ },
-	{0xE7, 0x03C4 /* GREEK SMALL LETTER TAU */ },
-	{0xE8, 0x03A6 /* GREEK CAPITAL LETTER PHI */ },
-	{0xE9, 0x0398 /* GREEK CAPITAL LETTER THETA */ },
-	{0xEA, 0x03A9 /* GREEK CAPITAL LETTER OMEGA */ },
-	{0xEB, 0x03B4 /* GREEK SMALL LETTER DELTA */ },
-	{0xEC, 0x221E /* INFINITY */ },
-	{0xED, 0x03C6 /* GREEK SMALL LETTER PHI */ },
-	{0xEE, 0x2208 /* ELEMENT OF */ },
-	{0xEF, 0x2229 /* INTERSECTION */ },
-	{0xF0, 0x224D /* EQUIVALENT TO */ },
-	{0xF1, 0x00B1 /* PLUS-MINUS SIGN */ },
-	{0xF2, 0x2265 /* GREATER-THAN OR EQUAL TO */ },
-	{0xF3, 0x2264 /* LESS-THAN OR EQUAL TO */ },
-	{0xF4, 0x2320 /* TOP HALF INTEGRAL */ },
-	{0xF5, 0x2321 /* BOTTOM HALF INTEGRAL */ },
-	{0xF6, 0x00F7 /* DIVISION SIGN */ },
-	{0xF7, 0x2248 /* ALMOST EQUAL TO */ },
-	{0xF8, 0x00B0 /* DEGREE SIGN */ },
-	{0xF9, 0x2219 /* BULLET OPERATOR */ },
-	{0xFA, 0x00B7 /* MIDDLE DOT */ },
-	{0xFB, 0x221A /* SQUARE ROOT */ },
-	{0xFC, 0x207F /* SUPERSCRIPT LATIN SMALL LETTER N */ },
-	{0xFD, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0xFE, 0x25A0 /* BLACK SQUARE */ },
-	{0xFF, 0x00A0 /* NO-BREAK SPACE */ },
-	{0, 0}
+const uint16_t highhalf_kamen [] = {
+	/* 0x80 */ 0x010C, /* LATIN CAPITAL LETTER C WITH CARON */
+	/* 0x81 */ 0x00FC, /* LATIN SMALL LETTER U WITH DIAERESIS */
+	/* 0x82 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0x83 */ 0x010F, /* LATIN SMALL LETTER D WITH CARON */
+	/* 0x84 */ 0x00E4, /* LATIN SMALL LETTER A WITH DIAERESIS */
+	/* 0x85 */ 0x010E, /* LATIN CAPITAL LETTER D WITH CARON */
+	/* 0x86 */ 0x0164, /* LATIN CAPITAL LETTER T WITH CARON */
+	/* 0x87 */ 0x010D, /* LATIN SMALL LETTER C WITH CARON */
+	/* 0x88 */ 0x011B, /* LATIN SMALL LETTER E WITH CARON */
+	/* 0x89 */ 0x011A, /* LATIN CAPITAL LETTER E WITH CARON */
+	/* 0x8A */ 0x0139, /* LATIN CAPITAL LETTER L WITH ACUTE */
+	/* 0x8B */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0x8C */ 0x013E, /* LATIN SMALL LETTER L WITH CARON */
+	/* 0x8D */ 0x013A, /* LATIN SMALL LETTER L WITH ACUTE */
+	/* 0x8E */ 0x00C4, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+	/* 0x8F */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0x90 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0x91 */ 0x017E, /* LATIN SMALL LETTER Z WITH CARON */
+	/* 0x92 */ 0x017D, /* LATIN CAPITAL LETTER Z WITH CARON */
+	/* 0x93 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0x94 */ 0x00F6, /* LATIN SMALL LETTER O WITH DIAERESIS */
+	/* 0x95 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0x96 */ 0x016F, /* LATIN SMALL LETTER U WITH RING ABOVE */
+	/* 0x97 */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0x98 */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0x99 */ 0x00D6, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+	/* 0x9A */ 0x00DC, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+	/* 0x9B */ 0x0160, /* LATIN CAPITAL LETTER S WITH CARON */
+	/* 0x9C */ 0x013D, /* LATIN CAPITAL LETTER L WITH CARON */
+	/* 0x9D */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0x9E */ 0x0158, /* LATIN CAPITAL LETTER R WITH CARON */
+	/* 0x9F */ 0x0165, /* LATIN SMALL LETTER T WITH CARON */
+	/* 0xA0 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xA1 */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xA2 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xA3 */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xA4 */ 0x0148, /* LATIN SMALL LETTER N WITH CARON */
+	/* 0xA5 */ 0x0147, /* LATIN CAPITAL LETTER N WITH CARON */
+	/* 0xA6 */ 0x016E, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+	/* 0xA7 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xA8 */ 0x0161, /* LATIN SMALL LETTER S WITH CARON */
+	/* 0xA9 */ 0x0159, /* LATIN SMALL LETTER R WITH CARON */
+	/* 0xAA */ 0x0155, /* LATIN SMALL LETTER R WITH ACUTE */
+	/* 0xAB */ 0x0154, /* LATIN CAPITAL LETTER R WITH ACUTE */
+	/* 0xAC */ 0x00BC, /* VULGAR FRACTION ONE QUARTER */
+	/* 0xAD */ 0x00A7, /* SECTION SIGN */
+	/* 0xAE */ 0x00BB, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xAF */ 0x00AB, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
+	/* 0xB0 */ 0x2591, /* LIGHT SHADE */
+	/* 0xB1 */ 0x2592, /* MEDIUM SHADE */
+	/* 0xB2 */ 0x2593, /* DARK SHADE */
+	/* 0xB3 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0xB4 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0xB5 */ 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB6 */ 0x2562, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */
+	/* 0xB7 */ 0x2556, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */
+	/* 0xB8 */ 0x2555, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */
+	/* 0xB9 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xBA */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xBB */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xBC */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xBD */ 0x255C, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */
+	/* 0xBE */ 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */
+	/* 0xBF */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0xC0 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0xC1 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0xC2 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0xC3 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0xC4 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0xC5 */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0xC6 */ 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xC7 */ 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xC8 */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xC9 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xCA */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xCB */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xCC */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xCD */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xCE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xCF */ 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD0 */ 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD1 */ 0x2564, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD2 */ 0x2565, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD3 */ 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */
+	/* 0xD4 */ 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */
+	/* 0xD5 */ 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xD6 */ 0x2553, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */
+	/* 0xD7 */ 0x256B, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xD8 */ 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xD9 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0xDA */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0xDB */ 0x2588, /* FULL BLOCK */
+	/* 0xDC */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0xDD */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0xDE */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0xDF */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0xE0 */ 0x03B1, /* GREEK SMALL LETTER ALPHA */
+	/* 0xE1 */ 0x03B2, /* GREEK SMALL LETTER BETA */
+	/* 0xE2 */ 0x0194, /* LATIN CAPITAL LETTER GAMMA */
+	/* 0xE3 */ 0x03C0, /* GREEK SMALL LETTER PI */
+	/* 0xE4 */ 0x03A3, /* GREEK CAPITAL LETTER SIGMA */
+	/* 0xE5 */ 0x03C3, /* GREEK SMALL LETTER SIGMA */
+	/* 0xE6 */ 0x03BC, /* GREEK SMALL LETTER MU */
+	/* 0xE7 */ 0x03C4, /* GREEK SMALL LETTER TAU */
+	/* 0xE8 */ 0x03A6, /* GREEK CAPITAL LETTER PHI */
+	/* 0xE9 */ 0x0398, /* GREEK CAPITAL LETTER THETA */
+	/* 0xEA */ 0x03A9, /* GREEK CAPITAL LETTER OMEGA */
+	/* 0xEB */ 0x03B4, /* GREEK SMALL LETTER DELTA */
+	/* 0xEC */ 0x221E, /* INFINITY */
+	/* 0xED */ 0x03C6, /* GREEK SMALL LETTER PHI */
+	/* 0xEE */ 0x2208, /* ELEMENT OF */
+	/* 0xEF */ 0x2229, /* INTERSECTION */
+	/* 0xF0 */ 0x224D, /* EQUIVALENT TO */
+	/* 0xF1 */ 0x00B1, /* PLUS-MINUS SIGN */
+	/* 0xF2 */ 0x2265, /* GREATER-THAN OR EQUAL TO */
+	/* 0xF3 */ 0x2264, /* LESS-THAN OR EQUAL TO */
+	/* 0xF4 */ 0x2320, /* TOP HALF INTEGRAL */
+	/* 0xF5 */ 0x2321, /* BOTTOM HALF INTEGRAL */
+	/* 0xF6 */ 0x00F7, /* DIVISION SIGN */
+	/* 0xF7 */ 0x2248, /* ALMOST EQUAL TO */
+	/* 0xF8 */ 0x00B0, /* DEGREE SIGN */
+	/* 0xF9 */ 0x2219, /* BULLET OPERATOR */
+	/* 0xFA */ 0x00B7, /* MIDDLE DOT */
+	/* 0xFB */ 0x221A, /* SQUARE ROOT */
+	/* 0xFC */ 0x207F, /* SUPERSCRIPT LATIN SMALL LETTER N */
+	/* 0xFD */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0xFE */ 0x25A0, /* BLACK SQUARE */
+	/* 0xFF */ 0x00A0, /* NO-BREAK SPACE */
 };
 
+#define table_kamen table_NULL
+
 unsigned char *const aliases_kamen [] = {
 	"x-kam-cs",
 	"kam",
@@ -3892,138 +4148,139 @@ unsigned char *const aliases_kamen [] = {
 
 /*** koi8_r ***/
 
-const struct table_entry table_koi8_r [] = {
-	{0x80, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0x81, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0x82, 0x250C /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0x83, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0x84, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0x85, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0x86, 0x251C /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0x87, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0x88, 0x252C /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0x89, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0x8A, 0x253C /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0x8B, 0x2580 /* UPPER HALF BLOCK */ },
-	{0x8C, 0x2584 /* LOWER HALF BLOCK */ },
-	{0x8D, 0x2588 /* FULL BLOCK */ },
-	{0x8E, 0x258C /* LEFT HALF BLOCK */ },
-	{0x8F, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0x90, 0x2591 /* LIGHT SHADE */ },
-	{0x91, 0x2592 /* MEDIUM SHADE */ },
-	{0x92, 0x2593 /* DARK SHADE */ },
-	{0x93, 0x2320 /* TOP HALF INTEGRAL */ },
-	{0x94, 0x25A0 /* BLACK SQUARE */ },
-	{0x95, 0x2022 /* BULLET */ },
-	{0x96, 0x221A /* SQUARE ROOT */ },
-	{0x97, 0x2248 /* ALMOST EQUAL TO */ },
-	{0x98, 0x2264 /* LESS-THAN OR EQUAL TO */ },
-	{0x99, 0x2265 /* GREATER-THAN OR EQUAL TO */ },
-	{0x9A, 0x00A0 /* NO-BREAK SPACE */ },
-	{0x9B, 0x2321 /* BOTTOM HALF INTEGRAL */ },
-	{0x9C, 0x00B0 /* DEGREE SIGN */ },
-	{0x9D, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0x9E, 0x00B7 /* MIDDLE DOT */ },
-	{0x9F, 0x00F7 /* DIVISION SIGN */ },
-	{0xA0, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xA1, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xA2, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xA3, 0x0451 /* CYRILLIC SMALL LETTER IO */ },
-	{0xA4, 0x2553 /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ },
-	{0xA5, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xA6, 0x2555 /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ },
-	{0xA7, 0x2556 /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ },
-	{0xA8, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xA9, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xAA, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xAB, 0x255A /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xAC, 0x255B /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xAD, 0x255C /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ },
-	{0xAE, 0x255D /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xAF, 0x255E /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xB0, 0x255F /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xB1, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xB2, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xB3, 0x0401 /* CYRILLIC CAPITAL LETTER IO */ },
-	{0xB4, 0x2562 /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ },
-	{0xB5, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xB6, 0x2564 /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xB7, 0x2565 /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xB8, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xB9, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xBA, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xBB, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xBC, 0x256A /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xBD, 0x256B /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xBE, 0x256C /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xBF, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xC0, 0x044E /* CYRILLIC SMALL LETTER YU */ },
-	{0xC1, 0x0430 /* CYRILLIC SMALL LETTER A */ },
-	{0xC2, 0x0431 /* CYRILLIC SMALL LETTER BE */ },
-	{0xC3, 0x0446 /* CYRILLIC SMALL LETTER TSE */ },
-	{0xC4, 0x0434 /* CYRILLIC SMALL LETTER DE */ },
-	{0xC5, 0x0435 /* CYRILLIC SMALL LETTER IE */ },
-	{0xC6, 0x0444 /* CYRILLIC SMALL LETTER EF */ },
-	{0xC7, 0x0433 /* CYRILLIC SMALL LETTER GHE */ },
-	{0xC8, 0x0445 /* CYRILLIC SMALL LETTER HA */ },
-	{0xC9, 0x0438 /* CYRILLIC SMALL LETTER I */ },
-	{0xCA, 0x0439 /* CYRILLIC SMALL LETTER SHORT I */ },
-	{0xCB, 0x043A /* CYRILLIC SMALL LETTER KA */ },
-	{0xCC, 0x043B /* CYRILLIC SMALL LETTER EL */ },
-	{0xCD, 0x043C /* CYRILLIC SMALL LETTER EM */ },
-	{0xCE, 0x043D /* CYRILLIC SMALL LETTER EN */ },
-	{0xCF, 0x043E /* CYRILLIC SMALL LETTER O */ },
-	{0xD0, 0x043F /* CYRILLIC SMALL LETTER PE */ },
-	{0xD1, 0x044F /* CYRILLIC SMALL LETTER YA */ },
-	{0xD2, 0x0440 /* CYRILLIC SMALL LETTER ER */ },
-	{0xD3, 0x0441 /* CYRILLIC SMALL LETTER ES */ },
-	{0xD4, 0x0442 /* CYRILLIC SMALL LETTER TE */ },
-	{0xD5, 0x0443 /* CYRILLIC SMALL LETTER U */ },
-	{0xD6, 0x0436 /* CYRILLIC SMALL LETTER ZHE */ },
-	{0xD7, 0x0432 /* CYRILLIC SMALL LETTER VE */ },
-	{0xD8, 0x044C /* CYRILLIC SMALL LETTER SOFT SIGN */ },
-	{0xD9, 0x044B /* CYRILLIC SMALL LETTER YERU */ },
-	{0xDA, 0x0437 /* CYRILLIC SMALL LETTER ZE */ },
-	{0xDB, 0x0448 /* CYRILLIC SMALL LETTER SHA */ },
-	{0xDC, 0x044D /* CYRILLIC SMALL LETTER E */ },
-	{0xDD, 0x0449 /* CYRILLIC SMALL LETTER SHCHA */ },
-	{0xDE, 0x0447 /* CYRILLIC SMALL LETTER CHE */ },
-	{0xDF, 0x044A /* CYRILLIC SMALL LETTER HARD SIGN */ },
-	{0xE0, 0x042E /* CYRILLIC CAPITAL LETTER YU */ },
-	{0xE1, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
-	{0xE2, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
-	{0xE3, 0x0426 /* CYRILLIC CAPITAL LETTER TSE */ },
-	{0xE4, 0x0414 /* CYRILLIC CAPITAL LETTER DE */ },
-	{0xE5, 0x0415 /* CYRILLIC CAPITAL LETTER IE */ },
-	{0xE6, 0x0424 /* CYRILLIC CAPITAL LETTER EF */ },
-	{0xE7, 0x0413 /* CYRILLIC CAPITAL LETTER GHE */ },
-	{0xE8, 0x0425 /* CYRILLIC CAPITAL LETTER HA */ },
-	{0xE9, 0x0418 /* CYRILLIC CAPITAL LETTER I */ },
-	{0xEA, 0x0419 /* CYRILLIC CAPITAL LETTER SHORT I */ },
-	{0xEB, 0x041A /* CYRILLIC CAPITAL LETTER KA */ },
-	{0xEC, 0x041B /* CYRILLIC CAPITAL LETTER EL */ },
-	{0xED, 0x041C /* CYRILLIC CAPITAL LETTER EM */ },
-	{0xEE, 0x041D /* CYRILLIC CAPITAL LETTER EN */ },
-	{0xEF, 0x041E /* CYRILLIC CAPITAL LETTER O */ },
-	{0xF0, 0x041F /* CYRILLIC CAPITAL LETTER PE */ },
-	{0xF1, 0x042F /* CYRILLIC CAPITAL LETTER YA */ },
-	{0xF2, 0x0420 /* CYRILLIC CAPITAL LETTER ER */ },
-	{0xF3, 0x0421 /* CYRILLIC CAPITAL LETTER ES */ },
-	{0xF4, 0x0422 /* CYRILLIC CAPITAL LETTER TE */ },
-	{0xF5, 0x0423 /* CYRILLIC CAPITAL LETTER U */ },
-	{0xF6, 0x0416 /* CYRILLIC CAPITAL LETTER ZHE */ },
-	{0xF7, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
-	{0xF8, 0x042C /* CYRILLIC CAPITAL LETTER SOFT SIGN */ },
-	{0xF9, 0x042B /* CYRILLIC CAPITAL LETTER YERU */ },
-	{0xFA, 0x0417 /* CYRILLIC CAPITAL LETTER ZE */ },
-	{0xFB, 0x0428 /* CYRILLIC CAPITAL LETTER SHA */ },
-	{0xFC, 0x042D /* CYRILLIC CAPITAL LETTER E */ },
-	{0xFD, 0x0429 /* CYRILLIC CAPITAL LETTER SHCHA */ },
-	{0xFE, 0x0427 /* CYRILLIC CAPITAL LETTER CHE */ },
-	{0xFF, 0x042A /* CYRILLIC CAPITAL LETTER HARD SIGN */ },
-	{0, 0}
+const uint16_t highhalf_koi8_r [] = {
+	/* 0x80 */ 0x2500, /* BOX DRAWINGS LIGHT HORIZONTAL */
+	/* 0x81 */ 0x2502, /* BOX DRAWINGS LIGHT VERTICAL */
+	/* 0x82 */ 0x250C, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */
+	/* 0x83 */ 0x2510, /* BOX DRAWINGS LIGHT DOWN AND LEFT */
+	/* 0x84 */ 0x2514, /* BOX DRAWINGS LIGHT UP AND RIGHT */
+	/* 0x85 */ 0x2518, /* BOX DRAWINGS LIGHT UP AND LEFT */
+	/* 0x86 */ 0x251C, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */
+	/* 0x87 */ 0x2524, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */
+	/* 0x88 */ 0x252C, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */
+	/* 0x89 */ 0x2534, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */
+	/* 0x8A */ 0x253C, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */
+	/* 0x8B */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0x8C */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0x8D */ 0x2588, /* FULL BLOCK */
+	/* 0x8E */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0x8F */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0x90 */ 0x2591, /* LIGHT SHADE */
+	/* 0x91 */ 0x2592, /* MEDIUM SHADE */
+	/* 0x92 */ 0x2593, /* DARK SHADE */
+	/* 0x93 */ 0x2320, /* TOP HALF INTEGRAL */
+	/* 0x94 */ 0x25A0, /* BLACK SQUARE */
+	/* 0x95 */ 0x2022, /* BULLET */
+	/* 0x96 */ 0x221A, /* SQUARE ROOT */
+	/* 0x97 */ 0x2248, /* ALMOST EQUAL TO */
+	/* 0x98 */ 0x2264, /* LESS-THAN OR EQUAL TO */
+	/* 0x99 */ 0x2265, /* GREATER-THAN OR EQUAL TO */
+	/* 0x9A */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0x9B */ 0x2321, /* BOTTOM HALF INTEGRAL */
+	/* 0x9C */ 0x00B0, /* DEGREE SIGN */
+	/* 0x9D */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0x9E */ 0x00B7, /* MIDDLE DOT */
+	/* 0x9F */ 0x00F7, /* DIVISION SIGN */
+	/* 0xA0 */ 0x2550, /* BOX DRAWINGS DOUBLE HORIZONTAL */
+	/* 0xA1 */ 0x2551, /* BOX DRAWINGS DOUBLE VERTICAL */
+	/* 0xA2 */ 0x2552, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xA3 */ 0x0451, /* CYRILLIC SMALL LETTER IO */
+	/* 0xA4 */ 0x2553, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */
+	/* 0xA5 */ 0x2554, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */
+	/* 0xA6 */ 0x2555, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */
+	/* 0xA7 */ 0x2556, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */
+	/* 0xA8 */ 0x2557, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */
+	/* 0xA9 */ 0x2558, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */
+	/* 0xAA */ 0x2559, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */
+	/* 0xAB */ 0x255A, /* BOX DRAWINGS DOUBLE UP AND RIGHT */
+	/* 0xAC */ 0x255B, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */
+	/* 0xAD */ 0x255C, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */
+	/* 0xAE */ 0x255D, /* BOX DRAWINGS DOUBLE UP AND LEFT */
+	/* 0xAF */ 0x255E, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xB0 */ 0x255F, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xB1 */ 0x2560, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */
+	/* 0xB2 */ 0x2561, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB3 */ 0x0401, /* CYRILLIC CAPITAL LETTER IO */
+	/* 0xB4 */ 0x2562, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */
+	/* 0xB5 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xB6 */ 0x2564, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xB7 */ 0x2565, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xB8 */ 0x2566, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */
+	/* 0xB9 */ 0x2567, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xBA */ 0x2568, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xBB */ 0x2569, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */
+	/* 0xBC */ 0x256A, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xBD */ 0x256B, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xBE */ 0x256C, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xBF */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xC0 */ 0x044E, /* CYRILLIC SMALL LETTER YU */
+	/* 0xC1 */ 0x0430, /* CYRILLIC SMALL LETTER A */
+	/* 0xC2 */ 0x0431, /* CYRILLIC SMALL LETTER BE */
+	/* 0xC3 */ 0x0446, /* CYRILLIC SMALL LETTER TSE */
+	/* 0xC4 */ 0x0434, /* CYRILLIC SMALL LETTER DE */
+	/* 0xC5 */ 0x0435, /* CYRILLIC SMALL LETTER IE */
+	/* 0xC6 */ 0x0444, /* CYRILLIC SMALL LETTER EF */
+	/* 0xC7 */ 0x0433, /* CYRILLIC SMALL LETTER GHE */
+	/* 0xC8 */ 0x0445, /* CYRILLIC SMALL LETTER HA */
+	/* 0xC9 */ 0x0438, /* CYRILLIC SMALL LETTER I */
+	/* 0xCA */ 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
+	/* 0xCB */ 0x043A, /* CYRILLIC SMALL LETTER KA */
+	/* 0xCC */ 0x043B, /* CYRILLIC SMALL LETTER EL */
+	/* 0xCD */ 0x043C, /* CYRILLIC SMALL LETTER EM */
+	/* 0xCE */ 0x043D, /* CYRILLIC SMALL LETTER EN */
+	/* 0xCF */ 0x043E, /* CYRILLIC SMALL LETTER O */
+	/* 0xD0 */ 0x043F, /* CYRILLIC SMALL LETTER PE */
+	/* 0xD1 */ 0x044F, /* CYRILLIC SMALL LETTER YA */
+	/* 0xD2 */ 0x0440, /* CYRILLIC SMALL LETTER ER */
+	/* 0xD3 */ 0x0441, /* CYRILLIC SMALL LETTER ES */
+	/* 0xD4 */ 0x0442, /* CYRILLIC SMALL LETTER TE */
+	/* 0xD5 */ 0x0443, /* CYRILLIC SMALL LETTER U */
+	/* 0xD6 */ 0x0436, /* CYRILLIC SMALL LETTER ZHE */
+	/* 0xD7 */ 0x0432, /* CYRILLIC SMALL LETTER VE */
+	/* 0xD8 */ 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */
+	/* 0xD9 */ 0x044B, /* CYRILLIC SMALL LETTER YERU */
+	/* 0xDA */ 0x0437, /* CYRILLIC SMALL LETTER ZE */
+	/* 0xDB */ 0x0448, /* CYRILLIC SMALL LETTER SHA */
+	/* 0xDC */ 0x044D, /* CYRILLIC SMALL LETTER E */
+	/* 0xDD */ 0x0449, /* CYRILLIC SMALL LETTER SHCHA */
+	/* 0xDE */ 0x0447, /* CYRILLIC SMALL LETTER CHE */
+	/* 0xDF */ 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */
+	/* 0xE0 */ 0x042E, /* CYRILLIC CAPITAL LETTER YU */
+	/* 0xE1 */ 0x0410, /* CYRILLIC CAPITAL LETTER A */
+	/* 0xE2 */ 0x0411, /* CYRILLIC CAPITAL LETTER BE */
+	/* 0xE3 */ 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
+	/* 0xE4 */ 0x0414, /* CYRILLIC CAPITAL LETTER DE */
+	/* 0xE5 */ 0x0415, /* CYRILLIC CAPITAL LETTER IE */
+	/* 0xE6 */ 0x0424, /* CYRILLIC CAPITAL LETTER EF */
+	/* 0xE7 */ 0x0413, /* CYRILLIC CAPITAL LETTER GHE */
+	/* 0xE8 */ 0x0425, /* CYRILLIC CAPITAL LETTER HA */
+	/* 0xE9 */ 0x0418, /* CYRILLIC CAPITAL LETTER I */
+	/* 0xEA */ 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
+	/* 0xEB */ 0x041A, /* CYRILLIC CAPITAL LETTER KA */
+	/* 0xEC */ 0x041B, /* CYRILLIC CAPITAL LETTER EL */
+	/* 0xED */ 0x041C, /* CYRILLIC CAPITAL LETTER EM */
+	/* 0xEE */ 0x041D, /* CYRILLIC CAPITAL LETTER EN */
+	/* 0xEF */ 0x041E, /* CYRILLIC CAPITAL LETTER O */
+	/* 0xF0 */ 0x041F, /* CYRILLIC CAPITAL LETTER PE */
+	/* 0xF1 */ 0x042F, /* CYRILLIC CAPITAL LETTER YA */
+	/* 0xF2 */ 0x0420, /* CYRILLIC CAPITAL LETTER ER */
+	/* 0xF3 */ 0x0421, /* CYRILLIC CAPITAL LETTER ES */
+	/* 0xF4 */ 0x0422, /* CYRILLIC CAPITAL LETTER TE */
+	/* 0xF5 */ 0x0423, /* CYRILLIC CAPITAL LETTER U */
+	/* 0xF6 */ 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
+	/* 0xF7 */ 0x0412, /* CYRILLIC CAPITAL LETTER VE */
+	/* 0xF8 */ 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+	/* 0xF9 */ 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
+	/* 0xFA */ 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
+	/* 0xFB */ 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
+	/* 0xFC */ 0x042D, /* CYRILLIC CAPITAL LETTER E */
+	/* 0xFD */ 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */
+	/* 0xFE */ 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
+	/* 0xFF */ 0x042A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
 };
 
+#define table_koi8_r table_NULL
+
 unsigned char *const aliases_koi8_r [] = {
 	"koi8-r",
 	"csKOI8R",
@@ -4033,138 +4290,139 @@ unsigned char *const aliases_koi8_r [] = {
 
 /*** koi8_u ***/
 
-const struct table_entry table_koi8_u [] = {
-	{0x80, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0x81, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0x82, 0x250C /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0x83, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0x84, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0x85, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0x86, 0x251C /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0x87, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0x88, 0x252C /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0x89, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0x8A, 0x253C /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0x8B, 0x2580 /* UPPER HALF BLOCK */ },
-	{0x8C, 0x2584 /* LOWER HALF BLOCK */ },
-	{0x8D, 0x2588 /* FULL BLOCK */ },
-	{0x8E, 0x258C /* LEFT HALF BLOCK */ },
-	{0x8F, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0x90, 0x2591 /* LIGHT SHADE */ },
-	{0x91, 0x2592 /* MEDIUM SHADE */ },
-	{0x92, 0x2593 /* DARK SHADE */ },
-	{0x93, 0x2320 /* TOP HALF INTEGRAL */ },
-	{0x94, 0x25A0 /* BLACK SQUARE */ },
-	{0x95, 0x2219 /* BULLET OPERATOR */ },
-	{0x96, 0x221A /* SQUARE ROOT */ },
-	{0x97, 0x2248 /* ALMOST EQUAL TO */ },
-	{0x98, 0x2264 /* LESS THAN OR EQUAL TO */ },
-	{0x99, 0x2265 /* GREATER THAN OR EQUAL TO */ },
-	{0x9A, 0x00A0 /* NO-BREAK SPACE */ },
-	{0x9B, 0x2321 /* BOTTOM HALF INTEGRAL */ },
-	{0x9C, 0x00B0 /* DEGREE SIGN */ },
-	{0x9D, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0x9E, 0x00B7 /* MIDDLE DOT */ },
-	{0x9F, 0x00F7 /* DIVISION SIGN */ },
-	{0xA0, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xA1, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xA2, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xA3, 0x0451 /* CYRILLIC SMALL LETTER IO */ },
-	{0xA4, 0x0454 /* CYRILLIC SMALL LETTER UKRAINIAN IE */ },
-	{0xA5, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xA6, 0x0456 /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xA7, 0x0457 /* CYRILLIC SMALL LETTER YI (UKRAINIAN) */ },
-	{0xA8, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xA9, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xAA, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xAB, 0x255A /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xAC, 0x255B /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xAD, 0x0491 /* CYRILLIC SMALL LETTER GHE WITH UPTURN */ },
-	{0xAE, 0x255D /* BOX DRAWINGS DOUBLE UP AND LEFT */ },
-	{0xAF, 0x255E /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xB0, 0x255F /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xB1, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xB2, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xB3, 0x0401 /* CYRILLIC CAPITAL LETTER IO */ },
-	{0xB4, 0x0404 /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ },
-	{0xB5, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xB6, 0x0406 /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xB7, 0x0407 /* CYRILLIC CAPITAL LETTER YI (UKRAINIAN) */ },
-	{0xB8, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xB9, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xBA, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xBB, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xBC, 0x256A /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xBD, 0x0490 /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ },
-	{0xBE, 0x256C /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ },
-	{0xBF, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xC0, 0x044E /* CYRILLIC SMALL LETTER YU */ },
-	{0xC1, 0x0430 /* CYRILLIC SMALL LETTER A */ },
-	{0xC2, 0x0431 /* CYRILLIC SMALL LETTER BE */ },
-	{0xC3, 0x0446 /* CYRILLIC SMALL LETTER TSE */ },
-	{0xC4, 0x0434 /* CYRILLIC SMALL LETTER DE */ },
-	{0xC5, 0x0435 /* CYRILLIC SMALL LETTER IE */ },
-	{0xC6, 0x0444 /* CYRILLIC SMALL LETTER EF */ },
-	{0xC7, 0x0433 /* CYRILLIC SMALL LETTER GHE */ },
-	{0xC8, 0x0445 /* CYRILLIC SMALL LETTER KHA */ },
-	{0xC9, 0x0438 /* CYRILLIC SMALL LETTER I */ },
-	{0xCA, 0x0439 /* CYRILLIC SMALL LETTER SHORT I */ },
-	{0xCB, 0x043A /* CYRILLIC SMALL LETTER KA */ },
-	{0xCC, 0x043B /* CYRILLIC SMALL LETTER EL */ },
-	{0xCD, 0x043C /* CYRILLIC SMALL LETTER EM */ },
-	{0xCE, 0x043D /* CYRILLIC SMALL LETTER EN */ },
-	{0xCF, 0x043E /* CYRILLIC SMALL LETTER O */ },
-	{0xD0, 0x043F /* CYRILLIC SMALL LETTER PE */ },
-	{0xD1, 0x044F /* CYRILLIC SMALL LETTER YA */ },
-	{0xD2, 0x0440 /* CYRILLIC SMALL LETTER ER */ },
-	{0xD3, 0x0441 /* CYRILLIC SMALL LETTER ES */ },
-	{0xD4, 0x0442 /* CYRILLIC SMALL LETTER TE */ },
-	{0xD5, 0x0443 /* CYRILLIC SMALL LETTER U */ },
-	{0xD6, 0x0436 /* CYRILLIC SMALL LETTER ZHE */ },
-	{0xD7, 0x0432 /* CYRILLIC SMALL LETTER VE */ },
-	{0xD8, 0x044C /* CYRILLIC SMALL LETTER SOFT SIGN */ },
-	{0xD9, 0x044B /* CYRILLIC SMALL LETTER YERU */ },
-	{0xDA, 0x0437 /* CYRILLIC SMALL LETTER ZE */ },
-	{0xDB, 0x0448 /* CYRILLIC SMALL LETTER SHA */ },
-	{0xDC, 0x044D /* CYRILLIC SMALL LETTER E */ },
-	{0xDD, 0x0449 /* CYRILLIC SMALL LETTER SHCHA */ },
-	{0xDE, 0x0447 /* CYRILLIC SMALL LETTER CHE */ },
-	{0xDF, 0x044A /* CYRILLIC SMALL LETTER HARD SIGN */ },
-	{0xE0, 0x042E /* CYRILLIC CAPITAL LETTER YU */ },
-	{0xE1, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
-	{0xE2, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
-	{0xE3, 0x0426 /* CYRILLIC CAPITAL LETTER TSE */ },
-	{0xE4, 0x0414 /* CYRILLIC CAPITAL LETTER DE */ },
-	{0xE5, 0x0415 /* CYRILLIC CAPITAL LETTER IE */ },
-	{0xE6, 0x0424 /* CYRILLIC CAPITAL LETTER EF */ },
-	{0xE7, 0x0413 /* CYRILLIC CAPITAL LETTER GHE */ },
-	{0xE8, 0x0425 /* CYRILLIC CAPITAL LETTER KHA */ },
-	{0xE9, 0x0418 /* CYRILLIC CAPITAL LETTER I */ },
-	{0xEA, 0x0419 /* CYRILLIC CAPITAL LETTER SHORT I */ },
-	{0xEB, 0x041A /* CYRILLIC CAPITAL LETTER KA */ },
-	{0xEC, 0x041B /* CYRILLIC CAPITAL LETTER EL */ },
-	{0xED, 0x041C /* CYRILLIC CAPITAL LETTER EM */ },
-	{0xEE, 0x041D /* CYRILLIC CAPITAL LETTER EN */ },
-	{0xEF, 0x041E /* CYRILLIC CAPITAL LETTER O */ },
-	{0xF0, 0x041F /* CYRILLIC CAPITAL LETTER PE */ },
-	{0xF1, 0x042F /* CYRILLIC CAPITAL LETTER YA */ },
-	{0xF2, 0x0420 /* CYRILLIC CAPITAL LETTER ER */ },
-	{0xF3, 0x0421 /* CYRILLIC CAPITAL LETTER ES */ },
-	{0xF4, 0x0422 /* CYRILLIC CAPITAL LETTER TE */ },
-	{0xF5, 0x0423 /* CYRILLIC CAPITAL LETTER U */ },
-	{0xF6, 0x0416 /* CYRILLIC CAPITAL LETTER ZHE */ },
-	{0xF7, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
-	{0xF8, 0x042C /* CYRILLIC CAPITAL LETTER SOFT SIGN */ },
-	{0xF9, 0x042B /* CYRILLIC CAPITAL LETTER YERU */ },
-	{0xFA, 0x0417 /* CYRILLIC CAPITAL LETTER ZE */ },
-	{0xFB, 0x0428 /* CYRILLIC CAPITAL LETTER SHA */ },
-	{0xFC, 0x042D /* CYRILLIC CAPITAL LETTER E */ },
-	{0xFD, 0x0429 /* CYRILLIC CAPITAL LETTER SHCHA */ },
-	{0xFE, 0x0427 /* CYRILLIC CAPITAL LETTER CHE */ },
-	{0xFF, 0x042A /* CYRILLIC CAPITAL LETTER HARD SIGN */ },
-	{0, 0}
+const uint16_t highhalf_koi8_u [] = {
+	/* 0x80 */ 0x2500, /* BOX DRAWINGS  LIGHT HORIZONTAL */
+	/* 0x81 */ 0x2502, /* BOX DRAWINGS  LIGHT VERTICAL */
+	/* 0x82 */ 0x250C, /* BOX DRAWINGS  LIGHT DOWN AND RIGHT */
+	/* 0x83 */ 0x2510, /* BOX DRAWINGS  LIGHT DOWN AND LEFT */
+	/* 0x84 */ 0x2514, /* BOX DRAWINGS  LIGHT UP AND RIGHT */
+	/* 0x85 */ 0x2518, /* BOX DRAWINGS  LIGHT UP AND LEFT */
+	/* 0x86 */ 0x251C, /* BOX DRAWINGS  LIGHT VERTICAL AND RIGHT */
+	/* 0x87 */ 0x2524, /* BOX DRAWINGS  LIGHT VERTICAL AND LEFT */
+	/* 0x88 */ 0x252C, /* BOX DRAWINGS  LIGHT DOWN AND HORIZONTAL */
+	/* 0x89 */ 0x2534, /* BOX DRAWINGS  LIGHT UP AND HORIZONTAL */
+	/* 0x8A */ 0x253C, /* BOX DRAWINGS  LIGHT VERTICAL AND HORIZONTAL */
+	/* 0x8B */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0x8C */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0x8D */ 0x2588, /* FULL BLOCK */
+	/* 0x8E */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0x8F */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0x90 */ 0x2591, /* LIGHT SHADE */
+	/* 0x91 */ 0x2592, /* MEDIUM SHADE */
+	/* 0x92 */ 0x2593, /* DARK SHADE */
+	/* 0x93 */ 0x2320, /* TOP HALF INTEGRAL */
+	/* 0x94 */ 0x25A0, /* BLACK SQUARE */
+	/* 0x95 */ 0x2219, /* BULLET OPERATOR */
+	/* 0x96 */ 0x221A, /* SQUARE ROOT */
+	/* 0x97 */ 0x2248, /* ALMOST EQUAL TO */
+	/* 0x98 */ 0x2264, /* LESS THAN OR EQUAL TO */
+	/* 0x99 */ 0x2265, /* GREATER THAN OR EQUAL TO */
+	/* 0x9A */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0x9B */ 0x2321, /* BOTTOM HALF INTEGRAL */
+	/* 0x9C */ 0x00B0, /* DEGREE SIGN */
+	/* 0x9D */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0x9E */ 0x00B7, /* MIDDLE DOT */
+	/* 0x9F */ 0x00F7, /* DIVISION SIGN */
+	/* 0xA0 */ 0x2550, /* BOX DRAWINGS  DOUBLE HORIZONTAL */
+	/* 0xA1 */ 0x2551, /* BOX DRAWINGS  DOUBLE VERTICAL */
+	/* 0xA2 */ 0x2552, /* BOX DRAWINGS  DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xA3 */ 0x0451, /* CYRILLIC SMALL LETTER IO */
+	/* 0xA4 */ 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+	/* 0xA5 */ 0x2554, /* BOX DRAWINGS  DOUBLE DOWN AND RIGHT */
+	/* 0xA6 */ 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xA7 */ 0x0457, /* CYRILLIC SMALL LETTER YI (UKRAINIAN) */
+	/* 0xA8 */ 0x2557, /* BOX DRAWINGS  DOUBLE DOWN AND LEFT */
+	/* 0xA9 */ 0x2558, /* BOX DRAWINGS  UP SINGLE AND RIGHT DOUBLE */
+	/* 0xAA */ 0x2559, /* BOX DRAWINGS  UP DOUBLE AND RIGHT SINGLE */
+	/* 0xAB */ 0x255A, /* BOX DRAWINGS  DOUBLE UP AND RIGHT */
+	/* 0xAC */ 0x255B, /* BOX DRAWINGS  UP SINGLE AND LEFT DOUBLE */
+	/* 0xAD */ 0x0491, /* CYRILLIC SMALL LETTER GHE WITH UPTURN */
+	/* 0xAE */ 0x255D, /* BOX DRAWINGS  DOUBLE UP AND LEFT */
+	/* 0xAF */ 0x255E, /* BOX DRAWINGS  VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xB0 */ 0x255F, /* BOX DRAWINGS  VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xB1 */ 0x2560, /* BOX DRAWINGS  DOUBLE VERTICAL AND RIGHT */
+	/* 0xB2 */ 0x2561, /* BOX DRAWINGS  VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB3 */ 0x0401, /* CYRILLIC CAPITAL LETTER IO */
+	/* 0xB4 */ 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+	/* 0xB5 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xB6 */ 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xB7 */ 0x0407, /* CYRILLIC CAPITAL LETTER YI (UKRAINIAN) */
+	/* 0xB8 */ 0x2566, /* BOX DRAWINGS  DOUBLE DOWN AND HORIZONTAL */
+	/* 0xB9 */ 0x2567, /* BOX DRAWINGS  UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xBA */ 0x2568, /* BOX DRAWINGS  UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xBB */ 0x2569, /* BOX DRAWINGS  DOUBLE UP AND HORIZONTAL */
+	/* 0xBC */ 0x256A, /* BOX DRAWINGS  VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xBD */ 0x0490, /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
+	/* 0xBE */ 0x256C, /* BOX DRAWINGS  DOUBLE VERTICAL AND HORIZONTAL */
+	/* 0xBF */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xC0 */ 0x044E, /* CYRILLIC SMALL LETTER YU */
+	/* 0xC1 */ 0x0430, /* CYRILLIC SMALL LETTER A */
+	/* 0xC2 */ 0x0431, /* CYRILLIC SMALL LETTER BE */
+	/* 0xC3 */ 0x0446, /* CYRILLIC SMALL LETTER TSE */
+	/* 0xC4 */ 0x0434, /* CYRILLIC SMALL LETTER DE */
+	/* 0xC5 */ 0x0435, /* CYRILLIC SMALL LETTER IE */
+	/* 0xC6 */ 0x0444, /* CYRILLIC SMALL LETTER EF */
+	/* 0xC7 */ 0x0433, /* CYRILLIC SMALL LETTER GHE */
+	/* 0xC8 */ 0x0445, /* CYRILLIC SMALL LETTER KHA */
+	/* 0xC9 */ 0x0438, /* CYRILLIC SMALL LETTER I */
+	/* 0xCA */ 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
+	/* 0xCB */ 0x043A, /* CYRILLIC SMALL LETTER KA */
+	/* 0xCC */ 0x043B, /* CYRILLIC SMALL LETTER EL */
+	/* 0xCD */ 0x043C, /* CYRILLIC SMALL LETTER EM */
+	/* 0xCE */ 0x043D, /* CYRILLIC SMALL LETTER EN */
+	/* 0xCF */ 0x043E, /* CYRILLIC SMALL LETTER O */
+	/* 0xD0 */ 0x043F, /* CYRILLIC SMALL LETTER PE */
+	/* 0xD1 */ 0x044F, /* CYRILLIC SMALL LETTER YA */
+	/* 0xD2 */ 0x0440, /* CYRILLIC SMALL LETTER ER */
+	/* 0xD3 */ 0x0441, /* CYRILLIC SMALL LETTER ES */
+	/* 0xD4 */ 0x0442, /* CYRILLIC SMALL LETTER TE */
+	/* 0xD5 */ 0x0443, /* CYRILLIC SMALL LETTER U */
+	/* 0xD6 */ 0x0436, /* CYRILLIC SMALL LETTER ZHE */
+	/* 0xD7 */ 0x0432, /* CYRILLIC SMALL LETTER VE */
+	/* 0xD8 */ 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */
+	/* 0xD9 */ 0x044B, /* CYRILLIC SMALL LETTER YERU */
+	/* 0xDA */ 0x0437, /* CYRILLIC SMALL LETTER ZE */
+	/* 0xDB */ 0x0448, /* CYRILLIC SMALL LETTER SHA */
+	/* 0xDC */ 0x044D, /* CYRILLIC SMALL LETTER E */
+	/* 0xDD */ 0x0449, /* CYRILLIC SMALL LETTER SHCHA */
+	/* 0xDE */ 0x0447, /* CYRILLIC SMALL LETTER CHE */
+	/* 0xDF */ 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */
+	/* 0xE0 */ 0x042E, /* CYRILLIC CAPITAL LETTER YU */
+	/* 0xE1 */ 0x0410, /* CYRILLIC CAPITAL LETTER A */
+	/* 0xE2 */ 0x0411, /* CYRILLIC CAPITAL LETTER BE */
+	/* 0xE3 */ 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
+	/* 0xE4 */ 0x0414, /* CYRILLIC CAPITAL LETTER DE */
+	/* 0xE5 */ 0x0415, /* CYRILLIC CAPITAL LETTER IE */
+	/* 0xE6 */ 0x0424, /* CYRILLIC CAPITAL LETTER EF */
+	/* 0xE7 */ 0x0413, /* CYRILLIC CAPITAL LETTER GHE */
+	/* 0xE8 */ 0x0425, /* CYRILLIC CAPITAL LETTER KHA */
+	/* 0xE9 */ 0x0418, /* CYRILLIC CAPITAL LETTER I */
+	/* 0xEA */ 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
+	/* 0xEB */ 0x041A, /* CYRILLIC CAPITAL LETTER KA */
+	/* 0xEC */ 0x041B, /* CYRILLIC CAPITAL LETTER EL */
+	/* 0xED */ 0x041C, /* CYRILLIC CAPITAL LETTER EM */
+	/* 0xEE */ 0x041D, /* CYRILLIC CAPITAL LETTER EN */
+	/* 0xEF */ 0x041E, /* CYRILLIC CAPITAL LETTER O */
+	/* 0xF0 */ 0x041F, /* CYRILLIC CAPITAL LETTER PE */
+	/* 0xF1 */ 0x042F, /* CYRILLIC CAPITAL LETTER YA */
+	/* 0xF2 */ 0x0420, /* CYRILLIC CAPITAL LETTER ER */
+	/* 0xF3 */ 0x0421, /* CYRILLIC CAPITAL LETTER ES */
+	/* 0xF4 */ 0x0422, /* CYRILLIC CAPITAL LETTER TE */
+	/* 0xF5 */ 0x0423, /* CYRILLIC CAPITAL LETTER U */
+	/* 0xF6 */ 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
+	/* 0xF7 */ 0x0412, /* CYRILLIC CAPITAL LETTER VE */
+	/* 0xF8 */ 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+	/* 0xF9 */ 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
+	/* 0xFA */ 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
+	/* 0xFB */ 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
+	/* 0xFC */ 0x042D, /* CYRILLIC CAPITAL LETTER E */
+	/* 0xFD */ 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */
+	/* 0xFE */ 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
+	/* 0xFF */ 0x042A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
 };
 
+#define table_koi8_u table_NULL
+
 unsigned char *const aliases_koi8_u [] = {
 	"koi8-u",
 	NULL
@@ -4173,138 +4431,139 @@ unsigned char *const aliases_koi8_u [] = {
 
 /*** koi8_ru ***/
 
-const struct table_entry table_koi8_ru [] = {
-	{0x80, 0x2500 /* BOX DRAWINGS LIGHT HORIZONTAL */ },
-	{0x81, 0x2502 /* BOX DRAWINGS LIGHT VERTICAL */ },
-	{0x82, 0x250C /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ },
-	{0x83, 0x2510 /* BOX DRAWINGS LIGHT DOWN AND LEFT */ },
-	{0x84, 0x2514 /* BOX DRAWINGS LIGHT UP AND RIGHT */ },
-	{0x85, 0x2518 /* BOX DRAWINGS LIGHT UP AND LEFT */ },
-	{0x86, 0x251C /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ },
-	{0x87, 0x2524 /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ },
-	{0x88, 0x252C /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ },
-	{0x89, 0x2534 /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ },
-	{0x8A, 0x253C /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ },
-	{0x8B, 0x2580 /* UPPER HALF BLOCK */ },
-	{0x8C, 0x2584 /* LOWER HALF BLOCK */ },
-	{0x8D, 0x2588 /* FULL BLOCK */ },
-	{0x8E, 0x258C /* LEFT HALF BLOCK */ },
-	{0x8F, 0x2590 /* RIGHT HALF BLOCK */ },
-	{0x90, 0x2591 /* LIGHT SHADE */ },
-	{0x91, 0x2592 /* MEDIUM SHADE */ },
-	{0x92, 0x2593 /* DARK SHADE */ },
-	{0x93, 0x2320 /* TOP HALF INTEGRAL */ },
-	{0x94, 0x25A0 /* BLACK SQUARE */ },
-	{0x95, 0x2219 /* BULLET OPERATOR */ },
-	{0x96, 0x221A /* SQUARE ROOT */ },
-	{0x97, 0x2248 /* ALMOST EQUAL TO */ },
-	{0x98, 0x2264 /* LESS THAN OR EQUAL TO */ },
-	{0x99, 0x2265 /* GREATER THAN OR EQUAL TO */ },
-	{0x9A, 0x00A0 /* NO-BREAK SPACE */ },
-	{0x9B, 0x2321 /* BOTTOM HALF INTEGRAL */ },
-	{0x9C, 0x00B0 /* DEGREE SIGN */ },
-	{0x9D, 0x00B2 /* SUPERSCRIPT TWO */ },
-	{0x9E, 0x00B7 /* MIDDLE DOT */ },
-	{0x9F, 0x00F7 /* DIVISION SIGN */ },
-	{0xA0, 0x2550 /* BOX DRAWINGS DOUBLE HORIZONTAL */ },
-	{0xA1, 0x2551 /* BOX DRAWINGS DOUBLE VERTICAL */ },
-	{0xA2, 0x2552 /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ },
-	{0xA3, 0x0451 /* CYRILLIC SMALL LETTER IO */ },
-	{0xA4, 0x0454 /* CYRILLIC SMALL LETTER UKRAINIAN IE */ },
-	{0xA5, 0x2554 /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ },
-	{0xA6, 0x0456 /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xA7, 0x0457 /* CYRILLIC SMALL LETTER YI (UKRAINIAN) */ },
-	{0xA8, 0x2557 /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ },
-	{0xA9, 0x2558 /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ },
-	{0xAA, 0x2559 /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ },
-	{0xAB, 0x255A /* BOX DRAWINGS DOUBLE UP AND RIGHT */ },
-	{0xAC, 0x255B /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ },
-	{0xAD, 0x0491 /* CYRILLIC SMALL LETTER GHE WITH UPTURN */ },
-	{0xAE, 0x045E /* CYRILLIC SMALL LETTER SHORT U */ },
-	{0xAF, 0x255E /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ },
-	{0xB0, 0x255F /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ },
-	{0xB1, 0x2560 /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ },
-	{0xB2, 0x2561 /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ },
-	{0xB3, 0x0401 /* CYRILLIC CAPITAL LETTER IO */ },
-	{0xB4, 0x0404 /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ },
-	{0xB5, 0x2563 /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ },
-	{0xB6, 0x0406 /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */ },
-	{0xB7, 0x0407 /* CYRILLIC CAPITAL LETTER YI (UKRAINIAN) */ },
-	{0xB8, 0x2566 /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ },
-	{0xB9, 0x2567 /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xBA, 0x2568 /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ },
-	{0xBB, 0x2569 /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ },
-	{0xBC, 0x256A /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE */ },
-	{0xBD, 0x0490 /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */ },
-	{0xBE, 0x040E /* CYRILLIC CAPITAL LETTER SHORT U */ },
-	{0xBF, 0x00A9 /* COPYRIGHT SIGN */ },
-	{0xC0, 0x044E /* CYRILLIC SMALL LETTER YU */ },
-	{0xC1, 0x0430 /* CYRILLIC SMALL LETTER A */ },
-	{0xC2, 0x0431 /* CYRILLIC SMALL LETTER BE */ },
-	{0xC3, 0x0446 /* CYRILLIC SMALL LETTER TSE */ },
-	{0xC4, 0x0434 /* CYRILLIC SMALL LETTER DE */ },
-	{0xC5, 0x0435 /* CYRILLIC SMALL LETTER IE */ },
-	{0xC6, 0x0444 /* CYRILLIC SMALL LETTER EF */ },
-	{0xC7, 0x0433 /* CYRILLIC SMALL LETTER GHE */ },
-	{0xC8, 0x0445 /* CYRILLIC SMALL LETTER KHA */ },
-	{0xC9, 0x0438 /* CYRILLIC SMALL LETTER I */ },
-	{0xCA, 0x0439 /* CYRILLIC SMALL LETTER SHORT I */ },
-	{0xCB, 0x043A /* CYRILLIC SMALL LETTER KA */ },
-	{0xCC, 0x043B /* CYRILLIC SMALL LETTER EL */ },
-	{0xCD, 0x043C /* CYRILLIC SMALL LETTER EM */ },
-	{0xCE, 0x043D /* CYRILLIC SMALL LETTER EN */ },
-	{0xCF, 0x043E /* CYRILLIC SMALL LETTER O */ },
-	{0xD0, 0x043F /* CYRILLIC SMALL LETTER PE */ },
-	{0xD1, 0x044F /* CYRILLIC SMALL LETTER YA */ },
-	{0xD2, 0x0440 /* CYRILLIC SMALL LETTER ER */ },
-	{0xD3, 0x0441 /* CYRILLIC SMALL LETTER ES */ },
-	{0xD4, 0x0442 /* CYRILLIC SMALL LETTER TE */ },
-	{0xD5, 0x0443 /* CYRILLIC SMALL LETTER U */ },
-	{0xD6, 0x0436 /* CYRILLIC SMALL LETTER ZHE */ },
-	{0xD7, 0x0432 /* CYRILLIC SMALL LETTER VE */ },
-	{0xD8, 0x044C /* CYRILLIC SMALL LETTER SOFT SIGN */ },
-	{0xD9, 0x044B /* CYRILLIC SMALL LETTER YERU */ },
-	{0xDA, 0x0437 /* CYRILLIC SMALL LETTER ZE */ },
-	{0xDB, 0x0448 /* CYRILLIC SMALL LETTER SHA */ },
-	{0xDC, 0x044D /* CYRILLIC SMALL LETTER E */ },
-	{0xDD, 0x0449 /* CYRILLIC SMALL LETTER SHCHA */ },
-	{0xDE, 0x0447 /* CYRILLIC SMALL LETTER CHE */ },
-	{0xDF, 0x044A /* CYRILLIC SMALL LETTER HARD SIGN */ },
-	{0xE0, 0x042E /* CYRILLIC CAPITAL LETTER YU */ },
-	{0xE1, 0x0410 /* CYRILLIC CAPITAL LETTER A */ },
-	{0xE2, 0x0411 /* CYRILLIC CAPITAL LETTER BE */ },
-	{0xE3, 0x0426 /* CYRILLIC CAPITAL LETTER TSE */ },
-	{0xE4, 0x0414 /* CYRILLIC CAPITAL LETTER DE */ },
-	{0xE5, 0x0415 /* CYRILLIC CAPITAL LETTER IE */ },
-	{0xE6, 0x0424 /* CYRILLIC CAPITAL LETTER EF */ },
-	{0xE7, 0x0413 /* CYRILLIC CAPITAL LETTER GHE */ },
-	{0xE8, 0x0425 /* CYRILLIC CAPITAL LETTER KHA */ },
-	{0xE9, 0x0418 /* CYRILLIC CAPITAL LETTER I */ },
-	{0xEA, 0x0419 /* CYRILLIC CAPITAL LETTER SHORT I */ },
-	{0xEB, 0x041A /* CYRILLIC CAPITAL LETTER KA */ },
-	{0xEC, 0x041B /* CYRILLIC CAPITAL LETTER EL */ },
-	{0xED, 0x041C /* CYRILLIC CAPITAL LETTER EM */ },
-	{0xEE, 0x041D /* CYRILLIC CAPITAL LETTER EN */ },
-	{0xEF, 0x041E /* CYRILLIC CAPITAL LETTER O */ },
-	{0xF0, 0x041F /* CYRILLIC CAPITAL LETTER PE */ },
-	{0xF1, 0x042F /* CYRILLIC CAPITAL LETTER YA */ },
-	{0xF2, 0x0420 /* CYRILLIC CAPITAL LETTER ER */ },
-	{0xF3, 0x0421 /* CYRILLIC CAPITAL LETTER ES */ },
-	{0xF4, 0x0422 /* CYRILLIC CAPITAL LETTER TE */ },
-	{0xF5, 0x0423 /* CYRILLIC CAPITAL LETTER U */ },
-	{0xF6, 0x0416 /* CYRILLIC CAPITAL LETTER ZHE */ },
-	{0xF7, 0x0412 /* CYRILLIC CAPITAL LETTER VE */ },
-	{0xF8, 0x042C /* CYRILLIC CAPITAL LETTER SOFT SIGN */ },
-	{0xF9, 0x042B /* CYRILLIC CAPITAL LETTER YERU */ },
-	{0xFA, 0x0417 /* CYRILLIC CAPITAL LETTER ZE */ },
-	{0xFB, 0x0428 /* CYRILLIC CAPITAL LETTER SHA */ },
-	{0xFC, 0x042D /* CYRILLIC CAPITAL LETTER E */ },
-	{0xFD, 0x0429 /* CYRILLIC CAPITAL LETTER SHCHA */ },
-	{0xFE, 0x0427 /* CYRILLIC CAPITAL LETTER CHE */ },
-	{0xFF, 0x042A /* CYRILLIC CAPITAL LETTER HARD SIGN */ },
-	{0, 0}
+const uint16_t highhalf_koi8_ru [] = {
+	/* 0x80 */ 0x2500, /* BOX DRAWINGS  LIGHT HORIZONTAL */
+	/* 0x81 */ 0x2502, /* BOX DRAWINGS  LIGHT VERTICAL */
+	/* 0x82 */ 0x250C, /* BOX DRAWINGS  LIGHT DOWN AND RIGHT */
+	/* 0x83 */ 0x2510, /* BOX DRAWINGS  LIGHT DOWN AND LEFT */
+	/* 0x84 */ 0x2514, /* BOX DRAWINGS  LIGHT UP AND RIGHT */
+	/* 0x85 */ 0x2518, /* BOX DRAWINGS  LIGHT UP AND LEFT */
+	/* 0x86 */ 0x251C, /* BOX DRAWINGS  LIGHT VERTICAL AND RIGHT */
+	/* 0x87 */ 0x2524, /* BOX DRAWINGS  LIGHT VERTICAL AND LEFT */
+	/* 0x88 */ 0x252C, /* BOX DRAWINGS  LIGHT DOWN AND HORIZONTAL */
+	/* 0x89 */ 0x2534, /* BOX DRAWINGS  LIGHT UP AND HORIZONTAL */
+	/* 0x8A */ 0x253C, /* BOX DRAWINGS  LIGHT VERTICAL AND HORIZONTAL */
+	/* 0x8B */ 0x2580, /* UPPER HALF BLOCK */
+	/* 0x8C */ 0x2584, /* LOWER HALF BLOCK */
+	/* 0x8D */ 0x2588, /* FULL BLOCK */
+	/* 0x8E */ 0x258C, /* LEFT HALF BLOCK */
+	/* 0x8F */ 0x2590, /* RIGHT HALF BLOCK */
+	/* 0x90 */ 0x2591, /* LIGHT SHADE */
+	/* 0x91 */ 0x2592, /* MEDIUM SHADE */
+	/* 0x92 */ 0x2593, /* DARK SHADE */
+	/* 0x93 */ 0x2320, /* TOP HALF INTEGRAL */
+	/* 0x94 */ 0x25A0, /* BLACK SQUARE */
+	/* 0x95 */ 0x2219, /* BULLET OPERATOR */
+	/* 0x96 */ 0x221A, /* SQUARE ROOT */
+	/* 0x97 */ 0x2248, /* ALMOST EQUAL TO */
+	/* 0x98 */ 0x2264, /* LESS THAN OR EQUAL TO */
+	/* 0x99 */ 0x2265, /* GREATER THAN OR EQUAL TO */
+	/* 0x9A */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0x9B */ 0x2321, /* BOTTOM HALF INTEGRAL */
+	/* 0x9C */ 0x00B0, /* DEGREE SIGN */
+	/* 0x9D */ 0x00B2, /* SUPERSCRIPT TWO */
+	/* 0x9E */ 0x00B7, /* MIDDLE DOT */
+	/* 0x9F */ 0x00F7, /* DIVISION SIGN */
+	/* 0xA0 */ 0x2550, /* BOX DRAWINGS  DOUBLE HORIZONTAL */
+	/* 0xA1 */ 0x2551, /* BOX DRAWINGS  DOUBLE VERTICAL */
+	/* 0xA2 */ 0x2552, /* BOX DRAWINGS  DOWN SINGLE AND RIGHT DOUBLE */
+	/* 0xA3 */ 0x0451, /* CYRILLIC SMALL LETTER IO */
+	/* 0xA4 */ 0x0454, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+	/* 0xA5 */ 0x2554, /* BOX DRAWINGS  DOUBLE DOWN AND RIGHT */
+	/* 0xA6 */ 0x0456, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xA7 */ 0x0457, /* CYRILLIC SMALL LETTER YI (UKRAINIAN) */
+	/* 0xA8 */ 0x2557, /* BOX DRAWINGS  DOUBLE DOWN AND LEFT */
+	/* 0xA9 */ 0x2558, /* BOX DRAWINGS  UP SINGLE AND RIGHT DOUBLE */
+	/* 0xAA */ 0x2559, /* BOX DRAWINGS  UP DOUBLE AND RIGHT SINGLE */
+	/* 0xAB */ 0x255A, /* BOX DRAWINGS  DOUBLE UP AND RIGHT */
+	/* 0xAC */ 0x255B, /* BOX DRAWINGS  UP SINGLE AND LEFT DOUBLE */
+	/* 0xAD */ 0x0491, /* CYRILLIC SMALL LETTER GHE WITH UPTURN */
+	/* 0xAE */ 0x045E, /* CYRILLIC SMALL LETTER SHORT U */
+	/* 0xAF */ 0x255E, /* BOX DRAWINGS  VERTICAL SINGLE AND RIGHT DOUBLE */
+	/* 0xB0 */ 0x255F, /* BOX DRAWINGS  VERTICAL DOUBLE AND RIGHT SINGLE */
+	/* 0xB1 */ 0x2560, /* BOX DRAWINGS  DOUBLE VERTICAL AND RIGHT */
+	/* 0xB2 */ 0x2561, /* BOX DRAWINGS  VERTICAL SINGLE AND LEFT DOUBLE */
+	/* 0xB3 */ 0x0401, /* CYRILLIC CAPITAL LETTER IO */
+	/* 0xB4 */ 0x0404, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+	/* 0xB5 */ 0x2563, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */
+	/* 0xB6 */ 0x0406, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+	/* 0xB7 */ 0x0407, /* CYRILLIC CAPITAL LETTER YI (UKRAINIAN) */
+	/* 0xB8 */ 0x2566, /* BOX DRAWINGS  DOUBLE DOWN AND HORIZONTAL */
+	/* 0xB9 */ 0x2567, /* BOX DRAWINGS  UP SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xBA */ 0x2568, /* BOX DRAWINGS  UP DOUBLE AND HORIZONTAL SINGLE */
+	/* 0xBB */ 0x2569, /* BOX DRAWINGS  DOUBLE UP AND HORIZONTAL */
+	/* 0xBC */ 0x256A, /* BOX DRAWINGS  VERTICAL SINGLE AND HORIZONTAL DOUBLE */
+	/* 0xBD */ 0x0490, /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
+	/* 0xBE */ 0x040E, /* CYRILLIC CAPITAL LETTER SHORT U */
+	/* 0xBF */ 0x00A9, /* COPYRIGHT SIGN */
+	/* 0xC0 */ 0x044E, /* CYRILLIC SMALL LETTER YU */
+	/* 0xC1 */ 0x0430, /* CYRILLIC SMALL LETTER A */
+	/* 0xC2 */ 0x0431, /* CYRILLIC SMALL LETTER BE */
+	/* 0xC3 */ 0x0446, /* CYRILLIC SMALL LETTER TSE */
+	/* 0xC4 */ 0x0434, /* CYRILLIC SMALL LETTER DE */
+	/* 0xC5 */ 0x0435, /* CYRILLIC SMALL LETTER IE */
+	/* 0xC6 */ 0x0444, /* CYRILLIC SMALL LETTER EF */
+	/* 0xC7 */ 0x0433, /* CYRILLIC SMALL LETTER GHE */
+	/* 0xC8 */ 0x0445, /* CYRILLIC SMALL LETTER KHA */
+	/* 0xC9 */ 0x0438, /* CYRILLIC SMALL LETTER I */
+	/* 0xCA */ 0x0439, /* CYRILLIC SMALL LETTER SHORT I */
+	/* 0xCB */ 0x043A, /* CYRILLIC SMALL LETTER KA */
+	/* 0xCC */ 0x043B, /* CYRILLIC SMALL LETTER EL */
+	/* 0xCD */ 0x043C, /* CYRILLIC SMALL LETTER EM */
+	/* 0xCE */ 0x043D, /* CYRILLIC SMALL LETTER EN */
+	/* 0xCF */ 0x043E, /* CYRILLIC SMALL LETTER O */
+	/* 0xD0 */ 0x043F, /* CYRILLIC SMALL LETTER PE */
+	/* 0xD1 */ 0x044F, /* CYRILLIC SMALL LETTER YA */
+	/* 0xD2 */ 0x0440, /* CYRILLIC SMALL LETTER ER */
+	/* 0xD3 */ 0x0441, /* CYRILLIC SMALL LETTER ES */
+	/* 0xD4 */ 0x0442, /* CYRILLIC SMALL LETTER TE */
+	/* 0xD5 */ 0x0443, /* CYRILLIC SMALL LETTER U */
+	/* 0xD6 */ 0x0436, /* CYRILLIC SMALL LETTER ZHE */
+	/* 0xD7 */ 0x0432, /* CYRILLIC SMALL LETTER VE */
+	/* 0xD8 */ 0x044C, /* CYRILLIC SMALL LETTER SOFT SIGN */
+	/* 0xD9 */ 0x044B, /* CYRILLIC SMALL LETTER YERU */
+	/* 0xDA */ 0x0437, /* CYRILLIC SMALL LETTER ZE */
+	/* 0xDB */ 0x0448, /* CYRILLIC SMALL LETTER SHA */
+	/* 0xDC */ 0x044D, /* CYRILLIC SMALL LETTER E */
+	/* 0xDD */ 0x0449, /* CYRILLIC SMALL LETTER SHCHA */
+	/* 0xDE */ 0x0447, /* CYRILLIC SMALL LETTER CHE */
+	/* 0xDF */ 0x044A, /* CYRILLIC SMALL LETTER HARD SIGN */
+	/* 0xE0 */ 0x042E, /* CYRILLIC CAPITAL LETTER YU */
+	/* 0xE1 */ 0x0410, /* CYRILLIC CAPITAL LETTER A */
+	/* 0xE2 */ 0x0411, /* CYRILLIC CAPITAL LETTER BE */
+	/* 0xE3 */ 0x0426, /* CYRILLIC CAPITAL LETTER TSE */
+	/* 0xE4 */ 0x0414, /* CYRILLIC CAPITAL LETTER DE */
+	/* 0xE5 */ 0x0415, /* CYRILLIC CAPITAL LETTER IE */
+	/* 0xE6 */ 0x0424, /* CYRILLIC CAPITAL LETTER EF */
+	/* 0xE7 */ 0x0413, /* CYRILLIC CAPITAL LETTER GHE */
+	/* 0xE8 */ 0x0425, /* CYRILLIC CAPITAL LETTER KHA */
+	/* 0xE9 */ 0x0418, /* CYRILLIC CAPITAL LETTER I */
+	/* 0xEA */ 0x0419, /* CYRILLIC CAPITAL LETTER SHORT I */
+	/* 0xEB */ 0x041A, /* CYRILLIC CAPITAL LETTER KA */
+	/* 0xEC */ 0x041B, /* CYRILLIC CAPITAL LETTER EL */
+	/* 0xED */ 0x041C, /* CYRILLIC CAPITAL LETTER EM */
+	/* 0xEE */ 0x041D, /* CYRILLIC CAPITAL LETTER EN */
+	/* 0xEF */ 0x041E, /* CYRILLIC CAPITAL LETTER O */
+	/* 0xF0 */ 0x041F, /* CYRILLIC CAPITAL LETTER PE */
+	/* 0xF1 */ 0x042F, /* CYRILLIC CAPITAL LETTER YA */
+	/* 0xF2 */ 0x0420, /* CYRILLIC CAPITAL LETTER ER */
+	/* 0xF3 */ 0x0421, /* CYRILLIC CAPITAL LETTER ES */
+	/* 0xF4 */ 0x0422, /* CYRILLIC CAPITAL LETTER TE */
+	/* 0xF5 */ 0x0423, /* CYRILLIC CAPITAL LETTER U */
+	/* 0xF6 */ 0x0416, /* CYRILLIC CAPITAL LETTER ZHE */
+	/* 0xF7 */ 0x0412, /* CYRILLIC CAPITAL LETTER VE */
+	/* 0xF8 */ 0x042C, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+	/* 0xF9 */ 0x042B, /* CYRILLIC CAPITAL LETTER YERU */
+	/* 0xFA */ 0x0417, /* CYRILLIC CAPITAL LETTER ZE */
+	/* 0xFB */ 0x0428, /* CYRILLIC CAPITAL LETTER SHA */
+	/* 0xFC */ 0x042D, /* CYRILLIC CAPITAL LETTER E */
+	/* 0xFD */ 0x0429, /* CYRILLIC CAPITAL LETTER SHCHA */
+	/* 0xFE */ 0x0427, /* CYRILLIC CAPITAL LETTER CHE */
+	/* 0xFF */ 0x042A, /* CYRILLIC CAPITAL LETTER HARD SIGN */
 };
 
+#define table_koi8_ru table_NULL
+
 unsigned char *const aliases_koi8_ru [] = {
 	"koi8-ru",
 	NULL
@@ -4313,137 +4572,140 @@ unsigned char *const aliases_koi8_ru [] = {
 
 /*** tcvn5712 ***/
 
+const uint16_t highhalf_tcvn5712 [] = {
+	/* 0x80 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0x81 */ 0x1EA2, /* LATIN CAPITAL LETTER A WITH HOOK ABOVE */
+	/* 0x82 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0x83 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0x84 */ 0x1EA0, /* LATIN CAPITAL LETTER A WITH DOT BELOW */
+	/* 0x85 */ 0x1EB6, /* LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
+	/* 0x86 */ 0x1EAC, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0x87 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0x88 */ 0x1EBA, /* LATIN CAPITAL LETTER E WITH HOOK ABOVE */
+	/* 0x89 */ 0x1EBC, /* LATIN CAPITAL LETTER E WITH TILDE */
+	/* 0x8A */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0x8B */ 0x1EB8, /* LATIN CAPITAL LETTER E WITH DOT BELOW */
+	/* 0x8C */ 0x1EC6, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0x8D */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0x8E */ 0x1EC8, /* LATIN CAPITAL LETTER I WITH HOOK ABOVE */
+	/* 0x8F */ 0x0128, /* LATIN CAPITAL LETTER I WITH TILDE */
+	/* 0x90 */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0x91 */ 0x1ECA, /* LATIN CAPITAL LETTER I WITH DOT BELOW */
+	/* 0x92 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0x93 */ 0x1ECE, /* LATIN CAPITAL LETTER O WITH HOOK ABOVE */
+	/* 0x94 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0x95 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0x96 */ 0x1ECC, /* LATIN CAPITAL LETTER O WITH DOT BELOW */
+	/* 0x97 */ 0x1ED8, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0x98 */ 0x1EDC, /* LATIN CAPITAL LETTER O WITH HORN AND GRAVE */
+	/* 0x99 */ 0x1EDE, /* LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */
+	/* 0x9A */ 0x1EE0, /* LATIN CAPITAL LETTER O WITH HORN AND TILDE */
+	/* 0x9B */ 0x1EDA, /* LATIN CAPITAL LETTER O WITH HORN AND ACUTE */
+	/* 0x9C */ 0x1EE2, /* LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */
+	/* 0x9D */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0x9E */ 0x1EE6, /* LATIN CAPITAL LETTER U WITH HOOK ABOVE */
+	/* 0x9F */ 0x0168, /* LATIN CAPITAL LETTER U WITH TILDE */
+	/* 0xA0 */ 0x00A0, /* NO-BREAK SPACE */
+	/* 0xA1 */ 0x0102, /* LATIN CAPITAL LETTER A WITH BREVE */
+	/* 0xA2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xA3 */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xA4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xA5 */ 0x01A0, /* LATIN CAPITAL LETTER O WITH HOOK */
+	/* 0xA6 */ 0x01AF, /* LATIN CAPITAL LETTER U WITH HORN */
+	/* 0xA7 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xA8 */ 0x0103, /* LATIN SMALL LETTER A WITH BREVE */
+	/* 0xA9 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xAA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xAB */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xAC */ 0x01A1, /* LATIN SMALL LETTER O WITH HOOK */
+	/* 0xAD */ 0x01B0, /* LATIN SMALL LETTER U WITH HORN */
+	/* 0xAE */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xAF */ 0x1EB0, /* LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */
+	/* 0xB0 */ 0x0300, /* COMBINING GRAVE ACCENT */
+	/* 0xB1 */ 0x0309, /* COMBINING HOOK ABOVE */
+	/* 0xB2 */ 0x0303, /* COMBINING TILDE */
+	/* 0xB3 */ 0x0301, /* COMBINING ACUTE ACCENT */
+	/* 0xB4 */ 0x0323, /* COMBINING DOT BELOW */
+	/* 0xB5 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xB6 */ 0x1EA3, /* LATIN SMALL LETTER A WITH HOOK ABOVE */
+	/* 0xB7 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xB8 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xB9 */ 0x1EA1, /* LATIN SMALL LETTER A WITH DOT BELOW */
+	/* 0xBA */ 0x1EB2, /* LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */
+	/* 0xBB */ 0x1EB1, /* LATIN SMALL LETTER A WITH BREVE AND GRAVE */
+	/* 0xBC */ 0x1EB3, /* LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */
+	/* 0xBD */ 0x1EB5, /* LATIN SMALL LETTER A WITH BREVE AND TILDE */
+	/* 0xBE */ 0x1EAF, /* LATIN SMALL LETTER A WITH BREVE AND ACUTE */
+	/* 0xBF */ 0x1EB4, /* LATIN CAPITAL LETTER A WITH BREVE AND TILDE */
+	/* 0xC0 */ 0x1EAE, /* LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */
+	/* 0xC1 */ 0x1EA6, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */
+	/* 0xC2 */ 0x1EA8, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xC3 */ 0x1EAA, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */
+	/* 0xC4 */ 0x1EA4, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */
+	/* 0xC5 */ 0x1EC0, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */
+	/* 0xC6 */ 0x1EB7, /* LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */
+	/* 0xC7 */ 0x1EA7, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */
+	/* 0xC8 */ 0x1EA9, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xC9 */ 0x1EAB, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */
+	/* 0xCA */ 0x1EA5, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */
+	/* 0xCB */ 0x1EAD, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0xCC */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xCD */ 0x1EC2, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xCE */ 0x1EBB, /* LATIN SMALL LETTER E WITH HOOK ABOVE */
+	/* 0xCF */ 0x1EBD, /* LATIN SMALL LETTER E WITH TILDE */
+	/* 0xD0 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xD1 */ 0x1EB9, /* LATIN SMALL LETTER E WITH DOT BELOW */
+	/* 0xD2 */ 0x1EC1, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */
+	/* 0xD3 */ 0x1EC3, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xD4 */ 0x1EC5, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */
+	/* 0xD5 */ 0x1EBF, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */
+	/* 0xD6 */ 0x1EC7, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0xD7 */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xD8 */ 0x1EC9, /* LATIN SMALL LETTER I WITH HOOK ABOVE */
+	/* 0xD9 */ 0x1EC4, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */
+	/* 0xDA */ 0x1EBE, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
+	/* 0xDB */ 0x1ED2, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */
+	/* 0xDC */ 0x0129, /* LATIN SMALL LETTER I WITH TILDE */
+	/* 0xDD */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xDE */ 0x1ECB, /* LATIN SMALL LETTER I WITH DOT BELOW */
+	/* 0xDF */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xE0 */ 0x1ED4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xE1 */ 0x1ECF, /* LATIN SMALL LETTER O WITH HOOK ABOVE */
+	/* 0xE2 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xE3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xE4 */ 0x1ECD, /* LATIN SMALL LETTER O WITH DOT BELOW */
+	/* 0xE5 */ 0x1ED3, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */
+	/* 0xE6 */ 0x1ED5, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xE7 */ 0x1ED7, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */
+	/* 0xE8 */ 0x1ED1, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */
+	/* 0xE9 */ 0x1ED9, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0xEA */ 0x1EDD, /* LATIN SMALL LETTER O WITH HORN AND GRAVE */
+	/* 0xEB */ 0x1EDF, /* LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
+	/* 0xEC */ 0x1EE1, /* LATIN SMALL LETTER O WITH HORN AND TILDE */
+	/* 0xED */ 0x1EDB, /* LATIN SMALL LETTER O WITH HORN AND ACUTE */
+	/* 0xEE */ 0x1EE3, /* LATIN SMALL LETTER O WITH HORN AND DOT BELOW */
+	/* 0xEF */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xF0 */ 0x1ED6, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */
+	/* 0xF1 */ 0x1EE7, /* LATIN SMALL LETTER U WITH HOOK ABOVE */
+	/* 0xF2 */ 0x0169, /* LATIN SMALL LETTER U WITH TILDE */
+	/* 0xF3 */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xF4 */ 0x1EE5, /* LATIN SMALL LETTER U WITH DOT BELOW */
+	/* 0xF5 */ 0x1EEB, /* LATIN SMALL LETTER U WITH HORN AND GRAVE */
+	/* 0xF6 */ 0x1EED, /* LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */
+	/* 0xF7 */ 0x1EEF, /* LATIN SMALL LETTER U WITH HORN AND TILDE */
+	/* 0xF8 */ 0x1EE9, /* LATIN SMALL LETTER U WITH HORN AND ACUTE */
+	/* 0xF9 */ 0x1EF1, /* LATIN SMALL LETTER U WITH HORN AND DOT BELOW */
+	/* 0xFA */ 0x1EF3, /* LATIN SMALL LETTER Y WITH GRAVE */
+	/* 0xFB */ 0x1EF7, /* LATIN SMALL LETTER Y WITH HOOK ABOVE */
+	/* 0xFC */ 0x1EF9, /* LATIN SMALL LETTER Y WITH TILDE */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x1EF5, /* LATIN SMALL LETTER Y WITH DOT BELOW */
+	/* 0xFF */ 0x1ED0, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */
+};
+
 const struct table_entry table_tcvn5712 [] = {
-	{0x80, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0x81, 0x1EA2 /* LATIN CAPITAL LETTER A WITH HOOK ABOVE */ },
-	{0x82, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0x83, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0x84, 0x1EA0 /* LATIN CAPITAL LETTER A WITH DOT BELOW */ },
-	{0x85, 0x1EB6 /* LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */ },
-	{0x86, 0x1EAC /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0x87, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0x88, 0x1EBA /* LATIN CAPITAL LETTER E WITH HOOK ABOVE */ },
-	{0x89, 0x1EBC /* LATIN CAPITAL LETTER E WITH TILDE */ },
-	{0x8A, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0x8B, 0x1EB8 /* LATIN CAPITAL LETTER E WITH DOT BELOW */ },
-	{0x8C, 0x1EC6 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0x8D, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0x8E, 0x1EC8 /* LATIN CAPITAL LETTER I WITH HOOK ABOVE */ },
-	{0x8F, 0x0128 /* LATIN CAPITAL LETTER I WITH TILDE */ },
-	{0x90, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0x91, 0x1ECA /* LATIN CAPITAL LETTER I WITH DOT BELOW */ },
-	{0x92, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0x93, 0x1ECE /* LATIN CAPITAL LETTER O WITH HOOK ABOVE */ },
-	{0x94, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0x95, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0x96, 0x1ECC /* LATIN CAPITAL LETTER O WITH DOT BELOW */ },
-	{0x97, 0x1ED8 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0x98, 0x1EDC /* LATIN CAPITAL LETTER O WITH HORN AND GRAVE */ },
-	{0x99, 0x1EDE /* LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */ },
-	{0x9A, 0x1EE0 /* LATIN CAPITAL LETTER O WITH HORN AND TILDE */ },
-	{0x9B, 0x1EDA /* LATIN CAPITAL LETTER O WITH HORN AND ACUTE */ },
-	{0x9C, 0x1EE2 /* LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */ },
-	{0x9D, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0x9E, 0x1EE6 /* LATIN CAPITAL LETTER U WITH HOOK ABOVE */ },
-	{0x9F, 0x0168 /* LATIN CAPITAL LETTER U WITH TILDE */ },
-	{0xA0, 0x00A0 /* NO-BREAK SPACE */ },
-	{0xA1, 0x0102 /* LATIN CAPITAL LETTER A WITH BREVE */ },
-	{0xA2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xA3, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xA4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xA5, 0x01A0 /* LATIN CAPITAL LETTER O WITH HOOK */ },
-	{0xA6, 0x01AF /* LATIN CAPITAL LETTER U WITH HORN */ },
-	{0xA7, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xA8, 0x0103 /* LATIN SMALL LETTER A WITH BREVE */ },
-	{0xA9, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xAA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xAB, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xAC, 0x01A1 /* LATIN SMALL LETTER O WITH HOOK */ },
-	{0xAD, 0x01B0 /* LATIN SMALL LETTER U WITH HORN */ },
-	{0xAE, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xAF, 0x1EB0 /* LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */ },
-	{0xB0, 0x0300 /* COMBINING GRAVE ACCENT */ },
-	{0xB1, 0x0309 /* COMBINING HOOK ABOVE */ },
-	{0xB2, 0x0303 /* COMBINING TILDE */ },
-	{0xB3, 0x0301 /* COMBINING ACUTE ACCENT */ },
-	{0xB4, 0x0323 /* COMBINING DOT BELOW */ },
-	{0xB5, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xB6, 0x1EA3 /* LATIN SMALL LETTER A WITH HOOK ABOVE */ },
-	{0xB7, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xB8, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xB9, 0x1EA1 /* LATIN SMALL LETTER A WITH DOT BELOW */ },
-	{0xBA, 0x1EB2 /* LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */ },
-	{0xBB, 0x1EB1 /* LATIN SMALL LETTER A WITH BREVE AND GRAVE */ },
-	{0xBC, 0x1EB3 /* LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */ },
-	{0xBD, 0x1EB5 /* LATIN SMALL LETTER A WITH BREVE AND TILDE */ },
-	{0xBE, 0x1EAF /* LATIN SMALL LETTER A WITH BREVE AND ACUTE */ },
-	{0xBF, 0x1EB4 /* LATIN CAPITAL LETTER A WITH BREVE AND TILDE */ },
-	{0xC0, 0x1EAE /* LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */ },
-	{0xC1, 0x1EA6 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */ },
-	{0xC2, 0x1EA8 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xC3, 0x1EAA /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */ },
-	{0xC4, 0x1EA4 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */ },
-	{0xC5, 0x1EC0 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */ },
-	{0xC6, 0x1EB7 /* LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */ },
-	{0xC7, 0x1EA7 /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */ },
-	{0xC8, 0x1EA9 /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xC9, 0x1EAB /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */ },
-	{0xCA, 0x1EA5 /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */ },
-	{0xCB, 0x1EAD /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0xCC, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xCD, 0x1EC2 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xCE, 0x1EBB /* LATIN SMALL LETTER E WITH HOOK ABOVE */ },
-	{0xCF, 0x1EBD /* LATIN SMALL LETTER E WITH TILDE */ },
-	{0xD0, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xD1, 0x1EB9 /* LATIN SMALL LETTER E WITH DOT BELOW */ },
-	{0xD2, 0x1EC1 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */ },
-	{0xD3, 0x1EC3 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xD4, 0x1EC5 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */ },
-	{0xD5, 0x1EBF /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */ },
-	{0xD6, 0x1EC7 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0xD7, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xD8, 0x1EC9 /* LATIN SMALL LETTER I WITH HOOK ABOVE */ },
-	{0xD9, 0x1EC4 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */ },
-	{0xDA, 0x1EBE /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */ },
-	{0xDB, 0x1ED2 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */ },
-	{0xDC, 0x0129 /* LATIN SMALL LETTER I WITH TILDE */ },
-	{0xDD, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xDE, 0x1ECB /* LATIN SMALL LETTER I WITH DOT BELOW */ },
-	{0xDF, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xE0, 0x1ED4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xE1, 0x1ECF /* LATIN SMALL LETTER O WITH HOOK ABOVE */ },
-	{0xE2, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xE3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xE4, 0x1ECD /* LATIN SMALL LETTER O WITH DOT BELOW */ },
-	{0xE5, 0x1ED3 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */ },
-	{0xE6, 0x1ED5 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xE7, 0x1ED7 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */ },
-	{0xE8, 0x1ED1 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */ },
-	{0xE9, 0x1ED9 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0xEA, 0x1EDD /* LATIN SMALL LETTER O WITH HORN AND GRAVE */ },
-	{0xEB, 0x1EDF /* LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */ },
-	{0xEC, 0x1EE1 /* LATIN SMALL LETTER O WITH HORN AND TILDE */ },
-	{0xED, 0x1EDB /* LATIN SMALL LETTER O WITH HORN AND ACUTE */ },
-	{0xEE, 0x1EE3 /* LATIN SMALL LETTER O WITH HORN AND DOT BELOW */ },
-	{0xEF, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xF0, 0x1ED6 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */ },
-	{0xF1, 0x1EE7 /* LATIN SMALL LETTER U WITH HOOK ABOVE */ },
-	{0xF2, 0x0169 /* LATIN SMALL LETTER U WITH TILDE */ },
-	{0xF3, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xF4, 0x1EE5 /* LATIN SMALL LETTER U WITH DOT BELOW */ },
-	{0xF5, 0x1EEB /* LATIN SMALL LETTER U WITH HORN AND GRAVE */ },
-	{0xF6, 0x1EED /* LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */ },
-	{0xF7, 0x1EEF /* LATIN SMALL LETTER U WITH HORN AND TILDE */ },
-	{0xF8, 0x1EE9 /* LATIN SMALL LETTER U WITH HORN AND ACUTE */ },
-	{0xF9, 0x1EF1 /* LATIN SMALL LETTER U WITH HORN AND DOT BELOW */ },
-	{0xFA, 0x1EF3 /* LATIN SMALL LETTER Y WITH GRAVE */ },
-	{0xFB, 0x1EF7 /* LATIN SMALL LETTER Y WITH HOOK ABOVE */ },
-	{0xFC, 0x1EF9 /* LATIN SMALL LETTER Y WITH TILDE */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x1EF5 /* LATIN SMALL LETTER Y WITH DOT BELOW */ },
-	{0xFF, 0x1ED0 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */ },
-	{0xA7, 0x00D0 /* letter ETH */ },
-	{0xAE, 0x00F0 },
+	{0xA7, 0x00D0}, /* letter ETH */
+	{0xAE, 0x00F0}, 
 	{0, 0}
 };
 
@@ -4461,137 +4723,140 @@ unsigned char *const aliases_tcvn5712 [] = {
 
 /*** viscii ***/
 
+const uint16_t highhalf_viscii [] = {
+	/* 0x80 */ 0x1EA0, /* LATIN CAPITAL LETTER A WITH DOT BELOW */
+	/* 0x81 */ 0x1EAE, /* LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */
+	/* 0x82 */ 0x1EB0, /* LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */
+	/* 0x83 */ 0x1EB6, /* LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
+	/* 0x84 */ 0x1EA4, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */
+	/* 0x85 */ 0x1EA6, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */
+	/* 0x86 */ 0x1EA8, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0x87 */ 0x1EAC, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0x88 */ 0x1EBC, /* LATIN CAPITAL LETTER E WITH TILDE */
+	/* 0x89 */ 0x1EB8, /* LATIN CAPITAL LETTER E WITH DOT BELOW */
+	/* 0x8A */ 0x1EBE, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
+	/* 0x8B */ 0x1EC0, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */
+	/* 0x8C */ 0x1EC2, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0x8D */ 0x1EC4, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */
+	/* 0x8E */ 0x1EC6, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0x8F */ 0x1ED0, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */
+	/* 0x90 */ 0x1ED2, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */
+	/* 0x91 */ 0x1ED4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0x92 */ 0x1ED6, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */
+	/* 0x93 */ 0x1ED8, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0x94 */ 0x1EE2, /* LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */
+	/* 0x95 */ 0x1EDA, /* LATIN CAPITAL LETTER O WITH HORN AND ACUTE */
+	/* 0x96 */ 0x1EDC, /* LATIN CAPITAL LETTER O WITH HORN AND GRAVE */
+	/* 0x97 */ 0x1EDE, /* LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */
+	/* 0x98 */ 0x1ECA, /* LATIN CAPITAL LETTER I WITH DOT BELOW */
+	/* 0x99 */ 0x1ECE, /* LATIN CAPITAL LETTER O WITH HOOK ABOVE */
+	/* 0x9A */ 0x1ECC, /* LATIN CAPITAL LETTER O WITH DOT BELOW */
+	/* 0x9B */ 0x1EC8, /* LATIN CAPITAL LETTER I WITH HOOK ABOVE */
+	/* 0x9C */ 0x1EE6, /* LATIN CAPITAL LETTER U WITH HOOK ABOVE */
+	/* 0x9D */ 0x0168, /* LATIN CAPITAL LETTER U WITH TILDE */
+	/* 0x9E */ 0x1EE4, /* LATIN CAPITAL LETTER U WITH DOT BELOW */
+	/* 0x9F */ 0x1EF2, /* LATIN CAPITAL LETTER Y WITH GRAVE */
+	/* 0xA0 */ 0x00D5, /* LATIN CAPITAL LETTER O WITH TILDE */
+	/* 0xA1 */ 0x1EAF, /* LATIN SMALL LETTER A WITH BREVE AND ACUTE */
+	/* 0xA2 */ 0x1EB1, /* LATIN SMALL LETTER A WITH BREVE AND GRAVE */
+	/* 0xA3 */ 0x1EB7, /* LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */
+	/* 0xA4 */ 0x1EA5, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */
+	/* 0xA5 */ 0x1EA7, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */
+	/* 0xA6 */ 0x1EA9, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xA7 */ 0x1EAD, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0xA8 */ 0x1EBD, /* LATIN SMALL LETTER E WITH TILDE */
+	/* 0xA9 */ 0x1EB9, /* LATIN SMALL LETTER E WITH DOT BELOW */
+	/* 0xAA */ 0x1EBF, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */
+	/* 0xAB */ 0x1EC1, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */
+	/* 0xAC */ 0x1EC3, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xAD */ 0x1EC5, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */
+	/* 0xAE */ 0x1EC7, /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0xAF */ 0x1ED1, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */
+	/* 0xB0 */ 0x1ED3, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */
+	/* 0xB1 */ 0x1ED5, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
+	/* 0xB2 */ 0x1ED7, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */
+	/* 0xB3 */ 0x1EE0, /* LATIN CAPITAL LETTER O WITH HOOK AND TILDE */
+	/* 0xB4 */ 0x01A0, /* LATIN CAPITAL LETTER O WITH HOOK */
+	/* 0xB5 */ 0x1ED9, /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+	/* 0xB6 */ 0x1EDD, /* LATIN SMALL LETTER O WITH HORN AND GRAVE */
+	/* 0xB7 */ 0x1EDF, /* LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */
+	/* 0xB8 */ 0x1ECB, /* LATIN SMALL LETTER I WITH DOT BELOW */
+	/* 0xB9 */ 0x1EF0, /* LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */
+	/* 0xBA */ 0x1EE8, /* LATIN CAPITAL LETTER U WITH HORN AND ACUTE */
+	/* 0xBB */ 0x1EEA, /* LATIN CAPITAL LETTER U WITH HORN AND GRAVE */
+	/* 0xBC */ 0x1EEC, /* LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */
+	/* 0xBD */ 0x01A1, /* LATIN SMALL LETTER O WITH HORN */
+	/* 0xBE */ 0x1EDB, /* LATIN SMALL LETTER O WITH HORN AND ACUTE */
+	/* 0xBF */ 0x01AF, /* LATIN CAPITAL LETTER U WITH HORN */
+	/* 0xC0 */ 0x00C0, /* LATIN CAPITAL LETTER A WITH GRAVE */
+	/* 0xC1 */ 0x00C1, /* LATIN CAPITAL LETTER A WITH ACUTE */
+	/* 0xC2 */ 0x00C2, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+	/* 0xC3 */ 0x00C3, /* LATIN CAPITAL LETTER A WITH TILDE */
+	/* 0xC4 */ 0x1EA2, /* LATIN CAPITAL LETTER A WITH HOOK ABOVE */
+	/* 0xC5 */ 0x0102, /* LATIN CAPITAL LETTER A WITH BREVE */
+	/* 0xC6 */ 0x1EB3, /* LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */
+	/* 0xC7 */ 0x1EB5, /* LATIN SMALL LETTER A WITH BREVE AND TILDE */
+	/* 0xC8 */ 0x00C8, /* LATIN CAPITAL LETTER E WITH GRAVE */
+	/* 0xC9 */ 0x00C9, /* LATIN CAPITAL LETTER E WITH ACUTE */
+	/* 0xCA */ 0x00CA, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+	/* 0xCB */ 0x1EBA, /* LATIN CAPITAL LETTER E WITH HOOK ABOVE */
+	/* 0xCC */ 0x00CC, /* LATIN CAPITAL LETTER I WITH GRAVE */
+	/* 0xCD */ 0x00CD, /* LATIN CAPITAL LETTER I WITH ACUTE */
+	/* 0xCE */ 0x0128, /* LATIN CAPITAL LETTER I WITH TILDE */
+	/* 0xCF */ 0x1EF3, /* LATIN SMALL LETTER Y WITH GRAVE */
+	/* 0xD0 */ 0x0110, /* LATIN CAPITAL LETTER D WITH STROKE */
+	/* 0xD1 */ 0x1EE9, /* LATIN SMALL LETTER U WITH HORN AND ACUTE */
+	/* 0xD2 */ 0x00D2, /* LATIN CAPITAL LETTER O WITH GRAVE */
+	/* 0xD3 */ 0x00D3, /* LATIN CAPITAL LETTER O WITH ACUTE */
+	/* 0xD4 */ 0x00D4, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+	/* 0xD5 */ 0x1EA1, /* LATIN SMALL LETTER A WITH DOT BELOW */
+	/* 0xD6 */ 0x1EF7, /* LATIN SMALL LETTER Y WITH HOOK ABOVE */
+	/* 0xD7 */ 0x1EEB, /* LATIN SMALL LETTER U WITH HORN AND GRAVE */
+	/* 0xD8 */ 0x1EED, /* LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */
+	/* 0xD9 */ 0x00D9, /* LATIN CAPITAL LETTER U WITH GRAVE */
+	/* 0xDA */ 0x00DA, /* LATIN CAPITAL LETTER U WITH ACUTE */
+	/* 0xDB */ 0x1EF9, /* LATIN SMALL LETTER Y WITH TILDE */
+	/* 0xDC */ 0x1EF5, /* LATIN SMALL LETTER Y WITH DOT BELOW */
+	/* 0xDD */ 0x00DD, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+	/* 0xDE */ 0x1EE1, /* LATIN SMALL LETTER O WITH HORN AND TILDE */
+	/* 0xDF */ 0x01B0, /* LATIN SMALL LETTER U WITH HORN */
+	/* 0xE0 */ 0x00E0, /* LATIN SMALL LETTER A WITH GRAVE */
+	/* 0xE1 */ 0x00E1, /* LATIN SMALL LETTER A WITH ACUTE */
+	/* 0xE2 */ 0x00E2, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+	/* 0xE3 */ 0x00E3, /* LATIN SMALL LETTER A WITH TILDE */
+	/* 0xE4 */ 0x1EA3, /* LATIN SMALL LETTER A WITH HOOK ABOVE */
+	/* 0xE5 */ 0x0103, /* LATIN SMALL LETTER A WITH BREVE */
+	/* 0xE6 */ 0x1EEF, /* LATIN SMALL LETTER U WITH HORN AND TILDE */
+	/* 0xE7 */ 0x1EAB, /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */
+	/* 0xE8 */ 0x00E8, /* LATIN SMALL LETTER E WITH GRAVE */
+	/* 0xE9 */ 0x00E9, /* LATIN SMALL LETTER E WITH ACUTE */
+	/* 0xEA */ 0x00EA, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+	/* 0xEB */ 0x1EBB, /* LATIN SMALL LETTER E WITH HOOK ABOVE */
+	/* 0xEC */ 0x00EC, /* LATIN SMALL LETTER I WITH GRAVE */
+	/* 0xED */ 0x00ED, /* LATIN SMALL LETTER I WITH ACUTE */
+	/* 0xEE */ 0x0129, /* LATIN SMALL LETTER I WITH TILDE */
+	/* 0xEF */ 0x1EC9, /* LATIN SMALL LETTER I WITH HOOK ABOVE */
+	/* 0xF0 */ 0x0111, /* LATIN SMALL LETTER D WITH STROKE */
+	/* 0xF1 */ 0x1EF1, /* LATIN SMALL LETTER U WITH HORN AND DOT BELOW */
+	/* 0xF2 */ 0x00F2, /* LATIN SMALL LETTER O WITH GRAVE */
+	/* 0xF3 */ 0x00F3, /* LATIN SMALL LETTER O WITH ACUTE */
+	/* 0xF4 */ 0x00F4, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+	/* 0xF5 */ 0x00F5, /* LATIN SMALL LETTER O WITH TILDE */
+	/* 0xF6 */ 0x1ECF, /* LATIN SMALL LETTER O WITH HOOK ABOVE */
+	/* 0xF7 */ 0x1ECD, /* LATIN SMALL LETTER O WITH DOT BELOW */
+	/* 0xF8 */ 0x1EE5, /* LATIN SMALL LETTER U WITH DOT BELOW */
+	/* 0xF9 */ 0x00F9, /* LATIN SMALL LETTER U WITH GRAVE */
+	/* 0xFA */ 0x00FA, /* LATIN SMALL LETTER U WITH ACUTE */
+	/* 0xFB */ 0x0169, /* LATIN SMALL LETTER U WITH TILDE */
+	/* 0xFC */ 0x1EE7, /* LATIN SMALL LETTER U WITH HOOK ABOVE */
+	/* 0xFD */ 0x00FD, /* LATIN SMALL LETTER Y WITH ACUTE */
+	/* 0xFE */ 0x1EE3, /* LATIN SMALL LETTER O WITH HORN AND DOT BELOW */
+	/* 0xFF */ 0x1EEE, /* LATIN CAPITAL LETTER U WITH HORN AND TILDE */
+};
+
 const struct table_entry table_viscii [] = {
-	{0x80, 0x1EA0 /* LATIN CAPITAL LETTER A WITH DOT BELOW */ },
-	{0x81, 0x1EAE /* LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */ },
-	{0x82, 0x1EB0 /* LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */ },
-	{0x83, 0x1EB6 /* LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */ },
-	{0x84, 0x1EA4 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */ },
-	{0x85, 0x1EA6 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */ },
-	{0x86, 0x1EA8 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0x87, 0x1EAC /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0x88, 0x1EBC /* LATIN CAPITAL LETTER E WITH TILDE */ },
-	{0x89, 0x1EB8 /* LATIN CAPITAL LETTER E WITH DOT BELOW */ },
-	{0x8A, 0x1EBE /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */ },
-	{0x8B, 0x1EC0 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */ },
-	{0x8C, 0x1EC2 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0x8D, 0x1EC4 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */ },
-	{0x8E, 0x1EC6 /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0x8F, 0x1ED0 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */ },
-	{0x90, 0x1ED2 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */ },
-	{0x91, 0x1ED4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0x92, 0x1ED6 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */ },
-	{0x93, 0x1ED8 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0x94, 0x1EE2 /* LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */ },
-	{0x95, 0x1EDA /* LATIN CAPITAL LETTER O WITH HORN AND ACUTE */ },
-	{0x96, 0x1EDC /* LATIN CAPITAL LETTER O WITH HORN AND GRAVE */ },
-	{0x97, 0x1EDE /* LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */ },
-	{0x98, 0x1ECA /* LATIN CAPITAL LETTER I WITH DOT BELOW */ },
-	{0x99, 0x1ECE /* LATIN CAPITAL LETTER O WITH HOOK ABOVE */ },
-	{0x9A, 0x1ECC /* LATIN CAPITAL LETTER O WITH DOT BELOW */ },
-	{0x9B, 0x1EC8 /* LATIN CAPITAL LETTER I WITH HOOK ABOVE */ },
-	{0x9C, 0x1EE6 /* LATIN CAPITAL LETTER U WITH HOOK ABOVE */ },
-	{0x9D, 0x0168 /* LATIN CAPITAL LETTER U WITH TILDE */ },
-	{0x9E, 0x1EE4 /* LATIN CAPITAL LETTER U WITH DOT BELOW */ },
-	{0x9F, 0x1EF2 /* LATIN CAPITAL LETTER Y WITH GRAVE */ },
-	{0xA0, 0x00D5 /* LATIN CAPITAL LETTER O WITH TILDE */ },
-	{0xA1, 0x1EAF /* LATIN SMALL LETTER A WITH BREVE AND ACUTE */ },
-	{0xA2, 0x1EB1 /* LATIN SMALL LETTER A WITH BREVE AND GRAVE */ },
-	{0xA3, 0x1EB7 /* LATIN SMALL LETTER A WITH BREVE AND DOT BELOW */ },
-	{0xA4, 0x1EA5 /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE */ },
-	{0xA5, 0x1EA7 /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE */ },
-	{0xA6, 0x1EA9 /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xA7, 0x1EAD /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0xA8, 0x1EBD /* LATIN SMALL LETTER E WITH TILDE */ },
-	{0xA9, 0x1EB9 /* LATIN SMALL LETTER E WITH DOT BELOW */ },
-	{0xAA, 0x1EBF /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE */ },
-	{0xAB, 0x1EC1 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE */ },
-	{0xAC, 0x1EC3 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xAD, 0x1EC5 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE */ },
-	{0xAE, 0x1EC7 /* LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0xAF, 0x1ED1 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE */ },
-	{0xB0, 0x1ED3 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE */ },
-	{0xB1, 0x1ED5 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */ },
-	{0xB2, 0x1ED7 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE */ },
-	{0xB3, 0x1EE0 /* LATIN CAPITAL LETTER O WITH HOOK AND TILDE */ },
-	{0xB4, 0x01A0 /* LATIN CAPITAL LETTER O WITH HOOK */ },
-	{0xB5, 0x1ED9 /* LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW */ },
-	{0xB6, 0x1EDD /* LATIN SMALL LETTER O WITH HORN AND GRAVE */ },
-	{0xB7, 0x1EDF /* LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE */ },
-	{0xB8, 0x1ECB /* LATIN SMALL LETTER I WITH DOT BELOW */ },
-	{0xB9, 0x1EF0 /* LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */ },
-	{0xBA, 0x1EE8 /* LATIN CAPITAL LETTER U WITH HORN AND ACUTE */ },
-	{0xBB, 0x1EEA /* LATIN CAPITAL LETTER U WITH HORN AND GRAVE */ },
-	{0xBC, 0x1EEC /* LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */ },
-	{0xBD, 0x01A1 /* LATIN SMALL LETTER O WITH HORN */ },
-	{0xBE, 0x1EDB /* LATIN SMALL LETTER O WITH HORN AND ACUTE */ },
-	{0xBF, 0x01AF /* LATIN CAPITAL LETTER U WITH HORN */ },
-	{0xC0, 0x00C0 /* LATIN CAPITAL LETTER A WITH GRAVE */ },
-	{0xC1, 0x00C1 /* LATIN CAPITAL LETTER A WITH ACUTE */ },
-	{0xC2, 0x00C2 /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ },
-	{0xC3, 0x00C3 /* LATIN CAPITAL LETTER A WITH TILDE */ },
-	{0xC4, 0x1EA2 /* LATIN CAPITAL LETTER A WITH HOOK ABOVE */ },
-	{0xC5, 0x0102 /* LATIN CAPITAL LETTER A WITH BREVE */ },
-	{0xC6, 0x1EB3 /* LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE */ },
-	{0xC7, 0x1EB5 /* LATIN SMALL LETTER A WITH BREVE AND TILDE */ },
-	{0xC8, 0x00C8 /* LATIN CAPITAL LETTER E WITH GRAVE */ },
-	{0xC9, 0x00C9 /* LATIN CAPITAL LETTER E WITH ACUTE */ },
-	{0xCA, 0x00CA /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ },
-	{0xCB, 0x1EBA /* LATIN CAPITAL LETTER E WITH HOOK ABOVE */ },
-	{0xCC, 0x00CC /* LATIN CAPITAL LETTER I WITH GRAVE */ },
-	{0xCD, 0x00CD /* LATIN CAPITAL LETTER I WITH ACUTE */ },
-	{0xCE, 0x0128 /* LATIN CAPITAL LETTER I WITH TILDE */ },
-	{0xCF, 0x1EF3 /* LATIN SMALL LETTER Y WITH GRAVE */ },
-	{0xD0, 0x0110 /* LATIN CAPITAL LETTER D WITH STROKE */ },
-	{0xD1, 0x1EE9 /* LATIN SMALL LETTER U WITH HORN AND ACUTE */ },
-	{0xD2, 0x00D2 /* LATIN CAPITAL LETTER O WITH GRAVE */ },
-	{0xD3, 0x00D3 /* LATIN CAPITAL LETTER O WITH ACUTE */ },
-	{0xD4, 0x00D4 /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ },
-	{0xD5, 0x1EA1 /* LATIN SMALL LETTER A WITH DOT BELOW */ },
-	{0xD6, 0x1EF7 /* LATIN SMALL LETTER Y WITH HOOK ABOVE */ },
-	{0xD7, 0x1EEB /* LATIN SMALL LETTER U WITH HORN AND GRAVE */ },
-	{0xD8, 0x1EED /* LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE */ },
-	{0xD9, 0x00D9 /* LATIN CAPITAL LETTER U WITH GRAVE */ },
-	{0xDA, 0x00DA /* LATIN CAPITAL LETTER U WITH ACUTE */ },
-	{0xDB, 0x1EF9 /* LATIN SMALL LETTER Y WITH TILDE */ },
-	{0xDC, 0x1EF5 /* LATIN SMALL LETTER Y WITH DOT BELOW */ },
-	{0xDD, 0x00DD /* LATIN CAPITAL LETTER Y WITH ACUTE */ },
-	{0xDE, 0x1EE1 /* LATIN SMALL LETTER O WITH HORN AND TILDE */ },
-	{0xDF, 0x01B0 /* LATIN SMALL LETTER U WITH HORN */ },
-	{0xE0, 0x00E0 /* LATIN SMALL LETTER A WITH GRAVE */ },
-	{0xE1, 0x00E1 /* LATIN SMALL LETTER A WITH ACUTE */ },
-	{0xE2, 0x00E2 /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ },
-	{0xE3, 0x00E3 /* LATIN SMALL LETTER A WITH TILDE */ },
-	{0xE4, 0x1EA3 /* LATIN SMALL LETTER A WITH HOOK ABOVE */ },
-	{0xE5, 0x0103 /* LATIN SMALL LETTER A WITH BREVE */ },
-	{0xE6, 0x1EEF /* LATIN SMALL LETTER U WITH HORN AND TILDE */ },
-	{0xE7, 0x1EAB /* LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE */ },
-	{0xE8, 0x00E8 /* LATIN SMALL LETTER E WITH GRAVE */ },
-	{0xE9, 0x00E9 /* LATIN SMALL LETTER E WITH ACUTE */ },
-	{0xEA, 0x00EA /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ },
-	{0xEB, 0x1EBB /* LATIN SMALL LETTER E WITH HOOK ABOVE */ },
-	{0xEC, 0x00EC /* LATIN SMALL LETTER I WITH GRAVE */ },
-	{0xED, 0x00ED /* LATIN SMALL LETTER I WITH ACUTE */ },
-	{0xEE, 0x0129 /* LATIN SMALL LETTER I WITH TILDE */ },
-	{0xEF, 0x1EC9 /* LATIN SMALL LETTER I WITH HOOK ABOVE */ },
-	{0xF0, 0x0111 /* LATIN SMALL LETTER D WITH STROKE */ },
-	{0xF1, 0x1EF1 /* LATIN SMALL LETTER U WITH HORN AND DOT BELOW */ },
-	{0xF2, 0x00F2 /* LATIN SMALL LETTER O WITH GRAVE */ },
-	{0xF3, 0x00F3 /* LATIN SMALL LETTER O WITH ACUTE */ },
-	{0xF4, 0x00F4 /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ },
-	{0xF5, 0x00F5 /* LATIN SMALL LETTER O WITH TILDE */ },
-	{0xF6, 0x1ECF /* LATIN SMALL LETTER O WITH HOOK ABOVE */ },
-	{0xF7, 0x1ECD /* LATIN SMALL LETTER O WITH DOT BELOW */ },
-	{0xF8, 0x1EE5 /* LATIN SMALL LETTER U WITH DOT BELOW */ },
-	{0xF9, 0x00F9 /* LATIN SMALL LETTER U WITH GRAVE */ },
-	{0xFA, 0x00FA /* LATIN SMALL LETTER U WITH ACUTE */ },
-	{0xFB, 0x0169 /* LATIN SMALL LETTER U WITH TILDE */ },
-	{0xFC, 0x1EE7 /* LATIN SMALL LETTER U WITH HOOK ABOVE */ },
-	{0xFD, 0x00FD /* LATIN SMALL LETTER Y WITH ACUTE */ },
-	{0xFE, 0x1EE3 /* LATIN SMALL LETTER O WITH HORN AND DOT BELOW */ },
-	{0xFF, 0x1EEE /* LATIN CAPITAL LETTER U WITH HORN AND TILDE */ },
-	{0xD0, 0x00D0 /* letter ETH */ },
-	{0xF0, 0x00F0 },
+	{0xD0, 0x00D0}, /* letter ETH */
+	{0xF0, 0x00F0}, 
 	{0, 0}
 };
 
@@ -4608,9 +4873,9 @@ unsigned char *const aliases_viscii [] = {
 
 /*** utf8 ***/
 
-const struct table_entry table_utf8 [] = {
-	{0, 0}
-};
+#define highhalf_utf8 highhalf_NULL
+
+#define table_utf8 table_NULL
 
 unsigned char *const aliases_utf8 [] = {
 	"utf-8",
@@ -4618,42 +4883,67 @@ unsigned char *const aliases_utf8 [] = {
 	NULL
 };
 
+/*** NULL ***/
+
+const uint16_t highhalf_NULL [] = {
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+	0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,
+};
+
+const struct table_entry table_NULL [] = {
+	{0, 0}
+};
+
 const struct codepage_desc codepages [] = {
-	{"7-bit ASCII", aliases_7bit, table_7bit},
-	{"ISO 8859-1", aliases_8859_1, table_8859_1},
-	{"ISO 8859-2", aliases_8859_2, table_8859_2},
-	{"ISO 8859-3", aliases_8859_3, table_8859_3},
-	{"ISO 8859-4", aliases_8859_4, table_8859_4},
-	{"ISO 8859-5", aliases_8859_5, table_8859_5},
-	{"ISO 8859-6", aliases_8859_6, table_8859_6},
-	{"ISO 8859-7", aliases_8859_7, table_8859_7},
-	{"ISO 8859-8", aliases_8859_8, table_8859_8},
-	{"ISO 8859-9", aliases_8859_9, table_8859_9},
-	{"ISO 8859-10", aliases_8859_10, table_8859_10},
-	{"ISO 8859-13", aliases_8859_13, table_8859_13},
-	{"ISO 8859-14", aliases_8859_14, table_8859_14},
-	{"ISO 8859-15", aliases_8859_15, table_8859_15},
-	{"ISO 8859-16", aliases_8859_16, table_8859_16},
-	{"Window$ 1250", aliases_cp1250, table_cp1250},
-	{"Window$ 1251", aliases_cp1251, table_cp1251},
-	{"Window$ 1252", aliases_cp1252, table_cp1252},
-	{"Window$ 1256", aliases_cp1256, table_cp1256},
-	{"Window$ 1257", aliases_cp1257, table_cp1257},
-	{"CP 437", aliases_cp437, table_cp437},
-	{"CP 737", aliases_cp737, table_cp737},
-	{"CP 850", aliases_cp850, table_cp850},
-	{"CP 852", aliases_cp852, table_cp852},
-	{"CP 866", aliases_cp866, table_cp866},
-	{"CP 1125 (Ukrainian)", aliases_cp1125, table_cp1125},
-	{"MacRoman 2000", aliases_macroman, table_macroman},
-	{"Mac latin 2", aliases_mac_lat2, table_mac_lat2},
-	{"Kamenicky Brothers", aliases_kamen, table_kamen},
-	{"KOI8-R", aliases_koi8_r, table_koi8_r},
-	{"KOI8-U", aliases_koi8_u, table_koi8_u},
-	{"KOI8-RU", aliases_koi8_ru, table_koi8_ru},
-	{"TCVN-5712", aliases_tcvn5712, table_tcvn5712},
-	{"VISCII", aliases_viscii, table_viscii},
-	{"Unicode UTF-8", aliases_utf8, table_utf8},
+	{"7-bit ASCII", aliases_7bit, highhalf_7bit, table_7bit},
+	{"ISO 8859-1", aliases_8859_1, highhalf_8859_1, table_8859_1},
+	{"ISO 8859-2", aliases_8859_2, highhalf_8859_2, table_8859_2},
+	{"ISO 8859-3", aliases_8859_3, highhalf_8859_3, table_8859_3},
+	{"ISO 8859-4", aliases_8859_4, highhalf_8859_4, table_8859_4},
+	{"ISO 8859-5", aliases_8859_5, highhalf_8859_5, table_8859_5},
+	{"ISO 8859-6", aliases_8859_6, highhalf_8859_6, table_8859_6},
+	{"ISO 8859-7", aliases_8859_7, highhalf_8859_7, table_8859_7},
+	{"ISO 8859-8", aliases_8859_8, highhalf_8859_8, table_8859_8},
+	{"ISO 8859-9", aliases_8859_9, highhalf_8859_9, table_8859_9},
+	{"ISO 8859-10", aliases_8859_10, highhalf_8859_10, table_8859_10},
+	{"ISO 8859-13", aliases_8859_13, highhalf_8859_13, table_8859_13},
+	{"ISO 8859-14", aliases_8859_14, highhalf_8859_14, table_8859_14},
+	{"ISO 8859-15", aliases_8859_15, highhalf_8859_15, table_8859_15},
+	{"ISO 8859-16", aliases_8859_16, highhalf_8859_16, table_8859_16},
+	{"Window$ 1250", aliases_cp1250, highhalf_cp1250, table_cp1250},
+	{"Window$ 1251", aliases_cp1251, highhalf_cp1251, table_cp1251},
+	{"Window$ 1252", aliases_cp1252, highhalf_cp1252, table_cp1252},
+	{"Window$ 1256", aliases_cp1256, highhalf_cp1256, table_cp1256},
+	{"Window$ 1257", aliases_cp1257, highhalf_cp1257, table_cp1257},
+	{"CP 437", aliases_cp437, highhalf_cp437, table_cp437},
+	{"CP 737", aliases_cp737, highhalf_cp737, table_cp737},
+	{"CP 850", aliases_cp850, highhalf_cp850, table_cp850},
+	{"CP 852", aliases_cp852, highhalf_cp852, table_cp852},
+	{"CP 866", aliases_cp866, highhalf_cp866, table_cp866},
+	{"CP 1125 (Ukrainian)", aliases_cp1125, highhalf_cp1125, table_cp1125},
+	{"MacRoman 2000", aliases_macroman, highhalf_macroman, table_macroman},
+	{"Mac latin 2", aliases_mac_lat2, highhalf_mac_lat2, table_mac_lat2},
+	{"Kamenicky Brothers", aliases_kamen, highhalf_kamen, table_kamen},
+	{"KOI8-R", aliases_koi8_r, highhalf_koi8_r, table_koi8_r},
+	{"KOI8-U", aliases_koi8_u, highhalf_koi8_u, table_koi8_u},
+	{"KOI8-RU", aliases_koi8_ru, highhalf_koi8_ru, table_koi8_ru},
+	{"TCVN-5712", aliases_tcvn5712, highhalf_tcvn5712, table_tcvn5712},
+	{"VISCII", aliases_viscii, highhalf_viscii, table_viscii},
+	{"Unicode UTF-8", aliases_utf8, highhalf_utf8, table_utf8},
 	{NULL, NULL, NULL}
 };
 

From 86ed79deafd6944ba956dd639cb03432fa2ac45a Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sun, 24 Sep 2006 23:56:12 +0300
Subject: [PATCH 117/132] Use wcwidth if available and applicable.

(If wchar_t is not Unicode, then it is not applicable.)
---
 configure.in        | 4 ++--
 src/intl/charsets.c | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index cb684414..fbfad2a0 100644
--- a/configure.in
+++ b/configure.in
@@ -168,7 +168,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
 
-AC_CHECK_HEADERS(wctype.h)
+AC_CHECK_HEADERS(wctype.h wchar.h)
 AC_CHECK_HEADERS(fcntl.h limits.h time.h unistd.h)
 AC_CHECK_HEADERS(sigaction.h)
 AC_CHECK_HEADERS(arpa/inet.h)
@@ -279,7 +279,7 @@ AC_FUNC_MMAP
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(cfmakeraw gethostbyaddr herror strerror)
 AC_CHECK_FUNCS(popen uname access chmod alarm timegm mremap)
-AC_CHECK_FUNCS(strcasecmp strncasecmp strcasestr strstr strchr strrchr)
+AC_CHECK_FUNCS(strcasecmp strncasecmp strcasestr strstr strchr strrchr wcwidth)
 AC_CHECK_FUNCS(memmove bcopy stpcpy strdup index isdigit mempcpy memrchr)
 AC_CHECK_FUNCS(snprintf vsnprintf asprintf vasprintf)
 AC_CHECK_FUNCS(getifaddrs getpwnam inet_pton inet_ntop)
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 119b5328..99d9c7ae 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -10,6 +10,9 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#if HAVE_WCHAR_H
+#include <wchar.h>
+#endif
 #if HAVE_WCTYPE_H
 #include <wctype.h>
 #endif
@@ -547,7 +550,6 @@ invalid_arg:
 /*
  * Find out number of standard terminal collumns needed for displaying symbol
  * (glyph) which represents Unicode character c.
- * TODO: Use wcwidth when it is available.
  *
  * @return	2 for double-width glyph, 1 for others.
  * 		TODO: May be extended to return 0 for zero-width glyphs
@@ -556,6 +558,10 @@ invalid_arg:
 inline int
 unicode_to_cell(unicode_val_T c)
 {
+#if __STDC_ISO_10646__ && HAVE_WCWIDTH
+	if (wcwidth(c) >= 2)
+		return 2;
+#else  /* !__STDC_ISO_10646 || !HAVE_WCWIDTH */
 	if (c >= 0x1100
 		&& (c <= 0x115f			/* Hangul Jamo */
 		|| c == 0x2329
@@ -571,6 +577,7 @@ unicode_to_cell(unicode_val_T c)
 		|| (c >= 0x20000 && c <= 0x2fffd)
 		|| (c >= 0x30000 && c <= 0x3fffd)))
 		return 2;
+#endif /* !__STDC_ISO_10646 || !HAVE_WCWIDTH */
 
 	return 1;
 }

From 304f5fa1ea4853e5b8f635e5fb53c13dddfff814 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 25 Sep 2006 22:24:56 +0300
Subject: [PATCH 118/132] comment fix (__STDC_ISO_10646__, not
 __STDC_ISO_10646)

---
 src/intl/charsets.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 99d9c7ae..059dfff7 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -561,7 +561,7 @@ unicode_to_cell(unicode_val_T c)
 #if __STDC_ISO_10646__ && HAVE_WCWIDTH
 	if (wcwidth(c) >= 2)
 		return 2;
-#else  /* !__STDC_ISO_10646 || !HAVE_WCWIDTH */
+#else  /* !__STDC_ISO_10646__ || !HAVE_WCWIDTH */
 	if (c >= 0x1100
 		&& (c <= 0x115f			/* Hangul Jamo */
 		|| c == 0x2329
@@ -577,7 +577,7 @@ unicode_to_cell(unicode_val_T c)
 		|| (c >= 0x20000 && c <= 0x2fffd)
 		|| (c >= 0x30000 && c <= 0x3fffd)))
 		return 2;
-#endif /* !__STDC_ISO_10646 || !HAVE_WCWIDTH */
+#endif /* !__STDC_ISO_10646__ || !HAVE_WCWIDTH */
 
 	return 1;
 }

From 538e8eb8a51fddc93ef952704f33b8efa518efa6 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 25 Sep 2006 22:46:48 +0300
Subject: [PATCH 119/132] List events in alphabetical order.

---
 doc/events.txt | 78 +++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/doc/events.txt b/doc/events.txt
index 92cc6235..4d5a17f3 100644
--- a/doc/events.txt
+++ b/doc/events.txt
@@ -113,6 +113,27 @@ Description:
 
  Open Lua console dialog.
 
+-------------------------------------------------------------------------------
+Name:		follow-url
+Managed By:	The scripting subsystem/backends
+Triggered When:
+
+ The user decides to load some document by following a link, entering an URL
+ in the goto URL dialog, loading frames from a frameset (?) etc.
+
+Arguments:
+
+ unsigned char **url, struct session *ses
+
+Description:
+
+ If another URL than @url should be followed it is passed by setting @url.
+ If @url is changed the event propagation should be ended.
+ Valid values for @url includes:
+ - leaving @url unchanged if the original URL should be followed;
+ - NULL if no URL should be followed; or
+ - a dynamically allocated new URL to be followed instead.
+
 -------------------------------------------------------------------------------
 Name:		free-history
 Managed By:	The scripting subsystem/backends
@@ -128,6 +149,24 @@ Description:
 
  Allow a subsystem to free its history lists.
 
+-------------------------------------------------------------------------------
+Name:		get-proxy
+Managed By:	The scripting subsystem/backends
+Triggered When:
+
+ Determining what proxy, if any, should be used to load a requested URL.
+
+Arguments:
+
+ unsigned char **new_proxy_url, unsigned char *url
+
+Description:
+
+ Possible values for @new_proxy_url includes:
+ - a dynamically allocated string with the format proxy:port;
+ - an empty string (dynamically allocated!) to use no proxy; or
+ - NULL to use the default proxies.
+
 -------------------------------------------------------------------------------
 Name:		goto-url
 Managed By:	The scripting subsystem/backends
@@ -154,45 +193,6 @@ Description:
  NULL the hook handler should assume no current URI and no suitable UI set up
  (i.e., starting up yet or -dump).
 
--------------------------------------------------------------------------------
-Name:		follow-url
-Managed By:	The scripting subsystem/backends
-Triggered When:
-
- The user decides to load some document by following a link, entering an URL
- in the goto URL dialog, loading frames from a frameset (?) etc.
-
-Arguments:
-
- unsigned char **url, struct session *ses
-
-Description:
-
- If another URL than @url should be followed it is passed by setting @url.
- If @url is changed the event propagation should be ended.
- Valid values for @url includes:
- - leaving @url unchanged if the original URL should be followed;
- - NULL if no URL should be followed; or
- - a dynamically allocated new URL to be followed instead.
-
--------------------------------------------------------------------------------
-Name:		get-proxy
-Managed By:	The scripting subsystem/backends
-Triggered When:
-
- Determining what proxy, if any, should be used to load a requested URL.
-
-Arguments:
-
- unsigned char **new_proxy_url, unsigned char *url
-
-Description:
-
- Possible values for @new_proxy_url includes:
- - a dynamically allocated string with the format proxy:port;
- - an empty string (dynamically allocated!) to use no proxy; or
- - NULL to use the default proxies.
-
 -------------------------------------------------------------------------------
 Name:		periodic-saving
 Managed By:	No maintainer but used by lowlevel/timer.*

From 7a1644c252fab38e49f9cabbb466213a71737773 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 25 Sep 2006 22:58:38 +0300
Subject: [PATCH 120/132] List "Triggered When" before "Arguments" in the event
 template.

That's the order in all existing event descriptions.
---
 doc/events.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/events.txt b/doc/events.txt
index 4d5a17f3..41c64f2d 100644
--- a/doc/events.txt
+++ b/doc/events.txt
@@ -21,14 +21,14 @@ Below is a template showing how to read the event information
 
 Name:		<event name>
 Managed By:	<what part of the code registers and unregister the event>
-Arguments:
-
- <the order and type of the arguments>
-
 Triggered When:
 
  <short description of when the event is triggered>
 
+Arguments:
+
+ <the order and type of the arguments>
+
 Description:
 
  <description of the arguments, what the event does etc.>

From c33d195ff49597a808324791cb93a91cd37a868d Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 25 Sep 2006 23:43:32 +0300
Subject: [PATCH 121/132] Garbage-collect SMJS objects before flushing caches.

---
 doc/events.txt             | 20 ++++++++++++++++++++
 src/main/main.c            |  7 +++++++
 src/scripting/smjs/hooks.c | 16 ++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/doc/events.txt b/doc/events.txt
index 41c64f2d..e7d8397b 100644
--- a/doc/events.txt
+++ b/doc/events.txt
@@ -113,6 +113,26 @@ 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 4f214ab1..404ef1a0 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -306,6 +306,13 @@ 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 647d2887..f2c0289a 100644
--- a/src/scripting/smjs/hooks.c
+++ b/src/scripting/smjs/hooks.c
@@ -89,10 +89,26 @@ 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 86bc6a534bf7b59226e85578ac94a936620a4d6b Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Tue, 26 Sep 2006 19:40:59 +0200
Subject: [PATCH 122/132] Should be visible not location.

---
 src/ecmascript/see/unibar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ecmascript/see/unibar.c b/src/ecmascript/see/unibar.c
index ae72f766..8dd43e4a 100644
--- a/src/ecmascript/see/unibar.c
+++ b/src/ecmascript/see/unibar.c
@@ -121,7 +121,7 @@ static void
 unibar_put(struct SEE_interpreter *interp, struct SEE_object *o,
 	   struct SEE_string *p, struct SEE_value *val, int attr)
 {
-	if (p == s_location) {
+	if (p == s_visible) {
 		struct global_object *g = (struct global_object *)interp;
 		struct view_state *vs = g->win->vs;
 		struct document_view *doc_view = vs->doc_view;

From bac6e76c23d758dccd5fa96b7b5c1c290f88d8d8 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Wed, 27 Sep 2006 21:29:27 +0300
Subject: [PATCH 123/132] switch_to_tab: Prevent "tab number out of range"
 assertion failure.

To reproduce:
- Start ELinks.
- Enable the ui.tabs.wraparound option.
- Press t to open a second tab.
- Go to http://elinks.cz/ in the second tab.
- Press 3< to step three tabs to the left.

In the statement "tab = tabs + tab % tabs;", tab == -2 and tabs == 2.
So tab % tabs == 0 and tab becomes 2, which is out of range.

The new version calls get_opt_bool even if the tab parameter is already in
range, but the cost should be negligible compared to the redraw_terminal()
call that follows.
---
 src/terminal/tab.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/terminal/tab.c b/src/terminal/tab.c
index d5b82a3c..f382ed8e 100644
--- a/src/terminal/tab.c
+++ b/src/terminal/tab.c
@@ -138,19 +138,11 @@ switch_to_tab(struct terminal *term, int tab, int tabs)
 	if (tabs < 0) tabs = number_of_tabs(term);
 
 	if (tabs > 1) {
-		if (tab >= tabs) {
-			if (get_opt_bool("ui.tabs.wraparound"))
-				tab = tab % tabs;
-			else
-				tab = tabs - 1;
-		}
-
-		if (tab < 0) {
-			if (get_opt_bool("ui.tabs.wraparound"))
-				tab = tabs + tab % tabs;
-			else
-				tab = 0;
-		}
+		if (get_opt_bool("ui.tabs.wraparound")) {
+			tab %= tabs;
+			if (tab < 0) tab += tabs;
+		} else
+			int_bounds(&tab, 0, tabs - 1);
 	} else tab = 0;
 
 	if (tab != term->current_tab) {

From 3f94687e28a3e5c9a5611a5e85cd4aa01a83396e Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Thu, 28 Sep 2006 23:50:46 +0200
Subject: [PATCH 124/132] Use @tabs_count instead of mixed tabs_count, num_tabs
 or tabs.

---
 src/dialogs/menu.c   |  8 ++++----
 src/dialogs/status.c |  8 ++++----
 src/terminal/tab.c   | 28 ++++++++++++++--------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/dialogs/menu.c b/src/dialogs/menu.c
index 8c996609..101d97e7 100644
--- a/src/dialogs/menu.c
+++ b/src/dialogs/menu.c
@@ -218,7 +218,7 @@ tab_menu(struct session *ses, int x, int y, int place_above_cursor)
 {
 	/* [gettext_accelerator_context(tab_menu)] */
 	struct menu_item *menu;
-	int tabs;
+	int tabs_count;
 #ifdef CONFIG_BOOKMARKS
 	int anonymous = get_cmd_opt_bool("anonymous");
 #endif
@@ -226,7 +226,7 @@ tab_menu(struct session *ses, int x, int y, int place_above_cursor)
 	assert(ses && ses->tab);
 	if_assert_failed return;
 
-	tabs = number_of_tabs(ses->tab->term);
+	tabs_count = number_of_tabs(ses->tab->term);
 	menu = new_menu(FREE_LIST);
 	if (!menu) return;
 
@@ -255,14 +255,14 @@ tab_menu(struct session *ses, int x, int y, int place_above_cursor)
 	/* Keep tab related operations below this separator */
 	add_menu_separator(&menu);
 
-	if (tabs > 1) {
+	if (tabs_count > 1) {
 		add_menu_action(&menu, N_("Nex~t tab"), ACT_MAIN_TAB_NEXT);
 		add_menu_action(&menu, N_("Pre~v tab"), ACT_MAIN_TAB_PREV);
 	}
 
 	add_menu_action(&menu, N_("~Close tab"), ACT_MAIN_TAB_CLOSE);
 
-	if (tabs > 1) {
+	if (tabs_count > 1) {
 		add_menu_action(&menu, N_("C~lose all tabs but the current"),
 				ACT_MAIN_TAB_CLOSE_ALL_BUT_CURRENT);
 #ifdef CONFIG_BOOKMARKS
diff --git a/src/dialogs/status.c b/src/dialogs/status.c
index 6f569c5b..d5ffc48f 100644
--- a/src/dialogs/status.c
+++ b/src/dialogs/status.c
@@ -74,7 +74,7 @@ update_status(void)
 	int set_window_title = get_opt_bool("ui.window_title");
 	int insert_mode = get_opt_bool("document.browse.forms.insert_mode");
 	struct session *ses;
-	int tabs = 1;
+	int tabs_count = 1;
 	struct terminal *term = NULL;
 
 	foreach (ses, sessions) {
@@ -85,7 +85,7 @@ update_status(void)
 		 * tab sessions share the same term. */
 		if (ses->tab->term != term) {
 			term = ses->tab->term;
-			tabs = number_of_tabs(term);
+			tabs_count = number_of_tabs(term);
 		}
 
 		if (status->force_show_title_bar >= 0)
@@ -102,8 +102,8 @@ update_status(void)
 			dirty = 1;
 		}
 
-		if (show_tabs(show_tabs_bar, tabs) != status->show_tabs_bar) {
-			status->show_tabs_bar = show_tabs(show_tabs_bar, tabs);
+		if (show_tabs(show_tabs_bar, tabs_count) != status->show_tabs_bar) {
+			status->show_tabs_bar = show_tabs(show_tabs_bar, tabs_count);
 			dirty = 1;
 		}
 
diff --git a/src/terminal/tab.c b/src/terminal/tab.c
index f382ed8e..badb504a 100644
--- a/src/terminal/tab.c
+++ b/src/terminal/tab.c
@@ -130,19 +130,19 @@ get_tab_number_by_xpos(struct terminal *term, int xpos)
 	return -1;
 }
 
-/* if @tabs > 0, then it is taken as the result of a recent
+/* if @tabs_count > 0, then it is taken as the result of a recent
  * call to number_of_tabs() so it just uses this value. */
 void
-switch_to_tab(struct terminal *term, int tab, int tabs)
+switch_to_tab(struct terminal *term, int tab, int tabs_count)
 {
-	if (tabs < 0) tabs = number_of_tabs(term);
+	if (tabs_count < 0) tabs_count = number_of_tabs(term);
 
-	if (tabs > 1) {
+	if (tabs_count > 1) {
 		if (get_opt_bool("ui.tabs.wraparound")) {
-			tab %= tabs;
-			if (tab < 0) tab += tabs;
+			tab %= tabs_count;
+			if (tab < 0) tab += tabs_count;
 		} else
-			int_bounds(&tab, 0, tabs - 1);
+			int_bounds(&tab, 0, tabs_count - 1);
 	} else tab = 0;
 
 	if (tab != term->current_tab) {
@@ -156,16 +156,16 @@ void
 switch_current_tab(struct session *ses, int direction)
 {
 	struct terminal *term = ses->tab->term;
-	int num_tabs = number_of_tabs(term);
+	int tabs_count = number_of_tabs(term);
 	int count;
 
-	if (num_tabs < 2)
+	if (tabs_count < 2)
 		return;
 
 	count = eat_kbd_repeat_count(ses);
 	if (count) direction *= count;
 
-	switch_to_tab(term, term->current_tab + direction, num_tabs);
+	switch_to_tab(term, term->current_tab + direction, tabs_count);
 }
 
 static void
@@ -175,9 +175,9 @@ really_close_tab(struct session *ses)
 	struct window *current_tab = get_current_tab(term);
 
 	if (ses->tab == current_tab) {
-		int num_tabs = number_of_tabs(term);
+		int tabs_count = number_of_tabs(term);
 
-		switch_to_tab(term, term->current_tab - 1, num_tabs - 1);
+		switch_to_tab(term, term->current_tab - 1, tabs_count - 1);
 	}
 
 	delete_window(ses->tab);
@@ -187,9 +187,9 @@ void
 close_tab(struct terminal *term, struct session *ses)
 {
 	/* [gettext_accelerator_context(close_tab)] */
-	int num_tabs = number_of_tabs(term);
+	int tabs_count = number_of_tabs(term);
 
-	if (num_tabs < 2) {
+	if (tabs_count < 2) {
 		query_exit(ses);
 		return;
 	}

From 0b58b99d300077cc883099505165bab67ac8d761 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Thu, 28 Sep 2006 23:58:26 +0200
Subject: [PATCH 125/132] Use @current_tab for current tab.

---
 src/bfu/menu.c         | 4 ++--
 src/session/session.c  | 4 ++--
 src/terminal/tab.c     | 4 ++--
 src/viewer/text/view.c | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/bfu/menu.c b/src/bfu/menu.c
index b4c56590..3bbfbc99 100644
--- a/src/bfu/menu.c
+++ b/src/bfu/menu.c
@@ -869,8 +869,8 @@ static void
 search_menu(struct menu *menu)
 {
 	struct terminal *term = menu->win->term;
-	struct window *tab = get_current_tab(term);
-	struct session *ses = tab ? tab->data : NULL;
+	struct window *current_tab = get_current_tab(term);
+	struct session *ses = current_tab ? current_tab->data : NULL;
 	unsigned char *prompt = _("Search menu/", term);
 
 	if (menu->size < 1 || !ses) return;
diff --git a/src/session/session.c b/src/session/session.c
index ceb720e7..2dc95d52 100644
--- a/src/session/session.c
+++ b/src/session/session.c
@@ -221,9 +221,9 @@ get_master_session(void)
 
 	foreach (ses, sessions)
 		if (ses->tab->term->master) {
-			struct window *tab = get_current_tab(ses->tab->term);
+			struct window *current_tab = get_current_tab(ses->tab->term);
 
-			return tab ? tab->data : NULL;
+			return current_tab ? current_tab->data : NULL;
 		}
 
 	return NULL;
diff --git a/src/terminal/tab.c b/src/terminal/tab.c
index badb504a..24ac7579 100644
--- a/src/terminal/tab.c
+++ b/src/terminal/tab.c
@@ -211,11 +211,11 @@ static void
 really_close_tabs(struct session *ses)
 {
 	struct terminal *term = ses->tab->term;
-	struct window *current = get_current_tab(term);
+	struct window *current_tab = get_current_tab(term);
 	struct window *tab;
 
 	foreach_tab (tab, term->windows) {
-		if (tab == current) continue;
+		if (tab == current_tab) continue;
 
 		/* Update the current tab counter so assertions in the
 		 * delete_window() call-chain will hold, namely the one in
diff --git a/src/viewer/text/view.c b/src/viewer/text/view.c
index 5c247b02..1b610466 100644
--- a/src/viewer/text/view.c
+++ b/src/viewer/text/view.c
@@ -1055,15 +1055,15 @@ send_mouse_event(struct session *ses, struct document_view *doc_view,
 	/* Handle tabs navigation if tabs bar is displayed. */
 	if (ses->status.show_tabs_bar && is_mouse_on_tab_bar(ses, mouse)) {
 		int tab_num = get_tab_number_by_xpos(term, mouse->x);
-		struct window *tab = get_current_tab(term);
+		struct window *current_tab = get_current_tab(term);
 
 		if (check_mouse_action(ev, B_UP)) {
 			if (check_mouse_button(ev, B_MIDDLE)
 			    && term->current_tab == tab_num
 			    && mouse->y == term->prev_mouse_event.y) {
-				if (tab->data == ses) ses = NULL;
+				if (current_tab->data == ses) ses = NULL;
 
-				close_tab(term, tab->data);
+				close_tab(term, current_tab->data);
 			}
 
 			return ses;
@@ -1081,7 +1081,7 @@ send_mouse_event(struct session *ses, struct document_view *doc_view,
 			if (check_mouse_button(ev, B_MIDDLE)) {
 				do_not_ignore_next_mouse_event(term);
 			} else if (check_mouse_button(ev, B_RIGHT)) {
-				tab_menu(tab->data, mouse->x, mouse->y, 1);
+				tab_menu(current_tab->data, mouse->x, mouse->y, 1);
 			}
 		}
 

From e86e1d0fa3fc7c2380c3aeb6a800b986fe7611ff Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Fri, 29 Sep 2006 00:07:54 +0200
Subject: [PATCH 126/132] Trim some trailing whitespaces.

---
 src/bfu/dialog.c    | 2 +-
 src/bfu/hotkey.c    | 2 +-
 src/intl/charsets.c | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bfu/dialog.c b/src/bfu/dialog.c
index a7051b1f..34e60266 100644
--- a/src/bfu/dialog.c
+++ b/src/bfu/dialog.c
@@ -289,7 +289,7 @@ select_button_by_key(struct dialog_data *dlg_data)
 #ifdef CONFIG_UTF8
 	int codepage;
 #endif
-	
+
 	struct widget_data *widget_data;
 	struct term_event *ev = dlg_data->term_event;
 
diff --git a/src/bfu/hotkey.c b/src/bfu/hotkey.c
index 9ab50df6..c2622859 100644
--- a/src/bfu/hotkey.c
+++ b/src/bfu/hotkey.c
@@ -186,7 +186,7 @@ check_hotkeys_common(struct menu *menu, term_event_char_T hotkey, struct termina
 		found = (unicode_fold_label_case(items_hotkey) == key);
 #else
 		found = (toupper(*text) == key);
-#endif		
+#endif
 
 		if (found) {
 			menu->selected = i;
diff --git a/src/intl/charsets.c b/src/intl/charsets.c
index 059dfff7..0892e265 100644
--- a/src/intl/charsets.c
+++ b/src/intl/charsets.c
@@ -46,7 +46,7 @@ struct table_entry {
 struct codepage_desc {
 	unsigned char *name;
 	unsigned char *const *aliases;
- 
+
  	/* The Unicode mappings of codepage bytes 0x80...0xFF.
  	 * (0x00...0x7F are assumed to be ASCII in all codepages.)
  	 * Because all current values fit in 16 bits, we store them as
@@ -56,7 +56,7 @@ struct codepage_desc {
  	 * appropriate.  (U+FFFF is reserved and will never be
  	 * assigned as a character.)  */
 	const uint16_t *highhalf;
- 
+
  	/* If some byte in the codepage corresponds to multiple Unicode
  	 * characters, then the preferred character is in @highhalf
  	 * above, and the rest are listed here in @extra.  This table
@@ -661,7 +661,7 @@ static unicode_val_T
 cp2u_shared(const struct codepage_desc *from, unsigned char c)
 {
 	unicode_val_T u = from->highhalf[c - 0x80];
-	
+
 	if (u == 0xFFFF) u = UCS_REPLACEMENT_CHARACTER;
 	return u;
 }

From 461787013bab23f06838cbadfbbd27e00cef0d7a Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 1 Oct 2006 16:08:52 +0200
Subject: [PATCH 127/132] Revert commit
 7cb91c32139dc72aad02b9f11c1aad40ccb172a4. Doble glyphs should be displayed
 correctly.

---
 src/document/html/renderer.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
index 9d316dfa..b80e2d63 100644
--- a/src/document/html/renderer.c
+++ b/src/document/html/renderer.c
@@ -454,7 +454,7 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
 							continue;
 						} else {
 							unsigned char i;
-broken_char:							/* broken char */
+
 							for (i = 0; chars < end;i++) {
 								part->document->buf[i] = *chars++;
 							}
@@ -467,9 +467,7 @@ good_char:
 							schar->data = (unicode_val_T)data;
 							part->char_width[x] = 2;
 							copy_screen_chars(&POS(x++, y), schar, 1);
-							data = utf8_to_unicode(&chars, end);
-							if (data == UCS_NO_CHAR) goto broken_char;
-							schar->data = (unicode_val_T)data;
+							schar->data = UCS_NO_CHAR;
 							part->spaces[x] = 0;
 							part->char_width[x] = 0;
 						} else {

From 7f0fb0440c54ae131dabb5b6c7e8e8bce9838ee6 Mon Sep 17 00:00:00 2001
From: Miciah Dashiel Butler Masters <miciah@myrealbox.com>
Date: Sun, 1 Oct 2006 14:57:47 +0000
Subject: [PATCH 128/132] Secure file saving: restore umask after _all_ failure
 conditions

The secure file saving code plays some shenanigans with the umask.
Previously, the code could fail to restore the old umask when certain libc
calls failed: malloc, mkstemp, fdopen, and fopen. This resulted in
unrelated code creating files with the wrong umode. Specifically, the
download code's automatic directory creation was creating directories
without the execute permission bit.

Thanks to Quiznos for reporting and helping to track the problem down.
---
 src/util/secsave.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/util/secsave.c b/src/util/secsave.c
index 23ea093a..10ffd326 100644
--- a/src/util/secsave.c
+++ b/src/util/secsave.c
@@ -69,9 +69,8 @@ enum secsave_errno secsave_errno = SS_ERR_NONE;
 /* Open a file for writing in a secure way. It returns a pointer to a structure
  * secure_save_info on success, or NULL on failure. */
 static struct secure_save_info *
-secure_open_umask(unsigned char *file_name, mode_t mask)
+secure_open_umask(unsigned char *file_name)
 {
-	mode_t saved_mask;
 	struct stat st;
 	struct secure_save_info *ssi;
 
@@ -144,8 +143,6 @@ secure_open_umask(unsigned char *file_name, mode_t mask)
 		}
 	}
 
-	saved_mask = umask(mask);
-
 	if (ssi->secure_save) {
 		/* We use a random name for temporary file, mkstemp() opens
 		 * the file and return a file descriptor named fd, which is
@@ -187,8 +184,6 @@ secure_open_umask(unsigned char *file_name, mode_t mask)
 		}
 	}
 
-	umask(saved_mask);
-
 	return ssi;
 
 free_file_name:
@@ -206,12 +201,20 @@ end:
 struct secure_save_info *
 secure_open(unsigned char *file_name)
 {
+	struct secure_save_info *ssi;
+	mode_t saved_mask;
 #ifdef CONFIG_OS_WIN32
 	/* There is neither S_IRWXG nor S_IRWXO under crossmingw32-gcc */
-	return secure_open_umask(file_name, 0177);
+	const mode_t mask = 0177;
 #else
-	return secure_open_umask(file_name, S_IXUSR | S_IRWXG | S_IRWXO);
+	const mode_t mask = S_IXUSR | S_IRWXG | S_IRWXO;
 #endif
+	
+	saved_mask = umask(mask);
+	ssi = secure_open_umask(file_name);
+	umask(saved_mask);
+
+	return ssi;
 }
 
 /* Close a file opened with secure_open, and return 0 on success, errno

From cc6c59d9326e90e7b11ee41d85b605c670c2487c Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 8 Oct 2006 16:24:47 +0200
Subject: [PATCH 129/132] Handling If-Modified-Since.

---
 src/cache/cache.c        | 7 +++++++
 src/protocol/http/http.c | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/cache/cache.c b/src/cache/cache.c
index ea1185a3..6f0a8475 100644
--- a/src/cache/cache.c
+++ b/src/cache/cache.c
@@ -181,6 +181,13 @@ get_validated_cache_entry(struct uri *uri, enum cache_mode cache_mode)
 	if (!cached || cached->incomplete)
 		return NULL;
 
+	if (uri->protocol == PROTOCOL_HTTP || uri->protocol == PROTOCOL_HTTPS
+	    || uri->protocol == PROTOCOL_FILE /* CGI */) {
+	    	if (cached->last_modified && cache_mode == CACHE_MODE_NORMAL)
+			return NULL;
+	}
+
+
 	/* A bit of a gray zone. Delete the entry if the it has the stricktest
 	 * cache mode and we don't want the most aggressive mode or we have to
 	 * remove the redirect or the entry expired. Please enlighten me.
diff --git a/src/protocol/http/http.c b/src/protocol/http/http.c
index 87d468d8..b67db9e2 100644
--- a/src/protocol/http/http.c
+++ b/src/protocol/http/http.c
@@ -571,6 +571,8 @@ http_send_header(struct socket *socket)
 		return;
 	}
 
+	if (!conn->cached) conn->cached = find_in_cache(uri);
+
 	talking_to_proxy = IS_PROXY_URI(conn->uri) && !conn->socket->ssl;
 	use_connect = connection_is_https_proxy(conn) && !conn->socket->ssl;
 

From 09991b59f16dbbccb68bee81e2261bdda500ef01 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 11 Oct 2006 14:39:04 +0200
Subject: [PATCH 130/132] Partial Afrikaans translation was added. Thanks to
 Friedel Wolff.

---
 AUTHORS                    |    3 +
 configure.in               |    2 +-
 po/af.po                   | 7965 ++++++++++++++++++++++++++++++++++++
 src/intl/gettext/libintl.c |    1 +
 4 files changed, 7970 insertions(+), 1 deletion(-)
 create mode 100644 po/af.po

diff --git a/AUTHORS b/AUTHORS
index f65085d4..56b3c065 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -192,6 +192,9 @@ Flemming Frandsen <ff@partyticket.net>
 Frédéric L. W. Meunier <0@pervalidus.tk>
 	Minor documentation updates
 
+Friedel Wolff <fwolff@translate.org.za>
+	Afrikaans translation
+
 Fuzzy European King <james@place.org>
 	Fixed lua stack overflow
 
diff --git a/configure.in b/configure.in
index fbfad2a0..e0980d36 100644
--- a/configure.in
+++ b/configure.in
@@ -1157,7 +1157,7 @@ dnl ===================================================================
 dnl Gettext grey zone. Beware.
 dnl ===================================================================
 
-ALL_LINGUAS="be bg ca cs da de el es et fi fr gl hr hu id is it lt nl nb pl pt pt_BR ro ru sk sr sv tr uk"
+ALL_LINGUAS="af be bg ca cs da de el es et fi fr gl hr hu id is it lt nl nb pl pt pt_BR ro ru sk sr sv tr uk"
 
 AM_GNU_GETTEXT
 
diff --git a/po/af.po b/po/af.po
new file mode 100644
index 00000000..bbc69e68
--- /dev/null
+++ b/po/af.po
@@ -0,0 +1,7965 @@
+# Afrikaans translations for elinks.
+# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Friedel Wolff <fwolff@translate.org.za>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.12\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-10-11 14:23+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 0.10rc4\n"
+
+#: src/bfu/hierbox.c:332
+msgid "Close"
+msgstr "Sluit"
+
+#. | MSGBOX_SCROLLABLE
+#: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43
+#: src/dialogs/document.c:240
+msgid "Info"
+msgstr "Info"
+
+#: src/bfu/hierbox.c:430
+msgid "Press space to expand this folder."
+msgstr "Druk spasie om hierdie gids te laat oopvou."
+
+#. accelerator_context(do_auth_dialog, do_edit_dialog, generic_external_protocol_handler, info_box, input_dialog, menu_add_ext, menu_keys, push_hierbox_info_button, refreshed_msg_box, resize_terminal_dialog, setup_first_session, src/config/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:build_edit_dialog, src/cookies/dialogs.c:push_add_server_button, src/scripting/lua/core.c:l_edit_bookmark_dialog, src/scripting/lua/core.c:l_xdialog, src/viewer/text/search.c:search_dlg_do, terminal_options, write_config_dialog)
+#: src/bfu/hierbox.c:441 src/bfu/inpfield.c:256 src/bfu/msgbox.c:173
+#: src/bfu/msgbox.c:191 src/config/dialogs.c:58 src/config/dialogs.c:393
+#: src/cookies/dialogs.c:356 src/cookies/dialogs.c:454 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/protocol/protocol.c:236 src/scripting/lua/core.c:390
+#: src/scripting/lua/core.c:471 src/session/session.c:806
+#: src/viewer/text/search.c:1666
+msgid "~OK"
+msgstr "Regs~o"
+
+#. cant_delete_item
+#: src/bfu/hierbox.c:552
+#, c-format
+msgid "Sorry, but the item \"%s\" cannot be deleted."
+msgstr "Jammer, maar die item \"%s\" kan nie geskrap word nie."
+
+#. cant_delete_used_item
+#: src/bfu/hierbox.c:555
+#, c-format
+msgid "Sorry, but the item \"%s\" is being used by something else."
+msgstr "Jammer, maar die item \"%s\" word deur iets anders gebruik."
+
+#. cant_delete_folder
+#: src/bfu/hierbox.c:558 src/bookmarks/dialogs.c:121
+#, c-format
+msgid "Sorry, but the folder \"%s\" cannot be deleted."
+msgstr "Jammer, maar die gids \"%s\" kan nie geskrap word nie."
+
+#. cant_delete_used_folder
+#: src/bfu/hierbox.c:561 src/bookmarks/dialogs.c:123
+#, c-format
+msgid "Sorry, but the folder \"%s\" is being used by something else."
+msgstr "Jammer, maar die gids \"%s\" word deur iets anders gebruik."
+
+#. delete_marked_items_title
+#: src/bfu/hierbox.c:564
+msgid "Delete marked items"
+msgstr "Skrap gemerkte items"
+
+#. delete_marked_items
+#: src/bfu/hierbox.c:567
+msgid "Delete marked items?"
+msgstr "Skrap gemerkte items?"
+
+#. delete_folder_title
+#: src/bfu/hierbox.c:570 src/bookmarks/dialogs.c:129
+msgid "Delete folder"
+msgstr "Skrap gids"
+
+#. delete_folder
+#: src/bfu/hierbox.c:573
+#, c-format
+msgid "Delete the folder \"%s\" and its content?"
+msgstr "Skrap die gids \"%s\" en sy inhoud?"
+
+#. delete_item_title
+#: src/bfu/hierbox.c:576
+msgid "Delete item"
+msgstr "Skrap item"
+
+#. delete_item
+#: src/bfu/hierbox.c:579
+#, c-format
+msgid ""
+"Delete \"%s\"?\n"
+"\n"
+"%s"
+msgstr ""
+"Skrap \"%s\"?\n"
+"\n"
+"%s"
+
+#. clear_all_items_title
+#: src/bfu/hierbox.c:582
+msgid "Clear all items"
+msgstr "Skrap alle items"
+
+#. clear_all_items
+#: src/bfu/hierbox.c:585
+msgid "Do you really want to remove all items?"
+msgstr "Wil u regtig alle items verwyder?"
+
+#: src/bfu/hierbox.c:642
+msgid "Delete error"
+msgstr "Fout tydens skrap"
+
+#. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
+#: src/bfu/hierbox.c:754 src/bfu/hierbox.c:766 src/bfu/hierbox.c:808
+#: src/bfu/hierbox.c:870 src/config/dialogs.c:851 src/dialogs/menu.c:127
+#: src/formhist/formhist.c:419 src/mime/dialogs.c:70 src/session/task.c:273
+#: src/terminal/tab.c:206 src/terminal/tab.c:249
+msgid "~Yes"
+msgstr "~Ja"
+
+#. accelerator_context(close_all_tabs_but_current, close_tab, memorize_form, menu_del_ext, push_hierbox_clear_button, push_hierbox_delete_button, query_delete_selected_item, query_exit, ses_goto, src/config/dialogs.c:really_add_keybinding.yn)
+#: src/bfu/hierbox.c:755 src/bfu/hierbox.c:767 src/bfu/hierbox.c:809
+#: src/bfu/hierbox.c:871 src/config/dialogs.c:852 src/dialogs/menu.c:128
+#: src/formhist/formhist.c:420 src/mime/dialogs.c:71 src/session/task.c:274
+#: src/terminal/tab.c:207 src/terminal/tab.c:250
+msgid "~No"
+msgstr "~Nee"
+
+#: src/bfu/hierbox.c:939 src/bfu/hierbox.c:970 src/viewer/text/search.c:1085
+#: src/viewer/text/search.c:1093 src/viewer/text/search.c:1109
+#: src/viewer/text/search.c:1685
+msgid "Search"
+msgstr "Soek"
+
+#: src/bfu/hierbox.c:941 src/viewer/text/search.c:1086
+#, c-format
+msgid "Search string '%s' not found"
+msgstr "Soekstring '%s' nie gevind nie"
+
+#: src/bfu/hierbox.c:970 src/config/dialogs.c:169 src/config/dialogs.c:359
+#: src/config/dialogs.c:507 src/cookies/dialogs.c:34 src/cookies/dialogs.c:350
+#: src/dialogs/edit.c:92 src/dialogs/edit.c:94 src/scripting/lua/core.c:386
+#: src/scripting/lua/core.c:387 src/scripting/lua/core.c:468
+msgid "Name"
+msgstr "Naam"
+
+#: src/bfu/inpfield.c:72 src/bfu/inpfield.c:79
+msgid "Bad number"
+msgstr "Slegte getal"
+
+#: src/bfu/inpfield.c:73
+msgid "Number expected in field"
+msgstr "Getal is verwag in die veld"
+
+#: src/bfu/inpfield.c:81
+#, c-format
+msgid "Number should be in the range from %d to %d."
+msgstr "Getal moet in die omvang van %d tot %d wees."
+
+#: src/bfu/inpfield.c:99 src/config/dialogs.c:460
+msgid "Bad string"
+msgstr "Slegte string"
+
+#: src/bfu/inpfield.c:100
+msgid "Empty string not allowed"
+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:394 src/cookies/dialogs.c:357
+#: src/cookies/dialogs.c:455 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/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/viewer/text/search.c:1667
+msgid "~Cancel"
+msgstr "~Kanseleer"
+
+#: src/bfu/leds.c:74
+msgid "Clock"
+msgstr "Horlosie"
+
+#: src/bfu/leds.c:75
+msgid "Digital clock in the status bar."
+msgstr "Digitale horlose in die statusbalk."
+
+#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1203
+#: src/config/options.inc:1210 src/ecmascript/ecmascript.c:44
+#: 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"
+msgstr "Aktiveer"
+
+#: src/bfu/leds.c:79
+msgid "Whether to display a digital clock in the status bar."
+msgstr "Of 'n digitale horlosie in die statusbalk vertoon moet word."
+
+#: src/bfu/leds.c:81
+msgid "Format"
+msgstr "Formaat"
+
+#: src/bfu/leds.c:83
+msgid ""
+"Format string for the digital clock. See the strftime(3)\n"
+"manpage for details."
+msgstr ""
+"Formaatstring vir die digitale horlosie. Sien die man-blad\n"
+"vir strftime(3) vir detail."
+
+#: src/bfu/leds.c:90
+msgid "LEDs"
+msgstr "LED's"
+
+#: src/bfu/leds.c:92
+msgid "LEDs (visual indicators) options."
+msgstr "LED-opsies (visuele aanwysers)."
+
+#: src/bfu/leds.c:96
+msgid ""
+"Enable LEDs.\n"
+"These visual indicators will inform you about various states."
+msgstr ""
+"Aktiveer LED's.\n"
+"Hierdie visuele aanwysers sal u inlig oor verskeie toestande."
+
+#. name:
+#: src/bfu/leds.c:302 src/bfu/leds.c:344
+msgid "LED indicators"
+msgstr "LED-aanwysers"
+
+#: src/bfu/leds.c:303
+msgid ""
+"What the different LEDs indicate:\n"
+"\n"
+"[SIJP--]\n"
+" |||||`- Unused\n"
+" ||||`-- Unused\n"
+" |||`--- A JavaScript pop-up window was blocked\n"
+" ||`---- A JavaScript error has occured\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"
+"\n"
+"'-' generally indicates that the LED is off."
+msgstr ""
+"Wat die verskillende LED's aandui:\n"
+"\n"
+"[SIJP--]\n"
+" |||||`- Ongebruik\n"
+" ||||`-- Ongebruik\n"
+" |||`--- 'n JavaScript-opspringvenster is geblok\n"
+" ||`---- 'n JavaScript-fout het voorgekom\n"
+" |`----- Die toestand vir invoegmodus vir teksinvoer in forms\n"
+" |       'i' beteken modusloos, 'I' beteken invoermodus is aan\n"
+" `------ Of 'n SSL-verbinding gebruik is\n"
+"\n"
+"'-' dui gewoonlik dat die LED af is."
+
+#: src/bfu/menu.c:874
+msgid "Search menu/"
+msgstr ""
+
+#: src/bookmarks/backend/xbel.c:97
+msgid "read_bookmarks_xbel(): Error in XML_ParserCreate()"
+msgstr ""
+
+#: src/bookmarks/backend/xbel.c:108
+#, c-format
+msgid "read_bookmarks_xbel(): Error reading %s"
+msgstr ""
+
+#: src/bookmarks/backend/xbel.c:116
+#, c-format
+msgid ""
+"Parse error while processing XBEL bookmarks in %s at line %d column %d:\n"
+"%s"
+msgstr ""
+
+#: src/bookmarks/backend/xbel.c:390 src/bookmarks/backend/xbel.c:411
+msgid "No title"
+msgstr "Geen titel"
+
+#: src/bookmarks/backend/xbel.c:396
+msgid "No URL"
+msgstr "Geen URL"
+
+#. name:
+#: src/bookmarks/bookmarks.c:48 src/bookmarks/bookmarks.c:181
+msgid "Bookmarks"
+msgstr "Boekmerke"
+
+#: src/bookmarks/bookmarks.c:50
+msgid "Bookmark options."
+msgstr "Boekmerkkeuses."
+
+#: src/bookmarks/bookmarks.c:53 src/bookmarks/bookmarks.c:59
+msgid "File format"
+msgstr "LĂŞerformaat"
+
+#: src/bookmarks/bookmarks.c:55
+msgid ""
+"File format for bookmarks (affects both reading and saving):\n"
+"0 is the default native ELinks format\n"
+"1 is XBEL universal XML bookmarks format (NO NATIONAL CHARS SUPPORT!)"
+msgstr ""
+
+#: src/bookmarks/bookmarks.c:61
+msgid ""
+"File format for bookmarks (affects both reading and saving):\n"
+"0 is the default native ELinks format\n"
+"1 is XBEL universal XML bookmarks format (NO NATIONAL CHARS SUPPORT!)  "
+"(DISABLED)"
+msgstr ""
+
+#: src/bookmarks/bookmarks.c:67
+msgid "Save folder state"
+msgstr "Stoor gidstoestand"
+
+#: src/bookmarks/bookmarks.c:69
+msgid ""
+"When saving bookmarks also store whether folders are\n"
+"expanded or not, so the look of the bookmark dialog is\n"
+"kept across ELinks sessions. If disabled all folders will\n"
+"appear unexpanded next time ELinks is run."
+msgstr ""
+
+#: src/bookmarks/bookmarks.c:74
+msgid "Periodic snapshotting"
+msgstr ""
+
+#: src/bookmarks/bookmarks.c:76
+msgid ""
+"Automatically save a snapshot of all tabs periodically.\n"
+"This will periodically bookmark the tabs of each terminal in a separate "
+"folder\n"
+"for recovery after a crash.\n"
+"\n"
+"This feature requires bookmark support."
+msgstr ""
+
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1055
+#: src/dialogs/document.c:145 src/globhist/dialogs.c:65
+msgid "Title"
+msgstr "Titel"
+
+#: src/bookmarks/dialogs.c:73 src/cache/dialogs.c:65
+#: src/dialogs/document.c:136 src/dialogs/edit.c:96 src/formhist/dialogs.c:63
+#: src/globhist/dialogs.c:66 src/protocol/auth/dialogs.c:163
+#: src/scripting/lua/core.c:388
+msgid "URL"
+msgstr "URL"
+
+#. cant_delete_item
+#: src/bookmarks/dialogs.c:117
+#, c-format
+msgid "Sorry, but the bookmark \"%s\" cannot be deleted."
+msgstr "Jammer, maar die boekmerk \"%s\" kan nie geskrap word nie."
+
+#. cant_delete_used_item
+#: src/bookmarks/dialogs.c:119
+#, c-format
+msgid "Sorry, but the bookmark \"%s\" is being used by something else."
+msgstr "Jammer, maar die boekmerk \"%s\" word deur iets anders gebruik."
+
+#. delete_marked_items_title
+#: src/bookmarks/dialogs.c:125
+msgid "Delete marked bookmarks"
+msgstr "Skrap gemerkte boekmerke"
+
+#. delete_marked_items
+#: src/bookmarks/dialogs.c:127
+msgid "Delete marked bookmarks?"
+msgstr "Skrap gemerkte boekmerke?"
+
+#. delete_folder
+#: src/bookmarks/dialogs.c:131
+#, c-format
+msgid "Delete the folder \"%s\" and all bookmarks in it?"
+msgstr "Skrap die gids \"%s\" en alle boekmerke daarin?"
+
+#. delete_item_title
+#: src/bookmarks/dialogs.c:133
+msgid "Delete bookmark"
+msgstr "Skrap boekmerk"
+
+#: src/bookmarks/dialogs.c:135
+#, c-format
+msgid "Delete this bookmark?"
+msgstr "Skrap hierdie boekmerk?"
+
+#. clear_all_items_title
+#: src/bookmarks/dialogs.c:137
+msgid "Clear all bookmarks"
+msgstr ""
+
+#. clear_all_items_title
+#: src/bookmarks/dialogs.c:139
+msgid "Do you really want to remove all bookmarks?"
+msgstr "Wil u regtig alle boekmerke skrap?"
+
+#: src/bookmarks/dialogs.c:254
+msgid "Add folder"
+msgstr "Voeg gids by"
+
+#: src/bookmarks/dialogs.c:254
+msgid "Folder name"
+msgstr "Gidsnaam"
+
+#: src/bookmarks/dialogs.c:310 src/scripting/lua/core.c:382
+msgid "Edit bookmark"
+msgstr "Wysig boekmerk"
+
+#: src/bookmarks/dialogs.c:461
+msgid "Cannot move folder inside itself"
+msgstr "Kan nie 'n gids in homself inskuif nie"
+
+#: src/bookmarks/dialogs.c:462
+msgid ""
+"You are trying to move the marked folder inside itself. To move the folder "
+"to a different location select the new location before pressing the Move "
+"button."
+msgstr ""
+
+#: src/bookmarks/dialogs.c:468
+msgid "Nothing to move"
+msgstr "Niks om te skuif nie"
+
+#: src/bookmarks/dialogs.c:469
+msgid ""
+"To move bookmarks, first mark all the bookmarks (or folders) you want to "
+"move.  This can be done with the Insert key if you're using the default key-"
+"bindings.  An asterisk will appear near all marked bookmarks.  Now move to "
+"where you want to have the stuff moved to, and press the \"Move\" button."
+msgstr ""
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
+#: src/bookmarks/dialogs.c:487 src/cache/dialogs.c:230
+#: src/globhist/dialogs.c:224 src/protocol/auth/dialogs.c:261
+msgid "~Goto"
+msgstr "~Gaan na"
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons)
+#: src/bookmarks/dialogs.c:488 src/config/dialogs.c:531
+#: src/cookies/dialogs.c:476
+msgid "~Edit"
+msgstr "~Redigeer"
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
+#: src/bookmarks/dialogs.c:489 src/cache/dialogs.c:231
+#: src/config/dialogs.c:533 src/config/dialogs.c:960 src/cookies/dialogs.c:477
+#: src/dialogs/menu.c:457 src/formhist/dialogs.c:211
+#: src/globhist/dialogs.c:229 src/protocol/auth/dialogs.c:263
+msgid "~Delete"
+msgstr "~Skrap"
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/menu.c:ext_menu)
+#: src/bookmarks/dialogs.c:490 src/config/dialogs.c:532
+#: src/config/dialogs.c:959 src/cookies/dialogs.c:474 src/dialogs/menu.c:455
+msgid "~Add"
+msgstr "~Voeg by"
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons)
+#: src/bookmarks/dialogs.c:491
+msgid "Add se~parator"
+msgstr "Voeg ~skeier in"
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons)
+#: src/bookmarks/dialogs.c:492
+msgid "Add ~folder"
+msgstr "Voeg ~gids by"
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons)
+#: src/bookmarks/dialogs.c:493
+msgid "~Move"
+msgstr "~Skuif"
+
+#. accelerator_context(src/bookmarks/dialogs.c:bookmark_buttons, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/dialogs/menu.c:view_menu, src/globhist/dialogs.c:globhist_buttons)
+#: src/bookmarks/dialogs.c:494 src/cache/dialogs.c:232
+#: src/config/dialogs.c:534 src/config/dialogs.c:962 src/dialogs/menu.c:408
+#: src/globhist/dialogs.c:230
+msgid "~Search"
+msgstr "Soe~k"
+
+#. This one is too dangerous, so just let user delete
+#. * the bookmarks file if needed. --Zas
+#: src/bookmarks/dialogs.c:498
+msgid "Clear"
+msgstr "Maak skoon"
+
+#. TODO: Would this be useful? --jonas
+#: src/bookmarks/dialogs.c:501 src/globhist/dialogs.c:235
+msgid "Save"
+msgstr "Stoor"
+
+#: src/bookmarks/dialogs.c:507
+msgid "Bookmark manager"
+msgstr "Boekmerkbestuurder"
+
+#: src/bookmarks/dialogs.c:632
+msgid "Search bookmarks"
+msgstr "Deursoek boekmerke"
+
+#: src/bookmarks/dialogs.c:661
+msgid "Add bookmark"
+msgstr "Voeg boekmerk by"
+
+#: src/bookmarks/dialogs.c:697
+msgid "Saved session"
+msgstr "Gestoorde sessie"
+
+#: src/bookmarks/dialogs.c:705
+msgid "Bookmark tabs"
+msgstr "Stoor oortjies in boekmerke"
+
+#: src/bookmarks/dialogs.c:705
+msgid "Enter folder name"
+msgstr "Tik gidsnaam in"
+
+#: src/cache/dialogs.c:72
+msgid "Proxy URL"
+msgstr "Instaan-URL"
+
+#: src/cache/dialogs.c:77
+msgid "Redirect"
+msgstr "Aanstuur"
+
+#: src/cache/dialogs.c:85 src/config/options.inc:509
+#: src/dialogs/document.c:156 src/protocol/bittorrent/dialogs.c:126
+msgid "Size"
+msgstr "Grootte"
+
+#: src/cache/dialogs.c:87
+msgid "Loaded size"
+msgstr "Gelaaide grootte"
+
+#: src/cache/dialogs.c:90
+msgid "Content type"
+msgstr "Inhoudtipe"
+
+#: src/cache/dialogs.c:94 src/dialogs/document.c:201
+msgid "Last modified"
+msgstr "Laas gewysig"
+
+#: src/cache/dialogs.c:102 src/dialogs/document.c:183
+msgid "SSL Cipher"
+msgstr ""
+
+#: src/cache/dialogs.c:106 src/dialogs/document.c:188
+msgid "Encoding"
+msgstr "Enkodering"
+
+#: src/cache/dialogs.c:112
+msgid "Flags"
+msgstr "Vlae"
+
+#: src/cache/dialogs.c:115 src/dialogs/document.c:159
+msgid "incomplete"
+msgstr "onvolledig"
+
+#: src/cache/dialogs.c:118 src/protocol/auth/dialogs.c:182
+msgid "invalid"
+msgstr "ongeldig"
+
+#: src/cache/dialogs.c:125 src/cookies/dialogs.c:40 src/cookies/dialogs.c:44
+#: src/cookies/dialogs.c:353
+msgid "Expires"
+msgstr "Verval"
+
+#: src/cache/dialogs.c:131
+msgid "ID"
+msgstr "ID"
+
+#: src/cache/dialogs.c:134 src/config/options.inc:713
+msgid "Header"
+msgstr "Kop"
+
+#. cant_delete_item
+#: src/cache/dialogs.c:187
+#, c-format
+msgid "Sorry, but cache entry \"%s\" cannot be deleted."
+msgstr "Jammer, maar kasitem \"%s\" kan nie geskrap word nie."
+
+#. cant_delete_used_item
+#: src/cache/dialogs.c:189
+#, c-format
+msgid "Sorry, but cache entry \"%s\" is being used by something else."
+msgstr "Jammer, maar kasitem \"%s\" word deur iets anders gebruik."
+
+#. delete_marked_items_title
+#: src/cache/dialogs.c:195
+msgid "Delete marked cache entries"
+msgstr "Skrap gemerkte kasitem"
+
+#. delete_marked_items
+#: src/cache/dialogs.c:197
+msgid "Delete marked cache entries?"
+msgstr "Skrap gemerkte kasitem?"
+
+#. delete_item_title
+#: src/cache/dialogs.c:203
+msgid "Delete cache entry"
+msgstr "Skrap kasitem"
+
+#: src/cache/dialogs.c:205
+#, c-format
+msgid "Delete this cache entry?"
+msgstr "Skrap hierdie kasitem?"
+
+#. accelerator_context(display_download, src/cache/dialogs.c:cache_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/dialogs/download.c:download_buttons, src/formhist/dialogs.c:formhist_buttons, src/globhist/dialogs.c:globhist_buttons, src/protocol/auth/dialogs.c:auth_buttons)
+#: src/cache/dialogs.c:229 src/config/dialogs.c:530 src/cookies/dialogs.c:473
+#: src/dialogs/download.c:255 src/dialogs/download.c:492
+#: src/formhist/dialogs.c:210 src/globhist/dialogs.c:225
+#: src/protocol/auth/dialogs.c:262
+msgid "~Info"
+msgstr "~Info"
+
+#: src/cache/dialogs.c:237
+msgid "Cache manager"
+msgstr "Kasbestuurder"
+
+#. Please keep these tables in alphabetical order, and in sync with
+#. * the ACT_* constants in kbdbind.h.
+#. These two actions are common over all keymaps:
+#: src/config/actions-edit.inc:5 src/config/actions-main.inc:5
+#: src/config/actions-menu.inc:5
+msgid "Do nothing"
+msgstr "Doen niks"
+
+#: src/config/actions-edit.inc:7
+msgid "Attempt to auto-complete the input"
+msgstr ""
+
+#: src/config/actions-edit.inc:8
+msgid "Attempt to auto-complete a local file"
+msgstr ""
+
+#: src/config/actions-edit.inc:9
+msgid "Attempt to unambiguously auto-complete the input"
+msgstr ""
+
+#: src/config/actions-edit.inc:10
+msgid "Delete character in front of the cursor"
+msgstr ""
+
+#: src/config/actions-edit.inc:11
+msgid "Go to the first line of the buffer"
+msgstr ""
+
+#: src/config/actions-edit.inc:12 src/config/actions-menu.inc:8
+msgid "Cancel current state"
+msgstr ""
+
+#: src/config/actions-edit.inc:13 src/config/actions-main.inc:19
+msgid "Copy text to clipboard"
+msgstr ""
+
+#: src/config/actions-edit.inc:14
+msgid "Delete text from clipboard"
+msgstr ""
+
+#: src/config/actions-edit.inc:15 src/config/actions-menu.inc:9
+msgid "Delete character under cursor"
+msgstr ""
+
+#: src/config/actions-edit.inc:16 src/config/actions-menu.inc:10
+msgid "Move cursor downwards"
+msgstr ""
+
+#: src/config/actions-edit.inc:17 src/config/actions-menu.inc:11
+msgid "Go to the end of the page/line"
+msgstr ""
+
+#: src/config/actions-edit.inc:18
+msgid "Go to the last line of the buffer"
+msgstr ""
+
+#: src/config/actions-edit.inc:19 src/config/actions-main.inc:47
+#: src/config/actions-menu.inc:12
+msgid "Follow the current link"
+msgstr ""
+
+#: src/config/actions-edit.inc:20 src/config/actions-menu.inc:14
+msgid "Go to the start of the page/line"
+msgstr ""
+
+#: src/config/actions-edit.inc:21
+msgid "Delete to beginning of line"
+msgstr ""
+
+#: src/config/actions-edit.inc:22
+msgid "Delete to end of line"
+msgstr ""
+
+#: src/config/actions-edit.inc:23
+msgid "Delete backwards to start of word"
+msgstr ""
+
+#: src/config/actions-edit.inc:24 src/config/actions-menu.inc:15
+msgid "Move the cursor left"
+msgstr ""
+
+#: src/config/actions-edit.inc:25
+msgid "Move cursor before current word"
+msgstr ""
+
+#: src/config/actions-edit.inc:26
+msgid "Move cursor after current word"
+msgstr ""
+
+#: src/config/actions-edit.inc:27 src/config/actions-menu.inc:17
+msgid "Move to the next item"
+msgstr ""
+
+#: src/config/actions-edit.inc:28
+msgid "Open in external editor"
+msgstr ""
+
+#: src/config/actions-edit.inc:29
+msgid "Paste text from the clipboard"
+msgstr ""
+
+#: src/config/actions-edit.inc:30 src/config/actions-menu.inc:20
+msgid "Move to the previous item"
+msgstr ""
+
+#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79
+#: src/config/actions-menu.inc:21
+msgid "Redraw the terminal"
+msgstr ""
+
+#: src/config/actions-edit.inc:32 src/config/actions-menu.inc:22
+msgid "Move the cursor right"
+msgstr ""
+
+#: src/config/actions-edit.inc:33
+msgid "Toggle regex matching (type-ahead searching)"
+msgstr ""
+
+#: src/config/actions-edit.inc:34 src/config/actions-menu.inc:26
+msgid "Move cursor upwards"
+msgstr ""
+
+#: src/config/actions-main.inc:8
+msgid "Abort connection"
+msgstr ""
+
+#: src/config/actions-main.inc:9
+msgid "Add a new bookmark"
+msgstr ""
+
+#: src/config/actions-main.inc:10
+msgid "Add a new bookmark using current link"
+msgstr ""
+
+#: src/config/actions-main.inc:11
+msgid "Bookmark all open tabs"
+msgstr ""
+
+#: src/config/actions-main.inc:12
+msgid "Open authentication manager"
+msgstr "Open magtigingbestuurder"
+
+#: src/config/actions-main.inc:13
+msgid "Backspace the last entered digit of the current prefix"
+msgstr ""
+
+#: src/config/actions-main.inc:14
+msgid "Open bookmark manager"
+msgstr ""
+
+#: src/config/actions-main.inc:15
+msgid "Open cache manager"
+msgstr ""
+
+#: src/config/actions-main.inc:16
+msgid "Free unused cache entries"
+msgstr ""
+
+#: src/config/actions-main.inc:17
+msgid "Open cookie manager"
+msgstr ""
+
+#: src/config/actions-main.inc:18
+msgid "Reload cookies file"
+msgstr ""
+
+#: src/config/actions-main.inc:20
+msgid "Show information about the current page"
+msgstr ""
+
+#: src/config/actions-main.inc:21
+msgid "Open download manager"
+msgstr ""
+
+#: src/config/actions-main.inc:22
+msgid "Enter ex-mode (command line)"
+msgstr ""
+
+#: src/config/actions-main.inc:23
+msgid "Open the File menu"
+msgstr ""
+
+#: src/config/actions-main.inc:24
+msgid "Find the next occurrence of the current search text"
+msgstr ""
+
+#: src/config/actions-main.inc:25
+msgid "Find the previous occurrence of the current search text"
+msgstr ""
+
+#: src/config/actions-main.inc:26
+msgid "Forget authentication credentials"
+msgstr ""
+
+#: src/config/actions-main.inc:27
+msgid "Open form history manager"
+msgstr ""
+
+#: src/config/actions-main.inc:28
+msgid "Pass URI of current frame to external command"
+msgstr ""
+
+#: src/config/actions-main.inc:29
+msgid "Maximize the current frame"
+msgstr ""
+
+#: src/config/actions-main.inc:30
+msgid "Move to the next frame"
+msgstr ""
+
+#: src/config/actions-main.inc:31
+msgid "Move to the previous frame"
+msgstr ""
+
+#: src/config/actions-main.inc:32
+msgid "Open \"Go to URL\" dialog box"
+msgstr ""
+
+#: src/config/actions-main.inc:33
+msgid "Open \"Go to URL\" dialog box containing the current URL"
+msgstr ""
+
+#: src/config/actions-main.inc:34
+msgid "Open \"Go to URL\" dialog box containing the current link URL"
+msgstr ""
+
+#: src/config/actions-main.inc:35
+msgid "Go to the homepage"
+msgstr ""
+
+#: src/config/actions-main.inc:36
+msgid "Show information about the current page protocol headers"
+msgstr ""
+
+#: src/config/actions-main.inc:37
+msgid "Open history manager"
+msgstr ""
+
+#: src/config/actions-main.inc:38
+msgid "Return to the previous document in history"
+msgstr ""
+
+#: src/config/actions-main.inc:39
+msgid "Go forward in history"
+msgstr ""
+
+#: src/config/actions-main.inc:40
+msgid "Jump to link"
+msgstr ""
+
+#: src/config/actions-main.inc:41
+msgid "Open keybinding manager"
+msgstr ""
+
+#: src/config/actions-main.inc:42
+msgid "Kill all backgrounded connections"
+msgstr ""
+
+#: src/config/actions-main.inc:43
+msgid "Download the current link"
+msgstr ""
+
+#: src/config/actions-main.inc:44
+msgid "Download the current image"
+msgstr ""
+
+#: src/config/actions-main.inc:45
+msgid "Attempt to resume download of the current link"
+msgstr ""
+
+#: src/config/actions-main.inc:46
+msgid "Pass URI of current link to external command"
+msgstr ""
+
+#: src/config/actions-main.inc:48
+msgid "Follow the current link, forcing reload of the target"
+msgstr ""
+
+#: src/config/actions-main.inc:49
+msgid "Open the link context menu"
+msgstr ""
+
+#: src/config/actions-main.inc:50
+msgid "Open the form fields menu"
+msgstr ""
+
+#: src/config/actions-main.inc:51
+msgid "Open a Lua console"
+msgstr ""
+
+#: src/config/actions-main.inc:52
+msgid "Go at a specified mark"
+msgstr ""
+
+#: src/config/actions-main.inc:53
+msgid "Set a mark"
+msgstr ""
+
+#: src/config/actions-main.inc:54
+msgid "Activate the menu"
+msgstr ""
+
+#: src/config/actions-main.inc:55
+msgid "Move cursor down"
+msgstr ""
+
+#: src/config/actions-main.inc:56
+msgid "Move cursor left"
+msgstr ""
+
+#: src/config/actions-main.inc:57
+msgid "Move cursor right"
+msgstr ""
+
+#: src/config/actions-main.inc:58
+msgid "Move cursor up"
+msgstr ""
+
+#: src/config/actions-main.inc:59
+msgid "Move to the end of the document"
+msgstr ""
+
+#: src/config/actions-main.inc:60
+msgid "Move to the start of the document"
+msgstr ""
+
+#: src/config/actions-main.inc:61
+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"
+msgstr ""
+
+#: src/config/actions-main.inc:64
+msgid "Move to the previous link"
+msgstr ""
+
+#: src/config/actions-main.inc:65
+msgid "Move one link right"
+msgstr ""
+
+#: src/config/actions-main.inc:66
+msgid "Move one link up"
+msgstr ""
+
+#: src/config/actions-main.inc:67 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
+msgid "Move upwards by a page"
+msgstr ""
+
+#: src/config/actions-main.inc:69
+msgid "Open the current link in a new tab"
+msgstr "Open die huidige skakel in 'n nuwe oortjie"
+
+#: src/config/actions-main.inc:70
+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
+msgid "Open the current link in a new window"
+msgstr "Open die huidige skakel in 'n nuwe venster"
+
+#: src/config/actions-main.inc:72
+msgid "Open a new tab"
+msgstr "Open 'n nuwe oortjie"
+
+#: src/config/actions-main.inc:73
+msgid "Open a new tab in the background"
+msgstr "Open 'n nuwe agtergrondoortjie"
+
+#: src/config/actions-main.inc:74
+msgid "Open a new window"
+msgstr "Open 'n nuwe venster"
+
+#: src/config/actions-main.inc:75
+msgid "Open an OS shell"
+msgstr ""
+
+#: src/config/actions-main.inc:76
+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
+msgid "Quit without confirmation"
+msgstr ""
+
+#: src/config/actions-main.inc:80
+msgid "Reload the current page"
+msgstr ""
+
+#: src/config/actions-main.inc:81
+msgid "Re-render the current page"
+msgstr ""
+
+#: src/config/actions-main.inc:82
+msgid "Reset form items to their initial values"
+msgstr ""
+
+#: src/config/actions-main.inc:83
+msgid "Show information about the currently used resources"
+msgstr ""
+
+#: src/config/actions-main.inc:84
+msgid "Save the current document in source form"
+msgstr ""
+
+#: src/config/actions-main.inc:85
+msgid "Save the current document in formatted form"
+msgstr ""
+
+#: src/config/actions-main.inc:86
+msgid "Save options"
+msgstr "Stoor keuses"
+
+#: src/config/actions-main.inc:87
+msgid "Save URL as"
+msgstr "Stoor URL as"
+
+#: src/config/actions-main.inc:88
+msgid "Scroll down"
+msgstr ""
+
+#: src/config/actions-main.inc:89
+msgid "Scroll left"
+msgstr ""
+
+#: src/config/actions-main.inc:90
+msgid "Scroll right"
+msgstr ""
+
+#: src/config/actions-main.inc:91
+msgid "Scroll up"
+msgstr ""
+
+#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23
+msgid "Search for a text pattern"
+msgstr ""
+
+#: src/config/actions-main.inc:93
+msgid "Search backwards for a text pattern"
+msgstr ""
+
+#: src/config/actions-main.inc:94 src/config/actions-main.inc:95
+msgid "Search link text by typing ahead"
+msgstr ""
+
+#: src/config/actions-main.inc:96
+msgid "Search document text by typing ahead"
+msgstr ""
+
+#: src/config/actions-main.inc:97
+msgid "Search document text backwards by typing ahead"
+msgstr ""
+
+#: src/config/actions-main.inc:98
+msgid "Show terminal options dialog"
+msgstr ""
+
+#: src/config/actions-main.inc:99
+msgid "Submit form"
+msgstr ""
+
+#: src/config/actions-main.inc:100
+msgid "Submit form and reload"
+msgstr ""
+
+#: src/config/actions-main.inc:101 src/terminal/tab.c:203
+#: src/terminal/tab.c:246
+msgid "Close tab"
+msgstr "Sluit oortjie"
+
+#: src/config/actions-main.inc:102
+msgid "Close all tabs but the current one"
+msgstr "Sluit alle oortjies behalwe die huidige een"
+
+#: src/config/actions-main.inc:103
+msgid "Pass URI of current tab to external command"
+msgstr ""
+
+#: src/config/actions-main.inc:104
+msgid "Open the tab menu"
+msgstr ""
+
+#: src/config/actions-main.inc:105
+msgid "Move the current tab to the left"
+msgstr ""
+
+#: src/config/actions-main.inc:106
+msgid "Move the current tab to the right"
+msgstr ""
+
+#: src/config/actions-main.inc:107
+msgid "Next tab"
+msgstr "Volgende oortjie"
+
+#: src/config/actions-main.inc:108
+msgid "Previous tab"
+msgstr "Vorige oortjie"
+
+#: src/config/actions-main.inc:109
+msgid "Open the terminal resize dialog"
+msgstr ""
+
+#: src/config/actions-main.inc:110
+msgid "Toggle rendering of page using CSS"
+msgstr ""
+
+#: src/config/actions-main.inc:111
+msgid "Toggle displaying of links to images"
+msgstr "Wissel die vertoon van skakels na prente"
+
+#: src/config/actions-main.inc:112
+msgid "Toggle rendering of tables"
+msgstr ""
+
+#: src/config/actions-main.inc:113
+msgid "Toggle usage of document specific colors"
+msgstr ""
+
+#: src/config/actions-main.inc:114
+msgid "Toggle rendering page as HTML / plain text"
+msgstr ""
+
+#: src/config/actions-main.inc:115
+msgid "Toggle mouse handling"
+msgstr ""
+
+#: src/config/actions-main.inc:116
+msgid "Toggle displaying of links numbers"
+msgstr "Wissel die vertoon van skakelnommers"
+
+#: src/config/actions-main.inc:117
+msgid "Toggle plain renderer compression of empty lines"
+msgstr ""
+
+#: src/config/actions-main.inc:118
+msgid "Toggle wrapping of text"
+msgstr ""
+
+#: src/config/actions-main.inc:119
+msgid "View the current image"
+msgstr ""
+
+#: src/config/actions-menu.inc:13
+msgid "Expand item"
+msgstr "Laat item oopvou"
+
+#: src/config/actions-menu.inc:16
+msgid "Mark item"
+msgstr ""
+
+#: src/config/actions-menu.inc:24
+msgid "Select current highlighted item"
+msgstr ""
+
+#: src/config/actions-menu.inc:25
+msgid "Collapse item"
+msgstr ""
+
+#: src/config/cmdline.c:91
+#, c-format
+msgid "Cannot parse option %s: %s"
+msgstr ""
+
+#: src/config/cmdline.c:114
+#, c-format
+msgid "Unknown option %s"
+msgstr ""
+
+#: src/config/cmdline.c:132 src/config/cmdline.c:156 src/config/cmdline.c:224
+#: src/config/opttypes.c:38
+msgid "Parameter expected"
+msgstr ""
+
+#: src/config/cmdline.c:157
+msgid "Too many parameters"
+msgstr ""
+
+#: src/config/cmdline.c:162
+msgid "error"
+msgstr ""
+
+#: src/config/cmdline.c:164 src/network/state.c:47
+msgid "Host not found"
+msgstr ""
+
+#: src/config/cmdline.c:178
+msgid "Resolver error"
+msgstr ""
+
+#: src/config/cmdline.c:329
+msgid "Remote method not supported"
+msgstr ""
+
+#: src/config/cmdline.c:381
+msgid "Template option folder"
+msgstr ""
+
+#: src/config/cmdline.c:404
+#, c-format
+msgid "(default: %ld)"
+msgstr "(verstek: %ld)"
+
+#: src/config/cmdline.c:411 src/config/cmdline.c:440
+#, c-format
+msgid "(default: \"%s\")"
+msgstr "(verstek: \"%s\")"
+
+#: src/config/cmdline.c:416
+#, c-format
+msgid "(alias for %s)"
+msgstr ""
+
+#: src/config/cmdline.c:421 src/config/cmdline.c:430
+#, c-format
+msgid "(default: %s)"
+msgstr "(verstek: %s)"
+
+#: src/config/cmdline.c:564
+msgid "Configuration options"
+msgstr "Opstellingkeuses"
+
+#: src/config/cmdline.c:568
+msgid "Usage: elinks [OPTION]... [URL]..."
+msgstr "Gebruik: elinks [KEUSE]... [URL]..."
+
+#: src/config/cmdline.c:569
+msgid "Options"
+msgstr "Keuses"
+
+#: src/config/cmdline.c:611
+msgid "Internal consistency error"
+msgstr ""
+
+#.
+#: src/config/cmdline.c:647
+msgid "Restrict to anonymous mode"
+msgstr ""
+
+#: src/config/cmdline.c:649
+msgid ""
+"Restricts ELinks so it can run on an anonymous account.\n"
+"Local file browsing, downloads, and modification of options\n"
+"will be disabled. Execution of viewers is allowed, but entries\n"
+"in the association table can't be added or modified."
+msgstr ""
+
+#: src/config/cmdline.c:654
+msgid "Autosubmit first form"
+msgstr ""
+
+#: src/config/cmdline.c:656
+msgid "Automatically submit the first form in the given URLs."
+msgstr ""
+
+#: src/config/cmdline.c:658
+msgid "Clone internal session with given ID"
+msgstr ""
+
+#: src/config/cmdline.c:660
+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:666
+msgid "Name of directory with configuration file"
+msgstr ""
+
+#: src/config/cmdline.c:668
+msgid ""
+"Path of the directory ELinks will read and write its\n"
+"config and runtime state files to instead of ~/.elinks.\n"
+"If the path does not begin with a '/' it is assumed to be\n"
+"relative to your HOME directory."
+msgstr ""
+
+#: src/config/cmdline.c:673
+msgid "Print default configuration file to stdout"
+msgstr ""
+
+#: src/config/cmdline.c:675
+msgid ""
+"Print a configuration file with options set to the built-in\n"
+"defaults to stdout."
+msgstr ""
+
+#: src/config/cmdline.c:680
+msgid "Name of configuration file"
+msgstr ""
+
+#: src/config/cmdline.c:682
+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:686
+msgid "Print help for configuration options"
+msgstr ""
+
+#: src/config/cmdline.c:688
+msgid "Print help for configuration options and exit."
+msgstr ""
+
+#: src/config/cmdline.c:690
+msgid "MIME type assumed for unknown document types"
+msgstr ""
+
+#: src/config/cmdline.c:692
+msgid "The default MIME type used for documents of unknown type."
+msgstr ""
+
+#: src/config/cmdline.c:694
+msgid "Ignore user-defined keybindings"
+msgstr ""
+
+#: src/config/cmdline.c:696
+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:700
+msgid "Print formatted versions of given URLs to stdout"
+msgstr ""
+
+#: src/config/cmdline.c:702
+msgid "Print formatted plain-text versions of given URLs to stdout."
+msgstr ""
+
+#: src/config/cmdline.c:704
+msgid "Codepage to use with -dump"
+msgstr ""
+
+#: src/config/cmdline.c:706
+msgid "Codepage used when formatting dump output."
+msgstr ""
+
+#: src/config/cmdline.c:708
+msgid "Color mode used with -dump"
+msgstr ""
+
+#: src/config/cmdline.c:710
+msgid "Color mode used with -dump."
+msgstr ""
+
+#: src/config/cmdline.c:712
+msgid "Width of document formatted with -dump"
+msgstr ""
+
+#: src/config/cmdline.c:714
+msgid "Width of the dump output."
+msgstr ""
+
+#: src/config/cmdline.c:716
+msgid "Evaluate configuration file directive"
+msgstr ""
+
+#: src/config/cmdline.c:718
+msgid ""
+"Specify configuration file directives on the command-line\n"
+"which will be evaluated after all configuration files has been\n"
+"read. Example usage:\n"
+"\t-eval 'set protocol.file.allow_special_files = 1'"
+msgstr ""
+
+#. lynx compatibility
+#: src/config/cmdline.c:724
+msgid "Interpret documents of unknown types as HTML"
+msgstr ""
+
+#: src/config/cmdline.c:726
+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:736
+msgid "Print usage help and exit"
+msgstr ""
+
+#: src/config/cmdline.c:738
+msgid "Print usage help and exit."
+msgstr ""
+
+#: src/config/cmdline.c:740
+msgid "Only permit local connections"
+msgstr ""
+
+#: src/config/cmdline.c:742
+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:746
+msgid "Print detailed usage help and exit"
+msgstr ""
+
+#: src/config/cmdline.c:748
+msgid "Print detailed usage help and exit."
+msgstr ""
+
+#: src/config/cmdline.c:750
+msgid "Look up specified host"
+msgstr ""
+
+#: src/config/cmdline.c:752
+msgid "Look up specified host and print all DNS resolved IP addresses."
+msgstr ""
+
+#: src/config/cmdline.c:754
+msgid "Run as separate instance"
+msgstr ""
+
+#: src/config/cmdline.c:756
+msgid ""
+"Run ELinks as a separate instance instead of connecting to an\n"
+"existing instance. Note that normally no runtime state files\n"
+"(bookmarks, history, etc.) are written to the disk when this\n"
+"option is used. See also -touch-files."
+msgstr ""
+
+#: src/config/cmdline.c:761
+msgid "Disable use of files in ~/.elinks"
+msgstr ""
+
+#: src/config/cmdline.c:763
+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:767
+msgid "Disable link numbering in dump output"
+msgstr ""
+
+#: src/config/cmdline.c:769
+msgid ""
+"Prevents printing of link number in dump output.\n"
+"Note that this really affects only -dump, nothing else."
+msgstr ""
+
+#: src/config/cmdline.c:772
+msgid "Disable printing of link references in dump output"
+msgstr ""
+
+#: src/config/cmdline.c:774
+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:778
+msgid "Control an already running ELinks"
+msgstr ""
+
+#: src/config/cmdline.c:780
+msgid ""
+"Control a remote ELinks instance by passing commands to it.\n"
+"The option takes an additional argument containing the method\n"
+"which should be invoked and any parameters that should be passed\n"
+"to it. For ease of use, the additional method argument can be\n"
+"omitted in which case any URL arguments will be opened in new\n"
+"tabs in the remote instance.\n"
+"Following is a list of the supported methods:\n"
+"\tping()                    : look for a remote instance\n"
+"\topenURL()                 : prompt URL in current tab\n"
+"\topenURL(URL)              : open URL in current tab\n"
+"\topenURL(URL, new-tab)     : open URL in new tab\n"
+"\topenURL(URL, new-window)  : open URL in new window\n"
+"\taddBookmark(URL)          : bookmark URL\n"
+"\tinfoBox(text)             : show text in a message box\n"
+"\txfeDoCommand(openBrowser) : open new window"
+msgstr ""
+
+#: src/config/cmdline.c:796
+msgid "Connect to session ring with given ID"
+msgstr ""
+
+#: src/config/cmdline.c:798
+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"
+"are interconnected and share state (cache, bookmarks, cookies,\n"
+"and so on). By default, all ELinks instances connect to session\n"
+"ring 0. You can change that behaviour with this switch and form as\n"
+"many session rings as you want. Obviously, if the session-ring with\n"
+"this number doesn't exist yet, it's created and this ELinks instance\n"
+"will become the master instance (that usually doesn't matter for you\n"
+"as a user much). Note that you usually don't want to use this unless\n"
+"you're a developer and you want to do some testing - if you want the\n"
+"ELinks instances each running standalone, rather use the -no-connect\n"
+"command-line option. Also note that normally no runtime state files\n"
+"are written to the disk when this option is used. See also\n"
+"-touch-files."
+msgstr ""
+
+#: src/config/cmdline.c:813
+msgid "Print the source of given URLs to stdout"
+msgstr ""
+
+#: src/config/cmdline.c:815
+msgid "Print given URLs in source form to stdout."
+msgstr ""
+
+#: src/config/cmdline.c:819
+msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring"
+msgstr ""
+
+#: src/config/cmdline.c:821
+msgid ""
+"When enabled, runtime state files (bookmarks, history, etc.) are\n"
+"written to disk, even when -no-connect or -session-ring is used.\n"
+"The option has no effect if not used in conjunction with any of\n"
+"these options."
+msgstr ""
+
+#: src/config/cmdline.c:826
+msgid "Verbose level"
+msgstr ""
+
+#: src/config/cmdline.c:828
+msgid ""
+"The verbose level controls what messages are shown at\n"
+"start up and while running:\n"
+"\t0 means only show serious errors\n"
+"\t1 means show serious errors and warnings\n"
+"\t2 means show all messages"
+msgstr ""
+
+#: src/config/cmdline.c:834
+msgid "Print version information and exit"
+msgstr ""
+
+#: src/config/cmdline.c:836
+msgid "Print ELinks version information and exit."
+msgstr ""
+
+#: src/config/conf.c:720
+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"
+"## options through UI, however only option values will be altered\n"
+"## and all your formatting, own comments etc will be kept as-is.\n"
+msgstr ""
+
+#: src/config/conf.c:728
+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"
+"## options through UI, however only option values will be altered\n"
+"## and missing options will be added at the end of file; if option\n"
+"## is not written in this file, but in some file included from it,\n"
+"## it is NOT counted as missing. Note that all your formatting,\n"
+"## own comments and so on will be kept as-is.\n"
+msgstr ""
+
+#: src/config/conf.c:738
+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"
+"## by ELinks when you save options through UI and you are out of\n"
+"## luck with your formatting and own comments then, so beware.\n"
+msgstr ""
+
+#: src/config/conf.c:749
+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:762
+msgid "Automatically saved options\n"
+msgstr ""
+
+#: src/config/conf.c:774
+msgid "Automatically saved keybindings\n"
+msgstr ""
+
+#: src/config/dialogs.c:54
+msgid "Write config success"
+msgstr "Keuseskryfsukses"
+
+#: src/config/dialogs.c:55
+#, c-format
+msgid "Options were saved successfully to config file %s."
+msgstr "Keuses is suksesvol gestuur na keuselĂŞer %s."
+
+#. accelerator_context(write_config_dialog)
+#: src/config/dialogs.c:59
+msgid "~Do not show anymore"
+msgstr "~Moet nie meer wys nie"
+
+#: src/config/dialogs.c:65
+msgid "Cannot read the file"
+msgstr "Kan nie die lĂŞer lees nie"
+
+#: src/config/dialogs.c:68
+msgid "Cannot get file status"
+msgstr "Kan nie lĂŞerstatus bepaal nie"
+
+#: src/config/dialogs.c:71
+msgid "Cannot access the file"
+msgstr "Kan nie toegang kry tot lĂŞer nie"
+
+#: src/config/dialogs.c:74
+msgid "Cannot create temp file"
+msgstr "Kan nie tydelike lĂŞer skep nie"
+
+#: src/config/dialogs.c:77
+msgid "Cannot rename the file"
+msgstr "Kan nie lĂŞer hernoem nie"
+
+#: src/config/dialogs.c:80
+msgid "File saving disabled by option"
+msgstr ""
+
+#: src/config/dialogs.c:83 src/network/state.c:46
+msgid "Out of memory"
+msgstr "Onvoldoende geheue"
+
+#: src/config/dialogs.c:86
+msgid "Cannot write the file"
+msgstr "Kan nie die lĂŞer skryf nie"
+
+#: src/config/dialogs.c:91
+msgid "Secure file saving error"
+msgstr ""
+
+#: src/config/dialogs.c:99
+msgid "Write config error"
+msgstr ""
+
+#: src/config/dialogs.c:100
+#, c-format
+msgid ""
+"Unable to write to config file %s.\n"
+"%s"
+msgstr ""
+
+#: src/config/dialogs.c:155
+msgid "modified"
+msgstr "gewysig"
+
+#: src/config/dialogs.c:174
+msgid "(expand by pressing space)"
+msgstr "(druk spasie om oop te vou)"
+
+#: src/config/dialogs.c:177 src/config/dialogs.c:360
+#: src/config/options.inc:863
+msgid "Type"
+msgstr "Soort"
+
+#: src/config/dialogs.c:202 src/config/dialogs.c:389 src/cookies/dialogs.c:35
+#: src/cookies/dialogs.c:351
+msgid "Value"
+msgstr "Waarde"
+
+#: src/config/dialogs.c:206
+msgid ""
+"\n"
+"\n"
+"This value has been changed since you last saved your configuration."
+msgstr ""
+"\n"
+"\n"
+"Hierdie waarde is verander sedert u opstelling laas gestoor is."
+
+#: src/config/dialogs.c:212 src/config/dialogs.c:364
+msgid "N/A"
+msgstr ""
+
+#: src/config/dialogs.c:214 src/config/dialogs.c:362
+msgid "Description"
+msgstr "Beskrywing"
+
+#: src/config/dialogs.c:321 src/protocol/bittorrent/dialogs.c:599
+#: src/protocol/protocol.c:230 src/session/session.c:287
+#: src/session/session.c:969 src/viewer/text/textarea.c:570
+#: src/viewer/text/textarea.c:577
+msgid "Error"
+msgstr "Fout"
+
+#: src/config/dialogs.c:322
+msgid "Bad option value."
+msgstr ""
+
+#: src/config/dialogs.c:350 src/config/dialogs.c:418 src/cookies/dialogs.c:323
+msgid "Edit"
+msgstr "Redigeer"
+
+#: src/config/dialogs.c:419
+msgid ""
+"This option cannot be edited. This means that this is some special option "
+"like a folder - try to press a space in order to see its contents."
+msgstr ""
+"Hierdie keuse kan nie gewysig word nie. Dit beteken dat hierdie 'n spesiale "
+"keuse is, soos 'n gids - probeer spasie om die inhoud te sien."
+
+#: src/config/dialogs.c:461
+msgid ""
+"Option names may only contain alpha-numeric characters\n"
+"in addition to '_' and '-'."
+msgstr ""
+
+#: src/config/dialogs.c:482 src/config/dialogs.c:507
+msgid "Add option"
+msgstr "Voeg keuse by"
+
+#: src/config/dialogs.c:483
+msgid "Cannot add an option here."
+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: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
+msgid "Sa~ve"
+msgstr "Stoo~r"
+
+#: src/config/dialogs.c:540
+msgid "Option manager"
+msgstr "Keusebestuurder"
+
+#: src/config/dialogs.c:702
+msgid "Keystroke"
+msgstr "Sleutel"
+
+#: src/config/dialogs.c:704 src/config/options.inc:1223
+msgid "Action"
+msgstr "Aksie"
+
+#: src/config/dialogs.c:705
+msgid "Keymap"
+msgstr ""
+
+#: src/config/dialogs.c:844
+msgid "Keystroke already used"
+msgstr "Sleutel reeds in gebruik"
+
+#: src/config/dialogs.c:845
+#, c-format
+msgid ""
+"The keystroke \"%s\" is currently used for \"%s\".\n"
+"Are you sure you want to replace it?"
+msgstr ""
+"Die sleutel \"%s\" word tans gebruik vir \"%s\".\n"
+"Is u seker u wil dit vervang?"
+
+#: src/config/dialogs.c:870 src/config/dialogs.c:887 src/config/dialogs.c:923
+msgid "Add keybinding"
+msgstr "Heg kortpadsleutel"
+
+#: src/config/dialogs.c:871
+msgid "Invalid keystroke."
+msgstr "Ongeldige sleutel."
+
+#: src/config/dialogs.c:888
+msgid "Need to select an action."
+msgstr "Moet 'n aksie kies."
+
+#: src/config/dialogs.c:910
+#, c-format
+msgid ""
+"Action: %s\n"
+"Keymap: %s\n"
+"\n"
+"Keystroke should be written in the format: [Shift-][Ctrl-][Alt-]Key\n"
+"Key: a,b,c,...,1,2,3,...,Space,Up,PageDown,Tab,Enter,Insert,F5,...\n"
+"\n"
+"Keystroke"
+msgstr ""
+
+#. accelerator_context(menu_keys, src/config/dialogs.c:keybinding_buttons, src/globhist/dialogs.c:globhist_buttons)
+#: src/config/dialogs.c:961 src/dialogs/info.c:135 src/globhist/dialogs.c:231
+msgid "~Toggle display"
+msgstr "~Wissel vertoonstyl"
+
+#: src/config/dialogs.c:968
+msgid "Keybinding manager"
+msgstr ""
+
+#: src/config/home.c:121
+#, c-format
+msgid ""
+"Commandline options -config-dir set to %s, but could not create directory %s."
+msgstr ""
+
+#: src/config/home.c:126
+#, c-format
+msgid "ELINKS_CONFDIR set to %s, but could not create directory %s."
+msgstr ""
+
+#: src/config/home.c:149
+msgid ""
+"Unable to find or create ELinks config directory. Please check if you have "
+"$HOME variable set correctly and if you have write permission to your home "
+"directory."
+msgstr ""
+
+#: src/config/kbdbind.c:221
+msgid "Main mapping"
+msgstr ""
+
+#: src/config/kbdbind.c:222
+msgid "Edit mapping"
+msgstr ""
+
+#: src/config/kbdbind.c:223
+msgid "Menu mapping"
+msgstr ""
+
+#: src/config/kbdbind.c:588
+msgid "Unrecognised keymap"
+msgstr ""
+
+#: src/config/kbdbind.c:591
+msgid "Error parsing keystroke"
+msgstr ""
+
+#: src/config/kbdbind.c:595
+msgid "Unrecognised action (internal error)"
+msgstr ""
+
+#: src/config/kbdbind.c:611
+msgid "Error registering event"
+msgstr ""
+
+#.
+#: src/config/options.inc:19
+msgid "Configuration system"
+msgstr ""
+
+#: src/config/options.inc:21
+msgid "Configuration handling options."
+msgstr ""
+
+#: src/config/options.inc:23
+msgid "Comments"
+msgstr "Kommentaar"
+
+#: src/config/options.inc:25
+msgid ""
+"Amount of comments automatically written to the config file:\n"
+"0 is no comments are written\n"
+"1 is only the \"blurb\" (name+type) is written\n"
+"2 is only the description is written\n"
+"3 is full comments are written"
+msgstr ""
+
+#: src/config/options.inc:31
+msgid "Indentation"
+msgstr ""
+
+#: src/config/options.inc:33
+msgid ""
+"Shift width of one indentation level in the configuration\n"
+"file. Zero means that no indentation is performed at all\n"
+"when saving the configuration."
+msgstr ""
+
+#: src/config/options.inc:37
+msgid "Saving style"
+msgstr ""
+
+#: src/config/options.inc:39
+msgid ""
+"Determines what happens when you tell ELinks to save options:\n"
+"0 is only values of current options are altered\n"
+"1 is values of current options are altered and missing options\n"
+"     are added at the end of the file\n"
+"2 is the configuration file is rewritten from scratch\n"
+"3 is values of current options are altered and missing options\n"
+"     CHANGED during this ELinks session are added at the end of\n"
+"     the file"
+msgstr ""
+
+#: src/config/options.inc:48
+msgid "Comments localization"
+msgstr ""
+
+#: src/config/options.inc:50
+msgid ""
+"If set to 1, comments in the configuration file will be\n"
+"translated to the language used by UI. Note that if you have\n"
+"different language set in different terminals, the language\n"
+"used in the configuration file MAY be the same as on the\n"
+"terminal where you saved the file, but it should be generally\n"
+"considered unpredictable."
+msgstr ""
+
+#: src/config/options.inc:58
+msgid "Saving style warnings"
+msgstr ""
+
+#: src/config/options.inc:60
+msgid ""
+"This is internal option used when displaying a warning about\n"
+"obsolete config.saving_style. You shouldn't touch it."
+msgstr ""
+
+#: src/config/options.inc:63
+msgid "Show template"
+msgstr ""
+
+#: src/config/options.inc:65
+msgid ""
+"Show template options in autocreated trees in the options\n"
+"manager and save them to the configuration file."
+msgstr ""
+
+#. Keep options in alphabetical order.
+#: src/config/options.inc:71 src/dialogs/info.c:182
+msgid "Connections"
+msgstr "Verbindings"
+
+#: src/config/options.inc:73
+msgid "Connection options."
+msgstr "Verbindingkeuses."
+
+#: src/config/options.inc:76
+msgid "Asynchronous DNS"
+msgstr "Asinchrone DNS"
+
+#: src/config/options.inc:78
+msgid "Whether to use asynchronous DNS resolving."
+msgstr "Of asinchrone DSN gebruik moet word."
+
+#: src/config/options.inc:80
+msgid "Maximum connections"
+msgstr "Maksimum verbindings"
+
+#: src/config/options.inc:82
+msgid "Maximum number of concurrent connections."
+msgstr "Maksimum aantal gelyktydige verbindings."
+
+#: src/config/options.inc:84
+msgid "Maximum connections per host"
+msgstr "Maksimum verbindings per gasheer"
+
+#: src/config/options.inc:86
+msgid "Maximum number of concurrent connections to a given host."
+msgstr "Maksimum aantal gelyktydige verbindings aan 'n spesifieke gasheer."
+
+#: src/config/options.inc:88
+msgid "Connection retries"
+msgstr ""
+
+#: src/config/options.inc:90
+msgid ""
+"Number of tries to establish a connection.\n"
+"Zero means try forever."
+msgstr ""
+
+#: src/config/options.inc:93 src/network/state.c:52
+msgid "Receive timeout"
+msgstr ""
+
+#: src/config/options.inc:95
+msgid "Receive timeout (in seconds)."
+msgstr ""
+
+#: src/config/options.inc:98 src/config/options.inc:108
+msgid "Try IPv4 when connecting"
+msgstr ""
+
+#: src/config/options.inc:100
+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"
+"in the style of e.g. http4://elinks.cz/."
+msgstr ""
+
+#: src/config/options.inc:110
+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"
+"in the style of e.g. http4://elinks.cz/."
+msgstr ""
+
+#: src/config/options.inc:118
+msgid "Try IPv6 when connecting"
+msgstr ""
+
+#: src/config/options.inc:120
+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"
+"in the style of e.g. http6://elinks.cz/."
+msgstr ""
+
+#: src/config/options.inc:126
+msgid "Timeout for non-restartable connections"
+msgstr ""
+
+#: src/config/options.inc:128
+msgid "Timeout for non-restartable connections (in seconds)."
+msgstr ""
+
+#. Keep options in alphabetical order.
+#: src/config/options.inc:134
+msgid "Document"
+msgstr "Dokument"
+
+#: src/config/options.inc:136
+msgid "Document options."
+msgstr "Dokumentkeuses."
+
+#: src/config/options.inc:138
+msgid "Browsing"
+msgstr "Blaai"
+
+#: src/config/options.inc:140
+msgid "Document browsing options (mainly interactivity)."
+msgstr "Keuses vir blaai van dokumente (hoofsaaklik interaktiwiteit)."
+
+#: src/config/options.inc:143
+msgid "Access keys"
+msgstr "Toegansleutels"
+
+#: src/config/options.inc:145
+msgid ""
+"Options for handling of link access keys.\n"
+"An HTML document can use the ACCESSKEY attribute to assign\n"
+"an access key to an element. When an access key is pressed,\n"
+"the corresponding element will be given focus."
+msgstr ""
+
+#: src/config/options.inc:150
+msgid "Automatic links following"
+msgstr "Automatiese volg van skakels"
+
+#: src/config/options.inc:152
+msgid ""
+"Automatically follow a link or submit a form if appropriate\n"
+"accesskey is pressed - this is the standard behaviour, but it's\n"
+"considered dangerous."
+msgstr ""
+
+#: src/config/options.inc:156
+msgid "Display access key in link info"
+msgstr "Vertoon toegangsleutel in skakelinligting"
+
+#: src/config/options.inc:158
+msgid "Display access key in link info."
+msgstr "Vertoon toegangsleutel in skakelinligting."
+
+#: src/config/options.inc:160
+msgid "Accesskey priority"
+msgstr "Toegangsleutelprioriteit"
+
+#: src/config/options.inc:162
+msgid ""
+"Priority of 'accesskey' HTML attribute:\n"
+"0 is first try all normal bindings; if it fails, check accesskey\n"
+"1 is first try only frame bindings; if it fails, check accesskey\n"
+"2 is first check accesskey (this can be dangerous)"
+msgstr ""
+
+#: src/config/options.inc:168
+msgid "Forms"
+msgstr "Vorms"
+
+#: src/config/options.inc:170
+msgid "Options for handling of the forms interaction."
+msgstr "Keuses vir die hantering van vorminteraksie."
+
+#: src/config/options.inc:172
+msgid "Submit form automatically"
+msgstr "Dien vorm outomaties in"
+
+#: src/config/options.inc:174
+msgid ""
+"Automagically submit a form when enter is pressed with a text\n"
+"field selected."
+msgstr ""
+"Dien 'n vorm outomaties in wanneer Enter gedruk word met\n"
+"'n teksveld wat gekies is."
+
+#: src/config/options.inc:177
+msgid "Confirm submission"
+msgstr "Bevestig indiening"
+
+#: src/config/options.inc:179
+msgid "Ask for confirmation when submitting a form."
+msgstr "Vra vir bevestiging met die indien van 'n vorm."
+
+#: src/config/options.inc:181
+msgid "Default form input size"
+msgstr "Verstek invoergrootte in forms"
+
+#: src/config/options.inc:183
+msgid "Default form input size if none is specified."
+msgstr "Verstek invoergrootte in forms indien geen gespesifiseer is nie."
+
+#: src/config/options.inc:185
+msgid "Insert mode"
+msgstr "Invoermodus"
+
+#: src/config/options.inc:187
+msgid ""
+"The setting for this option affects how key presses are handled\n"
+"when one selects a text-input form-field. When enabled, one must\n"
+"explicitly 'enter' a selected text-field to edit it; this prevents\n"
+"text fields from capturing key presses, such as presses of a scroll\n"
+"key, when it is inadvertently selected. When disabled, key presses\n"
+"are always inserted into a selected text field."
+msgstr ""
+
+#: src/config/options.inc:194
+msgid "External editor"
+msgstr "Eksterne redigeerder"
+
+#: src/config/options.inc:196
+msgid ""
+"Path to the executable that ELinks should launch when the user\n"
+"requests to edit a textarea with an external editor.\n"
+"If this is blank, ELinks will use the value of the environmental\n"
+"variable $EDITOR. If $EDITOR is empty or not set, ELinks will then\n"
+"default to \"vi\"."
+msgstr ""
+
+#: src/config/options.inc:203
+msgid "Images"
+msgstr "Prente"
+
+#: src/config/options.inc:205
+msgid "Options for handling of images."
+msgstr "Keuses vir die hantering van prente."
+
+#: src/config/options.inc:207
+msgid "Display style for image tags"
+msgstr "Vertoonstyl vir prent-etikette"
+
+#: src/config/options.inc:209
+msgid ""
+"Display style for image tags when displayed:\n"
+"0     means always display IMG\n"
+"1     means always display filename\n"
+"2     means display alt/title attribute if possible, IMG if not\n"
+"3     means display alt/title attribute if possible, filename if not"
+msgstr ""
+
+#: src/config/options.inc:215
+msgid "Maximum length for image filename"
+msgstr "Maksimum lengte vir 'n prent se lĂŞernaam"
+
+#: src/config/options.inc:217
+msgid ""
+"Maximum length of image filename when displayed:\n"
+"0     means always display full filename\n"
+"1-500 means display filename with this maximal length;\n"
+"      if it is longer, the middle is substituted by an asterisk"
+msgstr ""
+
+#: src/config/options.inc:227
+msgid "Image links tagging"
+msgstr ""
+
+#: src/config/options.inc:229
+msgid ""
+"When to enclose image links:\n"
+"0 means never\n"
+"1 means never if alt or title are provided (old behavior)\n"
+"2 means always"
+msgstr ""
+
+#: src/config/options.inc:234
+msgid "Image link prefix"
+msgstr ""
+
+#: src/config/options.inc:236
+msgid "Prefix string to use to mark image links."
+msgstr ""
+
+#: src/config/options.inc:238
+msgid "Image link suffix"
+msgstr ""
+
+#: src/config/options.inc:240
+msgid "Suffix string to use to mark image links."
+msgstr ""
+
+#: src/config/options.inc:242
+msgid "Maximum length for image label"
+msgstr "Maksimum lengte vir 'n prent-etiket"
+
+#: src/config/options.inc:244
+msgid ""
+"Maximum length of image label (alt/title):\n"
+"0     means always display full label\n"
+"1-500 means display label with this maximal length;\n"
+"      if it is longer, the middle is substituted by an asterisk"
+msgstr ""
+
+#: src/config/options.inc:249
+msgid "Display links to images w/o alt"
+msgstr "Wys skakels na prente sonder alt"
+
+#: src/config/options.inc:251
+msgid ""
+"Display links to images without an alt attribute. If this option\n"
+"is off, these images are completely invisible."
+msgstr ""
+"Wys skakels na prente sonder 'n alt-atribuut. As hierdie\n"
+"keuse af is, is hierdie beelde heeltemal onsigbaar."
+
+#: src/config/options.inc:254
+msgid "Display links to images"
+msgstr "Wys skakels na prente"
+
+#: src/config/options.inc:256
+msgid ""
+"Display links to any images in the document, regardless of them\n"
+"having an alt attribute or not. If this option is off, the alt\n"
+"attribute contents is shown, but as normal text, not selectable\n"
+"as a link."
+msgstr ""
+"Wys skakels na enige prente in die dokument, of hulle\n"
+"'n alt-atribuut het of nie. As hierdie keuse af is, word die\n"
+"alt-teks gewys, maar as gewone teks, nie kiesbaar as\n"
+"'n skakel nie."
+
+#: src/config/options.inc:262
+msgid "Links"
+msgstr "Skakels"
+
+#: src/config/options.inc:264
+msgid "Options for handling of links to other documents."
+msgstr "Keuses vir die hantering van skakels na ander dokumente."
+
+#: src/config/options.inc:266
+msgid "Active link"
+msgstr "Aktiewe skakel"
+
+#: src/config/options.inc:268
+msgid "Options for the active link."
+msgstr "Keuses vir die aktiewe skakel."
+
+#: src/config/options.inc:270
+msgid "Colors"
+msgstr "Kleure"
+
+#: src/config/options.inc:272
+msgid "Active link colors."
+msgstr "Kleure vir aktiewe skakels."
+
+#: src/config/options.inc:274 src/config/options.inc:539
+#: src/config/options.inc:949
+msgid "Background color"
+msgstr "Agtergronkleur"
+
+#: src/config/options.inc:276 src/config/options.inc:541
+#: src/config/options.inc:950
+msgid "Default background color."
+msgstr "Verstekagtergrondkleur."
+
+#. ==========================================================
+#. ============= BORING PART (colors) START =================
+#. ==========================================================
+#. XXX: All bfu colors needs to have both 'text' and 'background'
+#. *	options even if it is not used. get_bfu_color() depends
+#. *	on it.
+#. 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:535
+#: src/config/options.inc:947
+msgid "Text color"
+msgstr "Tekskleur"
+
+#: src/config/options.inc:280 src/config/options.inc:537
+#: src/config/options.inc:948
+msgid "Default text color."
+msgstr "Verstektekskleur."
+
+#: src/config/options.inc:282
+msgid "Enable color"
+msgstr "Aktiveer kleur"
+
+#: src/config/options.inc:284
+msgid ""
+"Enable use of the active link background and text color\n"
+"settings instead of the link colors from the document."
+msgstr ""
+"Aktiveer die gebruik van agtergrond- en tekskleur\n"
+"vir aktiewe skakels eerder as die skakelkleure van die\n"
+"dokument."
+
+#: src/config/options.inc:287
+msgid "Bold"
+msgstr "Vet"
+
+#: src/config/options.inc:289
+msgid "Make the active link text bold."
+msgstr "Maak die aktiewe skakelteks vet."
+
+#: src/config/options.inc:291
+msgid "Invert colors"
+msgstr ""
+
+#: src/config/options.inc:293
+msgid "Invert the fore- and background color so the link stands out."
+msgstr ""
+
+#: src/config/options.inc:296 src/config/options.inc:912
+#: src/dialogs/options.c:231
+msgid "Underline"
+msgstr "Onderstreep"
+
+#: src/config/options.inc:298
+msgid "Underline the active link."
+msgstr "Onderstreep die aktiewe skakel."
+
+#: src/config/options.inc:301
+msgid "Directory highlighting"
+msgstr ""
+
+#: src/config/options.inc:303
+msgid "Highlight links to directories in FTP and local directory listing."
+msgstr ""
+
+#: src/config/options.inc:305
+msgid "Number links"
+msgstr "Nommer skakels"
+
+#: src/config/options.inc:307
+msgid "Display numbers next to the links."
+msgstr "Wys nommers langs die skakels."
+
+#: src/config/options.inc:309
+msgid "Handling of target=_blank"
+msgstr "Hantering van target=_blank"
+
+#: src/config/options.inc:311
+msgid ""
+"Define how to handle links having target=_blank set:\n"
+"0 means open link in current tab\n"
+"1 means open link in new tab in foreground\n"
+"2 means open link in new tab in background\n"
+"3 means open link in new window"
+msgstr ""
+"Definieer gedrag vir skakels met target=_blank:\n"
+"0 beteken maak oop in huidige oortjie\n"
+"1 beteken maak oop in nuwe oortjie in die voorgrond\n"
+"2 beteken maak oop in nuwe oortjie in die agtergrond3 beteken maak oop in "
+"nuwe venster"
+
+#: src/config/options.inc:324
+msgid "Use tabindex"
+msgstr "Gebruik TABINDEX"
+
+#: src/config/options.inc:326
+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."
+msgstr ""
+"Of die TABINDEX-volgorde gebruik moet word.\n"
+"Die TABINDEX-atribuut in HTML-elemente spesifiseer\n"
+"die volgorde waarin skakel fokus moet ontvang as die\n"
+"sleutelbord gebruik word om in die dokument te\n"
+"beweeg."
+
+#: src/config/options.inc:331
+msgid "Missing fragment reporting"
+msgstr ""
+
+#: src/config/options.inc:333
+msgid "Open a message box when document has no tag with given id."
+msgstr ""
+
+#: src/config/options.inc:335
+msgid "Number keys select links"
+msgstr "Syferknoppies kies skakels"
+
+#: src/config/options.inc:337
+msgid ""
+"Number keys select links rather than specify command prefixes. This\n"
+"is a tristate:\n"
+"0 means never\n"
+"1 means if document.browse.links.numbering = 1\n"
+"2 means always"
+msgstr ""
+
+#: src/config/options.inc:343
+msgid "Warn about maliciously crafted URIs"
+msgstr "Waarsku oor kwaadwillig gevormde URI's"
+
+#: src/config/options.inc:345
+msgid ""
+"When following a link the user ID part of the URI is\n"
+"checked and if a maliciously crafted URI is detected a\n"
+"warning dialog will ask before following the link."
+msgstr ""
+
+#. TODO - this is somehow implemented by ff, but disabled
+#. * for now as it doesn't work.
+#: src/config/options.inc:351
+msgid "Wrap-around links cycling"
+msgstr ""
+
+#. 0
+#: src/config/options.inc:353
+msgid ""
+"When pressing 'down' on the last link, jump at the first one, and\n"
+"vice versa."
+msgstr ""
+
+#: src/config/options.inc:357
+msgid "Scrolling"
+msgstr ""
+
+#: src/config/options.inc:359
+msgid "Scrolling options."
+msgstr ""
+
+#: src/config/options.inc:361
+msgid "Horizontal step"
+msgstr ""
+
+#: src/config/options.inc:363
+msgid ""
+"Number of columns to scroll when a key bound to scroll-left or scroll-\n"
+"right is pressed and no prefix was given."
+msgstr ""
+
+#: src/config/options.inc:366
+msgid "Extended horizontal scrolling"
+msgstr ""
+
+#: src/config/options.inc:368
+msgid ""
+"Whether to allow horizontal scrolling when the document\n"
+"does not extend off the screen. Useful for copy/paste\n"
+"operations."
+msgstr ""
+
+#: src/config/options.inc:372
+msgid "Margin"
+msgstr ""
+
+#: src/config/options.inc:374
+msgid ""
+"Size of the virtual margin - when you click inside of that margin,\n"
+"document scrolls in that direction."
+msgstr ""
+
+#: src/config/options.inc:377
+msgid "Vertical step"
+msgstr ""
+
+#: src/config/options.inc:379
+msgid ""
+"Number of lines to scroll when a key bound to scroll-up or scroll-\n"
+"down is pressed and no prefix was given."
+msgstr ""
+
+#: src/config/options.inc:383
+msgid "Searching"
+msgstr "Soek"
+
+#: src/config/options.inc:385
+msgid "Options for searching."
+msgstr "Keuses vir soek."
+
+#: src/config/options.inc:387
+msgid "Case sensitivity"
+msgstr "Kassensitiwiteit"
+
+#: src/config/options.inc:389
+msgid ""
+"Whether the search should match the document text while maintaining\n"
+"case sensitivity."
+msgstr ""
+
+#: src/config/options.inc:393
+msgid "Regular expressions"
+msgstr "Reguliere uitdrukkings"
+
+#: src/config/options.inc:395
+msgid ""
+"Enable searching with regular expressions:\n"
+"0 for plain text searching\n"
+"1 for basic regular expression searches\n"
+"2 for extended regular expression searches"
+msgstr ""
+
+#: src/config/options.inc:401
+msgid "Show search hit top or bottom dialogs"
+msgstr ""
+
+#: src/config/options.inc:403
+msgid ""
+"Whether to show a dialog when the search hits top or bottom of the\n"
+"document."
+msgstr ""
+
+#: src/config/options.inc:406
+msgid "Wraparound"
+msgstr ""
+
+#: src/config/options.inc:408
+msgid "Wrap around when searching. Currently only used for typeahead."
+msgstr ""
+
+#: src/config/options.inc:410
+msgid "Show not found"
+msgstr ""
+
+#: src/config/options.inc:412
+msgid ""
+"How to inform the user when nothing is matched:\n"
+"0 means do nothing\n"
+"1 means beep the terminal\n"
+"2 means pop up message box"
+msgstr ""
+
+#: src/config/options.inc:417
+msgid "Typeahead searching"
+msgstr ""
+
+#: src/config/options.inc:419
+msgid ""
+"Start typeahead searching when an unbound key is pressed without\n"
+"any modifiers. Note that most keys have default bindings, so this\n"
+"feature will not be useful unless you unbind them.\n"
+"\n"
+"0 disables this feature; typeahead searching will only be used\n"
+"  when you press a key bound to search-typeahead or similar\n"
+"1 automatically starts typeahead searching thru link text\n"
+"2 automatically starts typeahead searching thru all document text"
+msgstr ""
+
+#: src/config/options.inc:428
+msgid "Horizontal text margin"
+msgstr ""
+
+#: src/config/options.inc:430
+msgid "Horizontal text margin."
+msgstr ""
+
+#: src/config/options.inc:432
+msgid "Document meta refresh"
+msgstr ""
+
+#: src/config/options.inc:434
+msgid ""
+"Automatically follow document-specified refresh directives ('<meta>\n"
+"refresh' tags). Web-page authors use these to instruct the browser\n"
+"to reload a document at a given interval or to load another page.\n"
+"Regardless of the value the refresh URI is accessible as a link.\n"
+"Use the document.browse.minimum_refresh_time to control the minimum\n"
+"number of seconds a refresh will wait."
+msgstr ""
+
+#: src/config/options.inc:441
+msgid "Document meta refresh minimum time"
+msgstr ""
+
+#: src/config/options.inc:443
+msgid ""
+"The minimum number of milliseconds that should pass before\n"
+"refreshing. If set to zero the document refresh time is used\n"
+"unchanged. It can fix going back in history for some sites that\n"
+"use refreshing with zero values."
+msgstr ""
+
+#: src/config/options.inc:448
+msgid "Tables navigation order"
+msgstr ""
+
+#: src/config/options.inc:450
+msgid "Move by columns in table, instead of rows."
+msgstr ""
+
+#. Keep options in alphabetical order.
+#: src/config/options.inc:456
+msgid "Cache"
+msgstr "Kas"
+
+#: src/config/options.inc:458
+msgid "Cache options."
+msgstr ""
+
+#: src/config/options.inc:460
+msgid "Cache information about redirects"
+msgstr ""
+
+#: src/config/options.inc:462
+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"
+"common to various web login systems - frequently, when accessing\n"
+"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"
+"option has value of 0, this malfunction is fixed, but occasionally\n"
+"you may get superfluous (depends on how you take it ;-) requests to\n"
+"the server. If this option has value of 1, experienced users can\n"
+"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"
+"it, even previous redirects will be taken from cache instead of\n"
+"asking the server."
+msgstr ""
+
+#: src/config/options.inc:480
+msgid "Ignore cache-control info from server"
+msgstr ""
+
+#: src/config/options.inc:482
+msgid ""
+"Ignore Cache-Control and Pragma server headers.\n"
+"When set, the document is cached even with 'Cache-Control: no-cache'."
+msgstr ""
+
+#: src/config/options.inc:485
+msgid "Formatted documents"
+msgstr ""
+
+#: src/config/options.inc:487
+msgid "Format cache options."
+msgstr ""
+
+#: src/config/options.inc:489
+msgid "Number"
+msgstr "Aantal"
+
+#: src/config/options.inc:491
+msgid ""
+"Number of cached formatted pages. Do not get too generous\n"
+"here, 'formatted' means that all the accompanying structures\n"
+"are kept in memory so that you get the cached document\n"
+"immediatelly, but these structures may take a lot - 2x the\n"
+"size of the HTML source is probably not unusual, but it can\n"
+"be even more if the document consists of a lot of short lines\n"
+"(padded right, if possible) and links and not much other markup.\n"
+"So if you set this to 256 and then you don't like your ELinks\n"
+"eating 90M, don't come complaining to us. ;-)\n"
+"Also note that the format cache itself is not counted to the\n"
+"memory cache size, but the HTML source of the formatted documents\n"
+"is always cached, even if it is over the memory cache size\n"
+"threshold. (Then of course no other documents can be cached.)"
+msgstr ""
+
+#: src/config/options.inc:505 src/dialogs/info.c:201
+msgid "Memory cache"
+msgstr "Geheuekas"
+
+#: src/config/options.inc:507
+msgid "Memory cache options."
+msgstr "Keuses vir geheuekas."
+
+#: src/config/options.inc:511
+msgid "Memory cache size (in bytes)."
+msgstr "Kasgrootte (in grepe)."
+
+#: src/config/options.inc:515
+msgid "Charset"
+msgstr "Karakterstel"
+
+#: src/config/options.inc:517
+msgid "Charset options."
+msgstr "Karakterstelkeuses."
+
+#: src/config/options.inc:519
+msgid "Default codepage"
+msgstr "Verstekkarakterstel"
+
+#: src/config/options.inc:521
+msgid ""
+"Default document codepage. 'System' stands for\n"
+"a codepage determined by a selected locale."
+msgstr ""
+
+#: src/config/options.inc:524
+msgid "Ignore charset info from server"
+msgstr "Ignoreer die karakterstel van die bediener"
+
+#: src/config/options.inc:526
+msgid "Ignore charset info sent by server."
+msgstr "Ignoreer die karakterstel wat deur die bediener gestuur word."
+
+#: src/config/options.inc:530
+msgid "Default color settings"
+msgstr "Verstekkleurinstellings"
+
+#: src/config/options.inc:532
+msgid "Default document color settings."
+msgstr "Verstelinstellings vir dokumentkleure."
+
+#: src/config/options.inc:543
+msgid "Link color"
+msgstr "Skakelkleur"
+
+#: src/config/options.inc:545
+msgid "Default link color."
+msgstr "Verstekskakelkleur."
+
+#: src/config/options.inc:547
+msgid "Visited-link color"
+msgstr "Kleur van besoekte skakels"
+
+#: src/config/options.inc:549
+msgid "Default visited link color."
+msgstr "Verstekkleur van besoekte skakels."
+
+#: src/config/options.inc:551
+msgid "Image-link color"
+msgstr "Prentskakel-kleur"
+
+#: src/config/options.inc:553
+msgid "Default image link color."
+msgstr "Verstekkleur van prentskakels."
+
+#: src/config/options.inc:555
+msgid "Bookmarked-link color"
+msgstr "Kleur van geboekmerkte skakels"
+
+#: src/config/options.inc:557
+msgid "Default bookmarked link color."
+msgstr "Verstek kleur van geboekmerkte skakels."
+
+#: src/config/options.inc:559
+msgid "Directory color"
+msgstr "Gidskleur"
+
+#: src/config/options.inc:561
+msgid ""
+"Default directory color.\n"
+"See document.browse.links.color_dirs option."
+msgstr ""
+"Verstek-gidskleur.\n"
+"Sien die 'document.browse.links.color_dirs'-keuse."
+
+#: src/config/options.inc:568
+msgid "Increase contrast"
+msgstr "Verhoog kontras"
+
+#: src/config/options.inc:570
+msgid ""
+"Increase the contrast between the foreground and background colors\n"
+"to ensure readability. For example it disallows dark colors on a\n"
+"black background. Note, this is different from ensuring the contrast\n"
+"with the ensure_contrast option."
+msgstr ""
+"Verhoog die kontras tussen die voorgrond- en agtergrondkleure\n"
+"om leesbaarheid te verseker. Dit laat byvoorbeeld\n"
+"nie donker kleure op 'n swart agtergrond toe nie. Let wel,\n"
+"hierdie is anders as om die kontras te verseker met die\n"
+"'ensure_contrast'-keuse."
+
+#: src/config/options.inc:575
+msgid "Ensure contrast"
+msgstr "Verseker kontras"
+
+#: src/config/options.inc:577
+msgid "Makes sure that the back- and foreground color 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
+#. * handling.
+#: src/config/options.inc:582
+msgid "Use document-specified colors"
+msgstr "Gebruik kleure gespesifiseer in die dokument"
+
+#: src/config/options.inc:584
+msgid ""
+"Use colors specified in document:\n"
+"0 is use always the default settings\n"
+"1 is use document colors if available, except background\n"
+"2 is use document colors, including background. This can\n"
+"  mostly look very impressive, but some sites will appear\n"
+"  really ugly. Note, that obviously if the background is\n"
+"  not black, it will break the behaviour of transparency."
+msgstr ""
+
+#. Keep options in alphabetical order.
+#: src/config/options.inc:597
+msgid "Downloading"
+msgstr "Aflaai"
+
+#: src/config/options.inc:599
+msgid "Options regarding files downloading and handling."
+msgstr "Keuses aangaande die aflaai en hantering van lĂŞers."
+
+#: src/config/options.inc:601
+msgid "Default download directory"
+msgstr ""
+
+#: src/config/options.inc:603
+msgid "Default download directory."
+msgstr ""
+
+#: src/config/options.inc:605
+msgid "Set original time"
+msgstr ""
+
+#: src/config/options.inc:607
+msgid ""
+"Set the timestamp of each downloaded file to the timestamp\n"
+"stored on the server."
+msgstr ""
+
+#. Does automatic resuming make sense as an option?
+#: src/config/options.inc:611
+msgid "Prevent overwriting"
+msgstr ""
+
+#: src/config/options.inc:613
+msgid ""
+"Prevent overwriting the local files:\n"
+"0 is files will silently be overwritten\n"
+"1 is add a suffix .{number} (for example '.1') to the name\n"
+"2 is ask the user"
+msgstr ""
+
+#: src/config/options.inc:618
+msgid "Notify download completion by bell"
+msgstr ""
+
+#: src/config/options.inc:620
+msgid ""
+"Audio notification when download is completed:\n"
+"0 is never\n"
+"1 is when background notification is active\n"
+"2 is always"
+msgstr ""
+
+#: src/config/options.inc:626
+msgid "Dump output"
+msgstr ""
+
+#: src/config/options.inc:628
+msgid "Dump output options."
+msgstr ""
+
+#: src/config/options.inc:630 src/config/options.inc:916
+#: src/config/opttypes.c:407 src/dialogs/document.c:163
+msgid "Codepage"
+msgstr ""
+
+#: src/config/options.inc:632
+msgid ""
+"Codepage used in dump output. 'System' stands for\n"
+"a codepage determined by a selected locale."
+msgstr ""
+
+#: src/config/options.inc:641 src/config/options.inc:650
+#: src/config/options.inc:658 src/config/options.inc:666
+#: src/config/options.inc:673 src/config/options.inc:683
+#: src/config/options.inc:692 src/config/options.inc:701
+#: src/config/options.inc:895
+msgid "Color mode"
+msgstr ""
+
+#: src/config/options.inc:643
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is 256 color mode"
+msgstr ""
+
+#: src/config/options.inc:652
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode"
+msgstr ""
+
+#: src/config/options.inc:660
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 256 color mode"
+msgstr ""
+
+#: src/config/options.inc:668
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode"
+msgstr ""
+
+#: src/config/options.inc:675
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is 256 color mode\n"
+"4 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:685
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 88 color mode\n"
+"3 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:694
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is 256 color mode\n"
+"3 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:703
+msgid ""
+"Color mode for dumps:\n"
+"-1 is standard dump mode\n"
+"0 is mono mode\n"
+"1 is 16 color mode\n"
+"2 is true color mode"
+msgstr ""
+
+#: src/config/options.inc:709
+msgid "Footer"
+msgstr ""
+
+#: src/config/options.inc:711
+#, c-format
+msgid "Footer string used in dumps. %u is substituted by URL."
+msgstr ""
+
+#: src/config/options.inc:715
+#, c-format
+msgid "Header string used in dumps. %u is substituted by URL."
+msgstr ""
+
+#: src/config/options.inc:717
+msgid "Numbering"
+msgstr ""
+
+#: src/config/options.inc:719
+msgid "Whether to print link numbers in dump output."
+msgstr ""
+
+#: src/config/options.inc:721
+msgid "References"
+msgstr "Verwysings"
+
+#: src/config/options.inc:723
+msgid ""
+"Whether to print references (URIs) of document links\n"
+"in dump output."
+msgstr ""
+
+#: src/config/options.inc:726
+msgid "Separator"
+msgstr "Skeier"
+
+#: src/config/options.inc:728
+msgid "String which separates two dumps."
+msgstr ""
+
+#: src/config/options.inc:730
+msgid "Width"
+msgstr "Wydte"
+
+#: src/config/options.inc:732
+msgid "Width of screen in characters when dumping documents."
+msgstr ""
+
+#: src/config/options.inc:736
+msgid "History"
+msgstr "Geskiedenis"
+
+#: src/config/options.inc:738
+msgid "History options."
+msgstr "Geskiedeniskeuses."
+
+#: src/config/options.inc:740
+msgid "Keep unhistory"
+msgstr "Hou toekoms"
+
+#: src/config/options.inc:742
+msgid "Keep unhistory (\"forward history\")."
+msgstr "Hou toekoms (\"vorentoe geskiedenis\")."
+
+#: src/config/options.inc:745
+msgid "HTML rendering"
+msgstr ""
+
+#: src/config/options.inc:747
+msgid "Options concerning the display of HTML pages."
+msgstr ""
+
+#: src/config/options.inc:749
+msgid "Display frames"
+msgstr "Wys rame"
+
+#: src/config/options.inc:751
+msgid "Display frames."
+msgstr "Wys rame."
+
+#: src/config/options.inc:753
+msgid "Display tables"
+msgstr "Wys tabelle"
+
+#: src/config/options.inc:755
+msgid "Display tables."
+msgstr "Wys tabelle."
+
+#: src/config/options.inc:757
+msgid "Display subscripts"
+msgstr "Wys onderskrif"
+
+#: src/config/options.inc:759
+msgid "Display subscripts (as [thing])."
+msgstr "Wys onderskrif (as [iets])."
+
+#: src/config/options.inc:761
+msgid "Display superscripts"
+msgstr "Wys superskrif"
+
+#: src/config/options.inc:763
+msgid "Display superscripts (as ^thing)."
+msgstr "Wys superskrif (as ^iets)."
+
+#: src/config/options.inc:765
+msgid "Rendering of html link element"
+msgstr ""
+
+#: src/config/options.inc:767
+msgid ""
+"How to render <link> tags from the HTML header:\n"
+"0 is nothing\n"
+"1 is title\n"
+"2 is name in addition\n"
+"3 is hreflang in addition\n"
+"4 is type in addition\n"
+"5 is everything"
+msgstr ""
+
+#: src/config/options.inc:775
+msgid "Underline links"
+msgstr "Onderstreep skakels"
+
+#: src/config/options.inc:777
+msgid "Underline links."
+msgstr "Onderstreep skakels."
+
+#: src/config/options.inc:779
+msgid "Wrap non breaking space"
+msgstr ""
+
+#: src/config/options.inc:781
+msgid ""
+"If set do not honour non breaking space (the nbsp entity)\n"
+"but allow to wrap the text. This can help keeping the width\n"
+"of documents down so no horizontal scrolling is needed."
+msgstr ""
+
+#: src/config/options.inc:786
+msgid "Plain rendering"
+msgstr ""
+
+#: src/config/options.inc:788
+msgid "Options concerning the display of plain text pages."
+msgstr "Keuses aangaandie die vertoon van gewone teksblaaie."
+
+#: src/config/options.inc:790
+msgid "Display URIs"
+msgstr "Wys URI's"
+
+#: src/config/options.inc:792
+msgid "Display URIs in the document as links."
+msgstr "Wys URI's in die dokument as skakels."
+
+#: src/config/options.inc:794
+msgid "Compress empty lines"
+msgstr "Pers leĂŤ lyne saam"
+
+#: src/config/options.inc:796
+msgid "Compress successive empty lines to only one in displayed text."
+msgstr "Pers opeenvolgende leĂŤ lyne saam tot een in die vertoonde teks."
+
+#: src/config/options.inc:799
+msgid "URI passing"
+msgstr "URI-oordrag"
+
+#: src/config/options.inc:801
+msgid ""
+"Rules for passing URIs to external commands. When one rule\n"
+"is defined the link and tab menu will have a menu item that\n"
+"makes it possible to pass the the link, frame or tab URI to\n"
+"an external command. If several rules are defined the link and\n"
+"tab menu will have a submenu of items for each rule. Note, this\n"
+"is mostly useful for launching graphical viewers, since there\n"
+"is not support for releasing the terminal while the command runs.\n"
+"The action and submenus are also available by binding keys to\n"
+"the frame-external-command, the link-external-command, and\n"
+"the tab-external-command actions."
+msgstr ""
+
+#: src/config/options.inc:814
+msgid ""
+"A rule for passing URI to an external command.\n"
+"The format is:\n"
+"%c in the string means the current URL\n"
+"%% in the string means '%'\n"
+"Do _not_ put single- or double-quotes around %c."
+msgstr ""
+
+#. Keep options in alphabetical order.
+#: src/config/options.inc:824
+msgid "Information files"
+msgstr "InligtinglĂŞers"
+
+#: src/config/options.inc:826
+msgid "Options for information files in ~/.elinks."
+msgstr "Keuses vir inligtinglĂŞers in ~/.elinks."
+
+#: src/config/options.inc:828
+msgid "Save interval"
+msgstr "Stoorinterval"
+
+#: src/config/options.inc:830
+msgid ""
+"Interval at which to trigger information files in ~/.elinks\n"
+"to be saved to disk if they has changed (seconds; 0 to disable)"
+msgstr ""
+"Interval waarna die stoor van veranderde inligtinglĂŞers\n"
+"in ~/.elinks geaktiveer moet word (sekondes; 0 deaktiveer)"
+
+#: src/config/options.inc:833
+msgid "Use secure file saving"
+msgstr ""
+
+#: src/config/options.inc:835
+msgid ""
+"First write data to unique temporary file, then rename this file\n"
+"upon successfully finishing this. Note that this relates only to\n"
+"config files, not downloaded files. You may want to disable\n"
+"it if you are using some exotic permissions for concerned files.\n"
+"Secure file saving is automagically disabled if file is symlink.\n"
+"Warning: some systems (ie. OS/2, Win32) require that destination\n"
+"file doesn't exist when rename(3) is called, breaking atomicity,\n"
+"and reducing reliability of this feature."
+msgstr ""
+
+#: src/config/options.inc:844
+msgid "Use fsync(3) with secure file saving"
+msgstr ""
+
+#: src/config/options.inc:846
+msgid ""
+"When using secure file saving, call fsync(3), if the OS\n"
+"supports it, to force the OS immediately to write the data\n"
+"to permanent storage. This is optional for those who wish\n"
+"to avoid excessive disk I/O."
+msgstr ""
+
+#. Keep options in alphabetical order.
+#: src/config/options.inc:855
+msgid "Terminals"
+msgstr "Terminale"
+
+#: src/config/options.inc:857
+msgid "Terminal options."
+msgstr "Terminaalkeuses."
+
+#: src/config/options.inc:861
+msgid "Options specific to this terminal type (according to $TERM value)."
+msgstr ""
+
+#: src/config/options.inc:865
+msgid ""
+"Terminal type; matters mostly only when drawing frames and\n"
+"dialog box borders:\n"
+"0 is dumb terminal type, ASCII art\n"
+"1 is VT100, simple but portable\n"
+"2 is Linux, you get double frames and other goodies\n"
+"3 is KOI-8\n"
+"4 is FreeBSD"
+msgstr ""
+
+#: src/config/options.inc:873 src/dialogs/options.c:227
+msgid "Switch fonts for line drawing"
+msgstr ""
+
+#: src/config/options.inc:875
+msgid ""
+"Switch fonts when drawing lines, enabling both local characters\n"
+"and lines working at the same time. Makes sense only with linux\n"
+"terminal."
+msgstr ""
+
+#: src/config/options.inc:879 src/dialogs/options.c:232
+msgid "UTF-8 I/O"
+msgstr ""
+
+#: src/config/options.inc:881
+msgid ""
+"Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
+"only the subset of UTF8 according to terminal codepage is used."
+msgstr ""
+
+#: src/config/options.inc:884 src/dialogs/options.c:228
+msgid "Restrict frames in cp850/852"
+msgstr ""
+
+#: src/config/options.inc:886
+msgid ""
+"Restrict the characters used when drawing lines. Makes sense\n"
+"only with linux terminals using the cp850/852 character sets."
+msgstr ""
+
+#: src/config/options.inc:889 src/dialogs/options.c:229
+msgid "Block cursor"
+msgstr ""
+
+#: src/config/options.inc:891
+msgid ""
+"Move cursor to bottom right corner when done drawing.\n"
+"This is particularly useful when we have a block cursor,\n"
+"so that inversed text is displayed correctly."
+msgstr ""
+
+#: src/config/options.inc:897
+msgid ""
+"The color mode controls what colors are used and how they are\n"
+"output to the terminal. The color modes are:\n"
+"0 is mono mode, only 2 colors are used\n"
+"1 is 16 color mode, uses the common ANSI colors\n"
+"2 is 256 color mode, uses XTerm RGB codes\n"
+"3 is true color mode, uses konsole RGB codes."
+msgstr ""
+
+#: src/config/options.inc:904 src/dialogs/options.c:230
+msgid "Transparency"
+msgstr "Deursigtigheid"
+
+#: src/config/options.inc:906
+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"
+"sense only when colors are enabled."
+msgstr ""
+
+#: src/config/options.inc:914
+msgid "If we should use underline or enhance the color instead."
+msgstr ""
+
+#: src/config/options.inc:918
+msgid ""
+"Codepage of charset used for displaying content on terminal.\n"
+"'System' stands for a codepage determined by a selected locale."
+msgstr ""
+
+#. Keep options in alphabetical order.
+#: src/config/options.inc:925
+msgid "User interface"
+msgstr "Gebruikerkoppelvlak"
+
+#: src/config/options.inc:927
+msgid "User interface options."
+msgstr "Keuses oor die gebruikerkoppevlak."
+
+#: src/config/options.inc:931
+msgid "Color settings"
+msgstr "Kleurinstellings"
+
+#: src/config/options.inc:933
+msgid "Default user interface color settings."
+msgstr "Verstek-kleurinstellings van die gebruikerkoppelvlak."
+
+#: src/config/options.inc:960
+msgid "Color terminals"
+msgstr "Kleurterminale"
+
+#: src/config/options.inc:962
+msgid "Color settings for color terminal."
+msgstr "Kleurinstellings vir kleur terminale."
+
+#: src/config/options.inc:964
+msgid "Non-color terminals"
+msgstr ""
+
+#: src/config/options.inc:966
+msgid "Color settings for non-color terminal."
+msgstr ""
+
+#. FIXME: obsolete, how to alias them correctly ? --Zas
+#: src/config/options.inc:969
+msgid "Main menu bar"
+msgstr ""
+
+#: src/config/options.inc:971
+msgid "Main menu bar colors."
+msgstr ""
+
+#: src/config/options.inc:973
+msgid "Unselected main menu bar item"
+msgstr ""
+
+#: src/config/options.inc:975
+msgid "Unselected main menu bar item colors."
+msgstr ""
+
+#: src/config/options.inc:977
+msgid "Selected main menu bar item"
+msgstr ""
+
+#: src/config/options.inc:979
+msgid "Selected main menu bar item colors."
+msgstr ""
+
+#: src/config/options.inc:981 src/config/options.inc:1010
+msgid "Hotkey"
+msgstr ""
+
+#: src/config/options.inc:983
+msgid "Main menu hotkey colors."
+msgstr ""
+
+#: src/config/options.inc:985 src/config/options.inc:1014
+msgid "Unselected hotkey"
+msgstr ""
+
+#: src/config/options.inc:987
+msgid "Main menu unselected hotkey colors."
+msgstr ""
+
+#: src/config/options.inc:989 src/config/options.inc:1018
+msgid "Selected hotkey"
+msgstr ""
+
+#: src/config/options.inc:991
+msgid "Main menu selected hotkey colors."
+msgstr ""
+
+#: src/config/options.inc:994
+msgid "Menu bar"
+msgstr ""
+
+#: src/config/options.inc:996
+msgid "Menu bar colors."
+msgstr ""
+
+#: src/config/options.inc:998
+msgid "Unselected menu item"
+msgstr ""
+
+#: src/config/options.inc:1000
+msgid "Unselected menu item colors."
+msgstr ""
+
+#: src/config/options.inc:1002
+msgid "Selected menu item"
+msgstr ""
+
+#: src/config/options.inc:1004
+msgid "Selected menu item colors."
+msgstr ""
+
+#: src/config/options.inc:1006
+msgid "Marked menu item"
+msgstr ""
+
+#: src/config/options.inc:1008
+msgid "Marked menu item colors."
+msgstr ""
+
+#: src/config/options.inc:1012
+msgid "Menu item hotkey colors."
+msgstr ""
+
+#: src/config/options.inc:1016
+msgid "Menu item unselected hotkey colors."
+msgstr ""
+
+#: src/config/options.inc:1020
+msgid "Menu item selected hotkey colors."
+msgstr ""
+
+#: src/config/options.inc:1022
+msgid "Menu frame"
+msgstr ""
+
+#: src/config/options.inc:1024
+msgid "Menu frame colors."
+msgstr ""
+
+#: src/config/options.inc:1027
+msgid "Dialog"
+msgstr ""
+
+#: src/config/options.inc:1029
+msgid "Dialog colors."
+msgstr ""
+
+#: src/config/options.inc:1039
+msgid "Generic"
+msgstr ""
+
+#: src/config/options.inc:1041
+msgid "Generic dialog colors."
+msgstr ""
+
+#: src/config/options.inc:1043
+msgid "Frame"
+msgstr ""
+
+#: src/config/options.inc:1045
+msgid "Dialog frame colors."
+msgstr ""
+
+#: src/config/options.inc:1047
+msgid "Scrollbar"
+msgstr ""
+
+#: src/config/options.inc:1049
+msgid "Scrollbar colors."
+msgstr ""
+
+#: src/config/options.inc:1051
+msgid "Selected scrollbar"
+msgstr ""
+
+#: src/config/options.inc:1053
+msgid "Scrollbar selected colors."
+msgstr ""
+
+#: src/config/options.inc:1057
+msgid "Dialog title colors."
+msgstr ""
+
+#: src/config/options.inc:1059
+msgid "Text"
+msgstr "Teks"
+
+#: src/config/options.inc:1061
+msgid "Dialog text colors."
+msgstr ""
+
+#: src/config/options.inc:1063 src/viewer/text/form.c:1797
+msgid "Checkbox"
+msgstr ""
+
+#: src/config/options.inc:1065
+msgid "Dialog checkbox colors."
+msgstr ""
+
+#: src/config/options.inc:1067
+msgid "Selected checkbox"
+msgstr ""
+
+#: src/config/options.inc:1069
+msgid "Dialog selected checkbox colors."
+msgstr ""
+
+#: src/config/options.inc:1071
+msgid "Checkbox label"
+msgstr ""
+
+#: src/config/options.inc:1073
+msgid "Dialog checkbox label colors."
+msgstr ""
+
+#: src/config/options.inc:1075
+msgid "Button"
+msgstr "Knoppie"
+
+#: src/config/options.inc:1077 src/config/options.inc:1085
+msgid "Dialog button colors."
+msgstr ""
+
+#: src/config/options.inc:1079
+msgid "Selected button"
+msgstr ""
+
+#: src/config/options.inc:1081 src/config/options.inc:1089
+msgid "Dialog selected button colors."
+msgstr ""
+
+#: src/config/options.inc:1083
+msgid "Button shortcut"
+msgstr ""
+
+#: src/config/options.inc:1087
+msgid "Selected button shortcut"
+msgstr ""
+
+#: src/config/options.inc:1091 src/viewer/text/form.c:1801
+msgid "Text field"
+msgstr "Teksveld"
+
+#: src/config/options.inc:1093
+msgid "Dialog text field colors."
+msgstr "Teksveldkleur in dialoĂŤ."
+
+#: src/config/options.inc:1095
+msgid "Text field text"
+msgstr "Teksveldteks"
+
+#: src/config/options.inc:1097
+msgid "Dialog field text colors."
+msgstr ""
+
+#: src/config/options.inc:1099
+msgid "Meter"
+msgstr ""
+
+#: src/config/options.inc:1101
+msgid "Dialog meter colors."
+msgstr ""
+
+#: src/config/options.inc:1103
+msgid "Shadow"
+msgstr "Skadu"
+
+#: src/config/options.inc:1105
+msgid "Dialog shadow colors (see ui.shadows option)."
+msgstr "Skadukleure vir dialoog (sien die ui.shadows-keuse)"
+
+#: src/config/options.inc:1107
+msgid "Title bar"
+msgstr ""
+
+#: src/config/options.inc:1109
+msgid "Title bar colors."
+msgstr ""
+
+#: src/config/options.inc:1111
+msgid "Generic title bar"
+msgstr ""
+
+#: src/config/options.inc:1113
+msgid "Generic title bar colors."
+msgstr ""
+
+#: src/config/options.inc:1115
+msgid "Title bar text"
+msgstr ""
+
+#: src/config/options.inc:1117
+msgid "Title bar text colors."
+msgstr ""
+
+#: src/config/options.inc:1120
+msgid "Status bar"
+msgstr ""
+
+#: src/config/options.inc:1122
+msgid "Status bar colors."
+msgstr ""
+
+#: src/config/options.inc:1124
+msgid "Generic status bar"
+msgstr ""
+
+#: src/config/options.inc:1126
+msgid "Generic status bar colors."
+msgstr ""
+
+#: src/config/options.inc:1128
+msgid "Status bar text"
+msgstr ""
+
+#: src/config/options.inc:1130
+msgid "Status bar text colors."
+msgstr ""
+
+#: src/config/options.inc:1133
+msgid "Tabs bar"
+msgstr ""
+
+#: src/config/options.inc:1135
+msgid "Tabs bar colors."
+msgstr ""
+
+#: src/config/options.inc:1137
+msgid "Unvisited tab"
+msgstr ""
+
+#: src/config/options.inc:1139
+msgid ""
+"Tab colors for tabs that have not been\n"
+"selected since they completed loading."
+msgstr ""
+
+#: src/config/options.inc:1142
+msgid "Unselected tab"
+msgstr ""
+
+#: src/config/options.inc:1144
+msgid "Unselected tab colors."
+msgstr ""
+
+#: src/config/options.inc:1146
+msgid "Loading tab"
+msgstr ""
+
+#: src/config/options.inc:1148
+msgid "Tab colors for tabs that are loading in the background."
+msgstr ""
+
+#: src/config/options.inc:1150
+msgid "Selected tab"
+msgstr ""
+
+#: src/config/options.inc:1152
+msgid "Selected tab colors."
+msgstr ""
+
+#: src/config/options.inc:1154
+msgid "Tab separator"
+msgstr ""
+
+#: src/config/options.inc:1156
+msgid "Tab separator colors."
+msgstr ""
+
+#: src/config/options.inc:1159
+msgid "Searched strings"
+msgstr ""
+
+#: src/config/options.inc:1161
+msgid "Searched string highlight colors."
+msgstr ""
+
+#. ==========================================================
+#. ============= BORING PART (colors) END ===================
+#. ==========================================================
+#. Keep options in alphabetical order.
+#: src/config/options.inc:1170
+msgid "Dialog settings"
+msgstr ""
+
+#: src/config/options.inc:1172
+msgid "Dialogs-specific appearance and behaviour settings."
+msgstr ""
+
+#: src/config/options.inc:1175
+msgid "Minimal height of listbox widget"
+msgstr ""
+
+#: src/config/options.inc:1177
+msgid ""
+"Minimal height of the listbox widget (used e.g. for bookmarks\n"
+"or global history)."
+msgstr ""
+
+#: src/config/options.inc:1180
+msgid "Drop shadows"
+msgstr ""
+
+#: src/config/options.inc:1182
+msgid ""
+"Make dialogs drop shadows (the shadows are solid, you can\n"
+"adjust their color by ui.colors.*.dialog.shadow). You may\n"
+"also want to eliminate the wide borders by adjusting setup.h."
+msgstr ""
+
+#: src/config/options.inc:1186
+msgid "Underline menu hotkeys"
+msgstr ""
+
+#: src/config/options.inc:1188
+msgid ""
+"Whether to underline hotkeys in menus to make them more\n"
+"visible. Requires the underlining is enabled for the terminal."
+msgstr ""
+
+#: src/config/options.inc:1191
+msgid "Underline button shortcuts"
+msgstr ""
+
+#: src/config/options.inc:1193
+msgid ""
+"Whether to underline button shortcuts to make them more\n"
+"visible. Requires the underlining is enabled for the terminal."
+msgstr ""
+
+#: src/config/options.inc:1197
+msgid "Timer options"
+msgstr ""
+
+#: src/config/options.inc:1199
+msgid ""
+"Timed action after certain interval of user inactivity. Someone can\n"
+"even find this useful, although you may not believe that."
+msgstr ""
+
+#: src/config/options.inc:1205
+msgid ""
+"Whether to enable the timer or not:\n"
+"0 is don't count down anything\n"
+"1 is count down, but don't show the timer\n"
+"2 is count down and show the timer near LEDs"
+msgstr ""
+
+#: src/config/options.inc:1212
+msgid ""
+"Whether to enable the timer or not:\n"
+"0 is don't count down anything\n"
+"1 is count down, but don't show the timer\n"
+"2 is count down and show the timer near LEDs (DISABLED)"
+msgstr ""
+
+#: src/config/options.inc:1218
+msgid "Duration"
+msgstr ""
+
+#: src/config/options.inc:1220
+msgid ""
+"Inactivity timeout in seconds. The maximum of one day\n"
+"should be enough for just everyone (TM)."
+msgstr ""
+
+#: src/config/options.inc:1225
+msgid "Keybinding action to be triggered when timer reaches zero."
+msgstr ""
+
+#: src/config/options.inc:1228
+msgid "Window tabs"
+msgstr ""
+
+#: src/config/options.inc:1230
+msgid "Window tabs settings."
+msgstr ""
+
+#: src/config/options.inc:1232
+msgid "Display tabs bar"
+msgstr ""
+
+#: src/config/options.inc:1234
+msgid ""
+"Show tabs bar on the screen:\n"
+"0 means never\n"
+"1 means only if two or more tabs are open\n"
+"2 means always"
+msgstr ""
+
+#: src/config/options.inc:1239
+msgid "Tab bar at top"
+msgstr ""
+
+#: src/config/options.inc:1241
+msgid "Whether display tab bar at top like other browsers do."
+msgstr ""
+
+#: src/config/options.inc:1243
+msgid "Wrap-around tabs cycling"
+msgstr ""
+
+#: src/config/options.inc:1245
+msgid ""
+"When moving right from the last tab, jump at the first one, and\n"
+"vice versa."
+msgstr ""
+
+#: src/config/options.inc:1248
+msgid "Confirm tab closing"
+msgstr ""
+
+#: src/config/options.inc:1250
+msgid "When closing a tab show confirmation dialog."
+msgstr ""
+
+#: src/config/options.inc:1254 src/config/opttypes.c:408
+msgid "Language"
+msgstr "Taal"
+
+#: src/config/options.inc:1256
+msgid ""
+"Language of user interface. 'System' means that the language will\n"
+"be extracted from the environment dynamically."
+msgstr ""
+
+#: src/config/options.inc:1259
+msgid "Display menu bar always"
+msgstr ""
+
+#: src/config/options.inc:1261
+msgid "Always show menu bar on the screen."
+msgstr ""
+
+#: src/config/options.inc:1263
+msgid "Display status bar"
+msgstr ""
+
+#: src/config/options.inc:1265
+msgid "Show status bar on the screen."
+msgstr ""
+
+#: src/config/options.inc:1267
+msgid "Display title bar"
+msgstr ""
+
+#: src/config/options.inc:1269
+msgid "Show title bar on the screen."
+msgstr ""
+
+#: src/config/options.inc:1271
+msgid "Display goto dialog in new tabs"
+msgstr ""
+
+#: src/config/options.inc:1273
+msgid ""
+"Pop up goto dialog in newly created tabs when there's no homepage\n"
+"set. This means also showing goto dialog on startup."
+msgstr ""
+
+#: src/config/options.inc:1276
+msgid "Show a message box when file is saved successfully"
+msgstr ""
+
+#: src/config/options.inc:1278
+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"
+"pop up."
+msgstr ""
+
+#: src/config/options.inc:1283
+msgid "Sessions"
+msgstr ""
+
+#: src/config/options.inc:1285
+msgid "Sessions settings."
+msgstr ""
+
+#: src/config/options.inc:1287
+msgid "Keep session active"
+msgstr ""
+
+#: src/config/options.inc:1289
+msgid "Keep the session active even if the last terminal exits."
+msgstr ""
+
+#: src/config/options.inc:1291
+msgid "Auto save session"
+msgstr ""
+
+#: src/config/options.inc:1293
+msgid ""
+"Automatically save the session when quitting.\n"
+"This feature requires bookmark support."
+msgstr ""
+
+#: src/config/options.inc:1296
+msgid "Auto restore session"
+msgstr ""
+
+#: src/config/options.inc:1298
+msgid ""
+"Automatically restore the session at start.\n"
+"This feature requires bookmark support."
+msgstr ""
+
+#: src/config/options.inc:1301
+msgid "Auto save and restore session folder name"
+msgstr ""
+
+#: src/config/options.inc:1303
+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"
+"This only makes sense with bookmark support."
+msgstr ""
+
+#: src/config/options.inc:1307
+msgid "Homepage URI"
+msgstr ""
+
+#: src/config/options.inc:1309
+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"
+"Set to \"\" if the environment variable WWW_HOME should be used\n"
+"as homepage URI instead."
+msgstr ""
+
+#: src/config/options.inc:1315
+msgid "Date format"
+msgstr "Datumformaat"
+
+#: src/config/options.inc:1317
+msgid "Date format to use in dialogs. See strftime(3)."
+msgstr "Datumformaat om in dialoĂŤ te gebruik. Sien strftime(3)."
+
+#: src/config/options.inc:1320
+msgid "Set window title"
+msgstr "Stel venstertitel"
+
+#: src/config/options.inc:1322
+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"
+"shown on the window titlebar."
+msgstr ""
+
+#: src/config/opttypes.c:54
+msgid "Read error"
+msgstr "Leesfout"
+
+#: src/config/opttypes.c:402
+msgid "Boolean"
+msgstr "Bools"
+
+#: src/config/opttypes.c:402
+msgid "[0|1]"
+msgstr "[0|1]"
+
+#: src/config/opttypes.c:403
+msgid "Integer"
+msgstr "Heelgetal"
+
+#: src/config/opttypes.c:403 src/config/opttypes.c:404
+msgid "<num>"
+msgstr ""
+
+#: src/config/opttypes.c:404
+msgid "Longint"
+msgstr "Lang heelgegetal"
+
+#: src/config/opttypes.c:405
+msgid "String"
+msgstr "String"
+
+#: src/config/opttypes.c:405
+msgid "<str>"
+msgstr "<str>"
+
+#: src/config/opttypes.c:407
+msgid "<codepage>"
+msgstr ""
+
+#: src/config/opttypes.c:408
+msgid "<language>"
+msgstr "<taal>"
+
+#: src/config/opttypes.c:409
+msgid "Color"
+msgstr "Kleur"
+
+#: src/config/opttypes.c:409
+msgid "<color|#rrggbb>"
+msgstr "<kleur|#rrggbb>"
+
+#: src/config/opttypes.c:411
+msgid "Special"
+msgstr "Spesiaal"
+
+#: src/config/opttypes.c:413
+msgid "Alias"
+msgstr ""
+
+#. tree
+#: src/config/opttypes.c:416
+msgid "Folder"
+msgstr "Gids"
+
+#. name:
+#: src/config/timer.c:73
+msgid "Periodic Saving"
+msgstr ""
+
+#. name:
+#: src/config/urlhist.c:61
+msgid "Goto URL History"
+msgstr ""
+
+#. name:
+#: src/cookies/cookies.c:80 src/cookies/cookies.c:858
+msgid "Cookies"
+msgstr "Koekies"
+
+#: src/cookies/cookies.c:82
+msgid "Cookies options."
+msgstr "Koekiekeuses"
+
+#: src/cookies/cookies.c:84
+msgid "Accept policy"
+msgstr "Aanvaardingsbeleid"
+
+#: src/cookies/cookies.c:87
+msgid ""
+"Cookies accepting policy:\n"
+"0 is accept no cookies\n"
+"1 is ask for confirmation before accepting cookie\n"
+"2 is accept all cookies"
+msgstr ""
+"Koekieaanvaardingsbeleid:\n"
+"0 is aanvaar geen koekies nie\n"
+"1 is vra eers vir bevestiging voor een aanvaar word\n"
+"2 is aanvaar alle koekies"
+
+#: src/cookies/cookies.c:92
+msgid "Maximum age"
+msgstr "Maksimum ouderdom"
+
+#: src/cookies/cookies.c:94
+msgid ""
+"Cookie maximum age (in days):\n"
+"-1 is use cookie's expiration date if any\n"
+"0  is force expiration at the end of session, ignoring cookie's\n"
+"   expiration date\n"
+"1+ is use cookie's expiration date, but limit age to the given\n"
+"   number of days"
+msgstr ""
+"Maksimum koekieouderdom (in dae):\n"
+"-1 is gebruik die koekie se vervaldatum, indien enige\n"
+"0  forseer verval by sessie-einde en ignoreer die\n"
+"   koekie se vervaldatum\n"
+"1+ is gebruik die koekie se vervaldatum, maar beperk\n"
+"   die ouderdom tot die gegewe aantal dae"
+
+#: src/cookies/cookies.c:101
+msgid "Paranoid security"
+msgstr "ParanoĂŻese sekuriteit"
+
+#: src/cookies/cookies.c:103
+msgid ""
+"When enabled, we'll require three dots in cookies domain for all\n"
+"non-international domains (instead of just two dots). Some countries\n"
+"have generic second level domains (eg. .com.pl, .co.uk) and allowing\n"
+"sites to set cookies for these generic domains could potentially be\n"
+"very bad. Note, it is off by default as it breaks a lot of sites."
+msgstr ""
+"Indien geaktiveer, vereis ons drie punte in die koekiedomein\n"
+"vir alle nie-internasionale domeine (in plaas van net twee punte). Party\n"
+"lande het generiese tweedevlakdomeine (bv. .org.za, .co.uk) en as\n"
+"werwe toegelaat word om koekies vir hierdie generiese domeine te stel\n"
+"kan dit potensieel baie sleg wees. Let wel: hierdie is by verstek af "
+"aangesien\n"
+"dit baie werwe breek."
+
+#: src/cookies/cookies.c:109
+msgid "Saving"
+msgstr "Stoor"
+
+#: src/cookies/cookies.c:111
+msgid "Whether cookies should be loaded from and save to disk."
+msgstr "Of koekies van/na die skyf gelaai/gestoor moet word."
+
+#: src/cookies/cookies.c:113
+msgid "Resaving"
+msgstr "Herstoor"
+
+#: src/cookies/cookies.c:115
+msgid ""
+"Save cookies after each change in cookies list? No effect when\n"
+"cookie saving (cookies.save) is off."
+msgstr ""
+"Stoor koekies na elke verandering in die koekielys? Geen effek\n"
+"as koekies nooit gestoor word nie (koekies.stoor)."
+
+#: src/cookies/dialogs.c:36 src/cookies/dialogs.c:352
+msgid "Domain"
+msgstr "Domein"
+
+#: src/cookies/dialogs.c:37 src/mime/backend/mailcap.c:97
+#: src/mime/backend/mimetypes.c:56 src/protocol/file/cgi.c:43
+msgid "Path"
+msgstr "Pad"
+
+#: src/cookies/dialogs.c:41
+msgid "at quit time"
+msgstr "met afsluiting"
+
+#: src/cookies/dialogs.c:49 src/cookies/dialogs.c:354
+msgid "Secure"
+msgstr ""
+
+#: src/cookies/dialogs.c:50
+msgid "yes"
+msgstr "ja"
+
+#: src/cookies/dialogs.c:50
+msgid "no"
+msgstr "nee"
+
+#: src/cookies/dialogs.c:70
+#, c-format
+msgid "Do you want to accept a cookie from %s?"
+msgstr "Wil u 'n koekie van %s aanvaar?"
+
+#: src/cookies/dialogs.c:78
+msgid "Accept cookie?"
+msgstr "Aanvaar koekie?"
+
+#. accelerator_context(accept_cookie_dialog)
+#: src/cookies/dialogs.c:81
+msgid "~Accept"
+msgstr "~Aanvaar"
+
+#. accelerator_context(accept_cookie_dialog)
+#: src/cookies/dialogs.c:82
+msgid "~Reject"
+msgstr "~Keur af"
+
+#: src/cookies/dialogs.c:149 src/cookies/dialogs.c:342
+#: src/dialogs/document.c:177
+msgid "Server"
+msgstr "Bediener"
+
+#. cant_delete_item
+#: src/cookies/dialogs.c:201
+#, c-format
+msgid "Sorry, but cookie \"%s\" cannot be deleted."
+msgstr "Jammer, maar koekie \"%s\" kan nie geskrap word nie."
+
+#. cant_delete_used_item
+#: src/cookies/dialogs.c:203
+#, c-format
+msgid "Sorry, but cookie \"%s\" is being used by something else."
+msgstr "Jammer, maar koekie \"%s\" word deur iets anders gebruik."
+
+#. cant_delete_folder
+#: src/cookies/dialogs.c:205
+#, c-format
+msgid "Sorry, but cookie domain \"%s\" cannot be deleted."
+msgstr "Jammer, maar koekiedomein \"%s\" kan nie geskrap word nie."
+
+#. cant_delete_used_folder
+#: src/cookies/dialogs.c:207
+#, c-format
+msgid "Sorry, but cookie domain \"%s\" is being used by something else."
+msgstr "Jammer, maar koekiedomein \"%s\" word deur iets anders gebruik."
+
+#. delete_marked_items_title
+#: src/cookies/dialogs.c:209
+msgid "Delete marked cookies"
+msgstr "Skrap gemerkte koekies"
+
+#. delete_marked_items
+#: src/cookies/dialogs.c:211
+msgid "Delete marked cookies?"
+msgstr "Skrap gemerkte koekies?"
+
+#. delete_folder_title
+#: src/cookies/dialogs.c:213
+msgid "Delete domain's cookies"
+msgstr "Skrap domein se koekies"
+
+#. delete_folder
+#: src/cookies/dialogs.c:215
+#, c-format
+msgid "Delete all cookies from domain \"%s\"?"
+msgstr "Skrap alle koekies van domein \"%s\"?"
+
+#. delete_item_title
+#: src/cookies/dialogs.c:217
+msgid "Delete cookie"
+msgstr "Skrap koekie"
+
+#: src/cookies/dialogs.c:219
+#, c-format
+msgid "Delete this cookie?"
+msgstr "Skrap hierdie koekie?"
+
+#. clear_all_items_title
+#: src/cookies/dialogs.c:221
+msgid "Clear all cookies"
+msgstr "Skrap alle koekies"
+
+#. clear_all_items_title
+#: src/cookies/dialogs.c:223
+msgid "Do you really want to remove all cookies?"
+msgstr "Wil u regtig alle koekies skrap?"
+
+#: src/cookies/dialogs.c:448
+msgid "Add server"
+msgstr "Voeg bediener by"
+
+#: src/cookies/dialogs.c:452
+msgid "Server name"
+msgstr "Bedienernaam"
+
+#. accelerator_context(src/cookies/dialogs.c:cookie_buttons)
+#: src/cookies/dialogs.c:475
+msgid "Add ~server"
+msgstr "Voeg ~bediener by"
+
+#. 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:478 src/dialogs/download.c:498 src/dialogs/edit.c:99
+#: src/globhist/dialogs.c:232 src/protocol/auth/dialogs.c:264
+msgid "C~lear"
+msgstr "Maak skoon"
+
+#: src/cookies/dialogs.c:484
+msgid "Cookie manager"
+msgstr "Koekiebestuurder"
+
+#: src/dialogs/document.c:46
+msgid "You are nowhere!"
+msgstr ""
+
+#: src/dialogs/document.c:64
+msgid "Link"
+msgstr "Skakel"
+
+#: src/dialogs/document.c:71
+msgid "Link title"
+msgstr "Skakeltitel"
+
+#: src/dialogs/document.c:88
+msgid "Link image"
+msgstr "Skakelprent"
+
+#: src/dialogs/document.c:103
+msgid "Link last visit time"
+msgstr "Skakel se laaste besoektyd"
+
+#: src/dialogs/document.c:109
+msgid "Link title (from history)"
+msgstr "Skakeltitel (vanuit geskiedenis)"
+
+#: src/dialogs/document.c:167
+msgid "assumed"
+msgstr ""
+
+#: src/dialogs/document.c:170
+msgid "ignoring server setting"
+msgstr "ignoreer bedienerinstelling"
+
+#: src/dialogs/document.c:195
+msgid "Date"
+msgstr "Datum"
+
+#: src/dialogs/document.c:213 src/globhist/dialogs.c:67
+msgid "Last visit time"
+msgstr "Laaste besoektyd"
+
+#: src/dialogs/document.c:232
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: src/dialogs/document.c:247 src/dialogs/document.c:316
+msgid "Header info"
+msgstr "Kopinligting"
+
+#: src/dialogs/document.c:260
+msgid "Internal header info"
+msgstr "Interne kopinligting"
+
+#: src/dialogs/document.c:301
+msgid "No header info."
+msgstr "Geen kopinligting."
+
+#: src/dialogs/download.c:243 src/dialogs/menu.c:593
+#: src/protocol/bittorrent/dialogs.c:228 src/session/download.c:398
+msgid "Download"
+msgstr "Aflaai"
+
+#. accelerator_context(display_download)
+#: src/dialogs/download.c:250
+msgid "~Background"
+msgstr "~Agtergrond"
+
+#. accelerator_context(display_download)
+#: src/dialogs/download.c:251
+msgid "Background with ~notify"
+msgstr "Agtergrond met ~kennisgewing"
+
+#. accelerator_context(display_download, src/dialogs/download.c:download_buttons)
+#: src/dialogs/download.c:258 src/dialogs/download.c:493
+msgid "~Abort"
+msgstr "~Staak"
+
+#. accelerator_context(display_download)
+#: src/dialogs/download.c:263
+msgid "Abort and ~delete file"
+msgstr "Staak en s~krap lĂŞer"
+
+#. cant_delete_item
+#: src/dialogs/download.c:423
+#, c-format
+msgid "Sorry, but download \"%s\" cannot be interrupted."
+msgstr "Jammer, maar aflaai \"%s\" kan nie onderbreek word nie."
+
+#. cant_delete_used_item
+#: src/dialogs/download.c:425
+#, c-format
+msgid "Sorry, but download \"%s\" is being used by something else."
+msgstr "Jammer, maar aflaai \"%s\" word deur iets anders gebruik."
+
+#. delete_marked_items_title
+#: src/dialogs/download.c:431
+msgid "Interrupt marked downloads"
+msgstr "Onderbreek gemerkte aflaaie"
+
+#. delete_marked_items
+#: src/dialogs/download.c:433
+msgid "Interrupt marked downloads?"
+msgstr "Onderbreek gemerkte aflaaie?"
+
+#. delete_item_title
+#: src/dialogs/download.c:439
+msgid "Interrupt download"
+msgstr "Onderbreek aflaai"
+
+#: src/dialogs/download.c:441
+#, c-format
+msgid "Interrupt this download?"
+msgstr "Onderbreek hierdie aflaai?"
+
+#. clear_all_items_title
+#: src/dialogs/download.c:443
+msgid "Interrupt all downloads"
+msgstr "Onderbreek alle aflaaie"
+
+#. clear_all_items_title
+#: src/dialogs/download.c:445
+msgid "Do you really want to interrupt all downloads?"
+msgstr "Wil u regtig alle aflaaie onderbreek?"
+
+#. This requires more work to make locking work and query the user
+#: src/dialogs/download.c:496
+msgid "Abort and delete file"
+msgstr "Staak en skrap lĂŞer"
+
+#: src/dialogs/download.c:503
+msgid "Download manager"
+msgstr "Aflaaibestuurder"
+
+#. name:
+#: src/dialogs/exmode.c:149
+msgid "Exmode"
+msgstr "Ex-modus"
+
+#: src/dialogs/info.c:41
+msgid "About"
+msgstr "Aangaande"
+
+#: src/dialogs/info.c:131
+msgid "Keys"
+msgstr "Sleutels"
+
+#: src/dialogs/info.c:142
+msgid "Copying"
+msgstr ""
+
+#: src/dialogs/info.c:143
+#, c-format
+msgid ""
+"ELinks %s\n"
+"\n"
+"(C) 1999 - 2002 Mikulas Patocka\n"
+"(C) 2001 - 2004 Petr Baudis\n"
+"(C) 2002 - 2006 Jonas Fonseca\n"
+"and others\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation, specifically version 2 of the License."
+msgstr ""
+"ELinks %s\n"
+"\n"
+"(C) 1999 - 2002 Mikulas Patocka\n"
+"(C) 2001 - 2004 Petr Baudis\n"
+"(C) 2002 - 2006 Jonas Fonseca\n"
+"en andere\n"
+"\n"
+"Hierdie program is Vrye Sagteware; u kan dit herversprei en/of wysig "
+"onderhewig aan die voorwaardes van die GNU Algemene Publieke Lisensie soos "
+"gepubliseer deur die Stigting vir Vrye Sagteware, spesifiek weergawe 2 van "
+"die lisensie."
+
+#: src/dialogs/info.c:171 src/dialogs/info.c:276
+msgid "Resources"
+msgstr "Hulpbronne"
+
+#: src/dialogs/info.c:175
+#, c-format
+msgid "%ld handle"
+msgid_plural "%ld handles"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/info.c:179
+#, c-format
+msgid "%ld timer"
+msgid_plural "%ld timers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/info.c:186
+#, c-format
+msgid "%ld connection"
+msgid_plural "%ld connections"
+msgstr[0] "%ld verbinding"
+msgstr[1] "%ld verbindings"
+
+#: src/dialogs/info.c:190
+#, c-format
+msgid "%ld connecting"
+msgid_plural "%ld connecting"
+msgstr[0] "%ld verbind"
+msgstr[1] "%ld verbind"
+
+#: src/dialogs/info.c:194
+#, c-format
+msgid "%ld transferring"
+msgid_plural "%ld transferring"
+msgstr[0] "%ld dra oor"
+msgstr[1] "%ld dra oor"
+
+#: src/dialogs/info.c:198
+#, c-format
+msgid "%ld keepalive"
+msgid_plural "%ld keepalive"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/info.c:206 src/dialogs/info.c:258
+#, c-format
+msgid "%ld byte"
+msgid_plural "%ld bytes"
+msgstr[0] "%ld greep"
+msgstr[1] "%ld grepe"
+
+#: src/dialogs/info.c:210
+#, c-format
+msgid "%ld file"
+msgid_plural "%ld files"
+msgstr[0] "%ld lĂŞer"
+msgstr[1] "%ld lĂŞers"
+
+#: src/dialogs/info.c:214 src/dialogs/info.c:229
+#, c-format
+msgid "%ld in use"
+msgid_plural "%ld in use"
+msgstr[0] "%ld in gebruik"
+msgstr[1] "%ld in gebruik"
+
+#: src/dialogs/info.c:218
+#, c-format
+msgid "%ld loading"
+msgid_plural "%ld loading"
+msgstr[0] "%ld laai"
+msgstr[1] "%ld laai"
+
+#: src/dialogs/info.c:221
+msgid "Document cache"
+msgstr "Dokumentkas"
+
+#: src/dialogs/info.c:225
+#, c-format
+msgid "%ld formatted"
+msgid_plural "%ld formatted"
+msgstr[0] "%ld geformateer"
+msgstr[1] "%ld geformateer"
+
+#: src/dialogs/info.c:233
+#, c-format
+msgid "%ld refreshing"
+msgid_plural "%ld refreshing"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/dialogs/info.c:236
+msgid "Interlinking"
+msgstr ""
+
+#: src/dialogs/info.c:239
+msgid "master terminal"
+msgstr "meesterterminaal"
+
+#: src/dialogs/info.c:241
+msgid "slave terminal"
+msgstr "slaafterminaal"
+
+#: src/dialogs/info.c:245
+#, c-format
+msgid "%ld terminal"
+msgid_plural "%ld terminals"
+msgstr[0] "%ld terminaal"
+msgstr[1] "%ld terminale"
+
+#: src/dialogs/info.c:249
+#, c-format
+msgid "%ld session"
+msgid_plural "%ld sessions"
+msgstr[0] "%ld sessie"
+msgstr[1] "%ld sessies"
+
+#: src/dialogs/info.c:254
+msgid "Memory allocated"
+msgstr ""
+
+#: src/dialogs/info.c:262
+#, c-format
+msgid "%ld byte overhead"
+msgid_plural "%ld bytes overhead"
+msgstr[0] "%ld greep oorhoofse koste"
+msgstr[1] "%ld grepe oorhoofse koste"
+
+#: src/dialogs/menu.c:96
+msgid "Save URL"
+msgstr "Stoor URL"
+
+#: src/dialogs/menu.c:96 src/dialogs/menu.c:537
+msgid "Enter URL"
+msgstr "Tik URL in"
+
+#: src/dialogs/menu.c:121
+msgid "Exit ELinks"
+msgstr "Verlaat ELinks"
+
+#: src/dialogs/menu.c:123
+msgid "Do you really want to exit ELinks (and terminate all downloads)?"
+msgstr "Wil u regtig ELinks verlaat (en alle aflaaie nietig maak)?"
+
+#: src/dialogs/menu.c:125
+msgid "Do you really want to exit ELinks?"
+msgstr "Wil u regtig ELinks verlaat?"
+
+#: src/dialogs/menu.c:161
+msgid "No history"
+msgstr "Geen geskiedenis"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu, tab_menu)
+#: src/dialogs/menu.c:233 src/dialogs/menu.c:309
+msgid "Go ~back"
+msgstr "Gaan ~terug"
+
+#. accelerator_context(tab_menu)
+#: src/dialogs/menu.c:234
+msgid "Go for~ward"
+msgstr "Gaan ~vorentoe"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu, tab_menu)
+#: src/dialogs/menu.c:241 src/dialogs/menu.c:322
+msgid "Bookm~ark document"
+msgstr "~Boekmerk dokument"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
+#: src/dialogs/menu.c:245 src/dialogs/menu.c:414
+msgid "Toggle ~html/plain"
+msgstr "Wissel ~html/gewoon"
+
+#. accelerator_context(tab_menu)
+#: src/dialogs/menu.c:246
+msgid "~Reload"
+msgstr "~Herlaai"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
+#: src/dialogs/menu.c:249 src/dialogs/menu.c:424
+msgid "Frame at ~full-screen"
+msgstr "Raam in ~volle skerm"
+
+#. accelerator_context(tab_menu)
+#: src/dialogs/menu.c:251
+msgid "~Pass frame URI to external command"
+msgstr "~Stuur raam se URI na eksterne opdrag"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
+#: src/dialogs/menu.c:259 src/dialogs/menu.c:426
+msgid "Nex~t tab"
+msgstr "Vol~gende oortjie"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
+#: src/dialogs/menu.c:260 src/dialogs/menu.c:427
+msgid "Pre~v tab"
+msgstr "Vo~rige oortjie"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu)
+#: src/dialogs/menu.c:263 src/dialogs/menu.c:428
+msgid "~Close tab"
+msgstr "~Sluit oortjie"
+
+#. accelerator_context(tab_menu)
+#: src/dialogs/menu.c:266
+msgid "C~lose all tabs but the current"
+msgstr "S~luit alle oortjies behalwe die huidige een"
+
+#. accelerator_context(tab_menu)
+#: src/dialogs/menu.c:270
+msgid "B~ookmark all tabs"
+msgstr "B~oekmerk alle oortjies"
+
+#. accelerator_context(tab_menu)
+#: src/dialogs/menu.c:278
+msgid "Pass tab URI to e~xternal command"
+msgstr "Stuur oortjie se URI na ~eksterke opdrag"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:306
+msgid "Open new ~tab"
+msgstr "Open nuwe ~oortjie"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:307
+msgid "Open new tab in backgroun~d"
+msgstr "Maak nuwe oortjie oop in die agtergron~d"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:308
+msgid "~Go to URL"
+msgstr "~Gaan na URL"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:310
+msgid "Go ~forward"
+msgstr "Gaan ~vorentoe"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:311
+msgid "~History"
+msgstr "Ge~skiedenis"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:312
+msgid "~Unhistory"
+msgstr "~Toekoms"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:318
+msgid "~Save as"
+msgstr "~Stoor as"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:319
+msgid "Save UR~L as"
+msgstr "Stoor UR~L as"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:320
+msgid "Sa~ve formatted document"
+msgstr "Stoor ge~formatteerde teks"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:329
+msgid "~Kill background connections"
+msgstr ""
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:330
+msgid "Flush all ~caches"
+msgstr ""
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:331
+msgid "Resource ~info"
+msgstr "~Hulpbroninligting"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:338
+msgid "E~xit"
+msgstr "~Sluit af"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:365
+msgid "Open ~new window"
+msgstr "Open nuwe ~venster"
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:384
+msgid "~OS shell"
+msgstr ""
+
+#. accelerator_context(src/dialogs/menu.c:file_menu)
+#: src/dialogs/menu.c:391
+msgid "Resize t~erminal"
+msgstr "Stel t~erminaalgrootte"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:409
+msgid "Search ~backward"
+msgstr "Soek ~agtertoe"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:410
+msgid "Find ~next"
+msgstr "Vind vol~gende"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:411
+msgid "Find ~previous"
+msgstr "Vind vo~rige"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:412
+msgid "T~ypeahead search"
+msgstr ""
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:415
+msgid "Toggle i~mages"
+msgstr "Wissel ~prente"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:416
+msgid "Toggle ~link numbering"
+msgstr "Wissel ~skakelnommers"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:417
+msgid "Toggle ~document colors"
+msgstr "Wissel ~dokumentkleure"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:418
+msgid "~Wrap text on/off"
+msgstr "Wissel ~teksomvouing"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:420
+msgid "Document ~info"
+msgstr "Dokument~inligting"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:421
+msgid "H~eader info"
+msgstr "~Kopinligting"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:422
+msgid "Rel~oad document"
+msgstr "~Herlaai dokument"
+
+#. accelerator_context(src/dialogs/menu.c:view_menu)
+#: src/dialogs/menu.c:423
+msgid "~Rerender document"
+msgstr "~Teken dokument oor"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:435
+msgid "~ELinks homepage"
+msgstr "~ELinks-tuisblad"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:436
+msgid "~Documentation"
+msgstr "~Dokumentasie"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:437
+msgid "~Keys"
+msgstr "~Sleutels"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:439
+msgid "LED ~indicators"
+msgstr "~LED-aanwysers"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:442
+msgid "~Bugs information"
+msgstr "~Foute-inligting"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:444
+msgid "ELinks ~GITWeb"
+msgstr "ELinks-~GITWeb"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:447
+msgid "~Copying"
+msgstr "~KopiĂŤring"
+
+#. accelerator_context(src/dialogs/menu.c:help_menu)
+#: src/dialogs/menu.c:448
+msgid "~About"
+msgstr "~Aangaande"
+
+#. accelerator_context(src/dialogs/menu.c:ext_menu)
+#: src/dialogs/menu.c:456
+msgid "~Modify"
+msgstr "~Wysig"
+
+#. accelerator_context(src/dialogs/menu.c:setup_menu)
+#: src/dialogs/menu.c:464 src/dialogs/menu.c:478
+msgid "~Language"
+msgstr "~Taal"
+
+#. accelerator_context(src/dialogs/menu.c:setup_menu)
+#: src/dialogs/menu.c:466 src/dialogs/menu.c:479
+msgid "C~haracter set"
+msgstr "~Karakterstel"
+
+#. accelerator_context(src/dialogs/menu.c:setup_menu)
+#: src/dialogs/menu.c:467 src/dialogs/menu.c:480
+msgid "~Terminal options"
+msgstr "T~erminaalkeuses"
+
+#. accelerator_context(src/dialogs/menu.c:setup_menu)
+#: src/dialogs/menu.c:468
+msgid "File ~extensions"
+msgstr "~LĂŞeruitbreidings"
+
+#. accelerator_context(src/dialogs/menu.c:setup_menu)
+#: src/dialogs/menu.c:470
+msgid "~Options manager"
+msgstr "Ke~usebestuurder"
+
+#. accelerator_context(src/dialogs/menu.c:setup_menu)
+#: src/dialogs/menu.c:471
+msgid "~Keybinding manager"
+msgstr "Kortpa~dbestuurder"
+
+#. accelerator_context(src/dialogs/menu.c:setup_menu)
+#: src/dialogs/menu.c:472
+msgid "~Save options"
+msgstr "~Stoor keuses"
+
+#. accelerator_context(src/dialogs/menu.c:tools_menu)
+#: src/dialogs/menu.c:487
+msgid "Global ~history"
+msgstr "Globale ~geskiedenis"
+
+#. accelerator_context(src/dialogs/menu.c:tools_menu)
+#: src/dialogs/menu.c:490
+msgid "~Bookmarks"
+msgstr "~Boekmerke"
+
+#. accelerator_context(src/dialogs/menu.c:tools_menu)
+#: src/dialogs/menu.c:492
+msgid "~Cache"
+msgstr "~Kas"
+
+#. accelerator_context(src/dialogs/menu.c:tools_menu)
+#: src/dialogs/menu.c:493
+msgid "~Downloads"
+msgstr "~Afgelaai"
+
+#. accelerator_context(src/dialogs/menu.c:tools_menu)
+#: src/dialogs/menu.c:495
+msgid "Coo~kies"
+msgstr "K~oekies"
+
+#. accelerator_context(src/dialogs/menu.c:tools_menu)
+#: src/dialogs/menu.c:498
+msgid "~Form history"
+msgstr "~Vormgeskiedenis"
+
+#. accelerator_context(src/dialogs/menu.c:tools_menu)
+#: src/dialogs/menu.c:500
+msgid "~Authentication"
+msgstr "~Magtiging"
+
+#. accelerator_context(src/dialogs/menu.c:main_menu)
+#: src/dialogs/menu.c:517
+msgid "~File"
+msgstr "~LĂŞer"
+
+#. accelerator_context(src/dialogs/menu.c:main_menu)
+#: src/dialogs/menu.c:518
+msgid "~View"
+msgstr "~Bekyk"
+
+#. accelerator_context(src/dialogs/menu.c:main_menu)
+#: src/dialogs/menu.c:519
+msgid "~Link"
+msgstr "~Skakel"
+
+#. accelerator_context(src/dialogs/menu.c:main_menu)
+#: src/dialogs/menu.c:520
+msgid "~Tools"
+msgstr "~Nutsgoed"
+
+#. accelerator_context(src/dialogs/menu.c:main_menu)
+#: src/dialogs/menu.c:521
+msgid "~Setup"
+msgstr "~Opstelling"
+
+#. accelerator_context(src/dialogs/menu.c:main_menu)
+#: src/dialogs/menu.c:522
+msgid "~Help"
+msgstr "~Hulp"
+
+#: src/dialogs/menu.c:537
+msgid "Go to URL"
+msgstr "Gaan na URL"
+
+#: src/dialogs/menu.c:593
+msgid "Save to file"
+msgstr "Stoor na lĂŞer"
+
+#: src/dialogs/menu.c:928
+msgid "Empty directory"
+msgstr "LeĂŤ gids"
+
+#: src/dialogs/menu.c:972
+msgid "Directories:"
+msgstr "Gidse:"
+
+#: src/dialogs/menu.c:985
+msgid "Files:"
+msgstr "LĂŞers:"
+
+#. 2 '\n' + 1 '\0'
+#: src/dialogs/options.c:173
+#, c-format
+msgid ""
+"The environmental variable TERM is set to '%s'.\n"
+"\n"
+"ELinks maintains separate sets of values for these options\n"
+"and chooses the appropriate set based on the value of TERM.\n"
+"This allows you to configure the settings appropriately for\n"
+"each terminal in which you run ELinks."
+msgstr ""
+
+#: src/dialogs/options.c:199
+msgid "Terminal options"
+msgstr "Terminaalkeuses"
+
+#: src/dialogs/options.c:208
+msgid "Frame handling:"
+msgstr ""
+
+#: src/dialogs/options.c:209
+msgid "No frames"
+msgstr ""
+
+#: src/dialogs/options.c:210
+msgid "VT 100 frames"
+msgstr ""
+
+#: src/dialogs/options.c:211
+msgid "Linux or OS/2 frames"
+msgstr ""
+
+#: src/dialogs/options.c:212
+msgid "FreeBSD frames"
+msgstr ""
+
+#: src/dialogs/options.c:213
+msgid "KOI8-R frames"
+msgstr ""
+
+#: src/dialogs/options.c:215
+msgid "Color mode:"
+msgstr "Kleurmodus:"
+
+#: src/dialogs/options.c:216
+msgid "No colors (mono)"
+msgstr "Geen kleure (mono)"
+
+#: src/dialogs/options.c:217
+msgid "16 colors"
+msgstr "16 kleure"
+
+#: src/dialogs/options.c:219
+msgid "88 colors"
+msgstr "88 kleure"
+
+#: src/dialogs/options.c:222
+msgid "256 colors"
+msgstr "256 kleure"
+
+#: src/dialogs/options.c:225
+msgid "true color"
+msgstr "egte kleur"
+
+#: src/dialogs/options.c:309
+msgid "Resize terminal"
+msgstr ""
+
+#: src/dialogs/options.c:312
+msgid "Width="
+msgstr ""
+
+#: src/dialogs/options.c:313
+msgid "Height="
+msgstr ""
+
+#. FIXME: The following is a PITA from the l10n standpoint. A *big*
+#. * one, _("of")-like pearls are a nightmare. Format strings need to
+#. * be introduced to this fuggy corner of code as well. --pasky
+#: src/dialogs/progress.c:32
+msgid "Received"
+msgstr "Het ontvang"
+
+#: src/dialogs/progress.c:37
+msgid "of"
+msgstr "van"
+
+#: src/dialogs/progress.c:48
+msgid "Average speed"
+msgstr "Gemiddelde spoed"
+
+#: src/dialogs/progress.c:49
+msgid "average speed"
+msgstr "gemiddelde spoed"
+
+#: src/dialogs/progress.c:50
+msgid "avg"
+msgstr "gem"
+
+#: src/dialogs/progress.c:58
+msgid "current speed"
+msgstr "huidige spoed"
+
+#: src/dialogs/progress.c:58
+msgid "cur"
+msgstr "tans"
+
+#: src/dialogs/progress.c:65
+msgid "Elapsed time"
+msgstr "Tyd verby"
+
+#: src/dialogs/progress.c:66
+msgid "elapsed time"
+msgstr "tyd verby"
+
+#: src/dialogs/progress.c:67
+msgid "ETT"
+msgstr ""
+
+#: src/dialogs/progress.c:73
+msgid "Speed"
+msgstr "Spoed"
+
+#: src/dialogs/progress.c:73
+msgid "speed"
+msgstr "spoed"
+
+#: src/dialogs/progress.c:83
+msgid "estimated time"
+msgstr "geskatte tyd"
+
+#: src/dialogs/progress.c:84
+msgid "ETA"
+msgstr ""
+
+#: src/dialogs/status.c:184
+msgid "Enter a mark to set"
+msgstr ""
+
+#: src/dialogs/status.c:188
+msgid "Enter a mark to which to jump"
+msgstr ""
+
+#: src/dialogs/status.c:195
+#, c-format
+msgid "Keyboard prefix: %d"
+msgstr ""
+
+#: src/dialogs/status.c:219
+#, c-format
+msgid "Cursor position: %dx%d"
+msgstr ""
+
+#: src/dialogs/status.c:319
+msgid "Untitled"
+msgstr "Naamloos"
+
+#: src/dialogs/status.c:321
+msgid "No document"
+msgstr "Geen dokument"
+
+#. name:
+#: src/document/css/css.c:28 src/document/css/css.c:155
+msgid "Cascading Style Sheets"
+msgstr "Cascading Style Sheets"
+
+#: src/document/css/css.c:30
+msgid "Options concerning how to use CSS for styling documents."
+msgstr "Keuses oor hoe om CSS te gebruik vir stilering van dokumente."
+
+#: src/document/css/css.c:32
+msgid "Enable CSS"
+msgstr "Aktiveer CSS"
+
+#: src/document/css/css.c:34
+msgid "Enable adding of CSS style info to documents."
+msgstr "Aktiveer die toevoeging van CSS-stylinligting tot dokumente."
+
+#: src/document/css/css.c:36
+msgid "Import external style sheets"
+msgstr "Voer eksterne styllĂŞers in"
+
+#: src/document/css/css.c:38
+msgid ""
+"When enabled any external style sheets that are imported from\n"
+"either CSS itself using the @import keyword or from the HTML using\n"
+"<link> tags in the document header will also be downloaded."
+msgstr ""
+
+#: src/document/css/css.c:42
+msgid "Default style sheet"
+msgstr "Verstek styllĂŞer"
+
+#: src/document/css/css.c:44
+msgid ""
+"The path to the file containing the default user defined\n"
+"Cascading Style Sheet. It can be used to control the basic\n"
+"layout of HTML documents. The path is assumed to be relative\n"
+"to ELinks' home directory.\n"
+"Leave as \"\" to use built-in document styling."
+msgstr ""
+
+#. name:
+#: src/ecmascript/ecmascript.c:40 src/ecmascript/ecmascript.c:311
+msgid "ECMAScript"
+msgstr "ECMAScript"
+
+#: src/ecmascript/ecmascript.c:42
+msgid "ECMAScript options."
+msgstr "ECMAScript-keuses."
+
+#: src/ecmascript/ecmascript.c:46
+msgid "Whether to run those scripts inside of documents."
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:48
+msgid "Script error reporting"
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:50
+msgid "Open a message box when a script reports an error."
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:52
+msgid "Ignore <noscript> content"
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:54
+msgid ""
+"Whether to ignore content enclosed by the <noscript> tag\n"
+"when ECMAScript is enabled."
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:57
+msgid "Maximum execution time"
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:59
+msgid "Maximum execution time in seconds for a script."
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:61
+msgid "Pop-up window blocking"
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:63
+msgid "Whether to disallow scripts to open new windows or tabs."
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:256
+msgid "JavaScript Emergency"
+msgstr ""
+
+#: src/ecmascript/ecmascript.c:258
+#, c-format
+msgid ""
+"A script embedded in the current document was running\n"
+"for more than %d seconds. This probably means there is\n"
+"a bug in the script and it could have halted the whole\n"
+"ELinks, so the script execution was interrupted."
+msgstr ""
+
+#: src/ecmascript/see/window.c:211 src/ecmascript/spidermonkey/window.c:286
+msgid "JavaScript Alert"
+msgstr ""
+
+#: src/ecmascript/spidermonkey.c:88
+#, c-format
+msgid "A script embedded in the current document raised the following%s%s%s%s"
+msgstr ""
+
+#: src/ecmascript/spidermonkey.c:104
+msgid "JavaScript Error"
+msgstr ""
+
+#: src/formhist/dialogs.c:67
+msgid "Forms are never saved for this URL."
+msgstr ""
+
+#: src/formhist/dialogs.c:69
+msgid "Forms are saved for this URL."
+msgstr ""
+
+#. cant_delete_item
+#: src/formhist/dialogs.c:120
+#, c-format
+msgid "Sorry, but form \"%s\" cannot be deleted."
+msgstr ""
+
+#. cant_delete_used_item
+#: src/formhist/dialogs.c:122
+#, c-format
+msgid "Sorry, but form \"%s\" is being used by something else."
+msgstr ""
+
+#. delete_marked_items_title
+#: src/formhist/dialogs.c:128
+msgid "Delete marked forms"
+msgstr ""
+
+#. delete_marked_items
+#: src/formhist/dialogs.c:130
+msgid "Delete marked forms?"
+msgstr ""
+
+#. delete_item_title
+#: src/formhist/dialogs.c:136
+msgid "Delete form"
+msgstr ""
+
+#: src/formhist/dialogs.c:138
+#, c-format
+msgid "Delete this form?"
+msgstr ""
+
+#. clear_all_items_title
+#: src/formhist/dialogs.c:140
+msgid "Clear all forms"
+msgstr ""
+
+#. clear_all_items_title
+#: src/formhist/dialogs.c:142
+msgid "Do you really want to remove all forms?"
+msgstr ""
+
+#: src/formhist/dialogs.c:173
+msgid "Form not saved"
+msgstr ""
+
+#: src/formhist/dialogs.c:174
+msgid ""
+"No saved information for this URL.\n"
+"If you want to save passwords for this URL, enable it by pressing the "
+"\"Toggle saving\" button."
+msgstr ""
+
+#. accelerator_context(src/formhist/dialogs.c:formhist_buttons)
+#: src/formhist/dialogs.c:209
+msgid "~Login"
+msgstr "Meld aan"
+
+#. accelerator_context(src/formhist/dialogs.c:formhist_buttons)
+#: src/formhist/dialogs.c:212
+msgid "~Toggle saving"
+msgstr ""
+
+#. accelerator_context(src/formhist/dialogs.c:formhist_buttons)
+#: src/formhist/dialogs.c:213
+msgid "Clea~r"
+msgstr ""
+
+#: src/formhist/dialogs.c:219
+msgid "Form history manager"
+msgstr "Vormgeskiedenisbestuurder"
+
+#: src/formhist/formhist.c:36
+msgid "Show form history dialog"
+msgstr "Wys vormgeskiedenisbestuurder"
+
+#: src/formhist/formhist.c:38
+msgid ""
+"Ask if a login form should be saved to file or not.\n"
+"This option only disables the dialog, already saved login\n"
+"forms are unaffected."
+msgstr ""
+"Vra of aanmeldinligting in 'n lĂŞergestoor moet word.\n"
+"Hierdie keuse deaktiveer slegs die vraag. Reeds\n"
+"gestuurde inligting word nie geaffekteer nie."
+
+#: src/formhist/formhist.c:413
+msgid "Form history"
+msgstr "Vormgeskiedenis"
+
+#: src/formhist/formhist.c:414
+msgid ""
+"Should this login be remembered?\n"
+"\n"
+"Please note that the password will be stored obscured (but unencrypted) in a "
+"file on your disk.\n"
+"\n"
+"If you are using a valuable password, answer NO."
+msgstr ""
+"Moet hierdie aanmelding onthou word?\n"
+"\n"
+"Let wel: die wagwoord sal in 'n obskure (maar\n"
+"ongeĂŤnkripteerde) formaat gestoor word in 'n lĂŞer op u\n"
+"skyf. Indien u 'n kosbare wagwoord gebruik, antwoord NEE."
+
+#. accelerator_context(memorize_form)
+#: src/formhist/formhist.c:421
+msgid "Ne~ver for this site"
+msgstr "N~ooit vir hierdie werf nie"
+
+#. name:
+#: src/formhist/formhist.c:440
+msgid "Form History"
+msgstr "Vormgeskiedenis"
+
+#. cant_delete_item
+#: src/globhist/dialogs.c:105
+#, c-format
+msgid "Sorry, but history entry \"%s\" cannot be deleted."
+msgstr "Jammer, maar die geskiedenisitem \"%s\" kan nie geskrap word nie."
+
+#. cant_delete_used_item
+#: src/globhist/dialogs.c:107
+#, c-format
+msgid "Sorry, but history entry \"%s\" is being used by something else."
+msgstr "Jammer, maar die geskiedenisitem \"%s\" word deur iets anders gebruik."
+
+#. delete_marked_items_title
+#: src/globhist/dialogs.c:113
+msgid "Delete marked history entries"
+msgstr "Skrap gemerkte geskiedenisitems"
+
+#. delete_marked_items
+#: src/globhist/dialogs.c:115
+msgid "Delete marked history entries?"
+msgstr "Skrap gemerkte geskiedenisitems?"
+
+#. delete_item_title
+#: src/globhist/dialogs.c:121
+msgid "Delete history entry"
+msgstr "Skrap geskiedenisitem"
+
+#: src/globhist/dialogs.c:123
+#, c-format
+msgid "Delete this history entry?"
+msgstr "Skrap hierdie geskiedenisitem?"
+
+#. clear_all_items_title
+#: src/globhist/dialogs.c:125
+msgid "Clear all history entries"
+msgstr "Skrap alle geskiedenisitems"
+
+#. clear_all_items_title
+#: src/globhist/dialogs.c:127
+msgid "Do you really want to remove all history entries?"
+msgstr "Wil u regtig alle geskiedenisitems skrap?"
+
+#: src/globhist/dialogs.c:169
+msgid "Search history"
+msgstr "Deursoek geskiedenis"
+
+#. accelerator_context(src/globhist/dialogs.c:globhist_buttons)
+#: src/globhist/dialogs.c:227
+msgid "~Bookmark"
+msgstr "~Boekmerk"
+
+#: src/globhist/dialogs.c:241
+msgid "Global history manager"
+msgstr "Globale geskiedenisbestuurder"
+
+#: src/globhist/globhist.c:60
+msgid "Global history"
+msgstr "Globale geskiedenis"
+
+#: src/globhist/globhist.c:62
+msgid "Global history options."
+msgstr "Keuses oor globale geskiedenis."
+
+#: src/globhist/globhist.c:66
+msgid "Enable global history (\"history of all pages visited\")."
+msgstr ""
+"Aktiveer globale geskiedenis (\"geskiedenis van alle besoekte bladsye\")."
+
+#: src/globhist/globhist.c:68
+msgid "Maximum number of entries"
+msgstr "Maksimum aantal inskrywings"
+
+#: src/globhist/globhist.c:70
+msgid "Maximum number of entries in the global history."
+msgstr "Maksimum aantal inskrywings in die globale geskiedenis."
+
+#: src/globhist/globhist.c:72
+msgid "Display style"
+msgstr "Vertoonstyl"
+
+#: src/globhist/globhist.c:74
+msgid ""
+"What to display in global history dialog:\n"
+"0 is URLs\n"
+"1 is page titles"
+msgstr ""
+"Wat om in die globalegeskiedenisdialoog te wys:\n"
+"0 is URL'e\n"
+"1 is bladsytitels"
+
+#. name:
+#: src/globhist/globhist.c:448
+msgid "Global History"
+msgstr "Globale geskiedenis"
+
+#: src/intl/gettext/libintl.c:27
+msgid "System"
+msgstr "Stelsel"
+
+#: src/intl/gettext/libintl.c:28
+msgid "English"
+msgstr "Engels"
+
+#: src/intl/gettext/libintl.c:30
+msgid "Afrikaans"
+msgstr ""
+
+#: src/intl/gettext/libintl.c:31
+msgid "Belarusian"
+msgstr "Belo-Russies"
+
+#: src/intl/gettext/libintl.c:32
+msgid "Brazilian Portuguese"
+msgstr "Brasiliaanse Portugees"
+
+#: src/intl/gettext/libintl.c:33
+msgid "Bulgarian"
+msgstr "Bulgaars"
+
+#: src/intl/gettext/libintl.c:34
+msgid "Catalan"
+msgstr "Katalaans"
+
+#: src/intl/gettext/libintl.c:35
+msgid "Croatian"
+msgstr "Kroaties"
+
+#: src/intl/gettext/libintl.c:36
+msgid "Czech"
+msgstr "Tsjeggies"
+
+#: src/intl/gettext/libintl.c:37
+msgid "Danish"
+msgstr "Deens"
+
+#: src/intl/gettext/libintl.c:38
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: src/intl/gettext/libintl.c:39
+msgid "Estonian"
+msgstr "Estnies"
+
+#: src/intl/gettext/libintl.c:40
+msgid "Finnish"
+msgstr "Fins"
+
+#: src/intl/gettext/libintl.c:41
+msgid "French"
+msgstr "Frans"
+
+#: src/intl/gettext/libintl.c:42
+msgid "Galician"
+msgstr "Gallikaans"
+
+#: src/intl/gettext/libintl.c:43
+msgid "German"
+msgstr "Duits"
+
+#: src/intl/gettext/libintl.c:44
+msgid "Greek"
+msgstr "Grieks"
+
+#: src/intl/gettext/libintl.c:45
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: src/intl/gettext/libintl.c:46
+msgid "Icelandic"
+msgstr "Yslands"
+
+#: src/intl/gettext/libintl.c:47
+msgid "Indonesian"
+msgstr "Indonesies"
+
+#: src/intl/gettext/libintl.c:48
+msgid "Italian"
+msgstr "Italiaans"
+
+#: src/intl/gettext/libintl.c:49
+msgid "Lithuanian"
+msgstr "Litous"
+
+#: src/intl/gettext/libintl.c:50
+msgid "Norwegian"
+msgstr "Noors"
+
+#: src/intl/gettext/libintl.c:51
+msgid "Polish"
+msgstr "Pools"
+
+#: src/intl/gettext/libintl.c:52
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: src/intl/gettext/libintl.c:53
+msgid "Romanian"
+msgstr "Romeens"
+
+#: src/intl/gettext/libintl.c:54
+msgid "Russian"
+msgstr "Russies"
+
+#: src/intl/gettext/libintl.c:55
+msgid "Serbian"
+msgstr "Serwies"
+
+#: src/intl/gettext/libintl.c:56
+msgid "Slovak"
+msgstr "Slowaaks"
+
+#: src/intl/gettext/libintl.c:57
+msgid "Spanish"
+msgstr "Spaans"
+
+#: src/intl/gettext/libintl.c:58
+msgid "Swedish"
+msgstr "Sweeds"
+
+#: src/intl/gettext/libintl.c:59
+msgid "Turkish"
+msgstr "Turks"
+
+#: src/intl/gettext/libintl.c:60
+msgid "Ukrainian"
+msgstr "OekraĂŻens"
+
+#: src/main/interlink.c:329 src/main/select.c:257
+#, c-format
+msgid "The call to %s failed: %d (%s)"
+msgstr ""
+
+#: src/main/main.c:136
+msgid "Cannot create a pipe for internal communication."
+msgstr ""
+
+#: src/main/main.c:200
+#, c-format
+msgid "URL expected after -%s"
+msgstr ""
+
+#: src/main/main.c:208
+msgid "No running ELinks found."
+msgstr ""
+
+#. The remote session(s) can not be created
+#: src/main/main.c:215
+msgid "No remote session to connect to."
+msgstr ""
+
+#: src/main/main.c:224
+msgid "Unable to encode session info."
+msgstr ""
+
+#: src/main/main.c:241
+msgid "Unable to attach_terminal()."
+msgstr ""
+
+#. Infinite loop prevention.
+#: src/main/select.c:260
+#, c-format
+msgid "%d select() failures."
+msgstr ""
+
+#: src/main/version.c:81
+#, c-format
+msgid "Built on %s %s"
+msgstr "Gebou op %s %s"
+
+#: src/main/version.c:84
+msgid "Text WWW browser"
+msgstr "Teks-WWW-blaaier"
+
+#: src/main/version.c:86
+#, c-format
+msgid " (built on %s %s)"
+msgstr ""
+
+#: src/main/version.c:92
+msgid "Features:"
+msgstr ""
+
+#: src/main/version.c:94
+msgid "Standard"
+msgstr "Standaard"
+
+#: src/main/version.c:96
+msgid "Debug"
+msgstr "Ontfout"
+
+#: src/main/version.c:99
+msgid "Fastmem"
+msgstr ""
+
+#: src/main/version.c:102
+msgid "Own Libc Routines"
+msgstr ""
+
+#: src/main/version.c:105
+msgid "No Backtrace"
+msgstr ""
+
+#: src/main/version.c:120
+msgid "No mouse"
+msgstr ""
+
+#: src/mime/backend/default.c:25
+msgid "MIME type associations"
+msgstr ""
+
+#: src/mime/backend/default.c:27
+msgid ""
+"Handler <-> MIME type association. The first sub-tree is the MIME\n"
+"class while the second sub-tree is the MIME type (ie. image/gif\n"
+"handler will reside at mime.type.image.gif). Each MIME type option\n"
+"should contain (case-sensitive) name of the MIME handler (its\n"
+"properties are stored at mime.handler.<name>)."
+msgstr ""
+
+#: src/mime/backend/default.c:35
+msgid ""
+"Handler matching this MIME-type class ('*' is used here in place\n"
+"of '.')."
+msgstr ""
+
+#: src/mime/backend/default.c:40
+msgid ""
+"Handler matching this MIME-type name ('*' is used here in place\n"
+"of '.')."
+msgstr ""
+
+#: src/mime/backend/default.c:44
+msgid "File type handlers"
+msgstr ""
+
+#: src/mime/backend/default.c:46
+msgid ""
+"A file type handler is a set of information about how to use\n"
+"an external program to view a file. It is possible to refer to it\n"
+"for several MIME types -- e.g., you can define an 'image' handler\n"
+"to which mime.type.image.png, mime.type.image.jpeg, and so on will\n"
+"refer; or one might define a handler for a more specific type of file\n"
+"-- e.g., PDF files.\n"
+"Note you must define both a MIME handler and a MIME type association\n"
+"for it to work."
+msgstr ""
+
+#: src/mime/backend/default.c:57
+msgid "Description of this handler."
+msgstr ""
+
+#: src/mime/backend/default.c:61
+msgid "System-specific handler description (ie. unix, unix-xwin, ...)."
+msgstr ""
+
+#: src/mime/backend/default.c:63 src/mime/backend/mailcap.c:102
+msgid "Ask before opening"
+msgstr ""
+
+#: src/mime/backend/default.c:65
+msgid "Ask before opening."
+msgstr ""
+
+#: src/mime/backend/default.c:67
+msgid "Block terminal"
+msgstr ""
+
+#: src/mime/backend/default.c:69
+msgid "Block the terminal when the handler is running."
+msgstr ""
+
+#: src/mime/backend/default.c:71
+msgid "Program"
+msgstr ""
+
+#: src/mime/backend/default.c:74
+#, no-c-format
+msgid ""
+"External viewer for this file type. '%' in this string will be\n"
+"substituted by a file name."
+msgstr ""
+
+#: src/mime/backend/default.c:78
+msgid "File extension associations"
+msgstr ""
+
+#: src/mime/backend/default.c:80
+msgid "Extension <-> MIME type association."
+msgstr ""
+
+#: src/mime/backend/default.c:84
+msgid ""
+"MIME-type matching this file extension ('*' is used here in place\n"
+"of '.')."
+msgstr ""
+
+#. name:
+#: src/mime/backend/default.c:215
+msgid "Option system"
+msgstr ""
+
+#. name:
+#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671
+msgid "Mailcap"
+msgstr ""
+
+#: src/mime/backend/mailcap.c:91
+msgid "Options for mailcap support."
+msgstr ""
+
+#: src/mime/backend/mailcap.c:95
+msgid "Enable mailcap support."
+msgstr ""
+
+#: src/mime/backend/mailcap.c:99
+msgid ""
+"Mailcap search path. Colon-separated list of files.\n"
+"Leave as \"\" to use MAILCAP environment variable instead."
+msgstr ""
+
+#: src/mime/backend/mailcap.c:104
+msgid "Ask before using the handlers defined by mailcap."
+msgstr ""
+
+#: src/mime/backend/mailcap.c:106
+msgid "Type query string"
+msgstr ""
+
+#: src/mime/backend/mailcap.c:108
+msgid ""
+"Type of description to show in \"what to do with this file\"\n"
+"query dialog:\n"
+"0 is show \"mailcap\"\n"
+"1 is show program to be run\n"
+"2 is show mailcap description field if any; \"mailcap\" otherwise"
+msgstr ""
+
+#: src/mime/backend/mailcap.c:114
+msgid "Prioritize entries by file"
+msgstr ""
+
+#: src/mime/backend/mailcap.c:116
+msgid ""
+"Prioritize entries by the order of the files in the mailcap\n"
+"path. This means that wildcard entries (like: image/*) will\n"
+"also be checked before deciding the handler."
+msgstr ""
+
+#: src/mime/backend/mailcap.c:349
+#, c-format
+msgid "Badly formated mailcap entry for type %s in \"%s\" line %d"
+msgstr ""
+
+#. name:
+#: src/mime/backend/mimetypes.c:46 src/mime/backend/mimetypes.c:279
+msgid "Mimetypes files"
+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"
+"the extension of the file name."
+msgstr ""
+
+#: src/mime/backend/mimetypes.c:54
+msgid "Enable mime.types support."
+msgstr ""
+
+#: src/mime/backend/mimetypes.c:58
+msgid "The search path for mime.types files. Colon-separated list of files."
+msgstr ""
+
+#: src/mime/dialogs.c:66
+msgid "Delete extension"
+msgstr ""
+
+#: src/mime/dialogs.c:67
+#, c-format
+msgid "Delete extension %s -> %s?"
+msgstr ""
+
+#: src/mime/dialogs.c:125
+msgid "Extension"
+msgstr "Uitbreiding"
+
+#: src/mime/dialogs.c:128
+msgid "Extension(s)"
+msgstr "Uitbreiding(s)"
+
+#: src/mime/dialogs.c:129
+msgid "Content-Type"
+msgstr ""
+
+#: src/mime/dialogs.c:141
+msgid "No extensions"
+msgstr "Geen uitbreidings"
+
+#. name:
+#: src/mime/mime.c:34 src/mime/mime.c:321
+msgid "MIME"
+msgstr "MIME"
+
+#: src/mime/mime.c:36
+msgid "MIME-related options (handlers of various MIME types)."
+msgstr ""
+
+#: src/mime/mime.c:38
+msgid "Default MIME-type"
+msgstr ""
+
+#: src/mime/mime.c:40
+msgid ""
+"Document MIME-type to assume by default (when we are unable to\n"
+"guess it properly from known information about the document)."
+msgstr ""
+
+#: src/network/ssl/ssl.c:71 src/network/ssl/ssl.c:156
+msgid "Verify certificates"
+msgstr ""
+
+#: src/network/ssl/ssl.c:73
+msgid ""
+"Verify the peer's SSL certificate. Note that this\n"
+"needs extensive configuration of OpenSSL by the user."
+msgstr ""
+
+#: src/network/ssl/ssl.c:76
+msgid "Client Certificates"
+msgstr ""
+
+#: src/network/ssl/ssl.c:78
+msgid "X509 client certificate options."
+msgstr ""
+
+#: src/network/ssl/ssl.c:82
+msgid ""
+"Enable or not the sending of X509 client certificates\n"
+"to servers which request them."
+msgstr ""
+
+#: src/network/ssl/ssl.c:85
+msgid "Certificate File"
+msgstr ""
+
+#: src/network/ssl/ssl.c:87
+msgid ""
+"The location of a file containing the client certificate\n"
+"and unencrypted private key in PEM format. If unset, the\n"
+"file pointed to by the X509_CLIENT_CERT variable is used\n"
+"instead."
+msgstr ""
+
+#: src/network/ssl/ssl.c:158
+msgid ""
+"Verify the peer's SSL certificate. Note that this\n"
+"probably doesn't work properly at all with GnuTLS."
+msgstr ""
+
+#. name:
+#: src/network/ssl/ssl.c:177 src/network/ssl/ssl.c:194
+msgid "SSL"
+msgstr "SSL"
+
+#: src/network/ssl/ssl.c:179
+msgid "SSL options."
+msgstr "SSL-keuses."
+
+#: src/network/state.c:26
+msgid "Waiting in queue"
+msgstr "Wagtend in tou"
+
+#: src/network/state.c:27
+msgid "Looking up host"
+msgstr "Kyk naam op"
+
+#: src/network/state.c:28
+msgid "Making connection"
+msgstr "Verbinding word gemaak"
+
+#: src/network/state.c:29
+msgid "SSL negotiation"
+msgstr "SSL-onderhandeling"
+
+#: src/network/state.c:30
+msgid "Request sent"
+msgstr "Versoek gestuur"
+
+#: src/network/state.c:31
+msgid "Logging in"
+msgstr "Meld aan"
+
+#: src/network/state.c:32
+msgid "Getting headers"
+msgstr "Kry koppe"
+
+#: src/network/state.c:33
+msgid "Server is processing request"
+msgstr "Bediener hanteer versoek"
+
+#: src/network/state.c:34
+msgid "Transferring"
+msgstr "Dra oor"
+
+#: src/network/state.c:36
+msgid "Resuming"
+msgstr "Hervat"
+
+#: src/network/state.c:37
+msgid "Connecting to peers"
+msgstr "Verbind aan eweknieĂŤ"
+
+#: src/network/state.c:38
+msgid "Connecting to tracker"
+msgstr ""
+
+#: src/network/state.c:41
+msgid "Waiting for redirect confirmation"
+msgstr "Wag vir direkte bevestiging"
+
+#: src/network/state.c:42
+msgid "OK"
+msgstr "Regso"
+
+#: src/network/state.c:43
+msgid "Interrupted"
+msgstr "Onderbreek"
+
+#: src/network/state.c:44
+msgid "Socket exception"
+msgstr ""
+
+#: src/network/state.c:45
+msgid "Internal error"
+msgstr "Interne fout"
+
+#: src/network/state.c:48
+msgid "Error writing to socket"
+msgstr "Fout met skryf na sok"
+
+#: src/network/state.c:49
+msgid "Error reading from socket"
+msgstr "Fout met lees vanaf sok"
+
+#: src/network/state.c:50
+msgid "Data modified"
+msgstr "Data gewysig"
+
+#: src/network/state.c:51
+msgid "Bad URL syntax"
+msgstr "Verkeerde URL-sintaks"
+
+#: src/network/state.c:53
+msgid "Request must be restarted"
+msgstr "Versoek moet herbegin word"
+
+#: src/network/state.c:54
+msgid "Can't get socket state"
+msgstr ""
+
+#: src/network/state.c:55
+msgid "Only local connections are permitted"
+msgstr "Slegs plaaslike verbindings word toegelaat"
+
+#: src/network/state.c:56
+msgid "No host in the specified IP family was found"
+msgstr ""
+
+#: src/network/state.c:58
+msgid ""
+"Error while decoding file. This might be caused\n"
+"by the encoded file being corrupt."
+msgstr ""
+
+#: src/network/state.c:61
+msgid ""
+"This URL contains a protocol not yet known by ELinks.\n"
+"You can configure an external handler for it through\n"
+"the options system."
+msgstr ""
+
+#: src/network/state.c:65
+msgid ""
+"This URL contains a protocol that is not natively known\n"
+"by ELinks which means that ELinks relies on external\n"
+"programs for handling it. Downloading URLs using external\n"
+"programs is not supported."
+msgstr ""
+
+#: src/network/state.c:70
+msgid "Bad HTTP response"
+msgstr ""
+
+#: src/network/state.c:71
+msgid "No content"
+msgstr "Geen inhoud"
+
+#: src/network/state.c:73
+msgid "Unknown file type"
+msgstr "Onbekende lĂŞertipe"
+
+#: src/network/state.c:74
+msgid "Error opening file"
+msgstr "Kon nie lĂŞer oopmaak nie"
+
+#: src/network/state.c:75
+msgid "CGI script not in CGI path"
+msgstr ""
+
+#: src/network/state.c:76
+msgid "Local file access is not allowed in anonymous mode"
+msgstr "Plaaslike lĂŞertoegang word nie toegelaat in anonieme modus nie"
+
+#: src/network/state.c:79
+msgid "Bad FTP response"
+msgstr "Slegte FTP-antwoord"
+
+#: src/network/state.c:80
+msgid "FTP service unavailable"
+msgstr "FTP-diens nie beskikbaar nie"
+
+#: src/network/state.c:81
+msgid "Bad FTP login"
+msgstr "Slegte FTP-aanmelding"
+
+#: src/network/state.c:82
+msgid "FTP PORT command failed"
+msgstr "FTP PORT-opdrag het gefaal"
+
+#: src/network/state.c:83
+msgid "File not found"
+msgstr "LĂŞer nie gevind nie"
+
+#: src/network/state.c:84
+msgid "FTP file error"
+msgstr "FTP-lĂŞerfout"
+
+#: src/network/state.c:88
+msgid "SSL error"
+msgstr "SSL-fout"
+
+#: src/network/state.c:90
+msgid "This version of ELinks does not contain SSL/TLS support"
+msgstr "Hierdie weergawe van ELinks bevat nie SSL/TLS-ondersteuning nie"
+
+#: src/network/state.c:93
+msgid "JavaScript support is not enabled"
+msgstr "JavaScript-ondersteuning is nie geaktiveer nie"
+
+#: src/network/state.c:96
+msgid "Bad NNTP response"
+msgstr "Slegte NNTP-antwoord"
+
+#: src/network/state.c:97
+msgid ""
+"Unable to handle news: URI because no news server has been\n"
+"been configured. Either set the option protocol.nntp.server\n"
+"or set the NNTPSERVER environment variable."
+msgstr ""
+
+#: src/network/state.c:100
+msgid "Server hang up for some reason"
+msgstr ""
+
+#: src/network/state.c:101
+msgid "No such newsgroup"
+msgstr ""
+
+#: src/network/state.c:102
+msgid "No such article"
+msgstr ""
+
+#: src/network/state.c:103
+msgid "Transfer failed"
+msgstr "Oordrag gefaal"
+
+#: src/network/state.c:104
+msgid "Authorization required"
+msgstr ""
+
+#: src/network/state.c:105
+msgid "Access to server denied"
+msgstr "Toegang tot bediener geweier"
+
+#: src/network/state.c:109
+msgid "The CSO phone-book protocol is not supported."
+msgstr ""
+
+#: src/network/state.c:112
+msgid ""
+"Configuration of the proxy server failed.\n"
+"This might be caused by an incorrect proxy\n"
+"setting specified by an environment variable\n"
+"or returned by a scripting proxy hook.\n"
+"\n"
+"The correct syntax for proxy settings are\n"
+"a host name optionally followed by a colon\n"
+"and a port number. Example: 'localhost:8080'."
+msgstr ""
+
+#: src/network/state.c:122
+msgid "BitTorrent error"
+msgstr "BitTorrent-fout"
+
+#: src/network/state.c:123
+msgid "The BitTorrent metainfo file contained errors"
+msgstr "Die BitTorrent-meta-inligtinglĂŞer het foute bevat"
+
+#: src/network/state.c:124
+msgid "The tracker requesting failed"
+msgstr ""
+
+#: src/network/state.c:148
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
+#. accelerator_context(open_in_new.beos, open_in_new.os2, open_in_new.win32)
+#: src/osdep/newwin.c:27
+msgid "~Xterm"
+msgstr "~Xterm"
+
+#. accelerator_context(open_in_new.beos, open_in_new.os2, open_in_new.win32)
+#: src/osdep/newwin.c:28
+msgid "T~wterm"
+msgstr "T~wterm"
+
+#. accelerator_context(open_in_new.beos, open_in_new.os2, open_in_new.win32)
+#: src/osdep/newwin.c:29
+msgid "~Screen"
+msgstr ""
+
+#. accelerator_context(open_in_new.os2, open_in_new.win32)
+#: src/osdep/newwin.c:33 src/osdep/newwin.c:39
+msgid "~Window"
+msgstr ""
+
+#. accelerator_context(open_in_new.os2)
+#: src/osdep/newwin.c:34
+msgid "~Full screen"
+msgstr "~Volle skerm"
+
+#. accelerator_context(open_in_new.beos)
+#: src/osdep/newwin.c:44
+msgid "~BeOS terminal"
+msgstr "~BeOS-terminaal"
+
+#: src/protocol/auth/dialogs.c:87
+#, c-format
+msgid "Authentication required for %s at %s"
+msgstr "Magtiging benodig vir %s by %s"
+
+#. This function is used for at least HTTP and FTP, so don't
+#. * name the protocol here.  Consider also what an FTP server
+#. * behind an HTTP proxy should be called.
+#: src/protocol/auth/dialogs.c:102
+msgid "Authentication required"
+msgstr "Magtiging benodig"
+
+#: src/protocol/auth/dialogs.c:112
+msgid "Login"
+msgstr "Meld aan"
+
+#: src/protocol/auth/dialogs.c:113 src/protocol/http/http.c:140
+msgid "Password"
+msgstr "Wagwoord"
+
+#: src/protocol/auth/dialogs.c:166
+msgid "Realm"
+msgstr ""
+
+#: src/protocol/auth/dialogs.c:178
+msgid "none"
+msgstr "geen"
+
+#: src/protocol/auth/dialogs.c:181
+msgid "State"
+msgstr "Status"
+
+#: src/protocol/auth/dialogs.c:182
+msgid "valid"
+msgstr "geldig"
+
+#. cant_delete_item
+#: src/protocol/auth/dialogs.c:219
+#, c-format
+msgid "Sorry, but auth entry \"%s\" cannot be deleted."
+msgstr ""
+
+#. cant_delete_used_item
+#: src/protocol/auth/dialogs.c:221
+#, c-format
+msgid "Sorry, but auth entry \"%s\" is being used by something else."
+msgstr ""
+
+#. delete_marked_items_title
+#: src/protocol/auth/dialogs.c:227
+msgid "Delete marked auth entries"
+msgstr ""
+
+#. delete_marked_items
+#: src/protocol/auth/dialogs.c:229
+msgid "Delete marked auth entries?"
+msgstr ""
+
+#. delete_item_title
+#: src/protocol/auth/dialogs.c:235
+msgid "Delete auth entry"
+msgstr ""
+
+#: src/protocol/auth/dialogs.c:237
+#, c-format
+msgid "Delete this auth entry?"
+msgstr ""
+
+#. clear_all_items_title
+#: src/protocol/auth/dialogs.c:239
+msgid "Clear all auth entries"
+msgstr ""
+
+#. clear_all_items_title
+#: src/protocol/auth/dialogs.c:241
+msgid "Do you really want to remove all auth entries?"
+msgstr ""
+
+#: src/protocol/auth/dialogs.c:269
+msgid "Authentication manager"
+msgstr "Magtigingbestuurder"
+
+#. name:
+#: src/protocol/bittorrent/bittorrent.c:26
+#: src/protocol/bittorrent/bittorrent.c:335
+msgid "BitTorrent"
+msgstr "BitTorrent"
+
+#: src/protocol/bittorrent/bittorrent.c:28
+msgid "BitTorrent specific options."
+msgstr ""
+
+#. ******************************************************************
+#. Listening socket options:
+#. ******************************************************************
+#: src/protocol/bittorrent/bittorrent.c:34
+msgid "Port range"
+msgstr "Poortomvang"
+
+#: src/protocol/bittorrent/bittorrent.c:36
+msgid "Port range allowed to be used for listening on."
+msgstr "Poortomvang waarop geluister mag word."
+
+#: src/protocol/bittorrent/bittorrent.c:38
+msgid "Minimum port"
+msgstr "Minimumpoort"
+
+#: src/protocol/bittorrent/bittorrent.c:40
+msgid "The minimum port to try and listen on."
+msgstr "Die minimumpoort waarop geluister kan word."
+
+#: src/protocol/bittorrent/bittorrent.c:42
+msgid "Maximum port"
+msgstr "Maksimumpoort"
+
+#: src/protocol/bittorrent/bittorrent.c:44
+msgid "The maximum port to try and listen on."
+msgstr "Die maksimumpoort waarop geluister kan word."
+
+#. ******************************************************************
+#. Tracker connection options:
+#. ******************************************************************
+#: src/protocol/bittorrent/bittorrent.c:51
+msgid "Tracker"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:53
+msgid "Tracker options."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:55
+msgid "Use compact tracker format"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:57
+msgid ""
+"Whether to request that the tracker returns peer info\n"
+"in compact format. Note, the compact format only supports\n"
+"IPv4 addresses."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:61
+msgid "Tracker announce interval"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:63
+msgid ""
+"The number of seconds to wait between periodically contacting\n"
+"the tracker for announcing progress and requesting more peers.\n"
+"Set to zero to use the interval requested by the tracker."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:67
+msgid "IP-address to announce"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:69
+msgid ""
+"What IP address to report to the tracker. If set to \"\"\n"
+"no IP address will be sent and the tracker will automatically\n"
+"determine an appropriate IP address."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:73
+msgid "User identification string"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:75
+msgid ""
+"An additional identification that is not shared with any users.\n"
+"It is intended to allow a client to prove their identity should\n"
+"their IP address change. It is an optional parameter, but some\n"
+"trackers require this parameter. If set to \"\" no user key will\n"
+"be sent to the tracker."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:81
+msgid "Maximum number of peers to request"
+msgstr "Die maksimum aantal eweknieĂŤ om aan te vra"
+
+#: src/protocol/bittorrent/bittorrent.c:83
+msgid ""
+"The maximum number of peers to request from the tracker.\n"
+"Set to 0 to use the server default."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:86
+msgid "Minimum peers to skip rerequesting"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:88
+msgid ""
+"The minimum number of peers to have in the current peer info\n"
+"pool before skipping requesting of more peers. I.e. setting\n"
+"numwant to zero.\n"
+"Set to 0 to not have any limit."
+msgstr ""
+
+#. ******************************************************************
+#. Lowlevel peer-wire options:
+#. ******************************************************************
+#: src/protocol/bittorrent/bittorrent.c:98
+msgid "Peer-wire"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:100
+msgid "Lowlevel peer-wire options."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:102
+msgid "Maximum number of peer connections"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:104
+msgid ""
+"The maximum number of allowed connections to both active and\n"
+"non-active peers. By increasing the number of allowed connections,\n"
+"the chance of finding good peers to download from is increased.\n"
+"However, too many connections can lead to TCP congestion. If the\n"
+"maximum is reached all new incoming connections will be closed."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:110
+msgid "Maximum peer message length"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:112
+msgid ""
+"The maximum length of messages to accept over the wire.\n"
+"Larger values will cause the connection to be dropped."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:115
+msgid "Maximum allowed request length"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:117
+msgid ""
+"The maximum length to allow for incoming requests.\n"
+"Larger requests will cause the connection to be dropped."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:120
+msgid "Length of requests"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:122
+msgid ""
+"How many bytes to query for per request. This is complementary\n"
+"to the max_request_length option. If the configured length is\n"
+"bigger than the piece length it will be truncated."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:126
+msgid "Peer inactivity timeout"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:128
+msgid ""
+"The number of seconds to wait before closing a socket on\n"
+"which nothing has been received or sent."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:131
+msgid "Maximum peer pool size"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:133
+msgid ""
+"Maximum number of items in the peer pool. The peer pool\n"
+"contains information used for establishing connections to\n"
+"new peers.\n"
+"Set to 0 to have unlimited size."
+msgstr ""
+
+#. ******************************************************************
+#. Piece management options:
+#. ******************************************************************
+#: src/protocol/bittorrent/bittorrent.c:143
+msgid "Maximum piece cache size"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:145
+msgid ""
+"The maximum amount of memory used to hold recently\n"
+"downloaded pieces.\n"
+"Set to 0 to have unlimited size."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:154
+msgid "Sharing rate"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:156
+msgid ""
+"The minimum sharing rate to achieve before stop seeding.\n"
+"The sharing rate is computed as the number of uploaded bytes\n"
+"divided with the number of downloaded bytes. The value should\n"
+"be a double value between 0.0 and 1.0 both included.\n"
+"Set to 1.0 to atleast upload a complete copy of all data and\n"
+"set to 0.0 to have unlimited sharing rate."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:163
+msgid "Maximum number of uploads"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:165
+msgid "The maximum number of uploads to allow at once."
+msgstr ""
+
+#. The number of uploads to fill out to with extra optimistic unchokes
+#: src/protocol/bittorrent/bittorrent.c:168
+msgid "Minimum number of uploads"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:170
+msgid ""
+"The minimum number of uploads which should at least\n"
+"be used for new connections."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:174
+msgid "Keepalive interval"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:176
+msgid ""
+"The number of seconds to pause between sending keepalive\n"
+"messages."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:179
+msgid "Number of pending requests"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:181
+msgid ""
+"How many piece requests to continuously keep in queue. Pipelining\n"
+"of requests is essential to saturate connections and get a good\n"
+"connection performance and thus a faster download. However, a\n"
+"very big queue size can lead to wasting bandwidth near the end\n"
+"of the connection since remaining piece blocks will be requested\n"
+"from multiple peers."
+msgstr ""
+
+#. Bram uses 30 seconds here.
+#: src/protocol/bittorrent/bittorrent.c:190
+msgid "Peer snubbing interval"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:192
+msgid ""
+"The number of seconds to wait for file data before assuming\n"
+"the peer has been snubbed."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:195
+msgid "Peer choke interval"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:197
+msgid ""
+"The number of seconds between updating the connection state\n"
+"and most importantly choke and unchoke peer connections. The\n"
+"choke period should be big enough for newly unchoked connections\n"
+"to get started but small enough to not allow freeriders too much\n"
+"room for stealing bandwidth."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:203
+msgid "Rarest first piece selection cutoff"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:205
+msgid ""
+"The number of pieces to obtain before switching piece\n"
+"selection strategy from random to rarest first."
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:208 src/protocol/http/http.c:109
+msgid "Allow blacklisting"
+msgstr ""
+
+#: src/protocol/bittorrent/bittorrent.c:210
+msgid "Allow blacklisting of buggy peers."
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:122
+msgid "Warning: potential malicious path detected"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:141
+msgid "Info hash"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:145
+msgid "Announce URI"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:151
+msgid "Creation date"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:160
+msgid "Directory"
+msgstr "Gids"
+
+#: src/protocol/bittorrent/dialogs.c:170
+msgid "Files"
+msgstr "LĂŞers"
+
+#: src/protocol/bittorrent/dialogs.c:183
+msgid "Comment"
+msgstr "Kommentaar"
+
+#: src/protocol/bittorrent/dialogs.c:229 src/session/download.c:399
+#, c-format
+msgid ""
+"Download complete:\n"
+"%s"
+msgstr ""
+"Aflaai afgehandel:\n"
+"%s"
+
+#: src/protocol/bittorrent/dialogs.c:256
+msgid "Download info"
+msgstr "Aflaai-inligting"
+
+#: src/protocol/bittorrent/dialogs.c:276
+msgid "downloading (random)"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:277
+msgid "downloading (rarest first)"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:278
+msgid "downloading (end game)"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:279
+msgid "seeding"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:307
+msgid "Status"
+msgstr "Status"
+
+#: src/protocol/bittorrent/dialogs.c:311
+msgid "partial"
+msgstr "gedeeltelik"
+
+#. Peers:
+#: src/protocol/bittorrent/dialogs.c:315
+msgid "Peers"
+msgstr "EweknieĂŤ"
+
+#: src/protocol/bittorrent/dialogs.c:319
+#, c-format
+msgid "%u connection"
+msgid_plural "%u connections"
+msgstr[0] "%u verbinding"
+msgstr[1] "%u verbindings"
+
+#: src/protocol/bittorrent/dialogs.c:329 src/protocol/bittorrent/dialogs.c:345
+#, c-format
+msgid "%u seeder"
+msgid_plural "%u seeders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocol/bittorrent/dialogs.c:335
+#, c-format
+msgid "%u available"
+msgid_plural "%u available"
+msgstr[0] "%u beskikbaar"
+msgstr[1] "%u beskikbaar"
+
+#: src/protocol/bittorrent/dialogs.c:340
+msgid "Swarm info"
+msgstr "Swerminligting"
+
+#: src/protocol/bittorrent/dialogs.c:353
+#, c-format
+msgid "%u downloader"
+msgid_plural "%u downloaders"
+msgstr[0] "%u aflaaier"
+msgstr[1] "%u aflaaiers"
+
+#. Upload:
+#: src/protocol/bittorrent/dialogs.c:359
+msgid "Upload"
+msgstr "Oplaai"
+
+#: src/protocol/bittorrent/dialogs.c:367
+msgid "average"
+msgstr "gemiddeld"
+
+#: src/protocol/bittorrent/dialogs.c:372
+msgid "1:1 in"
+msgstr ""
+
+#. Sharing:
+#: src/protocol/bittorrent/dialogs.c:378
+msgid "Sharing"
+msgstr "Deel"
+
+#: src/protocol/bittorrent/dialogs.c:387
+msgid "uploaded"
+msgstr "opgelaai"
+
+#: src/protocol/bittorrent/dialogs.c:389
+msgid "downloaded"
+msgstr "afgelaai"
+
+#. Pieces:
+#: src/protocol/bittorrent/dialogs.c:393
+msgid "Pieces"
+msgstr "Dele"
+
+#: src/protocol/bittorrent/dialogs.c:397
+#, c-format
+msgid "%u completed"
+msgid_plural "%u completed"
+msgstr[0] "%u voltooi"
+msgstr[1] "%u voltooi"
+
+#: src/protocol/bittorrent/dialogs.c:403
+#, c-format
+msgid "%u in progress"
+msgid_plural "%u in progress"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocol/bittorrent/dialogs.c:414
+#, c-format
+msgid "%u remaining"
+msgid_plural "%u remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Statistics:
+#: src/protocol/bittorrent/dialogs.c:419
+msgid "Statistics"
+msgstr "Statistiek"
+
+#: src/protocol/bittorrent/dialogs.c:423
+#, c-format
+msgid "%u in memory"
+msgid_plural "%u in memory"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocol/bittorrent/dialogs.c:429
+#, c-format
+msgid "%u locked"
+msgid_plural "%u locked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocol/bittorrent/dialogs.c:436
+#, c-format
+msgid "%u rejected"
+msgid_plural "%u rejected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocol/bittorrent/dialogs.c:443
+#, c-format
+msgid "%u unavailable"
+msgid_plural "%u unavailable"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/protocol/bittorrent/dialogs.c:584 src/session/session.c:278
+#, c-format
+msgid "Unable to retrieve %s"
+msgstr "Kon nie %s kry nie"
+
+#: src/protocol/bittorrent/dialogs.c:736
+#, c-format
+msgid "What would you like to do with the file '%s'?"
+msgstr "Wat wil u doen met die lĂŞer '%s'?"
+
+#: src/protocol/bittorrent/dialogs.c:752
+msgid "Information about the torrent"
+msgstr ""
+
+#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1121
+msgid "What to do?"
+msgstr "Hoe gemaak?"
+
+#. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback)
+#: src/protocol/bittorrent/dialogs.c:796
+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:1226
+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:1230
+msgid "Show ~header"
+msgstr "Wys ~kop"
+
+#: src/protocol/file/cgi.c:39
+msgid "Local CGI"
+msgstr ""
+
+#: src/protocol/file/cgi.c:41
+msgid "Local CGI specific options."
+msgstr ""
+
+#: src/protocol/file/cgi.c:45
+msgid "Colon separated list of directories, where CGI scripts are stored."
+msgstr ""
+
+#: src/protocol/file/cgi.c:47
+msgid "Allow local CGI"
+msgstr ""
+
+#: src/protocol/file/cgi.c:49
+msgid "Whether to execute local CGI scripts."
+msgstr ""
+
+#. name:
+#: src/protocol/file/cgi.c:54
+msgid "CGI"
+msgstr "CGI"
+
+#: src/protocol/file/file.c:42
+msgid "Local files"
+msgstr "Plaaslike lĂŞers"
+
+#: src/protocol/file/file.c:44
+msgid "Options specific to local browsing."
+msgstr ""
+
+#: src/protocol/file/file.c:46
+msgid "Allow reading special files"
+msgstr ""
+
+#: src/protocol/file/file.c:48
+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
+msgid "Show hidden files in directory listing"
+msgstr ""
+
+#: src/protocol/file/file.c:54
+msgid ""
+"When set to false, files with name starting with a dot will be\n"
+"hidden in local directories listing."
+msgstr ""
+
+#: src/protocol/file/file.c:57
+msgid "Try encoding extensions"
+msgstr ""
+
+#: src/protocol/file/file.c:59
+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"
+"(ie. 'filename.gz'); it depends on the supported encodings."
+msgstr ""
+
+#. name:
+#: src/protocol/file/file.c:67
+msgid "File"
+msgstr "LĂŞer"
+
+#. name:
+#: src/protocol/finger/finger.c:21
+msgid "Finger"
+msgstr "Finger"
+
+#. name:
+#: src/protocol/fsp/fsp.c:44 src/protocol/fsp/fsp.c:56
+msgid "FSP"
+msgstr "FSP"
+
+#: src/protocol/fsp/fsp.c:46
+msgid "FSP specific options."
+msgstr "FSP-spesifieke keuses."
+
+#: src/protocol/fsp/fsp.c:48
+msgid "Sort entries"
+msgstr "Sorteer inskrywings"
+
+#: src/protocol/fsp/fsp.c:50
+msgid "Whether to sort entries in directory listings."
+msgstr "Of gidsinskrywings gesorteer moet word."
+
+#. name:
+#: src/protocol/ftp/ftp.c:56 src/protocol/ftp/ftp.c:86
+msgid "FTP"
+msgstr "FTP"
+
+#: src/protocol/ftp/ftp.c:58
+msgid "FTP specific options."
+msgstr "FTP-spesifieke keuses."
+
+#: src/protocol/ftp/ftp.c:60 src/protocol/http/http.c:127
+#: src/protocol/http/http.c:209
+msgid "Proxy configuration"
+msgstr "Instaanbedieneropstelling"
+
+#: src/protocol/ftp/ftp.c:62
+msgid "FTP proxy configuration."
+msgstr "FTP-instaanbedieneropstelling."
+
+#: src/protocol/ftp/ftp.c:64 src/protocol/http/http.c:131
+#: src/protocol/http/http.c:213
+msgid "Host and port-number"
+msgstr "Rekenaar en poort"
+
+#: src/protocol/ftp/ftp.c:66
+msgid ""
+"Host and port-number (host:port) of the FTP proxy, or blank.\n"
+"If it's blank, FTP_PROXY environment variable is checked as well."
+msgstr ""
+
+#: src/protocol/ftp/ftp.c:69
+msgid "Anonymous password"
+msgstr "Anonieme wagwoord"
+
+#: src/protocol/ftp/ftp.c:71
+msgid "FTP anonymous password to be sent."
+msgstr ""
+
+#: src/protocol/ftp/ftp.c:73
+msgid "Use passive mode (IPv4)"
+msgstr ""
+
+#: src/protocol/ftp/ftp.c:75
+msgid "Use PASV instead of PORT (passive vs active mode, IPv4 only)."
+msgstr ""
+
+#: src/protocol/ftp/ftp.c:77
+msgid "Use passive mode (IPv6)"
+msgstr ""
+
+#: src/protocol/ftp/ftp.c:79
+msgid "Use EPSV instead of EPRT (passive vs active mode, IPv6 only)."
+msgstr ""
+
+#. name:
+#: src/protocol/gopher/gopher.c:47
+msgid "Gopher"
+msgstr "Gopher"
+
+#: src/protocol/http/codes.c:104
+#, c-format
+msgid "HTTP error %03d"
+msgstr "HTTP-fout %03d"
+
+#: src/protocol/http/codes.c:127
+msgid ""
+"  An error occurred on the server while fetching the document you\n"
+"  requested. However, the server did not send back any explanation of what\n"
+"  happenned, so it is unknown what went wrong. Please contact the web\n"
+"  server administrator about this, if you believe that this error should\n"
+"  not occur since it is not a nice behaviour from the web server at all\n"
+"  and indicates that there is some much deeper problem with the web server\n"
+"  software.\n"
+msgstr ""
+"  'n Fout het voorgekom op die bediener met die kry van die\n"
+"  aangevraagde dokument. Hy het egter geen verduidelik\n"
+"  teruggestuur nie, dus is dit nie duidelik wat fout gegaan het\n"
+"  nie. Kontak asseblief die administrateur van die bediener\n"
+"  hieroor as u glo dat hierdie fout nie moet voorkom nie, aangesien\n"
+"  hierdie geensins goeie gedrag van 'n webbediener is nie en dui op 'n\n"
+"  veel dieper probleem met die webbedienersagteware.\n"
+
+#. name:
+#: src/protocol/http/http.c:95 src/protocol/http/http.c:223
+msgid "HTTP"
+msgstr "HTTP"
+
+#: src/protocol/http/http.c:97
+msgid "HTTP-specific options."
+msgstr "HTTP-spesifieke keuses."
+
+#: src/protocol/http/http.c:100
+msgid "Server bug workarounds"
+msgstr ""
+
+#: src/protocol/http/http.c:102
+msgid "Server-side HTTP bugs workarounds."
+msgstr ""
+
+#: src/protocol/http/http.c:104
+msgid "Do not send Accept-Charset"
+msgstr "Moenie Accept-Charset stuur nie"
+
+#: src/protocol/http/http.c:106
+msgid ""
+"The Accept-Charset header is quite long and sending it can trigger\n"
+"bugs in some rarely found servers."
+msgstr ""
+
+#: src/protocol/http/http.c:111
+msgid "Allow blacklisting of buggy servers."
+msgstr ""
+
+#: src/protocol/http/http.c:113
+msgid "Broken 302 redirects"
+msgstr ""
+
+#: src/protocol/http/http.c:115
+msgid ""
+"Broken 302 redirect (violates RFC but compatible with Netscape).\n"
+"This is a problem for a lot of web discussion boards and the like.\n"
+"If they will do strange things to you, try to play with this."
+msgstr ""
+
+#: src/protocol/http/http.c:119
+msgid "No keepalive after POST requests"
+msgstr ""
+
+#: src/protocol/http/http.c:121
+msgid "Disable keepalive connection after POST request."
+msgstr ""
+
+#: src/protocol/http/http.c:123
+msgid "Use HTTP/1.0"
+msgstr "Gebruik HTTP/1.0"
+
+#: src/protocol/http/http.c:125
+msgid "Use HTTP/1.0 protocol instead of HTTP/1.1."
+msgstr "Gebruik HTTP/1.0-protokol in plaas van HTTP/1.1."
+
+#: src/protocol/http/http.c:129
+msgid "HTTP proxy configuration."
+msgstr "HTTP-instaanbediener."
+
+#: src/protocol/http/http.c:133
+msgid ""
+"Host and port-number (host:port) of the HTTP proxy, or blank.\n"
+"If it's blank, HTTP_PROXY environment variable is checked as well."
+msgstr ""
+
+#: src/protocol/http/http.c:136
+msgid "Username"
+msgstr "Gebruikernaam"
+
+#: src/protocol/http/http.c:138
+msgid "Proxy authentication username."
+msgstr "Instaanmagtigingsgebruikernaam"
+
+#: src/protocol/http/http.c:142
+msgid "Proxy authentication password."
+msgstr "Instaanmagtigingswagwoord"
+
+#: src/protocol/http/http.c:145
+msgid "Referer sending"
+msgstr ""
+
+#: src/protocol/http/http.c:147
+msgid ""
+"HTTP referer sending options. HTTP referer is a special header\n"
+"sent in the HTTP requests, which is supposed to contain the previous\n"
+"page visited by the browser. This way, the server can know what link\n"
+"did you follow when accessing that page. However, this behaviour\n"
+"can unfortunately considerably affect privacy and can lead even to a\n"
+"security problem on some badly designed web pages."
+msgstr ""
+
+#: src/protocol/http/http.c:154
+msgid "Policy"
+msgstr "Beleid"
+
+#: src/protocol/http/http.c:157
+msgid ""
+"Mode of sending HTTP referer:\n"
+"0 is send no referer\n"
+"1 is send current URL as referer\n"
+"2 is send fixed fake referer\n"
+"3 is send previous URL as referer (correct, but insecure)"
+msgstr ""
+
+#: src/protocol/http/http.c:163
+msgid "Fake referer URL"
+msgstr ""
+
+#: src/protocol/http/http.c:165
+msgid "Fake referer to be sent when policy is 2."
+msgstr ""
+
+#: src/protocol/http/http.c:168
+msgid "Send Accept-Language header"
+msgstr "Stuur Accept-Language-kop"
+
+#: src/protocol/http/http.c:170
+msgid "Send Accept-Language header."
+msgstr "Stuur Accept-Language-kop."
+
+#: src/protocol/http/http.c:172
+msgid "Use UI language as Accept-Language"
+msgstr "Gebruik koppelvlaktaal as Accept-Language"
+
+#: src/protocol/http/http.c:174
+msgid ""
+"Request localised versions of documents from web-servers (using the\n"
+"Accept-Language header) using the language you have configured for\n"
+"ELinks' user-interface (this also affects navigator.language ECMAScript\n"
+"value available to scripts). Note that some see this as a potential\n"
+"security risk because it tells web-masters and the FBI sniffers about\n"
+"your language preference."
+msgstr ""
+
+#: src/protocol/http/http.c:181
+msgid "Activate HTTP TRACE debugging"
+msgstr ""
+
+#: src/protocol/http/http.c:183
+msgid ""
+"If active, all HTTP requests are sent with TRACE as their method\n"
+"rather than GET or POST. This is useful for debugging of both ELinks\n"
+"and various server-side scripts --- the server only returns the client's\n"
+"request back to the client verbatim. Note that this type of request may\n"
+"not be enabled on all servers."
+msgstr ""
+
+#. OSNews.com is supposed to be relying on the textmode token, at least.
+#: src/protocol/http/http.c:190
+msgid "User-agent identification"
+msgstr "Identifiseer gebruikeragent"
+
+#: src/protocol/http/http.c:192
+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"
+"token in the first field is our silent attempt to establish this as\n"
+"a standard for new textmode user agents, so that the webmasters can\n"
+"have just a single uniform test for these if they are ie. 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."
+msgstr ""
+
+#: src/protocol/http/http.c:205
+msgid "HTTPS"
+msgstr "HTTPS"
+
+#: src/protocol/http/http.c:207
+msgid "HTTPS-specific options."
+msgstr "HTTPS-spesifieke keuses."
+
+#: src/protocol/http/http.c:211
+msgid "HTTPS proxy configuration."
+msgstr "HTTPS-instaanbediener."
+
+#: src/protocol/http/http.c:215
+msgid ""
+"Host and port-number (host:port) of the HTTPS CONNECT proxy, or blank.\n"
+"If it's blank, HTTPS_PROXY environment variable is checked as well."
+msgstr ""
+
+#. name:
+#: src/protocol/nntp/nntp.c:32 src/protocol/nntp/nntp.c:65
+msgid "NNTP"
+msgstr "NNTP"
+
+#: src/protocol/nntp/nntp.c:34
+msgid "NNTP and news specific options."
+msgstr "NNTP- en nuusspesifieke keuses."
+
+#: src/protocol/nntp/nntp.c:36
+msgid "Default news server"
+msgstr "Versteknuusbediener"
+
+#: src/protocol/nntp/nntp.c:38
+msgid ""
+"Used when resolving news: URIs. If set to the empty string\n"
+"the value of the NNTPSERVER environment variable will be used."
+msgstr ""
+
+#: src/protocol/nntp/nntp.c:41
+msgid "Message header entries"
+msgstr ""
+
+#: src/protocol/nntp/nntp.c:43
+msgid ""
+"Comma separated list of which entries in the article header\n"
+"to show. E.g. 'Subject' and 'From'.\n"
+"All header entries can be read in the header info dialog."
+msgstr ""
+
+#: src/protocol/protocol.c:232
+#, c-format
+msgid "This version of ELinks does not contain %s protocol support"
+msgstr ""
+
+#: src/protocol/protocol.c:263
+msgid "Protocols"
+msgstr "Protokolle"
+
+#: src/protocol/protocol.c:265
+msgid "Protocol specific options."
+msgstr "Protokolspesifieke keuses."
+
+#: src/protocol/protocol.c:267
+msgid "No-proxy domains"
+msgstr ""
+
+#: src/protocol/protocol.c:269
+msgid ""
+"Comma separated list of domains for which the proxy (HTTP/FTP)\n"
+"should be disabled. Optionally, a port can be specified for some\n"
+"domains as well. If it's blank, NO_PROXY environment variable is\n"
+"checked as well."
+msgstr ""
+
+#. name:
+#: src/protocol/protocol.c:312
+msgid "Protocol"
+msgstr "Protokol"
+
+#: src/protocol/rewrite/rewrite.c:44
+msgid "URI rewriting"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:46
+msgid ""
+"Rules for rewriting URIs entered in the goto dialog.\n"
+"It makes it possible to define a set of prefixes that will\n"
+"be expanded if they match a string entered in the goto dialog.\n"
+"The prefixes can be dumb, meaning that they work only like\n"
+"URI abbreviations, or smart ones, making it possible to pass\n"
+"arguments to them like search engine keywords."
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:53
+msgid "Enable dumb prefixes"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:55
+msgid ""
+"Enable dumb prefixes - simple URI abbreviations which can\n"
+"be written to the Goto URL dialog instead of actual URIs - i.e.\n"
+"if you write 'elinks' there, you are directed to\n"
+"http://elinks.cz/."
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:60
+msgid "Enable smart prefixes"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:62
+msgid ""
+"Enable smart prefixes - URI templates triggered by writing\n"
+"given abbreviation to the Goto URL dialog followed by a list\n"
+"of arguments from which the actual URI is composed - i.e.\n"
+"'gg:search keywords' or 'gn search keywords for news'."
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:67
+msgid "Dumb Prefixes"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:69
+msgid "Dumb prefixes, see enable-dumb description for details."
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:74
+#, no-c-format
+msgid ""
+"Replacement URI for this dumbprefix:\n"
+"%c in the string means the current URL\n"
+"%% in the string means '%'"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:78
+msgid "Smart Prefixes"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:80
+msgid "Smart prefixes, see enable-smart description for details."
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:87
+#, no-c-format
+msgid ""
+"Replacement URI for this smartprefix:\n"
+"%c in the string means the current URL\n"
+"%s in the string means the whole argument to smartprefix\n"
+"%0,%1,...,%9 means argument 0, 1, ..., 9\n"
+"%% in the string means '%'"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:93
+msgid "Default template"
+msgstr ""
+
+#: src/protocol/rewrite/rewrite.c:95
+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."
+msgstr ""
+
+#. name:
+#: src/protocol/rewrite/rewrite.c:367
+msgid "URI rewrite"
+msgstr ""
+
+#. name:
+#: src/protocol/smb/smb.c:67 src/protocol/smb/smb.c:79
+msgid "SMB"
+msgstr ""
+
+#: src/protocol/smb/smb.c:69
+msgid "SAMBA specific options."
+msgstr ""
+
+#: src/protocol/smb/smb.c:71
+msgid "Credentials"
+msgstr ""
+
+#: src/protocol/smb/smb.c:73
+msgid "Credentials file passed to smbclient via -A option."
+msgstr ""
+
+#. name:
+#: src/protocol/user.c:34 src/protocol/user.c:84
+msgid "User protocols"
+msgstr ""
+
+#: src/protocol/user.c:36
+msgid ""
+"User protocols. Options in this tree specify external\n"
+"handlers for the appropriate protocols. Ie.\n"
+"protocol.user.mailto.unix."
+msgstr ""
+
+#: src/protocol/user.c:47
+msgid ""
+"Handler (external program) for this protocol. Name the\n"
+"options in this tree after your system (ie. unix, unix-xwin)."
+msgstr ""
+
+#: src/protocol/user.c:52
+msgid ""
+"Handler (external program) for this protocol and system.\n"
+"%f in the string means file name to include form data from\n"
+"%h in the string means hostname (or email address)\n"
+"%p in the string means port\n"
+"%d in the string means path (everything after the port)\n"
+"%s in the string means subject (?subject=<this>)\n"
+"%u in the string means the whole URL"
+msgstr ""
+
+#: src/protocol/user.c:263
+msgid "No program"
+msgstr ""
+
+#: src/protocol/user.c:265
+#, c-format
+msgid "No program specified for protocol %s."
+msgstr ""
+
+#: src/scripting/lua/core.c:312
+msgid "Error registering event hook"
+msgstr ""
+
+#: src/scripting/lua/core.c:463
+msgid "User dialog"
+msgstr ""
+
+#: src/scripting/lua/core.c:742
+msgid "Lua Error"
+msgstr ""
+
+#: src/scripting/lua/core.c:892
+msgid "Lua Console"
+msgstr ""
+
+#: src/scripting/lua/core.c:892
+msgid "Enter expression"
+msgstr ""
+
+#: src/scripting/ruby/core.c:131 src/scripting/ruby/core.c:184
+msgid "Ruby Message"
+msgstr ""
+
+#: src/scripting/scripting.c:59
+#, c-format
+msgid "An error occurred while running a %s script"
+msgstr ""
+
+#: src/scripting/scripting.c:65
+msgid "Browser scripting error"
+msgstr ""
+
+#. name:
+#: src/scripting/scripting.c:93
+msgid "Scripting"
+msgstr ""
+
+#: src/scripting/smjs/elinks_object.c:85
+msgid "User script alert"
+msgstr ""
+
+#: src/session/download.c:235 src/session/download.c:359
+#: src/session/download.c:591 src/session/download.c:679
+msgid "Download error"
+msgstr "Aflaaifout"
+
+#: src/session/download.c:236 src/session/download.c:680
+#, c-format
+msgid ""
+"Could not create file '%s':\n"
+"%s"
+msgstr ""
+"Kon nie lĂŞer '%s' skep nie:\n"
+"%s"
+
+#: src/session/download.c:360
+#, c-format
+msgid ""
+"Error downloading %s:\n"
+"\n"
+"%s"
+msgstr ""
+"Fout met aflaai van %s:\n"
+"\n"
+"%s"
+
+#: src/session/download.c:592
+#, c-format
+msgid "'%s' is a directory."
+msgstr "'%s' is 'n gids."
+
+#: src/session/download.c:626
+msgid "File exists"
+msgstr "LĂŞer bestaan"
+
+#: src/session/download.c:627
+#, c-format
+msgid ""
+"This file already exists:\n"
+"%s\n"
+"\n"
+"The alternative filename is:\n"
+"%s"
+msgstr ""
+"Hierdie lĂŞer bestaan reeds:\n"
+"%s\n"
+"\n"
+"Die alternatiewe lĂŞernaam is:\n"
+"%s"
+
+#. accelerator_context(src/session/download.c:lookup_unique_name)
+#: src/session/download.c:634
+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:635
+msgid "~Overwrite the original file"
+msgstr "~Oorskryf die oorspronklike naam"
+
+#. accelerator_context(src/session/download.c:lookup_unique_name)
+#: src/session/download.c:636
+msgid "~Resume download of the original file"
+msgstr "~Hervat die aflaai van die oorspronklike lĂŞer"
+
+#: src/session/download.c:1124
+msgid "Unknown type"
+msgstr "Onbekende soort"
+
+#: src/session/download.c:1146
+#, 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:1176
+#, no-c-format
+msgid "Program ('%' will be replaced by the filename)"
+msgstr "Program ('%' sal vervang word met die lĂŞernaam)"
+
+#: src/session/download.c:1181
+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:1185
+msgid "Block the terminal"
+msgstr "Blok die terminaal"
+
+#: src/session/download.c:1192
+#, 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:1213
+msgid "~Open"
+msgstr "~Open"
+
+#: src/session/session.c:756 src/session/session.c:775 src/session/task.c:270
+#: src/viewer/text/textarea.c:624
+msgid "Warning"
+msgstr "Waarskuwing"
+
+#: src/session/session.c:757
+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, "
+"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."
+msgstr ""
+
+#: src/session/session.c:776
+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."
+msgstr ""
+
+#: src/session/session.c:801
+msgid "Welcome"
+msgstr "Welkom"
+
+#: src/session/session.c:802
+msgid ""
+"Welcome to ELinks!\n"
+"\n"
+"Press ESC for menu. Documentation is available in Help menu."
+msgstr ""
+"Welkom by ELinks!\n"
+"\n"
+"Druk ESC vir die kieslys. Dokumentasie is beskikbaar in die Hulp-kieslys."
+
+#: src/session/task.c:238
+#, c-format
+msgid ""
+"The URL you are about to follow might be maliciously crafted in order to "
+"confuse you. By following the URL you will be connecting to host \"%s\" as "
+"user \"%s\".\n"
+"\n"
+"Do you want to go to URL %s?"
+msgstr ""
+"Die URL wat u nou gaan volg is dalk kwaadwilliglik saamgestel om u te "
+"verwar. As u die URL volg, sal u verbind aan rekenaar \"%s\" as gebruiker \"%"
+"s\".\n"
+"\n"
+"Wil u gaan na URL %s?"
+
+#: src/session/task.c:248
+#, c-format
+msgid "Do you want to follow the redirect and post form data to URL %s?"
+msgstr "Wil u die aanstuur volg en vormdata instuur aan URL %s?"
+
+#: src/session/task.c:252
+#, c-format
+msgid ""
+"The form data you are about to post might be incomplete.\n"
+"Do you want to post to URL %s?"
+msgstr ""
+"Die vormdata wat u nou gaan instuur is dalk onvolledig.\n"
+"Wil u aan URL %s instuur?"
+
+#: src/session/task.c:256
+#, c-format
+msgid "Do you want to post form data to URL %s?"
+msgstr "Wil u vormdata instuur aan URL %s?"
+
+#: src/session/task.c:259
+#, c-format
+msgid "Do you want to repost form data to URL %s?"
+msgstr "Wil u vormdata oor instuur aan URL %s?"
+
+#: src/terminal/event.c:77
+#, c-format
+msgid "Bad terminal size: %d, %d"
+msgstr "Slegte terminaalgrootte: %d, %d"
+
+#: src/terminal/event.c:170
+msgid "Warning: terminal name contains illicit chars."
+msgstr ""
+
+#: src/terminal/event.c:251
+msgid "Failed to create session."
+msgstr "Kon nie sessie skep nie."
+
+#: src/terminal/event.c:437
+#, c-format
+msgid "Bad event %d"
+msgstr ""
+
+#: src/terminal/event.c:477
+#, c-format
+msgid "Could not read event: %d (%s)"
+msgstr ""
+
+#: src/terminal/kbd.c:1105
+msgid "Too many bytes read from the itrm!"
+msgstr ""
+
+#: src/terminal/tab.c:204
+msgid "Do you really want to close the current tab?"
+msgstr "Wil u regtig die huidige oortjie toemaak?"
+
+#: src/terminal/tab.c:247
+msgid "Do you really want to close all except the current tab?"
+msgstr "Wil u regtig al die oortjies behalwe die huidige een toemaak?"
+
+#: src/viewer/dump/dump.c:87
+#, c-format
+msgid "Can't write to stdout: %s"
+msgstr "Kan nie skryf na stdout nie: %s"
+
+#: src/viewer/dump/dump.c:90
+msgid "Can't write to stdout."
+msgstr "Kan nie skryf na stdout nie."
+
+#: src/viewer/dump/dump.c:285
+#, c-format
+msgid "URL protocol not supported (%s)."
+msgstr "URL-protokol nie ondersteun nie (%s)."
+
+#: src/viewer/text/draw.c:63
+msgid "Missing fragment"
+msgstr "Vermisde fragment"
+
+#: src/viewer/text/draw.c:64
+#, c-format
+msgid "The requested fragment \"#%s\" doesn't exist."
+msgstr "Die aangevraagde vragment \"#%s\" bestaan nie."
+
+#: src/viewer/text/form.c:1023
+msgid "Error while posting form"
+msgstr "Fout met instuur van vorm"
+
+#: src/viewer/text/form.c:1024
+#, c-format
+msgid "Could not load file %s: %s"
+msgstr "Kon nie lĂŞer %s laai nie: %s"
+
+#: src/viewer/text/form.c:1782
+msgid "Reset form"
+msgstr "Herstel vorm"
+
+#: src/viewer/text/form.c:1784
+msgid "Harmless button"
+msgstr "Skadelose knoppie"
+
+#: src/viewer/text/form.c:1792
+msgid "Submit form to"
+msgstr ""
+
+#: src/viewer/text/form.c:1793
+msgid "Post form to"
+msgstr ""
+
+#: src/viewer/text/form.c:1795
+msgid "Radio button"
+msgstr ""
+
+#: src/viewer/text/form.c:1799
+msgid "Select field"
+msgstr ""
+
+#: src/viewer/text/form.c:1803
+msgid "Text area"
+msgstr "Teksarea"
+
+#: src/viewer/text/form.c:1805
+msgid "File upload"
+msgstr "LĂŞeroplaaier"
+
+#: src/viewer/text/form.c:1807
+msgid "Password field"
+msgstr "Wagwoordveld"
+
+#: src/viewer/text/form.c:1845
+msgid "name"
+msgstr "naam"
+
+#: src/viewer/text/form.c:1857
+msgid "value"
+msgstr "waarde"
+
+#: src/viewer/text/form.c:1870
+msgid "read only"
+msgstr "leesalleen"
+
+#: src/viewer/text/form.c:1881
+#, c-format
+msgid "press %s to navigate"
+msgstr "druk %s om te navigeer"
+
+#: src/viewer/text/form.c:1883
+#, c-format
+msgid "press %s to edit"
+msgstr "druk %s om te wysig"
+
+#: src/viewer/text/form.c:1919
+#, c-format
+msgid "press %s to submit to %s"
+msgstr "druk %s om in te stuur aan %s"
+
+#: src/viewer/text/form.c:1921
+#, c-format
+msgid "press %s to post to %s"
+msgstr "druk %s om in te stuur aan %s"
+
+#: src/viewer/text/form.c:2023
+msgid "Useless button"
+msgstr "Nuttelose knoppie"
+
+#: src/viewer/text/form.c:2025
+msgid "Submit button"
+msgstr "Indien-knoppie"
+
+#. accelerator_context(link_menu.map)
+#: src/viewer/text/link.c:1271
+msgid "Display ~usemap"
+msgstr ""
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1276
+msgid "~Follow link"
+msgstr "~Volg skakel"
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1278
+msgid "Follow link and r~eload"
+msgstr "Volg skakel en ~herlaai"
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1282
+msgid "Open in new ~window"
+msgstr "Open in nuwe ~venster"
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1284
+msgid "Open in new ~tab"
+msgstr "Open in nuwe ~oortjie"
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1286
+msgid "Open in new tab in ~background"
+msgstr "Open in nuwe ~agtergrondoortjie"
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1291
+msgid "~Download link"
+msgstr "~Laai skakel af"
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1294
+msgid "~Add link to bookmarks"
+msgstr "Voeg skakel by ~boekmerke"
+
+#. accelerator_context(link_menu.std)
+#: src/viewer/text/link.c:1298
+msgid "Pass link URI to e~xternal command"
+msgstr "Stuur skakel-URI aan ~eksterne opdrag"
+
+#. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
+#: src/viewer/text/link.c:1309 src/viewer/text/link.c:1349
+msgid "~Reset form"
+msgstr "~Herstel vorm"
+
+#. accelerator_context(link_menu.textarea)
+#: src/viewer/text/link.c:1324
+msgid "Open in ~external editor"
+msgstr "Open in eksterne ~redigeerder"
+
+#. accelerator_context(link_menu.form, link_menu.textarea)
+#: src/viewer/text/link.c:1332
+msgid "~Submit form"
+msgstr "~Dien vorm in"
+
+#. accelerator_context(link_menu.form, link_menu.textarea)
+#: src/viewer/text/link.c:1333
+msgid "Submit form and rel~oad"
+msgstr "Dien vorm in en herl~aai"
+
+#. accelerator_context(link_menu.form, link_menu.textarea)
+#: src/viewer/text/link.c:1337
+msgid "Submit form and open in new ~window"
+msgstr "Dien vorm in en maak in nuwe ~venster oop"
+
+#. accelerator_context(link_menu.form, link_menu.textarea)
+#: src/viewer/text/link.c:1339
+msgid "Submit form and open in new ~tab"
+msgstr "Dien vorm in en maak in nuwe ~oorjtie oop"
+
+#. accelerator_context(link_menu.form, link_menu.textarea)
+#: src/viewer/text/link.c:1342
+msgid "Submit form and open in new tab in ~background"
+msgstr "Dien vorm in en maak in nuwe ~agtergrondoortjie oop"
+
+#. accelerator_context(link_menu.form, link_menu.textarea)
+#: src/viewer/text/link.c:1347
+msgid "Submit form and ~download"
+msgstr "Dien vorm in en laai af"
+
+#. accelerator_context(link_menu.form, link_menu.reset, link_menu.textarea)
+#: src/viewer/text/link.c:1354
+msgid "Form f~ields"
+msgstr "~Vormvelde"
+
+#. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
+#: src/viewer/text/link.c:1361
+msgid "V~iew image"
+msgstr "~Bekyk prent"
+
+#. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
+#: src/viewer/text/link.c:1363
+msgid "Download ima~ge"
+msgstr "Laai prent ~af"
+
+#: src/viewer/text/link.c:1372
+msgid "No link selected"
+msgstr "Geen skakel gekies nie"
+
+#: src/viewer/text/link.c:1442
+msgid "Image"
+msgstr "Prent"
+
+#: src/viewer/text/link.c:1447
+msgid "Usemap"
+msgstr ""
+
+#: src/viewer/text/search.c:1078
+msgid "Search hit top, continuing at bottom."
+msgstr "Soektog het bokant bereik, gaan nou onder aan."
+
+#: src/viewer/text/search.c:1079
+msgid "Search hit bottom, continuing at top."
+msgstr "Soektog het onderkant bereik, gaan nou bo aan."
+
+#: src/viewer/text/search.c:1082
+msgid "No previous search"
+msgstr "Geen vorige soektog nie"
+
+#: src/viewer/text/search.c:1094
+#, c-format
+msgid "Could not compile regular expression '%s'"
+msgstr "Kon nie reguliere uitdrukking '%s' saamstel nie"
+
+#: src/viewer/text/search.c:1137
+#, c-format
+msgid "No further matches for '%s'."
+msgstr "'%s' tref nĂŞrens verder nie."
+
+#: src/viewer/text/search.c:1139
+#, c-format
+msgid "Could not find a link with the text '%s'."
+msgstr "Kon nie 'n skakel met die teks '%s' vind nie."
+
+#: src/viewer/text/search.c:1141 src/viewer/text/search.c:1549
+msgid "Typeahead"
+msgstr ""
+
+#: src/viewer/text/search.c:1551
+msgid "No links in current document"
+msgstr "Geen skakels in die huidige dokument nie"
+
+#: src/viewer/text/search.c:1629
+msgid "Search for text"
+msgstr "Soek vir teks"
+
+#: src/viewer/text/search.c:1660
+msgid "Normal search"
+msgstr "Normale soektog"
+
+#: src/viewer/text/search.c:1661
+msgid "Regexp search"
+msgstr "Soektog met reguliere uitdrukking"
+
+#: src/viewer/text/search.c:1662
+msgid "Extended regexp search"
+msgstr "Soektog met uitgebreide reguliere uitdrukking"
+
+#: src/viewer/text/search.c:1663
+msgid "Case sensitive"
+msgstr "Kassensitief"
+
+#: src/viewer/text/search.c:1664
+msgid "Case insensitive"
+msgstr "Nie kassensitief nie"
+
+#: src/viewer/text/search.c:1688
+msgid "Search backward"
+msgstr "Soek agteruit"
+
+#. name:
+#: src/viewer/text/search.c:1727
+msgid "Search History"
+msgstr "Deursoek geskiedenis"
+
+#: src/viewer/text/textarea.c:571
+msgid "You cannot launch an external editor in the anonymous mode."
+msgstr ""
+
+#: src/viewer/text/textarea.c:578
+msgid "You can do this only on the master terminal"
+msgstr ""
+
+#: src/viewer/text/textarea.c:627
+#, c-format
+msgid ""
+"You have exceeded the textarea's size limit: your input is %d bytes, but the "
+"maximum is %u bytes.\n"
+"\n"
+"Your input has been truncated, but you can still recover the text that you "
+"entered from this file: %s"
+msgstr ""
+
+#: src/viewer/text/view.c:728
+msgid "Go to link"
+msgstr "Gaan na skakel"
+
+#: src/viewer/text/view.c:728
+msgid "Enter link number"
+msgstr "Tik skakelnommer in"
+
+#: src/viewer/text/view.c:1313
+msgid "Save error"
+msgstr "Fout met stoor"
+
+#: src/viewer/text/view.c:1314
+msgid "Error writing to file"
+msgstr "Fout met die skryf na die lĂŞer"
+
+#. name:
+#: src/viewer/viewer.c:25
+msgid "Viewer"
+msgstr "Bekykprogram"
diff --git a/src/intl/gettext/libintl.c b/src/intl/gettext/libintl.c
index 0db88b2d..4e9409e2 100644
--- a/src/intl/gettext/libintl.c
+++ b/src/intl/gettext/libintl.c
@@ -27,6 +27,7 @@ struct language languages[] = {
 	{N_("System"), "system"},
 	{N_("English"), "en"},
 
+	{N_("Afrikaans"), "af"},
 	{N_("Belarusian"), "be"},
 	{N_("Brazilian Portuguese"), "pt-BR"},
 	{N_("Bulgarian"), "bg"},

From 947c1730a61900fd3443696182b6692f2669bf56 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 11 Oct 2006 14:44:39 +0200
Subject: [PATCH 131/132] Fix crash due to untested null pointer occuring when
 doing HTTP_PROXY=8080:proxy.ucv.cl elinks http://wwww.google.cl. Thanks to
 Karel Zak.

---
 AUTHORS            | 1 +
 src/session/task.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 56b3c065..54620b4a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -291,6 +291,7 @@ Karel Kulhavy <clock@atrey.karlin.mff.cuni.cz>
 
 Karel Zak <kzak@redhat.com>
 	Support for negotiate-auth based on GSSAPI
+	Minor bug fixes
 
 Karsten Schölzel <kuser@gmx.de>
 	Event system chief engineer
diff --git a/src/session/task.c b/src/session/task.c
index f1ee9a4a..d5be8b11 100644
--- a/src/session/task.c
+++ b/src/session/task.c
@@ -539,8 +539,8 @@ loading_callback(struct download *download, struct session *ses)
 	}
 
 	if (is_in_result_state(download->state) && download->state != S_OK) {
-		print_error_dialog(ses, download->state, download->conn->uri,
-				   download->pri);
+		print_error_dialog(ses, download->state,
+				   download->conn ? download->conn->uri : NULL,				   	   download->pri);
 		if (d == DO_MOVE_ABORT) reload(ses, CACHE_MODE_NORMAL);
 	}
 

From eef961e206e5562e5352c3041a5f87115e17098a Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Wed, 11 Oct 2006 21:13:43 +0200
Subject: [PATCH 132/132] Detection of UTF-8 mode doesn't work well on slave
 terminals.

---
 src/terminal/terminal.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index e9860a77..3f872934 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -40,6 +40,7 @@ INIT_LIST_HEAD(terminals);
 
 static void check_if_no_terminal(void);
 
+#if 0
 static int
 was_utf8(int in, int out)
 {
@@ -59,6 +60,7 @@ was_utf8(int in, int out)
 	}
 	return 1;
 }
+#endif
 
 void
 redraw_terminal(struct terminal *term)
@@ -115,10 +117,12 @@ init_term(int fdin, int fdout)
 	term->spec = get_opt_rec(config_options, name);
 	object_lock(term->spec);
 
+#if 0
 	/* The hack to restore console in the right mode */
 	if (get_opt_int_tree(term->spec, "type") == TERM_LINUX) {
 		term->linux_was_utf8 = was_utf8(get_input_handle(), term->fdout);
 	}
+#endif
 
 	add_to_list(terminals, term);
 
@@ -167,6 +171,8 @@ destroy_terminal(struct terminal *term)
 	del_from_list(term);
 	close(term->fdin);
 
+#if 0
+	/* This code doesn't work with slave terminals. */
 	if (get_opt_int_tree(term->spec, "type") == TERM_LINUX) {
 		if (term->linux_was_utf8) {
 			hard_write(term->fdout, "\033%G", 3);
@@ -174,6 +180,7 @@ destroy_terminal(struct terminal *term)
 			hard_write(term->fdout, "\033%@", 3);
 		}
 	}
+#endif
 
 	if (term->fdout != 1) {
 		if (term->fdout != term->fdin) close(term->fdout);