From 96162a9f741e47f4b19d5b89c3a0e7056e100e26 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Fri, 21 Mar 2008 15:15:45 +0100 Subject: [PATCH 01/16] =?UTF-8?q?pl.po:=20Rozszerzenia=20->=20Rozszerzenia?= =?UTF-8?q?=20plik=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- po/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pl.po b/po/pl.po index a35e1ff4..495dd31a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5515,7 +5515,7 @@ msgstr "Opcje ~terminala" #. accelerator_context(src/dialogs/menu.c:setup_menu) #: src/dialogs/menu.c:473 msgid "File ~extensions" -msgstr "~Rozszerzenia" +msgstr "~Rozszerzenia plików" #. accelerator_context(src/dialogs/menu.c:setup_menu) #: src/dialogs/menu.c:475 From 0d7ff95d72c16b7d0d23c778d7e5426e736dcc9d Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sat, 22 Mar 2008 09:44:12 +0200 Subject: [PATCH 02/16] build: Quote redirections when echoing commands. Without this, "make --directory=doc V=1 keymap-defaults.txt" would not display the command it runs, because the command is LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt and the build system would run echo LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt && LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt so, the initial echo was redirected to keymap-defaults.txt too, and then overwritten with the intended output. Now, the build system instead runs echo 'LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt' && LC_ALL=C LANGUAGE=en /home/Kalle/src/elinks-0.12/doc/tools/keys2doc /home/Kalle/src/elinks-0.12/src/config/kbdbind.c keymap-defaults.txt > keymap-defaults.txt which echoes the redirection instead of executing it. This change also makes the output correctly preserve quotes in some other rules. --- Makefile.lib | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 96c85185..03bb7d8c 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -23,22 +23,33 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ # If we are verbose, we will show the "real" cmds instead of # their quiet versions (which are used in the non-verbose mode). # Inspired by the Linux kernel build system. +# +# If real cmds are to be shown, then quoteverbose quotes each as +# a shell word, so that it can be accurately displayed with echo. +# If the quiet versions are to be shown, then they should already +# be sufficiently quoted, so quoteverbose does nothing. ifdef V quiet = mquiet = masq_ + quoteverbose = '$(subst ','\'',$(1))' + #'# This line fixes syntax highlighting in Emacs' makefile-mode. Q = else quiet = quiet_ mquiet = quiet_ + quoteverbose = $(1) Q = @ endif # Show the command (quiet or non-quiet version based on the assignment # just above) and then execute it. -ncmd = $(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1)) -cmd = @$(if $($(quiet)cmd_$(1)),echo $($(quiet)cmd_$(1)) &&) $(cmd_$(1)) -mcmd = @$(if $($(mquiet)cmd_$(1)),echo $($(mquiet)cmd_$(1)) &&) $(cmd_$(1)) -ecmd = @$(if $($(mquiet)cmd_$(1)),printf "%-38s " $($(mquiet)cmd_$(1)) &&) $(cmd_$(1)) +# +# Because $(cmd_$(1)) and related variables may contain references to $(2), +# they must be expanded right here; that cannot be delegated to quoteverbose. +ncmd = $(if $($(quiet)cmd_$(1)),echo $(call quoteverbose,$($(quiet)cmd_$(1))) &&) $(cmd_$(1)) +cmd = @$(if $($(quiet)cmd_$(1)),echo $(call quoteverbose,$($(quiet)cmd_$(1))) &&) $(cmd_$(1)) +mcmd = @$(if $($(mquiet)cmd_$(1)),echo $(call quoteverbose,$($(mquiet)cmd_$(1))) &&) $(cmd_$(1)) +ecmd = @$(if $($(mquiet)cmd_$(1)),printf "%-38s " $(call quoteverbose,$($(mquiet)cmd_$(1))) &&) $(cmd_$(1)) quiet_cmd_compile = ' [$(CC_COLOR)CC$(END_COLOR)] $(RELPATH)$@' masq_cmd_compile = $(COMPILE) -o $(@) -c $< $(2) From e2d7ce588f8499e3caf69a30d1c6d1b31ba71284 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sun, 23 Mar 2008 13:28:06 +0200 Subject: [PATCH 03/16] Relicense my Perl scripts to ISC license The primary motivation for this change is that the disclaimer now refers to the author whereas it used to refer to the copyright holder. The ISC license is the preferred license for new code in OpenBSD. http://www.openbsd.org/policy.html http://www.openbsd.org/cgi-bin/cvsweb/src/share/misc/license.template?rev=1.2 I am also removing the reference to "the same terms as Perl itself" because those terms are not being distributed with ELinks. Anyway, Perl 5 is dual licensed under the Artistic License and the GNU General Public License (version 1 or later), and the ISC license seems GPL compatible to me. --- Unicode/gen-case | 33 ++++++++++----------------------- po/perl/msgaccel-check | 33 ++++++++++----------------------- po/perl/msgaccel-prepare | 33 ++++++++++----------------------- 3 files changed, 30 insertions(+), 69 deletions(-) diff --git a/Unicode/gen-case b/Unicode/gen-case index e67037b6..9ca69ddc 100755 --- a/Unicode/gen-case +++ b/Unicode/gen-case @@ -111,27 +111,14 @@ Kalle Olavi Niemitalo Copyright (c) 2006 Kalle Olavi Niemitalo. -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. In addition: +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. -=over - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -=back +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/po/perl/msgaccel-check b/po/perl/msgaccel-check index 29e01c30..20925afe 100755 --- a/po/perl/msgaccel-check +++ b/po/perl/msgaccel-check @@ -305,30 +305,17 @@ Kalle Olavi Niemitalo Copyright (c) 2005-2006 Kalle Olavi Niemitalo. -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. In addition: +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. -=over - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -=back +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. =head1 SEE ALSO diff --git a/po/perl/msgaccel-prepare b/po/perl/msgaccel-prepare index a606429f..f01652ce 100755 --- a/po/perl/msgaccel-prepare +++ b/po/perl/msgaccel-prepare @@ -318,30 +318,17 @@ Kalle Olavi Niemitalo Copyright (c) 2005-2006 Kalle Olavi Niemitalo. -This program is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. In addition: +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. -=over - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -=back +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. =head1 SEE ALSO From 4b408dd86087d322b51ba864acef1c6849068173 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sun, 16 Mar 2008 01:06:42 +0200 Subject: [PATCH 04/16] Display subtrees last in --config-help. elinks --config-help used to sort options like this: document.history document.history.global document.history.global.enable document.history.global.max_items document.history.global.display_type document.history.keep_unhistory Now it'll instead be: document.history document.history.keep_unhistory document.history.global document.history.global.enable document.history.global.max_items document.history.global.display_type i.e. all the options listed under a subheading are children of the tree named by it. This makes elinks.conf(5) look saner. --- doc/man/man5/elinks.conf.5 | 494 ++++++++++++++++++------------------- src/config/cmdline.c | 21 +- 2 files changed, 264 insertions(+), 251 deletions(-) diff --git a/doc/man/man5/elinks.conf.5 b/doc/man/man5/elinks.conf.5 index 3ddcb790..5b7185e9 100644 --- a/doc/man/man5/elinks.conf.5 +++ b/doc/man/man5/elinks.conf.5 @@ -1,11 +1,11 @@ .\" Title: elinks.conf .\" Author: .\" Generator: DocBook XSL Stylesheets v1.72.0 -.\" Date: 03/08/2008 +.\" Date: 03/23/2008 .\" Manual: ELinks configuration file .\" Source: ELinks 0.12.GIT .\" -.TH "ELINKS.CONF" "5" "03/08/2008" "ELinks 0.12.GIT" "ELinks configuration file" +.TH "ELINKS.CONF" "5" "03/23/2008" "ELinks 0.12.GIT" "ELinks configuration file" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -156,31 +156,6 @@ connection Connection options. .RE .PP -connection.ssl -.RS 4 -SSL options. -.RE -.PP -connection.ssl.client_cert -.RS 4 -X509 client certificate options. -.RE -.PP -connection.ssl.client_cert.enable [0|1] (default: 0) -.RS 4 -Enable or not the sending of X509 client certificates to servers which request them. -.RE -.PP -connection.ssl.client_cert.file (default: "") -.RS 4 -The location of a file containing the client certificate and unencrypted private key in PEM format. If unset, the file pointed to by the X509_CLIENT_CERT variable is used instead. -.RE -.PP -connection.ssl.cert_verify [0|1] (default: 0) -.RS 4 -Verify the peer's SSL certificate. Note that this needs extensive configuration of OpenSSL by the user. -.RE -.PP connection.async_dns [0|1] (default: 1) .RS 4 Whether to use asynchronous DNS resolving. @@ -221,6 +196,31 @@ connection.unrestartable_receive_timeout (default: 600) Timeout for non\-restartable connections (in seconds). .RE .PP +connection.ssl +.RS 4 +SSL options. +.RE +.PP +connection.ssl.cert_verify [0|1] (default: 0) +.RS 4 +Verify the peer's SSL certificate. Note that this needs extensive configuration of OpenSSL by the user. +.RE +.PP +connection.ssl.client_cert +.RS 4 +X509 client certificate options. +.RE +.PP +connection.ssl.client_cert.enable [0|1] (default: 0) +.RS 4 +Enable or not the sending of X509 client certificates to servers which request them. +.RE +.PP +connection.ssl.client_cert.file (default: "") +.RS 4 +The location of a file containing the client certificate and unencrypted private key in PEM format. If unset, the file pointed to by the X509_CLIENT_CERT variable is used instead. +.RE +.PP cookies .RS 4 Cookies options. @@ -285,6 +285,27 @@ document.browse Document browsing options (mainly interactivity). .RE .PP +document.browse.margin_width (default: 3) +.RS 4 +Horizontal text margin. +.RE +.PP +document.browse.refresh [0|1] (default: 1) +.RS 4 +Automatically follow document\-specified refresh directives (\fI refresh\fR +tags). Web\-page authors use these to instruct the browser to reload a document at a given interval or to load another page. Regardless of the value the refresh URI is accessible as a link. Use the document.browse.minimum_refresh_time to control the minimum number of seconds a refresh will wait. +.RE +.PP +document.browse.minimum_refresh_time (default: 1000) +.RS 4 +The minimum number of milliseconds that should pass before refreshing. If set to zero the document refresh time is used unchanged. It can fix going back in history for some sites that use refreshing with zero values. +.RE +.PP +document.browse.table_move_order [0|1] (default: 0) +.RS 4 +Move by columns in table, instead of rows. +.RE +.PP document.browse.accesskey .RS 4 Options for handling of link access keys. An HTML document can use the ACCESSKEY attribute to assign an access key to an element. When an access key is pressed, the corresponding element will be given focus. @@ -452,46 +473,6 @@ document.browse.links Options for handling of links to other documents. .RE .PP -document.browse.links.active_link -.RS 4 -Options for the active link. -.RE -.PP -document.browse.links.active_link.colors -.RS 4 -Active link colors. -.RE -.PP -document.browse.links.active_link.colors.background (default: blue) -.RS 4 -Default background color. -.RE -.PP -document.browse.links.active_link.colors.text (default: black) -.RS 4 -Default text color. -.RE -.PP -document.browse.links.active_link.enable_color [0|1] (default: 0) -.RS 4 -Enable use of the active link background and text color settings instead of the link colors from the document. -.RE -.PP -document.browse.links.active_link.bold [0|1] (default: 0) -.RS 4 -Make the active link text bold. -.RE -.PP -document.browse.links.active_link.invert [0|1] (default: 1) -.RS 4 -Invert the fore\- and background color so the link stands out. -.RE -.PP -document.browse.links.active_link.underline [0|1] (default: 0) -.RS 4 -Underline the active link. -.RE -.PP document.browse.links.color_dirs [0|1] (default: 1) .RS 4 Highlight links to directories in FTP and local directory listing. @@ -560,6 +541,46 @@ document.browse.links.wraparound [0|1] (default: 0) When pressing 'down' on the last link, jump to the first one, and vice versa. .RE .PP +document.browse.links.active_link +.RS 4 +Options for the active link. +.RE +.PP +document.browse.links.active_link.enable_color [0|1] (default: 0) +.RS 4 +Enable use of the active link background and text color settings instead of the link colors from the document. +.RE +.PP +document.browse.links.active_link.bold [0|1] (default: 0) +.RS 4 +Make the active link text bold. +.RE +.PP +document.browse.links.active_link.invert [0|1] (default: 1) +.RS 4 +Invert the fore\- and background color so the link stands out. +.RE +.PP +document.browse.links.active_link.underline [0|1] (default: 0) +.RS 4 +Underline the active link. +.RE +.PP +document.browse.links.active_link.colors +.RS 4 +Active link colors. +.RE +.PP +document.browse.links.active_link.colors.background (default: blue) +.RS 4 +Default background color. +.RE +.PP +document.browse.links.active_link.colors.text (default: black) +.RS 4 +Default text color. +.RE +.PP document.browse.scrolling .RS 4 Scrolling options. @@ -656,32 +677,28 @@ Start typeahead searching when an unbound key is pressed without any modifiers. .RE .RE .PP -document.browse.margin_width (default: 3) -.RS 4 -Horizontal text margin. -.RE -.PP -document.browse.refresh [0|1] (default: 1) -.RS 4 -Automatically follow document\-specified refresh directives (\fI refresh\fR -tags). Web\-page authors use these to instruct the browser to reload a document at a given interval or to load another page. Regardless of the value the refresh URI is accessible as a link. Use the document.browse.minimum_refresh_time to control the minimum number of seconds a refresh will wait. -.RE -.PP -document.browse.minimum_refresh_time (default: 1000) -.RS 4 -The minimum number of milliseconds that should pass before refreshing. If set to zero the document refresh time is used unchanged. It can fix going back in history for some sites that use refreshing with zero values. -.RE -.PP -document.browse.table_move_order [0|1] (default: 0) -.RS 4 -Move by columns in table, instead of rows. -.RE -.PP document.cache .RS 4 Cache options. .RE .PP +document.cache.cache_redirects [0|1] (default: 0) +.RS 4 +Cache even redirects sent by server (usually thru HTTP by a 302 HTTP code and a Location header). This was the original behaviour for quite some time, but it causes problems in a situation very common to various web login systems \- frequently, when accessing a certain location, they will redirect you to a login page if they don't receive an auth cookie, the login page then gives you the cookie and redirects you back to the original page, but there you have already cached redirect back to the login page! If this option has value of 0, this malfunction is fixed, but occasionally you may get superfluous (depends on how you take it ;\-) requests to the server. If this option has value of 1, experienced users can still workaround it by clever combination of usage of reload, jumping around in session history and hitting ctrl+enter. Note that this option is checked when retrieving the information from cache, not when saving it to cache \- thus if you enable it, even previous redirects will be taken from cache instead of asking the server. +.RE +.PP +document.cache.ignore_cache_control [0|1] (default: 1) +.RS 4 +Ignore Cache\-Control and Pragma server headers. When set, the document is cached even with 'Cache\-Control: no\-cache'. +.RE +.PP +document.cache.revalidation_interval (default: \-1) +.RS 4 +Period in seconds that a cache entry is considered to be up\-to\-date. When a document is loaded and this interval has elapsed since the document was initially loaded or most recently revalidated with the server, the server will be checked in case there is a more up\-to\-date version of the document. +.sp +A value of \-1 disables automatic revalidation. +.RE +.PP document.cache.format .RS 4 Format cache options. @@ -704,23 +721,6 @@ document.cache.memory.size (default: 1048576) Memory cache size (in bytes). .RE .PP -document.cache.cache_redirects [0|1] (default: 0) -.RS 4 -Cache even redirects sent by server (usually thru HTTP by a 302 HTTP code and a Location header). This was the original behaviour for quite some time, but it causes problems in a situation very common to various web login systems \- frequently, when accessing a certain location, they will redirect you to a login page if they don't receive an auth cookie, the login page then gives you the cookie and redirects you back to the original page, but there you have already cached redirect back to the login page! If this option has value of 0, this malfunction is fixed, but occasionally you may get superfluous (depends on how you take it ;\-) requests to the server. If this option has value of 1, experienced users can still workaround it by clever combination of usage of reload, jumping around in session history and hitting ctrl+enter. Note that this option is checked when retrieving the information from cache, not when saving it to cache \- thus if you enable it, even previous redirects will be taken from cache instead of asking the server. -.RE -.PP -document.cache.ignore_cache_control [0|1] (default: 1) -.RS 4 -Ignore Cache\-Control and Pragma server headers. When set, the document is cached even with 'Cache\-Control: no\-cache'. -.RE -.PP -document.cache.revalidation_interval (default: \-1) -.RS 4 -Period in seconds that a cache entry is considered to be up\-to\-date. When a document is loaded and this interval has elapsed since the document was initially loaded or most recently revalidated with the server, the server will be checked in case there is a more up\-to\-date version of the document. -.sp -A value of \-1 disables automatic revalidation. -.RE -.PP document.codepage .RS 4 Charset options. @@ -949,6 +949,11 @@ document.history History options. .RE .PP +document.history.keep_unhistory [0|1] (default: 1) +.RS 4 +Keep unhistory ("forward history"). +.RE +.PP document.history.global .RS 4 Global history options. @@ -977,11 +982,6 @@ What to display in global history dialog: .RE .RE .PP -document.history.keep_unhistory [0|1] (default: 1) -.RS 4 -Keep unhistory ("forward history"). -.RE -.PP document.html .RS 4 Options concerning the display of HTML pages. @@ -1129,6 +1129,11 @@ mime MIME\-related options (handlers of various MIME types). .RE .PP +mime.default_type (default: "application/octet\-stream") +.RS 4 +Document MIME\-type to assume by default (when we are unable to guess it properly from known information about the document). +.RE +.PP mime.extension .RS 4 Extension <\-> MIME type association. @@ -1166,7 +1171,7 @@ Block the terminal when the handler is running. .PP mime.handler._template_._template_.program (default: "") .RS 4 -External viewer for this file type. '%' in this string will be substituted by a file name. +External viewer for this file type. '%' in this string will be substituted by a file name. Do _not_ put single\- or double\-quotes around the % sign. .RE .PP mime.mailcap @@ -1241,21 +1246,56 @@ mime.type._template_._template_ (default: "") Handler matching this MIME\-type name ('*' is used here in place of '.'). .RE .PP -mime.default_type (default: "application/octet\-stream") -.RS 4 -Document MIME\-type to assume by default (when we are unable to guess it properly from known information about the document). -.RE -.PP protocol .RS 4 Protocol specific options. .RE .PP +protocol.no_proxy (default: "") +.RS 4 +Comma separated list of domains for which the proxy (HTTP/FTP) should be disabled. Optionally, a port can be specified for some domains as well. If it's blank, NO_PROXY environment variable is checked as well. +.RE +.PP protocol.bittorrent .RS 4 BitTorrent specific options. .RE .PP +protocol.bittorrent.piece_cache_size (default: 1048576) +.RS 4 +The maximum amount of memory used to hold recently downloaded pieces. Set to 0 to have unlimited size. +.RE +.PP +protocol.bittorrent.max_uploads (default: 7) +.RS 4 +The maximum number of uploads to allow at once. +.RE +.PP +protocol.bittorrent.min_uploads (default: 2) +.RS 4 +The minimum number of uploads which should at least be used for new connections. +.RE +.PP +protocol.bittorrent.request_queue_size (default: 5) +.RS 4 +How many piece requests to continuously keep in queue. Pipelining of requests is essential to saturate connections and get a good connection performance and thus a faster download. However, a very big queue size can lead to wasting bandwidth near the end of the connection since remaining piece blocks will be requested from multiple peers. +.RE +.PP +protocol.bittorrent.choke_interval (default: 10) +.RS 4 +The number of seconds between updating the connection state and most importantly choke and unchoke peer connections. The choke period should be big enough for newly unchoked connections to get started but small enough to not allow freeriders too much room for stealing bandwidth. +.RE +.PP +protocol.bittorrent.rarest_first_cutoff (default: 4) +.RS 4 +The number of pieces to obtain before switching piece selection strategy from random to rarest first. +.RE +.PP +protocol.bittorrent.allow_blacklist [0|1] (default: 1) +.RS 4 +Allow blacklisting of buggy peers. +.RE +.PP protocol.bittorrent.ports .RS 4 Port range allowed to be used for listening on. @@ -1341,41 +1381,6 @@ protocol.bittorrent.peerwire.pool_size (default: 55) Maximum number of items in the peer pool. The peer pool contains information used for establishing connections to new peers. Set to 0 to have unlimited size. .RE .PP -protocol.bittorrent.piece_cache_size (default: 1048576) -.RS 4 -The maximum amount of memory used to hold recently downloaded pieces. Set to 0 to have unlimited size. -.RE -.PP -protocol.bittorrent.max_uploads (default: 7) -.RS 4 -The maximum number of uploads to allow at once. -.RE -.PP -protocol.bittorrent.min_uploads (default: 2) -.RS 4 -The minimum number of uploads which should at least be used for new connections. -.RE -.PP -protocol.bittorrent.request_queue_size (default: 5) -.RS 4 -How many piece requests to continuously keep in queue. Pipelining of requests is essential to saturate connections and get a good connection performance and thus a faster download. However, a very big queue size can lead to wasting bandwidth near the end of the connection since remaining piece blocks will be requested from multiple peers. -.RE -.PP -protocol.bittorrent.choke_interval (default: 10) -.RS 4 -The number of seconds between updating the connection state and most importantly choke and unchoke peer connections. The choke period should be big enough for newly unchoked connections to get started but small enough to not allow freeriders too much room for stealing bandwidth. -.RE -.PP -protocol.bittorrent.rarest_first_cutoff (default: 4) -.RS 4 -The number of pieces to obtain before switching piece selection strategy from random to rarest first. -.RE -.PP -protocol.bittorrent.allow_blacklist [0|1] (default: 1) -.RS 4 -Allow blacklisting of buggy peers. -.RE -.PP protocol.file .RS 4 Options specific to local browsing. @@ -1426,16 +1431,6 @@ protocol.ftp FTP specific options. .RE .PP -protocol.ftp.proxy -.RS 4 -FTP proxy configuration. -.RE -.PP -protocol.ftp.proxy.host (default: "") -.RS 4 -Host and port\-number (host:port) of the FTP proxy, or blank. If it's blank, FTP_PROXY environment variable is checked as well. -.RE -.PP protocol.ftp.anon_passwd (default: "some@host.domain") .RS 4 FTP anonymous password to be sent. @@ -1451,11 +1446,47 @@ protocol.ftp.use_epsv [0|1] (default: 0) Use EPSV instead of EPRT (passive vs active mode, IPv6 only). .RE .PP +protocol.ftp.proxy +.RS 4 +FTP proxy configuration. +.RE +.PP +protocol.ftp.proxy.host (default: "") +.RS 4 +Host and port\-number (host:port) of the FTP proxy, or blank. If it's blank, FTP_PROXY environment variable is checked as well. +.RE +.PP protocol.http .RS 4 HTTP\-specific options. .RE .PP +protocol.http.accept_language (default: "") +.RS 4 +Send Accept\-Language header. +.RE +.PP +protocol.http.accept_ui_language [0|1] (default: 1) +.RS 4 +Request localised versions of documents from web\-servers (using the Accept\-Language header) using the language you have configured for +\fIELinks\fR' user\-interface (this also affects navigator.language ECMAScript value available to scripts). Note that some see this as a potential security risk because it tells web\-masters and the FBI sniffers about your language preference. +.RE +.PP +protocol.http.trace [0|1] (default: 0) +.RS 4 +If active, all HTTP requests are sent with TRACE as their method rather than GET or POST. This is useful for debugging of both +\fIELinks\fR +and various server\-side scripts \-\-\- the server only returns the client's request back to the client verbatim. Note that this type of request may not be enabled on all servers. +.RE +.PP +protocol.http.user_agent (default: "ELinks/%v (textmode; %s; %t\-%b)") +.RS 4 +Change the User Agent ID. That means identification string, which is sent to HTTP server when a document is requested. The 'textmode' token in the first field is our silent attempt to establish this as a standard for new textmode user agents, so that the webmasters can have just a single uniform test for these if they are e.g. pushing some lite version to them automagically. Use " " if you don't want any User\-Agent header to be sent at all. %v in the string means +\fIELinks\fR +version, %s in the string means system identification, %t in the string means size of the terminal, %b in the string means number of bars displayed by +\fIELinks\fR. +.RE +.PP protocol.http.bugs .RS 4 Server\-side HTTP bugs workarounds. @@ -1537,32 +1568,6 @@ protocol.http.referer.fake (default: "") Fake referer to be sent when policy is 2. .RE .PP -protocol.http.accept_language (default: "") -.RS 4 -Send Accept\-Language header. -.RE -.PP -protocol.http.accept_ui_language [0|1] (default: 1) -.RS 4 -Request localised versions of documents from web\-servers (using the Accept\-Language header) using the language you have configured for -\fIELinks\fR' user\-interface (this also affects navigator.language ECMAScript value available to scripts). Note that some see this as a potential security risk because it tells web\-masters and the FBI sniffers about your language preference. -.RE -.PP -protocol.http.trace [0|1] (default: 0) -.RS 4 -If active, all HTTP requests are sent with TRACE as their method rather than GET or POST. This is useful for debugging of both -\fIELinks\fR -and various server\-side scripts \-\-\- the server only returns the client's request back to the client verbatim. Note that this type of request may not be enabled on all servers. -.RE -.PP -protocol.http.user_agent (default: "ELinks/%v (textmode; %s; %t\-%b)") -.RS 4 -Change the User Agent ID. That means identification string, which is sent to HTTP server when a document is requested. The 'textmode' token in the first field is our silent attempt to establish this as a standard for new textmode user agents, so that the webmasters can have just a single uniform test for these if they are e.g. pushing some lite version to them automagically. Use " " if you don't want any User\-Agent header to be sent at all. %v in the string means -\fIELinks\fR -version, %s in the string means system identification, %t in the string means size of the terminal, %b in the string means number of bars displayed by -\fIELinks\fR. -.RE -.PP protocol.https .RS 4 HTTPS\-specific options. @@ -1598,6 +1603,21 @@ protocol.rewrite Rules for rewriting URIs entered in the goto dialog. It makes it possible to define a set of prefixes that will be expanded if they match a string entered in the goto dialog. The prefixes can be dumb, meaning that they work only like URI abbreviations, or smart ones, making it possible to pass arguments to them like search engine keywords. .RE .PP +protocol.rewrite.default_template (default: "") +.RS 4 +Default URI template used when the string entered in the goto dialog does not appear to be a URI or a filename (i.e. contains no '.', ':' or '/' characters), and does not match any defined prefixes. Set the value to "" to disable use of the default template rewrite rule. %c in the template means the current URL, %s in the template means the whole string from the goto dialog, %0,%1,\&...,%9 mean the 1st,2nd,\&...,10th space\-delimited part of %s, %% in the template means '%'. +.RE +.PP +protocol.rewrite.enable\-dumb [0|1] (default: 1) +.RS 4 +Enable dumb prefixes \- simple URI abbreviations which can be written to the Goto URL dialog instead of actual URIs \- i.e. if you write 'elinks' there, you are directed to http://elinks.cz/. +.RE +.PP +protocol.rewrite.enable\-smart [0|1] (default: 1) +.RS 4 +Enable smart prefixes \- URI templates triggered by writing given abbreviation to the Goto URL dialog followed by a list of arguments from which the actual URI is composed \- i.e. 'gg:search keywords' or 'gn search keywords for news'. +.RE +.PP protocol.rewrite.dumb .RS 4 Dumb prefixes, see enable\-dumb description for details. @@ -1618,21 +1638,6 @@ protocol.rewrite.smart._template_ (default: "") Replacement URI for this smartprefix: %c in the string means the current URL %s in the string means the whole argument to smartprefix %0,%1,\&...,%9 means argument 0, 1, \&..., 9 %% in the string means '%' .RE .PP -protocol.rewrite.default_template (default: "") -.RS 4 -Default URI template used when the string entered in the goto dialog does not appear to be a URI or a filename (i.e. contains no '.', ':' or '/' characters), and does not match any defined prefixes. Set the value to "" to disable use of the default template rewrite rule. %c in the template means the current URL, %s in the template means the whole string from the goto dialog, %0,%1,\&...,%9 mean the 1st,2nd,\&...,10th space\-delimited part of %s, %% in the template means '%'. -.RE -.PP -protocol.rewrite.enable\-dumb [0|1] (default: 1) -.RS 4 -Enable dumb prefixes \- simple URI abbreviations which can be written to the Goto URL dialog instead of actual URIs \- i.e. if you write 'elinks' there, you are directed to http://elinks.cz/. -.RE -.PP -protocol.rewrite.enable\-smart [0|1] (default: 1) -.RS 4 -Enable smart prefixes \- URI templates triggered by writing given abbreviation to the Goto URL dialog followed by a list of arguments from which the actual URI is composed \- i.e. 'gg:search keywords' or 'gn search keywords for news'. -.RE -.PP protocol.user .RS 4 User protocols. Options in this tree specify external handlers for the appropriate protocols. Ie. protocol.user.mailto.unix. @@ -1648,11 +1653,6 @@ protocol.user._template_._template_ (default: "") Handler (external program) for this protocol and system. %f in the string means file name to include form data from %h in the string means hostname (or email address) %p in the string means port %d in the string means path (everything after the port) %s in the string means subject (?subject=) %u in the string means the whole URL .RE .PP -protocol.no_proxy (default: "") -.RS 4 -Comma separated list of domains for which the proxy (HTTP/FTP) should be disabled. Optionally, a port can be specified for some domains as well. If it's blank, NO_PROXY environment variable is checked as well. -.RE -.PP terminal .RS 4 Terminal options. @@ -1763,6 +1763,46 @@ ui User interface options. .RE .PP +ui.date_format (default: "%b %e %H:%M") +.RS 4 +Date format to use in dialogs. See strftime(3). +.RE +.PP +ui.language (default: "System") +.RS 4 +Language of user interface. 'System' means that the language will be extracted from the environment dynamically. +.RE +.PP +ui.show_menu_bar_always [0|1] (default: 0) +.RS 4 +Always show menu bar on the screen. +.RE +.PP +ui.show_status_bar [0|1] (default: 1) +.RS 4 +Show status bar on the screen. +.RE +.PP +ui.show_title_bar [0|1] (default: 1) +.RS 4 +Show title bar on the screen. +.RE +.PP +ui.startup_goto_dialog [0|1] (default: 1) +.RS 4 +Pop up goto dialog in newly created tabs when there's no homepage set. This means also showing goto dialog on startup. +.RE +.PP +ui.success_msgbox [0|1] (default: 1) +.RS 4 +When you pressed a [ Save ] button in some manager, this option will make sure that a box confirming success of the operation will pop up. +.RE +.PP +ui.window_title [0|1] (default: 1) +.RS 4 +Set the window title when running in a windowing environment in an xterm\-like terminal. This way the document's title is shown on the window titlebar. +.RE +.PP ui.clock .RS 4 Digital clock in the status bar. @@ -3125,46 +3165,6 @@ ui.timer.action (default: "") .RS 4 Keybinding action to be triggered when timer reaches zero. .RE -.PP -ui.date_format (default: "%b %e %H:%M") -.RS 4 -Date format to use in dialogs. See strftime(3). -.RE -.PP -ui.language (default: "System") -.RS 4 -Language of user interface. 'System' means that the language will be extracted from the environment dynamically. -.RE -.PP -ui.show_menu_bar_always [0|1] (default: 0) -.RS 4 -Always show menu bar on the screen. -.RE -.PP -ui.show_status_bar [0|1] (default: 1) -.RS 4 -Show status bar on the screen. -.RE -.PP -ui.show_title_bar [0|1] (default: 1) -.RS 4 -Show title bar on the screen. -.RE -.PP -ui.startup_goto_dialog [0|1] (default: 1) -.RS 4 -Pop up goto dialog in newly created tabs when there's no homepage set. This means also showing goto dialog on startup. -.RE -.PP -ui.success_msgbox [0|1] (default: 1) -.RS 4 -When you pressed a [ Save ] button in some manager, this option will make sure that a box confirming success of the operation will pop up. -.RE -.PP -ui.window_title [0|1] (default: 1) -.RS 4 -Set the window title when running in a windowing environment in an xterm\-like terminal. This way the document's title is shown on the window titlebar. -.RE Generated using output from ELinks version 0.12.GIT. .sp .SH "SEE ALSO" diff --git a/src/config/cmdline.c b/src/config/cmdline.c index b4787b24..ff84dc58 100644 --- a/src/config/cmdline.c +++ b/src/config/cmdline.c @@ -419,8 +419,11 @@ version_cmd(struct option *o, unsigned char ***argv, int *argc) #define gettext_nonempty(x) (*(x) ? gettext(x) : (x)) +static void print_full_help_outer(struct option *tree, unsigned char *path); + static void -print_full_help(struct option *tree, unsigned char *path) +print_full_help_inner(struct option *tree, unsigned char *path, + int trees) { struct option *option; unsigned char saved[MAX_STR_LEN]; @@ -436,6 +439,9 @@ print_full_help(struct option *tree, unsigned char *path) ? (unsigned char *) gettext(option->desc) : (unsigned char *) "N/A"; + if (trees != (type == OPT_TREE)) + continue; + /* Don't print deprecated aliases (if we don't walk command * line options which use aliases for legitimate options). */ if ((type == OPT_ALIAS && tree != cmdline_options) @@ -547,7 +553,7 @@ print_full_help(struct option *tree, unsigned char *path) if (option->type == OPT_TREE) { memcpy(savedpos, ".", 2); - print_full_help(option, saved); + print_full_help_outer(option, saved); } savedpos = saved; @@ -555,6 +561,13 @@ print_full_help(struct option *tree, unsigned char *path) } } +static void +print_full_help_outer(struct option *tree, unsigned char *path) +{ + print_full_help_inner(tree, path, 0); + print_full_help_inner(tree, path, 1); +} + static void print_short_help(void) { @@ -627,13 +640,13 @@ printhelp_cmd(struct option *option, unsigned char ***argv, int *argc) if (!strcmp(option->name, "config-help")) { printf("%s:\n", gettext("Configuration options")); - print_full_help(config_options, ""); + print_full_help_outer(config_options, ""); } else { printf("%s\n\n%s:\n", gettext("Usage: elinks [OPTION]... [URL]..."), gettext("Options")); if (!strcmp(option->name, "long-help")) { - print_full_help(cmdline_options, "-"); + print_full_help_outer(cmdline_options, "-"); } else { print_short_help(); } From 511cccd19056a31cd42f763079ab2f5b542170d3 Mon Sep 17 00:00:00 2001 From: Laurent MONIN Date: Tue, 25 Mar 2008 22:31:19 +0100 Subject: [PATCH 05/16] French translation was updated. --- po/fr.po | 909 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 652 insertions(+), 257 deletions(-) diff --git a/po/fr.po b/po/fr.po index 11a55e6f..c9b3ef74 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: 2007-10-09 21:50+0200\n" -"PO-Revision-Date: 2007-10-09 21:52+0200\n" +"POT-Creation-Date: 2008-03-25 22:26+0100\n" +"PO-Revision-Date: 2008-03-25 22:30+0100\n" "Last-Translator: Laurent Monin \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "Fermer" #. | MSGBOX_SCROLLABLE #. #: src/bfu/hierbox.c:429 src/bfu/hierbox.c:438 src/dialogs/document.c:43 -#: src/dialogs/document.c:240 src/scripting/python/dialogs.c:43 +#: src/dialogs/document.c:241 src/scripting/python/dialogs.c:43 msgid "Info" msgstr "Info" @@ -35,7 +35,7 @@ msgstr "Pressez espace pour d #: src/bfu/msgbox.c:194 src/config/dialogs.c:57 src/config/dialogs.c:365 #: src/cookies/dialogs.c:372 src/cookies/dialogs.c:470 src/dialogs/edit.c:98 #: src/dialogs/info.c:134 src/dialogs/options.c:234 src/dialogs/options.c:315 -#: src/mime/dialogs.c:131 src/protocol/auth/dialogs.c:115 +#: src/mime/dialogs.c:132 src/protocol/auth/dialogs.c:115 #: src/protocol/protocol.c:245 src/scripting/lua/core.c:399 #: src/scripting/lua/core.c:480 src/scripting/python/dialogs.c:86 #: src/session/session.c:800 src/viewer/text/search.c:1677 @@ -176,10 +176,10 @@ 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:366 src/cookies/dialogs.c:373 #: src/cookies/dialogs.c:471 src/dialogs/edit.c:102 src/dialogs/edit.c:105 -#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:132 +#: src/dialogs/options.c:237 src/dialogs/options.c:316 src/mime/dialogs.c:133 #: src/protocol/auth/dialogs.c:116 src/protocol/bittorrent/dialogs.c:812 #: src/scripting/lua/core.c:400 src/scripting/lua/core.c:481 -#: src/session/download.c:645 src/session/download.c:1266 +#: src/session/download.c:645 src/session/download.c:1243 #: src/viewer/text/search.c:1678 msgid "~Cancel" msgstr "~Annuler" @@ -245,7 +245,7 @@ msgid "" " |||||`- Unused\n" " ||||`-- Unused\n" " |||`--- A JavaScript pop-up window was blocked\n" -" ||`---- A JavaScript error has occured\n" +" ||`---- A JavaScript error has occurred\n" " |`----- The state of insert mode for text-input form-fields\n" " | 'i' means modeless, 'I' means insert mode is on\n" " `------ Whether an SSL connection was used\n" @@ -576,15 +576,15 @@ msgstr "Taille (charg msgid "Content type" msgstr "Type de contenu" -#: src/cache/dialogs.c:94 src/dialogs/document.c:201 +#: src/cache/dialogs.c:94 src/dialogs/document.c:202 msgid "Last modified" msgstr "Dernière modification" -#: src/cache/dialogs.c:102 src/dialogs/document.c:183 +#: src/cache/dialogs.c:102 src/dialogs/document.c:184 msgid "SSL Cipher" msgstr "Chiffrement SSL" -#: src/cache/dialogs.c:106 src/dialogs/document.c:188 +#: src/cache/dialogs.c:106 src/dialogs/document.c:189 msgid "Encoding" msgstr "Encodage" @@ -592,7 +592,7 @@ msgstr "Encodage" msgid "Flags" msgstr "Drapeaux" -#: src/cache/dialogs.c:115 src/dialogs/document.c:159 +#: src/cache/dialogs.c:115 src/dialogs/document.c:160 msgid "incomplete" msgstr "incomplet" @@ -763,7 +763,7 @@ msgstr "Coller le texte du tampon" msgid "Move to the previous item" msgstr "Se déplacer à l'item précédent" -#: src/config/actions-edit.inc:31 src/config/actions-main.inc:79 +#: src/config/actions-edit.inc:31 src/config/actions-main.inc:84 #: src/config/actions-menu.inc:21 msgid "Redraw the terminal" msgstr "Redessiner le terminal" @@ -969,247 +969,267 @@ msgid "Move cursor left" msgstr "Déplacer le curseur vers la gauche" #: src/config/actions-main.inc:57 +msgid "Move cursor to the start of the line" +msgstr "Déplacer le curseur en début de ligne" + +#: src/config/actions-main.inc:58 msgid "Move cursor right" msgstr "Déplacer le curseur vers la droite" -#: src/config/actions-main.inc:58 +#: src/config/actions-main.inc:59 msgid "Move cursor up" msgstr "Déplacer le curseur vers le haut" -#: src/config/actions-main.inc:59 +#: src/config/actions-main.inc:60 msgid "Move to the end of the document" msgstr "Aller à la fin du document" -#: src/config/actions-main.inc:60 +#: src/config/actions-main.inc:61 msgid "Move to the start of the document" msgstr "Aller au début du document" -#: src/config/actions-main.inc:61 +#: src/config/actions-main.inc:62 msgid "Move one link down" msgstr "Se déplacer d'un lien vers le bas" -#: src/config/actions-main.inc:62 +#: src/config/actions-main.inc:63 +msgid "Move to the next line with a link" +msgstr "Se déplacer à la prochaine ligne contenant un lien" + +#: src/config/actions-main.inc:64 msgid "Move one link left" msgstr "Se déplacer d'un lien vers la gauche" -#: src/config/actions-main.inc:63 +#: src/config/actions-main.inc:65 +msgid "Move one link left or to the previous link" +msgstr "Se déplacer d'un lien à gauche ou au lien précédent" + +#: src/config/actions-main.inc:66 msgid "Move to the next link" msgstr "Se déplacer au lien suivant" -#: src/config/actions-main.inc:64 +#: src/config/actions-main.inc:67 msgid "Move to the previous link" msgstr "Se déplacer au lien précédent" -#: src/config/actions-main.inc:65 +#: src/config/actions-main.inc:68 msgid "Move one link right" msgstr "Se déplacer d'un lien vers la droite" -#: src/config/actions-main.inc:66 +#: src/config/actions-main.inc:69 +msgid "Move one link right or to the next link" +msgstr "Se déplacer d'un lien à droite ou au lien suivant" + +#: src/config/actions-main.inc:70 msgid "Move one link up" msgstr "Se déplacer d'un lien vers le haut" -#: src/config/actions-main.inc:67 src/config/actions-menu.inc:18 +#: src/config/actions-main.inc:71 +msgid "Move to the previous line with a link" +msgstr "Se déplacer à la précédente ligne contenant un lien" + +#: src/config/actions-main.inc:72 src/config/actions-menu.inc:18 msgid "Move downwards by a page" msgstr "Descendre d'une page" -#: src/config/actions-main.inc:68 src/config/actions-menu.inc:19 +#: src/config/actions-main.inc:73 src/config/actions-menu.inc:19 msgid "Move upwards by a page" msgstr "Monter d'une page" -#: src/config/actions-main.inc:69 +#: src/config/actions-main.inc:74 msgid "Open the current link in a new tab" msgstr "Ouvrir le lien courant dans un nouvel onglet" -#: src/config/actions-main.inc:70 +#: src/config/actions-main.inc:75 msgid "Open the current link in a new tab in the background" msgstr "Ouvrir le lien courant dans un nouvel onglet en arrière-plan" -#: src/config/actions-main.inc:71 +#: src/config/actions-main.inc:76 msgid "Open the current link in a new window" msgstr "Ouvrir le lien courant dans une nouvelle fenêtre" -#: src/config/actions-main.inc:72 +#: src/config/actions-main.inc:77 msgid "Open a new tab" msgstr "Ouvrir un nouvel onglet" -#: src/config/actions-main.inc:73 +#: src/config/actions-main.inc:78 msgid "Open a new tab in the background" msgstr "Ouvrir un nouvel onglet en arrière-plan" -#: src/config/actions-main.inc:74 +#: src/config/actions-main.inc:79 msgid "Open a new window" msgstr "Ouvrir une nouvelle fenêtre" -#: src/config/actions-main.inc:75 +#: src/config/actions-main.inc:80 msgid "Open an OS shell" msgstr "Ouvrir une ligne de commandes (shell)" -#: src/config/actions-main.inc:76 +#: src/config/actions-main.inc:81 msgid "Open options manager" msgstr "Ouvrir le gestionnaire d'options" -#: src/config/actions-main.inc:77 +#: src/config/actions-main.inc:82 msgid "Open a quit confirmation dialog box" msgstr "Ouvrir le dialogue de confirmation pour quitter" -#: src/config/actions-main.inc:78 +#: src/config/actions-main.inc:83 msgid "Quit without confirmation" msgstr "Quitter sans confirmation" -#: src/config/actions-main.inc:80 +#: src/config/actions-main.inc:85 msgid "Reload the current page" msgstr "Recharger la page courante" -#: src/config/actions-main.inc:81 +#: src/config/actions-main.inc:86 msgid "Re-render the current page" msgstr "Redessiner la page courante" -#: src/config/actions-main.inc:82 +#: src/config/actions-main.inc:87 msgid "Reset form items to their initial values" msgstr "Réinitialiser les champs de formulaire" -#: src/config/actions-main.inc:83 +#: src/config/actions-main.inc:88 msgid "Show information about the currently used resources" msgstr "Informations à propos des ressources utilisées" -#: src/config/actions-main.inc:84 +#: src/config/actions-main.inc:89 msgid "Save the current document in source form" msgstr "Sauver le document courant sous la forme source" -#: src/config/actions-main.inc:85 +#: src/config/actions-main.inc:90 msgid "Save the current document in formatted form" msgstr "Sauver le document courant sous la forme formatée" -#: src/config/actions-main.inc:86 +#: src/config/actions-main.inc:91 msgid "Save options" msgstr "Enregistrer les options" -#: src/config/actions-main.inc:87 +#: src/config/actions-main.inc:92 msgid "Save URL as" msgstr "Enregistrer l'URL sous" -#: src/config/actions-main.inc:88 +#: src/config/actions-main.inc:93 msgid "Scroll down" msgstr "Défiler vers le bas" -#: src/config/actions-main.inc:89 +#: src/config/actions-main.inc:94 msgid "Scroll left" msgstr "Défiler vers la gauche" -#: src/config/actions-main.inc:90 +#: src/config/actions-main.inc:95 msgid "Scroll right" msgstr "Défiler vers la droite" -#: src/config/actions-main.inc:91 +#: src/config/actions-main.inc:96 msgid "Scroll up" msgstr "Défiler vers le haut" -#: src/config/actions-main.inc:92 src/config/actions-menu.inc:23 +#: src/config/actions-main.inc:97 src/config/actions-menu.inc:23 msgid "Search for a text pattern" msgstr "Recherche de texte" -#: src/config/actions-main.inc:93 +#: src/config/actions-main.inc:98 msgid "Search backwards for a text pattern" msgstr "Recherche de texte (en arrière)" -#: src/config/actions-main.inc:94 src/config/actions-main.inc:95 +#: src/config/actions-main.inc:99 src/config/actions-main.inc:100 msgid "Search link text by typing ahead" msgstr "Rechercher un lien par préfrappe" -#: src/config/actions-main.inc:96 +#: src/config/actions-main.inc:101 msgid "Search document text by typing ahead" msgstr "Rechercher du texte par préfrappe" -#: src/config/actions-main.inc:97 +#: src/config/actions-main.inc:102 msgid "Search document text backwards by typing ahead" msgstr "Rechercher en arrière du texte par préfrappe" -#: src/config/actions-main.inc:98 +#: src/config/actions-main.inc:103 msgid "Show terminal options dialog" msgstr "Montrer les options du terminal" -#: src/config/actions-main.inc:99 +#: src/config/actions-main.inc:104 msgid "Submit form" msgstr "Envoyer le formulaire" -#: src/config/actions-main.inc:100 +#: src/config/actions-main.inc:105 msgid "Submit form and reload" msgstr "Envoyer le formulaire et recharger" -#: src/config/actions-main.inc:101 src/terminal/tab.c:205 +#: src/config/actions-main.inc:106 src/terminal/tab.c:205 #: src/terminal/tab.c:249 msgid "Close tab" msgstr "Fermer l'onglet" -#: src/config/actions-main.inc:102 +#: src/config/actions-main.inc:107 msgid "Close all tabs but the current one" msgstr "Fermer les autres onglets" -#: src/config/actions-main.inc:103 +#: src/config/actions-main.inc:108 msgid "Pass URI of current tab to external command" msgstr "Passer l'URI de l'onglet courant à une commande externe" -#: src/config/actions-main.inc:104 +#: src/config/actions-main.inc:109 msgid "Open the tab menu" msgstr "Ouvrir le menu des onglets" -#: src/config/actions-main.inc:105 +#: src/config/actions-main.inc:110 msgid "Move the current tab to the left" msgstr "Déplacer l'onglet courant vers la gauche" -#: src/config/actions-main.inc:106 +#: src/config/actions-main.inc:111 msgid "Move the current tab to the right" msgstr "Déplacer l'onglet courant vers la droite" -#: src/config/actions-main.inc:107 +#: src/config/actions-main.inc:112 msgid "Next tab" msgstr "Onglet suivant" -#: src/config/actions-main.inc:108 +#: src/config/actions-main.inc:113 msgid "Previous tab" msgstr "Onglet précédent" -#: src/config/actions-main.inc:109 +#: src/config/actions-main.inc:114 msgid "Open the terminal resize dialog" msgstr "Ouvrir le dialogue de redimensionnement du terminal" -#: src/config/actions-main.inc:110 +#: src/config/actions-main.inc:115 msgid "Toggle rendering of page using CSS" msgstr "Commuter le rendu avec CSS" -#: src/config/actions-main.inc:111 +#: src/config/actions-main.inc:116 msgid "Toggle displaying of links to images" msgstr "Commuter l'affichage des liens vers les images." -#: src/config/actions-main.inc:112 +#: src/config/actions-main.inc:117 msgid "Toggle rendering of tables" msgstr "Commuter le rendu des tableaux" -#: src/config/actions-main.inc:113 +#: src/config/actions-main.inc:118 msgid "Toggle usage of document specific colors" msgstr "Commuter l'utilisation des couleurs spécifiques au document" -#: src/config/actions-main.inc:114 +#: src/config/actions-main.inc:119 msgid "Toggle rendering page as HTML / plain text" msgstr "Commuter le rendu de la page en HTML/texte plein" -#: src/config/actions-main.inc:115 +#: src/config/actions-main.inc:120 msgid "Toggle mouse handling" msgstr "Bascule support souris" -#: src/config/actions-main.inc:116 +#: src/config/actions-main.inc:121 msgid "Toggle displaying of links numbers" msgstr "Commuter l'affichage des numéros de liens" -#: src/config/actions-main.inc:117 +#: src/config/actions-main.inc:122 msgid "Toggle plain renderer compression of empty lines" msgstr "Commuter la compression des lignes vides dans le rendu plein texte" -#: src/config/actions-main.inc:118 +#: src/config/actions-main.inc:123 msgid "Toggle wrapping of text" msgstr "Commuter la césure auto du texte (wrapping)" -#: src/config/actions-main.inc:119 +#: src/config/actions-main.inc:124 msgid "View the current image" msgstr "Voir l'image courante" @@ -1279,56 +1299,56 @@ msgstr "Guillemets manquant en fin d'argument" msgid "Garbage after quoted argument" msgstr "Contenu inattendu après l'argument" -#: src/config/cmdline.c:391 +#: src/config/cmdline.c:394 msgid "Remote method not supported" msgstr "Méthode remote non supportée" -#: src/config/cmdline.c:443 +#: src/config/cmdline.c:452 msgid "Template option folder" msgstr "Dossier des modèles d'option" -#: src/config/cmdline.c:466 +#: src/config/cmdline.c:475 #, c-format msgid "(default: %ld)" msgstr "(défaut: %ld)" -#: src/config/cmdline.c:473 src/config/cmdline.c:502 +#: src/config/cmdline.c:482 src/config/cmdline.c:511 #, c-format msgid "(default: \"%s\")" msgstr "(défaut: \"%s\")" -#: src/config/cmdline.c:478 +#: src/config/cmdline.c:487 #, c-format msgid "(alias for %s)" msgstr "(alias for %s)" -#: src/config/cmdline.c:483 src/config/cmdline.c:492 +#: src/config/cmdline.c:492 src/config/cmdline.c:501 #, c-format msgid "(default: %s)" msgstr "(défaut: %s)" -#: src/config/cmdline.c:626 +#: src/config/cmdline.c:642 msgid "Configuration options" msgstr "Options de configuration" -#: src/config/cmdline.c:630 +#: src/config/cmdline.c:646 msgid "Usage: elinks [OPTION]... [URL]..." msgstr "Usage: elinks [OPTION]... [URL]..." -#: src/config/cmdline.c:631 +#: src/config/cmdline.c:647 msgid "Options" msgstr "Options" -#: src/config/cmdline.c:673 +#: src/config/cmdline.c:689 msgid "Internal consistency error" msgstr "Erreur interne" #. -#: src/config/cmdline.c:709 +#: src/config/cmdline.c:725 msgid "Restrict to anonymous mode" msgstr "Restriction au mode anonyme" -#: src/config/cmdline.c:711 +#: src/config/cmdline.c:727 msgid "" "Restricts ELinks so it can run on an anonymous account.\n" "Local file browsing, downloads, and modification of options\n" @@ -1341,19 +1361,19 @@ msgstr "" "désactivés. L'utilisation de visionneurs externes reste \n" "possible, mais les associations ne peuvent être modifiées." -#: src/config/cmdline.c:716 +#: src/config/cmdline.c:732 msgid "Autosubmit first form" msgstr "Envoyer automatiquement le premier formulaire" -#: src/config/cmdline.c:718 +#: src/config/cmdline.c:734 msgid "Automatically submit the first form in the given URLs." msgstr "Envoyer automatiquement le premier formulaire de l'URL donnée." -#: src/config/cmdline.c:720 +#: src/config/cmdline.c:736 msgid "Clone internal session with given ID" msgstr "Cloner la session interne ayant l'ID donné" -#: src/config/cmdline.c:722 +#: src/config/cmdline.c:738 msgid "" "Used internally when opening ELinks instances in new windows.\n" "The ID maps to information that will be used when creating the\n" @@ -1365,11 +1385,11 @@ msgstr "" "nouvelle instance.\n" "N'utilisez pas cette option." -#: src/config/cmdline.c:728 +#: src/config/cmdline.c:744 msgid "Name of directory with configuration file" msgstr "Nom du répertoire contenant les fichiers de configuration" -#: src/config/cmdline.c:730 +#: src/config/cmdline.c:746 msgid "" "Path of the directory ELinks will read and write its\n" "config and runtime state files to instead of ~/.elinks.\n" @@ -1381,11 +1401,11 @@ msgstr "" "Si le chemin ne commence pas par un '/', il sera considéré\n" "relatif à votre répertoire HOME." -#: src/config/cmdline.c:735 +#: src/config/cmdline.c:751 msgid "Print default configuration file to stdout" msgstr "Imprimer le fichier de configuration par défaut sur la sortie standart" -#: src/config/cmdline.c:737 +#: src/config/cmdline.c:753 msgid "" "Print a configuration file with options set to the built-in\n" "defaults to stdout." @@ -1393,11 +1413,11 @@ msgstr "" "Imprimer un fichier de configuration contenant les options par défaut\n" "sur la sortie standart." -#: src/config/cmdline.c:742 +#: src/config/cmdline.c:758 msgid "Name of configuration file" msgstr "Nom du fichier de configuration" -#: src/config/cmdline.c:744 +#: src/config/cmdline.c:760 msgid "" "Name of the configuration file that all configuration\n" "options will be read from and written to. It should be\n" @@ -1407,29 +1427,29 @@ msgstr "" "et lues les options de configuration. Il doit être relatif\n" "à config-dir." -#: src/config/cmdline.c:748 +#: src/config/cmdline.c:764 msgid "Print help for configuration options" msgstr "Afficher l'aide pour les options de configuration" -#: src/config/cmdline.c:750 +#: src/config/cmdline.c:766 msgid "Print help for configuration options and exit." msgstr "Afficher l'aide pour les options de configuration et quitter." -#: src/config/cmdline.c:752 +#: src/config/cmdline.c:768 msgid "MIME type assumed for unknown document types" msgstr "Type MIME à supposer pour les documents de type inconnu" -#: src/config/cmdline.c:754 +#: src/config/cmdline.c:770 msgid "The default MIME type used for documents of unknown type." msgstr "" "Le type MIME par défaut à utiliser pour les documents dont\n" "le type est inconnu." -#: src/config/cmdline.c:756 +#: src/config/cmdline.c:772 msgid "Ignore user-defined keybindings" msgstr "Ignorer les associations de touches utilisateur" -#: src/config/cmdline.c:758 +#: src/config/cmdline.c:774 msgid "" "When set, all keybindings from configuration files will be\n" "ignored. It forces use of default keybindings and will reset\n" @@ -1441,46 +1461,46 @@ msgstr "" "réinitialisera les associations de touches définies par\n" "l'utilisateur lors d'une nouvelle sauvegarde." -#: src/config/cmdline.c:762 +#: src/config/cmdline.c:778 msgid "Print formatted versions of given URLs to stdout" msgstr "" "Imprimer les versions formatées des URLs données sur la sortie standard" -#: src/config/cmdline.c:764 +#: src/config/cmdline.c:780 msgid "Print formatted plain-text versions of given URLs to stdout." msgstr "" "Imprimer les versions plein texte formatées des URLs données sur la \n" "sortie standard." -#: src/config/cmdline.c:766 +#: src/config/cmdline.c:782 msgid "Codepage to use with -dump" msgstr "Jeu de caractères à utiliser avec -dump" -#: src/config/cmdline.c:768 +#: src/config/cmdline.c:784 msgid "Codepage used when formatting dump output." msgstr "Jeu de caractères utilisé lors du formatage de la sortie (dump)." -#: src/config/cmdline.c:770 +#: src/config/cmdline.c:786 msgid "Color mode used with -dump" msgstr "Mode couleurs à utiliser avec -dump" -#: src/config/cmdline.c:772 +#: src/config/cmdline.c:788 msgid "Color mode used with -dump." msgstr "Mode couleurs à utiliser avec -dump." -#: src/config/cmdline.c:774 +#: src/config/cmdline.c:790 msgid "Width of document formatted with -dump" msgstr "Largeur de document formaté à utiliser avec -dump" -#: src/config/cmdline.c:776 +#: src/config/cmdline.c:792 msgid "Width of the dump output." msgstr "Largeur de sortie (dump)." -#: src/config/cmdline.c:778 +#: src/config/cmdline.c:794 msgid "Evaluate configuration file directive" msgstr "Evalue une directive de fichier de configuration" -#: src/config/cmdline.c:780 +#: src/config/cmdline.c:796 msgid "" "Specify configuration file directives on the command-line\n" "which will be evaluated after all configuration files has been\n" @@ -1493,11 +1513,11 @@ msgstr "" " -eval 'set protocol.file.allow_special_files = 1'" #. lynx compatibility -#: src/config/cmdline.c:786 +#: src/config/cmdline.c:802 msgid "Interpret documents of unknown types as HTML" msgstr "Interprète les documents de type inconnu comme de l'HTML" -#: src/config/cmdline.c:788 +#: src/config/cmdline.c:804 msgid "" "Makes ELinks assume documents of unknown types are HTML.\n" "Useful when using ELinks as an external viewer from MUAs.\n" @@ -1508,19 +1528,19 @@ msgstr "" "d'ELinks comme visionneur pour les clients mail.\n" "C'est équivalent à -default-mime-type text/html." -#: src/config/cmdline.c:798 +#: src/config/cmdline.c:814 msgid "Print usage help and exit" msgstr "Afficher l'aide et quitter" -#: src/config/cmdline.c:800 +#: src/config/cmdline.c:816 msgid "Print usage help and exit." msgstr "Afficher l'aide et quitter." -#: src/config/cmdline.c:802 +#: src/config/cmdline.c:818 msgid "Only permit local connections" msgstr "Permettre seulement les connexions locales" -#: src/config/cmdline.c:804 +#: src/config/cmdline.c:820 msgid "" "Restricts ELinks to work offline and only connect to servers\n" "with local addresses (ie. 127.0.0.1). No connections to remote\n" @@ -1530,29 +1550,29 @@ msgstr "" "connexions vers des adresses locales (par exemple, 127.0.0.1),\n" "cela rend impossible toute connexion vers des sites distants." -#: src/config/cmdline.c:808 +#: src/config/cmdline.c:824 msgid "Print detailed usage help and exit" msgstr "Afficher l'aide détaillée et quitter" -#: src/config/cmdline.c:810 +#: src/config/cmdline.c:826 msgid "Print detailed usage help and exit." msgstr "Afficher l'aide détaillée et quitter." -#: src/config/cmdline.c:812 +#: src/config/cmdline.c:828 msgid "Look up specified host" msgstr "Résolution du nom de l'hôte spécifié" -#: src/config/cmdline.c:814 +#: src/config/cmdline.c:830 msgid "Look up specified host and print all DNS resolved IP addresses." msgstr "" "Résoudre le nom d'hôte spécifié et imprimer toutes les adresses IP\n" "correspondantes." -#: src/config/cmdline.c:816 +#: src/config/cmdline.c:832 msgid "Run as separate instance" msgstr "Exécuter en tant qu'instance séparée" -#: src/config/cmdline.c:818 +#: src/config/cmdline.c:834 msgid "" "Run ELinks as a separate instance instead of connecting to an\n" "existing instance. Note that normally no runtime state files\n" @@ -1564,11 +1584,11 @@ msgstr "" "(signets, historique, etc.) n'est modifié quand cette option est\n" "utilisée. Voir aussi -touch-files." -#: src/config/cmdline.c:823 +#: src/config/cmdline.c:839 msgid "Disable use of files in ~/.elinks" msgstr "Ne pas utiliser les fichiers dans ~/.elinks" -#: src/config/cmdline.c:825 +#: src/config/cmdline.c:841 msgid "" "Disables creation and use of files in the user specific home\n" "configuration directory (~/.elinks). It forces default configuration\n" @@ -1579,11 +1599,11 @@ msgstr "" "Cela force l'utilisation des valeurs de configuration par défaut et\n" "désactive la sauvegarde des fichiers d'état lors de l'exécution." -#: src/config/cmdline.c:829 +#: src/config/cmdline.c:845 msgid "Disable link numbering in dump output" msgstr "Ne pas numéroter les liens en sortie (dump)" -#: src/config/cmdline.c:831 +#: src/config/cmdline.c:847 msgid "" "Prevents printing of link number in dump output.\n" "Note that this really affects only -dump, nothing else." @@ -1591,11 +1611,11 @@ msgstr "" "Supprime l'affichage des numéros de liens dans la sortie de -dump.\n" "Notez que cette option ne concerne que -dump et rien d'autre." -#: src/config/cmdline.c:834 +#: src/config/cmdline.c:850 msgid "Disable printing of link references in dump output" msgstr "Ne pas afficher les références des liens dans la sortie (dump)" -#: src/config/cmdline.c:836 +#: src/config/cmdline.c:852 msgid "" "Prevents printing of references (URIs) of document links\n" "in dump output.\n" @@ -1604,11 +1624,11 @@ msgstr "" "Supprime l'affichage des références des liens dans la sortie de -dump.\n" "Notez que cette option ne concerne que -dump et rien d'autre." -#: src/config/cmdline.c:840 +#: src/config/cmdline.c:856 msgid "Control an already running ELinks" msgstr "Contrôler une instance préexistante d'ELinks" -#: src/config/cmdline.c:842 +#: src/config/cmdline.c:858 msgid "" "Control a remote ELinks instance by passing commands to it.\n" "The option takes an additional argument containing the method\n" @@ -1642,11 +1662,11 @@ msgstr "" "\tinfoBox(text) : montre un texte dans un boîte de dialogue\n" "\txfeDoCommand(openBrowser) : ouvre une nouvelle fenêtre" -#: src/config/cmdline.c:858 +#: src/config/cmdline.c:874 msgid "Connect to session ring with given ID" msgstr "Se connecter au groupe de sessions correspondant à cet ID" -#: src/config/cmdline.c:860 +#: src/config/cmdline.c:876 msgid "" "ID of session ring this ELinks session should connect to. ELinks\n" "works in so-called session rings, whereby all instances of ELinks\n" @@ -1677,22 +1697,22 @@ msgstr "" "-no-connect. Dans tous les cas, les fichiers d'état ne sont pas modifiés\n" "sur le disque, sauf si vous utilisez conjointement l'option -touch-files." -#: src/config/cmdline.c:875 +#: src/config/cmdline.c:891 msgid "Print the source of given URLs to stdout" msgstr "Imprimer la source des URLs données sur la sortie standard" -#: src/config/cmdline.c:877 +#: src/config/cmdline.c:893 msgid "Print given URLs in source form to stdout." msgstr "" "Imprimer les URLs données dans leur forme source sur la sortie standard." -#: src/config/cmdline.c:881 +#: src/config/cmdline.c:897 msgid "Touch files in ~/.elinks when running with -no-connect/-session-ring" msgstr "" "Modifier les fichiers dans ~/.elinks avec les options -no-connect/-session-" "ring" -#: src/config/cmdline.c:883 +#: src/config/cmdline.c:899 msgid "" "When enabled, runtime state files (bookmarks, history, etc.) are\n" "written to disk, even when -no-connect or -session-ring is used.\n" @@ -1704,11 +1724,11 @@ msgstr "" "sont utilisées. Cette option n'a aucun effet si elle n'est pas\n" "utilisée en conjonction avec ces options." -#: src/config/cmdline.c:888 +#: src/config/cmdline.c:904 msgid "Verbose level" msgstr "Niveau de verbosité" -#: src/config/cmdline.c:890 +#: src/config/cmdline.c:906 msgid "" "The verbose level controls what messages are shown at\n" "start up and while running:\n" @@ -1722,15 +1742,15 @@ msgstr "" "\t1 pour ne montrer que les erreurs sérieuses et les alertes\n" "\t2 pour montrer tous les messages" -#: src/config/cmdline.c:896 +#: src/config/cmdline.c:912 msgid "Print version information and exit" msgstr "Afficher la version et quitter" -#: src/config/cmdline.c:898 +#: src/config/cmdline.c:914 msgid "Print ELinks version information and exit." msgstr "Afficher la version d'ELinks et quitter." -#: src/config/conf.c:722 +#: src/config/conf.c:938 msgid "" "## This is ELinks configuration file. You can edit it manually,\n" "## if you wish so; this file is edited by ELinks when you save\n" @@ -1742,7 +1762,7 @@ msgstr "" "## des options, mais seules les valeurs des options seront\n" "## modifiées; votre formatage et commentaires seront préservés.\n" -#: src/config/conf.c:730 +#: src/config/conf.c:946 msgid "" "## This is ELinks configuration file. You can edit it manually,\n" "## if you wish so; this file is edited by ELinks when you save\n" @@ -1760,7 +1780,7 @@ msgstr "" "## dans un fichier inclus, l'option ne sera pas considérée comme\n" "## manquante. Votre formatage et commentaires seront préservés.\n" -#: src/config/conf.c:740 +#: src/config/conf.c:956 msgid "" "## This is ELinks configuration file. You can edit it manually,\n" "## if you wish so, but keep in mind that this file is overwritten\n" @@ -1773,7 +1793,7 @@ msgstr "" "## des options, votre formatage et commentaires peuvent ne pas\n" "## être préservés.\n" -#: src/config/conf.c:751 +#: src/config/conf.c:967 msgid "" "## Obviously, if you don't like what ELinks is going to do with\n" "## this file, you can change it by altering the config.saving_style\n" @@ -1782,11 +1802,11 @@ msgstr "" "## Evidemment, si vous n'aimez pas ce que ELinks fait avec ce fichier,\n" "## vous pouvez modifier la valeur de l'option config.saving_style.\n" -#: src/config/conf.c:764 +#: src/config/conf.c:980 msgid "Automatically saved options\n" msgstr "Options sauvées automatiquement\n" -#: src/config/conf.c:776 +#: src/config/conf.c:992 msgid "Automatically saved keybindings\n" msgstr "Associations de touches sauvées automatiquement\n" @@ -1917,7 +1937,7 @@ msgstr "Impossible d'ajouter une option ici." #. accelerator_context(src/config/dialogs.c:keybinding_buttons, src/config/dialogs.c:option_buttons, src/cookies/dialogs.c:cookie_buttons, src/formhist/dialogs.c:formhist_buttons, src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query, terminal_options) #: src/config/dialogs.c:507 src/config/dialogs.c:933 src/cookies/dialogs.c:495 #: src/dialogs/options.c:236 src/formhist/dialogs.c:214 -#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1250 +#: src/protocol/bittorrent/dialogs.c:799 src/session/download.c:1227 msgid "Sa~ve" msgstr "Enre~gistrer" @@ -2218,7 +2238,7 @@ msgid "" "it takes precedence. And better do not touch this\n" "at all unless you are sure what are you doing.\n" "Note that you can also force a given protocol\n" -"to be used on a per-connection basis by using an URL\n" +"to be used on a per-connection basis by using a URL\n" "in the style of e.g. http4://elinks.cz/." msgstr "" "Essayer ou non de se connecter en IPv4 à un hôte.\n" @@ -2234,7 +2254,7 @@ msgid "" "Whether to try to connect to a host over IPv4.\n" "Do not touch this option.\n" "Note that you can also force a given protocol\n" -"to be used on a per-connection basis by using an URL\n" +"to be used on a per-connection basis by using a URL\n" "in the style of e.g. http4://elinks.cz/." msgstr "" "Essayer ou non de se connecter en IPv4 à un hôte.\n" @@ -2252,7 +2272,7 @@ msgstr "Essayer IPv6 lors des connexions" msgid "" "Whether to try to connect to a host over IPv6.\n" "Note that you can also force a given protocol\n" -"to be used on a per-connection basis by using an URL\n" +"to be used on a per-connection basis by using a URL\n" "in the style of e.g. http6://elinks.cz/." msgstr "" "Essayer ou non de se connecter en IPv6 à un hôte.\n" @@ -2671,10 +2691,10 @@ msgid "" "Whether to navigate links using tabindex specified ordering.\n" "The TABINDEX attribute in HTML elements specifies the order\n" "in which links should receive focus when using the keyboard\n" -"to navigating the document." +"to navigate the document." msgstr "" "Autoriser ou non la navigation dans les liens en utilisant\n" -"l'ordre spécifiée par l'attribut TABINDEX. Cet attribut indique\n" +"l'ordre spécifié par l'attribut TABINDEX. Cet attribut indique\n" "l'ordre dans lequel les liens doivent recevoir le focus quand le\n" "clavier est utilisé pour la navigation dans le document." @@ -2729,10 +2749,10 @@ msgstr "S #. 0 #: src/config/options.inc:353 msgid "" -"When pressing 'down' on the last link, jump at the first one, and\n" +"When pressing 'down' on the last link, jump to the first one, and\n" "vice versa." msgstr "" -"En pressant la touche BAS sur le dernier lien, sauter au premier, et\n" +"En pressant la touche 'bas' sur le dernier lien, sauter au premier, et\n" "vice versa." #: src/config/options.inc:357 @@ -2833,7 +2853,7 @@ msgstr "Montrer les dialogues de limite de recherche" #: src/config/options.inc:403 msgid "" -"Whether to show a dialog when the search hits top or bottom of the\n" +"Whether to show a dialog when the search hits the top or bottom of the\n" "document." msgstr "" "Montrer un dialogue indiquant que la recherche a atteint le haut ou\n" @@ -2961,12 +2981,13 @@ msgid "Cache information about redirects" msgstr "Cacher les informations concernant les redirections" #: src/config/options.inc:462 +#, fuzzy msgid "" "Cache even redirects sent by server (usually thru HTTP by a 302\n" "HTTP code and a Location header). This was the original behaviour\n" -"for a quite some time, but it causes problems in a situation very\n" +"for quite some time, but it causes problems in a situation very\n" "common to various web login systems - frequently, when accessing\n" -"certain location, they will redirect you to a login page if they\n" +"a certain location, they will redirect you to a login page if they\n" "don't receive an auth cookie, the login page then gives you the\n" "cookie and redirects you back to the original page, but there you\n" "have already cached redirect back to the login page! If this\n" @@ -2976,7 +2997,7 @@ msgid "" "still workaround it by clever combination of usage of reload,\n" "jumping around in session history and hitting ctrl+enter.\n" "Note that this option is checked when retrieving the information\n" -"from cache, not when saving it to cache - thus if you will enable\n" +"from cache, not when saving it to cache - thus if you enable\n" "it, even previous redirects will be taken from cache instead of\n" "asking the server." msgstr "" @@ -3179,8 +3200,9 @@ msgid "Ensure contrast" msgstr "Garantir le contraste" #: src/config/options.inc:587 -msgid "Makes sure that the back- and foreground color are never equal." -msgstr "Forcer l'utilisation de couleurs différentes pour le fond et le texte." +msgid "Makes sure that the back- and foreground colors are never equal." +msgstr "" +"Assure que les couleurs d'avant et d'arrière-plan ne sont jamais égales." #. If you change this please also change ACT_MAIN_DOCUMENT_COLORS action #. * handling. @@ -3277,8 +3299,9 @@ msgstr "Sortie (dump)" msgid "Dump output options." msgstr "Options de sortie (dump)." +#. OPT_CODEPAGE #: src/config/options.inc:640 src/config/options.inc:912 -#: src/config/opttypes.c:404 src/dialogs/document.c:163 +#: src/config/opttypes.c:481 src/dialogs/document.c:164 msgid "Codepage" msgstr "Jeu de caractères" @@ -3437,8 +3460,8 @@ msgid "Display superscripts (as ^thing)." msgstr "Afficher superscripts (comme ^chose)." #: src/config/options.inc:721 -msgid "Rendering of html link element" -msgstr "Rendu des éléments html link" +msgid "Rendering of HTML link element" +msgstr "Rendu des éléments HTML link" #: src/config/options.inc:723 msgid "" @@ -3563,7 +3586,7 @@ msgstr "Intervalle pour la sauvegarde automatique" #: src/config/options.inc:786 msgid "" "Interval at which to trigger information files in ~/.elinks\n" -"to be saved to disk if they has changed (seconds; 0 to disable)" +"to be saved to disk if they have changed (seconds; 0 to disable)" msgstr "" "Intervalle pour la sauvegarde des fichiers d'information dans ~/.elinks\n" "lorsque ceux-ci ont été modifiés (en secondes; 0 pour désactiver)" @@ -4191,7 +4214,7 @@ msgstr "Souligner les raccourcis des menus" #: src/config/options.inc:1184 msgid "" "Whether to underline hotkeys in menus to make them more\n" -"visible. Requires the underlining is enabled for the terminal." +"visible. Requires that underlining is enabled for the terminal." msgstr "" "Souligner ou non les raccourcis des menus pour les rendre\n" "plus visibles. Le soulignement doit être activé pour le terminal." @@ -4203,7 +4226,7 @@ msgstr "Souligner les raccourcis des boutons" #: src/config/options.inc:1189 msgid "" "Whether to underline button shortcuts to make them more\n" -"visible. Requires the underlining is enabled for the terminal." +"visible. Requires that underlining is enabled for the terminal." msgstr "" "Souligner ou non les raccourcis des boutons pour les rendre\n" "plus visibles. Le soulignement doit être activé pour le terminal." @@ -4299,7 +4322,7 @@ msgstr "Navigation cyclique dans les onglets" #: src/config/options.inc:1241 msgid "" -"When moving right from the last tab, jump at the first one, and\n" +"When moving right from the last tab, jump to the first one, and\n" "vice versa." msgstr "" "En cas de déplacement à droite sur le dernier onglet, saute au premier\n" @@ -4314,7 +4337,8 @@ 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:1250 src/config/opttypes.c:405 +#. OPT_LANGUAGE +#: src/config/options.inc:1250 src/config/opttypes.c:483 msgid "Language" msgstr "Langue" @@ -4473,60 +4497,68 @@ msgstr "" msgid "Read error" msgstr "Erreur de lecture" -#: src/config/opttypes.c:399 +#. The OPT_ comments below are here to be found by grep. +#. OPT_BOOL +#: src/config/opttypes.c:472 msgid "Boolean" msgstr "Booléen" -#: src/config/opttypes.c:399 +#: src/config/opttypes.c:472 msgid "[0|1]" msgstr "[0|1]" -#: src/config/opttypes.c:400 +#. OPT_INT +#: src/config/opttypes.c:474 msgid "Integer" msgstr "Entier" -#: src/config/opttypes.c:400 src/config/opttypes.c:401 +#: src/config/opttypes.c:474 src/config/opttypes.c:476 msgid "" msgstr "" -#: src/config/opttypes.c:401 +#. OPT_LONG +#: src/config/opttypes.c:476 msgid "Longint" msgstr "Entier long" -#: src/config/opttypes.c:402 +#. OPT_STRING +#: src/config/opttypes.c:478 msgid "String" msgstr "Chaîne" -#: src/config/opttypes.c:402 +#: src/config/opttypes.c:478 msgid "" msgstr "" -#: src/config/opttypes.c:404 +#: src/config/opttypes.c:481 msgid "" msgstr "" -#: src/config/opttypes.c:405 +#: src/config/opttypes.c:483 msgid "" msgstr "" -#: src/config/opttypes.c:406 +#. OPT_COLOR +#: src/config/opttypes.c:485 msgid "Color" msgstr "Couleur" -#: src/config/opttypes.c:406 +#: src/config/opttypes.c:485 msgid "" msgstr "" -#: src/config/opttypes.c:408 +#. OPT_COMMAND +#: src/config/opttypes.c:488 msgid "Special" msgstr "Spécial" -#: src/config/opttypes.c:410 +#. OPT_ALIAS +#: src/config/opttypes.c:491 msgid "Alias" msgstr "Alias" -#. tree -#: src/config/opttypes.c:413 +#. OPT_TREE +#: src/config/opttypes.c:494 msgid "Folder" msgstr "Dossier" @@ -4610,7 +4642,7 @@ msgid "Saving" msgstr "Sauvegarde" #: src/cookies/cookies.c:119 -msgid "Whether cookies should be loaded from and save to disk." +msgid "Whether cookies should be loaded from and saved to disk." msgstr "Charger/sauvegarder ou non les cookies sur disque." #: src/cookies/cookies.c:121 @@ -4682,7 +4714,7 @@ msgid "~Reject" msgstr "~Rejeter" #: src/cookies/dialogs.c:161 src/cookies/dialogs.c:357 -#: src/dialogs/document.c:177 +#: src/dialogs/document.c:178 msgid "Server" msgstr "Serveur" @@ -4799,35 +4831,35 @@ msgstr "Derni msgid "Link title (from history)" msgstr "Titre du lien (historique)" -#: src/dialogs/document.c:167 +#: src/dialogs/document.c:168 msgid "assumed" msgstr "supposé" -#: src/dialogs/document.c:170 +#: src/dialogs/document.c:171 msgid "ignoring server setting" msgstr "Configuration du serveur ignorée" -#: src/dialogs/document.c:195 +#: src/dialogs/document.c:196 msgid "Date" msgstr "Date" -#: src/dialogs/document.c:213 src/globhist/dialogs.c:67 +#: src/dialogs/document.c:214 src/globhist/dialogs.c:67 msgid "Last visit time" msgstr "Date de dernière visite" -#: src/dialogs/document.c:232 +#: src/dialogs/document.c:233 msgid "Unknown" msgstr "Inconnu" -#: src/dialogs/document.c:247 src/dialogs/document.c:316 +#: src/dialogs/document.c:248 src/dialogs/document.c:317 msgid "Header info" msgstr "Info. en-têtes" -#: src/dialogs/document.c:260 +#: src/dialogs/document.c:261 msgid "Internal header info" msgstr "Info. en-têtes internes" -#: src/dialogs/document.c:301 +#: src/dialogs/document.c:302 msgid "No header info." msgstr "Aucune information d'en-tête." @@ -4909,7 +4941,7 @@ msgid "Download manager" msgstr "Gestionnaire de téléchargements" #. name: -#: src/dialogs/exmode.c:149 +#: src/dialogs/exmode.c:147 msgid "Exmode" msgstr "Exmode" @@ -5114,7 +5146,7 @@ msgstr "~Signet pour ce document" #. accelerator_context(src/dialogs/menu.c:view_menu, tab_menu) #: src/dialogs/menu.c:249 src/dialogs/menu.c:418 -msgid "Toggle ~html/plain" +msgid "Toggle ~HTML/plain" msgstr "~Bascule html/source" #. accelerator_context(tab_menu) @@ -6309,20 +6341,22 @@ msgstr "Programme" #, no-c-format msgid "" "External viewer for this file type. '%' in this string will be\n" -"substituted by a file name." +"substituted by a file name.\n" +"Do _not_ put single- or double-quotes around the % sign." msgstr "" "Visionneur externe pour ce type de fichier. '%' dans la chaîne sera\n" -"remplacé par un nom de fichier." +"remplacé par un nom de fichier.\n" +"Ne _pas_ placer de simple ou doubles guillemets autour du signe %." -#: src/mime/backend/default.c:78 +#: src/mime/backend/default.c:79 msgid "File extension associations" msgstr "Associations des extensions de fichiers" -#: src/mime/backend/default.c:80 +#: src/mime/backend/default.c:81 msgid "Extension <-> MIME type association." msgstr "Association extension <-> type MIME." -#: src/mime/backend/default.c:84 +#: src/mime/backend/default.c:85 msgid "" "MIME-type matching this file extension ('*' is used here in place\n" "of '.')." @@ -6331,12 +6365,12 @@ msgstr "" "ici à la place de '.')." #. name: -#: src/mime/backend/default.c:215 +#: src/mime/backend/default.c:216 msgid "Option system" msgstr "Système de configuration" #. name: -#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:671 +#: src/mime/backend/mailcap.c:89 src/mime/backend/mailcap.c:685 msgid "Mailcap" msgstr "Mailcap" @@ -6407,7 +6441,7 @@ msgstr "Fichiers mime.types" #: src/mime/backend/mimetypes.c:48 msgid "" "Options for the support of mime.types files. These files\n" -"can be used to find the content type of an URL by looking at\n" +"can be used to find the content type of a URL by looking at\n" "the extension of the file name." msgstr "" "Options pour le support des fichiers mime.types. Ces fichiers\n" @@ -6433,19 +6467,19 @@ msgstr "Supprimer l'extension" msgid "Delete extension %s -> %s?" msgstr "Supprimer l'extension %s -> %s ?" -#: src/mime/dialogs.c:125 +#: src/mime/dialogs.c:126 msgid "Extension" msgstr "Extension" -#: src/mime/dialogs.c:128 +#: src/mime/dialogs.c:129 msgid "Extension(s)" msgstr "Extension(s)" -#: src/mime/dialogs.c:129 +#: src/mime/dialogs.c:130 msgid "Content-Type" msgstr "Type de contenu" -#: src/mime/dialogs.c:141 +#: src/mime/dialogs.c:142 msgid "No extensions" msgstr "Aucune extension" @@ -6740,8 +6774,8 @@ msgstr "" "ou la variable d'environnement NNTPSERVER." #: src/network/state.c:101 -msgid "Server hang up for some reason" -msgstr "Le serveur est bloqué pour une raison inconnue" +msgid "Server hung up for some reason" +msgstr "Le serveur a raccroché pour une raison inconnue" #: src/network/state.c:102 msgid "No such newsgroup" @@ -7498,7 +7532,7 @@ msgstr "Que voulez-vous faire avec le fichier '%s' ?" msgid "Information about the torrent" msgstr "Informations sur le torrent" -#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1147 +#: src/protocol/bittorrent/dialogs.c:774 src/session/download.c:1124 msgid "What to do?" msgstr "Que faire ?" @@ -7508,12 +7542,12 @@ msgid "Down~load" msgstr "Té~lécharger" #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query) -#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1256 +#: src/protocol/bittorrent/dialogs.c:802 src/session/download.c:1233 msgid "~Display" msgstr "A~fficher" #. accelerator_context(src/protocol/bittorrent/dialogs.c:bittorrent_query_callback, src/session/download.c:do_type_query) -#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1260 +#: src/protocol/bittorrent/dialogs.c:806 src/session/download.c:1237 msgid "Show ~header" msgstr "~Montrer les en-têtes" @@ -7572,7 +7606,7 @@ msgstr "Montrer les fichiers cach #: 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." +"hidden in local directory listings." msgstr "" "Si mis à faux, les fichiers dont le nom commencent par un point\n" "seront cachés lors de la visualisation du contenu d'un répertoire\n" @@ -7897,11 +7931,11 @@ msgid "" "a standard for new textmode user agents, so that the webmasters can\n" "have just a single uniform test for these if they are e.g. pushing\n" "some lite version to them automagically.\n" -"%v in the string means ELinks version\n" -"%s in the string means system identification\n" -"%t in the string means size of the terminal\n" -"%b in the string means number of bars displayed by ELinks\n" -"Use \" \" if you don't want any User-Agent header to be sent at all." +"Use \" \" if you don't want any User-Agent header to be sent at all.\n" +"%v in the string means ELinks version,\n" +"%s in the string means system identification,\n" +"%t in the string means size of the terminal,\n" +"%b in the string means number of bars displayed by ELinks." msgstr "" "Change l'identification du navigateur.\n" "Il s'agit de l'en-tête User-Agent envoyé aux serveurs lors d'une\n" @@ -7909,12 +7943,12 @@ msgstr "" "tentative silencieuse d'établir un standart pour les nouveaux\n" "navigateurs en mode texte, ainsi les webmasters ont juste\n" "à utiliser un simple et uniforme test, pour fournir une version\n" -"du document plus adaptée à ce type de navigateur:\n" -"%v dans la chaîne insère la version d'ELinks\n" -"%s dans la chaîne insère l'identifiant du système\n" -"%t dans la chaîne insère les dimensions du terminal\n" -"%b dans la chaîne insère le nombre de barres affichées par ELinks\n" -"Utilisez \" \" si vous ne voulez envoyer aucun en-tête User-Agent." +"du document plus adaptée à ce type de navigateur.\n" +"Utilisez \" \" si vous ne voulez envoyer aucun en-tête User-Agent.%v dans la " +"chaîne insère la version d'ELinks,\n" +"%s dans la chaîne insère l'identifiant du système,\n" +"%t dans la chaîne insère les dimensions du terminal,\n" +"%b dans la chaîne insère le nombre de barres affichées par ELinks." #: src/protocol/http/http.c:205 msgid "HTTPS" @@ -8118,21 +8152,21 @@ msgid "" "(i.e. contains no '.', ':' or '/' characters), and does\n" "not match any defined prefixes. Set the value to \"\" to\n" "disable use of the default template rewrite rule.\n" -"%c in the template means the current URL\n" -"%s in the template means the whole string from the goto dialog\n" -"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n" -"%% in the template means '%'" +"%c in the template means the current URL,\n" +"%s in the template means the whole string from the goto dialog,\n" +"%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s,\n" +"%% in the template means '%'." msgstr "" "Modèle d'URI utilisé par défaut quand une chaîne entrée dans\n" "la dialogue \"Atteindre l'URL\" n'est ni une URI ni un fichier\n" "(par exemple, ne contient pas les caractères '.', ':' ou '/'),\n" "et ne correspond à aucun des préfixes définis. Mettre la valeur\n" "à \"\" pour désactiver l'usage de ce modèle.\n" -"%c signifie l'URL courante\n" -"%s signifie la chaîne complète du dialogue 'Aller à'\n" +"%c signifie l'URL courante,\n" +"%s signifie la chaîne complète du dialogue 'Aller à',\n" "%0,%1,...,%9 signifient les 1ère, 2ème, ..., parties séparées par des " -"espaces de %s\n" -"%% signifie '%'" +"espaces de %s,\n" +"%% signifie '%'." #. name: #: src/protocol/rewrite/rewrite.c:372 @@ -8347,40 +8381,40 @@ msgstr "Ecraser le fichier ~original" msgid "~Resume download of the original file" msgstr "~Reprendre le téléchargement du fichier original" -#: src/session/download.c:1150 +#: src/session/download.c:1127 msgid "Unknown type" msgstr "Type inconnu" -#: src/session/download.c:1175 +#: src/session/download.c:1152 #, c-format msgid "What would you like to do with the file '%s' (type: %s%s%s)?" msgstr "Que voulez-vous faire avec le fichier '%s' (type: %s%s%s) ?" -#: src/session/download.c:1178 +#: src/session/download.c:1155 #, c-format msgid "What would you like to do with the file (type: %s%s%s)?" msgstr "Que voulez-vous faire avec le fichier (type: %s%s%s) ?" -#: src/session/download.c:1206 +#: src/session/download.c:1183 #, no-c-format msgid "Program ('%' will be replaced by the filename)" msgstr "Programme ('%' sera remplacé par le nom du fichier)" -#: src/session/download.c:1211 +#: src/session/download.c:1188 msgid "The output of the program will be shown in the tab" msgstr "La sortie du programme sera montrée dans l'onglet" -#: src/session/download.c:1215 +#: src/session/download.c:1192 msgid "Block the terminal" msgstr "Bloquer le terminal" -#: src/session/download.c:1222 +#: src/session/download.c:1199 #, c-format msgid "The file will be opened with the program '%s'." msgstr "Le fichier sera ouvert avec le programme '%s'." #. accelerator_context(src/session/download.c:do_type_query) -#: src/session/download.c:1243 +#: src/session/download.c:1220 msgid "~Open" msgstr "~Ouvrir" @@ -8395,13 +8429,13 @@ msgstr "Avertissement" #: src/session/session.c:751 msgid "" -"You have empty string in protocol.http.user_agent - this was a default value " -"in the past, substituted by default ELinks User-Agent string. However, " +"You have an empty string in protocol.http.user_agent - this was a default " +"value in the past, substituted by default ELinks User-Agent string. However, " "currently this means that NO User-Agent HEADER WILL BE SENT AT ALL - if this " -"is really what you want, set its value to \" \", otherwise please delete " -"line with this settings from your configuration file (if you have no idea " -"what I'm talking about, just do this), so that correct default setting will " -"be used. Apologies for any inconvience caused." +"is really what you want, set its value to \" \", otherwise please delete the " +"line with this setting from your configuration file (if you have no idea " +"what I'm talking about, just do this), so that the correct default setting " +"will be used. Apologies for any inconvience caused." msgstr "" "L'option protocol.http.user_agent contient une chaîne vide - c'était la " "valeur qui, dans le passé, était remplacée par la chaîne d'identification de " @@ -8417,12 +8451,12 @@ msgid "" "You have option config.saving_style set to a de facto obsolete value. The " "configuration saving algorithms of ELinks were changed from the last time " "you upgraded ELinks. Now, only those options which you actually changed are " -"saved to the configuration file, instead of just all the options. This " -"simplifies our situation greatly when we see that some option has " -"inappropriate default value or we need to change semantic of some option in " -"a subtle way. Thus, we recommend you to change the value of config." -"saving_style option to 3 in order to get the \"right\" behaviour. Apologies " -"for any inconvience caused." +"saved to the configuration file, instead of all the options. This simplifies " +"our situation greatly when we see that some option has an inappropriate " +"default value or we need to change the semantics of some option in a subtle " +"way. Thus, we recommend you change the value of config.saving_style option " +"to 3 in order to get the \"right\" behaviour. Apologies for any inconvience " +"caused." msgstr "" "L'option config.saving_style configurée a une valeur obsolète. Les " "algorithmes de sauvegarde de la configuration d'ELinks ont changé depuis la " @@ -8515,7 +8549,7 @@ msgstr "Mauvais msgid "Could not read event: %d (%s)" msgstr "Impossible de lire l'évènement: %d (%s)" -#: src/terminal/kbd.c:1177 +#: src/terminal/kbd.c:1186 #, c-format msgid "Too many bytes read from the itrm!" msgstr "Trop d'octets lus en provenance de itrm!" @@ -8878,19 +8912,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:735 +#: src/viewer/text/view.c:1042 msgid "Go to link" msgstr "Aller au lien" -#: src/viewer/text/view.c:735 +#: src/viewer/text/view.c:1042 msgid "Enter link number" msgstr "Entrez un numéro de lien" -#: src/viewer/text/view.c:1320 +#: src/viewer/text/view.c:1627 msgid "Save error" msgstr "Erreur lors de la sauvegarde" -#: src/viewer/text/view.c:1321 +#: src/viewer/text/view.c:1628 msgid "Error writing to file" msgstr "Erreur lors de l'écriture du fichier" @@ -8903,3 +8937,364 @@ msgstr "Chronom #: src/viewer/viewer.c:25 msgid "Viewer" msgstr "Visionneur" + +#~ 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 "" +#~ "Essayer ou non de se connecter en IPv4 à un hôte.\n" +#~ "Notez que si connection.try_ipv6 est activé aussi,\n" +#~ "il est prioritaire. Mieux, ne touchez pas à ça du\n" +#~ "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.cz/." + +#~ 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 "" +#~ "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.cz/." + +#~ 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 "" +#~ "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.cz/." + +#~ 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 "" +#~ "Autoriser ou non la navigation dans les liens en utilisant\n" +#~ "l'ordre spécifiée par l'attribut TABINDEX. Cet attribut indique\n" +#~ "l'ordre dans lequel les liens doivent recevoir le focus quand le\n" +#~ "clavier est utilisé pour la navigation dans le document." + +#~ msgid "" +#~ "When pressing 'down' on the last link, jump at the first one, and\n" +#~ "vice versa." +#~ msgstr "" +#~ "En pressant la touche BAS sur le dernier lien, sauter au premier, et\n" +#~ "vice versa." + +#~ msgid "" +#~ "Whether to show a dialog when the search hits top or bottom of the\n" +#~ "document." +#~ msgstr "" +#~ "Montrer un dialogue indiquant que la recherche a atteint le haut ou\n" +#~ "le bas du document." + +#~ 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 "" +#~ "Cacher aussi les pages redirigées par le serveur (habituellement\n" +#~ "grâce au code HTTP 302 et un en-tête Location). Ceci était le\n" +#~ "fonctionnement initial, mais il pose des problèmes pour les\n" +#~ "pages web comportant un système d'authentification." + +#~ msgid "Makes sure that the back- and foreground color are never equal." +#~ msgstr "" +#~ "Forcer l'utilisation de couleurs différentes pour le fond et le texte." + +#~ msgid "Rendering of html link element" +#~ msgstr "Rendu des éléments html link" + +#~ 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 "" +#~ "Intervalle pour la sauvegarde des fichiers d'information dans ~/.elinks\n" +#~ "lorsque ceux-ci ont été modifiés (en secondes; 0 pour désactiver)" + +#~ msgid "" +#~ "Whether to underline hotkeys in menus to make them more\n" +#~ "visible. Requires the underlining is enabled for the terminal." +#~ msgstr "" +#~ "Souligner ou non les raccourcis des menus pour les rendre\n" +#~ "plus visibles. Le soulignement doit être activé pour le terminal." + +#~ msgid "" +#~ "Whether to underline button shortcuts to make them more\n" +#~ "visible. Requires the underlining is enabled for the terminal." +#~ msgstr "" +#~ "Souligner ou non les raccourcis des boutons pour les rendre\n" +#~ "plus visibles. Le soulignement doit être activé pour le terminal." + +#~ msgid "" +#~ "When moving right from the last tab, jump at the first one, and\n" +#~ "vice versa." +#~ msgstr "" +#~ "En cas de déplacement à droite sur le dernier onglet, saute au premier\n" +#~ "et vice-versa." + +#~ msgid "Whether cookies should be loaded from and save to disk." +#~ msgstr "Charger/sauvegarder ou non les cookies sur disque." + +#~ msgid "Toggle ~html/plain" +#~ msgstr "~Bascule html/source" + +#~ msgid "" +#~ "External viewer for this file type. '%' in this string will be\n" +#~ "substituted by a file name." +#~ msgstr "" +#~ "Visionneur externe pour ce type de fichier. '%' dans la chaîne sera\n" +#~ "remplacé par un nom de fichier." + +#~ 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 "" +#~ "Options pour le support des fichiers mime.types. Ces fichiers\n" +#~ "peuvent être consultés pour trouver le type de contenu associé\n" +#~ "à une URL en fonction de l'extension du nom de fichier." + +#~ msgid "Server hang up for some reason" +#~ msgstr "Le serveur est bloqué pour une raison inconnue" + +#~ msgid "" +#~ "When set to false, files with name starting with a dot will be\n" +#~ "hidden in local directories listing." +#~ msgstr "" +#~ "Si mis à faux, les fichiers dont le nom commencent par un point\n" +#~ "seront cachés lors de la visualisation du contenu d'un répertoire\n" +#~ "local." + +#~ 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 e.g. pushing\n" +#~ "some lite version to them automagically.\n" +#~ "%v in the string means ELinks version\n" +#~ "%s in the string means system identification\n" +#~ "%t in the string means size of the terminal\n" +#~ "%b in the string means number of bars displayed by ELinks\n" +#~ "Use \" \" if you don't want any User-Agent header to be sent at all." +#~ msgstr "" +#~ "Change l'identification du navigateur.\n" +#~ "Il s'agit de l'en-tête User-Agent envoyé aux serveurs lors d'une\n" +#~ "requête. Le mot clé 'textmode' dans le premier champ est notre\n" +#~ "tentative silencieuse d'établir un standart pour les nouveaux\n" +#~ "navigateurs en mode texte, ainsi les webmasters ont juste\n" +#~ "à utiliser un simple et uniforme test, pour fournir une version\n" +#~ "du document plus adaptée à ce type de navigateur:\n" +#~ "%v dans la chaîne insère la version d'ELinks\n" +#~ "%s dans la chaîne insère l'identifiant du système\n" +#~ "%t dans la chaîne insère les dimensions du terminal\n" +#~ "%b dans la chaîne insère le nombre de barres affichées par ELinks\n" +#~ "Utilisez \" \" si vous ne voulez envoyer aucun en-tête User-Agent." + +#~ msgid "" +#~ "Default URI template used when the string entered in\n" +#~ "the goto dialog does not appear to be a URI or a filename\n" +#~ "(i.e. contains no '.', ':' or '/' characters), and does\n" +#~ "not match any defined prefixes. Set the value to \"\" to\n" +#~ "disable use of the default template rewrite rule.\n" +#~ "%c in the template means the current URL\n" +#~ "%s in the template means the whole string from the goto dialog\n" +#~ "%0,%1,...,%9 mean the 1st,2nd,...,10th space-delimited part of %s\n" +#~ "%% in the template means '%'" +#~ msgstr "" +#~ "Modèle d'URI utilisé par défaut quand une chaîne entrée dans\n" +#~ "la dialogue \"Atteindre l'URL\" n'est ni une URI ni un fichier\n" +#~ "(par exemple, ne contient pas les caractères '.', ':' ou '/'),\n" +#~ "et ne correspond à aucun des préfixes définis. Mettre la valeur\n" +#~ "à \"\" pour désactiver l'usage de ce modèle.\n" +#~ "%c signifie l'URL courante\n" +#~ "%s signifie la chaîne complète du dialogue 'Aller à'\n" +#~ "%0,%1,...,%9 signifient les 1ère, 2ème, ..., parties séparées par des " +#~ "espaces de %s\n" +#~ "%% signifie '%'" + +#~ 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 "" +#~ "L'option protocol.http.user_agent contient une chaîne vide - c'était la " +#~ "valeur qui, dans le passé, était remplacée par la chaîne d'identification " +#~ "de client par défaut d'ELinks (User-Agent string). Toutefois, maintenant " +#~ "cela signifie qu'AUCUN en-tête User-Agent ne doit être envoyé - si c'est " +#~ "vraiment ce que vous désirez, utilisez la valeur \" \", sinon effacer la " +#~ "ligne concernée dans le fichier de configuration, ainsi la configuration " +#~ "par défaut sera utilisée. Si vous n'avez aucune idée de quoi nous parlons " +#~ "alors faites juste ça. Toutes nos excuses pour ce désagrément." + +#~ 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 "" +#~ "L'option config.saving_style configurée a une valeur obsolète. Les " +#~ "algorithmes de sauvegarde de la configuration d'ELinks ont changé depuis " +#~ "la dernière mise à jour. Maintenant, seules les options qui ont " +#~ "effectivement changées sont sauvegardées. Cela simplifie grandement les " +#~ "choses lorsque des options ont une mauvaise valeur par défaut ou lors de " +#~ "subtils changements dans les options. Nous vous recommandons d'utiliser " +#~ "la valeur 3 pour l'option config.saving_style dans le but d'obtenir un " +#~ "fonctionnement correct. Toutes nos excuses pour l'éventuel désagrément " +#~ "causé." + +#~ msgid "" +#~ "What the different LEDs indicate:\n" +#~ "\n" +#~ "[SIJP--]\n" +#~ " |||||`- Download in progress\n" +#~ " ||||`-- Unused\n" +#~ " |||`--- A JavaScript pop-up window was blocked\n" +#~ " ||`---- A JavaScript error has occurred\n" +#~ " |`----- The state of insert mode for text-input form-fields\n" +#~ " | 'i' means modeless, 'I' means insert mode is on\n" +#~ " `------ Whether an SSL connection was used\n" +#~ "\n" +#~ "'-' generally indicates that the LED is off." +#~ msgstr "" +#~ "Ce qu'indiquent les différents indicateurs LED:\n" +#~ "\n" +#~ "[SIJP--]\n" +#~ " |||||`- Téléchargement en cours\n" +#~ " ||||`-- Inutilisé\n" +#~ " |||`--- Une fenêtre Javascript a été bloquée\n" +#~ " ||`---- Une erreur JavaScript s'est produite\n" +#~ " |`----- Etat du mode insertion pour les champs texte\n" +#~ " | 'i' sans mode, 'I' mode insertion activé\n" +#~ " `------ Connexion SSL utilisée\n" +#~ "\n" +#~ "'-' indique généralement que la LED est inactive." + +#~ msgid "Cache mode" +#~ msgstr "Mode de cache" + +#~ msgid "never use cache entry" +#~ msgstr "ne jamais utiliser l'entrée du cache" + +#~ msgid "always use cache entry" +#~ msgstr "toujours utiliser l'entrée du cache" + +#~ msgid "Show information about current link" +#~ msgstr "Montrer les infos concernant le lien courant" + +#~ msgid "Combining characters" +#~ msgstr "Combiner les caractères" + +#~ msgid "" +#~ "Enable combining characters. It works only with the xterm in UTF-8 mode." +#~ msgstr "" +#~ "Active la combinaison de caractères.\n" +#~ "Cela ne fonctionne qu'avec xterm en mode UTF-8." + +#~ msgid "Time since loading" +#~ msgstr "Ancienneté" + +#~ msgid "Ignore \"display: none\"" +#~ msgstr "Ignorer \"display: none\"" + +#~ msgid "" +#~ "When enabled, elements are rendered, even when their display\n" +#~ "property has the value \"none\". Because ELinks's CSS support is\n" +#~ "still very incomplete, this setting can improve the way that some\n" +#~ "documents are rendered." +#~ msgstr "" +#~ "Si activé, les éléments sont visibles, même si leur propriété\n" +#~ "display a la valeur \"none\". Comme le support des CSS dans ELinks\n" +#~ "est encore très incomplet, cette option améliore un peu les choses\n" +#~ "avec certains documents." + +#~ msgid "Media types" +#~ msgstr "Types de medias CSS" + +#~ msgid "" +#~ "CSS media types that ELinks claims to support, separated with\n" +#~ "commas. The \"all\" type is implied. Currently, only ASCII\n" +#~ "characters work reliably here. See CSS2 section 7:\n" +#~ "http://www.w3.org/TR/1998/REC-CSS2-19980512/media.html" +#~ msgstr "" +#~ "Types de medias CSS qu'ELinks revendiquera supporter, séparés\n" +#~ "par des virgules. Le type \"all\" est implicite. Actuellement,\n" +#~ "seuls les caractères ASCII fonctionnent correctement ici.\n" +#~ "Voir CSS2 section 7:\n" +#~ "http://www.w3.org/TR/1998/REC-CSS2-19980512/media.html" + +#~ msgid "Enable on-the-fly compression" +#~ msgstr "Activer la décompression à la volée" + +#~ msgid "" +#~ "If enabled, the capability to receive compressed content (gzip and/or\n" +#~ "bzip2) is announced to the server, which usually sends the reply\n" +#~ "compressed, thus saving some bandwidth at slight CPU expense.\n" +#~ "\n" +#~ "If ELinks displays a incomplete page or garbage, try disabling this\n" +#~ "option. If that helps, there may be a bug in the decompression part\n" +#~ "of ELinks. Please report such bugs.\n" +#~ "\n" +#~ "If ELinks has been compiled without compression support, this option\n" +#~ "has no effect. To check the supported features, see Help -> About." +#~ msgstr "" +#~ "Si actif, la capacité de recevoir du contenu compressé (gzip et/ou " +#~ "bzip2)\n" +#~ "est annoncée au serveur, qui habituellement enverra une réponse " +#~ "compressée,\n" +#~ "épargnant ainsi de la bande passante réseau au prix d'un usage plus " +#~ "grand\n" +#~ "du temps processeur.\n" +#~ "\n" +#~ "Si ELinks affiche une page incomplète ou corrompue, essayez de " +#~ "désactiver\n" +#~ "cette option. Si cela fonctionne, il y a peut-être un bogue dans le code\n" +#~ "d'ELinks concernant la décompression. Merci de rapporter ces erreurs.\n" +#~ "\n" +#~ "Si ELinks a été compilé sans le support de la compression, cette option\n" +#~ "n'a pas d'effet. Pour vérifier les fonctionnalités supportées, \n" +#~ "voir Aide -> A propos." + +#~ msgid "~Link info" +#~ msgstr "Info sur le ~lien" From 08894be379e3ae92b0fdc40e82fd6cae2f69abe3 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Tue, 25 Mar 2008 22:35:06 +0100 Subject: [PATCH 06/16] bittorrent: Overflow occuring when a piece was rejected. --- src/protocol/bittorrent/piececache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocol/bittorrent/piececache.c b/src/protocol/bittorrent/piececache.c index 60431464..7eac3db3 100644 --- a/src/protocol/bittorrent/piececache.c +++ b/src/protocol/bittorrent/piececache.c @@ -931,7 +931,7 @@ add_to_bittorrent_piece_cache(struct bittorrent_peer_connection *peer, cache->rejected_pieces++; mem_mmap_free(entry->data, piece_length); entry->data = NULL; - update_bittorrent_connection_stats(bittorrent, (off_t) -piece_length, 0, 0); + update_bittorrent_connection_stats(bittorrent, -(off_t)piece_length, 0, 0); set_bittorrent_piece_cache_remaining(cache, piece, 1); if (bittorrent->mode == BITTORRENT_MODE_END_GAME) bittorrent->mode = BITTORRENT_MODE_NORMAL; From 179927071930810d59cdd4f6d4a68c3e0a1cbe3f Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 29 Mar 2008 15:29:08 +0100 Subject: [PATCH 07/16] pl.po: Small fixes. --- po/pl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pl.po b/po/pl.po index 495dd31a..089cfda0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7552,7 +7552,7 @@ msgstr[2] "%u karmiÄ…cych" #, c-format msgid "%u available" msgid_plural "%u available" -msgstr[0] "%u dostÄ™pny" +msgstr[0] "%u dostÄ™pni" msgstr[1] "%u dostÄ™pne" msgstr[2] "%u dostÄ™pnych" @@ -7584,7 +7584,7 @@ msgstr "1:1 w" #. Sharing: #: src/protocol/bittorrent/dialogs.c:378 msgid "Sharing" -msgstr "Dzielenie" +msgstr "Dzielenie siÄ™" #: src/protocol/bittorrent/dialogs.c:387 msgid "uploaded" From 94ce0340739d17d193b3387de00e4840156da7b8 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 29 Mar 2008 15:43:23 +0100 Subject: [PATCH 08/16] pl.po: Previous commit was wrong. --- po/pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pl.po b/po/pl.po index 089cfda0..6db2c2cb 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: 2008-01-29 18:58+0100\n" -"PO-Revision-Date: 2008-01-29 19:30+0100\n" +"PO-Revision-Date: 2008-03-29 16:00+0100\n" "Last-Translator: Witold Filipczyk \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -7552,8 +7552,8 @@ msgstr[2] "%u karmiÄ…cych" #, c-format msgid "%u available" msgid_plural "%u available" -msgstr[0] "%u dostÄ™pni" -msgstr[1] "%u dostÄ™pne" +msgstr[0] "%u dostÄ™pny" +msgstr[1] "%u dostÄ™pni" msgstr[2] "%u dostÄ™pnych" #: src/protocol/bittorrent/dialogs.c:340 From 5e88382033710681746816b843e4e667f4c75910 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 29 Mar 2008 16:23:23 +0100 Subject: [PATCH 09/16] Polish translation was updated. --- po/pl.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/po/pl.po b/po/pl.po index 6db2c2cb..763a2e85 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7347,33 +7347,34 @@ msgid "" "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 "" -"Maksymalny współczynnik dzielenia do osiÄ…gniÄ™cia przed zakoÅ„czeniem\n" -"karmienia. Współczynnik dzielenia jest obliczany jako liczba bajtów\n" -"wysÅ‚anych podzielona przez liczbÄ™ bajtów pobranych. Wartość powinna\n" -"być wartoÅ›ciÄ… double pomiÄ™dzy 0.0 a 1.0 wÅ‚Ä…cznie.\n" -"Należy ustawić na 1.0 aby przynajmniej wysÅ‚ać peÅ‚nÄ… kopiÄ™ wszystkich\n" -"danych, a na 0.0 aby mieć nieograniczony współczynnik dzielenia." +"Minimalny współczynnik dzielenia siÄ™ do osiÄ…gniÄ™cia przed\n" +"zakoÅ„czeniem karmienia. Współczynnik dzielenia siÄ™ jest\n" +"obliczany jako liczba bajtów wysÅ‚anych podzielona przez liczbÄ™\n" +"bajtów pobranych. Wartość powinna być wartoÅ›ciÄ… double pomiÄ™dzy\n" +"0.0 a 1.0 wÅ‚Ä…cznie. Należy ustawić na 1.0 aby przynajmniej wysÅ‚ać\n" +"peÅ‚nÄ… kopiÄ™ wszystkich danych, a na 0.0 aby mieć nieograniczony\n" +"współczynnik dzielenia siÄ™." #: src/protocol/bittorrent/bittorrent.c:163 msgid "Maximum number of uploads" -msgstr "Maksymalna liczba Å›ciÄ…ganych plików" +msgstr "Maksymalna liczba poÅ‚Ä…czeÅ„ wysyÅ‚ajÄ…cych" #: src/protocol/bittorrent/bittorrent.c:165 msgid "The maximum number of uploads to allow at once." -msgstr "Maksymalna liczba dozwolonych plików do wysyÅ‚ania jednoczeÅ›nie." +msgstr "Maksymalna liczba poÅ‚Ä…czeÅ„ wysyÅ‚ajÄ…cych dozwolonych natychmiast." #. The number of uploads to fill out to with extra optimistic unchokes #: src/protocol/bittorrent/bittorrent.c:168 msgid "Minimum number of uploads" -msgstr "Maksymalna liczba wysyÅ‚anych plików" +msgstr "Minimalna liczba poÅ‚Ä…czeÅ„ wysyÅ‚ajÄ…cych" #: src/protocol/bittorrent/bittorrent.c:170 msgid "" "The minimum number of uploads which should at least\n" "be used for new connections." msgstr "" -"Maksymalna liczba wysyÅ‚anych plików, które powinny przynajmniej\n" -"być używane dla nowych poÅ‚Ä…czeÅ„." +"Minimalna liczba poÅ‚Ä…czeÅ„ wysyÅ‚ajÄ…cych, która powinna\n" +"być użyta dla nowych poÅ‚Ä…czeÅ„." #: src/protocol/bittorrent/bittorrent.c:174 msgid "Keepalive interval" @@ -8807,7 +8808,7 @@ msgstr "Pole tekstowe" #: src/viewer/text/form.c:1827 msgid "File upload" -msgstr "Åadowanie pliku" +msgstr "WysyÅ‚anie pliku" #: src/viewer/text/form.c:1829 msgid "Password field" From f994ef4335fe865856df1dfe251e060cfc14a9fe Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Thu, 27 Mar 2008 08:52:45 +0100 Subject: [PATCH 10/16] mkalldirs: Reset ret when errno is EEXIST. This bug was revelead while using bittorrent. For filenames started with a dot and two slashes .// the open_bittorrent_file returned -1 and set errno to EEXIST. --- src/util/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/file.c b/src/util/file.c index 1e4020b9..8afa5a0b 100644 --- a/src/util/file.c +++ b/src/util/file.c @@ -619,8 +619,10 @@ mkalldirs(const unsigned char *path) p[pos] = separator; - if (ret < 0 && errno != EEXIST) - break; + if (ret < 0) { + if (errno != EEXIST) break; + ret = 0; + } } fmem_free(p); From 8995fb2be537757e79e4ad7c9574fc253fdd938e Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 29 Mar 2008 19:24:08 +0100 Subject: [PATCH 11/16] pl.po: Changed hotkeys to be consistent with 0.13.GIT. --- po/pl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pl.po b/po/pl.po index 763a2e85..c8de27b4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5309,7 +5309,7 @@ msgstr "~Przekaż URI karty do zewnÄ™trznego polecenia" #. accelerator_context(src/dialogs/menu.c:file_menu) #: src/dialogs/menu.c:310 msgid "Open new ~tab" -msgstr "Otwó~rz w nowej karcie" +msgstr "O~twórz w nowej karcie" #. accelerator_context(src/dialogs/menu.c:file_menu) #: src/dialogs/menu.c:311 @@ -5384,7 +5384,7 @@ msgstr "P~owÅ‚oka systemowa" #. accelerator_context(src/dialogs/menu.c:file_menu) #: src/dialogs/menu.c:395 msgid "Resize t~erminal" -msgstr "ZmieÅ„ rozmiar ~terminala" +msgstr "ZmieÅ„ ~rozmiar terminala" #. accelerator_context(src/dialogs/menu.c:view_menu) #: src/dialogs/menu.c:413 From 6302ee5e13b7667080dbe0d14e8b7c72e7852ef4 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 29 Mar 2008 19:45:20 +0100 Subject: [PATCH 12/16] Test commit. --- po/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/pl.po b/po/pl.po index c8de27b4..74ad3649 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: 2008-01-29 18:58+0100\n" -"PO-Revision-Date: 2008-03-29 16:00+0100\n" +"PO-Revision-Date: 2008-03-29 19:30+0100\n" "Last-Translator: Witold Filipczyk \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" From 1ab670cfce797899235633842d95833efe5c178c Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Mon, 28 Apr 2008 11:03:40 +0300 Subject: [PATCH 13/16] NEWS: the elinks-0.11 branch is at 0.11.4rc1.GIT already --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9a314ca7..7476701c 100644 --- a/NEWS +++ b/NEWS @@ -294,7 +294,7 @@ have already been considered. * Really retry forever when connection.retries = 0 ////////////////////////////////////////////////////////////////////// -ELinks 0.11.4rc0.GIT now: +ELinks 0.11.4rc1.GIT now: ------------------------- To be released as 0.11.4. From 8a02678bedb04a4b212b601223a4038c48995af7 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Fri, 18 Jan 2008 21:15:28 +0100 Subject: [PATCH 14/16] fsp: Fixed a serious bug. *fresult pointed to nowhere. On FreeBSD *fresult == NULL and directories weren't displayed. Check also if safe_write writes all data. (cherry picked from commit 06bcc48487676e0ea113ed7ace63798dc0562694) --- src/protocol/fsp/fsp.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c index efa6e2e4..58aeda82 100644 --- a/src/protocol/fsp/fsp.c +++ b/src/protocol/fsp/fsp.c @@ -171,7 +171,8 @@ display_entry(const FSP_RDENTRY *fentry, const unsigned char dircolor[]) static void sort_and_display_entries(FSP_DIR *dir, const unsigned char dircolor[]) { - FSP_RDENTRY fentry, *fresult, *table = NULL; + FSP_RDENTRY fentry, tmp, *table = NULL; + FSP_RDENTRY *fresult = &tmp; int size = 0; int i; @@ -228,7 +229,8 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri) if (get_opt_bool("protocol.fsp.sort")) { sort_and_display_entries(dir, dircolor); } else { - FSP_RDENTRY fentry, *fresult; + FSP_RDENTRY fentry, tmp; + FSP_RDENTRY *fresult = &tmp; while (!fsp_readdir_native(dir, &fentry, &fresult)) { if (!fresult) break; @@ -318,10 +320,18 @@ do_fsp(struct connection *conn) (off_print_T) sb.st_size); fclose(stderr); - while ((r = fsp_fread(buf, 1, READ_SIZE, file)) > 0) - if (safe_write(STDOUT_FILENO, buf, r) <= 0) - break; + while ((r = fsp_fread(buf, 1, READ_SIZE, file)) > 0) { + int off = 0; + while (r) { + int w = safe_write(STDOUT_FILENO, buf + off, r); + + if (w == -1) goto out; + off += w; + r -= w; + } + } +out: fsp_fclose(file); fsp_close_session(ses); exit(0); From 2463c1b2f8196b274a844ae5500756abc51c224d Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sat, 19 Jan 2008 10:55:11 +0200 Subject: [PATCH 15/16] Bug 939: Documented the fix. The fix itself is in the parent commit. (cherry picked from commit 4c390589ea28eeba020357fd89841b0fc2be33b3, rewriting the NEWS entry because the bug also occurred on Debian) --- NEWS | 1 + src/protocol/fsp/fsp.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/NEWS b/NEWS index 7476701c..1dac6b33 100644 --- a/NEWS +++ b/NEWS @@ -320,6 +320,7 @@ To be released as 0.11.4. * bug 712: GnuTLS works on https://www-s.uiuc.edu/[] * fix active and passive FTP over IPv6 * bug 938: elinks -remote no longer needs a controlling tty +* bug 939: fix FSP directory listing (some compiler options left it empty) * bug 978: Python's webbrowser.open_new_tab(URL) works since now * minor bug 54, Debian bug 338402: don't force the terminal to 8 bits with no parity, and don't disable XON/XOFF flow control either diff --git a/src/protocol/fsp/fsp.c b/src/protocol/fsp/fsp.c index 58aeda82..cd62fbf8 100644 --- a/src/protocol/fsp/fsp.c +++ b/src/protocol/fsp/fsp.c @@ -171,6 +171,13 @@ display_entry(const FSP_RDENTRY *fentry, const unsigned char dircolor[]) static void sort_and_display_entries(FSP_DIR *dir, const unsigned char dircolor[]) { + /* fsp_readdir_native in fsplib 0.9 and earlier requires + * the third parameter to point to a non-null pointer + * even though it does not dereference that pointer + * and overwrites it with another one anyway. + * http://sourceforge.net/tracker/index.php?func=detail&aid=1875210&group_id=93841&atid=605738 + * Work around the bug by using non-null &tmp. + * Nothing will actually read or write tmp. */ FSP_RDENTRY fentry, tmp, *table = NULL; FSP_RDENTRY *fresult = &tmp; int size = 0; @@ -229,6 +236,8 @@ fsp_directory(FSP_SESSION *ses, struct uri *uri) if (get_opt_bool("protocol.fsp.sort")) { sort_and_display_entries(dir, dircolor); } else { + /* &tmp works around a bug in fsplib 0.9 or earlier. + * See sort_and_display_entries for details. */ FSP_RDENTRY fentry, tmp; FSP_RDENTRY *fresult = &tmp; From be3d0d1be0a057bf8f379904efcb3ac43f349a68 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Mon, 28 Apr 2008 22:05:17 +0300 Subject: [PATCH 16/16] NEWS: temporarily mention bug 991 --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 1dac6b33..9b68f4f4 100644 --- a/NEWS +++ b/NEWS @@ -242,6 +242,7 @@ have already been considered. - fix compilation under gcc 4.x. Backported from gentoo portage. Commit bcabd8b7951f3319199811088e607501296ee573 in ELinks 0.11.3. - enhancement: avoid compilation of vernum.c in 'make install' + - bug 991: quote spaces in file names passed to external handlers * Reverted changes: - (new feature) document.write, reverted in 2c087e52e74528a720621186b91880463e039d50