From 30fde644b12dd61883497c2dd0a8248f44de3d27 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Mon, 8 Jan 2007 16:39:31 +0100
Subject: [PATCH 1/7] Polish translation was updated.

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

diff --git a/po/pl.po b/po/pl.po
index d2b7e6a0..1de6b39e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5102,9 +5102,9 @@ msgstr[2] "%ld sformatowanych"
 #, c-format
 msgid "%ld refreshing"
 msgid_plural "%ld refreshing"
-msgstr[0] "%ld od¶wie¿anych"
-msgstr[1] "%ld od¶wie¿any"
-msgstr[2] "%ld od¶wie¿ane"
+msgstr[0] "%ld od¶wie¿any"
+msgstr[1] "%ld od¶wie¿ane"
+msgstr[2] "%ld od¶wie¿anych"
 
 #: src/dialogs/info.c:236
 msgid "Interlinking"

From 8b8bb5610fea7ffe6f35b7258ac48a73e41cd6c0 Mon Sep 17 00:00:00 2001
From: Laurent MONIN <zas@norz.org>
Date: Wed, 10 Jan 2007 09:21:52 +0100
Subject: [PATCH 2/7] French translation was updated.

---
 po/fr.po | 599 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 306 insertions(+), 293 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 103d42e6..003bf54c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,13 +1,13 @@
 # French ELinks translation.
 # Fabrice Haberer-Proust <fric@gmx.li>
-# Laurent Monin <zas@norz.org>, 2001 - 2006
+# Laurent Monin <zas@norz.org>, 2001 - 2007
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ELinks 0.12.GIT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-26 10:35+0100\n"
-"PO-Revision-Date: 2006-12-26 10:37+0100\n"
+"POT-Creation-Date: 2007-01-10 09:16+0100\n"
+"PO-Revision-Date: 2007-01-10 09:18+0100\n"
 "Last-Translator: Laurent Monin <zas@norz.org>\n"
 "Language-Team: French <zas@norz.org>\n"
 "MIME-Version: 1.0\n"
@@ -192,8 +192,8 @@ msgstr "Horloge"
 msgid "Digital clock in the status bar."
 msgstr "Horloge digitale dans la barre de status."
 
-#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1165
-#: src/config/options.inc:1172 src/ecmascript/ecmascript.c:45
+#: src/bfu/leds.c:77 src/bfu/leds.c:94 src/config/options.inc:1177
+#: src/config/options.inc:1184 src/ecmascript/ecmascript.c:45
 #: src/globhist/globhist.c:64 src/mime/backend/mailcap.c:93
 #: src/mime/backend/mimetypes.c:52 src/network/ssl/ssl.c:80
 msgid "Enable"
@@ -367,7 +367,7 @@ msgstr ""
 "\n"
 "Cette fonctionnalité requiert le support des signets."
 
-#: src/bookmarks/dialogs.c:72 src/config/options.inc:1017
+#: src/bookmarks/dialogs.c:72 src/config/options.inc:1029
 #: src/dialogs/document.c:145 src/globhist/dialogs.c:65
 msgid "Title"
 msgstr "Titre"
@@ -607,7 +607,7 @@ msgstr "Expiration"
 msgid "ID"
 msgstr "ID"
 
-#: src/cache/dialogs.c:134 src/config/options.inc:662
+#: src/cache/dialogs.c:134 src/config/options.inc:668
 msgid "Header"
 msgstr "En-tête"
 
@@ -1822,7 +1822,7 @@ msgid "(expand by pressing space)"
 msgstr "(déployer en pressant espace)"
 
 #: src/config/dialogs.c:147 src/config/dialogs.c:330
-#: src/config/options.inc:812
+#: src/config/options.inc:818
 msgid "Type"
 msgstr "Type"
 
@@ -1904,7 +1904,7 @@ msgstr "Gestionnaire d'options"
 msgid "Keystroke"
 msgstr "Touches"
 
-#: src/config/dialogs.c:674 src/config/options.inc:1185
+#: src/config/dialogs.c:674 src/config/options.inc:1197
 msgid "Action"
 msgstr "Action"
 
@@ -2536,12 +2536,12 @@ msgid "Active link colors."
 msgstr "Couleurs du lien actif."
 
 #: src/config/options.inc:274 src/config/options.inc:548
-#: src/config/options.inc:911
+#: src/config/options.inc:923
 msgid "Background color"
 msgstr "Couleur du fond"
 
 #: src/config/options.inc:276 src/config/options.inc:550
-#: src/config/options.inc:912
+#: src/config/options.inc:924
 msgid "Default background color."
 msgstr "Couleur par défaut du fond."
 
@@ -2554,12 +2554,12 @@ msgstr "Couleur par d
 #. The colors and mono tree should be similar but with different default
 #. * values of course so always use the macros below.
 #: src/config/options.inc:278 src/config/options.inc:544
-#: src/config/options.inc:909
+#: src/config/options.inc:921
 msgid "Text color"
 msgstr "Couleur du texte"
 
 #: src/config/options.inc:280 src/config/options.inc:546
-#: src/config/options.inc:910
+#: src/config/options.inc:922
 msgid "Default text color."
 msgstr "Couleur du texte par défaut."
 
@@ -2593,7 +2593,7 @@ msgid "Invert the fore- and background color so the link stands out."
 msgstr ""
 "Inverser les couleurs de fond et de texte pour mettre le lien en évidence."
 
-#: src/config/options.inc:296 src/config/options.inc:874
+#: src/config/options.inc:296 src/config/options.inc:886
 #: src/dialogs/options.c:231
 msgid "Underline"
 msgstr "Souligné"
@@ -3247,7 +3247,7 @@ msgstr "Sortie (dump)"
 msgid "Dump output options."
 msgstr "Options de sortie (dump)."
 
-#: src/config/options.inc:639 src/config/options.inc:878
+#: src/config/options.inc:639 src/config/options.inc:890
 #: src/config/opttypes.c:408 src/dialogs/document.c:163
 msgid "Codepage"
 msgstr "Jeu de caractères"
@@ -3261,149 +3261,156 @@ msgstr ""
 "'System' indique que celui-ci sera déterminé par la locale\n"
 "en cours."
 
-#: src/config/options.inc:644 src/config/options.inc:850
+#: src/config/options.inc:644 src/config/options.inc:856
 msgid "Color mode"
 msgstr "Mode couleurs"
 
-#: src/config/options.inc:646
+#. The list of modes must be at the end of this string
+#. * because AsciiDoc 7.1.2 does not support continuing
+#. * an outer list entry after an inner list.
+#. * TRANSLATORS: This restriction applies only to the
+#. * "en" (English) translation.  (See doc/Makefile.)
+#: src/config/options.inc:651
 msgid ""
-"Color mode for dumps:\n"
+"Color mode for dumps.\n"
+"Some modes may have been disabled at compile time. The Setup -> Terminal "
+"options dialog lists the modes supported by this executable. If you select "
+"an unsupported mode, ELinks uses 16 colors.\n"
+"The color modes are:\n"
 "-1 is standard dump mode\n"
 "0 is mono mode\n"
 "1 is 16 color mode\n"
 "2 is 88 color mode\n"
 "3 is 256 color mode\n"
-"4 is true color mode\n"
-"Some of these may have been disabled at compile time. The Setup -> Terminal "
-"options dialog lists the modes supported by this executable. If you select "
-"an unsupported mode, ELinks uses 16 colors."
+"4 is true color mode"
 msgstr ""
-"Mode couleurs pour la sortie standard:\n"
+"Mode couleurs pour la sortie standard.\n"
+"Certains de ces modes ont pu être désactivés au moment de la\n"
+"compilation. Le dialogue Configuration -> Options du terminal\n"
+"liste les modes supportés par cet exécutable.\n"
+"Si vous sélectionnez un mode non supporté, ELinks utilisera\n"
+"le mode 16 couleurs.\n"
+"Les modes sont:\n"
 "-1 est le mode standard\n"
 " 0 est le mode monochrome\n"
 " 1 est le mode 16 couleurs\n"
 " 2 est le mode 88 couleurs\n"
 " 3 est le mode 256 couleurs\n"
-" 4 est le mode vraies couleurs\n"
-"Certains de ces modes ont pu être désactivés au moment de la\n"
-"compilation. Le dialogue Configuration -> Options du terminal\n"
-"lists les modes supportés par cet exécutable.\n"
-"Si vous sélectionnez un mode non supporté, ELinks utilisera\n"
-"le mode 16 couleurs."
+" 4 est le mode vraies couleurs"
 
-#: src/config/options.inc:658
+#: src/config/options.inc:664
 msgid "Footer"
 msgstr "Pied de page"
 
-#: src/config/options.inc:660
+#: src/config/options.inc:666
 #, 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:664
+#: src/config/options.inc:670
 #, 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:666
+#: src/config/options.inc:672
 msgid "Numbering"
 msgstr "Numérotation"
 
-#: src/config/options.inc:668
+#: src/config/options.inc:674
 msgid "Whether to print link numbers in dump output."
 msgstr "Numéroter ou non les liens en sortie (dump)."
 
-#: src/config/options.inc:670
+#: src/config/options.inc:676
 msgid "References"
 msgstr "Références"
 
-#: src/config/options.inc:672
+#: src/config/options.inc:678
 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:675
+#: src/config/options.inc:681
 msgid "Separator"
 msgstr "Séparateur"
 
-#: src/config/options.inc:677
+#: src/config/options.inc:683
 msgid "String which separates two dumps."
 msgstr "Chaîne qui sépare deux dumps."
 
-#: src/config/options.inc:679
+#: src/config/options.inc:685
 msgid "Width"
 msgstr "Largeur"
 
-#: src/config/options.inc:681
+#: src/config/options.inc:687
 msgid "Width of screen in characters when dumping documents."
 msgstr "Largeur de l'écran en caractères pour les dumps."
 
-#: src/config/options.inc:685
+#: src/config/options.inc:691
 msgid "History"
 msgstr "Historique"
 
-#: src/config/options.inc:687
+#: src/config/options.inc:693
 msgid "History options."
 msgstr "Options de l'historique."
 
-#: src/config/options.inc:689
+#: src/config/options.inc:695
 msgid "Keep unhistory"
 msgstr "Historique inverse"
 
-#: src/config/options.inc:691
+#: src/config/options.inc:697
 msgid "Keep unhistory (\"forward history\")."
 msgstr "Historique inverse (\"forward history\")."
 
-#: src/config/options.inc:694
+#: src/config/options.inc:700
 msgid "HTML rendering"
 msgstr "Rendu HTML"
 
-#: src/config/options.inc:696
+#: src/config/options.inc:702
 msgid "Options concerning the display of HTML pages."
 msgstr "Options d'affichage des pages HTML."
 
-#: src/config/options.inc:698
+#: src/config/options.inc:704
 msgid "Display frames"
 msgstr "Afficher les cadres"
 
-#: src/config/options.inc:700
+#: src/config/options.inc:706
 msgid "Display frames."
 msgstr "Afficher les cadres."
 
-#: src/config/options.inc:702
+#: src/config/options.inc:708
 msgid "Display tables"
 msgstr "Afficher les tableaux"
 
-#: src/config/options.inc:704
+#: src/config/options.inc:710
 msgid "Display tables."
 msgstr "Afficher les tableaux."
 
-#: src/config/options.inc:706
+#: src/config/options.inc:712
 msgid "Display subscripts"
 msgstr "Afficher subscripts"
 
-#: src/config/options.inc:708
+#: src/config/options.inc:714
 msgid "Display subscripts (as [thing])."
 msgstr "Afficher subscripts (comme [chose])."
 
-#: src/config/options.inc:710
+#: src/config/options.inc:716
 msgid "Display superscripts"
 msgstr "Afficher superscripts"
 
-#: src/config/options.inc:712
+#: src/config/options.inc:718
 msgid "Display superscripts (as ^thing)."
 msgstr "Afficher superscripts (comme ^chose)."
 
-#: src/config/options.inc:714
+#: src/config/options.inc:720
 msgid "Rendering of html link element"
 msgstr "Rendu des éléments html link"
 
-#: src/config/options.inc:716
+#: src/config/options.inc:722
 msgid ""
 "How to render <link> tags from the HTML header:\n"
 "0 is nothing\n"
@@ -3421,19 +3428,19 @@ msgstr ""
 "4 type de contenu en plus\n"
 "5 tout"
 
-#: src/config/options.inc:724
+#: src/config/options.inc:730
 msgid "Underline links"
 msgstr "Souligner les liens"
 
-#: src/config/options.inc:726
+#: src/config/options.inc:732
 msgid "Underline links."
 msgstr "Souligner les liens."
 
-#: src/config/options.inc:728
+#: src/config/options.inc:734
 msgid "Wrap non breaking space"
 msgstr "Césure sur les espaces non sécables (nbsp)"
 
-#: src/config/options.inc:730
+#: src/config/options.inc:736
 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"
@@ -3443,35 +3450,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:735
+#: src/config/options.inc:741
 msgid "Plain rendering"
 msgstr "Rendu plein texte"
 
-#: src/config/options.inc:737
+#: src/config/options.inc:743
 msgid "Options concerning the display of plain text pages."
 msgstr "Options d'affichage des pages plein texte."
 
-#: src/config/options.inc:739
+#: src/config/options.inc:745
 msgid "Display URIs"
 msgstr "Afficher les URIs"
 
-#: src/config/options.inc:741
+#: src/config/options.inc:747
 msgid "Display URIs in the document as links."
 msgstr "Afficher les URIs dans le document en tant que liens."
 
-#: src/config/options.inc:743
+#: src/config/options.inc:749
 msgid "Compress empty lines"
 msgstr "Compresser les lignes vides"
 
-#: src/config/options.inc:745
+#: src/config/options.inc:751
 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:748
+#: src/config/options.inc:754
 msgid "URI passing"
 msgstr "Passage d'URI"
 
-#: src/config/options.inc:750
+#: src/config/options.inc:756
 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"
@@ -3496,7 +3503,7 @@ msgstr ""
 "frame-external-command, link-external-command, et\n"
 "tab-external-command."
 
-#: src/config/options.inc:763
+#: src/config/options.inc:769
 msgid ""
 "A rule for passing URI to an external command.\n"
 "The format is:\n"
@@ -3511,19 +3518,19 @@ msgstr ""
 "Ne mettez pas de simples ou doubles guillemets autour de %c."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:773
+#: src/config/options.inc:779
 msgid "Information files"
 msgstr "Fichiers d'information"
 
-#: src/config/options.inc:775
+#: src/config/options.inc:781
 msgid "Options for information files in ~/.elinks."
 msgstr "Options concernant les fichiers d'information dans ~/.elinks."
 
-#: src/config/options.inc:777
+#: src/config/options.inc:783
 msgid "Save interval"
 msgstr "Intervalle pour la sauvegarde automatique"
 
-#: src/config/options.inc:779
+#: src/config/options.inc:785
 msgid ""
 "Interval at which to trigger information files in ~/.elinks\n"
 "to be saved to disk if they has changed (seconds; 0 to disable)"
@@ -3531,11 +3538,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:782
+#: src/config/options.inc:788
 msgid "Use secure file saving"
 msgstr "Fiabiliser la sauvegarde des fichiers"
 
-#: src/config/options.inc:784
+#: src/config/options.inc:790
 msgid ""
 "First write data to unique temporary file, then rename this file\n"
 "upon successfully finishing this. Note that this relates only to\n"
@@ -3558,11 +3565,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:793
+#: src/config/options.inc:799
 msgid "Use fsync(3) with secure file saving"
 msgstr "Utiliser fsync(3) avec la sauvegarde fiable des fichiers"
 
-#: src/config/options.inc:795
+#: src/config/options.inc:801
 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"
@@ -3576,21 +3583,21 @@ msgstr ""
 "éviter une utilisation excessive des entrées/sorties disque."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:804
+#: src/config/options.inc:810
 msgid "Terminals"
 msgstr "Terminaux"
 
-#: src/config/options.inc:806
+#: src/config/options.inc:812
 msgid "Terminal options."
 msgstr "Options du terminal."
 
-#: src/config/options.inc:810
+#: src/config/options.inc:816
 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:814
+#: src/config/options.inc:820
 msgid ""
 "Terminal type; matters mostly only when drawing frames and\n"
 "dialog box borders:\n"
@@ -3607,11 +3614,11 @@ msgstr ""
 "3 KOI-8\n"
 "4 FreeBSD"
 
-#: src/config/options.inc:822 src/dialogs/options.c:227
+#: src/config/options.inc:828 src/dialogs/options.c:227
 msgid "Switch fonts for line drawing"
 msgstr "Echanger les fontes pour dessiner les lignes"
 
-#: src/config/options.inc:824
+#: src/config/options.inc:830
 msgid ""
 "Switch fonts when drawing lines, enabling both local characters\n"
 "and lines working at the same time. Makes sense only with linux\n"
@@ -3625,11 +3632,11 @@ msgstr ""
 #. * and if so, behave as if "utf_8_io" were 1.  (When CONFIG_UTF8 is
 #. * not defined, it should not be possible to set UTF-8 as "codepage";
 #. * please report any such possibilities as bugs.)
-#: src/config/options.inc:833 src/dialogs/options.c:232
+#: src/config/options.inc:839 src/dialogs/options.c:232
 msgid "UTF-8 I/O"
 msgstr "E/S UTF-8"
 
-#: src/config/options.inc:835
+#: src/config/options.inc:841
 msgid ""
 "Enable I/O in UTF-8 for Unicode terminals. Note that currently,\n"
 "only the subset of UTF-8 according to terminal codepage is used.\n"
@@ -3640,11 +3647,11 @@ msgstr ""
 "avec l'encodage de caractères du terminal. ELinks ignore cette\n"
 "option si l'encodage de caractères utilisé par le terminal est UTF-8."
 
-#: src/config/options.inc:839 src/dialogs/options.c:228
+#: src/config/options.inc:845 src/dialogs/options.c:228
 msgid "Restrict frames in cp850/852"
 msgstr "Limiter les cadres dans cp850/852"
 
-#: src/config/options.inc:841
+#: src/config/options.inc:847
 msgid ""
 "Restrict the characters used when drawing lines. Makes sense\n"
 "only with linux terminals using the cp850/852 character sets."
@@ -3653,11 +3660,11 @@ msgstr ""
 "N'a du sens que pour les terminaux linux utilisant les jeux de\n"
 "caractères cp850/852."
 
-#: src/config/options.inc:844 src/dialogs/options.c:229
+#: src/config/options.inc:850 src/dialogs/options.c:229
 msgid "Block cursor"
 msgstr "Bloquer le curseur"
 
-#: src/config/options.inc:846
+#: src/config/options.inc:852
 msgid ""
 "Move cursor to bottom right corner when done drawing.\n"
 "This is particularly useful when we have a block cursor,\n"
@@ -3668,37 +3675,43 @@ msgstr ""
 "en forme de bloc est utilisé, ainsi le texte inversé\n"
 "est affiché correctement."
 
-#: src/config/options.inc:852
+#. The list of modes must be at the end of this string
+#. * because AsciiDoc 7.1.2 does not support continuing
+#. * an outer list entry after an inner list.
+#. * TRANSLATORS: This restriction applies only to the
+#. * "en" (English) translation.  (See doc/Makefile.)
+#: src/config/options.inc:863
 msgid ""
 "The color mode controls what colors are used and how they are output to the "
-"terminal. The color modes are:\n"
+"terminal.\n"
+"Some modes may have been disabled at compile time. The Setup -> Terminal "
+"options dialog lists the modes supported by this executable. If you select "
+"an unsupported mode, ELinks uses 16 colors.\n"
+"The color modes are:\n"
 "0 is mono mode, only 2 colors are used\n"
 "1 is 16 color mode, uses the common ANSI colors\n"
 "2 is 88 color mode, uses XTerm RGB codes\n"
 "3 is 256 color mode, uses XTerm RGB codes\n"
-"4 is true color mode, uses konsole RGB codes.\n"
-"Some of these may have been disabled at compile time. The Setup -> Terminal "
-"options dialog lists the modes supported by this executable. If you select "
-"an unsupported mode, ELinks uses 16 colors."
+"4 is true color mode, uses konsole RGB codes"
 msgstr ""
 "Le mode couleurs définit le nombre de couleurs affichées.\n"
+"Certains de ces modes ont pu être désactivés au moment de la\n"
+"compilation. Le dialogue Configuration -> Options du terminal\n"
+"lists les modes supportés par cet exécutable.\n"
+"Si vous sélectionnez un mode non supporté, ELinks utilisera\n"
+"le mode 16 couleurs.\n"
 "Les choix possibles sont:\n"
 "0 mode monochrome, utilise seulement 2 couleurs\n"
 "1 mode 16 couleurs, utilise les couleurs ANSI\n"
 "2 mode 88 couleurs, utilise les codes RVB d'XTerm\n"
 "3 mode 256 couleurs, utilise les codes RVB d'XTerm\n"
-"4 mode vraies couleurs, utilise les codes RVB de konsole.\n"
-"Certains de ces modes ont pu être désactivés au moment de la\n"
-"compilation. Le dialogue Configuration -> Options du terminal\n"
-"lists les modes supportés par cet exécutable.\n"
-"Si vous sélectionnez un mode non supporté, ELinks utilisera\n"
-"le mode 16 couleurs."
+"4 mode vraies couleurs, utilise les codes RVB de konsole."
 
-#: src/config/options.inc:864 src/dialogs/options.c:230
+#: src/config/options.inc:876 src/dialogs/options.c:230
 msgid "Transparency"
 msgstr "Transparence"
 
-#: src/config/options.inc:866
+#: src/config/options.inc:878
 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"
@@ -3716,11 +3729,11 @@ msgstr ""
 "un fond clair vous rencontrerez des problèmes de contraste).\n"
 "Cette option n'a de sens que quand les couleurs sont activées."
 
-#: src/config/options.inc:876
+#: src/config/options.inc:888
 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:880
+#: src/config/options.inc:892
 msgid ""
 "Codepage of charset used for displaying content on terminal.\n"
 "'System' stands for a codepage determined by a selected locale."
@@ -3730,374 +3743,374 @@ msgstr ""
 "sélectionnée."
 
 #. Keep options in alphabetical order.
-#: src/config/options.inc:887
+#: src/config/options.inc:899
 msgid "User interface"
 msgstr "Interface utilisateur"
 
-#: src/config/options.inc:889
+#: src/config/options.inc:901
 msgid "User interface options."
 msgstr "Options de l'interface utilisateur."
 
-#: src/config/options.inc:893
+#: src/config/options.inc:905
 msgid "Color settings"
 msgstr "Configuration des couleurs"
 
-#: src/config/options.inc:895
+#: src/config/options.inc:907
 msgid "Default user interface color settings."
 msgstr "Configuration des couleurs de l'interface utilisateur."
 
-#: src/config/options.inc:922
+#: src/config/options.inc:934
 msgid "Color terminals"
 msgstr "Terminaux couleur"
 
-#: src/config/options.inc:924
+#: src/config/options.inc:936
 msgid "Color settings for color terminal."
 msgstr "Configuration des couleurs des terminaux couleur."
 
-#: src/config/options.inc:926
+#: src/config/options.inc:938
 msgid "Non-color terminals"
 msgstr "Terminaux monochromes"
 
-#: src/config/options.inc:928
+#: src/config/options.inc:940
 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:931
+#: src/config/options.inc:943
 msgid "Main menu bar"
 msgstr "Barre du menu principal"
 
-#: src/config/options.inc:933
+#: src/config/options.inc:945
 msgid "Main menu bar colors."
 msgstr "Couleurs de la barre du menu principal."
 
-#: src/config/options.inc:935
+#: src/config/options.inc:947
 msgid "Unselected main menu bar item"
 msgstr "Item non sélectionné de la barre de menu"
 
-#: src/config/options.inc:937
+#: src/config/options.inc:949
 msgid "Unselected main menu bar item colors."
 msgstr "Couleurs des items non sélectionnés de la barre de menu."
 
-#: src/config/options.inc:939
+#: src/config/options.inc:951
 msgid "Selected main menu bar item"
 msgstr "Item sélectionné de la barre de menu"
 
-#: src/config/options.inc:941
+#: src/config/options.inc:953
 msgid "Selected main menu bar item colors."
 msgstr "Couleurs de l'item sélectionné de la barre de menu."
 
-#: src/config/options.inc:943 src/config/options.inc:972
+#: src/config/options.inc:955 src/config/options.inc:984
 msgid "Hotkey"
 msgstr "Raccourci clavier"
 
-#: src/config/options.inc:945
+#: src/config/options.inc:957
 msgid "Main menu hotkey colors."
 msgstr "Couleurs des raccourcis de la barre du menu principal."
 
-#: src/config/options.inc:947 src/config/options.inc:976
+#: src/config/options.inc:959 src/config/options.inc:988
 msgid "Unselected hotkey"
 msgstr "Raccourci non sélectionné"
 
-#: src/config/options.inc:949
+#: src/config/options.inc:961
 msgid "Main menu unselected hotkey colors."
 msgstr "Couleurs des raccourcis non sélectionnés du menu principal."
 
-#: src/config/options.inc:951 src/config/options.inc:980
+#: src/config/options.inc:963 src/config/options.inc:992
 msgid "Selected hotkey"
 msgstr "Raccourci sélectionné"
 
-#: src/config/options.inc:953
+#: src/config/options.inc:965
 msgid "Main menu selected hotkey colors."
 msgstr "Couleurs des raccourcis sélectionnés du menu principal."
 
-#: src/config/options.inc:956
+#: src/config/options.inc:968
 msgid "Menu bar"
 msgstr "Barre de menu"
 
-#: src/config/options.inc:958
+#: src/config/options.inc:970
 msgid "Menu bar colors."
 msgstr "Couleurs de la barre de menu."
 
-#: src/config/options.inc:960
+#: src/config/options.inc:972
 msgid "Unselected menu item"
 msgstr "Item non sélectionné du menu"
 
-#: src/config/options.inc:962
+#: src/config/options.inc:974
 msgid "Unselected menu item colors."
 msgstr "Couleurs des items non sélectionnés du menu."
 
-#: src/config/options.inc:964
+#: src/config/options.inc:976
 msgid "Selected menu item"
 msgstr "Item sélectionné du menu"
 
-#: src/config/options.inc:966
+#: src/config/options.inc:978
 msgid "Selected menu item colors."
 msgstr "Couleurs de l'item sélectionnés du menu."
 
-#: src/config/options.inc:968
+#: src/config/options.inc:980
 msgid "Marked menu item"
 msgstr "Item de menu marqué"
 
-#: src/config/options.inc:970
+#: src/config/options.inc:982
 msgid "Marked menu item colors."
 msgstr "Couleurs de l'item du menu marqué."
 
-#: src/config/options.inc:974
+#: src/config/options.inc:986
 msgid "Menu item hotkey colors."
 msgstr "Couleurs des raccourcis dans les menus."
 
-#: src/config/options.inc:978
+#: src/config/options.inc:990
 msgid "Menu item unselected hotkey colors."
 msgstr "Couleurs des raccourcis non sélectionnés dans les menus."
 
-#: src/config/options.inc:982
+#: src/config/options.inc:994
 msgid "Menu item selected hotkey colors."
 msgstr "Couleurs des raccourcis sélectionnés dans les menus."
 
-#: src/config/options.inc:984
+#: src/config/options.inc:996
 msgid "Menu frame"
 msgstr "Bordure du menu"
 
-#: src/config/options.inc:986
+#: src/config/options.inc:998
 msgid "Menu frame colors."
 msgstr "Couleurs de la bordure du menu."
 
-#: src/config/options.inc:989
+#: src/config/options.inc:1001
 msgid "Dialog"
 msgstr "Dialogue"
 
-#: src/config/options.inc:991
+#: src/config/options.inc:1003
 msgid "Dialog colors."
 msgstr "Couleurs des dialogues."
 
-#: src/config/options.inc:1001
+#: src/config/options.inc:1013
 msgid "Generic"
 msgstr "Générique"
 
-#: src/config/options.inc:1003
+#: src/config/options.inc:1015
 msgid "Generic dialog colors."
 msgstr "Couleurs des dialogues génériques."
 
-#: src/config/options.inc:1005
+#: src/config/options.inc:1017
 msgid "Frame"
 msgstr "Bordure"
 
-#: src/config/options.inc:1007
+#: src/config/options.inc:1019
 msgid "Dialog frame colors."
 msgstr "Couleurs de la bordure des dialogues."
 
-#: src/config/options.inc:1009
+#: src/config/options.inc:1021
 msgid "Scrollbar"
 msgstr "Barre de défilement"
 
-#: src/config/options.inc:1011
+#: src/config/options.inc:1023
 msgid "Scrollbar colors."
 msgstr "Couleurs de la barre de défilement."
 
-#: src/config/options.inc:1013
+#: src/config/options.inc:1025
 msgid "Selected scrollbar"
 msgstr "Barre de défilement sélectionnée"
 
-#: src/config/options.inc:1015
+#: src/config/options.inc:1027
 msgid "Scrollbar selected colors."
 msgstr "Couleurs de la barre de défilement sélectionnée."
 
-#: src/config/options.inc:1019
+#: src/config/options.inc:1031
 msgid "Dialog title colors."
 msgstr "Couleurs du titre des dialogues."
 
-#: src/config/options.inc:1021
+#: src/config/options.inc:1033
 msgid "Text"
 msgstr "Texte"
 
-#: src/config/options.inc:1023
+#: src/config/options.inc:1035
 msgid "Dialog text colors."
 msgstr "Couleurs du texte des dialogues."
 
-#: src/config/options.inc:1025 src/viewer/text/form.c:1801
+#: src/config/options.inc:1037 src/viewer/text/form.c:1802
 msgid "Checkbox"
 msgstr "Case à cocher"
 
-#: src/config/options.inc:1027
+#: src/config/options.inc:1039
 msgid "Dialog checkbox colors."
 msgstr "Couleurs des cases à cocher dans les dialogues."
 
-#: src/config/options.inc:1029
+#: src/config/options.inc:1041
 msgid "Selected checkbox"
 msgstr "Case à cocher sélectionnée"
 
-#: src/config/options.inc:1031
+#: src/config/options.inc:1043
 msgid "Dialog selected checkbox colors."
 msgstr "Couleurs de la case à cocher sélectionnée dans les dialogues."
 
-#: src/config/options.inc:1033
+#: src/config/options.inc:1045
 msgid "Checkbox label"
 msgstr "Label de case à cocher"
 
-#: src/config/options.inc:1035
+#: src/config/options.inc:1047
 msgid "Dialog checkbox label colors."
 msgstr "Couleurs des labels des cases à cocher dans les dialogues."
 
-#: src/config/options.inc:1037
+#: src/config/options.inc:1049
 msgid "Button"
 msgstr "Bouton"
 
-#: src/config/options.inc:1039 src/config/options.inc:1047
+#: src/config/options.inc:1051 src/config/options.inc:1059
 msgid "Dialog button colors."
 msgstr "Couleurs des boutons des dialogues."
 
-#: src/config/options.inc:1041
+#: src/config/options.inc:1053
 msgid "Selected button"
 msgstr "Bouton sélectionné"
 
-#: src/config/options.inc:1043 src/config/options.inc:1051
+#: src/config/options.inc:1055 src/config/options.inc:1063
 msgid "Dialog selected button colors."
 msgstr "Couleurs du bouton sélectionné dans les dialogues."
 
-#: src/config/options.inc:1045
+#: src/config/options.inc:1057
 msgid "Button shortcut"
 msgstr "Raccourci du bouton"
 
-#: src/config/options.inc:1049
+#: src/config/options.inc:1061
 msgid "Selected button shortcut"
 msgstr "Raccourci du bouton sélectionné"
 
-#: src/config/options.inc:1053 src/viewer/text/form.c:1805
+#: src/config/options.inc:1065 src/viewer/text/form.c:1806
 msgid "Text field"
 msgstr "Champ texte"
 
-#: src/config/options.inc:1055
+#: src/config/options.inc:1067
 msgid "Dialog text field colors."
 msgstr "Couleurs des champs texte dans les dialogues."
 
-#: src/config/options.inc:1057
+#: src/config/options.inc:1069
 msgid "Text field text"
 msgstr "Texte des champs texte"
 
-#: src/config/options.inc:1059
+#: src/config/options.inc:1071
 msgid "Dialog field text colors."
 msgstr "Couleurs de texte des champs texte dans les dialogues."
 
-#: src/config/options.inc:1061
+#: src/config/options.inc:1073
 msgid "Meter"
 msgstr "Barre de progression"
 
-#: src/config/options.inc:1063
+#: src/config/options.inc:1075
 msgid "Dialog meter colors."
 msgstr "Couleurs des barres de progression."
 
-#: src/config/options.inc:1065
+#: src/config/options.inc:1077
 msgid "Shadow"
 msgstr "Ombrage"
 
-#: src/config/options.inc:1067
+#: src/config/options.inc:1079
 msgid "Dialog shadow colors (see ui.shadows option)."
 msgstr "Couleurs des ombres des dialogues (voir l'option ui.shadows)."
 
-#: src/config/options.inc:1069
+#: src/config/options.inc:1081
 msgid "Title bar"
 msgstr "Barre de titre"
 
-#: src/config/options.inc:1071
+#: src/config/options.inc:1083
 msgid "Title bar colors."
 msgstr "Couleurs de la barre de titre."
 
-#: src/config/options.inc:1073
+#: src/config/options.inc:1085
 msgid "Generic title bar"
 msgstr "Barre de titre générique"
 
-#: src/config/options.inc:1075
+#: src/config/options.inc:1087
 msgid "Generic title bar colors."
 msgstr "Couleurs de la barre de titre générique."
 
-#: src/config/options.inc:1077
+#: src/config/options.inc:1089
 msgid "Title bar text"
 msgstr "Texte de la barre de titre"
 
-#: src/config/options.inc:1079
+#: src/config/options.inc:1091
 msgid "Title bar text colors."
 msgstr "Couleurs du texte de la barre de titre."
 
-#: src/config/options.inc:1082
+#: src/config/options.inc:1094
 msgid "Status bar"
 msgstr "Barre d'état"
 
-#: src/config/options.inc:1084
+#: src/config/options.inc:1096
 msgid "Status bar colors."
 msgstr "Couleurs de la barre d'état."
 
-#: src/config/options.inc:1086
+#: src/config/options.inc:1098
 msgid "Generic status bar"
 msgstr "Barre d'état générique"
 
-#: src/config/options.inc:1088
+#: src/config/options.inc:1100
 msgid "Generic status bar colors."
 msgstr "Couleurs de la barre d'état générique."
 
-#: src/config/options.inc:1090
+#: src/config/options.inc:1102
 msgid "Status bar text"
 msgstr "Texte de la barre d'état"
 
-#: src/config/options.inc:1092
+#: src/config/options.inc:1104
 msgid "Status bar text colors."
 msgstr "Couleurs du texte de la barre d'état."
 
-#: src/config/options.inc:1095
+#: src/config/options.inc:1107
 msgid "Tabs bar"
 msgstr "Barre d'onglets"
 
-#: src/config/options.inc:1097
+#: src/config/options.inc:1109
 msgid "Tabs bar colors."
 msgstr "Couleurs de la barre d'onglets."
 
-#: src/config/options.inc:1099
+#: src/config/options.inc:1111
 msgid "Unvisited tab"
 msgstr "Onglet non visité"
 
-#: src/config/options.inc:1101
+#: src/config/options.inc:1113
 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:1104
+#: src/config/options.inc:1116
 msgid "Unselected tab"
 msgstr "Onglet non sélectionné"
 
-#: src/config/options.inc:1106
+#: src/config/options.inc:1118
 msgid "Unselected tab colors."
 msgstr "Couleurs des onglets non sélectionnés."
 
-#: src/config/options.inc:1108
+#: src/config/options.inc:1120
 msgid "Loading tab"
 msgstr "Onglet en cours de chargement"
 
-#: src/config/options.inc:1110
+#: src/config/options.inc:1122
 msgid "Tab colors for tabs that are loading in the background."
 msgstr "Couleurs pour les onglets en cours de chargement."
 
-#: src/config/options.inc:1112
+#: src/config/options.inc:1124
 msgid "Selected tab"
 msgstr "Onglet sélectionné"
 
-#: src/config/options.inc:1114
+#: src/config/options.inc:1126
 msgid "Selected tab colors."
 msgstr "Couleurs de l'onglet sélectionné."
 
-#: src/config/options.inc:1116
+#: src/config/options.inc:1128
 msgid "Tab separator"
 msgstr "Séparateur d'onglets"
 
-#: src/config/options.inc:1118
+#: src/config/options.inc:1130
 msgid "Tab separator colors."
 msgstr "Couleurs du séparateur d'onglets."
 
-#: src/config/options.inc:1121
+#: src/config/options.inc:1133
 msgid "Searched strings"
 msgstr "Chaînes recherchées"
 
-#: src/config/options.inc:1123
+#: src/config/options.inc:1135
 msgid "Searched string highlight colors."
 msgstr "Couleurs de mise en évidence des chaînes recherchées."
 
@@ -4105,19 +4118,19 @@ msgstr "Couleurs de mise en 
 #. ============= BORING PART (colors) END ===================
 #. ==========================================================
 #. Keep options in alphabetical order.
-#: src/config/options.inc:1132
+#: src/config/options.inc:1144
 msgid "Dialog settings"
 msgstr "Configuration des dialogues"
 
-#: src/config/options.inc:1134
+#: src/config/options.inc:1146
 msgid "Dialogs-specific appearance and behaviour settings."
 msgstr "Configuration de l'apparence et du fonctionnement des dialogues."
 
-#: src/config/options.inc:1137
+#: src/config/options.inc:1149
 msgid "Minimal height of listbox widget"
 msgstr "Hauteur minimale des boîtes liste"
 
-#: src/config/options.inc:1139
+#: src/config/options.inc:1151
 msgid ""
 "Minimal height of the listbox widget (used e.g. for bookmarks\n"
 "or global history)."
@@ -4125,11 +4138,11 @@ msgstr ""
 "Hauteur minimale des boîtes liste (utilisée par exemple pour les\n"
 "signets ou l'historique global)."
 
-#: src/config/options.inc:1142
+#: src/config/options.inc:1154
 msgid "Drop shadows"
 msgstr "Porter des ombres"
 
-#: src/config/options.inc:1144
+#: src/config/options.inc:1156
 msgid ""
 "Make dialogs drop shadows (the shadows are solid, you can\n"
 "adjust their color by ui.colors.*.dialog.shadow). You may\n"
@@ -4139,11 +4152,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:1148
+#: src/config/options.inc:1160
 msgid "Underline menu hotkeys"
 msgstr "Souligner les raccourcis des menus"
 
-#: src/config/options.inc:1150
+#: src/config/options.inc:1162
 msgid ""
 "Whether to underline hotkeys in menus to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4151,11 +4164,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:1153
+#: src/config/options.inc:1165
 msgid "Underline button shortcuts"
 msgstr "Souligner les raccourcis des boutons"
 
-#: src/config/options.inc:1155
+#: src/config/options.inc:1167
 msgid ""
 "Whether to underline button shortcuts to make them more\n"
 "visible. Requires the underlining is enabled for the terminal."
@@ -4163,11 +4176,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:1159
+#: src/config/options.inc:1171
 msgid "Timer options"
 msgstr "Options des timers"
 
-#: src/config/options.inc:1161
+#: src/config/options.inc:1173
 msgid ""
 "Timed action after certain interval of user inactivity. Someone can\n"
 "even find this useful, although you may not believe that."
@@ -4175,7 +4188,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:1167
+#: src/config/options.inc:1179
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4187,7 +4200,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:1174
+#: src/config/options.inc:1186
 msgid ""
 "Whether to enable the timer or not:\n"
 "0 is don't count down anything\n"
@@ -4199,11 +4212,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:1180
+#: src/config/options.inc:1192
 msgid "Duration"
 msgstr "Durée"
 
-#: src/config/options.inc:1182
+#: src/config/options.inc:1194
 msgid ""
 "Inactivity timeout in seconds. The maximum of one day\n"
 "should be enough for just everyone (TM)."
@@ -4211,23 +4224,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:1187
+#: src/config/options.inc:1199
 msgid "Keybinding action to be triggered when timer reaches zero."
 msgstr "Action à déclencher lorsque le timer atteint zéro."
 
-#: src/config/options.inc:1190
+#: src/config/options.inc:1202
 msgid "Window tabs"
 msgstr "Onglets"
 
-#: src/config/options.inc:1192
+#: src/config/options.inc:1204
 msgid "Window tabs settings."
 msgstr "Configuration des onglets."
 
-#: src/config/options.inc:1194
+#: src/config/options.inc:1206
 msgid "Display tabs bar"
 msgstr "Afficher la barre d'onglets"
 
-#: src/config/options.inc:1196
+#: src/config/options.inc:1208
 msgid ""
 "Show tabs bar on the screen:\n"
 "0 means never\n"
@@ -4239,20 +4252,20 @@ msgstr ""
 "1 seulement si deux onglets ou plus sont ouverts\n"
 "2 toujours"
 
-#: src/config/options.inc:1201
+#: src/config/options.inc:1213
 msgid "Tab bar at top"
 msgstr "Barre d'onglets en haut"
 
-#: src/config/options.inc:1203
+#: src/config/options.inc:1215
 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:1205
+#: src/config/options.inc:1217
 msgid "Wrap-around tabs cycling"
 msgstr "Navigation cyclique dans les onglets"
 
-#: src/config/options.inc:1207
+#: src/config/options.inc:1219
 msgid ""
 "When moving right from the last tab, jump at the first one, and\n"
 "vice versa."
@@ -4260,20 +4273,20 @@ msgstr ""
 "En cas de déplacement à droite sur le dernier onglet, saute au premier\n"
 "et vice-versa."
 
-#: src/config/options.inc:1210
+#: src/config/options.inc:1222
 msgid "Confirm tab closing"
 msgstr "Confirmer la fermeture d'onglet"
 
-#: src/config/options.inc:1212
+#: src/config/options.inc:1224
 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:1216 src/config/opttypes.c:409
+#: src/config/options.inc:1228 src/config/opttypes.c:409
 msgid "Language"
 msgstr "Langue"
 
-#: src/config/options.inc:1218
+#: src/config/options.inc:1230
 msgid ""
 "Language of user interface. 'System' means that the language will\n"
 "be extracted from the environment dynamically."
@@ -4281,35 +4294,35 @@ msgstr ""
 "Langue de l'interface utilisateur. 'System' signifie que la langue\n"
 "sera dynamiquement extraite de l'environnement."
 
-#: src/config/options.inc:1221
+#: src/config/options.inc:1233
 msgid "Display menu bar always"
 msgstr "Toujours afficher la barre de menu"
 
-#: src/config/options.inc:1223
+#: src/config/options.inc:1235
 msgid "Always show menu bar on the screen."
 msgstr "Toujours montrer la barre de menu à l'écran."
 
-#: src/config/options.inc:1225
+#: src/config/options.inc:1237
 msgid "Display status bar"
 msgstr "Afficher la barre d'état"
 
-#: src/config/options.inc:1227
+#: src/config/options.inc:1239
 msgid "Show status bar on the screen."
 msgstr "Montrer la barre d'état."
 
-#: src/config/options.inc:1229
+#: src/config/options.inc:1241
 msgid "Display title bar"
 msgstr "Afficher la barre de titre"
 
-#: src/config/options.inc:1231
+#: src/config/options.inc:1243
 msgid "Show title bar on the screen."
 msgstr "Montrer la barre de titre."
 
-#: src/config/options.inc:1233
+#: src/config/options.inc:1245
 msgid "Display goto dialog in new tabs"
 msgstr "Afficher le dialogue \"Atteindre l'URL\" dans les nouveaux onglets"
 
-#: src/config/options.inc:1235
+#: src/config/options.inc:1247
 msgid ""
 "Pop up goto dialog in newly created tabs when there's no homepage\n"
 "set. This means also showing goto dialog on startup."
@@ -4318,11 +4331,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:1238
+#: src/config/options.inc:1250
 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:1240
+#: src/config/options.inc:1252
 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"
@@ -4332,27 +4345,27 @@ msgstr ""
 "option active un dialogue qui confirme que l'opération s'est déroulée\n"
 "correctement."
 
-#: src/config/options.inc:1245
+#: src/config/options.inc:1257
 msgid "Sessions"
 msgstr "Sessions"
 
-#: src/config/options.inc:1247
+#: src/config/options.inc:1259
 msgid "Sessions settings."
 msgstr "Configuration des sessions."
 
-#: src/config/options.inc:1249
+#: src/config/options.inc:1261
 msgid "Keep session active"
 msgstr "Garder la session active"
 
-#: src/config/options.inc:1251
+#: src/config/options.inc:1263
 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:1253
+#: src/config/options.inc:1265
 msgid "Auto save session"
 msgstr "Sauver automatiquement la session"
 
-#: src/config/options.inc:1255
+#: src/config/options.inc:1267
 msgid ""
 "Automatically save the session when quitting.\n"
 "This feature requires bookmark support."
@@ -4360,11 +4373,11 @@ msgstr ""
 "Sauvegarder automatiquement la session au moment de quitter.\n"
 "Cette fonctionnalité nécessite le support des signets."
 
-#: src/config/options.inc:1258
+#: src/config/options.inc:1270
 msgid "Auto restore session"
 msgstr "Restaurer automatiquement la session"
 
-#: src/config/options.inc:1260
+#: src/config/options.inc:1272
 msgid ""
 "Automatically restore the session at start.\n"
 "This feature requires bookmark support."
@@ -4372,11 +4385,11 @@ msgstr ""
 "Restaurer automatiquement la session au démarrage.\n"
 "Cette fonctionnalité nécessite le support des signets."
 
-#: src/config/options.inc:1263
+#: src/config/options.inc:1275
 msgid "Auto save and restore session folder name"
 msgstr "Nom du dossier pour la session automatique"
 
-#: src/config/options.inc:1265
+#: src/config/options.inc:1277
 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"
@@ -4386,11 +4399,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:1269
+#: src/config/options.inc:1281
 msgid "Homepage URI"
 msgstr "URI de la page d'accueil"
 
-#: src/config/options.inc:1271
+#: src/config/options.inc:1283
 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"
@@ -4402,19 +4415,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:1277
+#: src/config/options.inc:1289
 msgid "Date format"
 msgstr "Format des dates"
 
-#: src/config/options.inc:1279
+#: src/config/options.inc:1291
 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:1282
+#: src/config/options.inc:1294
 msgid "Set window title"
 msgstr "Modifier le titre de la fenêtre"
 
-#: src/config/options.inc:1284
+#: src/config/options.inc:1296
 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"
@@ -8478,191 +8491,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:1786
+#: src/viewer/text/form.c:1787
 msgid "Reset form"
 msgstr "Réinitialiser le formulaire"
 
-#: src/viewer/text/form.c:1788
+#: src/viewer/text/form.c:1789
 msgid "Harmless button"
 msgstr "Bouton sans impact"
 
-#: src/viewer/text/form.c:1796
+#: src/viewer/text/form.c:1797
 msgid "Submit form to"
 msgstr "Envoi du formulaire à"
 
-#: src/viewer/text/form.c:1797
+#: src/viewer/text/form.c:1798
 msgid "Post form to"
 msgstr "Transfert du formulaire à"
 
-#: src/viewer/text/form.c:1799
+#: src/viewer/text/form.c:1800
 msgid "Radio button"
 msgstr "Bouton radio"
 
-#: src/viewer/text/form.c:1803
+#: src/viewer/text/form.c:1804
 msgid "Select field"
 msgstr "Liste"
 
-#: src/viewer/text/form.c:1807
+#: src/viewer/text/form.c:1808
 msgid "Text area"
 msgstr "Champ texte multiligne"
 
-#: src/viewer/text/form.c:1809
+#: src/viewer/text/form.c:1810
 msgid "File upload"
 msgstr "Envoi de fichier"
 
-#: src/viewer/text/form.c:1811
+#: src/viewer/text/form.c:1812
 msgid "Password field"
 msgstr "Champ mot de passe"
 
-#: src/viewer/text/form.c:1849
+#: src/viewer/text/form.c:1850
 msgid "name"
 msgstr "Nom"
 
-#: src/viewer/text/form.c:1861
+#: src/viewer/text/form.c:1862
 msgid "value"
 msgstr "Valeur"
 
-#: src/viewer/text/form.c:1874
+#: src/viewer/text/form.c:1875
 msgid "read only"
 msgstr "lecture seule"
 
-#: src/viewer/text/form.c:1885
+#: src/viewer/text/form.c:1886
 #, c-format
 msgid "press %s to navigate"
 msgstr "pressez %s pour naviguer"
 
-#: src/viewer/text/form.c:1887
+#: src/viewer/text/form.c:1888
 #, c-format
 msgid "press %s to edit"
 msgstr "pressez %s pour éditer"
 
-#: src/viewer/text/form.c:1923
+#: src/viewer/text/form.c:1924
 #, c-format
 msgid "press %s to submit to %s"
 msgstr "pressez %s pour soumettre à %s"
 
-#: src/viewer/text/form.c:1925
+#: src/viewer/text/form.c:1926
 #, c-format
 msgid "press %s to post to %s"
 msgstr "pressez %s pour poster à %s"
 
-#: src/viewer/text/form.c:2027
+#: src/viewer/text/form.c:2028
 msgid "Useless button"
 msgstr "Bouton inutile"
 
-#: src/viewer/text/form.c:2029
+#: src/viewer/text/form.c:2030
 msgid "Submit button"
 msgstr "Bouton Soumettre"
 
 #. accelerator_context(link_menu.map)
-#: src/viewer/text/link.c:1280
+#: src/viewer/text/link.c:1279
 msgid "Display ~usemap"
 msgstr "Afficher ~usemap"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1285
+#: src/viewer/text/link.c:1284
 msgid "~Follow link"
 msgstr "~Suivre le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1287
+#: src/viewer/text/link.c:1286
 msgid "Follow link and r~eload"
 msgstr "Suivre le lien et ~recharger"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1291
+#: src/viewer/text/link.c:1290
 msgid "Open in new ~window"
 msgstr "Ouvrir dans une nouvelle ~fenêtre"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1293
+#: src/viewer/text/link.c:1292
 msgid "Open in new ~tab"
 msgstr "Ouvrir dans un nouvel ongle~t"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1295
+#: src/viewer/text/link.c:1294
 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:1300
+#: src/viewer/text/link.c:1299
 msgid "~Download link"
 msgstr "~Enregistrer le lien"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1303
+#: src/viewer/text/link.c:1302
 msgid "~Add link to bookmarks"
 msgstr "~Ajouter ce lien aux signets"
 
 #. accelerator_context(link_menu.std)
-#: src/viewer/text/link.c:1307
+#: src/viewer/text/link.c:1306
 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:1318 src/viewer/text/link.c:1358
+#: src/viewer/text/link.c:1317 src/viewer/text/link.c:1357
 msgid "~Reset form"
 msgstr "Remettre à ~zéro le formulaire"
 
 #. accelerator_context(link_menu.textarea)
-#: src/viewer/text/link.c:1333
+#: src/viewer/text/link.c:1332
 msgid "Open in ~external editor"
 msgstr "Ouvrir dans un ~éditeur externe"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1341
+#: src/viewer/text/link.c:1340
 msgid "~Submit form"
 msgstr "~Envoyer le formulaire"
 
 #. accelerator_context(link_menu.form, link_menu.textarea)
-#: src/viewer/text/link.c:1342
+#: src/viewer/text/link.c:1341
 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:1346
+#: src/viewer/text/link.c:1345
 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:1348
+#: src/viewer/text/link.c:1347
 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:1351
+#: src/viewer/text/link.c:1350
 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:1356
+#: src/viewer/text/link.c:1355
 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:1363
+#: src/viewer/text/link.c:1362
 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:1370
+#: src/viewer/text/link.c:1369
 msgid "V~iew image"
 msgstr "~Voir l'image"
 
 #. accelerator_context(link_menu.form, link_menu.map, link_menu.std)
-#: src/viewer/text/link.c:1372
+#: src/viewer/text/link.c:1371
 msgid "Download ima~ge"
 msgstr "Enregistrer l'~image"
 
-#: src/viewer/text/link.c:1381
+#: src/viewer/text/link.c:1380
 msgid "No link selected"
 msgstr "Aucun lien sélectionné"
 
-#: src/viewer/text/link.c:1451
+#: src/viewer/text/link.c:1450
 msgid "Image"
 msgstr "Image"
 
-#: src/viewer/text/link.c:1456
+#: src/viewer/text/link.c:1455
 msgid "Usemap"
 msgstr "Usemap"
 

From ec1bedc25eb239a0352e097ddc2b9168eb0af0c2 Mon Sep 17 00:00:00 2001
From: "M. Levinson" <levinsm@users.sourceforge.net>
Date: Sat, 6 Jan 2007 07:30:32 -0500
Subject: [PATCH 3/7] Python: Document more goto_url_hook and follow_url_hook
 return values.

Document what happens if goto_url_hook or follow_url_hook returns None or "".
doc/events.txt already explains the corresponding C values.

[ commit message by me --KON ]
---
 contrib/python/hooks.py | 6 ++++--
 doc/python.txt          | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/contrib/python/hooks.py b/contrib/python/hooks.py
index a4726e49..28cbf32b 100644
--- a/contrib/python/hooks.py
+++ b/contrib/python/hooks.py
@@ -49,7 +49,8 @@ dumbprefixes = {
 def goto_url_hook(url):
     """Rewrite a URL that was entered in a "Go to URL" dialog box.
 
-    This function should return a URL for ELinks to follow, or None if
+    This function should return a string containing a URL for ELinks to
+    follow, or an empty string if no URL should be followed, or None if
     ELinks should follow the original URL.
 
     Arguments:
@@ -63,7 +64,8 @@ def goto_url_hook(url):
 def follow_url_hook(url):
     """Rewrite a URL for a link that's about to be followed.
 
-    This function should return a URL for ELinks to follow, or None if
+    This function should return a string containing a URL for ELinks to
+    follow, or an empty string if no URL should be followed, or None if
     ELinks should follow the original URL.
 
     Arguments:
diff --git a/doc/python.txt b/doc/python.txt
index a5225150..62707ed7 100644
--- a/doc/python.txt
+++ b/doc/python.txt
@@ -37,7 +37,8 @@ FUNCTIONS
     follow_url_hook(url)
         Rewrite a URL for a link that's about to be followed.
         
-        This function should return a URL for ELinks to follow, or None if
+        This function should return a string containing a URL for ELinks to
+        follow, or an empty string if no URL should be followed, or None if
         ELinks should follow the original URL.
         
         Arguments:
@@ -47,7 +48,8 @@ FUNCTIONS
     goto_url_hook(url)
         Rewrite a URL that was entered in a "Go to URL" dialog box.
         
-        This function should return a URL for ELinks to follow, or None if
+        This function should return a string containing a URL for ELinks to
+        follow, or an empty string if no URL should be followed, or None if
         ELinks should follow the original URL.
         
         Arguments:

From f0dfd0504f1833ad6711fa357b244d8018a55eaa Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 12 Jan 2007 23:47:45 +0200
Subject: [PATCH 4/7] Route time_t-to-string conversions via time_print_T and
 TIME_PRINT_FORMAT.

The previous code just printed time_t directly with "%ld".  Now it
instead first casts to time_print_T (currently long) and then formats
with TIME_PRINT_FORMAT (currently "ld").  So the varargs will now
always match with the format string, even if time_t is longer than
long.  This still doesn't correctly format time_t values larger than
LONG_MAX, though.  But now it is at least easier to find some of the
places that need to be changed to support that.

I located these time_t-to-string conversions by searching for
str_to_time_t, expires, and last_visit.  There are still more places
that assume every interesting time_t value fits either in 32 bits or
in a long, e.g. in the cookie editor and in the ECMAScript interface.

Inspired by bug 6.
---
 src/cookies/cookies.c   | 12 ++++++------
 src/globhist/globhist.c |  5 +++--
 src/util/time.h         |  5 +++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/cookies/cookies.c b/src/cookies/cookies.c
index 1a31c0c8..455beb44 100644
--- a/src/cookies/cookies.c
+++ b/src/cookies/cookies.c
@@ -456,9 +456,9 @@ set_cookie(struct uri *uri, unsigned char *str)
 #ifdef DEBUG_COOKIES
 	{
 		DBG("Got cookie %s = %s from %s, domain %s, "
-		      "expires at %d, secure %d", cookie->name,
+		      "expires at %"TIME_PRINT_FORMAT", secure %d", cookie->name,
 		      cookie->value, cookie->server->host, cookie->domain,
-		      cookie->expires, cookie->secure);
+		      (time_print_T) cookie->expires, cookie->secure);
 	}
 #endif
 
@@ -672,8 +672,8 @@ send_cookies(struct uri *uri)
 
 		if (c->expires && c->expires <= now) {
 #ifdef DEBUG_COOKIES
-			DBG("Cookie %s=%s (exp %d) expired.",
-			    c->name, c->value, c->expires);
+			DBG("Cookie %s=%s (exp %"TIME_PRINT_FORMAT") expired.",
+			    c->name, c->value, (time_print_T) c->expires);
 #endif
 			delete_cookie(c);
 
@@ -878,12 +878,12 @@ save_cookies(struct terminal *term) {
 	now = time(NULL);
 	foreach (c, cookies) {
 		if (!c->expires || c->expires <= now) continue;
-		if (secure_fprintf(ssi, "%s\t%s\t%s\t%s\t%s\t%ld\t%d\n",
+		if (secure_fprintf(ssi, "%s\t%s\t%s\t%s\t%s\t%"TIME_PRINT_FORMAT"\t%d\n",
 				   c->name, c->value,
 				   c->server->host,
 				   empty_string_or_(c->path),
 				   empty_string_or_(c->domain),
-				   c->expires, c->secure) < 0)
+				   (time_print_T) c->expires, c->secure) < 0)
 			break;
 	}
 
diff --git a/src/globhist/globhist.c b/src/globhist/globhist.c
index d7a16200..f73e3d2c 100644
--- a/src/globhist/globhist.c
+++ b/src/globhist/globhist.c
@@ -393,10 +393,11 @@ write_global_history(void)
 	if (!ssi) return;
 
 	foreachback (history_item, global_history.entries) {
-		if (secure_fprintf(ssi, "%s\t%s\t%ld\n",
+		if (secure_fprintf(ssi, "%s\t%s\t%"TIME_PRINT_FORMAT"\n",
 				   history_item->title,
 				   history_item->url,
-				   history_item->last_visit) < 0) break;
+				   (time_print_T) history_item->last_visit) < 0)
+			break;
 	}
 
 	if (!secure_close(ssi)) global_history.dirty = 0;
diff --git a/src/util/time.h b/src/util/time.h
index 6fa73b0b..5ff63650 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -19,6 +19,11 @@ typedef long milliseconds_T;
 /* Is using atol() in this way acceptable? It seems
  * non-portable to me; time_t might not be a long. -- Miciah */
 #define str_to_time_t(s) ((time_t) atol(s))
+/* When formatting time_t values to be parsed with str_to_time_t,
+ * we first cast to time_print_T and then printf the result with
+ * TIME_PRINT_FORMAT.  */
+typedef long time_print_T;
+#define TIME_PRINT_FORMAT "ld"
 
 /* Redefine a timeval that has all fields signed so calculations
  * will be simplified on rare systems that define timeval with

From 9385c93ffd55d024502b8057ed1bf1264084e92c Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 13 Jan 2007 10:01:51 +0200
Subject: [PATCH 5/7] Move README.timegm to the same directory as date.c.

---
 src/protocol/{http => }/README.timegm | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/protocol/{http => }/README.timegm (100%)

diff --git a/src/protocol/http/README.timegm b/src/protocol/README.timegm
similarity index 100%
rename from src/protocol/http/README.timegm
rename to src/protocol/README.timegm

From 01fdf6c4d379e185043385d091aa20d2aace0bd8 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 13 Jan 2007 15:26:21 +0200
Subject: [PATCH 6/7] Bug 923: Added comments about potential time_t
 truncation.

And removed Miciah's portability question; MSVC++2005 already
has a time_t longer than long, so assuming that time_t is long
is surely not portable.
---
 src/cookies/dialogs.c               |  2 ++
 src/protocol/bittorrent/bencoding.c |  1 +
 src/protocol/ftp/parse.c            |  1 +
 src/scripting/smjs/globhist.c       |  1 +
 src/util/time.c                     |  4 ++++
 src/util/time.h                     | 10 ++++++----
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/cookies/dialogs.c b/src/cookies/dialogs.c
index 3af9c3dc..d80407b0 100644
--- a/src/cookies/dialogs.c
+++ b/src/cookies/dialogs.c
@@ -280,6 +280,7 @@ set_cookie_expires(struct dialog_data *dlg_data, struct widget_data *widget_data
 
 	if (!value || !cookie) return EVENT_NOT_PROCESSED;
 
+	/* Bug 923: Assumes time_t values fit in long.  */
 	errno = 0;
 	number = strtol(value, (char **) &end, 10);
 	if (errno || *end || number < 0) return EVENT_NOT_PROCESSED;
@@ -335,6 +336,7 @@ build_edit_dialog(struct terminal *term, struct cookie *cookie)
 	safe_strncpy(name, cookie->name, MAX_STR_LEN);
 	safe_strncpy(value, cookie->value, MAX_STR_LEN);
 	safe_strncpy(domain, cookie->domain, MAX_STR_LEN);
+	/* Bug 923: Assumes time_t values fit in unsigned long.  */
 	ulongcat(expires, &length, cookie->expires, MAX_STR_LEN, 0);
 	length = 0;
 	ulongcat(secure, &length, cookie->secure, MAX_STR_LEN, 0);
diff --git a/src/protocol/bittorrent/bencoding.c b/src/protocol/bittorrent/bencoding.c
index 6a7d0aae..237f3af7 100644
--- a/src/protocol/bittorrent/bencoding.c
+++ b/src/protocol/bittorrent/bencoding.c
@@ -760,6 +760,7 @@ parse_bittorrent_metafile(struct bittorrent_meta *meta, struct string *metafile)
 			break;
 
 		case BENCODING_TOKEN_CREATION_DATE:
+			/* Bug 923: Assumes time_t values fit in off_t.  */
 			meta->creation_date = (time_t) parse_bencoding_integer(value);
 			skip_scanner_token(&scanner);
 			break;
diff --git a/src/protocol/ftp/parse.c b/src/protocol/ftp/parse.c
index be4326e7..59b24e42 100644
--- a/src/protocol/ftp/parse.c
+++ b/src/protocol/ftp/parse.c
@@ -109,6 +109,7 @@ parse_ftp_eplf_response(struct ftp_file_info *info, unsigned char *src, int len)
 
 		case FTP_EPLF_MTIME:
 			if (src >= pos) break;
+			/* Bug 923: Assumes time_t values cannot exceed LONG_MAX.  */
 			info->mtime = (time_t) parse_ftp_number(&src, pos, 0, LONG_MAX);
 			break;
 		case FTP_EPLF_ID:
diff --git a/src/scripting/smjs/globhist.c b/src/scripting/smjs/globhist.c
index 6ea907d8..bcc4cad7 100644
--- a/src/scripting/smjs/globhist.c
+++ b/src/scripting/smjs/globhist.c
@@ -150,6 +150,7 @@ smjs_globhist_item_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *
 	case GLOBHIST_LAST_VISIT: {
 		uint32 seconds;
 
+		/* Bug 923: Assumes time_t values fit in uint32.  */
 		JS_ValueToECMAUint32(smjs_ctx, *vp, &seconds);
 		history_item->last_visit = seconds;
 
diff --git a/src/util/time.c b/src/util/time.c
index 8e0637ea..19bd2caf 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -134,6 +134,8 @@ timeval_from_milliseconds(timeval_T *t, milliseconds_T milliseconds)
 	return t;
 }
 
+/* Bug 923: Assumes time_t values fit in long.  (This function is used
+ * for both timestamps and durations.)  */
 timeval_T *
 timeval_from_seconds(timeval_T *t, long seconds)
 {
@@ -184,6 +186,8 @@ timeval_to_milliseconds(timeval_T *t)
 	return add_ms_to_ms(a, b);
 }
 
+/* Bug 923: Assumes time_t values fit in long.  (This function is used
+ * for both timestamps and durations.)  */
 long
 timeval_to_seconds(timeval_T *t)
 {
diff --git a/src/util/time.h b/src/util/time.h
index 5ff63650..7d81a775 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -16,18 +16,20 @@ typedef long milliseconds_T;
 #define ms_max(a, b) ((a) < (b) ? (b) : (a))
 #define ms_min(a, b) ((a) < (b) ? (a) : (b))
 
-/* Is using atol() in this way acceptable? It seems
- * non-portable to me; time_t might not be a long. -- Miciah */
+/* Bug 923: Assumes time_t values fit in long.  */
 #define str_to_time_t(s) ((time_t) atol(s))
 /* When formatting time_t values to be parsed with str_to_time_t,
  * we first cast to time_print_T and then printf the result with
- * TIME_PRINT_FORMAT.  */
+ * TIME_PRINT_FORMAT.
+ * Bug 923: Assumes time_t values fit in long.  */
 typedef long time_print_T;
 #define TIME_PRINT_FORMAT "ld"
 
 /* Redefine a timeval that has all fields signed so calculations
  * will be simplified on rare systems that define timeval with
- * unsigned fields. */
+ * unsigned fields.
+ * Bug 923: Assumes time_t values fit in long.  (This structure is
+ * used for both timestamps and durations.)  */
 typedef struct { long sec; long usec; } timeval_T;
 
 timeval_T *timeval_from_milliseconds(timeval_T *t, milliseconds_T milliseconds);

From 18771fdedb855a1ec27de3ea4e14421610a32621 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Sat, 13 Jan 2007 15:38:02 +0200
Subject: [PATCH 7/7] Bug 924, my_timegm: Added a comment about 2100 not being
 a leap year.

---
 src/protocol/date.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/protocol/date.c b/src/protocol/date.c
index 37b0db0e..bdd72477 100644
--- a/src/protocol/date.c
+++ b/src/protocol/date.c
@@ -218,6 +218,8 @@ my_timegm(struct tm *tm)
 	tm->tm_mon *= 153; tm->tm_mon += 2;
 	tm->tm_year -= 68;
 
+	/* Bug 924: Assumes all years divisible by 4 are leap years,
+	 * even though e.g. 2100 is not.  */
 	tm->tm_mday += tm->tm_year * 1461 / 4;
 	tm->tm_mday += ((tm->tm_mon / 5) - 672);