diff options
120 files changed, 16271 insertions, 13437 deletions
@@ -4,6 +4,7 @@ .autotools .cproject .deps/ +.idea/ .project .rsyncs .settings/ @@ -5,12 +5,60 @@ Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Copyright (C) 2005 - 2012 Sunil Shetye Copyright (C) 2005 - 2021 Matthias Andree -If enabled at configure/compile time, the following clause applies: +Some older portions not explicitly mentioned above are copyrighted by +Carl E. Harris, George M. Sipe, Graham Wilson, Matthias Andree and Sunil Shetye. + + +SSL library considerations +~~~~~~~~~~~~~~~~~~~~~~~~~~ +If linking against OpenSSL versions under dual OpenSSL/SSLeay license (f. i. +OpenSSL 1.1.1x and older) is enabled at configure/compile time, the +following clause applies: | This product includes software developed by the OpenSSL Project | for use in the OpenSSL Toolkit. (http://www.openssl.org/) -Some older portions not explicitly mentioned above are copyrighted by -Carl E. Harris, George M. Sipe, Graham Wilson, Matthias Andree and Sunil Shetye. +|Linking fetchmail statically or dynamically with other modules is making +|a combined work based on fetchmail. Thus, the terms and conditions +|of the GNU General Public License cover the whole combination. +| +|In addition, as a special exception, the copyright holders of fetchmail +|give you permission to combine fetchmail with free software programs or +|libraries that are released with code included in the standard release of +|OpenSSL under the OpenSSL or SSLeay license (or modified versions of such +|code, with unchanged license). +| +|You may copy and distribute such a system following the terms of the GNU GPL +|for fetchmail and the licenses of the other code concerned, +|provided that you include the source code of that other code when and as the +|GNU GPL requires distribution of source code. +| +|Note that people who make modified versions of fetchmail are not obligated to +|grant this special exception for their modified versions; it is their choice +|whether to do so. The GNU General Public License gives permission to release +|a modified version without this exception; this exception also makes it +|possible to release a modified version which carries forward this exception. +| +|In short: +Specific permission is granted for the GPLed code in this distribution to +be linked to OpenSSL without invoking GPL clause 2(b). + +Note that this permission applies to OpenSSL, and OpenSSL only. + +The Free Software Foundation asserts that a GPL v2 clause 2b exception is +required even for dynamically linked binaries. See +https://www.gnu.org/licenses/gpl-faq.en.html#GPLStaticVsDynamic + + +If linking against OpenSSL versions licensed under the Apache License version +2.0 (for instance, OpenSSL 3.0.x), note that this library is incompatible with +the GPLv2, so that effectively, distributors need to use the "or any later version" +grant in the GPLv2 and apply the GPLv3 which is considered compatible with the +Apache License 2.0 by the FSF and the ASF. + + +Fetchmail can be linked against wolfSSL, +which is under GNU General Public License v2, or optionally, any later version. +~~~~~~~~~~~~~~~~~~~~~~~~~~ The support for SMB authentication is copyright by Andrew Tridgell and is under GPL version 2 (or any later version). Andrew Tridgell has @@ -47,7 +95,7 @@ Stenberg and also under a liberal license: | MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND | CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. -The libesmtp/* files functions are (C) by Brian Stafford, see the respective +The libesmtp/* files functions are (C) by Brian Stafford, see the respective file headers for details (LGPL v2.1 or later). The KAME/* files are (C) Copyright (C) 1995, 1996, 1997, and 1998 WIDE @@ -56,9 +104,6 @@ Project, see the respective file headers for details. All other code in the distribution incorporates the copy of GPL version 2 below by reference. -Specific permission is granted for the GPLed code in this distribution to -be linked to OpenSSL without invoking GPL clause 2(b). - ------------------------------------------------------------------------------- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -1,4 +1,4 @@ -# Doxyfile 1.8.15 +# Doxyfile 1.8.20 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -38,7 +38,7 @@ PROJECT_NAME = fetchmail # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = legacy_63 +PROJECT_NUMBER = legacy_64 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -187,6 +187,16 @@ SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO +# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line +# such as +# /*************** +# as being the beginning of a Javadoc-style comment "banner". If set to NO, the +# Javadoc-style will behave just like regular comments and it will not be +# interpreted by doxygen. +# The default value is: NO. + +JAVADOC_BANNER = NO + # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first # line (until the first dot) of a Qt-style comment as the brief description. If # set to NO, the Qt-style will behave just like regular Qt-style comments (thus @@ -207,6 +217,14 @@ QT_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO +# By default Python docstrings are displayed as preformatted text and doxygen's +# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the +# doxygen's special commands can be used and the contents of the docstring +# documentation blocks is shown as doxygen documentation. +# The default value is: YES. + +PYTHON_DOCSTRING = YES + # If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the # documentation from any documented member that it re-implements. # The default value is: YES. @@ -243,12 +261,6 @@ TAB_SIZE = 8 ALIASES = -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources # only. Doxygen will then generate output that is more tailored for C. For # instance, some of the names that are used will be different. The list of all @@ -289,14 +301,14 @@ OPTIMIZE_OUTPUT_SLICE = NO # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, +# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL, # Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: # FortranFree, unknown formatted Fortran: Fortran. In the later case the parser # tries to guess whether the code is fixed or free formatted code, this is the -# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is -# Fortran), use: inc=Fortran f=C. +# default for Fortran type files). For instance to make doxygen treat .inc files +# as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. # # Note: For files without extension you can use no_extension as a placeholder. # @@ -319,7 +331,7 @@ MARKDOWN_SUPPORT = YES # to that level are automatically included in the table of contents, even if # they do not have an id attribute. # Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 0. +# Minimum value: 0, maximum value: 99, default value: 5. # This tag requires that the tag MARKDOWN_SUPPORT is set to YES. TOC_INCLUDE_HEADINGS = 0 @@ -435,6 +447,19 @@ TYPEDEF_HIDES_STRUCT = NO LOOKUP_CACHE_SIZE = 0 +# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use +# during processing. When set to 0 doxygen will based this on the number of +# cores available in the system. You can set it explicitly to a value larger +# than 0 to get more control over the balance between CPU load and processing +# speed. At this moment only the input processing can be done using multiple +# threads. Since this is still an experimental feature the default is set to 1, +# which efficively disables parallel processing. Please report any issues you +# encounter. Generating dot graphs in parallel is controlled by the +# DOT_NUM_THREADS setting. +# Minimum value: 0, maximum value: 32, default value: 1. + +NUM_PROC_THREADS = 0 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -455,6 +480,12 @@ EXTRACT_ALL = NO EXTRACT_PRIVATE = NO +# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual +# methods of a class will be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIV_VIRTUAL = NO + # If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal # scope will be included in the documentation. # The default value is: NO. @@ -509,8 +540,8 @@ HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO # If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO, these declarations will be -# included in the documentation. +# declarations. If set to NO, these declarations will be included in the +# documentation. # The default value is: NO. HIDE_FRIEND_COMPOUNDS = NO @@ -533,7 +564,7 @@ INTERNAL_DOCS = NO # names in lower-case letters. If set to YES, upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ # in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. +# (including Cygwin) and Mac users are advised to set this option to NO. # The default value is: system dependent. CASE_SENSE_NAMES = YES @@ -825,8 +856,10 @@ INPUT_ENCODING = UTF-8 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, -# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, -# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice. +# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment), +# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen +# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, +# *.vhdl, *.ucf, *.qsf and *.ice. FILE_PATTERNS = *.c \ *.h \ @@ -1043,6 +1076,38 @@ USE_HTAGS = NO VERBATIM_HEADERS = YES +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse_libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + +# If clang assisted parsing is enabled you can provide the clang parser with the +# path to the directory containing a file called compile_commands.json. This +# file is the compilation database (see: +# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the +# options used when the source files were built. This is equivalent to +# specifying the "-p" option to a clang tool, such as clang-check. These options +# will then be passed to the parser. Any options specified with CLANG_OPTIONS +# will be added as well. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse_libclang=ON option for CMake. + +CLANG_DATABASE_PATH = + #--------------------------------------------------------------------------- # Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- @@ -1199,9 +1264,9 @@ HTML_TIMESTAMP = YES # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML # documentation will contain a main index with vertical navigation menus that -# are dynamically created via Javascript. If disabled, the navigation index will +# are dynamically created via JavaScript. If disabled, the navigation index will # consists of multiple levels of tabs that are statically embedded in every HTML -# page. Disable this option to support browsers that do not have Javascript, +# page. Disable this option to support browsers that do not have JavaScript, # like the Qt help browser. # The default value is: YES. # This tag requires that the tag GENERATE_HTML is set to YES. @@ -1307,7 +1372,7 @@ CHM_FILE = HHC_LOCATION = # The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the master .chm file (NO). +# (YES) or that it should be included in the main .chm file (NO). # The default value is: NO. # This tag requires that the tag GENERATE_HTMLHELP is set to YES. @@ -1352,7 +1417,7 @@ QCH_FILE = # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help # Project output. For more information please see Qt Help Project / Namespace -# (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). +# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1360,7 +1425,7 @@ QHP_NAMESPACE = org.doxygen.Project # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt # Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual- +# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual- # folders). # The default value is: doc. # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1369,7 +1434,7 @@ QHP_VIRTUAL_FOLDER = doc # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom # filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- +# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- # filters). # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1377,7 +1442,7 @@ QHP_CUST_FILTER_NAME = # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the # custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- +# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- # filters). # This tag requires that the tag GENERATE_QHP is set to YES. @@ -1385,7 +1450,7 @@ QHP_CUST_FILTER_ATTRS = # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this # project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). # This tag requires that the tag GENERATE_QHP is set to YES. QHP_SECT_FILTER_ATTRS = @@ -1469,6 +1534,17 @@ TREEVIEW_WIDTH = 250 EXT_LINKS_IN_WINDOW = NO +# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg +# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see +# https://inkscape.org) to generate formulas as SVG images instead of PNGs for +# the HTML output. These images will generally look nicer at scaled resolutions. +# Possible values are: png (the default) and svg (looks nicer but requires the +# pdf2svg or inkscape tool). +# The default value is: png. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FORMULA_FORMAT = png + # Use this tag to change the font size of LaTeX formulas included as images in # the HTML documentation. When you change the font size after a successful # doxygen run you need to manually remove any form_*.png images from the HTML @@ -1489,8 +1565,14 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES +# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands +# to create new LaTeX commands to be used in formulas as building blocks. See +# the section "Including formulas" for details. + +FORMULA_MACROFILE = + # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# https://www.mathjax.org) which uses client side Javascript for the rendering +# https://www.mathjax.org) which uses client side JavaScript for the rendering # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1518,7 +1600,7 @@ MATHJAX_FORMAT = HTML-CSS # Content Delivery Network so you can quickly see the result without installing # MathJax. However, it is strongly recommended to install a local copy of # MathJax from https://www.mathjax.org before deployment. -# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/. +# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2. # This tag requires that the tag USE_MATHJAX is set to YES. MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/ @@ -1560,7 +1642,7 @@ MATHJAX_CODEFILE = SEARCHENGINE = NO # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. There +# implemented using a web server instead of a web client using JavaScript. There # are two flavors of web server based searching depending on the EXTERNAL_SEARCH # setting. When disabled, doxygen will generate a PHP script for searching and # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing @@ -1664,10 +1746,11 @@ LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex # The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to -# generate index for LaTeX. +# generate index for LaTeX. In case there is no backslash (\) as first character +# it will be automatically added in the LaTeX code. # Note: This tag is used in the generated output file (.tex). # See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat. -# The default value is: \makeindex. +# The default value is: makeindex. # This tag requires that the tag GENERATE_LATEX is set to YES. LATEX_MAKEINDEX_CMD = \makeindex @@ -1687,7 +1770,7 @@ COMPACT_LATEX = NO # The default value is: a4. # This tag requires that the tag GENERATE_LATEX is set to YES. -PAPER_TYPE = a4wide +PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names # that should be included in the LaTeX output. The package can be specified just @@ -1756,9 +1839,11 @@ LATEX_EXTRA_FILES = PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate -# the PDF file directly from the LaTeX files. Set this option to YES, to get a -# higher quality PDF documentation. +# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as +# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX +# files. Set this option to YES, to get a higher quality PDF documentation. +# +# See also section LATEX_CMD_NAME for selecting the engine. # The default value is: YES. # This tag requires that the tag GENERATE_LATEX is set to YES. @@ -2075,8 +2160,7 @@ SEARCH_INCLUDES = YES # This tag requires that the tag SEARCH_INCLUDES is set to YES. INCLUDE_PATH = /usr/include \ - /usr/include/lsb3 \ - build \ + autobuild \ trio # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard @@ -2162,12 +2246,6 @@ EXTERNAL_GROUPS = YES EXTERNAL_PAGES = YES -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of 'which perl'). -# The default file (with absolute path) is: /usr/bin/perl. - -PERL_PATH = /usr/bin/perl - #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- @@ -2181,15 +2259,6 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = NO -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see: -# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - # You can include diagrams made with dia in doxygen documentation. Doxygen will # then run dia to produce the diagram and insert it in the documentation. The # DIA_PATH tag allows you to specify the directory where the dia binary resides. @@ -18,7 +18,27 @@ running fetchmail. 1. PREPARATIONS: USEFUL THINGS TO INSTALL FIRST -1.1 OpenSSL +1.1 Choose a TLS/SSL library. + +OpenSSL has been used for a long time and is tested and proven. +See README.SSL for details. + +Forked libraries deriving from OpenSSL and under the SSLeay or OpenSSL license +cannot be used due to licensing issues, and are not supported. +This affects, f.i., LibreSSL, unless it is part of the operating system +(f. i., on OpenBSD). However, LibreSSL diverges from OpenSSL and is +not supported by the fetchmail maintainer. + +Since 6.4.27, there has been experimental support for recent wolfSSL versions, +which is under GNU GPL v2 or later license and hence may be easier for +a consistent GPLv2+ licensing of fetchmail. This support requires a C99 +or newer compiler, and requires up-to-date wolfSSL versions as wolfSSL keeps +fixing vulnerabilities in newer version, so new fetchmail releases will +consistently raise the bar on wolfSSL version. + +Choose between OpenSSL or wolfSSL. + +1.1a OpenSSL If you are installing OpenSSL yourself, it is recommended that you build shared OpenSSL libraries, it works better and updating OpenSSL does not @@ -28,6 +48,19 @@ Try after unpacking OpenSSL: ./config shared && make && make test && make install +1.1b wolfSSL + +If you are installing wolfSSL yourself, be sure to use a hardened build +with all OpenSSL APIs - you may add --enable-debug, +and note that --enable-opensslextra does NOT suffice. +Also note that overriding AM_CFLAGS or CFLAGS in wolfSSL's build may break +the OpenSSL compatibility layer. + + ./configure --enable-opensslall --enable-harden + make && make test && make install + +fetchmail's configure option --with-wolfssl takes precedence over --with-ssl. + 1.2 gettext (internationalization) Internationalization of fetchmail requires GNU gettext (libintl and @@ -66,7 +99,31 @@ configure option '--with-included-gettext'. Installing fetchmail is easy. From within this directory, type: - ./configure +When using OpenSSL: + + ./configure + + It is possible to either specify the install path, or pkg-config + module name, with --with-ssl, examples: + + ./configure --with-ssl=/opt/openssl3 + + ./configure --with-ssl=eopenssl30 + +When using wolfSSL (adjust the trust file location, see below): + + ./configure --with-wolfssl \ + WOLFSSL_TRUST_FILE=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem + +Here, you need to adjust the file path according to where your ca_cert_nss or +ca-certificates package installs the default trust bundle in PEM format with +BEGIN CERTIFICATE lines. +wolfSSL 5.1 cannot parse BEGIN TRUSTED CERTIFICATE bundles. + +Some typical locations as of 2021 are: +on Fedora Linux: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem +on Debian/Ubuntu: /etc/ssl/certs/ca-certificates.crt +on FreeBSD: /usr/local/share/certs/ca-root-nss.crt The autoconfiguration script will spend a bit of time figuring out the specifics of your system. If you want to specify a particular compiler diff --git a/Makefile.am b/Makefile.am index 429f46cd..ae16c11c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,9 @@ SUBDIRS= . po AUTOMAKE_OPTIONS= 1.12 foreign no-dist-gzip dist-xz subdir-objects dist-lzip +.DELETE_ON_ERROR: # yes please +.PRECIOUS: test-suite.log + AM_CPPFLAGS= -I$(srcdir)/libesmtp ACLOCAL_AMFLAGS= -I m4 -I m4-local AM_YFLAGS= -t -d @@ -23,7 +26,10 @@ nodist_bin_SCRIPTS= fetchmailconf python_PYTHON= $(pys) dist_man1_MANS+= $(pym) -CLEANFILES= $(nodist_bin_SCRIPTS) +CLEANFILES= $(nodist_bin_SCRIPTS) \ + fetchmail-man.html \ + fetchmail.html \ + fetchmail.rst # for gettext (used by fetchmail.c, NOT by GNU gettext) localedir= $(datadir)/locale @@ -197,38 +203,35 @@ EXTRA_DIST= $(DISTDOCS) $(distdirs) \ m4-local/ac_ma_search_package.m4 \ $(TESTS) t.rc t.regression \ dist-tools/html2txt \ - dist-tools/manServer.pl \ dist-tools/git-commit-po-updates.sh \ Doxyfile fetchmailconf: - ( echo '#! /bin/sh' && echo 'exec @PYTHON@ @pythondir@/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ || { rm -f $@ ; exit 1; } + ( echo '#! /bin/sh' && echo 'exec @PYTHON@ @pythondir@/fetchmailconf.py "$$@"' ) >$@ && chmod +x $@ FAQ: fetchmail-FAQ.html $(srcdir)/dist-tools/html2txt - AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ || { rm -f $@ ; exit 1 ; } + AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-FAQ.html >$@ fetchmail-FAQ.pdf: fetchmail-FAQ.html fetchmail-FAQ.book bighand.png $(AWK) '/^[ \t]*<h1/ {sec++; } {if (sec < 2 || sec > 3) print $0;}' <$(srcdir)/fetchmail-FAQ.html >fetchmail-FAQ-print.html - htmldoc --logoimage $(srcdir)/bighand.png --batch $(srcdir)/fetchmail-FAQ.book || { rm -f $@ ; exit 1 ; } + $(HTMLDOC) --logoimage $(srcdir)/bighand.png --batch $(srcdir)/fetchmail-FAQ.book rm -f fetchmail-FAQ-print.html FEATURES: fetchmail-features.html $(srcdir)/dist-tools/html2txt - AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-features.html >$@ || { rm -f $@ ; exit 1 ; } + AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/fetchmail-features.html >$@ NOTES: design-notes.html esrs-design-notes.html $(srcdir)/dist-tools/html2txt echo "This file contains two articles reformatted from HTML." > $@ \ && echo "------------------------------------------------------" >> $@ \ && echo "" >> $@ \ && AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/design-notes.html >>$@ \ - && AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/esrs-design-notes.html >>$@ \ - || { rm -f $@ ; exit 1 ; } + && AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/esrs-design-notes.html >>$@ TODO: todo.html $(srcdir)/dist-tools/html2txt - AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/todo.html >$@ || { rm -f $@ ; exit 1 ; } + AWK=$(AWK) $(SHELL) $(srcdir)/dist-tools/html2txt $(srcdir)/todo.html >$@ -fetchmail-man.html: fetchmail.man $(srcdir)/dist-tools/manServer.pl - env - "PATH=$$PATH" perl -T $(srcdir)/dist-tools/manServer.pl $(srcdir)/fetchmail.man >$@ \ - || { rm -f $@ ; exit 1 ; } +fetchmail-man.html: fetchmail.html + sed -Ee '/<colgroup>/,/<\/colgroup>/d' $< >$@ dist-hook: fetch-translations cd $(distdir) && find $(distdirs) po -name .git -type d -prune -exec rm -rf '{}' ';' @@ -251,6 +254,7 @@ fetch-translations: import-translations: fetch-translations cd $(top_builddir)/po && $(MAKE) update-po @printf '\n=== You can use dist-tools/git-commit-po-updates.sh to check these updates in. ===\n\n' + $(SHELL) $(top_srcdir)/dist-tools/git-commit-po-updates.sh -n git-check: @set -x && if test -d $(PACKAGE)-$(VERSION)-export ; then chmod -R u+rwX $(PACKAGE)-$(VERSION)-export ; fi && \ @@ -260,9 +264,13 @@ git-check: cd $(PACKAGE)-$(VERSION)-export && chmod -R u+rwX . && autoreconf -i -f -s -v \ && mkdir _build && cd _build && ../configure && $(MAKE) distcheck -SUFFIXES = .html .txt +SUFFIXES = .html .txt .rst .txt.html: - asciidoc --unsafe -a toc -a data-uri -o $@ $< || { rm -f $@ ; exit 1 ; } + asciidoc --unsafe --attribute toc --attribute data-uri -o $@ $< +.man.rst: + pandoc --from man --to rst --table-of-contents --standalone --output $@ $< +.rst.html: + $(RST2HTML) --title "Fetchmail Manual" --strip-comments --rfc-references $< $@ # default to some non-default options when using "make distcheck" AM_DISTCHECK_CONFIGURE_FLAGS=--with-ssl @@ -55,13 +55,20 @@ removed from a 6.5.0 or newer release.) requirements (dependencies), such as Boost or other class libraries. * The softbounce option default will change to "false" in the next release. * The --bsmtp - mode of operation may be removed in a future release. -* Given that OpenSSL is severely underdocumented, and needs license exceptions, - fetchmail may switch to a different SSL library. * SSLv3 support may be removed from a future fetchmail release. It has been obsolete for many years and found insecure. Use TLS. * Fetchmailconf is deprecated and will be removed from a future release. * Fetchmail does not guarantee compatibility with EOL OpenSSL versions. Support for end-of-life OpenSSL versions may be removed even from patchlevel releases. +* Nonstandard authentication schemes (such as RPA) may be removed from future + fetchmail versions. +* Nonstandard protocol extensions (such as SDPS/*ENV) may be removed from future + fetchmail versions. +* Future fetchmail releases (even minor ones) may change undocumented parts of + the .netrc parser in incompatible ways to enhance compatibility with typical + ftp(1) .netrc parsers. +* Apparently OPIE is dying. I only have this support on FreeBSD, and + FreeBSD 14 (slated for release in 2023) is about to remove it. # KNOWN BUGS AND WORKAROUNDS * Fetchmail does not handle messages without Message-ID header well @@ -80,6 +87,376 @@ removed from a 6.5.0 or newer release.) * Kerberos 5 may be broken, particularly on Heimdal, and provide bogus error messages. This will not be fixed, because the maintainer has no Kerberos 5 server to test against. Use GSSAPI. +* For IMAP connections, fetchmail will print "will idle after poll" in + verbose mode even though --idle is not given, as an artifact of the 6.4.22 + security fixes. Fetchmail means "could idle after poll", but this would + have required another loop through the translators. +* aka ... hostnames are not considered for upstream server X.509 certificate + verification, aka was meant for alias detection with multidrop mailboxes. +* When compiled against wolfSSL, some diagnostics and messages of fetchmail are + hardcoded to read "OpenSSL"; this was found only after the call for + translations had been sent out already. +* FreeBSD's OPIE implementation cannot be found when using a C++ compiler. + This should not affect the normal build, which uses a C compiler. + +-------------------------------------------------------------------------------- +fetchmail-6.4.38 (released 2024-01-31, 31720 LoC): + +# BREAKING CHANGES: +* Tighten OpenSSL and wolfSSL version requirements again. See README.SSL. + Distributors providing older versions that they backport security fixes for + may want to patch socket.c but remember to redirect support to your + distribution's support channels. + The fetchmail maintainer only supports functionally unmodified builds with + publicly available SSL/TLS library versions. + fetchmail will refuse to build against OpenSSL 1.0.2 older than 1.0.2u, + or wolfSSL older than 5.6.2. It will warn about OpenSSL older than 3.0.9, + or between 3.1.0 and 3.1.4, or wolfSSL older than 5.6.6. + +# TRANSLATIONS: language translations were updated by these fine people: +(in reverse alphabetical order of language codes): +* ru: Kirill Isakov [Russian] +* eo: Keith Bowes [Esperanto] + +-------------------------------------------------------------------------------- +fetchmail-6.4.37 (released 2023-02-26, 31710 LoC): + +# TRANSLATIONS: language translations were updated by this fine person: +* sr: Мирослав Николић (Miroslav Nikolić) [Serbian] + +-------------------------------------------------------------------------------- +fetchmail-6.4.36 (released 2023-01-28, 31710 LoC): + +# TRANSLATIONS: language translations were updated by these fine people: +(in alphabetical order of language codes): +* cs: Petr Pisar [Czech] +* es: Cristian Othón Martínez Vera [Spanish] +* fr: Frédéric Marchal [French] +* ja: Takeshi Hamasaki [Japanese] +* pl: Jakub Bogusz [Polish] +* ro: Remus-Gabriel Chelu [Romanian] +* sq: Besnik Bleta [Albanian] +* sv: Göran Uddeborg [Swedish] + +-------------------------------------------------------------------------------- +fetchmail-6.4.35 (released 2023-01-04, 31707 LoC): + +# BREAKING CHANGES: +* Fetchmail now warns about OpenSSL before 1.1.1s or 3.0.7, + and rejects wolfSSL older than 5.5.1. + +# TRANSLATIONS: language translations were updated by these fine people: +(in reverse alphabetical order of language codes so as not to prefer people): +* sv: Göran Uddeborg [Swedish] +* eo: Keith Bowes [Esperanto] + +-------------------------------------------------------------------------------- +fetchmail-6.4.34 (released 2022-10-15, 31701 LoC): + +# CRITICAL BUG FIXES: +* When an SMTP receiver refuses delivery, a message would be deleted from + the mail store in spite of a softbounce option that is enabled. + Bug report, analysis and patch by Horváth Zsolt. Gitlab, fixes #50. + +# BUILD NOTE: +* If you are reusing config.cache from prior builds, this may cause + issues with finding Python or some libraries. In case of trouble, + remove config.cache and retry. + +# TRANSLATIONS: language translations were updated by this fine person: +* sr: Мирослав Николић (Miroslav Nikolić) [Serbian] + +-------------------------------------------------------------------------------- +fetchmail-6.4.33 (released 2022-08-27, 31696 LoC): + +# TRANSLATIONS: language translations were updated by this fine person: +* fr: Frédéric Marchal [French] + +# CONTRIBUTED SCRIPT CHANGES: +* contrib/fetchsetup improvements by Matěj Cepl +* contrib/runfetchmail improvements by Matěj Cepl + +-------------------------------------------------------------------------------- +fetchmail-6.4.32 (released 2022-07-30, 31696 LoC): + +# FIXES: +* Use configure to find rst2html, some systems install it only with .py suffix, + others only without, and some install both. +* Update README.maintainer + +# TRANSLATIONS: language translations were updated by these fine people: +(in alphabetical order of language codes so as not to prefer people): +* cs: Petr Pisar [Czech] +* es: Cristian Othón Martínez Vera [Spanish] +* ja: Takeshi Hamasaki [Japanese] +* pl: Jakub Bogusz [Polish] +* ro: Remus-Gabriel Chelu [Romanian] +* sq: Besnik Bleta [Albanian] +* sv: Göran Uddeborg [Swedish] + +-------------------------------------------------------------------------------- +fetchmail-6.4.31 (released 2022-07-16, 31694 LoC): + +# BUG FIXES: +* Try to fix ./configure --with-ssl=... for systems that have multiple OpenSSL + versions installed. Issues reported by Dennis Putnam. +* The netrc parser now reports its errors to syslog or logfile when appropriate, + previously it would always log to stderr. +* Add error checking to .netrc parser. + +# CHANGES: +* manpage: use .UR/.UE macros instead of .URL for URIs. +* manpage: fix contractions. Found with FreeBSD's igor tool. +* manpage: HTML now built with pandoc -> python-docutils + (manServer.pl was dropped) + +-------------------------------------------------------------------------------- +fetchmail-6.4.30 (released 2022-04-26, 31666 LoC): + +# BREAKING CHANGES: +* Bump wolfSSL minimum required version to 5.2.0 to pull in security fix. + +# CHANGES: +* Using OpenSSL 1.* before 1.1.1n elicits a compile-time warning. +* Using OpenSSL 3.* before 3.0.2 elicits a compile-time warning. +* configure.ac was tweaked in order to hopefully fix cross-compilation issues + report, and different patch suggested, by Fabrice Fontaine, + https://gitlab.com/fetchmail/fetchmail/-/merge_requests/42 + +# TRANSLATIONS: language translations were updated by this fine person: +* ro: Remus-Gabriel Chelu [Romanian] + +-------------------------------------------------------------------------------- +fetchmail-6.4.29 (released 2022-03-20, 31661 LoC): + +# TRANSLATIONS: language translations were updated by this fine person: +* vi: Trần Ngọc Quân [Vietnamese] + +-------------------------------------------------------------------------------- +fetchmail-6.4.28 (released 2022-03-05, 31661 LoC): + +# DOCUMENTATION: +* Fix a typo in the manual page, courtesy of Jeremy Petch. + +# TRANSLATIONS: language translations were updated by this fine person: +* es: Cristian Othón Martínez Vera [Spanish] + +-------------------------------------------------------------------------------- +fetchmail-6.4.27 (released 2022-01-26, 31661 LoC): + +# BREAKING CHANGES: +* Bump wolfSSL minimum required version to 5.1.1 to pull in security fix. + +# TRANSLATIONS: language translations were updated by this fine person: +* ro: Remus-Gabriel Chelu [Romanian] + +-------------------------------------------------------------------------------- +fetchmail-6.4.26 (released 2021-12-26, 31661 LoC): + +# FIXES: +* When using wolfSSL 5.0.0, work around a bug that appears to hit wolfSSL when + receiving handshake records while still in SSL_peek(). Workaround is to read + 1 byte and cache it, then call SSL_peek() again. + This affects only some servers. https://github.com/wolfSSL/wolfssl/issues/4593 + +# TRANSLATIONS: language translations were updated by this fine person: +* sr: Мирослав Николић (Miroslav Nikolić) [Serbian] + +-------------------------------------------------------------------------------- +fetchmail-6.4.25 (released 2021-12-10, 31653 LoC): + +# BREAKING CHANGES: +* Since distributions continue patching for LibreSSL use, which cannot be + linked legally, block out LibreSSL in configure.ac and socket.c, and + refer to COPYING, unless on OpenBSD (which ships it in the base system). + OpenSSL and wolfSSL 5 can be used. SSL-related documentation was updated, do + re-read COPYING, INSTALL, README, README.packaging, README.SSL. +* Bump OpenSSL version requirement to 1.0.2f in order to safely remove + the obsolete OpenSSL flag SSL_OP_SINGLE_DH_USE. This blocks out 1.0.2e and + older 1.0.2 versions. 1.0.2f was a security fix release, and 1.0.2u is + publicly available from https://www.openssl.org/source/old/1.0.2/ +* Some of the configure.ac fiddling MIGHT have broken cross-compilation + again. The maintainer does not test cross-compiling fetchmail; if you + have difficulties, try setting PKG_CONFIG_LIBDIR to the pkg-config path + containing your target/host libraries, or see if --with-ssl-prefix or + --with-wolfssl-prefix, or overriding LDFLAGS/LIBS/CPPFLAGS, can help. + Feedback solicited on compliant systems that are before end-of-life. + +# BUG FIXES: +* 6.4.24's workaround for OpenSSL 1.0.2's X509_V_FLAG_TRUSTED_FIRST flag + contained a typo and would not kick in properly. +* Library and/or rpath setting from configure.ac was fixed. + +# ADDITIONS: +* Added an example systemd unit file and instructions to contrib/systemd/ + which runs fetchmail as a daemon with 5-minute poll intervals. + Courteously contributed by Barak A. Pearlmutter, Debian Bug#981464. +* fetchmail can now be used with wolfSSL 5's OpenSSL compatibility layer, + see INSTALL and README.SSL. This is considered experimental. + Feedback solicited. + +# CHANGES: +* The getstats.py dist-tool now counts lines of .ac and .am files. +* ./configure --with-ssl now supports pkg-config module names, too. See INSTALL. + +# TRANSLATIONS: language translations were updated by these fine people: +(in reverse alphabetical order of language codes so as not to prefer people): +* sv: Göran Uddeborg [Swedish] +* sq: Besnik Bleta [Albanian] +* pl: Jakub Bogusz [Polish] +* ja: Takeshi Hamasaki [Japanese] +* fr: Frédéric Marchal [French] +* eo: Keith Bowes [Esperanto] +* cs: Petr Pisar [Czech] + +# CREDITS: +* Thanks to Corey Halpin for testing release candidates. + +-------------------------------------------------------------------------------- +fetchmail-6.4.24 (released 2021-11-20, 30218 LoC): + +# OPENSSL AND LICENSING NOTE: +> see fetchmail-6.4.22 below, and the file COPYING. + + Note that distribution of packages linked with LibreSSL is not feasible + due to a missing GPLv2 clause 2(b) exception. + +# COMPATIBILITY: +* Bison 3.8 dropped yytoknum altogether, breaking compilation due to a + warning workaround. Remove the cast of yytoknum to void. This may cause + a compiler warning to reappear with older Bison versions. +* OpenSSL 1.0.2: Workaround for systems that keep the expired DST Root CA X3 + certificate in its trust store because OpenSSL by default prefers the + untrusted certificate and fails. Fetchmail now sets the + X509_V_FLAG_TRUSTED_FIRST flag (on OpenSSL 1.0.2 only). + This is workaround #2 from the OpenSSL Blog. For details, see both: + https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/ + https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/ + + NOTE: OpenSSL 1.0.2 is end of life, it is assumed that the OpenSSL library + is kept up to date by a distributor or via OpenSSL support contract. + Where this is not the case, please upgrade to a supported OpenSSL version. + +# DOCUMENTATION: +* The manual page was revised after re-checking with mandoc -Tlint, aspell, + igor. Some more revisions were made for clarity. + +# TRANSLATIONS: language translations were updated by these fine people: +* sv: Göran Uddeborg [Swedish] +* pl: Jakub Bogusz [Polish] +* fr: Frédéric Marchal [French] +* cs: Petr Pisar [Czech] +* eo: Keith Bowes [Esperanto] +* ja: Takeshi Hamasaki [Japanese] + +-------------------------------------------------------------------------------- +fetchmail-6.4.23 (released 2021-10-31, 30206 LoC): + +# USABILITY: +* For common ssh-based IMAP PREAUTH setups (i. e. those that use a plugin + - no matter its contents - and that set auth ssh), change the STARTTLS + error message to suggest sslproto '' instead. + This is a commonly reported issue after the CVE-2021-39272 fix in 6.4.22. + Fixes Redhat Bugzilla 2008160. Fixes GitLab #39. + +# TRANSLATIONS: language translations were updated by these fine people: +* ja: Takeshi Hamasaki [Japanese] +* sr: Мирослав Николић (Miroslav Nikolić) [Serbian] + +-------------------------------------------------------------------------------- +fetchmail-6.4.22 (released 2021-09-13, 30201 LoC): + +# OPENSSL AND LICENSING NOTE: +* fetchmail 6.4.22 is compatible with OpenSSL 1.1.1 and 3.0.0. + OpenSSL's licensing changed between these releases from dual OpenSSL/SSLeay + license to Apache License v2.0, which is considered incompatible with GPL v2 + by the FSF. For implications and details, see the file COPYING. + +# SECURITY FIXES: +* CVE-2021-39272: fetchmail-SA-2021-02: On IMAP connections, without --ssl and + with nonempty --sslproto, meaning that fetchmail is to enforce TLS, and when + the server or an attacker sends a PREAUTH greeting, fetchmail used to continue + an unencrypted connection. Now, log the error and abort the connection. + --Recommendation for servers that support SSL/TLS-wrapped or "implicit" mode on + a dedicated port (default 993): use --ssl, or the ssl user option in an rcfile. + --Reported by: Andrew C. Aitchison, based on the USENIX Security 21 paper "Why + TLS is better without STARTTLS - A Security Analysis of STARTTLS in the Email + Context" by Damian Poddebniak, Fabian Ising, Hanno Böck, and Sebastian + Schinzel. The paper did not mention fetchmail. + +* On IMAP and POP3 connections, --auth ssh no longer prevents STARTTLS + negotiation. +* On IMAP connections, fetchmail does not permit overriding a server-side + LOGINDISABLED with --auth password any more. +* On POP3 connections, the possibility for RPA authentication (by probing with + an AUTH command without arguments) no longer prevents STARTTLS negotiation. +* For POP3 connections, only attempt RPA if the authentication type is "any". + +# BUG FIXES: +* On IMAP connections, when AUTHENTICATE EXTERNAL fails and we have received the + tagged (= final) response, do not send "*". +* On IMAP connections, AUTHENTICATE EXTERNAL without username will properly send + a "=" for protocol compliance. +* On IMAP connections, AUTHENTICATE EXTERNAL will now check if the server + advertised SASL-IR (RFC-4959) support and otherwise refuse (fetchmail <= 6.4 + has not supported and does not support the separate challenge/response with + command continuation) +* On IMAP connections, when --auth external is requested but not advertised by + the server, log a proper error message. +* Fetchmail no longer crashes when attempting a connection with --plugin "" or + --plugout "". +* Fetchmail no longer leaks memory when processing the arguments of --plugin or + --plugout on connections. +* On POP3 connections, the CAPAbilities parser is now caseblind. +* Fix segfault on configurations with "defaults ... no envelope". Reported by + Bjørn Mork. Fixes Debian Bug#992400. This is a regression in fetchmail 6.4.3 + and happened when plugging memory leaks, which did not account for that the + envelope parameter is special when set as "no envelope". The segfault happens + in a constant strlen(-1), triggered by trusted local input => no vulnerability. +* Fix program abort (SIGABRT) with "internal error" when invalid sslproto is + given with OpenSSL 1.1.0 API compatible SSL implementations. + +# CHANGES: +* IMAP: When fetchmail is in not-authenticated state and the server volunteers + CAPABILITY information, use it and do not re-probe. (After STARTTLS, fetchmail + must and will re-probe explicitly.) +* For typical POP3/IMAP ports 110, 143, 993, 995, if port and --ssl option + do not match, emit a warning and continue. Closes Gitlab #31. + (cherry-picked from 6.5 beta branch "legacy_6x") +* fetchmail.man and README.SSL were updated in line with RFC-8314/8996/8997 + recommendations to prefer Implicit TLS (--ssl/ssl) and TLS v1.2 or newer, + placing --sslproto tls1.2+ more prominently. + The defaults shall not change between 6.4.X releases for compatibility. + +# TRANSLATIONS: language translations were updated by these fine people: +* sq: Besnik Bleta [Albanian] +* cs: Petr Pisar [Czech] +* eo: Keith Bowes [Esperanto] +* fr: Frédéric Marchal [French] +* pl: Jakub Bogusz [Polish] +* sv: Göran Uddeborg [Swedish] + +# CREDITS: +* Thanks for testing the release candidates and bug reports to: + Corey Halpin, Stefan Eßer. + +-------------------------------------------------------------------------------- +fetchmail-6.4.21 (released 2021-08-09, 30042 LoC): + +# REGRESSION FIX: +* The new security fix in 6.4.20 for CVE-2021-36386 caused truncation of + messages logged to buffered outputs, from --logfile and --syslog. + + This also caused lines in the logfile to run into one another because + the fragment containing the '\n' line-end character was usually lost. + + Reason is that on all modern systems (with <stdarg.h> header and vsnprintf() + interface), the length of log message fragments was added up twice, so + that these ended too deep into a freshly allocated buffer, after the '\0' + byte. Unbuffered outputs flushed the fragments right away, which masked the + bug. + + Reported by: Jürgen Edner, Erik Christiansen. -------------------------------------------------------------------------------- fetchmail-6.4.20 (released 2021-07-28, 30042 LoC): @@ -92,7 +469,7 @@ fetchmail-6.4.20 (released 2021-07-28, 30042 LoC): call to va_start(), so it reads garbage. The exact impact depends on many factors around the compiler and operating system configurations used and the implementation details of the stdarg.h interfaces of the two functions - mentioned before. To fix CVE-2021-38386. + mentioned before. To fix CVE-2021-36386. Reported by Christian Herdtweck of Intra2net AG, Tübingen, Germany. @@ -20,12 +20,15 @@ Fetchmail also fully supports authentication via GSSAPI, Kerberos 4 and 5, RFC1938 one-time passwords, Compuserve's POP3 with RPA, Microsoft's NTLM, Demon Internet's SDPS, or CRAM-MD5 authentication a la RFC2195. -Fetchmail supports end-to-end encryption with OpenSSL, do read README.SSL for -details on fetchmail's configuration and README.SSL-SERVER for server-side -requirements. NOTE! To be compatible with earlier releases, fetchmail 6.4 -default behaviour is more relaxed than dictated by recommendations - while it -does away with SSLv2, only negotiates SSLv3 if forced to, it will by default -still negotiate TLS v1.0. +Fetchmail supports end-to-end encryption with OpenSSL or wolfSSL (the latter +only on C99 or newer compilers), do read README.SSL for details on fetchmail's +configuration and README.SSL-SERVER for server-side requirements. NOTE! To be +compatible with earlier releases, fetchmail 6.4 default behaviour is more +relaxed than dictated by recommendations - while it does away with SSLv2, only +negotiates SSLv3 if forced to, it will by default still negotiate TLS v1.0. + +Also note that if used with wolfSSL, many texts will still read OpenSSL +because fetchmail uses wolfSSL's OpenSSL compatibility API. Portability ----------- @@ -12,56 +12,79 @@ setup. In case of troubles, mail the README.SSL-SERVER file to your ISP and have them check their server configuration against it. -Note that fetchmail up to version 6.3.26 confused SSL/TLS protocol levels with -whether a service needs to use in-band negotiation (STLS/STARTTLS for -POP3/IMAP4) or is totally SSL-wrapped on a separate port. +Note that fetchmail up to version 6.3.26 used to confuse SSL/TLS protocol +levels with whether a service needs to use in-band negotiation (STLS/STARTTLS +for POP3/IMAP4) or is totally SSL-wrapped ("Implicit TLS") on a separate port. +Fetchmail 6.4 seeks to fix that to some extent without breaking the +command-line and rcfile interfaces too much (see --ssl and --sslproto options, +below and in the manual). -Also, fetchmail 6.4.0 and newer releases changed some of the semantics -as the result of a bug-fix, and will auto-negotiate TLSv1 or newer only. -If your server does not support this, you may have to specify --sslproto -ssl3+. This is in order to prefer the newer TLS protocols, because SSLv2 -and v3 are broken. +fetchmail 6.4.0 will auto-negotiate TLSv1 or newer only. -Finally, due to other defaults changing, and several mail services not -supporting in-band negotiation of SSL or TLS by means of STLS or STARTTLS, -you may need to add ssl or --ssl to your configuration. +Fetchmail 6.4.38 supports OpenSSL 3.0.9, 3.1.4, and WolfSSL 5.6.6 or newer, +and might support OpenSSL 3.2.0 or newer. +Fetchmail may compile against end-of-life (EOL) OpenSSL 1.x.y versions, +but these are unsupported by the fetchmail maintainer. +It is expected that the user only uses a supported SSL library that receives +security fixes and is kept up to date. - -- Matthias Andree, 2021-03-29 +Note that WolfSSL 5 is a bit less flexible about its trust store, +see INSTALL chapter 2.1 for details. + +Note that many messages printed by fetchmail will print "OpenSSL" +even if wolfSSL is being used. Reason is that fetchmail uses +wolfSSL's OpenSSL compatibility layer and not the native wolfSSL API. + + -- Matthias Andree, 2024-01-31 Quickstart ---------- -Use an up-to-date release of OpenSSL v1.1.1 or newer, so as to get -TLSv1.3 support. Older OpenSSL versions are unsupported upstream, and -fetchmail rejects versions before v1.0.2 and warns about versions before v1.1.1. +Use an up-to-date release of OpenSSL v3.0/v3.1 or wolfSSL 5.5 or +newer, so as to get TLSv1.3 support and latest fixes. Older OpenSSL versions +are unsupported upstream, and fetchmail rejects versions before v1.0.2f and +warns about versions before 3.0.13. + +wolfSSL needs to be configured with --enable-opensslall --enable-harden, +else some required OpenSSL APIs are missing, especially for SNI (server name +indication), which is required to fetch mail from Google and some other mail +server providers. In all four examples below, the (--)sslcertck has become redundant -since fetchmail v6.4.0 but since fetchmail 6.3 releases will be in circulation -for a while, we'll leave it here to be safe. +since fetchmail v6.4.0, but since fetchmail 6.3 releases will be in circulation +for too long, (--)sslcertck will remain in the examples below for now. -For use of SSL or TLS with in-band negotiation on the regular service's port, -i. e. with STLS or STARTTLS, use these command line options +For use of SSL or TLS on a separate port (recommended), called Implicit TLS, +the whole TCP connection is SSL-encrypted from the very beginning (SSL- or +TLS-wrapped), use these command line options (in the rcfile, +omit all leading "--"): - --sslproto auto --sslcertck + --ssl --sslproto tls1.2+ --sslcertck or these options in the rcfile (after the respective "user"... options) - sslproto auto sslcertck - + ssl sslproto tls1.2+ sslcertck -Note that some services do not offer STLS or STARTTLS, but most do -offer SSL or TLS on a separate, dedicated, "secure" port: -For use of SSL or TLS on a separate port, if the whole TCP connection is -SSL-encrypted from the very beginning (SSL- or TLS-wrapped), use these -command line options (in the rcfile, omit all leading "--"): +For use of SSL or TLS with in-band negotiation on the regular service's port, +i. e. with STLS or STARTTLS, use these command line options (omitting --ssl or +ssl): - --ssl --sslproto auto --sslcertck + --sslproto tls1.2+ --sslcertck or these options in the rcfile (after the respective "user"... options) - ssl sslproto auto sslcertck + sslproto tls1.2+ sslcertck + + +With recent software on the server, you can alternatively configure tls1.3+. + +For some older services, you may need to use tls1.1+ or tls1+ for compatibility +instead of the tls1.2+ above. In such situations, you should ask the service +provider or server operator to upgrade their TLS implementation such that +TLS v1.3 be supported, and once that happens, update your fetchmail configuration +to tls1.3+ or tls1.2+. Background and use (long version :-)) diff --git a/README.SSL-SERVER b/README.SSL-SERVER index 60a7d332..a5e07551 100644 --- a/README.SSL-SERVER +++ b/README.SSL-SERVER @@ -9,6 +9,11 @@ In order to let any mail client (not just fetchmail) verify server certificates properly, so that users can be sure their connection is not eavesdropped, there are several requirements that need to be fulfilled. +0. Provide modern TLS implementations: + + Make sure the server supports TLS 1.2 and 1.3. + Older versions are deprecated and may preclude modern clients. + 1. Match certificate and DNS names: The server certificate's "common name" or "subject alternative name" must diff --git a/README.maintainer b/README.maintainer index e9b238f6..12701fac 100644 --- a/README.maintainer +++ b/README.maintainer @@ -2,3 +2,53 @@ MAINTAINER NOTES ================ Text documents are edited with vim "set tw=79 ai fo=atrq1w2" options. + +As of 6.4.31, fetchmail dropped its manServer.pl and uses pandoc to convert +from roff/man to RST and then the Python docutils from RST to HTML. +Other ways (through asciidoc) generate more or less quirky output which +is of questionable portability. + +Debian testing and Ubuntu 18.04 minimum survival from Git checkout, 2021-12-04: +# apt update && apt upgrade -y +# apt install -y --no-install-recommends build-essential automake \ + gettext gitk autopoint bison flex ca-certificates openssh-client \ + netbase pkg-config bash libssl-dev git +Redistributing requires additional packages: +# apt install --no-install-recommends -y \ + man lynx htmldoc asciidoc libcarp-always-perl lzip rsync \ + python3-docutils pandoc + +$ git clone https://gitlab.com/fetchmail/fetchmail.git fetchmail.git +$ cd fetchmail.git +$ autoreconf -if +$ mkdir -p _build && cd _build +$ ../configure +$ make check -j8 +$ make distcheck -j8 + +Alpine Linux (cannot build distribution due to lack of pandoc/htmldoc): +# apk add autoconf automake bison flex gettext gettext-dev gettext-lang git \ + build-base openssl3-dev openssh-client-default py3-docutils +Then continue with Debian's git clone ... above. + +Fedora Linux as of 34 cannot rebuild the distribution, it lacks HTMLDOC, +but as of F36, the F33 package still seems to work. +To install requisites: +# dnf install -y automake bison ca-certificates gettext-devel git pkg-config \ + openssl-devel vim-minimal findutils gcc make flex openssh-clients +then continue with the git clone... above. + +Arch Linux: +# pacman -Syu --noconfirm && pacman -S --noconfirm automake gcc autoconf flex \ + bison gettext ca-certificates pkg-config make git openssh +And for redistributing: +# pacman -S --noconfirm lynx htmldoc asciidoc lzip rsync perl-carp-always \ + perl-encode-locale python-docutils pandoc + +OpenSUSE Linux (Tumbleweed should work, Leap may not be fit for redistributing): +# zypper up -y +# zypper in -y automake autoconf gcc bison flex pkgconf-pkg-config \ + libopenssl-devel openssh git gcc gettext-tools tar make +And for redistributing: +# zypper in -y asciidoc lynx htmldoc perl-Carp-Always rsync lzip \ + perl-Encode-Locale pandoc python-docutils diff --git a/README.packaging b/README.packaging index 819d0613..e9c49b86 100644 --- a/README.packaging +++ b/README.packaging @@ -8,23 +8,42 @@ Greetings, dear packager! The bullet points below mention a few useful hints for package(r)s: -- Fetchmail requires OpenSSL v1.1.1. Fetchmail 6.4 tolerates 1.0.2 for now - but assumes the distributor backports security fixes for it. - -- Fetchmail now uses automake and supports all common automake targets and +- Mind the license difficulties around GPL'd software mixing in + OpenSSL/SSLeay licensed or Apache licensed code! + You cannot use OpenSSL derivative works such as LibreSSL that incur the + OpenSSL or SSLeay licensing terms, see COPYING for details. + +- Note OpenSSL's license changes between v1.1.1 and v3.0. See COPYING. + +- Fetchmail requires OpenSSL or wolfSSL, for details, see README.SSL. + Fetchmail 6.4 tolerates 1.0.2f for now but assumes the distributor backports + security fixes for it. Only link against SSL/TLS library versions + that are license compatible or covered by the license exception, and + that receives security fixes. + +- Your configuration and examples MUST NOT encourage setups running + fetchmail as the root user. For system-wide setups, a separate user, + possibly in a dedicated group of its own, should be used. + If you want to support --mda setups that impersonate other users, + DO NOT suggest or endorse unmaintained software such as procmail. + Instead, suggest maintained software that supports a "delivery mode", + for instance, Sam Varshavchik's maildrop (which is part of the Courier-MTA + and available separately) and which was designed to be installed set-uid. + +- Fetchmail uses GNU automake/autoconf and supports all common targets and overrides such as "make install-strip" or "DESTDIR=..." for staging areas. - The fetchmailconf script is named fetchmailconf.py, automake will install it into Python's top-level site-packages directory and byte-compile it (so you need to package or remove fetchmailconf.pyc and fetchmailconf.pyo as well). -- If you want to defeat Python byte-code compilation and would rather like to - install fetchmailconf.py yourself, you can add + > If you want to defeat Python byte-code compilation and would rather like to + install fetchmailconf.py yourself, you can add PYTHON=: - to the ./configure command or pass this in the environment. This pretends - that no Python interpreter were installed. + to the ./configure command or pass this in the environment. This pretends + to the configure script that no Python interpreter were installed. - The Makefile generates a two-line "fetchmailconf" /bin/sh wrapper script that executes the actual fetchmailconf.py with the python installation found at diff --git a/RELEASE-INSTRUCTIONS b/RELEASE-INSTRUCTIONS index 6e4d431b..81c6ba52 100644 --- a/RELEASE-INSTRUCTIONS +++ b/RELEASE-INSTRUCTIONS @@ -16,5 +16,7 @@ To do a release: - Upload sig and tarball to sourceforge, per <https://sourceforge.net/p/forge/documentation/Release%20Files%20for%20Download/#rsync> -- Update the fetchmail website for version, link to release nodes +- Update the fetchmail website for version, link to release notes (update release_id) and last update, commit, and upload. + +- On sourceforge.net, mark the new release as the default download. @@ -27,6 +27,11 @@ static const char base64val[] = { }; #define DECODE64(c) (isascii((unsigned char)(c)) ? base64val[c] : BAD) +unsigned len64frombits(unsigned inlen) +{ + return (inlen + 2)/3*4; +} + int to64frombits(char *out, const void *in_, int inlen, size_t outlen) /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */ { diff --git a/configure.ac b/configure.ac index 510ff6f2..035e730a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl Process this file with autoconf to produce a configure script. dnl dnl XXX - if bumping version here, check fetchmail.man, too! -AC_INIT([fetchmail],[6.4.20],[fetchmail-users@lists.sourceforge.net]) +AC_INIT([fetchmail],[6.4.38],[fetchmail-users@lists.sourceforge.net]) AC_CONFIG_SRCDIR([fetchmail.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_LIBOBJ_DIR([.]) @@ -30,7 +30,11 @@ dnl python is optional # # recent Python 3.x versions are supported. # -AM_PATH_PYTHON(2.7,,AC_MSG_WARN([Disabling fetchmailconf: python 2.7 or greater not found])) +try27=0 +AM_PATH_PYTHON([3.7],,[try27=1]) +if test try27 != 0 ; then + AM_PATH_PYTHON([2.7],,AC_MSG_WARN([[Disabling fetchmailconf: python 2.7 or 3.7 or greater not found]]) ) +fi AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) AC_USE_SYSTEM_EXTENSIONS @@ -42,6 +46,12 @@ AC_PROG_CPP dnl Later checks need this. AM_PROG_AR AC_PROG_RANLIB AM_PROG_CC_C_O +PKG_PROG_PKG_CONFIG + +AC_CHECK_PROGS([RST2HTML], [rst2html5.py rst2html5], [false]) +AC_CHECK_PROGS([HTMLDOC], [htmldoc], [${srcdir}/dist-tools/htmldoc]) + +AC_LIB_RPATH AC_ISC_POSIX dnl AC_ISC_POSIX: - XXX FIXME: remove in fetchmail 6.4. @@ -168,7 +178,7 @@ dnl addition of libintl to the build, which is both undesired dnl and breaks on Solaris/Blastwave.org machines. dnl dnl AC_CHECK_LIB(intl, gettext, -dnl [LIBS="$LIBS -lintl"]) +dnl [LIBS="$LIBS -lintl"]) AC_REPLACE_FUNCS([strstr strcasecmp memmove stpcpy strlcpy strlcat]) @@ -367,6 +377,7 @@ esac AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) ### use option --enable-POP2 to compile in the POP2 support AC_ARG_ENABLE(POP2, @@ -612,7 +623,7 @@ else AC_DEFINE(KERBEROS_V5) test "$dir" != "/usr" && CFLAGS="$CFLAGS -I$dir/include" LDFLAGS="$LDFLAGS -L$dir/lib" - LIBS="$LIBS $ac_krblibs $libk5crypto" + LIBS="$LIBS $ac_krblibs $libk5crypto" with_kerberos5=$dir break else @@ -717,102 +728,185 @@ if test "$KERBEROS_V4" = 1 ; then fi AM_CONDITIONAL(KERBEROS_V4_ENABLE, test "$KERBEROS_V4" = 1) -### use option --with-ssl to compile in the SSL support -AC_ARG_WITH(ssl, - [AS_HELP_STRING([--with-ssl[[={yes|no|DIR}]]],[Use OpenSSL from - DIR/include/openssl and - DIR/lib (default: yes). Yes means try to find it.])], - [with_ssl=$withval], - [with_ssl=yes]) - -if test "$with_ssl" = "yes" -then - # User didn't specify an SSL location. Let's look at some common - # directories where SSL has been found in the past and try and auto - # configure for SSL. OpenSSL determination will be made later. - # This will screw up if an OpenSSL install is located in a later - # directory than an older SSLeay install, but the user should fix that - # anyways and he can override on the configure line. - # Just testing for directories is not sufficient, /usr exists on - # all systems! - for ac_dir in \ - /usr/local/ssl \ - /usr/local \ - /usr/ssl \ - /usr \ - /local/ssl \ - /opt/ssl \ - /opt/csw \ - ; \ - do - if test -r "$ac_dir/include/openssl/ssl.h" ; then - with_ssl=$ac_dir - break; - fi - done -fi +openssldefault=yes +AC_ARG_WITH(wolfssl, + [AS_HELP_STRING([--with-wolfssl={DIR|no}], + [EXPERIMENTAL: Use wolfSSL and its OpenSSL compatibility layer])], + [with_wolfssl=$withval], [with_wolfssl=no]) +if test "$with_wolfssl" != "no" ; then + if test -x "$WOLFSSL_CONFIG" ; then + _WOLFSSLCONF="$WOLFSSL_CONFIG" + elif test yes != "$with_wolfssl" -a -x "${with_wolfssl}/bin/wolfssl-config" ; then + _WOLFSSLCONF=${with_wolfssl}/bin/wolfssl-config + else + _WOLFSSLCONF=wolfssl-config + fi + if test yes = "$with_wolfssl" && "$_WOLFSSLCONF" >/dev/null 2>&1 --version ; then + with_wolfssl="$(${_WOLFSSLCONF} --prefix)" + fi + if "$_WOLFSSLCONF" >/dev/null 2>&1 --version ; then + wolfCFLAGS="$(${_WOLFSSLCONF} --cflags)" + wolfLIBS="$(${_WOLFSSLCONF} --libs)" + elif test -d "${with_wolfssl}/include" -a -d "${with_wolfssl}/lib" ; then + wolfCFLAGS="-I${with_wolfssl}/include" + wolfLIBS="-L${with_wolfssl}/lib -lwolfssl -lpthread" + AS_MESSAGE([wolfssl-config not found nor executable, falling back to CFLAGS $wolfCFLAGS, LIBS $wolfLIBS]) + else + AC_MSG_ERROR([WolfSSL not found - please specify proper location to --with-wolfssl]) + fi + set -- $wolfLIBS + while test $# -ge 1 ; do + case $1 in -l*|lib*) : ;; + *) LDFLAGS="$LDFLAGS $1" ;; + esac + shift + done + CPPFLAGS="$CPPFLAGS $wolfCFLAGS -I${with_wolfssl}/include/wolfssl" + AC_CHECK_HEADERS([wolfssl/options.h]) + AC_LIB_LINKFLAGS([wolfssl]) + LIBS="$LIBWOLFSSL $LIBS" + openssldefault=no + AC_DEFINE(SSL_ENABLE, 1) + with_ssl=yes + if test -z "$WOLFSSL_TRUST_FILE" ; then + AC_MSG_ERROR([You must define WOLFSSL_TRUST_FILE and point it to the default CA certificate file (PEM format)]) + fi + AS_MESSAGE([Enabling wolfSSL support.]) + AC_DEFINE_UNQUOTED(WOLFSSL_TRUST_FILE, "$WOLFSSL_TRUST_FILE", + [Set to the default file of trusted certificates.]) +else + ### use option --with-ssl to compile in the SSL support + AC_ARG_WITH(ssl, + [AS_HELP_STRING([--with-ssl[[={yes|no|DIR}]]],[Use OpenSSL from + DIR/include/openssl and + DIR/lib (default: yes). Yes means try to find it.])], + [with_ssl=$withval], + [with_ssl=$openssldefault]) -if test -n "$with_ssl" -a "$with_ssl" != "no" -then - # With the autoconfigure above, the only time this is going to be - # true is going to be when we could not find the headers. If they - # are not in system standard locations, we are going to be broken. if test "$with_ssl" = "yes" then - # Let's just define the standard location for the SSLeay root - with_ssl="/usr/local/ssl" + # User didn't specify an SSL location. Let's look at some common + # directories where SSL has been found in the past and try and auto + # configure for SSL. OpenSSL determination will be made later. + # This will screw up if an OpenSSL install is located in a later + # directory than an older SSLeay install, but the user should fix that + # anyways and he can override on the configure line. + # Just testing for directories is not sufficient, /usr exists on + # all systems! + for ac_dir in \ + /usr/local/ssl \ + /usr/local \ + /usr/ssl \ + /usr \ + /local/ssl \ + /opt/ssl \ + /opt/csw \ + ; \ + do + if test -r "$ac_dir/include/openssl/ssl.h" ; then + with_ssl=$ac_dir + break; + fi + done fi - if test -r $with_ssl/include/openssl/ssl.h + + if test -n "$with_ssl" -a "$with_ssl" != "no" then - ### ssl.h found under openssl. Use openssl configuration preferentially, - AC_MSG_NOTICE(Enabling OpenSSL support in $with_ssl.) - test "$with_ssl" != "/usr" && CFLAGS="$CFLAGS -I$with_ssl/include" LDFLAGS="$LDFLAGS -L$with_ssl/lib" - ### In Red Hat 9, this file includes a reference to <krb5.h>, so we - ### force the Kerberos directory onto the include path so it will build. - CFLAGS="$CFLAGS -I/usr/kerberos/include" - ### OpenBSD comes with ssl headers - else - AC_MSG_ERROR([SSL support enabled, but OpenSSL not found]) - fi - PKG_CHECK_MODULES([SSL],[libssl libcrypto],[LIBS="$LIBS $SSL_LIBS"],[ - AS_MESSAGE([SSL-check: pkg-config check failed, using traditional probe]) - LDFLAGS="$LDFLAGS -L$with_ssl/lib" - AC_LIB_LINKFLAGS([crypto]) - AC_LIB_LINKFLAGS([ssl], [crypto]) - LIBS="$LIBS $LIBSSL $LIBCRYPTO" - dnl check if -ldl is needed - AC_MSG_CHECKING([for additional library dependencies of SSL]) + # With the autoconfigure above, the only time this is going to be + # true is going to be when we could not find the headers. If they + # are not in system standard locations, we are going to be broken. + if test "$with_ssl" = "yes" + then + # Let's just define the standard location for the SSLeay root + with_ssl="/usr/local/ssl" + fi + if test -r $with_ssl/include/openssl/ssl.h + then + ### ssl.h found under openssl. Use openssl configuration preferentially, + AC_MSG_NOTICE(Enabling OpenSSL support in $with_ssl.) + test "$with_ssl" != "/usr" && CFLAGS="$CFLAGS -I$with_ssl/include" LIBS="-L$with_ssl/lib $LIBS" + ### In Red Hat 9, this file includes a reference to <krb5.h>, so we + ### force the Kerberos directory onto the include path so it will build. + CFLAGS="$CFLAGS -I/usr/kerberos/include" + ### OpenBSD comes with ssl headers + else + case "$with_ssl" in */*) + AC_MSG_ERROR([SSL support enabled, but OpenSSL not found]) + ;; + *) + ;; + esac + fi + modules=openssl + case "$with_ssl" in */*) ;; *) modules="$with_ssl $modules" ;; esac found=0 - save_LIBS="$LIBS" - for i in "" "-ldl" ; do - LIBS="$LDFLAGS $save_LIBS $i" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <openssl/ssl.h>],[SSL_connect((SSL *)0)])],[found=1; break]) + test -n "$PKG_CONFIG" && for i in $modules ; do + AS_MESSAGE([SSL-check: trying pkg-config for $i]) + AS_MESSAGE([NOTE: libdir=$libdir]) + PKG_CHECK_MODULES([SSL],[$i],[ + set -- $SSL_LIBS + while test $# -ge 1 ; do + case $1 in -l*|lib*) LIBS="$LIBS $1" ;; + *) LDFLAGS="$LDFLAGS $1" ;; + esac + shift + done + CPPFLAGS="$SSL_CFLAGS $CPPFLAGS" + AS_MESSAGE([From pkg-config: $SSL_LIBS]) + AC_LIB_LINKFLAGS_FROM_LIBS([SSL_LDFLAGS],[$LIBS $SSL_LIBS]) + AS_MESSAGE([derived LDFLAGS: $SSL_LDFLAGS]) + LDFLAGS="$SSL_LDFLAGS $LDFLAGS" + found=1 + break],[: ignore-error]) done - if test $found = 0 ; then - AC_MSG_RESULT([error]) - AC_MSG_ERROR([cannot link with SSL - check config.log]) + if test $found -eq 0 ; then + AS_MESSAGE([SSL-check: pkg-config check failed, using traditional probe in $with_ssl]) + LDFLAGS="$LDFLAGS -L$with_ssl/lib" + CPPFLAGS="$CPPFLAGS -I$with_ssl/include" + AC_LIB_LINKFLAGS([ssl], [crypto]) + AS_MESSAGE([From probing: Adding $LIBSSL to LIBS. LDFLAGS=$LDFLAGS]) + LIBS="$LIBS $LIBSSL" + dnl check if -ldl is needed + AC_MSG_CHECKING([for additional library dependencies of SSL (-ldl?)]) + found=0 + save_LIBS="$LIBS" + for i in "" "-ldl" ; do + LIBS="$LDFLAGS $save_LIBS $i" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <openssl/ssl.h>],[SSL_connect((SSL *)0)])],[found=1; break]) + done + if test $found = 0 ; then + AC_MSG_RESULT([error]) + AC_MSG_ERROR([cannot link with SSL - check config.log]) + fi + LIBS="$save_LIBS $i" + if test "$i" = "" ; then i="(none)" ; fi + AC_MSG_RESULT($i) fi - LIBS="$save_LIBS $i" - if test "$i" = "" ; then i="(none)" ; fi - AC_MSG_RESULT($i) - ]) - AC_DEFINE(SSL_ENABLE, 1, [Define if you want SSL support compiled in]) - AS_MESSAGE(Enabling SSL support.) -else - AC_MSG_WARN(Disabling SSL support.) - AC_MSG_WARN(Consider re-running configure --with-ssl.) -fi - -if test "$cross_compiling" != yes -a "$with_ssl" != "no" -then - AC_LIB_LINKFLAGS([crypto]) - AC_LIB_LINKFLAGS([ssl], [crypto]) - - LIBS="$LIBS $LIBSSL $LIBCRYPTO" + AC_DEFINE(SSL_ENABLE, 1, [Define if you want SSL support compiled in]) + AS_MESSAGE([Enabling OpenSSL support.]) + else + AC_MSG_WARN(Disabling SSL support.) + AC_MSG_WARN(Consider re-running configure --with-ssl.) + fi fi -AC_MSG_NOTICE([LIBS:] "$LIBS") -case "$LIBS" in *-lssl*|*libssl*) +AS_MESSAGE([ + CC: $CC + CPPFLAGS: $CPPFLAGS + CFLAGS: $CFLAGS + LDFLAGS: $LDFLAGS + LIBS: $LIBS]) + +case "$LIBS" in *-lssl*|*libssl*|*-lwolfssl*|*libwolfssl*) + case $host_os in + openbsd*) ;; dnl OpenBSD ships LibreSSL in the base operating system + dnl so makes use of the GPL2 clause 3 exception. + *) + AC_CHECK_DECLS([LIBRESSL_VERSION_NUMBER], + AC_MSG_ERROR([fetchmail cannot legally be linked against LibreSSL for lack of GPL2 clause 2b exception. See COPYING.]),, + [#include <openssl/ssl.h>]) + ;; + esac AC_CHECK_DECLS([TLS1_3_VERSION],, AC_MSG_WARN([Your OpenSSL version is too old and does not support TLS v1.3. Upgrade.]), [#include <openssl/ssl.h>]) @@ -856,7 +950,7 @@ then ac_savedLDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $LDFLAGS" AC_CHECK_LIB(socks5, SOCKSconnect,, - AC_MSG_ERROR([could not find libsocks5 which is needed for built-in SOCKS5 support])) + AC_MSG_ERROR([could not find libsocks5 which is needed for built-in SOCKS5 support])) AC_DEFINE(HAVE_SOCKS) CFLAGS="$CFLAGS -Dconnect=SOCKSconnect -Dgetsockname=SOCKSgetsockname -Dbind=SOCKSbind -Daccept=SOCKSaccept -Dlisten=SOCKSlisten -Dselect=SOCKSselect -Drecvfrom=SOCKSrecvfrom -Dsendto=SOCKSsendto -Drecv=SOCKSrecv -Dsend=SOCKSsend -Dread=SOCKSread -Dwrite=SOCKSwrite -Drresvport=SOCKSrresvport -Dshutdown=SOCKSshutdown -Dlisten=SOCKSlisten -Dclose=SOCKSclose -Ddup=SOCKSdup -Ddup2=SOCKSdup2" AC_CHECK_FUNC(SOCKSfclose, [CFLAGS="$CFLAGS -Dfclose=SOCKSfclose"]) diff --git a/contrib/fetchsetup b/contrib/fetchsetup index 83223a11..b2cd8dbd 100755 --- a/contrib/fetchsetup +++ b/contrib/fetchsetup @@ -64,8 +64,8 @@ echo "protocol $PROTO" >> $HOME/.fetchmailrc echo 'username "'$USR'"' >> $HOME/.fetchmailrc echo 'password "'$PASS'"' >> $HOME/.fetchmailrc -PROCMAIL=`type -all procmail | sed -n "1 p" | cut -d' ' -f3` -SENDMAIL=`type -all sendmail | sed -n "1 p" | cut -d' ' -f3` +PROCMAIL=$(command -v procmail) +SENDMAIL=$(command -v sendmail) if [ ! "$PROCMAIL" = "" ]; then echo 'mda "'$PROCMAIL -d %s'"' >> $HOME/.fetchmailrc diff --git a/contrib/runfetchmail b/contrib/runfetchmail index 2b40f511..799f671a 100644 --- a/contrib/runfetchmail +++ b/contrib/runfetchmail @@ -90,15 +90,14 @@ VERSION="Runfetchmail 1.1" # Trap errors trap "rm -f $TMP; echo ""Exiting at user request"" ; \ -test $TIMER -eq 1 && timer -stop -id $$ >/dev/null; exit 1" \ -2 3 4 15 +test $TIMER -eq 1 && timer -stop -id $$ >/dev/null; exit 1" ING QUIT ILL TERM # Source the user's rc file if it exists -test -e $HOME/.runfetchmailrc && . $HOME/.runfetchmailrc +test -e $HOME/.runfetchmailrc && . $HOME/.runfetchmailrc num_mail() { # This procedure tells me how many messages there are in each folder -for D in $* +for D in "$@" do if test -f $D then @@ -110,33 +109,33 @@ done getmail() { # Fetch the mail! -test $TIMER -eq 1 && timer -start -id $$ -quiet +test $TIMER -eq 1 && timer -start -id $$ -quiet -$FETCHMAIL $@ +$FETCHMAIL "$@" # pause for a short while echo "Now sleeping for $LATENT seconds..." echo -n "Zzz...Zzz...Zzz..." sleep $LATENT -echo "wakeup time! <yawn>" +echo "wakeup time! <yawn<" } stats() { # Prepare the statistics # Ensure we have a log file -test ! -e $LOG && touch $LOG +test ! -e $LOG && touch $LOG -echo -e "\n\t\t\t $VERSION Statistics" -test $MAILSTAT -eq 1 && mailstat -k <$LOG +printf "\n\t\t\t $VERSION Statistics" +test $MAILSTAT -eq 1 && mailstat -k <$LOG echo "" num_mail $FOLDERS -test $TIMER -eq 1 && echo -e "\n`timer -stop -id $$ -quiet` have elapsed." +test $TIMER -eq 1 && printf "\n`timer -stop -id $$ -quiet` have elapsed." } prepmail() { # Let's prepare our e-mail -cat <<EOF >$TMP +cat <<EOF >$TMP From: $LOGNAME ($VERSION) To: $LOGNAME X-Loop: $SELF @@ -152,10 +151,12 @@ rm -f $LOG clear # Create and secure the temporary file -test $E_MAIL -eq 1 && { cat /dev/null >$TMP; chmod 600 $TMP } +test $E_MAIL -eq 1 && { + cat /dev/null <$TMP; chmod 600 $TMP +} # Prepare the e-mail before the logs are added to it -test $E_MAIL -eq 1 && prepmail +test $E_MAIL -eq 1 && prepmail # See if we are downloading every message or not if test "$1" = "-every" @@ -165,18 +166,19 @@ then fi # Fetch the mail and have the output written to stdout and (optionally) $TMP -test $E_MAIL -eq 1 && getmail $@ 2>&1 |tee -a $TMP || getmail $@ +test $E_MAIL -eq 1 && getmail "$@" 2<&1 |tee -a $TMP || getmail "$@" clear # Do the same thing with the statistics -test $E_MAIL -eq 1 && stats $@ 2>&1 |tee -a $TMP || stats $@ +test $E_MAIL -eq 1 && stats "$@" 2<&1 |tee -a $TMP || stats "$@" # Now send $TMP to myself and clean up the mess -test $E_MAIL -eq 1 && { cat $TMP |$SENDMAIL; rm -f $TMP } +test $E_MAIL -eq 1 && { + cat "$TMP|$SENDMAIL"; rm -f "$TMP" +} # cleanup the log file for next time rm -f $LOG # The End - diff --git a/contrib/systemd/README b/contrib/systemd/README new file mode 100644 index 00000000..6ac889c1 --- /dev/null +++ b/contrib/systemd/README @@ -0,0 +1,3 @@ +README.systemd and fetchmail.service were contributed by +Barak A. Pearlmutter <barak@pearlmutter.net> on 2021-11-23 +through Debian's Bug Tracking System, https://bugs.debian.org/981464 diff --git a/contrib/systemd/README.systemd b/contrib/systemd/README.systemd new file mode 100644 index 00000000..fd7229a0 --- /dev/null +++ b/contrib/systemd/README.systemd @@ -0,0 +1,23 @@ +To run fetchmail as a systemd user service, for an individual user: + +(1) Configuration + +Set up your .fetchmailrc so that "fetchmail --nodetach" actually +fetches your mail correctly. + +(2) Tell systemd to run it as a service + +Allow daemons to keep running after you log out (optional): +$ sudo loginctl enable-linger $USERNAME + +Make the service available: +$ systemctl --user enable fetchmail.service + +Actually turn it on: +$ systemctl --user start fetchmail.service + +Monitor it, to check if it's okay: +$ systemctl --user status fetchmail.service + +Monitor it harder: +$ journalctl --user -xeu fetchmail.service diff --git a/contrib/systemd/fetchmail.service b/contrib/systemd/fetchmail.service new file mode 100644 index 00000000..4f0bf410 --- /dev/null +++ b/contrib/systemd/fetchmail.service @@ -0,0 +1,13 @@ +# /usr/lib/systemd/user/fetchmail.service +# or any other location per man:systemd.unit(5) +[Unit] +Description=Fetchmail Daemon +Documentation=man:fetchmail(1) + +[Service] +ExecStart=fetchmail --nodetach --daemon 300 +ExecStop=fetchmail --quit +Restart=always + +[Install] +WantedBy=default.target diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 00000000..2e49da63 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,39 @@ +fetchmail (6.4.23-1) unstable; urgency=medium + + For common ssh-based IMAP PREAUTH setups (i. e. those that use a plugin + - no matter its contents - and that set auth ssh), change the STARTTLS + error message to suggest sslproto '' instead. + This is a commonly reported issue after the CVE-2021-39272 fix in + 6.4.22. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 11 Dec 2021 17:12:55 +0100 + +fetchmail (6.3.6~rc3-1) unstable; urgency=low + + Using at least one of the options "sslproto 'tls1'", "sslfingerprint" or + "sslcertck" enforces STARTTLS for POP3 and IMAP and terminates the connection + if unsuccessful. The same configuration causes permanent connection failure + with POP2, which is obsolete and does not support STLS. fetchmail 6.3.5 and + older had no way to enforce TLS. With those older versions, TLS was always + opportunistic, but fetchmail would happily transmit the password in cleartext + if STARTTLS failed. + Configurations using --ssl --sslcertck however have been safe. + + -- Nico Golde <nico@ngolde.de> Tue, 21 Nov 2006 17:39:37 +0100 + +fetchmail (6.3.1-1) unstable; urgency=low + + File /etc/default/fetchamil has been added to stablish if user wants to + start fetchmail on boot or not. + On install time we try to determine from old version if start or not. + Default will be to not start. + This addition is necessary since upgrades of the package while the users + hadn't finish to configure fetchmail properly were breaking the upgrade. + This had bitten quite a few users. + The fetchmail-ssl dummy package has been removed since it is no longer + needed. + Due to #327250 fetchmail home directory (/var/run/fetchmail) changed to + /var/lib/fetchmail + + -- Hector Garcia <hector@debian.org> Mon, 9 Jan 2006 23:24:29 +0100 + diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 00000000..ab213ddb --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,165 @@ +Fetchmail for Debian, README file +$Id: README.Debian 228 2005-08-14 15:52:49Z nion $ + +Miscellaneous notes +------------------- + +Fetchmail wants a MTA and will not use a MDA fallback by default anymore. +Please configure it correctly for your system. + +Also, MTA return codes 552 and 553 always cause fetchmail to trash the message, +unless "keep" mode is being used. MTA return codes in the "antispam" option +list will also cause mail loss. However, this list is empty by default. + + +Build instructions +------------------ + +Make sure to run "debian/rules clean" BEFORE you try to build the package +(dpkg-buildpackage will do that for you). You have been warned. + +You can tailor the capabilities of fetchmail (e.g. to add Kerberos IV support) +by defining DEB_FETCHMAIL_BUILD_OPTIONS before building the package. There is +no need to edit debian/rules anymore. Please read the comments in debian/rules +for more information. + +Building KerberosV support using the Heimdal libs in Debian will only work in +the SSL version of fetchmail. + + +Fetchmail and losing mail +------------------------- + +POP3 servers are known to delete stored mail for no good reason, no matter what +it is told to do. Badly-configured MTAs are known to send email to the trash or +bounce it with spam return codes -- including email sent to the postmaster. And +fetchmail is known to be blamed for both these things causing mail loss. + +SEND EMAIL TO YOURSELF MANUALLY TROUGH WHICHEVER DELIVERY METHOD YOU WANT +FETCHMAIL TO SEND THROUGH, TO TEST IT BEFORE RUNNING FETCHMAIL. + +CHECK YOUR MTA AND POP3 SERVER BY TELLING FETCHMAIL NOT TO DELETE MAIL FROM +YOUR SERVER ("keep" option) NOR DELETE SPAM ("antispam -1") NOR BOUNCE MAIL +("set no bouncemail") IF YOU VALUE YOUR EMAIL. YOU HAVE BEEN WARNED. + +The above checks should be made every time you change something important in +either fetchmail's or the MTA/MDA configuration. + +Now, let's go over it once again: Fetchmail can, and will delete your mail if +it thinks the MTA is telling it to do so. Option "keep" will avoid the +deletion of messages. If you forget to tell fetchmail to "keep" messages, and +the MTA refuses delivery (particularly with codes 552 (message too large) or 553 +(invalid envelope sender), fetchmail will delete the message even when it +failed to deliver it. Setting "no bouncemail" and "antispam -1" makes such +deletion less likely. + + +Using the system-wide fetchmail +------------------------------- + +The fetchmail package install a SysV init script in /etc/init.d/fetchmail. +This script will start a fetchmail daemon running as the user fetchmail, if +the configuration file /etc/fetchmailrc is present in the system. If the +configuration file is not present, nothing is started. + +If the system-wide fetchmail refuses to start, you probably have syntax +errors in the /etc/fetchmailrc file. Try /etc/init.d/fetchmail debug-run +to find out why it is not starting. Do notice that debug-run is *not* +capable of detecting errors that happen only in daemon mode. + +By default, the system-wide fetchmail daemon will poll every 5 minutes. To +change this, add a line like the following to your /etc/fetchmailrc file: + + set daemon 900 # poll every 15 minutes + +Also, the system-wide fetchmail daemon will by default log all output to +syslog. To disable this (e.g. if you use the logfile option), add the +following to your /etc/fetchmailrc file: + + set no syslog # disable logging to syslog + + +Fetchmail on a PPP link +----------------------- + +By default, the system-wide fetchmail will start at boot, and will be +restarted when the PPP link is brought up. You, can however, configure +the system-wide fetchmail to *only* run when the PPP link is up (note +that this has no real advantage over running fetchmail all the time). To +do so, you must do four things: + + 1. Turn of fetchmail at boot. Simply rename the S99fetchmail links in + the /etc/rc?.d directories to K15fetchmail. For example: + + # cd /etc/rc2.d + # mv S99fetchmail K15fetchmail + + Under Debian, it is advised to use generic commands: + # invoke-rc.d fetchmail stop + # update-rc.d fetchmail remove + + 2. Edit the ip-up script as described in the comments. + + 3. Edit the ip-down script as describe in the comments. + + 4. Remove /etc/resolvconf/update-libc.d/fetchmail (or add an "exit 0" + line at the beginning). + +Note that both the init script and the fetchmail PPP scripts are conffiles, +so if you don't like the setup you just need to change them to your heart's +content. The changes will not be overwritten by a package upgrade without +your explicit consent. + + +Running the system-wide fetchmail as root +----------------------------------------- + +The fetchmail package no longer supports running the system-wide fetchmail +as root. To switch to the new init script facility, just move your +/root/.fetchmailrc to /etc/fetchmailrc, read the "UIDL cache" section below, +and run: + + invoke-rc.d fetchmail restart + + +The UIDL cache +-------------- + +Fetchmail has an UIDL cache it may use to track message-seen state. The +init script and ip-up scripts want this cache to be in +/var/mail/.fetchmail-UIDL-cache. Note the paths leading up to the UIDL +cache file must be readable by the fetchmail user. This should not be a +problem on a default Debian install. + + +Errors with POP3 servers +------------------------ + +If you have difficulties with your POP3 server, and fetchmail -v shows that +fetchmail is trying to use AUTH instead of USER and PASS, you can use +"auth password" to force the use of USER and PASS. Also, fetchmailconf has +a blacklist of known-bad servers, try autodetecting the server with it. + + +Reporting problems +------------------ + +Use a Debian bug-reporting tool (e.g. reportbug from the reportbug package) to +report problems. Please include a fetchmail -v -v dump showing the problem to +aid debugging. /etc/init.d/fetchmail debug-run will do that for you if you are +using the system-wide fetchmail feature (Do remember that problems that only +happen in daemon mode are NOT triggered by debug-run). + +Problems with signals (e.g. "why fetchmail aborts with SIGPIPE?") need the use +of strace for debugging. Just do: + + /etc/init.d/fetchmail debug-run strace -o /tmp/strace.out + +and the init script will run fetchmail, and store the strace output in +/tmp/strace.out. See strace(1) for more details on strace. + +WARNING: strace output may contain security-sensitive information, such as your +fetchmail passwords. You should clobber those with "*" or "X" before sending +the file to anyone, especially the Debian bug-tracking system. + + -- Nicolas Boulenguez <nicolas@debian.org>, Tue, 10 Apr 2018 15:26:22 +0200 diff --git a/debian/README.contrib b/debian/README.contrib new file mode 100644 index 00000000..9f4260dd --- /dev/null +++ b/debian/README.contrib @@ -0,0 +1,14 @@ +Fetchmail for Debian, contrib/README.Debian file +$Id: README.contrib,v 1.4 2003/06/09 14:55:57 benj Exp $ +========================================================== + +A lot of the stuff in contrib/ is NOT tailored for being run in a +Debian system, and will malfunction or break your system if not correctly +modified. If you don't know what you're doing, don't use it. I do NOT +maintain the contrib/ directory, nor does fetchmail upstream. + +I have removed some useless or outright dangerous stuff from there as +well. You can always get the complete contrib/ contents from the source +package. + + -- Benjamin Drieu <benj@debian.org> diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 00000000..5ef0b722 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,5 @@ +The source package uses quilt for the modifications of the upstream source. +If you want to change something it is best to use the quilt approach as +documented in + /usr/share/doc/quilt/README.source + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..c21c4c07 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,2970 @@ +fetchmail (6.4.38-1) unstable; urgency=medium + + * New upstream release. + * Use no for Rules-Requires-Root. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 03 Feb 2024 09:21:29 +0100 + +fetchmail (6.4.37-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Mon, 27 Feb 2023 18:42:46 +0100 + +fetchmail (6.4.36-1) unstable; urgency=medium + + * New upstream release. + * Move away dependency from lsb-base to sysvinit-utils. + * Update Standards-Version to 4.6.2 . + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Tue, 31 Jan 2023 20:52:14 +0100 + +fetchmail (6.4.35-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Tue, 10 Jan 2023 22:57:42 +0100 + +fetchmail (6.4.34-1) unstable; urgency=high + + * New upstream release: + - fixes a critical bug, softbounce not considered if SMTP sink returns + permanent error. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Tue, 18 Oct 2022 19:01:25 +0200 + +fetchmail (6.4.33-2) unstable; urgency=medium + + * Don't enable systemd user mail retrieval (closes: #1019549, #1019857). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 15 Sep 2022 19:22:24 +0200 + +fetchmail (6.4.33-1) unstable; urgency=medium + + * New upstream release. + * Update debhelper level to 13 . + * Update Standards-Version to 4.6.1 . + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 01 Sep 2022 17:14:27 +0200 + +fetchmail (6.4.32-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Wed, 03 Aug 2022 15:01:51 +0200 + +fetchmail (6.4.31-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 17 Jul 2022 17:46:48 +0000 + +fetchmail (6.4.30-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 28 Apr 2022 22:58:25 +0200 + +fetchmail (6.4.29-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 20 Mar 2022 13:14:05 +0100 + +fetchmail (6.4.28-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 06 Mar 2022 17:36:01 +0100 + +fetchmail (6.4.27-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 30 Jan 2022 15:50:35 +0100 + +fetchmail (6.4.26-1) unstable; urgency=medium + + * New upstream release. + * Update watch file. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Mon, 03 Jan 2022 13:30:25 +0100 + +fetchmail (6.4.25-1) unstable; urgency=medium + + * New upstream release. + * Add user systemd unit configuration file (closes: #981464). + * Document upstream ssh authentication change due to CVE-2021-39272 fix + (closes: #999606). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 11 Dec 2021 16:41:33 +0100 + +fetchmail (6.4.24-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Wed, 24 Nov 2021 18:41:23 +0100 + +fetchmail (6.4.23-1) unstable; urgency=medium + + * New upstream release. + * Update watch file. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Fri, 05 Nov 2021 18:44:07 +0100 + +fetchmail (6.4.22-1) unstable; urgency=high + + * New upstream release: + - fix CVE-2021-39272: fail to enforce STARTTLS session encryption in + some circumstances (closes: #993163). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Wed, 15 Sep 2021 19:04:31 +0200 + +fetchmail (6.4.21-1) unstable; urgency=medium + + * New upstream release. + * Fix envelope segmentation fault (closes: #992400). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Wed, 18 Aug 2021 20:00:28 +0200 + +fetchmail (6.4.16-5) unstable; urgency=medium + + * Backport upstream regression fix for 6.4.20's security (CVE-2021-36386) + fix. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Mon, 09 Aug 2021 20:06:48 +0200 + +fetchmail (6.4.16-4) unstable; urgency=high + + * Backport upstream security fix for CVE-2021-36386: denial of service or + information disclosure when logging long messages. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 29 Jul 2021 00:18:56 +0200 + +fetchmail (6.4.16-3) unstable; urgency=medium + + * Fix operation autopkgtest. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 26 Jun 2021 23:53:00 +0200 + +fetchmail (6.4.16-2) unstable; urgency=medium + + * Backport upstream fix for memory leak in timeout situation for LOGIN auth. + * Backport upstream man page update. + * Sync with Ubuntu. + + [ Bryce Harrington <bryce@canonical.com> ] + * d/t/control: Invoke upstream testsuite via make check. + * d/t/control, d/t/operation, d/t/mock-pop3-server.py: Add DEP8 test + for checking fetchmail's POP3 functionality. + (LP: #1677818) + + [ Francesco P. Lovergine <frankie@debian.org> ] + * Only pass pidfile to fetchmail in daemon mode (closes: #989929). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 24 Jun 2021 18:37:01 +0200 + +fetchmail (6.4.16-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 13 Feb 2021 08:47:50 +0100 + +fetchmail (6.4.15-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 09 Jan 2021 11:00:33 +0100 + +fetchmail (6.4.14-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 29 Nov 2020 14:29:05 +0100 + +fetchmail (6.4.13-2) unstable; urgency=medium + + * Remove forced OpenSSL version check (closes: #973472). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 19 Nov 2020 19:28:12 +0100 + +fetchmail (6.4.13-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 29 Oct 2020 06:47:13 +0100 + +fetchmail (6.4.12-1) unstable; urgency=medium + + * New upstream release. + * Update watch file. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Fri, 04 Sep 2020 17:04:47 +0200 + +fetchmail (6.4.11-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 30 Aug 2020 07:29:47 +0200 + +fetchmail (6.4.8-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Mon, 15 Jun 2020 18:35:31 +0200 + +fetchmail (6.4.6-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 31 May 2020 18:32:17 +0200 + +fetchmail (6.4.5-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 16 May 2020 10:16:46 +0000 + +fetchmail (6.4.4-1) unstable; urgency=medium + + * New upstream release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Tue, 28 Apr 2020 18:55:30 +0000 + +fetchmail (6.4.3-1) unstable; urgency=medium + + * New upstream release. + * Update watch file. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 19 Apr 2020 12:00:51 +0000 + +fetchmail (6.4.2-2) unstable; urgency=medium + + * Allow stderr on service testing. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 16 Feb 2020 15:52:30 +0000 + +fetchmail (6.4.2-1) unstable; urgency=medium + + * New upstream release. + * Sync with Ubuntu. + + [ Bryce Harrington <bryce@canonical.com> ] + * d/tests: Add basic dep8 test cases. This adds a trivial test to + verify installation of the main bits, and that the service is up + and running. Partially addresses LP #1677818 "Missing dep8 + tests", however a true fix will also test email fetching from a + (local) mail service. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 15 Feb 2020 19:03:16 +0000 + +fetchmail (6.4.2~rc3-1) unstable; urgency=medium + + * New upstream RC release. + * Update Standards-Version to 4.5.0 . + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Tue, 11 Feb 2020 21:38:49 +0000 + +fetchmail (6.4.1-1) unstable; urgency=medium + + * New upstream release: + - fix default file locations regression, + - fix regression under _FORTIFY_SOURCE where + PATH_MAX > minimal _POSIX_PATH_MAX (closes: #941308). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 28 Sep 2019 14:17:50 +0000 + +fetchmail (6.4.0-1) unstable; urgency=medium + + * New major upstream release: + - fix pidfile behavior (closes: #941129). + * Update watch file. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 28 Sep 2019 06:58:50 +0000 + +fetchmail (6.4.0~rc4-2) unstable; urgency=medium + + * Remove all parts of fetchmailconf (closes: #939522). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 05 Sep 2019 22:22:32 +0000 + +fetchmail (6.4.0~rc4-1) unstable; urgency=medium + + * New major upstream RC release. + * Remove outdated and Python 2 only fetchmailconf package (closes: #936512). + * Drop merged in patches. + * Update remaining patches. + * Remove old upgrade code from postinst. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Mon, 02 Sep 2019 18:33:18 +0000 + +fetchmail (6.4.0~rc3-1) unstable; urgency=medium + + * New major upstream RC release. + * Properly report size of mailboxes of 2 GB or above (closes: #873668). + * Update Standards-Version to 4.4.0 . + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 24 Aug 2019 16:49:45 +0000 + +fetchmail (6.4.0~rc2-1) unstable; urgency=medium + + * New major upstream RC release. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Tue, 20 Aug 2019 06:06:00 +0000 + +fetchmail (6.4.0~rc1-1) unstable; urgency=medium + + * New major upstream RC release: + - set umask properly before writing the .fetchids file (closes: #831611), + - fix clang null pointer checks to prevent potential segfaults. + * Backport fix to no longer reports System error during SSL_connect(): + Success (closes: #928916). + * Sync with Ubuntu. + + [ nick black <dankamongmen@gmail.com> ] + * Use full path for invoke-rc.d (closes: #926743). + + [ Russell Coker <russell@coker.com.au> ] + * Fix init.d script typo that breaks labelling for SE Linux + (closes: #922616). + + [ Bryce Harrington <bryce@canonical.com> ] + * TLS: set hostname for SNI. + + + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Mon, 05 Aug 2019 22:35:46 +0000 + +fetchmail (6.4.0~beta4-3) unstable; urgency=medium + + * Backport fix potential SIGSEGV in pop3_delete (closes: #921450). + * Backport native name verification for OpenSSL. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Wed, 06 Feb 2019 16:33:00 +0000 + +fetchmail (6.4.0~beta4-2) unstable; urgency=medium + + * Upload to Sid. + * Update Standards-Version to 4.3.0 . + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sun, 03 Feb 2019 15:45:40 +0000 + +fetchmail (6.4.0~beta4-1) experimental; urgency=medium + + * New major upstream beta release: + - improved TLS support (closes: #768843). + * Update watch file. + * Disable Vcs-* fields for now. + * Update debhelper level to 11: + - remove dh-autoreconf build dependency, + - remove autotools-dev build dependency, + - don't specify parallel to debhelper, + - specify restart-after-upgrade to dh_installinit . + * Update Standards-Version to 4.1.4 . + + [ Russell Coker <russell@coker.com.au> ] + * Run restorecon after creating directory from init script (closes: #752598). + + [ Nicolas Boulenguez <nicolas@debian.org> ] + * Packaging updates (closes: #895366): + - rename d/init to d/fetchmail.init, as recommended by policy, + - give standard formatting to header of 01_fetchmailconf.patch , + - remove obsolete debian/pycompat , + - fix typo in manpage, + - delegate installation of ppp and logcheck scripts to debhelper, + - delegate manpages from dh_install to more specialized + dh_installmanpages , + - install contrib files and resolvconf directly without intermediate copy + in debian/tmp , + - switch copyright to format 1.0 and add some missing licenses. + - delegate buggy installation of README.contrib to debhelper, + - per policy 4.0.0, use invoke-rc.d instead of calling /etc/init.d/* + directly, + - rules: drop paragraphe preparing unused variable CONFFLAGS , + - rules: simplify some variable affectations, + - delegate build flags stuff to dpkg-buildflags . + + [ Kevin Ryde <user42_kevin@yahoo.com.au> ] + * Let fetchmail-mode run hook after other settings (closes: #710319). + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 23 Jun 2018 15:52:22 +0000 + +fetchmail (6.3.26-3) unstable; urgency=low + + * Use short debhelper rules format. + * Update packaging to fix FTBFS if building in parallel (closes: #828299). + * Let debhelper handle invoke-rc.d and update-rc.d calls. + * Add dh-autoreconf to build dependency. + * Remove unneeded dpkg-dev build dependency. + * Update Standards-Version to 3.9.8 and debhelper level to 9 . + * Remove Nico Golde from uploaders per request. + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Thu, 03 Nov 2016 21:07:11 +0000 + +fetchmail (6.3.26-2) unstable; urgency=low + + * New maintainer (closes: #800750), keep Nico and Hector as uploaders. + * Backport upstream fix for SSLv3 removal (closes: #804604) and do not + recommend SSLv3 (closes: #801178). + * Version OpenSSL build dependency for TLSv1.2 support. + * Remove quilt from build depends and its usage. + * Add dh-python to build depends. + * Update upstream URLs. + * Update watch file. + * Update Standards-Version to 3.9.6 . + + -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Sat, 03 Oct 2015 16:32:13 +0200 + +fetchmail (6.3.26-1) unstable; urgency=low + + * New upstream release. + - Fix mimedecode option dropping last message line in certain + situations (Closes: #706045). + * remove 03_fix_command_line_combination.patch and + 02_cert-verification-memleak.patch, included upstream. + * Bump standards version, no changes required. + * Change Vcs URI to canonical URI. + * Explicitly add postfix to Should-Start for LSB init script + (Closes: #631781). + * Add proper Default-Stop entries to LSB init script header. + * Simplify resolvconf script as resolvconf doesn't call scripts + anymore with --nscd (Closes: #699425). + + -- Nico Golde <nion@debian.org> Sat, 11 May 2013 12:23:25 +0200 + +fetchmail (6.3.22-2) unstable; urgency=low + + * Fix memory leak in OpenSSL's certificate varification callback. + Thanks Erik Thiele and Dominik! (Closes: #688015). + * Fix combination of --plugin and -f - (Closes: #671294). + + -- Nico Golde <nion@debian.org> Mon, 17 Dec 2012 13:04:01 +0100 + +fetchmail (6.3.22-1) unstable; urgency=low + + * New upstream release. + - Fix minor DoS in NTLM message handling (CVE-2012-3482). + - Clears SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS as a precaution + against "BEAST" attacks (CVE-2011-3389). + * Removed 03_ssl_cert_logging.patch, incorporated by upstream. + * Removed 02_fetchmail-kill-sslv2.patch, incorporated by upstream. + * Do not log disabled daemon message as warning (Closes: #672724). + * Raise standards version, no changes required. + * Add LSB description header to init script. + + -- Nico Golde <nion@debian.org> Thu, 30 Aug 2012 15:46:27 +0200 + +fetchmail (6.3.21-4) unstable; urgency=low + + * Fix building with build-arch (Closes: #671026). + + -- Nico Golde <nion@debian.org> Tue, 01 May 2012 18:56:24 +0200 + +fetchmail (6.3.21-3) unstable; urgency=low + + * Build with hardening compiler flags (Closes: #653538). + - Add Build-Depends on dpkg-dev (>= 1.16.1~). + - Use buildflags.mk snippet in debian/rules. + - Make all hardening flags default for DEB_BUILD_MAINT_OPTIONS. + * Use log_warning_msg rather than echo to inform user that the + fetchmail daemon has been disabled. + + -- Nico Golde <nion@debian.org> Thu, 29 Dec 2011 18:55:30 +0100 + +fetchmail (6.3.21-2) unstable; urgency=low + + * Do not log server certificate message to stderr in verbose mode + (Closes: #639807). + * debian/control: Drop XS-Python-Version to allow dh_python2 to create + symlinks to all supported python versions (Closes: #626100). + patch was missing in previous upload. + * Only awake fetchmail via resolvconf, if it is actually + running (Closes: #612179). + patch was broken in previous upload. + + -- Nico Golde <nion@debian.org> Sun, 04 Sep 2011 16:00:50 +0200 + +fetchmail (6.3.21-1) unstable; urgency=low + + * New upstream release + - Do not insert null byte into the last line of a message under + certain circumstances in the IMAP client (Closes: #638773). + * debian/control: Drop XS-Python-Version to allow dh_python2 to create + symlinks to all supported python versions (Closes: #626100). + * Only awake fetchmail via resolvconf, if it is actually + running (Closes: #612179). + * Adjust 02_fetchmail-kill-sslv2.patch, german po changes have been + applied by upstream. + * debian/control: extend long description for fetchmailconf. + * debian/rules: introduce new build-arch/build-indep targets. + + -- Nico Golde <nion@debian.org> Mon, 29 Aug 2011 19:20:00 +0200 + +fetchmail (6.3.19-1) unstable; urgency=low + + [Nico Golde] + * New upstream release. + * Bump standards version, no changes needed. + * Converting from python-central to dh_python2 (Closes: #616806) + - Removed python-central from dependencies + - Bump minimum python version to 2.6.6-3~ + - Removed XB-Python-Version + - Add dh_python2 call to binary-indep, remove dh_pycentral + * Removed 02_man_page.patch, changes included upstream. + * Add 02_fetchmail-kill-sslv2.patch (thanks Matthias!) to fix FTBFS + due to openssl 1.0.0 dropping ssl v2 support (Closes: #622054). + + [Hector Garcia] + * Removed the part from 01_fetchmailconf.patch where it touches + Makefile.in file and removed 03_fetchmailconf_python2.6.patch. + + -- Nico Golde <nion@debian.org> Wed, 13 Apr 2011 12:57:14 +0200 + +fetchmail (6.3.18-2) unstable; urgency=low + + * Fix python module path for fetchmailconf (Closes: #603861). + + -- Nico Golde <nion@debian.org> Wed, 01 Dec 2010 23:20:37 +0100 + +fetchmail (6.3.18-1) unstable; urgency=medium + + * New upstream release. + - Remove 03_spurious-ssl-cert-warning.patch, included upstream. + - Cancel GSSAPI authentication properly when encountering GSS + errors (Closes: #568455, #593694). + - Don't complain about READ-ONLY IMAP folders in --fetchall --keep + mode (Closes: #348995). + * Bump standards version, no changes needed. + + -- Nico Golde <nion@debian.org> Mon, 11 Oct 2010 23:53:31 +0200 + +fetchmail (6.3.17-4) unstable; urgency=low + + * Removed update-rc.d fetchmail remove (Closes: #587902, #587855). + + -- Hector Garcia <hector@debian.org> Fri, 02 Jul 2010 15:02:10 +0200 + +fetchmail (6.3.17-3) unstable; urgency=low + + * Removed stop on level 1. (Closes: #587367). + * Included doc-base information about the .html files in docs. + * Changed Conflicts for Breaks. + * Bumped standards-version to 3.9.0 + * Cleaned Makefile after configure to prevent unnecesary linking against + libcrypt and libk5crypto. + + -- Hector Garcia <hector@debian.org> Wed, 30 Jun 2010 12:41:12 +0200 + +fetchmail (6.3.17-2) unstable; urgency=low + + [Nico Golde] + * Add Should-Start and Should-Stop facilities to the init script + in order to make sure fetchmail is started after a local DNS + server and/or MTA if present. Thanks to Jan Braun and Petter + Reinholdtsen (Closes: #582475). + * Add 03_spurious-ssl-cert-warning.patch to prevent fetchmail complaining + about an insecure ssl connection even if a fingerprint that has been + obtained through a secure channel is configured (Closes: #580796). + + [Hector Garcia] + * Changed suggest of exim4 to default-mta (Closes: #586864, #586865). + * Not explicitly stop daemon on runlevel 0 and 6 (Closes: #498427). + * Make it compile against python2.6. Thanks to Steve Langasek + (Closes: #586866, #586867). + * Updated man page patch to include more minus escaped form. + + -- Nico Golde <nion@debian.org> Thu, 24 Jun 2010 13:52:43 +0200 + +fetchmail (6.3.17-1) unstable; urgency=low + + * New upstream release. + - Drop fetchmail-SA-2010-02.patch, included upstream, this + patch also introduced a regression that was fixed with this + release as well. + * Add status option to init script and incorporate changes + by Peter Eisentraut, thanks! (Closes: #527967). + - Bump lsb depedency to 3.2-13. + + -- Nico Golde <nion@debian.org> Fri, 07 May 2010 19:20:00 +0200 + +fetchmail (6.3.16-2) unstable; urgency=medium + + * Add fetchmail-SA-2010-02.patch fixing a possible DoS on invalid + multibyte sequences in message headers when used with -vv. + + -- Nico Golde <nion@debian.org> Mon, 19 Apr 2010 14:40:41 +0200 + +fetchmail (6.3.16-1) unstable; urgency=low + + * New upstream release. + - Load all SSL ciphers (Closes: #576430). + - Fix regression when using --interface (Closes: #576717). + + -- Nico Golde <nion@debian.org> Thu, 08 Apr 2010 20:03:55 +0200 + +fetchmail (6.3.15-1) unstable; urgency=low + + * New upstream release. + - Log an unexpected BYE from the server when using imap + (Closes: #140631, #215688). + * Removing Hectors NEWS entry as it was a plain copy of the changelog + (Closes: #569207). + * Remove 03_sdump_heap_overflow.patch, included upstream. + * Switch to 3.0 (quilt) source format. + * Fix incorrect version number in NEWS file: 6.3.6.rc3-1 -> 6.3.6~rc3-1. + + -- Nico Golde <nion@debian.org> Sat, 03 Apr 2010 19:57:08 +0200 + +fetchmail (6.3.13-2) unstable; urgency=medium + + * Add 03_sdump_heap_overflow.patch to fix heap overflow in verbose SSL + certificate information display (fetchmail-SA-2010-01). + * Some fixed issues for 6.3.13: + - Russion translation for flushed fixed (Closes: #531925). + - Fetchmail no longer drops permanently undelivered messages by + default, to match historic documentation. It does so by introducing + a new softbounce option (Closes: #471283). + - Report multiline SMTP errors properly (Closes: #529899). + * Also do not complain about /etc/fetchmailrc on calling the init + script with stop (Closes: #546841). + + -- Nico Golde <nion@debian.org> Thu, 04 Feb 2010 13:02:29 +0100 + +fetchmail (6.3.13-1) unstable; urgency=low + + * New upstream version. + * Removed 02_nooverlapping_snprintf.patch no longer needed. + * Removed 03_smb_assert.patch no longer needed. + * Removed 04_fix_fetchsetup_bashism.patch no longer needed. + * Removed 05_fetchlimit_exist_status.patch no longer needed. + * Removed 06_cert_0_byte.patch no longer needed. + * Bump to policy version 3.8.4 + * Added README.source explaining that this package uses quilt. + * Added 02_man_page.patch to fix 2 man page minor bugs. + * Added ${misc:Depends} on control for both binaries. + + -- Hector Garcia <hector@debian.org> Mon, 01 Feb 2010 16:45:58 +0100 + +fetchmail (6.3.9~rc2-8) unstable; urgency=low + + * Do not complain about missing config file when daemon shouldn't + start at all (Closes: #540533). + * Depend on $syslog in init script (Closes: #541394). + + -- Nico Golde <nion@debian.org> Thu, 13 Aug 2009 23:14:16 +0200 + +fetchmail (6.3.9~rc2-7) unstable; urgency=low + + * Fix inconsistencies in init script. + * Fix double inclusion of /etc/default/fetchmail (Closes: #540245). + + -- Nico Golde <nion@debian.org> Fri, 07 Aug 2009 16:30:08 +0200 + +fetchmail (6.3.9~rc2-6) unstable; urgency=high + + * Bump to policy version 3.8.2 + + don't rely on /etc/default/fetchmail in init script but provide + default (no) for START_DAEMON and check if file exists. + * debian/rules: dh_clean -k is deprecated => dh_prep. + * Include upstream patch to fix off-by-one asserts in smbutil.c + (03_smb_assert.patch; Closes: #449179). + * Fix bashism in fetchsetup script + (04_fix_fetchsetup_bashism.patch; Closes: #530081). + * Fix exit status of fetchmail when used with --fetchlimit + option (05_fetchlimit_exist_status.patch; Closes: #508667). + * Add upstream patch to detect malicious certificates containing + a null byte in the Subject Alternative Name + (CVE-2009-2666; 06_cert_0_byte.patch). + + -- Nico Golde <nion@debian.org> Thu, 06 Aug 2009 12:44:26 +0200 + +fetchmail (6.3.9~rc2-5) unstable; urgency=low + + * Set -e flag in prerm and preinst to ensure that the script aborts + its execution on failed commands. + * Add 02_nooverlapping_snprintf.patch to prevent undefined behaviour on + using snprintf with overlapping buffers. + + -- Nico Golde <nion@debian.org> Mon, 22 Dec 2008 16:10:32 +0100 + +fetchmail (6.3.9~rc2-4) unstable; urgency=low + + * Fix broken debug-run as the login shell of fetchmail + was changed to /bin/false by passing -s to su (Closes: #492745). + + -- Nico Golde <nion@debian.org> Sat, 09 Aug 2008 14:13:32 +0200 + +fetchmail (6.3.9~rc2-3) unstable; urgency=low + + * Updated debian/resolvconf to call awake instead of try-restart. + (Closes: #488085). + + -- Hector Garcia <hector@debian.org> Fri, 04 Jul 2008 18:28:29 +0200 + +fetchmail (6.3.9~rc2-2) unstable; urgency=low + + * Fix broken init script by dropping usage of su and use + -c by start-stop-daemon instead to switch to the fetchmail + user (Closes: #487943). + + -- Nico Golde <nion@debian.org> Wed, 25 Jun 2008 13:27:01 +0200 + +fetchmail (6.3.9~rc2-1) unstable; urgency=low + + * New upstream release. + - Fix CVE-2008-2711: possible denial of service vulnerability if used + with -vv when parsing large data blobs because of an uninitialized + argument pointer. + - Allow .fetchmailrc and .fetchids to be symlinks (Closes: #452907). + - The manual page now mentions that user descriptions need to come before + user options (Closes: #467010). + * Drop 04_fix_CVE-2007-4565_DoS.patch as this release fixes the issue. + * Drop 03_capa_probe.patch as this is fixed in this release. + * Drop 02_es.po.patch included upstream. + * Drop 05_fix-manpage-grammar.patch included upstream. + * Bump Standards version to 3.8.0, no changes needed. + * Bump debhelper compatibility level to 7 and adapt build dependency. + + -- Nico Golde <nion@debian.org> Tue, 24 Jun 2008 20:49:38 +0200 + +fetchmail (6.3.8-12) unstable; urgency=low + + * Set login shell of fetchmail user to /bin/false on + installation and upgrade (Closes: #481727). + + -- Nico Golde <nion@debian.org> Sun, 18 May 2008 14:29:37 +0200 + +fetchmail (6.3.8-11) unstable; urgency=low + + * Add removal of /var/run/fetchmail to postrm script (Closes: #463987). + * Fix grammar in manpage (05_fix-manpage-grammar.patch; Closes: #461642). + * Bump standards version to 3.7.3, no changes needed. + * Fix obsolete national encoding in copyright file. + * Fix "cryptic" comment in init file (Closes: #464549). + + -- Nico Golde <nion@debian.org> Mon, 04 Feb 2008 16:19:17 +0100 + +fetchmail (6.3.8-10) unstable; urgency=low + + * Build-depend on libgssglue instead of libgssapi since it replaced + gssapi. + * Chaged $@ to $* in su call in debug-run to fix broken + quoting, thanks Klaus Ethgen (Closes: #447061). + * Switched from Homepage tag to new Homepage field in control. + * Switched from Xs-Vcs-Svn to Vcs-Svn since this is implemented + in dpkg now. + * Fixed malformed date line in changelog and syntax-error in NEWS. + + -- Nico Golde <nion@debian.org> Sat, 03 Nov 2007 18:43:13 +0100 + +fetchmail (6.3.8-9) unstable; urgency=low + + * Fixed init to detect -d parameter on OPTIONS var. (Closes: #443327) + + -- Hector Garcia <hector@debian.org> Thu, 20 Sep 2007 12:05:09 +0200 + +fetchmail (6.3.8-8) unstable; urgency=high + + * Including fix_CVE-2007-4565_DoS patch to fix + Denial of Service vulnerability in sink.c + (CVE-2007-4565) (Closes: #440006). + * Fixed fetchmailconf menu sections. + + -- Nico Golde <nion@debian.org> Wed, 29 Aug 2007 12:05:09 +0200 + +fetchmail (6.3.8-7) unstable; urgency=low + + * Changed long description to fit current state of + compiled-in features. + + -- Nico Golde <nion@debian.org> Thu, 19 Jul 2007 16:40:13 +0200 + +fetchmail (6.3.8-6) unstable; urgency=low + + * Do not suppress error output for make distclean in rules. + * Build with gssapi support (Closes: #433423). + + -- Nico Golde <nion@debian.org> Mon, 09 Jul 2007 00:07:54 +0200 + +fetchmail (6.3.8-5) unstable; urgency=low + + * Included patch to fix errors on failed + CAPA probe (Closes: #421446). + + -- Nico Golde <nion@debian.org> Thu, 14 Jun 2007 15:08:38 +0200 + +fetchmail (6.3.8-4) unstable; urgency=low + + * Disable error message about editing /etc/default/fetchmail if + init stop is called. This way you don't see the message on a + package removal. + * Added KRB5 support (Closes: #427405). + + -- Nico Golde <nion@debian.org> Sat, 19 May 2007 18:33:55 +0200 + +fetchmail (6.3.8-3) unstable; urgency=low + + * Updated patch for spanish translation, synced with + upstream SVN. + + -- Nico Golde <nion@debian.org> Mon, 14 May 2007 16:23:15 +0200 + +fetchmail (6.3.8-2) unstable; urgency=low + + * Imported ubuntu changes in init script. + * Added OPTIONS= to default file and enabled init + script to use them (Closes: #389454). + * Included upstream es.po, thanks Javier Fernández-Sanguino Peña + (Closes: #420474). + + -- Nico Golde <nion@debian.org> Wed, 11 Apr 2007 18:12:15 +0200 + +fetchmail (6.3.8-1) unstable; urgency=low + + * New upstream release. + - Make the APOP challenge parser more distrustful and have it reject + challenges that do not conform to RFC-822 msg-id format, in the hope to make + mounting man-in-the-middle attacks (MITM) against APOP a bit more difficult + (CVE-2007-1558). + - Fix manual page: --sslcheck -> --sslcertck (Closes: #413059). + - Fix segfault on NULL pointer reference in bsmtp (Closes: #416625). + - Make BSMTP output actually work (Closes: #416812). + * Changed my maintainer address. + * Added watch file again and updated to version 3. + * Fixed spelling mistake in fetchmail.default. + * Bumped compat level since we already depend on debhelper >= 5. + * Removed dirs file, not needed anymore. + * Added delete-after and delete-after.README to contrib files. + + -- Nico Golde <nion@debian.org> Sun, 08 Apr 2007 16:40:42 +0200 + +fetchmail (6.3.7-1) unstable; urgency=medium + + * New upstream release. + + [ Nico Golde ] + * Removed UIDL file creation code from init, + no longer needed (Closes: #406391). + * Removed watch file since Berlios doesn't allow + scanning anymore. + * Added logrotate script to contrib.files. + + [ Hector Garcia ] + * Make try-restart only do the start if the runlevel allow so. + (Closes: #406126). + + -- Nico Golde <nico@ngolde.de> Tue, 6 Feb 2007 17:40:54 +0100 + +fetchmail (6.3.6-1) unstable; urgency=medium + + [New upstream version] + * Repair --user: using SSL certificate/key authentication overrode the + --user option. Now the latter takes precedence, and only defaults to the + certificate's common name (Closes: #400950). + * DNS: Detect /etc/resolv.conf changes: On systems that have res_search(), + assume we also have res_init() and call it (suggested by Ulrich Drepper, + glibc bug #3675) in order to make libc or libresolv reread the resolver + configuration at the beginning of a poll cycle. This is important when + fetchmail is in daemon mode and /etc/resolv.conf is changed later by + dhcpcd, dhclient, pppd, openvpn or other ip-up/ipchange scripts + (Closes: #389270, #391698). + * Important security fixes for: CVE-2006-5867 and CVE-2006-5974. + [Nico Golde] + * added NEWS file to the packages (Closes: #406328). + + -- Nico Golde <nico@ngolde.de> Mon, 8 Jan 2007 17:57:40 +0100 + +fetchmail (6.3.6~rc5-1) unstable; urgency=medium + + [Nico Golde] + * Added LC_ALL=C export into default file to switch of + localized log messages (Closes: #400719). + * Removed gettext dependency since libc on Debian ships its own + gettext functions (Closes: #402030). + * Finally removed popclient conflicts, thanks Tobias Frost for pointing + this bug (Closes: #262257). + + -- Nico Golde <nico@ngolde.de> Fri, 1 Dec 2006 18:27:17 +0100 + +fetchmail (6.3.6~rc3-1) unstable; urgency=medium + + [New upstream version] + * sslproto keywords are now case insensitive + * In verbose mode, log every IP fetchmail tries to connect to, to avoid + misleading the user. Suppress EAFNOSUPPORT errors from socket() call, too. + (Closes: #361825) + * Track getaddrinfo() results to properly free them after timeouts and + make sure that getaddrinfo() isn't interrupted by a timeout. + (Closes: #294547, #377135). + * If the lockfile ends before the process ID, treat it as stale and unlink it. + Reported by Justin Pryzby, (Closes: #376603). + * SECURITY FIX (CHANGES BEHAVIOR): + Using at least one of the options "sslproto 'tls1'", "sslfingerprint" or + "sslcertck" enforces STARTTLS for POP3 and IMAP and terminates the connection + if unsuccessful. The same configuration causes permanent connection failure + with POP2, which is obsolete and does not support STLS. fetchmail 6.3.5 and + older had no way to enforce TLS. With those older versions, TLS was always + opportunistic, but fetchmail would happily transmit the password in cleartext + if STARTTLS failed. Reported by and fixed in cooperation with Isaac Wilcox. + Configurations using --ssl --sslcertck however have been safe. + + [Nico Golde] + * Source-Version is deprecated, using source:Version now, + thanks Tolimar for the hint. + * Added colons in init to fit debian-policy + section 9.4 (Closes: #398160). + * Changed awaken call to restart cause of DNS problems (Closes: #391698). + * Added NEWS entry to inform about behaviour changes. + * Added XS-Vcs-Svn field to control file. + * Added debian/pycompat file. + * Updated debhelper dependency to version (>= 5.0.37.2) because of dh_python + call. + [Hector Garcia] + * Changed depend of fetchmailconf to >= instead of =, to + be able to do binary rebuilds. + * Migrated from dpatch to quilt. + * Removed 02_ja.po-fix, no longer needed. + * Removed 03_imap_experimental. Included upstream. + * Removed 04_eof_fix. Included upstream. + + -- Hector Garcia <hector@debian.org> Thu, 23 Nov 2006 11:35:01 +0100 + +fetchmail (6.3.4-7) unstable; urgency=low + + * Start using lsb init script. Patch by Christian Perrier. + (Closes: #388843) + + -- Hector Garcia <hector@debian.org> Sun, 24 Sep 2006 21:59:01 +0200 + +fetchmail (6.3.4-6) unstable; urgency=low + + [Hector Garcia] + * Applied patch suggested by upstream (Matthias Andree) + to fix build when DEB_FETCHMAIL_BUILD_OPTIONS includes + KRB5. (Closes: #223820) + [Nico Golde] + * Fixed problem with ja.po file because of new gettext version + (Closes: #385160). + + -- Hector Garcia <hector@debian.org> Wed, 6 Sep 2006 22:18:56 +0200 + +fetchmail (6.3.4-5) unstable; urgency=low + + [ Nico Golde ] + * Fixed broken symlink, thanks to Piotr Ozarowski (Closes: #383177). + + [ Hector Garcia ] + * Changed try-restart to awaken fetchmail if it is running or start it if + it is not. (Closes: 268346) + + -- Hector Garcia <hector@debian.org> Wed, 16 Aug 2006 11:51:51 +0200 + +fetchmail (6.3.4-4) unstable; urgency=low + + [ Nico Golde ] + * Fixed awakening bug in init script (Closes: #380459). + * Fixed EOF handling, patch can be removed after fetchmail 6.3.5 + release (Closes: #376603). + * Bumped Standards-Version. + + [ Piotr Ozarowski ] + * Updated for the new python policy (Closes: #380794). + * Replaced /usr/bin/fetchmailconf shell script with symlink + and thus removed 01.fetchmailconf patch. + + [ Hector Garcia ] + * Added bison to build-depends. + + -- Hector Garcia <hector@debian.org> Tue, 1 Aug 2006 10:44:26 +0200 + +fetchmail (6.3.4-3) unstable; urgency=low + + [ Nico Golde ] + * Removed not needed removal of /etc/default/fetchmail in postrm + script, thanks Justin Pryzby for the hint (Closes: #374473). + + -- Nico Golde <nico@ngolde.de> Mon, 19 Jun 2006 20:03:26 +0200 + +fetchmail (6.3.4-2) experimental; urgency=low + + [ Nico Golde ] + * Added head -n1 to get the fetchmail pid from pid file in init since it + does not contain only one line (Closes: #366539). + + [ Hector Garcia ] + * Added patch from Matthias Andree to fix IMAP (Closes: #312415). + + -- Hector Garcia <hector@debian.org> Mon, 15 May 2006 13:00:41 +0200 + +fetchmail (6.3.4-1) unstable; urgency=low + + [ Hector Garcia ] + * New upstream release + - pidfile: there is a new command-line (--pidfile PATH) and global option + for the rcfile (set pidfile [=] "/path/to/pidfile") option to allow + overriding the default location of the PID file. + * Removed es.po patch, integrated upstream. + * Changed init.d to use new flag --pidfile to place pid file on + /var/run/fetchmail/fetchmail.pid (Closes: #355457) + * Changed ip-up and ip-down to use invoke-rc.d + + [ Nico Golde ] + * Checked for new policy version and changed it in control. + + -- Hector Garcia <hector@debian.org> Tue, 2 May 2006 14:24:51 +0200 + +fetchmail (6.3.3-1) unstable; urgency=low + + [ Nico Golde ] + * Added true return values to fetchmail.postinst so postinst will not fail + if fetchmailrc is empty (Closes: #355187). + * Removed syslog patch to not change old behaviour (Closes: #356675). + Reopened #282259. + * Modified homepage tag in control to fit with the new address. + * Removed && true crap from init script. + + [ Hector Garcia ] + * New upstream release + - SDPS: fetchmail no longer replaces the local user ID for an empty + envelope sender when using the proprietary SDPS extension for POP3. + (Closes: #353575) + - "ssl" is a user option rather than a server option. Patch by Nico Golde. + (Closes: #354661) + - --idle and --fetchall can now be specified on the command line, too. + * Updated es.po.dpatch + * Removed null-env-sender.dpatch, is included upstream. + * Removed 01.fix-netrc-sigsegv, is included upstream. + * Added dh_python and deleting .pyc and *.pyo from packages + * Changed init.d to remove stale pid file. + + -- Hector Garcia <hector@debian.org> Tue, 4 Apr 2006 10:54:49 +0200 + +fetchmail (6.3.2-3) unstable; urgency=low + + [ Nico Golde ] + * Fixed watch file, thanks Bart Martens. (Closes: #354357) + * Included temporary patch to fix null envelope sender problem, + will be fixed with next upstream version. (Closes: #353575) + + -- Nico Golde <nico@ngolde.de> Sat, 25 Feb 2006 20:51:10 +0100 + +fetchmail (6.3.2-2) unstable; urgency=low + + [ Nico Golde ] + * included 01.fix-netrc-sigsegv patch to fix a segmentation fault + if no password for an account in netrc is set. Will be included in + next upstream release. + + [ Hector Garcia ] + * Included 02.fix-print-date patch to fix regresion on log notification. + Is included on upstream devel branch. (Closes: #282259) + + -- Hector Garcia <hector@debian.org> Fri, 3 Feb 2006 11:19:49 +0100 + +fetchmail (6.3.2-1) unstable; urgency=low + + [ Nico Golde ] + * New upstream release + - Security fix of CVE-2006-0321 (Closes: #348747). + - Fix help for poll interval and fetchall in + fetchmailconf (Closes: #344978). + - Don't complain about READ-ONLY IMAP folders in + --fetchall --keep mode (Closes: #348964). + * Removed 01_man_page.dpatch file upstream included it. + * Fixed watch file to match on bz2 files. + + [ Hector Garcia ] + * Changed usermod --home to -d to prevent failure on old versions of passwd. + (Closes: #348855) + + -- Hector Garcia <hector@debian.org> Tue, 24 Jan 2006 16:46:51 +0100 + +fetchmail (6.3.1-4) unstable; urgency=low + + [ Nico Golde ] + * Fixed broken symlink (Closes: #348134). + * removed gzip of fetchmailconf.1 cause we should ignore it, + it points to a wrong fetchmail manpage so we set a symlink + manually. + + [ Hector Garcia ] + * Reverted pidfile location (Closes: #348037). + * Removed #!/usr/bin/env python from fetchmailconf.py since it + is used as a lib not as a script. New dpatch file. + + -- Hector Garcia <hector@debian.org> Mon, 16 Jan 2006 10:27:04 +0100 + +fetchmail (6.3.1-3) unstable; urgency=low + + [ Nico Golde ] + * Fixed FTBFS on buildds (Closes: #347996). + + [ Hector Garcia ] + * Moving fetchmail.pid instead of deleting it on upgrade to prevent + failure on first reboot (Closes: #348037). + * Fixed bug that emptyed /etc/default/fetchmail. + + -- Hector Garcia <hector@debian.org> Sun, 15 Jan 2006 03:34:05 +0100 + +fetchmail (6.3.1-2) unstable; urgency=low + + * Added usr/lib/python2.3/site-packages/ to fetchmailconf install files to + fix breakage from last upload. + + -- Hector Garcia <hector@debian.org> Fri, 13 Jan 2006 13:11:13 +0100 + +fetchmail (6.3.1-1) unstable; urgency=low + + [ Nico Golde ] + * New upstream release + - Fixed tracepolls problem for 2nd user in skip stanza (Closes: #156094). + - Corrected global option descriptions in manpage (Closes: #241883). + - Progress dots will appear now (Closes: #298557). + - Fixed manpage typos (Closes: #323028). + - Fixed character encoding of fetchmail daemon (Closes: #277324). + - Fixed broken subjects in notification mails (Closes: #301348) + - uidl usage is not switched on by default anymore (Closes: #304701). + - Security fix. CVE-2005-4348 (Closes: #345944). + - Ipv6 is now enabled by default (Closes: #345263, #329975). + * Removed de.po fix because upstream included it. + * Added Homepage tag to control file. + * Update manpage patch to current version. + * Removed flex and bison from build depends, they are no longer needed. + * Fetchmail now uses gettext. + * Removed --enable-ipv6 (its default now) and --enable-netsec cause + it is no longer working. + * Added call to make update-gmo to fix localisation problems (Closes: #340630). + * Updated copyright file. + * Removed Loïc Minier from uploaders. + * Added fetchmail-ssl removal to NEWS file. + * Removed xutils dependency because makedepend is not necessary since 6.3.0. + * Moved fetchmail home directory to /var/lib/fetchmail (Closes: #327250). + * Removed NEWS.truncated file from installation and replaced with OLDNEWS. + + [ Hector Garcia ] + * Remove man1 from mandir on install time. (change on the packaging). + * Added myself to uploaders. + * Added patch to fix warning on fetchmail man page. Should submit upstream. + * Included gettext on build-depend. + * Included patch to update es.po. Already sended patch to usual translator. + * Added /etc/default/fetchmail to define when to start fetchmail or not + (Closes: #344582, #218040, #276044). + * Added NEWS.Debian to explain above. + * Made changes on control file to delete properly old fetchmail-ssl. I must + ask ftpmaster to delete it from archive. + * Removed depend on base-files (>= 2.2.0). Woody was released with 3.0.2 + * Fixed a problem on debian/rules that was forcing configure to be called twice. + * Changed UIDL file to /var/lib/fetchmail/.fetchmail-UIDL-cache since now + upstream needs to write more files on same dir, hence /var/mail it is not + suitable. + * Added python to build-depends. + + -- Hector Garcia <hector@debian.org> Fri, 13 Jan 2006 12:01:10 +0100 + +fetchmail (6.3.0-1) unstable; urgency=low + + * New upstream release. + - Security fix. CVE-2005-2335 and CVE-2005-3088 + - Drop support for OS not conforming to the Single Unix Specification v2 + or v3 (aka IEEE Std 1003.1-2001). + - Default for --smtphost is now always "localhost". + - Force fetchsizelimit to 1 for APOP and RPOP. + - Patch, to use a NULL envelope from, not write a Return-Path header (both to + meet RFC-2821), changed From, added Subject header, rewording the human + readable part. (Closes: #316446). + - Patch to avoid a segfault in multidrop/received mode when the + Received: headers are malformatted. + - MIME-encode bodies and Subject headers of warning messages, limiting + the header to 7 bits. + - Normalize most locale codesets to IANA codesets. + - Nico Golde's patch to support "proto RPOP" in the configuration file, + reported. (Closes: #242384) + - Added Russian translation. + - Dropped da=Danish, el=Greek and tr=Turkish translations which have more + than 10% (61+) untranslated or fuzzy messages. + - Major fetchmail(1) manual page overhaul. + - Fix fetchmail leaks sockets when SSL negotiation fails. + (Closes: #301964). + - Really fix (garbage in Received: lines when smtphostset). + (Closes: #207919). + - When writing the PID file, write a FHS 2.3 compliant PID file. + (Closes: #230615). + - Make ODMR really silent, suppress "fetchmail: receiving message data". + (Closes: #296163). + - Add From: header to warning emails. (Closes: #244828). + - Fix IMAP code to use password of arbitrary length from configuration + file (although not when read interactively). (Closes: #276424). + - Document that fetchmail may automatically enable UIDL option. + (Closes: #304701). + - Put *BOLD* text into the manual page near --mda to state unmistakably + that the --mda %T and %F substitutions add single quotes, hoping to avoid + bogus bug reports. (Closes: #224564). + - gettext (intl/) has been removed from the fetchmail package. + - Use of automake. + - Rename fetchmailconf to fetchmailconf.py. Created a /bin/sh wrapper. + - New dummy fetchmailconf manual page. + - fetchmailconf redirects fetchmail's input from /dev/null so it doesn't + wait for the user to enter a password when the user doesn't even see the prompt. + - Write RFC-compliant BSMTP envelopes. + - Received: headers now enclose the for <...> destination address in angle + brackets for consistency with Postfix. + - Delete oversized messages with the new --limitflush option. + (Closes: #212240). + - Add full support for --service option. + - Make "envelope 'Delivered-To'" work with dropdelivered. + - fetchmail should now automatically detect if OpenSSL requires -ldl + - Missed --port/--service/--ssl cleanups in the manual. + - Properly shut down SSL connections. + - Add support for SubjectAltName (RFC-2595 or 2818), to avoid bogus certificate + mismatch errors. Patch by Roland Stigge, Debian Bug#201113. (MA) + - make fetchmail --silent --quit really silent. (Closes: #229014) + - Exit with error if the lock file cannot be read. + - Do not break some other process's lockfile in "-q" mode, but wait for + the other process's exit. + - Man page: --sslfingerprint points user to x509(1ssl) and gives an + example how to use it. (Closes: #213484) + - Try to obtain FQDN as our own host by default, rather than using + "localhost". If hostname cannot be qualified, complain noisily and continue, + unless Kerberos, ODMR or ETRN are used (these require a FQDN). + Partial fix of Debian Bug#150137. (Closes: #316454). + - fetchmailconf now sets the service properly after autoprobe. + (Closes: #320645). + - When eating IMAP message trailer, don't see any line containing "OK" + as the end of the trailer, but wait for the proper tagged OK line. To work + around the qmail + Courier-IMAP problem in Debian. (Closes: #338007). + - Fixes: when trying to send a bounce message, don't bail out if we cannot + qualify our own hostname, so we aren't losing the bounce. Instead, pass the + buck on to the SMTP server and use our own unqualified hostname. + (Closes: #317761) + - Updated translations: Albanian [sq] (Besnik Bleta), Catalan [ca] (Ernest + Adrogué Calveras), Czech [cs] (Miloslav Trmac), German [de] (MA), + Spanish (Castilian) [es] (Javier Kohen), French [fr] (MA), + Polish [pl] (Jakub Bogusz), Russian [ru] (Pavel Maryanov). + - In oversized warning messages, print the account name, too. + (Closes: #213299). + * Remove man1 from mandir on install time. (change on the packaging). + * Deleted es.po patch. Included upstream. Updated 00list. + * Added myself to uploaders. + * Added patch to fix warning on fetchmail man page. Should submit upstream. + + -- Hector Garcia <hector@debian.org> Wed, 21 Dec 2005 13:18:58 +0100 + + +fetchmail (6.2.5.4-1) unstable; urgency=high + + [ Lucas Wall ] + - pidfile checking in init.d script (closes: #323637). + + [ Nico Golde ] + - Only create fetchmail user if it doesn't exist (closes: #330522,#321272). + - respect the permissions of fetchmail home. + - rebuild against latest openssl version. + - removed deletion of /etc/fetchmailrc, + see statement in BTS. (closes: #288063). + - adjusted legal notes (Thanks Marc Brockschmidt for the hint). + + [ Loic Minier ] + * New upstream stable releases. + - Fix password exposure in fetchmailconf: use umask 077 before opening + output file and restore umask later. (Closes: #336096) + This is CVE-2005-3088. + - Drop 01pop3sec.dpatch, included upstream. + - Fix IMAP timeouts, counting message count down on servers that do not + send EXISTS counts after EXPUNGE. (Closes: #314509) + - Unlist spanish translation patch for now, as the spanish translation was + completely destroyed upstream. + * Add myself to Uploaders. + + -- Loic Minier <lool@dooz.org> Tue, 15 Nov 2005 18:53:37 +0100 + +fetchmail (6.2.5-18) unstable; urgency=low + + * Nico Golde: + - fixed too late apply of dpatch patches + - fixed init script (closes: #320584) + + -- Lucas Wall <lwall@debian.org> Sat, 30 Jul 2005 13:11:15 -0300 + +fetchmail (6.2.5-17) unstable; urgency=high + + * Nico Golde: + - reverted change of MTA because exim4 should be the default MTA in debian + (closes: #320311). + - included patch for Spanish translation (closes: #286044). + - included patch for German translation (closes: #313699). + + -- Lucas Wall <lwall@debian.org> Thu, 28 Jul 2005 11:27:53 -0300 + +fetchmail (6.2.5-16) unstable; urgency=high + + * Nico Golde: + - changed suggests exim4 to postfix because of personal preference + - renewed copyright file + - added dpatch to build dependencies + - removed fetchmail.NEWS file cause it is no longer current + - new upstream patch because of security issue CAN-2005-2335 + + -- Nico Golde <nico@ngolde.de> Fri, 22 Jul 2005 08:01:03 -0200 + +fetchmail (6.2.5-15) unstable; urgency=high + + * Nico Golde: + - fixed buffer overrun in pop3 UIDs handling CAN-2005-2335 + http://fetchmail.berlios.de/fetchmail-SA-2005-01.txt + (closes: #212762) + + -- Lucas Wall <lwall@debian.org> Thu, 21 Jul 2005 13:25:10 -0300 + +fetchmail (6.2.5-14) unstable; urgency=low + + * Nico Golde: + - Remove fetchmailrc if package is purged. (closes: #288063) + - modified /etc/fetchmailrc message so it only will be printed + if $1 is start + - corrected Maintainers field in control + + -- Lucas Wall <lwall@debian.org> Sun, 17 Jul 2005 14:21:34 -0300 + +fetchmail (6.2.5-13) unstable; urgency=low + + * New maintainers. (closes: #295331) + * Lucas Wall: + - Removed debconf dependency (debconf was dropped in 6.2.5-1). + - Added build-dep on autotools-dev and switched to "copy + config.{guess,sub} on build schema". + * Nico Golde: + - Updated watch file. + - Improved init script. + - Removed conflict with popclient. (closes: #262257) + - Fixed pid file creation. (closes: #263447) + - Included contrib/fetchsetup into package. (closes: #303789) + - fixed broken esmtp support patch. (closes: #285934) + + -- Lucas Wall <lwall@debian.org> Fri, 24 Jun 2005 20:36:36 -0300 + +fetchmail (6.2.5-12) unstable; urgency=medium + + * Provide fetchmail-ssl package to facilitate upgrades from woody. + + -- Graham Wilson <graham@debian.org> Mon, 29 Nov 2004 00:43:30 +0000 + +fetchmail (6.2.5-11) unstable; urgency=medium + + * Check to see if the fetchmail user exists before starting the system-wide + fetchmail service. If not, re-add the user. This is to avoid problems when + the user purges a fetchmail-common package from woody. (closes: #268228) + * Only install the NEWS file in the fetchmail package. + + -- Graham Wilson <graham@debian.org> Tue, 14 Sep 2004 17:05:44 +0000 + +fetchmail (6.2.5-10) unstable; urgency=low + + * Fix resolvconf script error. (closes: #257647) + + -- Graham Wilson <graham@debian.org> Mon, 05 Jul 2004 08:11:07 +0000 + +fetchmail (6.2.5-9) unstable; urgency=low + + * Don't use -a with test. (closes: #252093) + * Update the server logcheck ignore file. (closes: #253022) + * Update the resolvconf script. (closes: #252807) + + -- Graham Wilson <graham@debian.org> Fri, 11 Jun 2004 19:50:36 +0000 + +fetchmail (6.2.5-8) unstable; urgency=low + + * Add a note to README.Debian concerning errors when using the UIDL file. + * Fix checking of "set no syslog" in the init script. (closes: #243142) + * Remove documentation about UIDL cache transition, since we no longer handle + that specially. + * Add a patch from Paul Slootman to use uname(2), instead of uname(1) in + interface_init. (closes: #224778) + * Clean up documentation of the 'antispam' option. (closes: #241878) + * Document 'set no syslog' in the example rc file. + * When determining /proc/net/dev format, assume post-Linux 2.2 by default. + + -- Graham Wilson <graham@debian.org> Fri, 14 May 2004 07:06:34 +0000 + +fetchmail (6.2.5-7) unstable; urgency=medium + + * Don't output dots if we are loggin to syslog. (closes: #217610) + * Don't handle the case where the UIDL cache is in root's home directory. + Users have had all of woody to take care of moving that file. + * Document in NEWS how options should be set now that /etc/default/fetchmail + doesn't exist. (closes: #242755) + * Don't add the syslog option to the command line if the user has 'set + no syslog' in /etc/fetchmailrc. (closes: #242165) + * Apply patch for the debug mode in the init script. Thanks to Ilguiz + Latypov. (closes: #240598) + * Set the permissions correctly on the UIDL cache file. (closes: #241649) + + -- Graham Wilson <graham@debian.org> Fri, 09 Apr 2004 01:06:56 +0000 + +fetchmail (6.2.5-6) unstable; urgency=medium + + * Rename NEWS.Debian to NEWS, so that it gets installed. + * Use a better check for the daemon option in the system-wide + fetchmailrc file. (closes: #240699) + * Update the sample fetchmailrc to reflect the current state of the + fetchmail package. + * Create the UIDL cache file if it doesn't exist and we are going to + use it. Hopefully this fixes it. (closes: #237703) + + -- Graham Wilson <graham@debian.org> Fri, 02 Apr 2004 04:07:14 +0000 + +fetchmail (6.2.5-5) unstable; urgency=low + + * Reformat NEWS.Debian, and try to make it more accurate as to the changes. + * Don't discard output from the ip-up script. + * Use normal fetchmail PID file format. This re-opens #230615. + (closes: #235519, #240159) + * Only call fetchmail with the --daemon option if system-wide config file + doesn't. (closes: #236105, #238036) + * Reread config file if we are re-execing ourselves. Thanks to Jeff Norman + for the patch. (closes: #202787) + * Correct man page documentation concerning using --quit with other + options. (closes: #226822) + * Change owner of UIDL cache file if it exists. (closes: #237703) + + -- Graham Wilson <graham@debian.org> Fri, 26 Mar 2004 05:07:34 +0000 + +fetchmail (6.2.5-4) unstable; urgency=low + + * Install logcheck ignore files correctly, and add a line to the workstation + file. (closes: #234713) + + -- Graham Wilson <graham@debian.org> Wed, 25 Feb 2004 23:19:47 +0000 + +fetchmail (6.2.5-3) unstable; urgency=low + + * Make return codes and messages comply with the LSB. (closes: #234352) + * Correctly detect if the running process is backgrounded. (closes: #234387) + * Fix error in ja.po. (closes: #233634) + * Set fetchsizelimit = 1 for all POP3 variants. (closes: #234268) + * Quote x11 in the menu file to make lintian happy. + * Update standards version to 3.6.1 (no changes). + + -- Graham Wilson <graham@debian.org> Wed, 25 Feb 2004 22:50:38 +0000 + +fetchmail (6.2.5-2) unstable; urgency=low + + * Thanks to Thomas Hood for his help with this release. + + * Suggest resolvconf. + * Rename the init script in the debian/ directory. + * Minor man page fixes. (closes: #231072) + * Use FHS compliant lock format. (closes: #230615) + * Under try-restart, just re-invoke the script with the restart argument. + * Don't die if /etc/fetchmailrc has the wrong permissions. + * Clean up in postrm, including calling dh_purge and not complaining + so much. + * Correct the test in try-restart. (closes: #230613) + * Call invoke-rc.d with the --quiet option. + + -- Graham Wilson <graham@debian.org> Sun, 22 Feb 2004 03:18:40 +0000 + +fetchmail (6.2.5-1) experimental; urgency=low + + * This release is mostly a rewrite of postinst, rules, and the init + script; I have tried to clean them up some, and to add some + improvements. (closes: #221115) + + * Use invoke-rc.d in postinst and prerm. (closes: #218040) + * In ip-up, only restart fetchmail if it is running. (closes: #222535) + * Rip out all of the debconf-related stuff. (closes: #215818) + + * In debian/rules: + - correctly support noopt and nostrip + - use dh_install in favor of dh_movefiles + - move commands from install target to binary-arch target + - use debian/compat instead of DH_COMPAT + + * Documentation updates: + - clean up README.Debian and try to clarify some things + - update the copyright file + - add a NEWS file + + * Add a watch file for uscan. + * Add support for resolvconf. + + * New upstream release. + + -- Graham Wilson <graham@debian.org> Fri, 30 Jan 2004 02:24:01 +0000 + +fetchmail (6.2.4-7) unstable; urgency=low + + * Suggest exim4 instead of exim. (closes: #228593) + + -- Graham Wilson <graham@debian.org> Tue, 20 Jan 2004 17:33:25 +0000 + +fetchmail (6.2.4-6) unstable; urgency=low + + * Build the postinst file for the binary-arch target. (closes: #225396) + + -- Graham Wilson <graham@debian.org> Mon, 29 Dec 2003 18:20:39 +0000 + +fetchmail (6.2.4-5) unstable; urgency=low + + * Replace autogen.sh with a new script. + * Remove config.status & Makefile on distclean. + * debian/rules: + - Don't automatically run autogen.sh. + - Don't automatically update config.sub or config.guess + - Remove the need for configure-stamp. + - Remove uneeded variables. + - Clean up `clean' and `config.status' targets. + - Update --build and --host usage. + * Don't need {executable,deletable}.files + * Remove old control and changelog files. + * Convert changelog to UTF-8. + * Update es.po, thanks Carlos Valdivia Yagüe. (closes: #220926) + * Fix numerous small errors in the manpage. + * debian/control: + - New maintainer. Thanks Benjamin. (closes: #221919) + - Trim the build-depends list. + - Don't need to build-depend on m-t-a, since it was only used for + fallback selection. + + -- Graham Wilson <graham@debian.org> Tue, 23 Dec 2003 17:18:07 +0000 + +fetchmail (6.2.4-4) unstable; urgency=low + + * Fix postinst bugs (closes: #216630) + * Remove if-up crap, which was a bad idea(tm) (closes: #216503, #217985) + * Update russian and danish translation (closes: #214355, #216330) + * Clean up source tree from old templates (closes: #217434) + + -- Benjamin Drieu <benj@debian.org> Tue, 28 Oct 2003 22:35:27 +0100 + +fetchmail (6.2.4-3) unstable; urgency=low + + * Fix a typo in new if-up.d/fetchmail script (closes: #212554). + + -- Benjamin Drieu <benj@debian.org> Mon, 29 Sep 2003 08:27:32 +0200 + +fetchmail (6.2.4-2) unstable; urgency=low + + * Hack sink.c again to handle smtpname gracefully (Closes: #207919). + * Fix a bug that prevented limit and flush to cooperate (closes: #212240). + * Update Brazilian (closes: #207967), French (closes: #208999), Japanese + (closes: #211015) and Dutch (closes: #211148) debconf translations. + * Add a /etc/network/if-up.d/fetchmail script to handle restarted + interfaces (closes: #212554). + + -- Benjamin Drieu <benj@debian.org> Sun, 28 Sep 2003 15:18:40 +0200 + +fetchmail (6.2.4-1) unstable; urgency=medium + + * The "Let fix some bugs" release + * New upstream version: + + Updated German, Spanish, Catalan, and Turkish translations. + + IDLE is now supported using no-ops even if the server doesn't + support the IMAP IDLE extension. (closes: #202308) + + Sunil Shetye's patch to do better password shrouding. + (closes: #200470) + + Sunil Shetye's bug-fix rollup patch. + - Protocol errors do to incorrect assumption of protocols being able + to skip bodies (Closes: #203319, #201829, #207281, #204602) + - Avoid useless reconnections with limit & expunge (closes: #202207) + - Fix some auth problems (closes: #197813, #199462, #200208) + - Fix a parse error in fetchmailrc (closes: #184078) + - Finally fix the broken headers bug + (closes: #146690, #170941, #197007) + + Introduce a translation item for the word "seen". (closes: #158050) + + Back out the hack to deal with lack of byte stuffing on some POP3 + servers. + + Thomas Steudten's patch to improve SMTP handling of 550 errors. + * Switch to po-debconf based templates (closes: #200361) + * Make sure we use the pidfile (closes: #207295) + * Fix a small typo in manpage (closes: #205892) + + -- Benjamin Drieu <benj@debian.org> Thu, 28 Aug 2003 15:47:25 +0200 + +fetchmail (6.2.3-1) unstable; urgency=low + + * New upstream version: + - German, Danish, Spanish, and Turkish translations updated. + - Brian Sammon's patch to deal with malformed message lines containiing NULs. + - Fai's patch to ignore all but the first Return-Path (some spams have + more than one of these) (closes: #192977). + - Bendebjamin Drieu's patch to properly byte-stuff when talking to BSNTP + (closes: #184469). + - Benjamin Drieu's patch to enable auth=cram-md5. (closes: #185232) + - Sunil Shetye's configure.in patch to avoid spurious search order messages + from GCC. + - Header-reading code now copes better with lines ending in \n only. + - Elias Israel's patches for POP3 NTLM support and dealing with byte- + stuffing failures at socket level. + * Fix my patch fixing #156592 (closes: #188417) + * Add a new logcheck patterns (closes: #198274, #202619) + * Fix dead links in debian/copyright (closes: #200519) + + -- Benjamin Drieu <bdrieu@april.org> Mon, 21 Jul 2003 10:49:04 +0200 + +fetchmail (6.2.2-4) unstable; urgency=low + + * Yet another init.d/fetchmail shell script error. + + -- Benjamin Drieu <benj@debian.org> Fri, 4 Jul 2003 13:51:35 +0200 + +fetchmail (6.2.2-3) unstable; urgency=low + + * Fix typo in shell script (closes: #197744) + + -- Benjamin Drieu <benj@debian.org> Tue, 17 Jun 2003 10:49:37 +0200 + +fetchmail (6.2.2-2) unstable; urgency=low + + * Do not croak if /usr/share/doc/fetchmail is missing (closes: #197631) + + -- Benjamin Drieu <benj@debian.org> Mon, 16 Jun 2003 17:01:41 +0200 + +fetchmail (6.2.2-1) unstable; urgency=low + + * New upstream source: + + Sunil Shetye's patch to improve behavior in empty messages. + (closes: #173343) + + Conform to RFC2595; reissue capability probes after successful + STARTTLS negotiation. + + Sunil's patch to make handling of failed STARTTLS more graceful. + + Sunil's JF2 fix patch for .fetchmailrc security fix. + + Christophe GIAUME <christophe@giaume.com> finished the implementation + of RFC2177 IDLE. + + Jason Tishler's fix patch for Cygwin. + + Support ssh-style authentication in POP3 + + Fix for Debian bug #108977, clean up config file evaluation, + by Benjamin Drieu. (already closed in 6.2.1-1) + * Provide an example of smtphost (closes: #192710) + * Fix two errors in manpage (closes: #180917, #189918) + * Fix init.d script not to override conffile's idfile option + (closes: #190762) + + -- Benjamin Drieu <benj@debian.org> Wed, 11 Jun 2003 13:08:37 +0200 + +fetchmail (6.2.1-1) unstable; urgency=low + + * New upstream source: + + Updated German, Turkish, Spanish, and Danish translation files. + + Integrated Sunil Shetye's patch to make mark_seen an explicit method + + Removed FAQ warning about GMX and associated fetchmailconf check, we + have a report that its servers are conformant now. + + Another Sunil patch to fix a minor bug in bouncemail generation + (closes: #174795) + * Build with libssl-0.9.7 + * Hack fetchmail.c to prevent excessive config file evaluations + (closes: #108977) + * Add a "sleep" in init script to make restart happy (closes: #180545) + * Remove autom4te.cache after build (closes: #179134) + * Make etc files conffiles (closes: #175436) + + -- Benjamin Drieu <benj@debian.org> Fri, 31 Jan 2003 11:05:11 +0100 + +fetchmail (6.2.0-3) unstable; urgency=high + + * Rebuilt package with testing dependencies, so that it will hit testing + as soon as possible, thus severity is high (will close grave bug #175990). + * Fix an attempt to ls conf file even if not created (closes: #174675) + * Add a new regexp to logcheck (closes: #176861, 176861) + * Update spanish templates (closes: #174402) + * Fix a german typo in templates (closes: #174553) + * Update man page (closes: #173862) + + -- Benjamin Drieu <benj@debian.org> Thu, 16 Jan 2003 16:32:16 +0000 + +fetchmail (6.2.0-2) unstable; urgency=high + + * Attempt to close #169568, which may be caused by a subtle touch behavior + on ia64 and alpha. Many thanks to Lukas Geyer (closes: #169568). + * Do not frob conffile unconditionally (closes: #150533) + + -- Benjamin Drieu <benj@debian.org> Thu, 19 Dec 2002 14:08:48 +0100 + +fetchmail (6.2.0-1) unstable; urgency=high + + * New upstream version + + SECURITY FIX: Applied Steffen Esser's fix for a buffer-overflow + bug in rfc822.c + + Updated Danish, German, and Turkish translation files. + + Sunil Sheye's SMTP timeout patch. + + -- Benjamin Drieu <benj@debian.org> Wed, 18 Dec 2002 11:41:28 +0100 + +fetchmail (6.1.3-2) unstable; urgency=low + + * Fix stupid typo that prevented changelog to be installed + (closes: #171525) + * Add a recommendation on "ca-certificates" on a idea of Andrew Lau + + -- Benjamin Drieu <benj@debian.org> Fri, 30 Nov 2002 10:40:12 +0100 + +fetchmail (6.1.3-1) unstable; urgency=low + + * New upstream source + + Updated Turkish, Danish, German, Spanish, Catalan po files. + + Added Slovak support. + + Configure.in update for autoconf 2.5 (Art Haas). + + Be case-insensitive when looking for IMAP responses. + + Fix logout-after-idle-delivery bug (Sunil Shetye). + + Sunil Shetye's patch to bulletproof end-of-header detection. + (closes: #146690) + + Sunil's fix for the STARTTLS problem -- repoll if TLS nabdshake + fails. The attempt to set up STARTTLS can be suppressed with + 'sslproto ""'. + * Merge fetchmail and fetchmail-ssl into one single source. Remove + fetchmail-common (closes: #164570) + * FTBFS for 6.1.2 are not relevant anymore (closes: #169568, #169571) + * Do not advertise non-free software in control (closes: #170659) + * Hack sink.c to prevent segfaults on null headers while bouncing + mail (closes: #170029) + * PPP ip-up script now restart fetchmail (closes: #145437) + + -- Benjamin Drieu <benj@debian.org> Fri, 29 Nov 2002 16:08:00 +0100 + +fetchmail (6.1.2-1) unstable; urgency=low + + * New upstream source (closes: #164621, #167472, #146690) + + Jan Klaverstijn's verbosity-lowering patch. + + Updated Turkish, German, Catalan, and Danish translation files. + + Fix processing of POP3 messages with missing bodies. + + Minor fixes by Sunil Shetye: fix generation of auth fail note, + handle unexpected SIGALRM, plug memory leak, handle lines beginning + with '\0', try to bulletproof error handling against read failures. + * Fix manpage which was outdated regarding antispam capabilities + (closes: #167266) + * Users should now be able to build custom packages with Kerberos, + (closes: #165762) + + -- Benjamin Drieu <benj@debian.org> Wed, 23 Oct 2002 18:24:18 +0200 + +fetchmail (6.1.0-2) unstable; urgency=medium + + * Fix trivial fetchmail --configdump bug (closes: #163286) + * Fix typo in ROOT_UID checking in fetchmail.c (closes: #163043) + * Apply Sunil Shetye patches to fix various IMAP and POP3 SSL problems + (closes: #163028, #162566, #162625) + * Hack do_session() to avoid not-so-silent "Repoll" messages in silent + mode (closes: #162571) + * Hack smtp_open() to strip port number that caused invalid email adresses + (closes: #156592) + + -- Benjamin Drieu <benj@debian.org> Wed, 9 Oct 2002 23:12:04 +0200 + +fetchmail (6.1.0-1) unstable; urgency=low + + * New maintainer (closes: #156667) + * New upstream source (closes: #152125): + + Updated French translation. + + SECURITY FIX: Stefan Esser's fix for potential remote vulnerability + in multidrop mode. This is an important security fix! + + Applied Matt Kraai's fixes for minor Debian bugs (Closes: #144539, #152222). + + Nerijus Baliunas's patch to support STARTTLS over IMAP. + + More cleanups and minor bugfixes from Sunil Shetye (Closes: #117472). + + Default antispam-response list is now empty. + + Updated de and po translations. + * fetchmail-common: Fix wrong path in /etc/init.d/fetchmail (closes: #158323) + + -- Benjamin Drieu <benj@debian.org> Thu, 26 Sep 2002 16:29:28 +0200 + +fetchmail (5.9.11-7.0) unstable; urgency=low + + * NrMU (I have RFA'ed this thing, and I MEAN it) + * Recompile to get new python dependencies right (closes: #158997) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 16 Sep 2002 13:17:57 -0300 + +fetchmail (5.9.11-7) unstable; urgency=high + + * Same as woody 5.9.11-6 + * SECURITY FIX: avoid buffer overflow on 64bit archs (imap.c) + This is a remote-expolitable buffer overflow, if the imap server + is hostile (backported from new upstream 5.9.12, bug found and + fixed by Nalin Dahyabhai) + * Minor fix to avoid leaking children (driver.c) + (backported from new upstream 5.9.12) + * Avoid trying to speak kpop to a imap server (driver.c) + (backported from new upstream 5.9.12) + * MINOR SECURITY FIX: better password shrounding (fetchmail.h, imap.c, + transact.c) (backported from new upstream 5.9.12) + * Handle empty addresses from a To: header containing only a comment + (transact.c) (backported from new upstream 5.9.12) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 8 Jun 2002 09:40:46 -0300 + +fetchmail (5.9.11-5) unstable; urgency=low + + * Grrr, fix stupid "be be" typo in package description too, while at + it... + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 24 Apr 2002 14:02:42 -0300 + +fetchmail (5.9.11-4) unstable; urgency=high + + * The "I knew it" release + * Hack around STLS problems: fetchmail would try to start STLS even if + it was already talking over a secured channel. Thanks to Matt Kraai + <kraai@alumni.cmu.edu> for the patch + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 24 Apr 2002 10:54:47 -0300 + +fetchmail (5.9.11-3) unstable; urgency=high + + * The "May this one be the last upload to woody" release + * Fix stupid typo in postrm script that redirected output to dev/null + instead of /dev/null (closes: #143145) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 16 Apr 2002 17:03:29 -0300 + +fetchmail (5.9.11-2) unstable; urgency=high + + * Fix another stupid bug in sink.c: do NOT cause mail to bounce + on 553 errors and the like + * Fix off-by-one error in base64.c anti-overflow patch from 5.9.10-4, + thanks to Ronald Wahl <Ronald.Wahl@informatik.tu-chemnitz.de> for + the fix. This probably fixes KerberosIV auth + * imap.c:do_imap_ntlm had the buffer size for from64tobits incorrectly + set to the input buffer size (closes: #141969) + * I dislike pointer arithmetric a lot, so I fixed base64.c to implement + from64tobits properly instead of applying the patch in the bug report + (closes: #141972) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 9 Apr 2002 12:40:31 -0300 + +fetchmail (5.9.11-1) unstable; urgency=high + + * New upstream source: + + Explicitly allow linking to OpenSSL in COPYING + (license change) + + Updated Turkish and Japanese translations + + Added warning about auth failures on the GMX server + + odmr.c: decrease log verbosity + (very minor code changes from Debian release 5.9.10-4) + * Crypto-in-main change to fetchmail-ssl's control file. + fetchmail-ssl has been moved into main, section mail, priority + extra. + * Matt Kraai's cosmetic env.c changes + * Enable Japanese localisation in configure.in + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 2 Apr 2002 09:47:30 -0300 + +fetchmail (5.9.10-4) unstable; urgency=high + + * SECURITY FIX: Avoid buffer overflows in base64.c, patch from + Matt Kraai <kraai@debian.org> + * Revert crypto-in-main until we can get the fetchmail license + straightened out. I am doing this to get the security patches + to the fetchmail-ssl crowd, but *expect fetchmail-ssl to be + removed from Debian* if the license issue with OpenSSL is not + fixed soon enough. It certainly will not be in Woody without + a license fix. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 27 Mar 2002 13:25:18 -0300 + +fetchmail (5.9.10-3) unstable; urgency=high + + * SECURITY FIX: Fix lots of buffer overflows lurking in + the new SMTP AUTH code in smtp.c (closes: #139644) + * Crypto-in-main change to fetchmail-ssl's control file. + fetchmail-ssl has been moved into main, section mail, priority + extra. + * Fix 4xx PS_TRANSIENT patch to shut up gcc warning + (utterly safe patch. Add explicit initialization of variable) + * Apply Sunil Shetye <shetye@bombay.retortsoft.com>'s patches + to detect and fix some format string bugs in fetchmail + (safe patch. Adds __attribute__ to some function + definitions, and fixes some obviously broken format strings) + * Add Catalan templates, thanks to Antoni Bella (safe patch, + closes: #139731, #139744) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 25 Mar 2002 13:38:52 -0300 + +fetchmail (5.9.10-2) unstable; urgency=low + + * The "get this sucker ready for a woody" release + * Track down stupid dangerous data-losing bugs in fetchmail: + + flushing messages on 4xx + can't send to postmaster + This was caused by the multidrop crap. Failover system added + that forces return of PS_TRANSIENT (and no bouncing of mail) + if any recipient returns a 4xx error. If this causes multidrop + misconfiguration to be hard to detect, you will get NO + sympathy from this maintainer; Other users were losing data + due to this bug + + non-paranoid documentation of default non-empty antispam list: + fixed in manpage, README.Debian + + non-paranoid documentation of the two always-delete-it codes: + fixed in manpage, README.Debian + + not always enforcing stripcr for delivery: + fixed by removing fallbacks, and upstream fallback stripcr fix + (closes: #133876) + * Tell people to read fetchmailconf to verify their servers against the + blacklist + * Add an "your helpful Debian Maintainer" section to top of manpage + * Fix minor spelling problem the BTS never delivered to me + (closes: #137277) + * Fix breakages caused by the new ESMTP AUTH stuff not being completely + implemented (closes: #138728) + * This upload has STLS support (closes: #138930) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 21 Mar 2002 11:56:07 -0300 + +fetchmail (5.9.10-1) unstable; urgency=medium + + * New upstream source + + Security fix: don't trust the message count passed back by the server + + Matt Kraai's patch for supporting STLS over POP3 + + Jakub Ulanowski's patch to fix SSL fingerprint handling + + ESMTP AUTH support from Wojciech Polak <polak@lodz.pdi.net> + (closes: #60805) + * Apply Byrial Jensen <byrial@image.dk>'s patches for i18n of new + 5.9.10 messages + * Add French template, thanks to Denis Barbier <barbier@debian.org> + (closes: #137539) + * Apply patch from Sunil Shetye <shetye@bombay.retortsoft.com> to + correctly signal failures to open/create a logfile as such, instead + of stupid "dup(): illegal FD" cryptic errors + * Apply a modified version of a patch from Sylvain Benoist + <sylvainb@whitepj.com>, to avoid file descriptor leaks on open + timeouts and reenable SSL connect timeouts (closes: #115355). + Grr, I never got that last email from the bug submitter, the + freaking BTS sent me the spam, though... + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 13 Mar 2002 21:01:56 -0300 + +fetchmail (5.9.8-4) unstable; urgency=low + + * Fix autoconf support in debian/rules + * Add Sunil Shetye's patch to stop fetchmail from trying to fetch + twice with IMAP (when EXISTS is not returned on EXPUNGE, old value + of count was used) + * Added Russian template translation, thanks to Ilgiz Kalmetev, + (closes: #136275) + * Added Espanish template translation, thanks to Carlos Valdivia, + (closes: #135065) + * Enforce mode 0600 on /etc/fetchmailrc, since fetchmail insists on it + anyway (closes: #135416) + * Add warning to README.Debian about the now gone MDA fallback + * Edit manpages to make sure the MDA fallback myth doesn't come back, + either + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 5 Mar 2002 15:23:37 -0300 + +fetchmail (5.9.8-3) unstable; urgency=low + + * Really fix #126221 this time, I hope. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 17 Feb 2002 07:50:53 -0300 + +fetchmail (5.9.8-2) unstable; urgency=low + + * Remove fetchmail-up and fetchmail-down scripts. There is no reason + at all not to call /etc/init.d/fetchmail for the ppp up and down + functions. (closes: #134190) + * Add sample /usr/share/doc/fetchmail{-ssl,}/ip-down example script + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 16 Feb 2002 07:28:43 -0200 + +fetchmail (5.9.8-1) unstable; urgency=medium + + * New upstream source: + + Document interaction of expunge in POP3 and servers which require a + delay before reconnection (closes: #132769) + + vsprintf underflow fixes by Sunil Shetye. + + Added warning about UIMS POP3 server. + + Sunil Shetye's patch for idle timeout during poll. + * Update copyright file (closes: #133497) + * Re-create /var/run/fetchmail on init.d script (closes: #133577) + * A recent upload disabled fingerprint output when running in silent + mode (closes: #126221) + * Use a safer (but far more likely to leave cruft behind) method of + removing the fetchmail user during purge. Users that request fetchmail to + be purged will not lose anything they left behind in /var/run/fetchmail, + even if they DID tell dpkg to purge all fetchmail traces from the system. + Don't expect such level of babysitting very often (closes: #130779) + * Fix fuckage on new i18n templates, and update da.po while at it + * fetchmail, fetchmail-ssl: call db_purge on install and upgrades, to + let debconf know that all templates were moved to fetchmail-common. + Otherwise, they are not removed from the system on purge + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 16 Feb 2002 00:50:24 -0200 + +fetchmail (5.9.7-3) unstable; urgency=low + + * Disable /usr/sbin/sendmail fallback (closes: #133340) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 11 Feb 2002 11:35:29 -0200 + +fetchmail (5.9.7-2) unstable; urgency=low + + * Do not supress the read of the message body when transact.c(readheaders) + returns PS_TRUNCATED (closes: #128672) + * Fix longstanding SSL hang w/ 100% CPU usage bug, thanks to + Matthias Andree <ma@dt.e-technik.uni-dortmund.de> for tracking down and + fixing the bug (closes: #127041) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 10 Feb 2002 12:22:39 -0200 + +fetchmail (5.9.7-1) unstable; urgency=low + + * New upstream source: + + Properly guard some transaction reporting in the SSL code + + Expunge edge case fix by Sunil Shetye + + Fixes for some odd IMAP and SMTP edge cases by Sunil Shetye + + UIDL bug fix by Matthias Andree + + Use smtpaddress, if present, to set the return path on warning mail + + Tell parser to object when SSL keyboard is used with SSL not compiled + + GSSAPI and ODMR fixes by Tom Hughes + * Fix small typo in message output (initscript) (closes: #129270) + * Change references to packaging-manual to debian-policy in comments + * Applied Tom Hughes patches to fix build of gssapi.c + * Enable i18n for "de" locale + * Do not output error when user requests "NO SSL" in the no-ssl version + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 2 Feb 2002 20:29:35 -0200 + +fetchmail (5.9.6-2) unstable; urgency=medium + + * Fix minor upgrade glitch: now remove /usr/share/doc/fethmail{-ssl,} + in new fetchmail{-ssl,} preinst script (closes: #126155) + * Tweak descriptions of fetchmail-common, fetchmail and fetchmail-ssl + to mention each other (closes: #126345) + * Fix non-initialization of deletions(imap.c), which resulted in random + crashes. Thanks to Sunil Shetye <shetye@bombay.retortsoft.com> for + tracking down the issue and for a preliminary version of the patch. + * Add umask 022 and some chmod --reference to postinst, so that we create + /etc/default/fetchmail with mode 644 and avoid changing its permissions + later. I will not attempt to chmod 644 it, since the user might have a + good reason to want it mode 600, so old files will remain 600 until the + user notices and chmods it himself if he wants to (closes: #126655) + * Add Danish debconf templates, thanks Claus Hindsgaul + (closes: #126595, #126596) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 29 Dec 2001 17:08:51 -0200 + +fetchmail (5.9.6-1) unstable; urgency=medium + + * The "Twilight in the North Sea" release + * New upstream source: + + OPIE bug fixes by Jun Miyoshi <usako@omnisci.co.jp>. + + Documented known IDLE bug in the todo.html file. + + Sunil Shetye's fix for a timeout/reconnect bug. + + LMTP fix from Toshiro HIKITA <toshi@sodan.org>. + + The duplicate-killer doesn't try to operate if we can get an actual + recipient address from the trace headers. + * Fix usage of dpkg-architecture in debian/rules: do not append -gnu to + the result, dpkg-architecture might be fixed to actually work as it + should someday, after all... + * Create a fetchmail-common package, to fix once and for all the problems + resulting from the sharing of conffiles between fetchmail and + fetchmail-ssl (closes: #123056) + * fetchmail-up: return exit status 0 if $DAEMON is not there to be run + * ip-up: return exit status 0 if initscript is not there to be run + * Document well in README.Debian just how dumb it is to forget to test-run + fetchmail with the 'keep' option when one changes the MTA/MDA + configuration, or fetchmail's. Also document the less-likely-to-delete- + messages way: setting antispam to -1 and setting "no bouncemail". + Upstream does not want to change the antispam defaults, and I happen to + think this is his call. OTOH, I will add an example config with safe + options, and if clueless people use that one, they will be [mostly] safe + from harm (closes: #123759) + * Report errors while opening logfile (closes: #120526) + * Change initscript slightly to show 'fetchmail' before trying to start + or signal it (closes: #121939) + * lintian override: "E: fetchmail-ssl usr-doc-symlink-to-foreign-package": + fetchmail-ssl DOES come from exactly the same source of fetchmail-common, + due to the ssl transformation hack. This hack will be shortlived. As soon + as woody is out or crypto in main arrives, I am killing the non-crypto + version of fetchmail. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 16 Dec 2001 11:04:12 -0200 + +fetchmail (5.9.5-7) unstable; urgency=low + + * Braindamaged sudo usage hits again. I am done with this, screw $HOME -- + sudo users make this useless and still expect stuff to work. Now use + getent passwd instead of assuming $HOME has anything useful at all in + these checks (closes: #122716). Yet another 'tip' for the currently + in limbo "debian packaging manual/howto/whatever". + * Apply patches from Mikael Andersson <mikan@debian.org> to fix build + with Debian kerberos4th. You better be using a new kerberos4th (>= 1.1), + or else this will break your build + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 8 Dec 2001 03:50:21 -0200 + +fetchmail (5.9.5-6) unstable; urgency=high + + * Fix logcheck.ignore file to really close #120398 + * Kicked urgency to high to get this thing into testing ASAP + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 28 Nov 2001 13:21:53 -0200 + +fetchmail (5.9.5-5) unstable; urgency=low + + * Complile all archs using -O instead of -O2, since upstream + also does it, and -O2 is broken in sparc (closes: #119425) + * Force correct permissions before trying to read config file + (closes: #120932) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 24 Nov 2001 14:34:28 -0200 + +fetchmail (5.9.5-4) unstable; urgency=low + + * Yet another workaround against #119366, make sure the owner of + /var/run/fetchmail is fetchmail:nogroup (closes: #120519) + * Add the chown workaround to the init script too, just in case + * Added "key fingerprint" and "#### body octets" to logcheck.ignore + (closes: #120398) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 22 Nov 2001 00:29:04 -0200 + +fetchmail (5.9.5-3) unstable; urgency=low + + * Added fetchmail\[[0-9]+\]: sleeping to logcheck.ignore (closes: #119682) + * Changed verbosity of "sleeping at ..." log message so that it only + shows up if fetchmail is above normal log level (closes: #120078) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 18 Nov 2001 11:55:07 -0200 + +fetchmail (5.9.5-2) unstable; urgency=low + + * Remove uneeded conflicts with python >=2.2. Lintian was screwing up. + * Add workaround for #119366, adduser not ensuring that the homedir + of the fetchmail user is really there + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 12 Nov 2001 22:10:38 -0200 + +fetchmail (5.9.5-1) unstable; urgency=low + + * The "Very dark skies ahead" release + * Enjoy NLS while it lasts. Upstream may drop it in the close future, + and I am not sure I will keep it alive in a Debian fork (I will certainly + try, however) + * New upstream source: + + Finished license cleanup, all licenses in the distribution are now + officially GPL-compatible. + + Added a length check to from64tobits() after receiving a warning that + it might create buffer overflows. No exploitable overflows were found + by a careful case-by-case audit, and at minimum an exploit would have + required that the mailserver be subverted + + Changed the logging logic along lines suggested by Jan Klaverstijn + + fetchmailconf looks first in the directory it's running from to find + fetchmail + + Make sure we vet a success status correctly from open_smtp_sink() + and open_bsmtp_sink() + + Immediately abort if a non-empty QMAILINJECT environment variable is + found. If it is set and contains f or i, qmail-inject or qmail's + sendmail `compatibility' wrapper will rewrite From: or Message-ID: + headers, respectively. En passant, fix the bug that program_name was not + filled in before used when the user's ID had no PW entry, leading to + (null) or crash when printing the error message. Patch by Matthias + Andree + + Block signals during SockConnect() so we don't get a socket descriptor + leak if we're hit by an alarm signal during connect(2) + + Set queryname even when server is inactive; avoids a core-dump bug in + the fetchids code + * Add -tt option to strace in the init.d debug-run debug helper + * Fix all calls to from64tobits so that fetchmail will actually compile, + I have no idea how it is compiling upstream without this. Maybe my CVS + tree is weird... oh well, I am using the non-exploitable version, so + I could care less :P + * Do not run config.guess anymore, trust output of dpkg-architecture + * Update fetchmailconf dependency list for the python 2.1 changes + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 10 Nov 2001 11:32:14 -0200 + +fetchmail (5.9.3-1) unstable; urgency=low + + * The "Upstream blues" release(s) :P + * New upstream source + + Make -D short option for --smtpaddress active again + + Make sure IMAP capability checks are caseblind + + Make sure suffix checks on akalists are properly caseblinded + + All warning mail now has a generated date stamp + + End of poll cycle is now logged + + Sanity check now rejects SSL option if SSL support is not + compiled in (Closes: #109796) + + Mike Warfield's fix for using a combined SSL cert and key in a + single file + + DNS lookups moved to just before te mailserver socket open, so + fetchmail now works OK even if started up without Internet + access. HESIOD lookups moved just before the DNS lookups + + Make sure the SICHLD handler is called when we run detached + (this helps with the zombie issue in #95659, I hope) + + Added FAQ item X8 on why mail sometimes gets an extra ) + appended + + Thomas Moestl's patch to use querynames in UID files. + + Timeout to deal with long socket closes (Sunil Shetye). + + Move from RSA MD5 code to Colin Plumb's public-domain implementation + (BSD classic license eliminated) + + Rewrite strcasecmp() (BSD classic license eliminated). + + Updated Danish po file. + + Re-enable explicit bounce message on bad address. + * Make sure .pot files are up-to-date. Will fix this for real in the + next upstream version, after I know how ESR will fix this upstream, + and what will come inside the upstream tarball + * fetchmailconf: fix tuple in sock.connect for python 2.1. Thanks to + Alain Tésio <alain@onesite.org> for the patch + * fetchmailconf: disable gross hack from upstream. We do NOT want + fetchmailconf to look for fetchmail in the current dir before it + searches $PATH. I shudder at the bug reports from clueless users... + * Fix problematic changes in 5.9.1-3 that caused POP2 protocol to be + run without being requested + * Make sure xgettext knows fetchmail uses GT_() instead of _() for gettext + (someone in fetchmail-friends pointed the need to do this, but I lost + his name somehow. Thank you, whomever you are). This actualy exposed + a bug in gettextize + * Update documentation on the _() to GT_() transition (sent upstream) + * Version dependency on debconf due to seen flag + * Fix typo in debian/copyright. Lintian rules! + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 30 Sep 2001 21:47:41 -0300 + +fetchmail (5.9.0-5) unstable; urgency=low + + * The "tidy-up before a long winter" release + * Fix ugly bogosity in fetchmail-up script, thanks to Jacek Kawa + <jfk@zeus.polsl.gliwice.pl> for the patch. I wonder what I was (not?) + thinking when I broke fetchmail-up... + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 20 Sep 2001 08:47:54 -0300 + +fetchmail (5.9.0-4) unstable; urgency=medium + + * Fix extremely stupid typo in fetchmail.config (closes: #112142) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 13 Sep 2001 15:12:37 -0300 + +fetchmail (5.9.0-3) unstable; urgency=low + + * Do not warn about the overriding of initscript defaults if system-wide + fetchmail is not active (closes: #110396) + * Change /bin/mail to /usr/bin/mail in fetchmail(1) (closes: #110820) + * fetchmailconf does not output empty plugin/plugout strings anymore + (closes: #106668, #106686). + * fetchmail: do strip /port# from LMTP addresses (closes: #98388) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 2 Sep 2001 11:57:56 -0300 + +fetchmail (5.9.0-2) unstable; urgency=low + + * Added strace capability to /etc/init.d/fetchmail debug-run, and updated + docs accordingly + * Detect missing /var/run or /var/run/fetchmail directory in initscript + (closes: #110076) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 26 Aug 2001 08:11:34 -0300 + +fetchmail (5.9.0-1) unstable; urgency=low + + * New upstream source: + * # characters now go to stdout, same place as the dots + * Matthias Andree's patch to correct parsing of spaces in quoted + usernames + * Do not complain/bomb out with an error if /etc/init.d/fetchmail is + missing, unless system-wide fetchmail is being switched from + disabled to enabled. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 15 Aug 2001 15:35:17 -0300 + +fetchmail (5.8.17-1) unstable; urgency=low + + * New upstream source: + * Eliminated second bounce on failed RCPT TO address. + * Always use fetchmail host's FQDN to identify the daemon when sending + bounce messages. + * Embarrassing bug of the month -- somehow, `skip' wasn't being + interpreted! + * Upstream integrated the security fix added to Debian in 5.8.16-1, + however I've added a warning should anyone attempt that exploit. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 8 Aug 2001 09:08:54 -0300 + +fetchmail (5.8.16-1) unstable; urgency=high + + * New upstream source: + * Refuse mail that has no good addresses and can't be sent to postmaster + * Restore behavior of discarding mail on 550 (closes: #105237) + * John Summerfield updated getfetchmail + * Lock-file-name bug reported by Scott Johnson + * Man page bugs pointed out by Andrew Benham + * POP3 end of session RSET on keep removed. Fixed in Debian in 5.8.14-1 + (closes: #104125) + * In IMAP, handle BAD and NO responses to FETCH gracefully + * Parse "no {syslog|invisible|showdots} properly + * Fixed bug in fetchmailconf plugin/plugout code (related to #105987) + * Handle ! in RFC2821 Return-Path addresses properly + * Fix typo in fetchmail(1), also done upstream (closes: #106925) + * SECURITY FIX: fix remote exploit on pop3 and imap protocols; Thanks + to Salvatore Sanfilippo <antirez@invece.org> for reporting the bug + and suggesting a patch to fix it. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 14 Jul 2001 12:38:26 -0300 + +fetchmail (5.8.14-2) unstable; urgency=low + + * Improved README.Debian file a little. Documented the fact that + system-wide fetchmail will refuse to start if there are errors in the + /etc/fetchmailrc file (closes: #105363). Documented how to properly + report bugs + * Added a debug-run initscript action that outputs proper debugging + information for reporting bugs + * Fix duplicate autotools-dev stuff in debian/rules clean target + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 14 Jul 2001 12:38:26 -0300 + +fetchmail (5.8.14-1) unstable; urgency=medium + + * New upstream source: + * Correction for backslash-handling patch in rfc822.c + * Fix for Debian Bug#103822: fetchmailconf fails to write file after + configuration; move .fetchmailrc to .fetchmailrc~ before overwriting + (closes: #103822) + * Discard Return-Path headers consisting of a single @ + * Make fetchmailconf dump plugin and plugout options properly + * Rob Brauns changes for building fetchmail outside its source directory + * Found (and killed) a subtle SMTP protocol error that was probably + lurking behind a lot of the bug reports related to bounce mail, thanks + to Quoc Luu. (Only manifested when the MTA rejected mail due to a bad + RCPT TO address) -- I think this closes: #88764 (hmh) + * Disable RSET before QUIT for pop3. This is a temporary measure, and I + might put it back soon (#104125) + * Fix serious configure.in bug that broke fallbacks to /usr/sbin/sendmail + (#104484) + * Fix assorted -Wall and build problems on upstream code + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 14 Jul 2001 12:38:26 -0300 + +fetchmail (5.8.12-1) unstable; urgency=low + + * New upstream source: + + Bug fix for envelope header skip + + ODMR finally seems to be working + + Handle multiple backslashes within RFC822 address strings correctly. + + Don't exit on a failure to DNS-resolve a mailserver name, just + make it inactive. Exit only if all lookups fail (closes: #99197) + + Restore code to deal with SMTP error responses at RCPT TO time, but + without issuing an RSET. This is intended to fix obscure bugs that + show up in recent Postfix releases and sendmail configurations that + delay antispam checks on the MAIL FROM line until RCPT TO time + (maybe fixes #88764) + * Add better autotools-dev support to debian/rules. Add devscripts to + build-depends because of this change + * Close standard input on initscript to make sure fetchmail won't ask + for passwords + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 7 Jul 2001 23:33:24 -0300 + +fetchmail (5.8.11-1) unstable; urgency=low + + * New upstream source: + + Add more ODMR fixes from Matt Armstrong <matt@lickey.com> + + Fix signal handling code (closes: #102711). Now, we do not reap + dead children until the end of a run when delivering to a MDA. + IF you use plugins and deliver to a MDA, you risk being overrun + by an army of undead. Don't do it, deliver through SMTP instead + + If a mail will be bounced to the postmaster AND postmaster is set to "" + (empty), don't try to forward it. Patch from Sunil Shetye + <shetye@bombay.retortsoft.com> + * Add polish template, thanks to Krzysztof Krzyzaniak + <eloy@transilvania.eu.org> (closes: #102667) + * More code cleanups for -Wall + * Recent bugfixes to other problems also fixed these: + (closes: #95370, #101950) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 3 Jul 2001 11:59:34 -0300 + +fetchmail (5.8.10-2) unstable; urgency=low + + * Recompile with dpkg 1.9.10 (closes: #102524, #102593) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 27 Jun 2001 13:42:34 -0300 + +fetchmail (5.8.10-1) unstable; urgency=low + + * New upstream source: + + ODMR fixes from Matt Armstrong <matt@lickey.com> + + The smtphost option has been split. It is no longer overloaded to set + the list of domains to be queried in ETRN and ODMR modes. Instead, + use the `fetchdomains' option. + + Fixes for the new message-marking code from Thomas Moestl + * Fix incorrect usage of strncat in 5.8.8-2 patch (also done upstream) + * Normalize tab usage on fetchmailconf (to keep #102052 closed) + * Fixed some -Wall warnings + * Added menu icon for fetchmailconf + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 26 Jun 2001 00:25:56 -0300 + +fetchmail (5.8.8-3) unstable; urgency=low + + * Finally managed to track down and terminate the last remaining + necromantic bug that liked keeping zombie children around for nefarious + needs (closes: #95659) + * Normalize tab usage on fetchmailconf (closes: #102052) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 24 Jun 2001 00:27:11 -0300 + +fetchmail (5.8.8-2) unstable; urgency=low + + * Fix warning about syslog/daemon overrides; now assume the warning should + be given at least once, if it cannot be verified to be uneeded. + * Replace numerous sprintfs with snprintf to avoid some remote + possibilities of a formatstring exploit exist. Same for strcat. + * Cleaned up lots of warnings (most of them justified) from gcc + * Debug builds now disable optimizations + * Dirty fix for ok in (driver.c)fetch_messages getting out of scope + for do_session (closes: #101792) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 23 Jun 2001 02:37:30 -0300 + +fetchmail (5.8.8-1) unstable; urgency=low + + * New upstream source + + Fix bug that prevented messages from being marked oversized + unless -v was on + + Steven Krings's patch to deal with over-long header lines + + Chris Maio's patch for POP3 with BSMTP + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 21 Jun 2001 11:51:18 -0300 + +fetchmail (5.8.7-2) unstable; urgency=low + + * fetchmailconf: Enclose local user names in quotes to avoid parse error + if numeric (closes: #101500) + * Add recently added .c files to po/POTFILES.in. Thanks to Byrial Jensen + <byrial@image.dk> for the patch + * Fix multidrop problem caused by the security fix in 5.8.5-2. Thanks to + Steve M.Robbins <steven.robbins@videotron.ca> for tracking this bug + down, and supplying a patch. Don't I feel dumb now for this mistake... + No more coding security fixes at 03:00 in the morning for me + (closes: #101530) + * Fix undue parameter expansion when generating postinst from template + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 19 Jun 2001 23:08:59 -0300 + +fetchmail (5.8.7-1) unstable; urgency=low + + * This release marks the start of a major code rewrite in fetchmail, so I + expect things to break. It doesn't help that I had to do a very + extensive list of changes in the packaging for 5.8.6-3. This is + unstable, therefore I'm not too concerned. However, you might want to + stick to 5.8.6-2 and wait for a few days to see if any major bugs show + up in the BTS before upgrading. You have been warned. + * New upstream source + + Fix fetchmailconf support for tracepolls (closes: #101242) + + driver.c refactoring in preparation for streaming mode + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 18 Jun 2001 11:26:41 -0300 + +fetchmail (5.8.6-3) unstable; urgency=medium + + * Applied patch from Byrial Jensen <byrial@image.dk> to make the + tracepools RFC-2822 compliant. Also, fixed bogus reference to + --adaccthdr in fetchmail --help + * Generate the postinst script in debian/rules from init.defaults and + *.postinst.template, to avoid poluting /usr/share or sync loss between + postinst and init.defaults + * Fix segfault-waiting-to-happen in driver.c. Thanks to Stephan Krings + <stephan@xmn-berlin.de> for noticing it + * /etc/default/fetchmail is not a conffile anymore. User-made changes are + still supported, but any changes made by me will not be propagated + anymore on upgrades. The "up-to-date" version of the configuration file + (including defaults and comments) is in the examples directory in the + documentation (closes: #101025) + * Disable fetchmailconf support for tracepolls until bug#101242 gets + fixed upstream + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 18 Jun 2001 02:50:34 -0300 + +fetchmail (5.8.6-2) unstable; urgency=low + + * Clean-up upstream cruft automatically, to make sure it won't choke an + --with-included-gettext build (not normally used in Debian, but who + knows...). This is needed because diff cannot delete files + * Running fetchmail as root is dangerous. The safest way is to run it as a + very unpriviledged user (you could even chroot it, I suppose) and + deliver over smtp. Stress this on the documentation + * Fix initscript so that it will work with POSIXLY_CORRECT set, thanks + "Sven M. Hallberg" <pesco@gmx.de> + * Do not abort postinst/prerm if the initscript fails (closes: #100832) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 14 Jun 2001 11:12:53 -0300 + +fetchmail (5.8.6-1) unstable; urgency=low + + * New upstream source + - Reject candidate headers for the MAIL FROM address that have \n in + them + - Add capability to insert poll trace data in the Received line + - Brendan Kehoe's patch to avoid doing DNS lookups on skip entries + (helps with #99197, but doesn't fix the whole issue) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 12 Jun 2001 13:28:19 -0300 + +fetchmail (5.8.5-2) unstable; urgency=high + + * Security fix: buffer overflow when rewriting headers longer than 512 + bytes (closes : #100394) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 12 Jun 2001 02:34:50 -0300 + +fetchmail (5.8.5-1) unstable; urgency=low + + * New upstream version + + Interface option fix from Alexander Kourakov. + + Attempted fix for Harry McGavran's problems with the Kerberos V build. + + Added fetchmailnochda.pl to the contrib directory. + + Sunil Shetye's patches for the seen count on IMAP and auto protocol. + * Fixed typo in logcheck.ignore (closes: #99706) + * Removed top_srcdir="." directive in debian/rules, as it broke the build + with new gettext and autoconf + * At least two known (and bad) bugs waiting for upstream fix. See + TODO.Debian in the source package -- they're not new bugs, AFAIK. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 2 Jun 2001 12:49:23 -0300 + +fetchmail (5.8.4-1) unstable; urgency=low + + * New upstream version + + New README.SSL file. If you use SSL, read it; tied to: + + New SSL certificate options from Thomas Moestl <tmoestl@gmx.net> + + Frantisek Brabec's patch for better UIDL error recovery + + Jorg de Jong's patch attempts to handle spaces in the ID part of UIDLs + (this probably closes: #96489) + * Fixed small typo in manpage + * Very minor fixes to work with autoconf 2.50 + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 22 May 2001 22:42:13 -0300 + +fetchmail (5.8.3-2) unstable; urgency=medium + + * The "Zombie-Child Reaper" release + * Split changelogs (including upstream's), to remove old cruft. + No information was lost, the complete changelogs are available + in the source package + * Serious attempt to allow all dead children to go peacefully to + the Big Bitbucket In The Sky. Signal handling was really screwed + up in Linux glibc 2.2 systems (and maybe others) (closes: #95659) + * fetchmailconf would generate bogus output if the monitor or + netsec options where enabled (closes: #98127) + * Use autotools-dev to make sure we need not worry about + config.{sub,guess} again. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 21 May 2001 11:42:13 -0300 + +fetchmail (5.8.3-1) unstable; urgency=medium + + * The "major pain in the neck" release + * New upstream release + - Don't cough and die from failure to resolve a skipped host + (closes: #92530, #92554) + - SIGCHLD handler now sets SA_RESTART explicitly in order to avoid + zombies from interrupted system calls (closes: #95993) + - Do aka suffix match even if DNS checking is enabled + - Prevent POP3 code from authenticating multiple times on success + - Fixed IMAP password shrouding + - Ignore Sender and Resent-Sender headers unless they contain @ + + The `localhost' special case of `via' is gone. Use `plugin %h' for + talking to ssh instead. THIS IS AN INCOMPATIBLE CHANGE IN + .fetchmailrc SEMANTICS. If you are using this for ssh tunnelling, + you may need to switch to using a plugin option with %h + SEE THE FAQ and fetchmail(1) manpage. + * Also set SA_NOCLDSTOP on SIGCHLD handler, we'll timeout the child + * Update German template, thanks blade@debian.org (closes: #97155) + * Add Galician template, thanks Jacobo Tarrio <jtarrio@trasno.net> + * Fixed build-dependency: libssl096-dev -> libssl-dev + * Honour /etc/default/fetchmail's CONFFILE in debconf warning tests + * Trust base-files to manage /var/mail, update policy compliance to + 3.5.4 and add the proper depends on base-files >= 2.2.0. This + reduces the mess on many of the scripts, which is a Good Thing. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 13 May 2001 14:35:58 -0300 + +fetchmail (5.8.1-6) unstable; urgency=low + + * The "I should not have got out of bed yesterday" release + * Fix broken handling of debconf defaults in fetchmail.config + (closes: #96648) + * Fix handling of /etc/default/fetchmail for $SERVICE when first + adding SERVICE to the config file + * Fix annoying postinst bogosity when creating the fetchmail user + * Add user-is-really-there test to initscript to close a bogon source + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 7 May 2001 16:53:08 -0300 + +fetchmail (5.8.1-5) unstable; urgency=low + + * The "I told you, didn't I?" release + * Warn users that ssh needs to be able to read the RSA/DSA keys to work, + and that means they must run the system-wide fetchmail as root. + * Debconf "no system-wide fetchmail" master switch added. Use + dpkg-reconfigure to re-enable it, or cry silently at the resulting + breakage if you don't know what you're doing. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 5 May 2001 23:58:05 -0300 + +fetchmail (5.8.1-4) unstable; urgency=low + + * The "A Debian developer's way is fraught with peril" release + * New Dutch template, thanks Thomas J. Zeeman (closes: #95737) + * Add debconf and initscript support to run the system-wide fetchmail + daemon as user fetchmail. It is safer, but it won't work if + fetchmail is told to deliver to a MDA. Unfortunately, now the + initscript violates the KISS principle quite throughoutly. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 5 May 2001 01:57:50 -0300 + +fetchmail (5.8.1-3) unstable; urgency=low + + * Small fixes to Makefile.in to finally have proper builds with all + possible gettext profiles (none, included, system's). + * New german template translations, thanks Sebastian Feltel (closes: #94529) + * Fix typo in templates.br (pt-br -> pt_BR) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 19 Apr 2001 15:32:15 -0300 + +fetchmail (5.8.1-2) unstable; urgency=medium + + * Fix upload screwup. No changes + * Use MULTIDROP(foo) in #92544 fix patch + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 12 Apr 2001 00:41:09 -0300 + +fetchmail (5.8.1-1) unstable; urgency=medium + + * The "it's time for the spring cleanup" release + * New upstream source + - Nalin Dahyabai's password parsing and authentication fixes. + - Golden brand (5.8.0) + * New upstream gettext 0.10.36 used instead of fetchmail upstream's. From + now on, Debian builds will always include the newest Debian packaged + version of gettext in the package source, just in case (we do not use + it, though) + * Build tweaks: to make sure new gettext will work, debian/rules clean now + adds execute permissions to all files that should have them, instead of + trusting the upstream tarball + * Switch to debhelper DH_COMPAT mode 3 + * Kerberos build support in fetchmail is NOT sane. I don't have a very + good way to test this stuff (and I don't think upstream can, either...), + but I'll try to at least clean it up to the point of it building + out-of-the-box using the multiple kerberos packages available in Debian. + This probably closes: #92793. + - configure changes to properly detect and work with heimdal-dev, + kerberos4kth-dev and krb5-dev. Do notice heimdal-dev does not provide + kerberosIV compatibility in Debian, you need kerberos4kth-dev too if + you need it (configure.in). Also, Heimdal builds *require* OpenSSL + support (due to Debian's packaging of Heimdal). + - rfc1731 seems to require kerberosIV support as far as I can tell from + RFCs, and the imap.c code agrees with this. This means that now KPOP + is only available if kerberosIV is as well. Do remember that GSSAPI + does not require kerberosIV and will work in kerberosV-only setups + (pop3.c) + * Fix typo in logcheck.ignore file (closes: #93215) + * Initscript fixed to not lie about fetchmail already running when it + fails to start (e.g. due to bad DNS) (closes: #93316) + * Do not use the poll name when using "via localhost" unless it is + a multidrop poll. (partialy addresses #92554) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 11 Apr 2001 12:09:35 -0300 + +fetchmail (5.7.7-2) unstable; urgency=low + + * Fix postrm purge target (closes: #92361) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 1 Apr 2001 01:43:41 -0300 + +fetchmail (5.7.7-1) unstable; urgency=low + + * New upstream source (but not really) + - No changes from 5.7.6-3 in Debian + * Build tweaks: now debian/rules makes sure the autotools are never run + so they have been dropped from build-depends. + * "--user root" was lost somehow from the initscript, probably in + one of those late-night hack-the-initscript sessions. Add it + back (closes: #92124) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Fri, 30 Mar 2001 00:45:57 -0300 + +fetchmail (5.7.6-3) unstable; urgency=low + + * The "GNU autotools are a pain in the arse" release + * I'm now using a full CVS-style autogen.sh approach. This will + make fetchmail far more friendly to newly debian-supported archs, + such as ia64 and hppa which need up-to-date config.guess or config.sub + support. I just hope nothing got broken in the process... + * Added menu entry for fetchmailconf + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 28 Mar 2001 01:36:40 -0300 + +fetchmail (5.7.6-2) unstable; urgency=low + + * Fix broken support for build without autoconf/autoheader + * Added CVS version info to many debian/ files + * Remind user that /etc/fetchmailrc is not removed on package + purge (we don't provide it, after all...) + * Fix bug in sink.c that would cause some SMTP errors not to be + correctly echoed to the log (e.g. 452 Out of storage) + (closes: #90966) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 25 Mar 2001 11:28:48 -0300 + +fetchmail (5.7.6-1) unstable; urgency=low + + * New upstream source + - IMAP: don't just quit if GSSAPI or Kerberos IV fail, but + try other methods + - Document the fact the IDLE and multiple folders don't play + well together (closes: #89908) + * Use -pipe for gcc in debian/rules + * Remove a lot of useless or dangerous cruft from contrib/ + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 22 Mar 2001 21:22:27 -0300 + +fetchmail (5.7.5-2) unstable; urgency=high + + * Fix POP2 build breackage + * Fix POP3 password leakage in fetchmail -v (closes: #90176) + * Try to compensate for broken sudo setups not correctly + setting ${HOME} for root, without actually breaking it for + people that have root's homedir elsewhere than /root + (closes: #90180) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 18 Mar 2001 23:40:58 -0300 + +fetchmail (5.7.5-1) unstable; urgency=low + + * New upstream source + * Add IPV6 and IPV6SEC build-time options to debian/rules + * Document in rcfile_y.y that "interface" is not available in + ipv6 builds + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 15 Mar 2001 19:30:23 -0300 + +fetchmail (5.7.4-3) unstable; urgency=low + + * Build-depends only in mail-transport-agent, as autobuilders do not + use the OR dependency. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 14 Mar 2001 14:57:55 -0300 + +fetchmail (5.7.4-2) unstable; urgency=low + + * Fixed build-depends (for fallback MDA) + * Suggests: mail-transport-agent + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 12 Mar 2001 21:57:18 -0300 + +fetchmail (5.7.4-1) unstable; urgency=low + + * New upstream source + - fetchmail now has a fallback MDA strategy for when it cannot connect + to the SMTP sink. Since not everyone will want to install and configure + procmail just because of fetchmail, we use /usr/sbin/sendmail as the + fallback strategy (works with exim, sendmail and postfix. Other MTAs + not tested) + * Patched to allow user to choose fallback strategy + * New conffile for initscript, /etc/default/fetchmail. This allows for + a default --daemon and --syslog behaviour, but will get in the way of + the clueful people who did the right thing and used set daemon and + set syslog in /etc/fetchmailrc (closes: #89343) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 11 Mar 2001 20:26:56 -0300 + +fetchmail (5.7.2-4) unstable; urgency=low + + * Added support for systems where aclocal and autoconf are not available + (which actually mean autoconf and automake can be removed from the + build-depends, but I'd rather have them installed when building + fetchmail) + * Better changelog for fetchmail-ssl + * Fix unsafe tempfile handling in fetchmailconf (closes: #89238) + Thanks go to Colin Phipps for the patch + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 11 Mar 2001 13:02:15 -0300 + +fetchmail (5.7.2-3) unstable; urgency=low + + * Fix bug in IMAP mailbox check (triggered by --check) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 7 Mar 2001 15:10:00 -0300 + +fetchmail (5.7.2-2) unstable; urgency=low + + * Fix IPv6 SA_LEN patch + * GSSAPI wouldn't compile due to syntax errors + * PROG_MAKE_SET was missing in configure.in + * Installs logcheck ignore files for the "C" locale + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 7 Mar 2001 00:03:48 -0300 + +fetchmail (5.7.2-1) unstable; urgency=low + + * New upstream source + * Fixed SA_LEN for glibc 2.2.2 and IPv6 + * Rebuilt NLS support (configure, makefiles) from scratch. Many thanks to + Nicolás Lichtmaier, who helped me a lot to figure out what was broken, + and why + * Warn user to move /root/.fetchids to new location (closes: #88658) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 5 Mar 2001 09:05:39 -0300 + +fetchmail (5.7.1-2) unstable; urgency=low + + * Seamless *build-time* support for kerberos IV and V, as well as for many + optional configure targets for fetchmail. This allows easy building of custom + fetchmail packages, supporting, e.g. POP2 or GSSAPI. See README.Debian and + debian/rules files for more information. (closes: #33317) + * Fix fetchmailconf "nospambounce" bug + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 4 Mar 2001 13:09:46 -0300 + +fetchmail (5.7.1-1) unstable; urgency=low + + * New upstream source + - manpage updates + - new --sslproto option + * Patched to fix NLS build + * Patched to fix SSL build + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 4 Mar 2001 05:43:50 -0300 + +fetchmail (5.7.0-2) unstable; urgency=low + + * Patch from upstream: do not attempt SASL on KPOP servers, + instead send USER and a fake PASS (closes: #88288) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 3 Mar 2001 19:19:54 -0300 + +fetchmail (5.7.0-1) unstable; urgency=low + + * New upstream source, fixes issues with fetchmailconf + * Patched to avoid breakage in NLS support + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 3 Mar 2001 08:29:43 -0300 + +fetchmail (5.6.8-3) unstable; urgency=low + + * Fix imap timeout when talking to Micoshaft Exchange + servers (closes: #87908) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 28 Feb 2001 19:10:52 -0300 + +fetchmail (5.6.8-2) unstable; urgency=low + + * Remind users that daemon means daemon (closes: #87580) + * Make sure fetchmail is started on ip-up (closes: #87577) + * Removed findutils from build-depends. + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 25 Feb 2001 12:59:51 -0300 + +fetchmail (5.6.8-1) unstable; urgency=low + + * New upstream source + Upstream has changed the syntax of "preauth" back to "auth", + please update your fetchmail configuration files. + * Maintainer scripts are now able to handle the sharing of + /etc/init.d/fetchmail by fetchmail and fetchmail-ssl without + causing problems during purge + * Avoid causing health problems during system boot ;-) (closes: #86885) + * "Improved" fetchmail-up and fetchmail-down scripts (closes: #86924) + This *will* bite your arse if you use PPP and don't read README.Debian; + Given the debconf annoyance I've added, and this changelog entry, consider + yourself warned and go read the README.Debian. + * Debconf support added to warn people about the init.d and ppp + scripts changes. + * Added missing Suggests: fetchmailconf to fetchmail-ssl + * Added missing xutils to Build-Depends: (for makedepend) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Wed, 21 Feb 2001 12:35:19 -0300 + +fetchmail (5.6.7-2) unstable; urgency=medium + + * Instead of reverting the change in driver.c, apply fix + * New CRAM-MD5 code is fully RFC-compliant, closes: #86667, #86474 + * Add warning to fetchmailconf for local usernames with embedded '@' + Closes: #82514 + + -- Henrique de Moraes Holschuh <hmh@debian.org> Tue, 20 Feb 2001 05:20:39 -0300 + +fetchmail (5.6.7-1) unstable; urgency=medium + + * New upstream source: + - Fixes pop3 AUTH/CAPA stuff so as to be rfc-compliant + * Please note 5.6.5 made changes to the fetchmailrc format, related + to the fact that many authorization features (such as CRAM-MD5) are now + auto-detected for both IMAP and POP3 + * Reverted change done to driver.c in 5.6.6 which caused fetchmail to emit + wrong status messages on timeouts when opening the mail server (source) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 19 Feb 2001 21:27:37 -0300 + +fetchmail (5.6.6-2) unstable; urgency=medium + + * The "children should not make fun of their elders" release + * Fetchmail wouldn't ask for passwords anymore (closes: #86350) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 17 Feb 2001 10:33:38 -0200 + +fetchmail (5.6.6-1) unstable; urgency=medium + + * New upstream source + * The "let's get that old maid out of testing" release + * No more asking for a password when using ETRN (closes: #85938) + * Don't issue AUTH between USER and PASS (closes: #85853, #86047) + * Different error message when local connection fails (closes: #85961) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Fri, 16 Feb 2001 17:28:11 -0200 + +fetchmail (5.6.5-3) unstable; urgency=low + + * Locales were not being correctly setup (closes: #73614) + * Applied patches to allow build with Kerberos IV (closes: #85772) + * /etc/init.d/fetchmail script for system-wide mail delivery, + create file /etc/fetchmailrc to enable. Deleted bogus + debian_rc file from the contrib dir to avoid confusing users. + (closes: #66251, #77804) + + -- Henrique de Moraes Holschuh <hmh@debian.org> Thu, 15 Feb 2001 17:27:56 -0200 + +fetchmail (5.6.5-2) unstable; urgency=low + + * Added hack from hell to generate fetchmail-ssl from the same source tree + * New fetchmail-ssl package, recompiled against up-to-date unstable + closes: #82073, #84427, #76240, #78362, #43179, #79153, #60949 + closes: #79967, #82503, #84434, #59584, #50421, #66624 + * Suggests fetchmailconf (closes: #69069) + * Bugs fixed by 5.5.4 and above: + closes: #75011, #70862, #69358, #69199, #66110, #63667 + closes: #62115, #61983, #59698 + probably closes: #80344 + * This is a new version (closes: #66824) + * Ported to debhelper v3, mode v2 (i.e. rebuilt debian/rules), and + fixed all crosstalk between the fetchmail and fetchmailconf packages. + Closes: #76240, #79967, #54132, #55205 + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 12 Feb 2001 15:25:18 -0200 + +fetchmail (5.6.5-1) unstable; urgency=low + + * New upstream source + * Closing bugs fixed by versions 5.5.4 and above: + closes: #78963, #63064, #65505, #81312, #78796, #78363 + closes: #68627, #63088, #71428 + + -- Henrique de Moraes Holschuh <hmh@debian.org> Mon, 12 Feb 2001 12:49:22 -0200 + +fetchmail (5.6.4-1) unstable; urgency=low + + * New upstream source + * Package is now compliant with policy 3.5.0.0 + * Fixed stupid screwup that might stop an autobuild in debian/rules + * Tentative build-depends. Please file a bug if it doesn't work + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sun, 11 Feb 2001 14:24:42 -0200 + +fetchmail (5.6.3-1) unstable; urgency=low + + * New upstream source + * New maintainer. Paul orphaned the package, and the other person who + should become the new fetchmail maintainer went MIA without so + much as uploading a new package or finishing his NM application + * Minor package cleanups + + -- Henrique de Moraes Holschuh <hmh@debian.org> Sat, 10 Feb 2001 21:55:06 -0200 diff --git a/debian/clean b/debian/clean new file mode 100644 index 00000000..5a8b3c5f --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +config.log +po/*.gmo diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..7a5a73fc --- /dev/null +++ b/debian/control @@ -0,0 +1,32 @@ +Source: fetchmail +Section: mail +Priority: optional +Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org> +Build-Depends: debhelper-compat (= 13), pkg-config, flex, libssl-dev (>= 3.0.11), bison, libkrb5-dev, libgssglue-dev +Standards-Version: 4.6.2 +Rules-Requires-Root: no +Homepage: https://www.fetchmail.info + +Package: fetchmail +Architecture: any +Pre-Depends: init-system-helpers (>= 1.52) +Depends: ${shlibs:Depends}, ${misc:Depends}, debianutils (>= 1.7), adduser (>= 3.34), sysvinit-utils (>= 3.05-4~) | lsb-base +Breaks: logcheck (<< 1.1.1-9), fetchmail-ssl (<= 6.2.5-12) +Conflicts: fetchmail-common +Replaces: fetchmail-common, fetchmail-ssl +Provides: fetchmail-ssl +Suggests: fetchmailconf, default-mta | mail-transport-agent, resolvconf +Recommends: ca-certificates +Description: SSL enabled POP3, APOP, IMAP mail gatherer/forwarder + fetchmail is a free, full-featured, robust, and well-documented remote mail + retrieval and forwarding utility intended to be used over on-demand TCP/IP + links (such as SLIP or PPP connections). It retrieves mail from remote mail + servers and forwards it to your local (client) machine's delivery system, so + it can then be read by normal mail user agents such as mutt, elm, pine, + (x)emacs/gnus, or mailx. The fetchmailconf package includes an interactive + GUI configurator suitable for end-users. + . + Kerberos V and GSSAPI are supported. + . + Kerberos IV, RPA, OPIE and other support for some other features are + available if the package is recompiled. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..adbecd91 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,311 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: fetchmail +Upstream-Contact: https://www.fetchmail.info +Source: https://gitlab.com/fetchmail/fetchmail/ + +Files: * +Copyright: 2005-2021 Matthias Andree + 2005-2012 Sunil Shetye + 1987-2012 Free Software Foundation, Inc. + 2004 Matthias Andree + 2004 Robert M. Funk + 2004 Graham Wilson + 1997-2004 Eric S. Raymond + 1996-1997 George M. Sipe + 1993-1995 Carl E. Harris +License: GPL-2+ with OpenSSL exception + Copyright retained for the purpose of protecting free software redistribution. + Specific permission is granted for the GPLed code in this distribition to + be linked to OpenSSL without invoking GPL clause 2(b). + . + The full text of the GNU General Public License is available in + /usr/share/common-licenses/GPL-2. + +Files: aclocal.m4 + config.rpath +Copyright: 1996-2011 Free Software Foundation, Inc + 1996 Gordon Matzigkeit <gord@gnu.ai.mit.edu> +License: FSFAP + This file is free software; the Free Software Foundation gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. + +Files: beos/* +Copyright: 1983-1999 The Regents of the University of California +License: BSD-4-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +Files: contrib/runfetchmail + idle.c + rfc822.c +Copyright: 1997 Eric S. Raymond <esr@thyrsus.com> + 1997 Doug Muth, Wescosville, Pennsylvania USA +License: Expat + 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 AUTHORS OR COPYRIGHT HOLDERS + 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. + +Files: install-sh +Copyright: 1994 X Consortium +License: MIT-X-Consortium + 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 + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + +Files: KAME/* +Copyright: 1995-1998 WIDE Project +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the project nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +Files: libesmtp/* +Copyright: 2001-2002 Brian Stafford <brian@stafford.uklinux.net> +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + The full text of the GNU Lesser General Public License is available + in /usr/share/common-licenses/LGPL-2.1. + +Files: rcfile_y.c + rcfile_y.h +Copyright: 1984-2011 Free Software Foundation, Inc. +License: GPL-3+ with bison exception + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + . + As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + +Files: ntlm.h + smb*.c + smb*.h +Copyright: 1992-1998 Andrew Tridgell + 1995 Jeremy Allison +License: GPL-2+ with link exception + Tridge has granted a specific exemption for his GPL-licensed code to + be linked with non-GPL-compliant code in fetchmail. + . + The full text of the GNU General Public License is available in + /usr/share/common-licenses/GPL-2. + +Files: md5c.c +Copyright: 1993 Colin Plumb +License: public-domain + No copyright is claimed. + The algorithm is due to Ron Rivest. + This code is in the public domain; do with it what you wish. + +Files: m4-local/ac_ma_search_package.m4 +Copyright: 2001-2004 Caolan McNamara <caolan@skynet.ie> + 2001-2004 Alexandre Duret-Lutz <duret_g@lrde.epita.fr> + 2001-2004 Matthew Mueller <donut@azstarnet.com> + 2001-2004 Matthias Andree <matthias.andree@gmx.de> +License: GPL-2+ with autoconf exception + Please note that every macro contained in this archive is copyrighted + by its respective author, unless the macro source explicitly says + otherwise. Permission has been granted, though, to use and distribute + all macros under the following license, which is a modified version of + the GNU General Public License version 2: + . + Every Autoconf macro presented on this web site is free software; + you can redistribute it and/or modify it under the terms of the GNU + General Public License as published by the Free Software + Foundation; either version 2, or (at your option) any later + version. + . + They are distributed in the hope that they will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + The full text of the GNU General Public License is available in + /usr/share/common-licenses/GPL-2. + . + As a special exception, the Free Software Foundation gives + unlimited permission to copy, distribute and modify the configure + scripts that are the output of Autoconf. You need not follow the + terms of the GNU General Public License when using or distributing + such scripts, even though portions of the text of Autoconf appear + in them. The GNU General Public License (GPL) does govern all other + use of the material that constitutes the Autoconf program. + . + Certain portions of the Autoconf source text are designed to be + copied (in certain cases, depending on the input) into the output + of Autoconf. We call these the "data" portions. The rest of the + Autoconf source text consists of comments plus executable code that + decides which of the data portions to output in any given case. We + call these comments and executable code the "non-data" portions. + Autoconf never copies any of the non-data portions into its output. + . + This special exception to the GPL applies to versions of Autoconf + released by the Free Software Foundation. When you make and + distribute a modified version of Autoconf, you may extend this + special exception to the GPL to apply to your modified version as + well, *unless* your modified version has the potential to copy into + its output some of the text that was the non-data portion of the + version that you started with. (In other words, unless your change + moves or copies text from the non-data portions to the data + portions.) If your modification has such potential, you must delete + any notice of this special exception to the GPL from your modified + version. + +Files: trio/* + ucs/*.c +Copyright: 2002-2003 Markus Kuhn + 1998-2001 Bjorn Reese + 1998-2001 Daniel Stenberg +License: ISC + 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. + . + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND + CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. + +Files: debian/* +Copyright: + 2015- Laszlo Boszormenyi (GCS) <gcs@debian.org> + 2018 Nicolas Boulenguez <nicolas@debian.org> + 2005-2016 Nico Golde <nion@debian.org> + 2005-2016 Héctor García <hector@debian.org> + 2005 Lucas Wall <lwall@debian.org> + 2005 Loic Minier <lool@dooz.org> + 2003-2004 Graham Wilson <graham@debian.org> + 2002-2003 Benjamin Drieu <benj@debian.org> + 2001-2002 Henrique M. Holschuh <hmh@debian.org> + 1996-2002 Paul Haggart <phaggart@debian.org> +License: GPL-2+ + +Files: debian/tests/* +Copyright: 2019 Bryce Harrington <bryce@canonical.com> +License: GPL-2+ + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +Comment: On Debian systems, the complete text of the GNU General Public + License v2 can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/fetchmail.default b/debian/fetchmail.default new file mode 100644 index 00000000..c145c37e --- /dev/null +++ b/debian/fetchmail.default @@ -0,0 +1,11 @@ +# This file will be used to declare some vars for fetchmail +# +# Uncomment the following if you don't want localized log messages +# export LC_ALL=C + +# If you want to specify any additional OPTION to the start +# scripts specify them here +# OPTIONS=... + +# Declare here if we want to start fetchmail. 'yes' or 'no' +START_DAEMON=no diff --git a/debian/fetchmail.doc-base b/debian/fetchmail.doc-base new file mode 100644 index 00000000..5c47447a --- /dev/null +++ b/debian/fetchmail.doc-base @@ -0,0 +1,10 @@ +Document: fetchmail +Title: Fetchmail Documentation +Author: Eric S. Raymond, Matthias Andree, Carl E. Harris, George M. Sipe +Abstract: This documentation covers the FAQ and features of fetchmail. +Section: Network/Communication + +Format: HTML +Index: /usr/share/doc/fetchmail/fetchmail-features.html +Files: /usr/share/doc/fetchmail/fetchmail-*.html + diff --git a/debian/fetchmail.docs b/debian/fetchmail.docs new file mode 100644 index 00000000..163821f8 --- /dev/null +++ b/debian/fetchmail.docs @@ -0,0 +1,9 @@ +design-notes.html +fetchmail-FAQ.html +fetchmail-features.html +todo.html +OLDNEWS +NEWS +README.SSL +contrib/systemd/README.systemd +debian/README.contrib diff --git a/debian/fetchmail.examples b/debian/fetchmail.examples new file mode 100644 index 00000000..4fb6f913 --- /dev/null +++ b/debian/fetchmail.examples @@ -0,0 +1 @@ +debian/fetchmailrc.example diff --git a/debian/fetchmail.init b/debian/fetchmail.init new file mode 100644 index 00000000..a6fbcb0e --- /dev/null +++ b/debian/fetchmail.init @@ -0,0 +1,248 @@ +#!/bin/sh +# +# Fetchmail init script +# Latest change: Do Aug 30 16:04:39 CEST 2012 +# +### BEGIN INIT INFO +# Provides: fetchmail +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: $mail-transport-agent postfix exim4 $named +# Should-Stop: $mail-transport-agent postfix exim4 +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: init-Script for system wide fetchmail daemon +# Description: Enable service provided by fetchmail in daemon mode +### END INIT INFO +# +# A fetchmailrc file containg hosts and passwords for all local users should be +# placed in /etc/fetchmailrc. Remember to make the /etc/fetchmailrc mode 600 +# to avoid disclosing the users' passwords. +# +# This script will NOT start or stop fetchmail if the /etc/fetchmailrc file +# does not exist or if START_DAEMON in /etc/default/fetchmail is set to no. + +set -e + +# Defaults +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/fetchmail +USER=fetchmail +OPTIONS="" + +CONFFILE="/etc/fetchmailrc" +PIDFILE="/var/run/fetchmail/fetchmail.pid" +UIDL="/var/lib/fetchmail/.fetchmail-UIDL-cache" +START_DAEMON="no" + +. /lib/lsb/init-functions + +if [ -r /etc/default/fetchmail ]; then + . /etc/default/fetchmail +fi + +OPTIONS="$OPTIONS -f $CONFFILE --pidfile $PIDFILE" + +if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "status" ]; then + log_action_msg "Not starting fetchmail daemon, disabled via /etc/default/fetchmail" + exit 0 +fi + +if [ ! -e $CONFFILE ]; then + log_failure_msg "$CONFFILE not found." + log_failure_msg "can not start fetchmail daemon... consider disabling the script" + exit 6 +fi + + +test -f $DAEMON || exit 0 + +if [ "$1" = "start" ]; then + if [ ! -r $CONFFILE ] ; then + log_failure_msg "$CONFFILE found but not readable." + exit 0 + fi +fi + + +# sanity checks (saves on MY sanity :-P ) +if ! id $USER >/dev/null 2>&1; then + if [ "$USER" = "fetchmail" ]; then + # The fetchmail user might have been removed when the fetchmail-common + # package is purged. We have to re-add it here so the system-wide + # daemon will run. + + adduser --system --ingroup nogroup --home /var/lib/fetchmail \ + --shell /bin/sh --disabled-password fetchmail >/dev/null 2>&1 || true + # work around possible adduser bug, see #119366 + [ -d /var/lib/fetchmail ] || mkdir -p /var/lib/fetchmail + chmod 700 /var/lib/fetchmail + chown -h -R fetchmail:nogroup /var/lib/fetchmail + [ -x /sbin/restorecon ] && /sbin/restorecon /var/lib/fetchmail + else + log_failure_msg "$0: $USER user does not exist!" + exit 1 + fi +fi + +# add daemon option if user hasn't already specified it +if ! grep -qs '^[[:space:]]*set[[:space:]]\+daemon[[:space:]]' "$CONFFILE"; then + # Make sure user did not use -d on /etc/default/fetchmail + if ! grep -qs -e '^[[:space:]]*OPTIONS=.*-d[[:space:]]*[[:digit:]]\+' "/etc/default/fetchmail"; then + OPTIONS="$OPTIONS -d 300" + fi +fi + +# add syslog option unless user specified "set no syslog". +if ! grep -qs '^[[:space:]]*set[[:space:]]\+no[[:space:]]\+syslog' "$CONFFILE"; then + OPTIONS="$OPTIONS --syslog" +fi + +# support for ephemeral /var/run +if [ "${PIDFILE%/*}" = "/var/run/fetchmail" ] && [ ! -d ${PIDFILE%/*} ] && [ "$1" != "status" ]; then + mkdir /var/run/fetchmail + chown -h $USER:nogroup /var/run/fetchmail + chmod 700 /var/run/fetchmail + [ -x /sbin/restorecon ] && /sbin/restorecon /var/run/fetchmail +fi + +# sanity check +#if [ ! -d ${PIDFILE%/*} ]; then +# log_failure_msg "$0: directory ${PIDFILE%/*} does not exist!" +# exit 1 +#fi + +# If the user is going to use a UIDL cache, try to find a better place for the +# UIDL cache than root's homedir. Also create $UIDL if it doesn't exist, +# because the daemon won't have the permission. +# THIS IS NOT NEEDED SINCE 6.3.x +#if ! grep -qs idfile "$CONFFILE" && [ -d /var/lib/fetchmail ]; then +# OPTIONS="$OPTIONS -i $UIDL" +# touch $UIDL +# chown -h $USER $UIDL +# chmod 0600 $UIDL +#fi + +# Makes sure certain files/directories have the proper owner +if [ -f $CONFFILE -a "`stat -c '%U %a' $CONFFILE 2>/dev/null`" != "$USER 600" ]; then + chown -h $USER $CONFFILE + chmod -f 0600 $CONFFILE +fi + +case "$1" in + start) + if test -e $PIDFILE ; then + pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` + PIDDIR=/proc/$pid + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + log_failure_msg "fetchmail already started; not starting." + exit 0 + else + log_warning_msg "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + log_begin_msg "Starting mail retriever agent:" "fetchmail" + if start-stop-daemon -S -o -q -x $DAEMON -u $USER -c $USER -- $OPTIONS; then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + status) + status_of_proc $DAEMON fetchmail -p $PIDFILE + ;; + stop) + if ! test -e $PIDFILE ; then + log_failure_msg "Pidfile not found! Is fetchmail running?" + exit 0 + fi + log_begin_msg "Stopping mail retriever agent:" "fetchmail" + if start-stop-daemon -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + force-reload|restart) + log_begin_msg "Restarting mail retriever agent:" "fetchmail" + if ! start-stop-daemon -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then + log_end_msg 1 + exit 1 + fi + sleep 1 + if start-stop-daemon -S -q -x $DAEMON -u $USER -c $USER -- $OPTIONS; then + log_end_msg 0 + else + log_end_msg 1 + exit 1 + fi + ;; + try-restart) + if test -e $PIDFILE ; then + pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` + PIDDIR=/proc/$pid + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + $0 restart + exit 0 + fi + fi + test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*fetchmail* && $0 start + ;; + awaken) + log_begin_msg "Awakening mail retriever agent:" "fetchmail" + if [ -s $PIDFILE ]; then + start-stop-daemon -K -s 10 -q -p $PIDFILE -x $DAEMON + log_end_msg 0 + exit 0 + else + log_end_msg 1 + exit 1 + fi + ;; + debug-run) + echo "$0: Initiating debug run of system-wide fetchmail service..." 1>&2 + echo "$0: script will be run in debug mode, all output to forced to" 1>&2 + echo "$0: stdout. This is not enough to debug failures that only" 1>&2 + echo "$0: happen in daemon mode." 1>&2 + echo "$0: You might want to direct output to a file, and tail -f it." 1>&2 + if [ "$2" = "strace" ]; then + echo "$0: (running debug mode under strace. See strace(1) for options)" 1>&2 + echo "$0: WARNING: strace output may contain security-sensitive info, such as" 1>&2 + echo "$0: passwords; please clobber them before sending the strace file to a" 1>&2 + echo "$0: public bug tracking system, such as Debian's." 1>&2 + fi + echo "$0: Stopping the service..." 1>&2 + "$0" stop + echo "$0: exit status of service stop was: $?" + echo "$0: RUNUSER is $USER" + echo "$0: OPTIONS would be $OPTIONS" + echo "$0: Starting service in nodetach mode, hit ^C (SIGINT/intr) to finish run..." 1>&2 + if [ "$2" = "strace" ] ; then + shift + shift + [ $# -ne 0 ] && echo "$0: (strace options are: -tt $@)" 1>&2 + su -s /bin/sh -c "/usr/bin/strace -tt $* $DAEMON $OPTIONS --nosyslog --nodetach -v -v" $USER <&- 2>&1 + else + su -s /bin/sh -c "$DAEMON $OPTIONS --nosyslog --nodetach -v -v" $USER <&- 2>&1 + fi + echo "$0: End of service run. Exit status was: $?" + exit 0 + ;; + *) + log_warning_msg "Usage: /etc/init.d/fetchmail {start|stop|restart|force-reload|awaken|debug-run}" + log_warning_msg " start - starts system-wide fetchmail service" + log_warning_msg " stop - stops system-wide fetchmail service" + log_warning_msg " restart, force-reload - starts a new system-wide fetchmail service" + log_warning_msg " awaken - tell system-wide fetchmail to start a poll cycle immediately" + log_warning_msg " debug-run [strace [strace options...]] - start a debug run of the" + log_warning_msg " system-wide fetchmail service, optionally running it under strace" + exit 1 + ;; +esac + +exit 0 + +# vim:ts=4:sw=4: diff --git a/debian/fetchmail.install b/debian/fetchmail.install new file mode 100644 index 00000000..1cc4540e --- /dev/null +++ b/debian/fetchmail.install @@ -0,0 +1,30 @@ +# A single line with a single occurence of the destination directory +# would be more efficient (as debhelper would use one cp command), but +# this presentation seems more easy to maintain. +contrib/fetchmailnochda.pl usr/share/doc/fetchmail/contrib +contrib/fetchsetup usr/share/doc/fetchmail/contrib +contrib/domino usr/share/doc/fetchmail/contrib +contrib/fetchmaildistrib usr/share/doc/fetchmail/contrib +contrib/fetchmail-mode.el usr/share/doc/fetchmail/contrib +contrib/getmail usr/share/doc/fetchmail/contrib +contrib/gotmail usr/share/doc/fetchmail/contrib +contrib/gotmail.awk usr/share/doc/fetchmail/contrib +contrib/gotmail.conf usr/share/doc/fetchmail/contrib +contrib/gotmail.html.awk usr/share/doc/fetchmail/contrib +contrib/login usr/share/doc/fetchmail/contrib +contrib/logout usr/share/doc/fetchmail/contrib +contrib/maildaemon usr/share/doc/fetchmail/contrib +contrib/mailqueue.pl usr/share/doc/fetchmail/contrib +contrib/multidrop usr/share/doc/fetchmail/contrib +contrib/novell usr/share/doc/fetchmail/contrib +contrib/poptest usr/share/doc/fetchmail/contrib +contrib/preauth-harness usr/share/doc/fetchmail/contrib +contrib/README usr/share/doc/fetchmail/contrib +contrib/README.getmail usr/share/doc/fetchmail/contrib +contrib/runfetchmail usr/share/doc/fetchmail/contrib +contrib/toprocmail usr/share/doc/fetchmail/contrib +contrib/zsh-completion usr/share/doc/fetchmail/contrib +contrib/fetchmail.logrotate usr/share/doc/fetchmail/contrib +contrib/delete-later usr/share/doc/fetchmail/contrib +contrib/delete-later.README usr/share/doc/fetchmail/contrib +contrib/systemd/fetchmail.service usr/lib/systemd/user/ diff --git a/debian/fetchmail.links b/debian/fetchmail.links new file mode 100644 index 00000000..d38caed8 --- /dev/null +++ b/debian/fetchmail.links @@ -0,0 +1,3 @@ +usr/bin/fetchmail usr/bin/popclient +usr/share/man/man1/fetchmail.1 usr/share/man/man1/popclient.1 +usr/share/man/man1/fetchmail.1 usr/share/man/man1/fetchmailrc.1 diff --git a/debian/fetchmail.logcheck.ignore.server b/debian/fetchmail.logcheck.ignore.server new file mode 100644 index 00000000..3f03e7f0 --- /dev/null +++ b/debian/fetchmail.logcheck.ignore.server @@ -0,0 +1,15 @@ +fetchmail\[[0-9]+\]: +reading +fetchmail\[[0-9]+\]: +(not )?flushed +fetchmail\[[0-9]+\]: +[0-9]+ +messages? (\([0-9]+ seen\) )?for +fetchmail\[[0-9]+\]: +skipping poll +fetchmail\[[0-9]+\]: +Polling +fetchmail\[[0-9]+\]: +Queuing for +fetchmail\[[0-9]+\]: +awakened by +fetchmail\[[0-9]+\]: +awakened at +fetchmail\[[0-9]+\]: +sleeping +fetchmail\[[0-9]+\]: .* key fingerprint: +fetchmail\[[0-9]+\]: +\(.* body octets\) +fetchmail\[[0-9]+\]: +could not decode BASE64 challenge +fetchmail\[[0-9]+\]: +You have no mail\. +fetchmail\[[0-9]+\]: +Turnaround now\.\.\. +fetchmail\[[0-9]+\]: +receiving message data diff --git a/debian/fetchmail.logcheck.ignore.workstation b/debian/fetchmail.logcheck.ignore.workstation new file mode 100644 index 00000000..c0a7a6be --- /dev/null +++ b/debian/fetchmail.logcheck.ignore.workstation @@ -0,0 +1 @@ +fetchmail\[[0-9]+\]: +Server CommonName mismatch: diff --git a/debian/fetchmail.postinst b/debian/fetchmail.postinst new file mode 100644 index 00000000..c3bf1145 --- /dev/null +++ b/debian/fetchmail.postinst @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Postinst script for fetchmail +# $Id: fetchmail.postinst 469 2008-05-18 12:47:05Z nion $ +# + +set -e + +# Create fetchmail user and its homedir if we may need it +if ! getent passwd fetchmail >/dev/null; then + adduser --system --ingroup nogroup --home /var/lib/fetchmail \ + --shell /bin/false --disabled-password fetchmail +fi + +# if the login shell is not /bin/false, change this, see #481727 +LOGINSH=$(getent passwd fetchmail | cut -d ':' -f 7) +if [ "x$LOGINSH" != "x/bin/false" ]; then + chsh -s /bin/false fetchmail +fi + +if ! [ -d /var/lib/fetchmail ]; then + mkdir -p /var/lib/fetchmail +fi +chmod 700 /var/lib/fetchmail +chown -h -R fetchmail:nogroup /var/lib/fetchmail + +#DEBHELPER# + +exit 0 + +# vim:ts=4:sw=4: diff --git a/debian/fetchmail.postrm b/debian/fetchmail.postrm new file mode 100644 index 00000000..64efe81c --- /dev/null +++ b/debian/fetchmail.postrm @@ -0,0 +1,32 @@ +#!/bin/sh +# +# Postrm script for fetchmail +# $Id: fetchmail.postrm 460 2008-02-04 15:20:16Z nion $ +# + +set -e + +#DEBHELPER# + +if [ "$1" = "purge" ]; then + if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge + fi + + # Remove other cruft + rm -f /var/mail/.fetchmail-UIDL-cache >/dev/null 2>&1 || true + rm -rf /var/run/fetchmail >/dev/null 2>&1 || true + + # Remove user fetchmail + fetchmailhome=`getent passwd fetchmail | cut -d : -f 6` + rm -f "$fetchmailhome/.fetchids" >/dev/null 2>&1 || true + rm -f "$fetchmailhome/.fetchmail-UIDL-cache" >/dev/null 2>&1 || true + rm -f "$fetchmailhome/.fetchmail.pid" >/dev/null 2>&1 || true + userdel fetchmail || true + rmdir "$fetchmailhome" >/dev/null 2>&1 || true +fi + +exit 0 + +# vim:ts=4:sw=4: diff --git a/debian/fetchmail.ppp.ip-down b/debian/fetchmail.ppp.ip-down new file mode 100644 index 00000000..75d0cfbe --- /dev/null +++ b/debian/fetchmail.ppp.ip-down @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Default fetchmail ip-down script (/etc/ppp/ip-down.d/fetchmail) +# +# Remove the "exit 0" line if you want only want to run fetchmail when the +# PPP link is up. +# + +exit 0 + +if [ -x /etc/init.d/fetchmail ]; then + invoke-rc.d --quiet fetchmail stop || true +fi diff --git a/debian/fetchmail.ppp.ip-up b/debian/fetchmail.ppp.ip-up new file mode 100644 index 00000000..3950a32a --- /dev/null +++ b/debian/fetchmail.ppp.ip-up @@ -0,0 +1,13 @@ +#!/bin/sh +# +# Default fetchmail ip-up script (/etc/ppp/ip-up.d/fetchmail) +# +# Change "try-restart" below to "start" +# and remove "-a ! -x /sbin/resolvconf" +# if you only want to run fetchmail when +# the PPP link is up. +# + +if [ -x /etc/init.d/fetchmail -a ! -x /sbin/resolvconf ]; then + invoke-rc.d --quiet fetchmail try-restart || true +fi diff --git a/debian/fetchmail.preinst b/debian/fetchmail.preinst new file mode 100644 index 00000000..96550390 --- /dev/null +++ b/debian/fetchmail.preinst @@ -0,0 +1,18 @@ +#!/bin/sh +# +# Preinst script for fetchmail +# $Id: fetchmail.preinst 486 2008-12-22 15:13:12Z nion $ +# + +set -e + +# Remove a possibly fucked ip-up.d, which was unfortunately not +# removed due of being a conffile. This is ugly but the only "clean" +# way I see right now. +if [ -f /etc/network/if-up.d/fetchmail ] && [ "$2" = "6.2.4-3" ]; then + rm -f /etc/network/if-up.d/fetchmail +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/fetchmail.prerm b/debian/fetchmail.prerm new file mode 100644 index 00000000..ecd8db61 --- /dev/null +++ b/debian/fetchmail.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e +# Stops daemon if it is running under our control +if [ -x /etc/init.d/fetchmail ]; then + invoke-rc.d --quiet fetchmail stop +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/fetchmailrc.example b/debian/fetchmailrc.example new file mode 100644 index 00000000..5fd5ecce --- /dev/null +++ b/debian/fetchmailrc.example @@ -0,0 +1,33 @@ +# /etc/fetchmailrc for system-wide daemon mode +# This file must be chmod 0600, owner fetchmail + +# The default for this option is 300, which polls the server every 5 +# minutes. +# +#set daemon 300 + +# By default, the system-wide fetchmail will output logging messages to +# syslog; uncomment the line below to disable this. This might be useful +# if you are logging to another file using the 'logfile' option. +# +# set no syslog + +# Avoid loss on 4xx errors. On the other hand, 5xx errors get more +# dangerous. +# +set no bouncemail + +# The following defaults are used when connecting to any server, and can +# be overridden in the server description below. +# +# Set antispam to -1, since it is far safer to use that together with no +# bouncemail. +# +defaults: + antispam -1 + batchlimit 100 + +# Example server section. +# +#poll foo.bar.org with protocol pop3 +# user baka there is localbaka here smtphost smtp.foo.bar.org; diff --git a/debian/patches/01_fetchmailconf.patch b/debian/patches/01_fetchmailconf.patch new file mode 100755 index 00000000..24557339 --- /dev/null +++ b/debian/patches/01_fetchmailconf.patch @@ -0,0 +1,14 @@ +Description: Remove header from fetchmailconf.py since it is a library. +Author: Hector Garcia <hector@debian.org> + +Remove header from fetchmailconf.py since it is a library. +Index: fetchmail-6.3.13/fetchmailconf.py +=================================================================== +--- fetchmail-6.3.13.orig/fetchmailconf.py 2009-09-24 01:11:14.000000000 +0200 ++++ fetchmail-6.3.13/fetchmailconf.py 2010-02-01 16:33:46.000000000 +0100 +@@ -1,5 +1,3 @@ +-#!/usr/bin/env python +-# + # A GUI configurator for generating fetchmail configuration files. + # by Eric S. Raymond, <esr@snark.thyrsus.com>, + # Matthias Andree <matthias.andree@gmx.de> diff --git a/debian/patches/04_invoke-rc.d.diff b/debian/patches/04_invoke-rc.d.diff new file mode 100644 index 00000000..8fc1bcf5 --- /dev/null +++ b/debian/patches/04_invoke-rc.d.diff @@ -0,0 +1,19 @@ +Description: patch contrib files to run invoke-rc.d instead of /etc/init.d/* directly + This is required by policy 4.0.0. +Author: Nicolas Boulenguez <nicolas@debian.org> + +--- a/contrib/fetchmail.logrotate ++++ b/contrib/fetchmail.logrotate +@@ -46,11 +46,7 @@ + sharedscripts + postrotate + if [ -f /var/run/fetchmail/fetchmail.pid ]; then \ +- if [ -x /usr/sbin/invoke-rc.d ]; then \ +- invoke-rc.d fetchmail restart > /dev/null; \ +- else \ +- /etc/init.d/fetchmail restart > /dev/null; \ +- fi; \ ++ invoke-rc.d fetchmail restart > /dev/null; + fi; + endscript + } diff --git a/debian/patches/07_properly_report_size_of_mailboxes.patch b/debian/patches/07_properly_report_size_of_mailboxes.patch new file mode 100644 index 00000000..1f68bd0d --- /dev/null +++ b/debian/patches/07_properly_report_size_of_mailboxes.patch @@ -0,0 +1,142 @@ +From 87626c2707cc0d82e49e160ab3c85430ff33534f Mon Sep 17 00:00:00 2001 +From: Matthias Andree <matthias.andree@gmx.de> +Date: Sat, 24 Aug 2019 17:53:08 +0200 +Subject: [PATCH] Properly report size of mailboxes of 2 GibiB or above. + +To fix Debian Bug#873668, reported by Andreas Schmidt. +This requires C99's new long long type. +--- + NEWS | 7 +++++++ + driver.c | 7 ++++--- + etrn.c | 2 +- + fetchmail.h | 2 +- + imap.c | 2 +- + odmr.c | 2 +- + pop2.c | 2 +- + pop3.c | 4 ++-- + 8 files changed, 18 insertions(+), 10 deletions(-) + +diff --git a/driver.c b/driver.c +index d21a32ab..a5033729 100644 +--- a/driver.c ++++ b/driver.c +@@ -948,7 +948,7 @@ static int do_session( + { + /* sigsetjmp returned zero -> normal operation */ + char buf[MSGBUFSIZE+1], *realhost; +- int count, newm, bytes; ++ int count, newm; + int fetches, dispatches, transient_errors, oldphase; + struct idlist *idp; + +@@ -1322,6 +1322,7 @@ is restored.")); + + /* compute # of messages and number of new messages waiting */ + stage = STAGE_GETRANGE; ++ unsigned long long bytes; + err = (ctl->server.base_protocol->getrange)(mailserver_socket, ctl, idp->id, &count, &newm, &bytes); + if (err != 0) + goto cleanUp; +@@ -1351,10 +1352,10 @@ is restored.")); + "%d messages for %s", + count), + count, buf); +- if (bytes == -1) ++ if (bytes == (unsigned long long)-1) // mailbox size unsupported + report_complete(stdout, ".\n"); + else +- report_complete(stdout, GT_(" (%d octets).\n"), bytes); ++ report_complete(stdout, GT_(" (%llu octets).\n"), bytes); + } + else + { +diff --git a/etrn.c b/etrn.c +index f3fab0ce..12b9d3fd 100644 +--- a/etrn.c ++++ b/etrn.c +@@ -34,7 +34,7 @@ static int etrn_ok (int sock, char *argbuf) + } + + static int etrn_getrange(int sock, struct query *ctl, const char *id, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* send ETRN and interpret the response */ + { + int ok, opts; +diff --git a/fetchmail.h b/fetchmail.h +index 23ba6e6e..72259e10 100644 +--- a/fetchmail.h ++++ b/fetchmail.h +@@ -226,7 +226,7 @@ struct method /* describe methods for protocol state machine */ + /* response_parsing function */ + int (*getauth)(int, struct query *, char *); + /* authorization fetcher */ +- int (*getrange)(int, struct query *, const char *, int *, int *, int *); ++ int (*getrange)(int, struct query *, const char *, int *, int *, unsigned long long *); + /* get message range to fetch */ + int (*getsizes)(int, int, int *); + /* get sizes of messages */ +diff --git a/imap.c b/imap.c +index 7b80679a..7836acd7 100644 +--- a/imap.c ++++ b/imap.c +@@ -876,7 +876,7 @@ static int imap_search(int sock, struct query *ctl, int count) + static int imap_getrange(int sock, + struct query *ctl, + const char *folder, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* get range of messages to be fetched */ + { + int ok; +diff --git a/odmr.c b/odmr.c +index 85decb6d..d1c011c4 100644 +--- a/odmr.c ++++ b/odmr.c +@@ -45,7 +45,7 @@ static int odmr_ok (int sock, char *argbuf) + } + + static int odmr_getrange(int sock, struct query *ctl, const char *id, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* send ODMR and then run a reverse SMTP session */ + { + int ok, opts, smtp_sock; +diff --git a/pop2.c b/pop2.c +index 7c843616..5a5a1bd1 100644 +--- a/pop2.c ++++ b/pop2.c +@@ -84,7 +84,7 @@ static int pop2_getauth(int sock, struct query *ctl, char *buf) + } + + static int pop2_getrange(int sock, struct query *ctl, const char *folder, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* get range of messages to be fetched */ + { + (void)ctl; +diff --git a/pop3.c b/pop3.c +index 6efe1b7e..25efbaad 100644 +--- a/pop3.c ++++ b/pop3.c +@@ -957,7 +957,7 @@ static int pop3_slowuidl( int sock, struct query *ctl, int *countp, int *newp) + static int pop3_getrange(int sock, + struct query *ctl, + const char *folder, +- int *countp, int *newp, int *bytes) ++ int *countp, int *newp, unsigned long long *bytes) + /* get range of messages to be fetched */ + { + int ok; +@@ -980,7 +980,7 @@ static int pop3_getrange(int sock, + if (ok == 0) { + int asgn; + +- asgn = sscanf(buf,"%d %d", countp, bytes); ++ asgn = sscanf(buf,"%d %llu", countp, bytes); + if (asgn != 2) + return PS_PROTOCOL; + } else +-- +2.22.0 + diff --git a/debian/patches/08_remove_forced_OpenSSL_check.patch b/debian/patches/08_remove_forced_OpenSSL_check.patch new file mode 100644 index 00000000..12a1d6e6 --- /dev/null +++ b/debian/patches/08_remove_forced_OpenSSL_check.patch @@ -0,0 +1,26 @@ +Description: Remove forced OpenSSL version check + Not needed, linker should take care of proper library loading. +Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> +Bug-Debian: https://bugs.debian.org/973472 +Forwarded: no +Last-Update: 2023-01-10 + +--- + +--- a/socket.c ++++ b/socket.c +@@ -1123,12 +1123,12 @@ int SSLOpen(int sock, char *mycert, char + } + } + #endif +- ++/* + if (ver < OPENSSL_VERSION_NUMBER) { + report(stderr, GT_("Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"), (long)ver, (long)(OPENSSL_VERSION_NUMBER)); + return -1; + } +- ++*/ + if (ver > OPENSSL_VERSION_NUMBER && outlevel >= O_VERBOSE) { + report(stdout, GT_("Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n"), (long)ver, (long)(OPENSSL_VERSION_NUMBER)); + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..50da97c1 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +01_fetchmailconf.patch +04_invoke-rc.d.diff +07_properly_report_size_of_mailboxes.patch +08_remove_forced_OpenSSL_check.patch diff --git a/debian/resolvconf b/debian/resolvconf new file mode 100644 index 00000000..a4995913 --- /dev/null +++ b/debian/resolvconf @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ -x /etc/init.d/fetchmail ] && [ -n "$(pidof fetchmail)" ]; then + /usr/sbin/invoke-rc.d --quiet fetchmail awaken +fi diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..ecb6aa67 --- /dev/null +++ b/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# +# $Id: rules 504 2010-02-02 11:40:24Z hector $ +# +# Originally by Henrique M. Holschuh <hmh@debian.org>, and based on +# previous work by Paul Haggard <phaggart@debian.org>, and in a +# debmake-created rules file. +# +# Special package build-time options: +# POP2, RPA, NTLM, SDPS, OPIE, KRB4, KRB5, GSSAPI +# NOPOP3, NOIMAP, NOETRN, NOODMR, IPV6, IPV6SEC +# +# To use them, add the ones you need to the environment variable +# DEB_FETCHMAIL_BUILD_OPTIONS before building the package. +# +# e.g. +# export DEB_FETCHMAIL_BUILD_OPTIONS="KRB4,NOIMAP,NOETRN,NOODMR" +# dpkg-buildpackage -rfakeroot -uc -us +# +# If DEB_FETCHMAIL_BUILD_OPTIONS is undefined, SSl, NTLM and SDPS will +# be enabled by default. +# +# The targets KRB4, KRB5, GSSAPI and OPIE require the proper libraries +# to be installed in the system. +# +# IPV6 and IPV6SEC support is untested, and breaks the 'interface' +# keyword (which is why they will not be enabled by default). + +# Defaults for official debian package +DEB_FETCHMAIL_BUILD_OPTIONS ?= "SSL,NTLM,SDPS,KRB5,GSSAPI" + +# Process build-time options +translate_option = $(if $(findstring $1,$(DEB_FETCHMAIL_BUILD_OPTIONS)),$2) +FETCHCONFOPT := \ + $(call translate_option,SSL, --with-ssl=/usr) \ + $(call translate_option,POP2, --enable-POP2) \ + $(call translate_option,RPA, --enable-RPA) \ + $(call translate_option,NTLM, --enable-NTLM) \ + $(call translate_option,SDPS, --enable-SDPS) \ + $(call translate_option,OPIE, --enable-opie) \ + $(call translate_option,KRB4, --with-kerberos=/usr) \ + $(call translate_option,KRB5, --with-kerberos5) \ + $(call translate_option,GSSAPI, --with-gssapi=/usr) \ + $(call translate_option,NOPOP3, --disable-POP3) \ + $(call translate_option,NOIMAP, --disable-IMAP) \ + $(call translate_option,NOETRN, --disable-ETRN) \ + $(call translate_option,NOODMR, --disable-ODMR) \ + $(call translate_option,IPV6, --enable-inet6) + +# enable hardening +DEB_BUILD_MAINT_OPTIONS := hardening=+all +DPKG_EXPORT_BUILDFLAGS := 1 +DEB_CFLAGS_MAINT_APPEND := -Wall -pipe +include /usr/share/dpkg/buildflags.mk + +override_dh_auto_configure: + dh_auto_configure -- --enable-nls \ + --disable-rpath --disable-fallback \ + $(FETCHCONFOPT) + +override_dh_auto_install: + dh_auto_install + rm -rf debian/fetchmail/usr/lib/ + rm -f debian/fetchmail/usr/bin/fetchmailconf \ + debian/fetchmail/usr/share/man/man1/fetchmailconf.1 + install -D -m 755 debian/resolvconf \ + debian/fetchmail/etc/resolvconf/update-libc.d/fetchmail + +override_dh_installinit: + dh_installinit --restart-after-upgrade + + +override_dh_installsystemduser: + dh_installsystemduser --no-enable + +override_dh_auto_test: + +%: + dh $@ + +.PHONY: override_dh_auto_configure override_dh_auto_install \ + override_dh_installinit override_dh_installsystemduser \ + override_dh_auto_test diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 00000000..c5a12096 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1 @@ +source-is-missing [fetchmail-man.html] diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 00000000..83ed5bd0 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,15 @@ +Test-Command: ./configure && make check +Depends: @, build-essential, gcc, libssl-dev, python3 +Restrictions: allow-stderr + +Tests: installation +Depends: @ +Restrictions: + +Tests: service +Depends: @, systemd-sysv +Restrictions: needs-root, allow-stderr + +Tests: operation +Depends: @, sudo, python3 +Restrictions: needs-root diff --git a/debian/tests/installation b/debian/tests/installation new file mode 100644 index 00000000..271fc6ca --- /dev/null +++ b/debian/tests/installation @@ -0,0 +1,23 @@ +#!/bin/sh + +############################################ +### Check main installation requirements ### +############################################ + +set -e + +# Config file +echo "Checking config file present" +test -e /etc/default/fetchmail + +# Service +echo "Checking service scripts are installed" +test -e /etc/init.d/fetchmail +test -e /etc/ppp/ip-down.d/fetchmail + +# Script +echo "Checking fetchmail is present" +test -e /usr/bin/fetchmail +fetchmail --version > /dev/null 2>&1 +c=$(fetchmail --help 2>&1 | wc -l) +test $c -gt 5 diff --git a/debian/tests/mock-pop3-server.py b/debian/tests/mock-pop3-server.py new file mode 100644 index 00000000..159069b4 --- /dev/null +++ b/debian/tests/mock-pop3-server.py @@ -0,0 +1,214 @@ +#!/usr/bin/env python3 +# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- + +# Copyright (C) 2019 Bryce W. Harrington +# +# Released under GNU GPLv2 or later, read the file 'LICENSE.GPLv2+' for +# more information. +# +# 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 AUTHORS OR COPYRIGHT HOLDERS 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. +# +# Author: Bryce Harrington <bryce@canonical.com> + +import os +import sys +import socket +from tempfile import mkstemp + +DEBUGGING = True +DEFAULT_HOST = '' +DEFAULT_PORT = 11110 +NEWLINE = b"\r\n" +MESSAGE_CONTENT = b''' +From: test@example.com\r +Subject: Test message\r +\r +This is a body for testing\r +\r +''' + +def dbg(msg): + """Prints information to stdout if debugging is enabled""" + if DEBUGGING: + sys.stdout.write("{}\n".format(msg)) + +def command_user(data, msg): + return b'+OK user accepted' + +def command_pass(data, msg): + return b'+OK pass accepted' + +def command_stat(data, msg): + return b'+OK 1 %i' %(msg.size) + +def command_list(data, msg): + if data == b'LIST': + return b'+OK 1 messages (%i octets)'%(msg.size) \ + + NEWLINE \ + + b'1 %i'%(msg.size) \ + + NEWLINE \ + + b'.' + else: + cmd, num = data.split() + return b'+OK 1 (%i octects)'%(msg.size) + +def command_last(data, msg): + return b'+OK 0' + +def command_top(data, msg): + cmd, num, lines = data.split() + assert num == b'1', "unknown message number: {num}".format(num) + bottom = NEWLINE.join(msg.bottom[:int(lines)]) + text = msg.top + NEWLINE + NEWLINE + bottom + dbg(text) + return b'+OK top of message follows%s' % (NEWLINE + text + NEWLINE + b'.') + +def command_retr(data, msg): + return b'+OK %i octets'%(msg.size) \ + + NEWLINE \ + + data \ + + NEWLINE \ + + b'.' + +def command_dele(data, msg): + return b'+OK 1 %i'%(msg.size) + +def command_noop(data, msg): + return b'+OK 1 %i'%(msg.size) + +def command_quit(data, msg): + return b'+OK mock pop3 server signing off' + +COMMANDS = { + b'USER' : command_user, + b'PASS' : command_pass, + b'STAT' : command_stat, + b'LIST' : command_list, + b'LAST' : command_last, + b'TOP' : command_top, + b'RETR' : command_retr, + b'DELE' : command_dele, + b'NOOP' : command_noop, + b'QUIT' : command_quit, +} + +class Mailbox: + """Encapsulates a mailbox containing a single email message""" + def __init__(self, message_filename): + with open(message_filename, "rb") as msg: + data = msg.read() + self.data = data + self.size = len(data) + self.top, rest = data.split(NEWLINE + NEWLINE, 1) + self.bottom = rest.split(NEWLINE) + + +class Mailserver: + def __init__(self, conn, mbox): + self._conn = conn + self._mbox = mbox + self._chunk_size = 4096 + + def close(self): + dbg(" - Server exiting") + self._conn.close() + + def send(self, data): + dbg(" - Server sending") + self._conn.sendall(data + NEWLINE) + + def receive(self): + dbg(" - Server receiving") + data = [] + while True: + chunk = self._conn.recv(self._chunk_size) + if NEWLINE in chunk: + data.append(chunk[:chunk.index(NEWLINE)]) + break + data.append(chunk) + return b"".join(data) + + def process(self): + data = self.receive() + dbg(" - Received: '{}'".format(data)) + command = data.split(None, 1)[0] + if command in COMMANDS.keys(): + response = COMMANDS[command](data, self._mbox) + dbg(" - Response: {}".format(response)) + try: + self.send(response) + if command == b'QUIT': + return False + except BrokenPipeError: + dbg(" - Client terminated connection") + return False + else: + self.send(b"-ERR unrecognized command") + return True + +def serve(messages_filename, host=DEFAULT_HOST, port=DEFAULT_PORT): + dbg("Serving for {} on {}".format(host, port)) + + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + sock.bind((host, port)) + + mailbox = Mailbox(messages_filename) + + try: + dbg("* mock-pop3-server ready on {}:{}".format(host, port)) + while True: + sock.listen(1) + conn, address = sock.accept() + dbg("* Connection from {}".format(address)) + server = Mailserver(conn, mailbox) + server.send(b"+OK mock-pop3-server pop3 server ready") + try: + dbg("* Processing commands for connection...") + while server.process(): + dbg("* Finished command") + pass + finally: + dbg("* Closing remote connection") + server.close() + except KeyboardInterrupt: + dbg("* mock-pop3-server interrupted") + return 1 + except SystemExit: + dbg("* mock-pop3-server exiting") + return 1 + finally: + sock.shutdown(socket.SHUT_RDWR) + sock.close() + return 0 + + +if __name__ == "__main__": + fd, message_filename = mkstemp(prefix='message-', suffix='.txt') + dbg("Creating message file '{}'".format(message_filename)) + + with open(message_filename, 'wb') as f: + f.write(MESSAGE_CONTENT.lstrip()) + + try: + exit(serve(message_filename, host=DEFAULT_HOST, port=DEFAULT_PORT)) + except KeyError: + sys.stderr.write("Exiting\n") + sys.exit(1) diff --git a/debian/tests/operation b/debian/tests/operation new file mode 100644 index 00000000..c36dfb6d --- /dev/null +++ b/debian/tests/operation @@ -0,0 +1,47 @@ +#!/bin/sh + +########################### +### Test fetching email ### +########################### + +set -e + +POP3_SERVER=127.0.0.1 +POP3_PORT=11110 +USER=${USER:-user} +PASSWORD=ubuntu +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM + +LOG="${WORKDIR}/fetchmail.log" +MBOX="${WORKDIR}/test-mbox-$(date +%''s_%N)" +CONFIG="${WORKDIR}/fetchmailrc" + +echo "Configuring a functional local mail system" + +python3 "$(dirname ${0})/mock-pop3-server.py" & +SERVER_PID=$! +sleep 1 + +# Configure fetchmail +cat > "${CONFIG}" <<EOF +poll ${POP3_SERVER} port ${POP3_PORT} no uidl with protocol POP3: + auth password + user '${USER}' there with password '${PASSWORD}' + is ${USER} here + sslproto '' + mda "/bin/sh -c 'cat > ${MBOX}'" +EOF +chmod 700 "${CONFIG}" +chown -R fetchmail "${WORKDIR}" + +# Run fetchmail +echo "Checking fetchmail operates" +sudo -u fetchmail /usr/bin/fetchmail -d0 -vvv -f "${CONFIG}" "${POP3_SERVER}" + +# TODO: Verify the test email was delivered to expected destination +echo "Checking test email was received" +grep "Received: from " "${MBOX}" + +kill ${SERVER_PID} +echo "OK" diff --git a/debian/tests/service b/debian/tests/service new file mode 100644 index 00000000..95f9abcd --- /dev/null +++ b/debian/tests/service @@ -0,0 +1,13 @@ +#!/bin/sh + +############################### +### Check fetchmail service ### +############################### + +set -e + +echo "Checking fetchmail service is enabled" +systemctl is-enabled fetchmail.service + +echo "Checking fetchmail service is active" +systemctl is-active fetchmail.service diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 00000000..ede1268c --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,64 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFXwq5cBEADQxc9JeK4yqt1BX5tOMfzyIfEyBWXix0xqeAA/HQ2wd31NFcGF +EbAevDsGoO7UcYQji1Gj/TggmclV37SHPDE++bU7O6Wur57FfTsVCmS6XjHj/n2q +XgxrWtU7Fv9YOBz/wNge3sGAh2xbwh5dTt+Ew6TbuMbwXNonb4WUCo6yFMrDd2vg +9RqcVSDpdLFO0JI9hNGLQDtHP2TbBfGj8V5qz9NFiGzRxmmFhMzqOSDCEs9uanr3 +TCLq7yZFTyAmXDCZuyFhxGwHDo6jB+9LbIprA/oH0uFol899hiIrZRm7kIAYsOSv +p84x0XBFvSMoDY4ZA4Ucv3xk+aDqob0V5F4+W3Vg7bdlpbAuwov944Zawbm/sBGc +tNbfNeWjc+L7F43PbghzCfk6aLH0LwH3lNiu76F57lJqfTCnkBd0V0dUZ0/AJFsk +Zu+aO/dCVkbfjotXDqsh55kBrSMsRX/rqt2d43q6o9AyWu5aMqLAG2ZN19qLu/a1 +vzbMEfRaimlFSo9LMY1jf5TcUc7mNlPDhm8c6o+Ivx/D0tSQ4V+3SqbroYgHo1A4 +Qyiau4sEP2YFtKbdRdpaN7WsdfdaZmrd9xa5lvp/gQZEdpLPzL0aBDEeUzaL/nee +/EDQUbPuSYJCmDNyqxs/Y4j0ZGQmIPT1CY34AvdjIcLuT/BG1JZaIlKQ9QARAQAB +tCVNYXR0aGlhcyBBbmRyZWUgPG1hbmRyZWVARnJlZUJTRC5vcmc+iQI9BBMBCgAn +BQJV8K2uAhsDBQkLRzUABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEOQSsVbv +84Va0lAQAId7zuMEqUVFSnSNqME944cFgFz8PTMfe16FYSCjGJoQRL433oTAo9k0 +Lf0DDiG8egBceu+Fy8mY5RiC8DVGlbgIwLkQsstYs/HFM0MiMgumh8f1AoN+EcL9 +AdrGrJTn2/9gFA1mjH62Iifte/vrzJPUD5s5Ca5RWFoC/UcQlGsf7SbgJgujHPhs +sfhX5aOnGIi5CJ5MOBfNT04WDRkUvf0WTtCf176IXWF7ACFhwAITtyxnTGP+zuXR +j1V0bAZVkuE0+jysoaJv4xvnTBCbWufkLYeTxMrLPhW+umbi4+QNT/8LRufyvuit +7lviK79duM94vob2WxVbs0OuR9wmsLOMA7zBQpSz2ZO1ScDiqJHh+3A8cAt36egt +EGdzLJD7u4swlPjU3KXKWPr9rpPBb3fwMp6zUq2kqQzSmk7vFbGBOjcMzb5AZtzp +11K/Nto6GAa/fWFZ3gQ3JRk8LaSehMof2HxZvwC1wwXGopoZX2ZxtKTe3qR4/O1v +GsibQybsNoFeIpL/ckM2vqxkOhYdkQ0Kh//5WLAXljvgeRZvX7aaIJIXJIdziogr +bJfEUKxoo+HGStoLCvRkHb5SZYoAlEQ6PoK6868vgxMBmI3GjhbF+/zFw5xiMHU2 +kqdBR8skwjU/qU+YYEuD1iqfpautLthLToN7v5yzNMRiTFttnR8ftChNYXR0aGlh +cyBBbmRyZWUgPG1hdHRoaWFzLmFuZHJlZUBnbXguZGU+iQI9BBMBCgAnBQJV8KuX +AhsDBQkLRzUABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEOQSsVbv84Var5oP +/1zvsa/QvnsXEvN6YgbiYfFrSKS5dSltlEF8DKDuuDwDpwWFXeHV9WTcjUkKXVVd +bE1IM30E8J4MiP5k22hBxF+XTdrDlvt0iiWvZfVyYWb/i90EGC0Wyp9A9CsYCHt5 +o0Xe8Yg2/er0u18HWi8s381lzRp+I74nWQQp729jfH2Y9E5TYwLotpeEz6J2y9pT +yujMGzo9tuOS+xd+cd9sRcp5w3seJE4Naf5HrhMR1SijoE1SmF00I2KCD/1codxP +jRLhvfZ09ZwvNZihyV9CSJp9b0HM0jl1BY3p55hd9hd0CzIAl/vkLCA0TvET3SXG +nogeMChQseIpe4cV7MiupXwBGbexWiwunu4e/tQvyGPK+dSnPlL4qTx3BN5CQFj9 +s6TBKZ94Ehycu3vDCKWd2GQ6sJMUB/3+Hb4sNdsdi9OjtWdobZ4VYe6/OJuTOZKk +xcYhKaWcpF0uZSJd01I5CP0fo67IGmO9WgfG/vyeEcajO2MzkcwHbbEBzPT/4H+L +CuKV6cAjVnq/JFuYqndgq3wezMNuhrOAYLWUXXmfuc3yqxhFQQNqzNy+znX+/D1K +Psd3p0AFSIFVWe3zsQOUi70QpJrJw3RhY1lcRoJYVZKM7LE3BjHuV8kIOCyyFZiA +YpU2vjI2c2dUFUg59m85NhTeezJYvxJ8uX8WDTXIDsd+uQINBFXwq5cBEADXJu0c +p9DvJV6m5Zu+ehmm5qjEzrIIpKuub8xWfG7GTlH2YNW0EZAxuoM8PJlaqQMUp22Q +k7qRL9Zkfq7cS1bo67PizgwAQcncGL//wI+FNv8qqGBpKNwn9MzfBlEuWrrc+j9l +4CFEnAKTqvjxsv4bOcSlthrl5wA27pKanUsHgWgucwk4lAd1Q6WTbrlxxASDBu+O +mMYrCezcIFxQGdnMm7qSUCwtyEx6E0CKXgX5HS2QKtV1/pPLSsIkiBGb2h/+av8z +Fr2zUhBVxxmqPxd7fiWauGWVUYDNI59u2X2a0iNLBiRQT+Y3/p4sEIBXv+D3aInU +WHQ0/VgDFaElc/OZj2lu/y30Ud77tIfaTSBP6LQtmcb5T3VztJ4Ot9+0Rvw5VIjA +kis+JO7KAZ6n5TIW+7vkIC+04quOMmsO5f5/1Xo0NFozLBCrn8ZN58GYR2EoBx60 +PMjDFU1MsvIK7SDhD3bf4C2FnV2H2QCp0F4TH+GhVabi7FGy50VWcqI44QMI/IH4 +p4Wqt/Fc8deVGC8YC8f6OcK6HBat9iQfSA8LlhX3RtnUbl4DBlw4C+EcfZSjz45r +4Y3ah9l07Z+lrIXwUdypqGA1hvheMoaJNbFlNRvxYHY0UYeeYa8/2thoBD8mRJsp +SuraQdX64mJpBhZAr9julJKicqyTgURKZulNSwARAQABiQIlBBgBCgAPBQJV8KuX +AhsMBQkLRzUAAAoJEOQSsVbv84VaXgsP/0BzIBYcDrh/b9rj9TuQy9TkFACo1p2X +b5IP5SYIFzLLU7/LAdTFrIgaZxf/qNYNFC6BagK3EKxoVNG0KA076l2KDd1VAkqM +TpGkDwmQBTRXtI64XDdKTaARu4vjzC+iyAwmAgYMOR39KdEohpNpvcmoxbx2MFOy +TlSSYnhvQjc/nsdPh8aHG7WJPvPCk0RFxOt0uhf5448LzI0e+Riam15JBpAb/rgk +FDrVoCbiF0VIGYUWLfqhm0f3FBRqE4PrgihQfE0FpeeJiKqVshtGy64yGoN6Xw+S +pro9qsM7zA1sGLE4iVP1UK/hNsoTkbS8y+dKTLwGDKmrvakZzf2HOI6gLhNdTjzr +Koacx53PrbbmMaemuNcta5vWYPRarlCpi1V7IyTFECxTCfubIVLJw7nvyacx+FUi +n1uaP9LAqtQHeZB0NyVRsrTKys4BvtFHDKHVj/1XBiZY5IVS85WLFKgTC1pRmftc +9jbbguuJDcSLe1k6T4UOOLZCuJqldC9AYa1qSDTLs8N8JF/FKkoEcxGO5wxjCiBj +LzI+5oACY1T93oW2m02NUt+sAVysQJcAXJvZab1AmLOYK4gQDgC1gpIJL4BPq9i4 +WMmYlaHIKGNJU8CzruOFwMfnh5I/jKA+oa/j7+dwrtfrgytRoTHaAqcXwe3VH29L +93g/7fa+B3v7 +=m6uS +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..beb35e80 --- /dev/null +++ b/debian/watch @@ -0,0 +1,6 @@ +version=4 +opts=uversionmangle=s/^RELEASE\.//;s/(\d+)[_-](\d+)[_-](\d+)/\$1.\$2.\$3/;s/(\d+)[_-](\d+)/\$1.\$2/;s/(\d)[_\.\-\+]?((rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/;s/(\d)[_\.\-\+]?RC[\-\.]?(\d*)$/$1~rc$2/,\ +dversionmangle=s/\+(debian|dfsg|ds|deb)(\.?\d+)?$//i,\ +pgpsigurlmangle=s/$/.asc/ \ +https://gitlab.com/fetchmail/fetchmail/tags \ +.*/tags/RELEASE[_-]v?(\d\S*) diff --git a/dist-tools/getstats.py b/dist-tools/getstats.py index ad52f464..4c45318b 100755 --- a/dist-tools/getstats.py +++ b/dist-tools/getstats.py @@ -12,7 +12,7 @@ from datetime import date # Get version and date with tempfile.TemporaryDirectory() as tmpdirname: subprocess.check_call("git archive --format=tar HEAD | ( cd {} && tar -xf -)".format(tmpdirname), shell=True) - LOC = subprocess.getoutput("cat {0}/*.[chly] {0}/*.py 2>/dev/null | wc -l".format(tmpdirname)).strip() + LOC = subprocess.getoutput("cat {0}/*.[chly] {0}/*.a[cm] {0}/*.py 2>/dev/null | wc -l".format(tmpdirname)).strip() try: with open("configure.ac") as f: AC_INIT = list(filter(lambda x: re.match('AC_INIT', x), diff --git a/dist-tools/git-commit-po-updates.sh b/dist-tools/git-commit-po-updates.sh index f7c4d759..0bcdb6f4 100755 --- a/dist-tools/git-commit-po-updates.sh +++ b/dist-tools/git-commit-po-updates.sh @@ -115,7 +115,7 @@ done git diff -G '^"(Project-Id-Version|PO-Revision-Date):' --name-only po/*.po \ | while read pofile ; do if ! handle_po "$pofile" "Update" "to" ; then - echo "There were errors updating $nfile" >&2 ; rc=1 + echo "There were errors updating $pofile" >&2 ; rc=1 fi done diff --git a/dist-tools/htmldoc b/dist-tools/htmldoc new file mode 100755 index 00000000..b16af17f --- /dev/null +++ b/dist-tools/htmldoc @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu +type htmldoc >/dev/null 2>&1 && case "$(type htmldoc)" in +*"$(realpath $(dirname $0))"*) ;; # ignore re-executing ourselves to avoid unterminated recursion +*) exec htmldoc "$@" ;; +esac +exec flatpak run --filesystem=host org.msweet.htmldoc "$@" diff --git a/dist-tools/makerelease.pl b/dist-tools/makerelease.pl index 8a648316..0f9a2f3b 100755 --- a/dist-tools/makerelease.pl +++ b/dist-tools/makerelease.pl @@ -94,8 +94,6 @@ if ($versions[0] eq $tag) { my $pwd = `pwd`; chomp $pwd; -$ENV{PATH} .= ":$pwd/dist-tools:$pwd/dist-tools/shipper"; - print "Building $version release, tag $tag, previous tag $oldtag\n"; if (-d "autom4te.cache") { @@ -128,10 +126,13 @@ print "--- CPUs for make: $ncpu\n"; if ($ncpu < 1) { warn "ncpus unplausible, assuming 2"; $ncpu = 2; } -if (system("cd autobuild && make -j$ncpu " . ($verbose ? '' : '-s') . " check distcheck")) { +if (system("cd autobuild && make -j $ncpu " . ($verbose ? '' : '-s') . " check && make -j $ncpu " . ($verbose ? '' : '-s') . " distcheck")) { die("Compilation failure\n"); } +my $hashes = `cd autobuild && openssl dgst -sha256 $project-$version$xzsufx $project-$version$lzsufx`; +if (!$hashes) { die "openssl dgst failed"; } + open(REPORT, ">$tmp/$project.PREAMBLE.$$"); print REPORT <<EOF; @@ -145,8 +146,15 @@ The source archive is available at: <$website$project-$version$xzsufx/download> <$website$project-$version$lzsufx/download> -Here are the release notes: +The detached GnuPG signature is available at: +<$website$project-$version$xzsufx.asc/download> +<$website$project-$version$lzsufx.asc/download> + +The SHA256 hashes for the tarballs are: +$hashes +Here are the release notes: +-------------------------------------------------------------------------------- EOF # Extract the current notes @@ -169,16 +177,14 @@ $oldver =~ tr/-/./; $oldver =~ s/^RELEASE_//; if ($diffs) { - print REPORT "Diffs from the previous ($oldver) release follow as a MIME attachment." -} else { - print REPORT "By popular demand, diffs from the previous release have been omitted." + print REPORT "Diffs from the previous ($oldver) release follow as a MIME attachment.\n"; } -close(NEWS); - -close(REPORT); +close(NEWS) or die $!; +close(REPORT) or die $!; if ($diffs) { + die "sending diffs has not been ported from svn to git yet. Aborting"; if ($tag eq '<workfile>') { system("svn diff -r$oldtag $errnull >$tmp/$project.DIFFS.$$"); } else { @@ -192,7 +198,8 @@ if ($diffs) { ." -n -D 'diff between $oldver and $version' -m 'text/plain' -e 7bit -f $tmp/$project.DIFFS.$$" ." -o ANNOUNCE.EMAIL"; } else { - system("mv", "$tmp/$project.PREAMBLE.$$", "ANNOUNCE.EMAIL"); + my @cmd = ("mv", "$tmp/$project.PREAMBLE.$$", "ANNOUNCE.EMAIL"); + system (@cmd) == 0 or die "mv @cmd failed: $?"; } #unlink("$tmp/$project.PREAMBLE.$$"); @@ -204,6 +211,7 @@ system("cd autobuild && gpg -ba --sign $project-$version$xzsufx && gpg -ba --sig print "### Extracting release notes...\n"; makerelnotes('NEWS', 'autobuild/README.txt'); +#die "Aborting... in dry-run mode"; print "### Uploading\n"; print "=== local\n"; diff --git a/dist-tools/manServer.pl b/dist-tools/manServer.pl deleted file mode 100755 index 6573f650..00000000 --- a/dist-tools/manServer.pl +++ /dev/null @@ -1,2939 +0,0 @@ -#!/usr/bin/perl -T - -# manServer - Unix man page to HTML converter -# Rolf Howarth, rolf@squarebox.co.uk -# Version 1.07 16 July 2001 -# Version 1.07+ma1 2006-03-31 Matthias Andree -# add trailing slash of URLs -# support https, too - -$version = "1.07+ma1"; -$manServerUrl = "<A HREF=\"http://www.squarebox.co.uk/users/rolf/download/manServer.shtml\">manServer $version</A>"; - -use Socket; - -$ENV{'PATH'} = "/bin:/usr/bin"; - -initialise(); -$request = shift @ARGV; -# Usage: manServer [-dn] filename | manServer [-s port] - -$root = ""; -$cgiMode = 0; -$bodyTag = "BODY bgcolor=#F0F0F0 text=#000000 link=#0000ff vlink=#C000C0 alink=#ff0000"; - -if ($ENV{'GATEWAY_INTERFACE'} ne "") -{ - *OUT = *STDOUT; - open(LOG, ">>/tmp/manServer.log"); - chmod(0666, '/tmp/manServer.log'); - $root = $ENV{'SCRIPT_NAME'}; - $url = $ENV{'PATH_INFO'}; - if ($ENV{'REQUEST_METHOD'} eq "POST") - { $args = <STDIN>; chop $args; } - else - { $args = $ENV{'QUERY_STRING'}; } - $url .= "?".$args if ($args); - $cgiMode = 1; - $date = &fmtTime(time); - $remoteHost = $ENV{'REMOTE_HOST'} || $ENV{'REMOTE_ADDR'}; - $referer = $ENV{'HTTP_REFERER'}; - $userAgent = $ENV{'HTTP_USER_AGENT'}; - print LOG "$date\t$remoteHost\t$url\t$referer\t$userAgent\n"; - processRequest($url); -} -elsif ($request eq "-s" || $request eq "") -{ - *LOG = *STDERR; - startServer(); -} -else -{ - $cmdLineMode = 1; - if ($request =~ m/^-d(\d)/) - { - $debug = $1; - $request = shift @ARGV; - } - *OUT = *STDOUT; - *LOG = *STDERR; - $file = findPage($request); - man2html($file); -} - -exit(0); - - -##### Mini HTTP Server #### - -sub startServer -{ - ($port) = @ARGV; - $port = 8888 unless $port; - - $sockaddr = 'S n a4 x8'; - - ($name, $aliases, $proto) = getprotobyname('tcp'); - ($name, $aliases, $port) = getservbyname($port, 'tcp') - unless $port =~ /^\d+$/; - - while(1) - { - $this = pack($sockaddr, AF_INET, $port, "\0\0\0\0"); - - select(NS); $| = 1; select(stdout); - - socket(S, PF_INET, SOCK_STREAM, $proto) || die "socket: $!"; - if (bind(S, $this)) - { - last; - } - else - { - print STDERR "Failed to bind to port $port: $!\n"; - ++$port; - } - } - - listen(S, 5) || die "connect: $!"; - - select(S); $| = 1; select(stdout); - - while(1) - { - print LOG "Waiting for connection on port $port\n"; - ($addr = accept(NS,S)) || die $!; - #print "accept ok\n"; - - ($af,$rport,$inetaddr) = unpack($sockaddr,$addr); - @inetaddr = unpack('C4',$inetaddr); - print LOG "Got connection from ", join(".",@inetaddr), "\n"; - - while (<NS>) - { - if (m/^GET (\S+)/) { $url = $1; } - last if (m/^\s*$/); - } - *OUT = *NS; - processRequest($url); - close NS ; - } -} - - -sub processRequest -{ - $url = $_[0]; - print LOG "Request = $url, root = $root\n"; - - if ( ($url =~ m/^([^?]*)\?(.*)$/) || ($url =~ m/^([^&]*)&(.*)$/) ) - { - $request = $1; - $args = $2; - } - else - { - $request = $url; - $args = ""; - } - - @params = split(/[=&]/, $args); - for ($i=0; $i<=$#params; ++$i) - { - $params[$i] =~ tr/+/ /; - $params[$i] =~ s/%([0-9A-Fa-f][0-9A-Fa-f])/pack("C",hex($1))/eg; - } - %params = @params; - - $request = $params{'q'} if ($params{'q'}); - $searchType = $params{'t'}; - $debug = $params{'d'}; - - $processed = 0; - $file = ""; - - if ($searchType) - { - print OUT "HTTP/1.0 200 Ok\n" unless ($cgiMode); - print OUT "Content-type: text/html\n\n"; - print OUT "<H1>Searching not yet implemented</H1>\n"; - print LOG "Searching not implemented\n"; - $processed = 1; - } - elsif ($request eq "/" || $request eq "") - { - print OUT "HTTP/1.0 200 Ok\n" unless ($cgiMode); - print OUT "Content-type: text/html\n\n"; - print LOG "Home page\n"; - homePage(); - $processed = 1; - } - elsif ($request =~ m,^/.*/$,) - { - print OUT "HTTP/1.0 200 Ok\n" unless ($cgiMode); - print OUT "Content-type: text/html\n\n"; - print LOG "List directory\n"; - listDir($request); - $processed = 1; - } - elsif (-f $request || -f "$request.gz" || -f "$request.bz2") - { - # Only allow fully specified files if they're in our manpath - foreach $md (@manpath) - { - $dir = $md; - if (substr($request,0,length($dir)) eq $dir) - { - print OUT "HTTP/1.0 200 Ok\n" unless ($cgiMode); - print OUT "Content-type: text/html\n\n"; - man2html($request); - $processed = 1; - last; - } - } - } - else - { - $file = findPage($request); - if (@multipleMatches) - { - print OUT "HTTP/1.0 200 Ok\n" unless ($cgiMode); - print OUT "Content-type: text/html\n\n"; - print LOG "Multiple matches\n"; - printMatches(); - $processed = 1; - } - elsif ($file) - { - print OUT "HTTP/1.0 301 Redirected\n" unless ($cgiMode); - $file .= "&d=$debug" if ($debug); - print OUT "Location: $root$file\n\n"; - print LOG "Redirect to $root$file\n"; - $processed = 1; - } - } - - unless ($processed) - { - print OUT "HTTP/1.0 404 Not Found\n" unless ($cgiMode); - print OUT "Content-type: text/html\n\n"; - print OUT "<HTML><HEAD>\n<TITLE>Not Found</TITLE>\n<$bodyTag>\n"; - print OUT "<CENTER><H1><HR>Not Found<HR></H1></CENTER>\nFailed to find man page /$request\n"; - print OUT "<P><HR><P><A HREF=\"$root/\">Main Index</A>\n</HTML>\n"; - print STDERR "Failed to find /$request\n" unless ($cgiMode); - } -} - -sub homePage -{ - print OUT "<HTML><HEAD><TITLE>Manual Pages - Main Index</TITLE> -</HEAD><$bodyTag><CENTER><H1><HR><I>Manual Reference Pages</I> - Main Index<HR></H1></CENTER> -<FORM ACTION=\"$root/\" METHOD=get>\n"; - $uname = `uname -s -r`; - if (! $?) - { - $hostname = `hostname`; - print OUT "<B>$uname pages on $hostname</B><P>\n"; - } - # print OUT "<SELECT name=t> <OPTION selected value=0>Command name - # <OPTION value=1>Keyword search <OPTION value=2>Full text search</SELECT>\n"; - print OUT "Command name: <INPUT name=q size=20> <INPUT type=submit value=\"Show Page\"> </FORM><P>\n"; - loadManDirs(); - foreach $dir (@mandirs) - { - ($section) = ($dir =~ m/man([0-9A-Za-z]+)$/); - print OUT "<A HREF=\"$root$dir/\">$dir" ; - print OUT "- <I>$sectionName{$section}</I>" if ($sectionName{$section}); - print OUT "</A><BR>\n"; - } - print OUT "<P><HR><P><FONT SIZE=-1>Generated by $manServerUrl from local unix man pages.</FONT>\n</BODY></HTML>\n"; -} - -sub listDir -{ - foreach $md (@manpath) - { - $dir = $md; - if (substr($request,0,length($dir)) eq $dir) - { - $request =~ s,/$,,; - ($section) = ($request =~ m/man([0-9A-Za-z]+)$/); - $sectionName = $sectionName{$section}; - $sectionName = "Manual Reference Pages" unless ($sectionName); - print OUT "<HTML><HEAD><TITLE>Contents of $request</TITLE></HEAD>\n<$bodyTag>\n"; - print OUT "<CENTER><H1><HR><NOBR><I>$sectionName</I></NOBR> - <NOBR>Index of $request</NOBR><HR></H1></CENTER>\n"; - print OUT "<FORM ACTION=\"$root/\" METHOD=get>\n"; - print OUT "Command name: <INPUT name=q size=20> <INPUT type=submit value=\"Show Page\"> </FORM><P>\n"; - - if (opendir(DIR, $request)) - { - @files = sort readdir DIR; - foreach $f (@files) - { - next if ($f eq "." || $f eq ".." || $f !~ m/\./); - $f =~ s/\.(gz|bz2)$//; - # ($name) = ($f =~ m,/([^/]*)$,); - print OUT "<A HREF=\"$root$request/$f\">$f</A> \n"; - } - closedir DIR; - } - print OUT "<P><A HREF=\"$root/\">Main Index</A>\n</HTML>\n"; - print OUT "<P><HR><P><FONT SIZE=-1>Generated by $manServerUrl from local unix man pages.</FONT>\n</BODY></HTML>\n"; - return; - } - } - print OUT "<H1>Directory $request not known</H1>\n"; -} - -sub printMatches -{ - print OUT "<HTML><HEAD><TITLE>Ambiguous Request '$request'</TITLE></HEAD>\n<$bodyTag>\n"; - print OUT "<CENTER><H1><HR>Ambiguous Request '$request'<HR></H1></CENTER>\nPlease select one of the following pages:<P><BLOCKQUOTE>"; - foreach $f (@multipleMatches) - { - print OUT "<A HREF=\"$root$f\">$f</A><BR>\n"; - } - print OUT "</BLOCKQUOTE><HR><P><A HREF=\"$root/\">Main Index</A>\n</HTML>\n"; -} - - -##### Process troff input using man macros into HTML ##### - -sub man2html -{ - $file = $_[0]; - $srcfile = $file; - $zfile = $file; - if (! -f $file) - { - if (-f "$file.gz") - { - $zfile = "$file.gz"; - $zcat = "/usr/bin/zcat"; - $zcat = "/bin/zcat" unless (-x $zcat); - $srcfile = "$zcat $zfile |"; - $srcfile =~ m/^(.*)$/; - $srcfile = $1; # untaint - } - elsif (-f "$file.bz2") - { - $zfile = "$file.bz2"; - $srcfile = "/usr/bin/bzcat $zfile |"; - $srcfile =~ m/^(.*)$/; - $srcfile = $1; # untaint - } - } - print LOG "man2html $file\n"; - $foundNroffTag = 0; - loadContents($file); - unless (open(SRC, $srcfile)) - { - print OUT "<H1>Failed to open $file</H1>\n"; - print STDERR "Failed to open $srcfile\n"; - return; - } - ($dir,$page,$sect) = ($file =~ m,^(.*)/([^/]+)\.([^.]+)$,); - $troffTable = 0; - %macro = (); - %renamedMacro = (); - %deletedMacro = (); - @indent = (); - @tabstops = (); - $indentLevel = 0; - $prevailingIndent = 6; - $trapLine = 0; - $blockquote = 0; - $noSpace = 0; - $firstSection = 0; - $eqnStart = ""; - $eqnEnd = ""; - $eqnMode = 0; - %eqndefs = (); - $defaultNm = ""; - $title = $file; - $title = "Manual Page - $page($sect)" if ($page && $sect); - - $_ = getLine(); - if (m/^.so (man.*)$/) - { - # An .so include on the first line only is replaced by the referenced page. - # (See elsewhere for processing of included sections that occur later in document.) - man2html("$dir/../$1"); - return; - } - - $perlPattern = ""; - if ($file =~ m/perl/) - { - &loadPerlPages(); - $perlPattern = join('|', grep($_ ne $page, keys %perlPages)); - } - - print OUT "<HTML><HEAD>\n<TITLE>$title</TITLE>\n<$bodyTag><A NAME=top></A>\n"; - - if ($foundNroffTag) - { - do - { - preProcessLine(); - processLine(); - } - while(getLine()); - endNoFill(); - endParagraph(); - } - else - { - # Special case where input is not nroff at all but is preformatted text - $sectionName = "Manual Reference Pages"; - $sectionNumber = $sect; - $left = "Manual Page"; - $right = "Manual Page"; - $macroPackage = "(preformatted text)"; - $pageName = "$page($sect)"; - $saveCurrentLine = $_; - outputPageHead(); - $_ = $saveCurrentLine; - print OUT "<PRE>\n"; - do - { - print OUT $_; - } - while(getLine()); - print OUT "</PRE>\n"; - } - outputPageFooter(); -} - -sub outputPageHead -{ - plainOutput( "<CENTER>\n" ); - outputLine( "<H1><HR><I>$sectionName - </I><NOBR>$pageName</NOBR><HR></H1>\n" ); - plainOutput( "</CENTER>\n" ); -} - -sub outputPageFooter -{ - if ($pageName) - { - unless ($cmdLineMode) - { - plainOutput( "<FORM ACTION=\"$root/\" METHOD=get>\n" ); - plainOutput( "Jump to page <INPUT name=q size=12> or go to <A HREF=#top>Top of page</A> | \n" ); - plainOutput( "<A HREF=\"$root$dir/\">Section $sectionNumber</A> | \n" ); - plainOutput( "<A HREF=\"$root/\">Main Index</A>.\n" ); - plainOutput( "<FORM>\n" ); - } - endBlockquote(); - outputLine("<P><HR>\n<TABLE width=100%><TR> <TD width=33%><I>$left</I></TD> <TD width=33% align=center>$pageName</TD> <TD align=right width=33%><I>$right</I></TD> </TR></TABLE>"); - } - plainOutput("<FONT SIZE=-1>Generated by $manServerUrl from $zfile $macroPackage.</FONT>\n</BODY></HTML>\n"); -} - -sub outputContents -{ - print OUT "<A name=contents></A><H3>CONTENTS</H3></A>\n"; - blockquote(); - for ($id=1; $id<=$#contents; ++$id) - { - $name = $contents[$id]; - $pre = ""; - $pre = " " if ($name =~ m/^ /); - $pre .= " " if ($name =~ m/^ /); - $name =~ s,^\s+,,; - next if ($name eq "" || $name =~ m,^/,); - unless ($name =~ m/[a-z]/) - { - $name = "\u\L$name"; - $name =~ s/ (.)/ \u\1/g; - } - outputLine("$pre<A HREF=#$id>$name</A><BR>\n"); - } - endBlockquote(); -} - -# First pass to extract table of contents -sub loadContents -{ - @contents = (); - %contents = (); - # print STDERR "SRCFILE = $srcfile\n"; - open(SRC, $srcfile) || return; - while (<SRC>) - { - preProcessLine(); - $foundNroffTag = $foundNroffTag || (m/^\.(\\\"|TH|so) /); - if (m/^\.(S[HShs]) ([A-Z].*)\s*$/) - { - $foundNroffTag = 1; - $c = $1; - $t = $2; - $t =~ s/"//g; - $id = @contents; - if ($c eq "SH" || $c eq "Sh") - { - push(@contents, $t); - } - elsif ($t =~ m/\\f/) - { - $t =~ s/\\f.//g; - push(@contents, " $t"); - } - else - { - push(@contents, " $t"); - } - $contents{"\U$t"} = $id; - } - } - close SRC; -} - -# Preprocess $_ -sub preProcessLine -{ - # Remove spurious white space to canonicise the input - chop; - $origLine = $_; - s, $,,g; - s,^',.,; # treat non breaking requests as if there was a dot - s,^\.\s*,\.,; - - if ($eqnMode == 1) - { - if (m/$eqnEnd/) - { - s,^(.*?)$eqnEnd,&processEqnd($1),e; - $eqnMode = 0; - } - else - { - &processEqns($_); - } - } - if ($eqnStart && $eqnMode==0) - { - s,$eqnStart(.*?)$eqnEnd,&processEqnd($1),ge; - if (m/$eqnStart/) - { - s,$eqnStart(.*)$,&processEqns($1),e; - $eqnMode = 1; - } - } - - # XXX Note: multiple levels of escaping aren't handled properly, eg. \\*.. as a macro argument - # should get interpolated as string but ends up with a literal '\' being copied through to output. - s,\\\\\*q,",g; # treat mdoc \\*q as special case - - s,\\\\,_DBLSLASH_,g; - s,\\ ,_SPACE_,g; - s,\s*\\".*$,,; - s,\\$,,; - - # Then apply any variable substitutions and escape < and > - # (which has to be done before we start inserting tags...) - s,\\\*\((..),$vars{$1},ge; - s/\\\*([*'`,^,:~].)/$vars{$1}||"\\*$1"/ge; - s,\\\*(.),$vars{$1},ge; - # Expand special characters for the first time (eg. \(<- - s,\\\((..),$special{$1}||"\\($1",ge; - s,<,<,g; - s,>,>,g; - - # Interpolate width and number registers - s,\\w(.)(.*?)\1,&width($2),ge; - s,\\n\((..),&numreg($1),ge; - s,\\n(.),&numreg($1),ge; -} - -# Undo slash escaping, normally done at output stage, also in macro defn -sub postProcessLine -{ - s,_DBLSLASH_,\\,g; - s,_SPACE_, ,g; -} - -# Rewrite the line, expanding escapes such as font styles, and output it. -# The line may be a plain text troff line, or it might be the expanded output of a -# macro in which case some HTML tags may already have been inserted into the text. -sub outputLine -{ - $_ = $_[0]; - - print OUT "<!-- Output: \"$_\" -->\n" if ($debug>1); - - if ($needBreak) - { - plainOutput("<!-- Need break --><BR>\n"); - lineBreak(); - } - if ($textSinceBreak && !$noFill && $_ =~ m/^\s/) - { - plainOutput("<BR>\n"); - lineBreak(); - } - - s,\\&\.,.,g; # \&. often used to escape dot at start of line - s,\\\.,.,g; - s,\\\^,,g; - s,\\\|,,g; - s,\\c,,g; - s,\\0, ,g; - s,\\t,\t,g; - - s,\\%, ,g; - s,\\\{,,g; - s,\\},,g; - s,\\$,,g; - - s,\\e,\,g; - s,\\([-+_~#[]),\1,g; - - # Can't implement local motion tags - s,\\[hv](.).*?\1,,g; - s,\\z,,g; - - # Font changes, super/sub-scripts and font size changes - s,\\(f[^(]|f\(..|u|d|s[-+]?\d),&inlineStyle($1),ge; - - # Overstrike - if (m/\\o/) - { - # handle a few special accent cases we know how to deal with - s,\\o(.)([aouAOU])"\1,\\o\1\2:\1,g; - s,\\o(.)(.)\\(.)\1,\\o\1\2\3\1,g; - s;\\o(.)([A-Za-z])(['`:,^~])\1;\\o\1\3\2\1;g; - #s,\\o(.)(.*?)\1,"<BLINK>".($vars{$2}||$2)."</BLINK>",ge; - s,\\o(.)(.*?)\1,$vars{$2}||$2,ge; - } - # Bracket building (ignore) - s,\\b(.)(.*?)\1,\2,g; - - s,\\`,`,g; - s,\\',',g; - s,',’,g; - s,`,‘,g; - - # Expand special characters introduced by eqn - s,\\\((..),$special{$1}||"\\($1",ge; - s,\\\((..),<BLINK>\\($1</BLINK>,g unless (m,^\.,); - - # Don't know how to handle other escapes - s,(\\[^&]),<BLINK>\1</BLINK>,g unless (m,^\.,); - - postProcessLine(); - - # Insert links for http, ftp and mailto URLs - # Recognised URLs are sequence of alphanumerics and special chars like / and ~ - # but must finish with an alphanumeric rather than punctuation like "." - s,\b(https?://[-\w/~:@.%#+$?=]+[\w/]),<A HREF=\"\1\">\1</A>,g; - s,\b(ftp://[-\w/~:@.%#+$?=]+),<A HREF=\"\1\">\1</A>,g; - s,([-_A-Za-z0-9.]+@[A-Za-z][-_A-Za-z0-9]*\.[-_A-Za-z0-9.]+),<A HREF=\"mailto:\1\">\1</A>,g; - - # special case for things like 'perlre' as it's so useful but the - # pod-generated pages aren't very parser friendly... - if ($perlPattern && ! m/<A HREF/i) - { - s,\b($perlPattern)\b,<A HREF=\"$root$perlPages{$1}\">\1</A>,g; - } - - # Do this late so \& can be used to suppress conversion of URLs etc. - s,\\&,,g; - - # replace tabs with spaces to next multiple of 8 - if (m/\t/) - { - $tmp = $_; - $tmp =~ s/<[^>]*>//g; - $tmp =~ s/&[^;]*;/@/g; - @tmp = split(/\t/, $tmp); - $pos = 0; - for ($i=0; $i<=$#tmp; ++$i) - { - $pos += length($tmp[$i]); - $tab[$i] = 0; - $tab[$i] = 8 - $pos%8 unless (@tabstops); - foreach $ts (@tabstops) - { - if ($pos < $ts) - { - $tab[$i] = $ts-$pos; - last; - } - } - $pos += $tab[$i]; - } - while (m/\t/) - { - s,\t," " x (shift @tab),e; - } - } - - $textSinceBreak = $_ unless ($textSinceBreak); - print OUT $_; -} - -# Output a line consisting purely of HTML tags which shouldn't be regarded as -# a troff output line. -sub plainOutput -{ - print OUT $_[0]; -} - - -# Output the original line for debugging -sub outputOrigLine -{ - print OUT "<!-- $origLine -->\n"; -} - -# Use this to read the next input line (buffered to implement lookahead) -sub getLine -{ - $lookaheadPtr = 0; - if (@lookahead) - { - $_ = shift @lookahead; - return $_; - } - $_ = <SRC>; -} - -# Look ahead to peek at the next input line -sub _lookahead -{ - # set lookaheadPtr to 0 to re-read the lines we've looked ahead at - if ($lookaheadPtr>=0 && $lookaheadPtr <= $#lookahead) - { - return $lookahead[$lookaheadPtr++]; - } - $lookaheadPtr = -1; - $ll = <SRC>; - push(@lookahead, $ll); - return $ll; -} - -# Consume the last line that was returned by lookahead -sub consume -{ - --$lookaheadPtr; - if ($lookaheadPtr>=0 && $lookaheadPtr <= $#lookahead) - { - $removed = $lookahead[$lookaheadPtr]; - @lookahead = (@lookahead[0..$lookaheadPtr-1],@lookahead[$lookaheadPtr+1..$#lookahead]); - } - else - { - $removed = pop @lookahead; - } - chop $removed; - plainOutput("<!-- Consumed $removed -->\n"); -} - -# Look ahead skipping comments and other common non-text tags -sub lookahead -{ - $ll = _lookahead(); - while ($ll =~ m/^\.(\\"|PD|IX|ns)/) - { - $ll = _lookahead(); - } - return $ll; -} - -# Process $_, expaning any macros into HTML and calling outputLine(). -# If necessary, this method can read more lines of input from <SRC> (.ig & .de) -# The following state variables are used: -# ... -sub processLine -{ - $doneLine = 1; # By default, this counts as a line for trap purposes - - s,^\.if t ,,; - s,^\.el ,,; # conditions assumed to evaluate false, so else must be true... - - if ($troffTable) - { - processTable(); - } - elsif ($eqnMode == 2) - { - plainOutput("<!-- $_ -->\n"); - processEqns($_); - } - elsif (m/^\./) - { - processMacro(); - } - else - { - processPlainText(); - } - if ($doneLine) - { - # Called after processing (most) input lines to decrement trapLine. This is needed - # to implement the .it 1 trap after one line for .TP, where the first line is outdented - if ($trapLine > 0) - { - --$trapLine; - if ($trapLine == 0) - { - &$trapAction; - } - } - } -} - - -# Process plain text lines -sub processPlainText -{ - if ($_ eq "") - { - lineBreak(); - plainOutput("<P>\n"); - return; - } - - s,(\\f[23BI])([A-Z].*?)(\\f.),$1.($contents{"\U$2"}?"<A HREF=#".$contents{"\U$2"}.">$2</A>":$2).$3,ge; - - if ($currentSection eq "SEE ALSO" && ! $cmdLineMode) - { - # Some people don't use BR or IR for see also refs - s,(^|\s)([-.A-Za-z_0-9]+)\s?\(([0-9lL][0-9a-zA-Z]*)\),\1<A HREF=\"$root/$2.$3\">$2($3)</A>,g; - } - outputLine("$_\n"); -} - - -# Process macros and built-in directives -sub processMacro -{ - outputOrigLine(); - - # Place macro arguments (space delimited unless within ") into @p - # Remove " from $_, place command in $c, remainder in $joined - - @p = grep($_ !~ m/^\s*$/, split(/("[^"]*"|\s+)/) ); - grep(s/"//g, @p); - $_ = join(" ", @p); - $p[0] =~ s/^\.//; - $c = $p[0]; - $joined = join(" ", @p[1..$#p]); - $joined2 = join(" ", @p[2..$#p]); - $joined3 = join(" ", @p[3..$#p]); - - if ($macro{$c}) # Expand macro - { - # Get full macro text - $macro = $macro{$c}; - # Interpolate arguments - $macro =~ s,\\\$(\d),$p[$1],ge; - #print OUT "<!-- Expanding $c to\n$macro-->\n"; - foreach $_ (split(/\n/, $macro)) - { - $_ .= "\n"; - preProcessLine(); - processLine(); - } - $doneLine = 0; - return; - } - elsif ($renamedMacro{$c}) - { - $c = $renamedMacro{$c}; - } - - if ($c eq "ds") # Define string - { - $vars{$p[1]} = $joined2; - $doneLine = 0; - } - elsif ($c eq "nr") # Define number register - { - $number{$p[1]} = evalnum($joined2); - $doneLine = 0; - } - elsif ($c eq "ti") # Temporary indent - { - plainOutput(" "); - } - elsif ($c eq "rm") - { - $macroName = $p[1]; - if ($macro{$macroName}) - { - delete $macro{$macroName}; - } - else - { - $deletedMacro{$macroName} = 1; - } - } - elsif ($c eq "rn") - { - $oldName = $p[1]; - $newName = $p[2]; - $macro = $macro{$oldName}; - if ($macro) - { - if ($newName =~ $reservedMacros && ! $deletedMacro{$newName}) - { - plainOutput("<!-- Not overwriting reserved macro '$newName' -->\n"); - } - else - { - $macro{$newName} = $macro; - delete $deletedMacro{$newName}; - } - delete $macro{$oldName}; - } - else - { - # Support renaming of reserved macros by mapping occurrences of new name - # to old name after macro expansion so that built in definition is still - # available, also mark the name as deleted to override reservedMacro checks. - plainOutput("<!-- Fake renaming reserved macro '$oldName' -->\n"); - $renamedMacro{$newName} = $oldName; - $deletedMacro{$oldName} = 1; - } - } - elsif ($c eq "de" || $c eq "ig") # Define macro or ignore - { - $macroName = $p[1]; - if ($c eq "ig") - { $delim = ".$p[1]"; } - else - { $delim = ".$p[2]"; } - $delim = ".." if ($delim eq "."); - # plainOutput("<!-- Scanning for delimiter $delim -->\n"); - - $macro = ""; - $_ = getLine(); - preProcessLine(); - while ($_ ne $delim) - { - postProcessLine(); - outputOrigLine(); - $macro .= "$_\n"; - $_ = getLine(); - last if ($_ eq ""); - preProcessLine(); - } - outputOrigLine(); - # plainOutput("<!-- Found delimiter -->\n"); - if ($c eq "de") - { - if ($macroName =~ $reservedMacros && ! $deletedMacro{$macroName}) - { - plainOutput("<!-- Not defining reserved macro '$macroName' ! -->\n"); - } - else - { - $macro{$macroName} = $macro; - delete $deletedMacro{$macroName}; - } - } - } - elsif ($c eq "so") # Source - { - plainOutput("<P>[<A HREF=\"$root$dir/../$p[1]\">Include document $p[1]</A>]<P>\n"); - } - elsif ($c eq "TH" || $c eq "Dt") # Man page title - { - endParagraph(); - $sectionNumber = $p[2]; - $sectionName = $sectionName{"\L$sectionNumber"}; - $sectionName = "Manual Reference Pages" unless ($sectionName); - $pageName = "$p[1] ($sectionNumber)"; - outputPageHead(); - if ($c eq "TH") - { - $right = $p[3]; - $left = $p[4]; - $left = $osver unless ($left); - $macroPackage = "using man macros"; - } - else - { - $macroPackage = "using doc macros"; - } - } - elsif ($c eq "Nd") - { - outputLine("- $joined\n"); - } - elsif ($c eq "SH" || $c eq "SS" || $c eq "Sh" || $c eq "Ss") # Section/subsection - { - lineBreak(); - endNoFill(); - endParagraph(); - $id = $contents{"\U$joined"}; - $currentSection = $joined; - - if ($c eq "SH" || $c eq "Sh") - { - endBlockquote(); - if ($firstSection++==1) # after first 'Name' section - { - outputContents(); - } - outputLine( "<A name=$id>\n\n <H3>$joined</H3>\n\n</A>\n" ); - blockquote(); - } - elsif ($joined =~ m/\\f/) - { - $joined =~ s/\\f.//g; - $id = $contents{"\U$joined"}; - outputLine( "<A name=$id>\n<H4><I>$joined</I></H4></A>\n" ); - } - else - { - endBlockquote(); - outputLine( "<A name=$id>\n\n <H4> $joined</H4>\n</A>\n" ); - blockquote(); - } - lineBreak(); - } - elsif ($c eq "TX" || $c eq "TZ") # Document reference - { - $title = $title{$p[1]}; - $title = "Document [$p[1]]" unless ($title); - outputLine( "\\fI$title\\fP$joined2\n" ); - } - elsif ($c eq "PD") # Line spacing - { - $noSpace = ($p[1] eq "0"); - $doneLine = 0; - } - elsif ($c eq "TS") # Table start - { - unless ($macroPackage =~ /tbl/) - { - if ($macroPackage =~ /eqn/) - { $macroPackage =~ s/eqn/eqn & tbl/; } - else - { $macroPackage .= " with tbl support"; } - } - resetStyles(); - endNoFill(); - $troffTable = 1; - $troffSeparator = "\t"; - plainOutput( "<P><BLOCKQUOTE><TABLE bgcolor=#E0E0E0 border=1 cellspacing=0 cellpadding=3>\n" ); - } - elsif ($c eq "EQ") # Eqn start - { - unless ($macroPackage =~ /eqn/) - { - if ($macroPackage =~ /tbl/) - { $macroPackage =~ s/tbl/tbl & eqn/; } - else - { $macroPackage .= " with eqn support"; } - } - $eqnMode = 2; - } - elsif ($c eq "ps") # Point size - { - plainOutput(&sizeChange($p[1])); - } - elsif ($c eq "ft") # Font change - { - plainOutput(&fontChange($p[1])); - } - elsif ($c eq "I" || $c eq "B") # Single word font change - { - $id = $contents{"\U$joined"}; - if ($id && $joined =~ m/^[A-Z]/) - { $joined = "<A HREF=#$id>$joined</A>"; } - outputLine( "\\f$c$joined\\fP " ); - plainOutput("\n") if ($noFill); - } - elsif ($c eq "SM") # Single word smaller - { - outputLine("\\s-1$joined\\s0 "); - $doneLine = 0 unless ($joined); - } - elsif ($c eq "SB") # Single word bold and small - { - outputLine("\\fB\\s-1$joined\\s0\\fP "); - } - elsif (m/^\.[BI]R (\S+)\s?\(\s?([0-9lL][0-9a-zA-Z]*)\s?\)(.*)$/) - { - # Special form, .BR is generally used for references to other pages - # Annoyingly, some people have more than one per line... - # Also, some people use .IR ... - for ($i=1; $i<=$#p; $i+=2) - { - $pair = $p[$i]." ".$p[$i+1]; - if ($p[$i+1] eq "(") - { - $pair .= $p[$i+2].$p[$i+3]; - $i += 2; - } - if ($pair =~ m/^(\S+)\s?\(\s?([0-9lL][0-9a-zA-Z]*)\s?\)(.*)$/) - { - if ($cmdLineMode) - { outputLine( "\\fB$1\\fR($2)$3\n" ); } - else - { outputLine( "<A HREF=\"$root/$1.$2\">$1($2)</A>$3\n" ); } - } - else - { outputLine( "$pair\n" ); } - } - } - elsif ($c eq "BR" || $c eq "BI" || $c eq "IB" || - $c eq "IR" || $c eq "RI" || $c eq "RB") - { - $f1 = (substr($c ,0,1)); - $f2 = (substr($c,1,1)); - - # Check if first param happens to be a section name - $id = $contents{"\U$p[1]"}; - if ($id && $p[1] =~ m/^[A-Z]/) - { - $p[1] = "<A HREF=#$id>$p[1]</A>"; - } - - for ($i=1; $i<=$#p; ++$i) - { - $f = ($i%2 == 1) ? $f1 : $f2; - outputLine("\\f$f$p[$i]"); - } - outputLine("\\fP "); - plainOutput("\n") if ($noFill); - } - elsif ($c eq "nf" || $c eq "Bd") # No fill - { - startNoFill(); - } - elsif ($c eq "fi" || $c eq "Ed") # Fill - { - endNoFill(); - } - elsif ($c eq "HP") - { - $indent = evalnum($p[1]); - if ($trapOnBreak) - { - plainOutput("<BR>\n"); - } - else - { - # Outdent first line, ie. until next break - $trapOnBreak = 1; - $trapAction = *trapHP; - newParagraph($indent); - plainOutput( "<TD colspan=2>\n" ); - $colState = 2; - } - } - elsif ($c eq "IP") - { - $trapOnBreak = 0; - $tag = $p[1]; - $indent = evalnum($p[2]); - newParagraph($indent); - outputLine("<TD$width>\n$tag\n</TD><TD>\n"); - $colState = 1; - lineBreak(); - } - elsif ($c eq "TP") - { - $trapOnBreak = 0; - $trapLine = 1; # Next line is tag, then next column - $doneLine = 0; # (But don't count this line) - $trapAction = *trapTP; - $indent = evalnum($p[1]); - $tag = lookahead(); - chop $tag; - $i = ($indent ? $indent : $prevailingIndent) ; - $w = width($tag); - if ($w > $i) - { - plainOutput("<!-- Length of tag '$tag' ($w) > indent ($i) -->\n") if ($debug); - newParagraph($indent); - $trapAction = *trapHP; - plainOutput( "<TD colspan=2>\n" ); - $colState = 2; - } - else - { - newParagraph($indent); - plainOutput( "<TD$width nowrap>\n" ); - $colState = 0; - } - $body = lookahead(); - $lookaheadPtr = 0; - if ($body =~ m/^\.[HILP]?P/) - { - chop $body; - plainOutput("<!-- Suppressing TP body due to $body -->\n"); - $trapLine = 0; - } - } - elsif ($c eq "LP" || $c eq "PP" || $c eq "P" || $c eq "Pp") # Paragraph - { - $trapOnBreak = 0; - $prevailingIndent = 6; - if ($indent[$indentLevel] > 0 && $docListStyle eq "") - { - $line = lookahead(); - if ($line =~ m/^\.(TP|IP|HP)/) - { - plainOutput("<!-- suppressed $c before $1 -->\n"); - } - elsif ($line =~ m/^\.RS/) - { - plainOutput("<P>\n"); - } - else - { - endRow(); - $foundTag = ""; - $lookaheadPtr = 0; - do - { - $line = lookahead(); - if ($line =~ m/^\.(TP|HP|IP|RS)( \d+)?/) - { - $indent = $2; - $indent = $prevailingIndent unless ($2); - if ($indent == $indent[$indentLevel]) - { $foundTag = $1; } - $line = ""; - } - } - while ($line ne "" && $line !~ m/^\.(RE|SH|SS|PD)/); - $lookaheadPtr = 0; - if ($foundTag) - { - plainOutput("<!-- Found tag $foundTag -->\n"); - plainOutput("<TR><TD colspan=2>\n"); - $colState = 2; - } - else - { - plainOutput("<!-- $c ends table -->\n"); - setIndent(0); - } - } - } - else - { - plainOutput("<P>\n"); - } - lineBreak(); - } - elsif ($c eq "br") # Break - { - if ($trapOnBreak) - { - # Should this apply to all macros that cause a break? - $trapOnBreak = 0; - &$trapAction(); - } - $needBreak = 1 if ($textSinceBreak); - } - elsif ($c eq "sp") # Space - { - lineBreak(); - plainOutput("<P>\n"); - } - elsif ($c eq "RS") # Block indent start - { - if ($indentLevel==0 && $indent[0]==0) - { - blockquote(); - } - else - { - $indent = $p[1]; - $indent = $prevailingIndent unless ($indent); - if ($indent > $indent[$indentLevel] && !$extraIndent) - { - $extraIndent = 1; - ++$indentLevel; - $indent[$indentLevel] = 0; - setIndent($indent-$indent[$indentLevel-1]); - plainOutput("<TR><TD$width> </TD><TD>\n"); - $colState = 1; - } - elsif ($indent < $indent[$indentLevel] || $colState==2) - { - endRow(); - setIndent($indent); - plainOutput("<TR><TD$width> </TD><TD>\n"); - $colState = 1; - } - ++$indentLevel; - $indent[$indentLevel] = 0; - } - $prevailingIndent = 6; - } - elsif ($c eq "RE") # Block indent end - { - if ($extraIndent) - { - endRow(); - setIndent(0); - --$indentLevel; - $extraIndent = 0; - } - if ($indentLevel==0) - { - endParagraph(); - if ($blockquote>0) - { - plainOutput("</BLOCKQUOTE>\n"); - --$blockquote; - } - } - else - { - endRow(); - setIndent(0); - --$indentLevel; - } - $prevailingIndent = $indent[$indentLevel]; - $prevailingIndent = 6 unless($prevailingIndent); - } - elsif ($c eq "DT") # default tabs - { - @tabstops = (); - } - elsif ($c eq "ta") # Tab stops - { - @tabstops = (); - for ($i=0; $i<$#p; ++$i) - { - $ts = $p[$i+1]; - $tb = 0; - if ($ts =~ m/^\+/) - { - $tb = $tabstops[$i-1]; - $ts =~ s/^\+//; - } - $ts = evalnum($ts); - $tabstops[$i] = $tb + $ts; - } - plainOutput("<!-- Tabstops set at ".join(",", @tabstops)." -->\n") if ($debug); - } - elsif ($c eq "It") # List item (mdoc) - { - lineBreak(); - if ($docListStyle eq "-tag") - { - endRow() unless($multilineIt); - if ($tagWidth) - { - setIndent($tagWidth); - } - else - { - setIndent(6); - $width = ""; # let table take care of own width - } - if ($p[1] eq "Xo") - { - plainOutput("<TR valign=top><TD colspan=2>"); - } - else - { - $tag = &mdocStyle(@p[1..$#p]); - $body = lookahead(); - if ($body =~ m/^\.It/) - { $multilineItNext = 1; } - else - { $multilineItNext = 0; } - if ($multilineIt) - { - outputLine("<BR>\n$tag\n"); - } - elsif ($multilineItNext || $tagWidth>0 && width($tag)>$tagWidth) - { - outputLine("<TR valign=top><TD colspan=2>$tag\n"); - $colState = 2; - } - else - { - outputLine("<TR valign=top><TD>$tag\n"); - $colState = 1; - } - if ($multilineItNext) - { - $multilineIt = 1; - } - else - { - $multilineIt = 0; - if ($colState==2) - { plainOutput("</TD></TR><TR><TD> </TD><TD>\n"); } - else - { plainOutput("</TD><TD>\n"); } - } - } - } - else - { - plainOutput("<LI>"); - } - lineBreak(); - } - elsif ($c eq "Xc") - { - if ($docListStyle eq "-tag") - { - plainOutput("</TD></TR><TR><TD> </TD><TD>\n"); - } - } - elsif ($c eq "Bl") # Begin list (mdoc) - { - push @docListStyles, $docListStyle; - if ($p[1] eq "-enum") - { - plainOutput("<OL>\n"); - $docListStyle = $p[1]; - } - elsif($p[1] eq "-bullet") - { - plainOutput("<UL>\n"); - $docListStyle = $p[1]; - } - else - { - $docListStyle = "-tag"; - if ($p[2] eq "-width") - { - $tagWidth = width($p[3]); - if ($tagWidth < 6) { $tagWidth = 6; } - } - else - { - $tagWidth = 0; - } - $multilineIt = 0; - } - } - elsif ($c eq "El") # End list - { - if ($docListStyle eq "-tag") - { - endRow(); - setIndent(0); - } - elsif ($docListStyle eq "-bullet") - { - plainOutput("</UL>\n"); - } - else - { - plainOutput("</OL>\n"); - } - $docListStyle = pop @docListStyles; - } - elsif ($c eq "Os") - { - $right = $joined; - } - elsif ($c eq "Dd") - { - $left = $joined; - } - elsif ($c eq "Sx") # See section - { - $id = $contents{"\U$joined"}; - if ($id && $joined =~ m/^[A-Z]/) - { - outputLine("<A HREF=#$id>".&mdocStyle(@p[1..$#p])."</A>\n"); - } - else - { - my $x = &mdocStyle(@p[1..$#p]); - $x =~ s/^ //; - outputLine($x."\n"); - } - } - elsif (&mdocCallable($c)) - { - my $x = &mdocStyle(@p); - $x =~ s/^ //; - outputLine($x."\n"); - } - elsif ($c eq "Bx") - { - outputLine("<I>BSD $joined</I>\n"); - } - elsif ($c eq "Ux") - { - outputLine("<I>Unix $joined</I>\n"); - } - elsif ($c eq "At") - { - outputLine("<I>AT&T $joined</I>\n"); - } - elsif ($c =~ m/[A-Z][a-z]/) # Unsupported doc directive - { - outputLine("<BR>.$c $joined\n"); - } - elsif ($c eq "") # Empty line (eg. troff comment) - { - $doneLine = 0; - } - else # Unsupported directive - { - # Unknown macros are ignored, and don't count as a line as far as trapLine goes - $doneLine = 0; - plainOutput("<!-- ignored unsupported tag .$c -->\n"); - } -} - -sub trapTP -{ - $lookaheadPtr = 0; - $body = lookahead(); - if ($body =~ m/^\.TP/) - { - consume(); - $trapLine = 1; # restore TP trap - $doneLine = 0; # don't count this line - plainOutput("<BR>\n"); - } - else - { - plainOutput("</TD><TD valign=bottom>\n"); - $colState = 1; - } - lineBreak(); -} - -sub trapHP -{ - $lookaheadPtr = 0; - $body = lookahead(); - if ($body =~ m/^\.([TH]P)/) - { - consume(); - # Restore appropriate type of trap - if ($1 eq "TP") - { - $trapLine = 1; - $doneLine = 0; # don't count this line - } - else - { - $trapOnBreak = 1; - } - plainOutput("<BR>\n"); - } - else - { - plainOutput("</TD></TR><TR valign=top><TD$width> </TD><TD>\n"); - $colState = 1; - } - lineBreak(); -} - -sub newParagraph -{ - $indent = $_[0]; - endRow(); - startRow($indent); -} - -sub startRow -{ - $indent = $_[0]; - $indent = $prevailingIndent unless ($indent); - $prevailingIndent = $indent; - setIndent($indent); - plainOutput( "<TR valign=top>" ); -} - -# End an existing HP/TP/IP/RS row -sub endRow -{ - if ($indent[$indentLevel] > 0) - { - lineBreak(); - plainOutput( "</TD></TR>\n" ); - } -} - -# Called when we output a line break tag. Only needs to be called once if -# calling plainOutput, but should call before and after if using outputLine. -sub lineBreak -{ - $needBreak = 0; - $textSinceBreak = 0; -} - -# Called to reset all indents and pending paragraphs (eg. at the start of -# a new top level section). -sub endParagraph -{ - ++$indentLevel; - while ($indentLevel > 0) - { - --$indentLevel; - if ($indent[$indentLevel] > 0) - { - endRow(); - setIndent(0); - } - } -} - -# Interpolate a number register (possibly autoincrementing) -sub numreg -{ - return 0 + $number{$_[0]}; -} - -# Evaluate a numeric expression -sub evalnum -{ - $n = $_[0]; - return "" if ($n eq ""); - if ($n =~ m/i$/) # inches - { - $n =~ s/i//; - $n *= 10; - } - return 0+$n; -} - -sub setIndent -{ - $tsb = $textSinceBreak; - $indent = evalnum($_[0]); - if ($indent==0 && $_[0] !~ m/^0/) - { - $indent = 6; - } - plainOutput("<!-- setIndent $indent, indent[$indentLevel] = $indent[$indentLevel] -->\n") if ($debug); - if ($indent[$indentLevel] != $indent) - { - lineBreak(); - if ($indent[$indentLevel] > 0) - { - plainOutput("<TR></TR>") unless ($noSpace); - plainOutput("</TABLE>"); - } - if ($indent > 0) - { - endNoFill(); - $border = ""; - $border = " border=1" if ($debug>2); - #plainOutput("<P>") unless ($indent[$indentLevel] > 0); - plainOutput("<TABLE$border"); - # Netscape bug, makes 2 cols same width? : plainOutput("<TABLE$border COLS=2"); - # Overcome some of the vagaries of Netscape tables - plainOutput(" width=100%") if ($indentLevel>0); - if ($noSpace) - { - plainOutput(" cellpadding=0 cellspacing=0>\n"); - } - else - { - plainOutput(" cellpadding=3>".($tsb ? "<!-- tsb: $tsb -->\n<TR></TR><TR></TR>\n" : "\n") ); - } - #$width = " width=".($indent*5); # causes text to be chopped if too big - $percent = $indent; - if ($indentLevel > 0) - { $percent = $indent * 100 / (100-$indentLevel[0]); } - $width = " width=$percent%"; - } - $indent[$indentLevel] = $indent; - } -} - -# Process mdoc style macros recursively, as one of the macro arguments -# may itself be the name of another macro to invoke. -sub mdocStyle -{ - return "" unless @_; - my ($tag, @param) = @_; - my ($rest, $term); - - # Don't format trailing punctuation - if ($param[$#param] =~ m/^[.,;:]$/) - { - $term = pop @param; - } - if ($param[$#param] =~ m/^[)\]]$/) - { - $term = (pop @param).$term; - } - - if ($param[0] =~ m,\\\\,) - { - print STDERR "$tag: ",join(",", @param),"\n"; - } - $rest = &mdocStyle(@param); - - if ($tag eq "Op") - { - $rest =~ s/ //; # remove first space - return " \\fP[$rest]$term"; - } - elsif ($tag eq "Xr") # cross reference - { - my $p = shift @param; - my $url = $p; - if (@param==1) - { - $url .= ".".$param[0]; - $rest = "(".$param[0].")"; - } - else - { - $rest = &mdocStyle(@param); - } - if ($cmdLineMode) - { - return " <B>".$p."</B>".$rest.$term; - } - else - { - return " <A HREF=\"".$root."/".$url."\">".$p."</A>".$rest.$term; - } - } - elsif ($tag eq "Fl") - { - my ($sofar); - while (@param) - { - $f = shift @param; - if ($f eq "Ns") # no space - { - chop $sofar; - } - elsif (&mdocCallable($f)) - { - unshift @param, $f; - return $sofar.&mdocStyle(@param).$term; - } - else - { - $sofar .= "-<B>$f</B> " - } - } - return $sofar.$term; - } - elsif ($tag eq "Pa" || $tag eq "Er" || $tag eq "Fn" || $tag eq "Dv") - { - return "\\fC$rest\\fP$term"; - } - elsif ($tag eq "Ad" || $tag eq "Ar" || $tag eq "Em" || $tag eq "Fa" || $tag eq "St" || - $tag eq "Ft" || $tag eq "Va" || $tag eq "Ev" || $tag eq "Tn" || $tag eq "%T") - { - return "\\fI$rest\\fP$term"; - } - elsif ($tag eq "Nm") - { - $defaultNm = $param[0] unless ($defaultNm); - $rest = $defaultNm unless ($param[0]); - return "\\fB$rest\\fP$term"; - } - elsif ($tag eq "Ic" || $tag eq "Cm" || $tag eq "Sy") - { - return "\\fB$rest\\fP$term"; - } - elsif ($tag eq "Ta") # Tab - { - # Tabs are used inconsistently so this is the best we can do. Columns won't line up. Tough. - return " $rest$term"; - } - elsif ($tag eq "Ql") - { - $rest =~ s/ //; - return "`<TT>$rest</TT>'$term"; - } - elsif ($tag eq "Dl") - { - return "<P> <TT>$rest</TT>$term<P>\n"; - } - elsif ($tag =~ m/^[ABDEOPQS][qoc]$/) - { - $lq = ""; - $rq = ""; - if ($tag =~ m/^A/) - { $lq = "<"; $rq = ">"; } - elsif ($tag =~ m/^B/) - { $lq = "["; $rq = "]"; } - elsif ($tag =~ m/^D/) - { $lq = "\""; $rq = "\""; } - elsif ($tag =~ m/^P/) - { $lq = "("; $rq = ")"; } - elsif ($tag =~ m/^Q/) - { $lq = "\""; $rq = "\""; } - elsif ($tag =~ m/^S/) - { $lq = "\\'"; $rq = "\\'"; } - elsif ($tag =~ m/^O/) - { $lq = "["; $rq = "]"; } - if ($tag =~ m/^.o/) - { $rq = ""; } - if ($tag =~ m/^.c/) - { $lq = ""; } - $rest =~ s/ //; - return $lq.$rest.$rq.$term ; - } - elsif (&mdocCallable($tag)) # but not in list above... - { - return $rest.$term; - } - elsif ($tag =~ m/^[.,;:()\[\]]$/) # punctuation - { - return $tag.$rest.$term; - } - elsif ($tag eq "Ns") - { - return $rest.$term; - } - else - { - return " ".$tag.$rest.$term; - } -} - -# Determine if a macro is mdoc parseable/callable -sub mdocCallable -{ - return ($_[0] =~ m/^(Op|Fl|Pa|Er|Fn|Ns|No|Ad|Ar|Xr|Em|Fa|Ft|St|Ic|Cm|Va|Sy|Nm|Li|Dv|Ev|Tn|Pf|Dl|%T|Ta|Ql|[ABDEOPQS][qoc])$/); -} - - -# Estimate the output width of a string -sub width -{ - local($word) = $_[0]; - $word =~ s,<[/A-Z][^>]*>,,g; # remove any html tags - $word =~ s/^\.\S+\s//; - $word =~ s/\\..//g; - $x = length($word); - $word =~ s/[ ()|.,!;:"']//g; # width of punctuation is about half a character - return ($x + length($word)) / 2; -} - -# Process a tbl table (between TS/TE tags) -sub processTable -{ - if ($troffTable == "1") - { - @troffRowDefs = (); - @tableRows = (); - $hadUnderscore = 0; - while(1) - { - outputOrigLine(); - if (m/;\s*$/) - { - $troffSeparator = quotemeta($1) if (m/tab\s*\((.)\)/); - } - else - { - s/\.\s*$//; - s/\t/ /g; - s/^[^lrcan^t]*//; # remove any 'modifiers' coming before tag - # delimit on tags excluding s (viewed as modifier of previous column) - s/([lrcan^t])/\t$1/g; - s/^\t//; - push @troffRowDefs, $_; - last if ($origLine =~ m/\.\s*$/); - } - $_ = getLine(); - preProcessLine(); - } - $troffTable = 2; - return; - } - - s/$troffSeparator/\t/g; - if ($_ eq ".TE") - { - endTblRow(); - flushTable(); - $troffTable = 0; - plainOutput("</TABLE></BLOCKQUOTE>\n"); - } - elsif ($_ eq ".T&") - { - endTblRow(); - flushTable(); - $troffTable = 1; - } - elsif (m/[_=]/ && m/^[_=\t]*$/ && $troffCol==0) - { - if (m/^[_=]$/) - { - flushTable(); - plainOutput("<TR></TR><TR></TR>\n"); - $hadUnderscore = 1; - } - elsif ($troffCol==0 && @troffRowDefs) - { - # Don't output a row, but this counts as a row as far as row defs go - $rowDef = shift @troffRowDefs; - @troffColDefs = split(/\t/, $rowDef); - } - } - elsif (m/^\.sp/ && $troffCol==0 && !$hadUnderscore) - { - flushTable(); - plainOutput("<TR></TR><TR></TR>\n"); - } - elsif ($_ eq ".br" && $troffMultiline) - { - $rowref->[$troffCol] .= "<BR>\n"; - } - elsif ($_ !~ m/^\./) - { - $rowref = $tableRows[$#tableRows]; # reference to current row (last row in array) - if ($troffCol==0 && @troffRowDefs) - { - $rowDef = shift @troffRowDefs; - if ($rowDef =~ m/^[_=]/) - { - $xxx = $_; - flushTable(); - plainOutput("<TR></TR><TR></TR>\n"); - $hadUnderscore = 1; - $_ = $xxx; - $rowDef = shift @troffRowDefs; - } - @troffColDefs = split(/\t/, $rowDef); - } - - if ($troffCol == 0 && !$troffMultiline) - { - $rowref = []; - push(@tableRows, $rowref); - #plainOutput("<TR valign=top>"); - } - - #{ - if (m/T}/) - { - $troffMultiline = 0; - } - if ($troffMultiline) - { - $rowref->[$troffCol] .= "$_\n"; - return; - } - - @columns = split(/\t/, $_); - plainOutput("<!-- Adding (".join(",", @columns)."), type (".join(",", @troffColDefs).") -->\n") if ($debug); - while ($troffCol <= $#troffColDefs && @columns > 0) - { - $def = $troffColDefs[$troffCol]; - $col = shift @columns; - $col =~ s/\s*$//; - $align = ""; - $col = "\\^" if ($col eq "" && $def =~ m/\^/); - $col = " " if ($col eq ""); - $style1 = ""; - $style2 = ""; - if ($col ne "\\^") - { - if ($def =~ m/[bB]/ || $def =~ m/f3/) - { $style1 = "\\fB"; $style2 = "\\fP"; } - if ($def =~ m/I/ || $def =~ m/f2/) - { $style1 = "\\fI"; $style2 = "\\fP"; } - } - if ($def =~ m/c/) { $align = " align=center"; } - if ($def =~ m/[rn]/) { $align = " align=right"; } - $span = $def; - $span =~ s/[^s]//g; - if ($span) { $align.= " colspan=".(length($span)+1); } - - #{ - if ($col =~ m/T}/) - { - $rowref->[$troffCol] .= "$style2</TD>"; - ++$troffCol; - } - elsif ($col =~ m/T\{/) #} - { - $col =~ s/T\{//; #} - $rowref->[$troffCol] = "<TD$align>$style1$col"; - $troffMultiline = 1; - } - else - { - $rowref->[$troffCol] = "<TD$align>$style1$col$style2</TD>"; - ++$troffCol; - } - } - - endTblRow() unless ($troffMultiline); - } -} - -sub endTblRow -{ - return if ($troffCol == 0); - while ($troffCol <= $#troffColDefs) - { - $rowref->[$troffCol] = "<TD> </TD>"; - #print OUT "<TD> </TD>"; - ++$troffCol; - } - $troffCol = 0; - #print OUT "</TR>\n" -} - -sub flushTable -{ - plainOutput("<!-- flushTable $#tableRows rows -->\n") if ($debug); - - # Treat rows with first cell blank or with more than one vertically - # spanned row as a continuation of the previous line. - # Note this is frequently a useful heuristic but isn't foolproof. - for($r=0; $r<$#tableRows; ++$r) - { - $vspans = 0; - for ($c=0; $c<=$#{$tableRows[$r+1]}; ++$c) - {++$vspans if ($tableRows[$r+1][$c] =~ m,<TD.*?>\\\^</TD>,);} - if ((($vspans>1) || ($tableRows[$r+1][0] =~ m,<TD.*?> </TD>,)) && - $#{$tableRows[$r]} == $#{$tableRows[$r+1]} && 0) - { - if ($debug) - { - plainOutput("<!-- merging row $r+1 into previous -->\n"); - plainOutput("<!-- row $r: (".join(",", @{$tableRows[$r]}).") -->\n"); - plainOutput("<!-- row $r+1: (".join(",", @{$tableRows[$r+1]}).") -->\n"); - } - for ($c=0; $c<=$#{$tableRows[$r]}; ++$c) - { - $tableRows[$r][$c] .= $tableRows[$r+1][$c]; - $tableRows[$r][$c] =~ s,\\\^,,g; # merging is stronger than spanning! - $tableRows[$r][$c] =~ s,</TD><TD.*?>,<BR>,; - } - @tableRows = (@tableRows[0..$r], @tableRows[$r+2 .. $#tableRows]); - --$r; # process again - } - } - - # Turn \^ vertical span requests into rowspan tags - for($r=0; $r<$#tableRows; ++$r) - { - for ($c=0; $c<=$#{$tableRows[$r]}; ++$c) - { - $r2 = $r+1; - while ( $r2<=$#tableRows && ($tableRows[$r2][$c] =~ m,<TD.*?>\\\^</TD>,) ) - { - ++$r2; - } - $rs = $r2-$r; - if ($rs > 1) - { - plainOutput("<!-- spanning from $r,$c -->\n") if ($debug); - $tableRows[$r][$c] =~ s/<TD/<TD rowspan=$rs/; - } - } - } - - # As tbl and html differ in whether they expect spanned cells to be - # supplied, remove any cells that are 'rowspanned into'. - for($r=0; $r<=$#tableRows; ++$r) - { - for ($c=$#{$tableRows[$r]}; $c>=0; --$c) - { - if ($tableRows[$r][$c] =~ m/<TD rowspan=(\d+)/) - { - for ($r2=$r+1; $r2<$r+$1; ++$r2) - { - $rowref = $tableRows[$r2]; - plainOutput("<!-- removing $r2,$c: ".$rowref->[$c]." -->\n") if ($debug); - @$rowref = (@{$rowref}[0..$c-1], @{$rowref}[$c+1..$#$rowref]); - } - } - } - } - - # Finally, output the cells that are left - for($r=0; $r<=$#tableRows; ++$r) - { - plainOutput("<TR valign=top>\n"); - for ($c=0; $c <= $#{$tableRows[$r]}; ++$c) - { - outputLine($tableRows[$r][$c]); - } - plainOutput("</TR>\n"); - } - @tableRows = (); - $troffCol = 0; - plainOutput("<!-- flushTable done -->\n") if ($debug); -} - - -# Use these for all font changes, including .ft, .ps, .B, .BI, .SM etc. -# Need to add a mechanism to stack up these changes so tags match: <X> <Y> ... </Y> </X> etc. - -sub pushStyle -{ - $result = ""; - $type = $_[0]; - $tag = $_[1]; - print OUT "<!-- pushStyle $type($tag) [".join(",", @styleStack)."] " if ($debug>1); - @oldItems = (); - if (grep(m/^$type/, @styleStack)) - { - print OUT "undoing up to old $type " if ($debug>1); - while (@styleStack) - { - # search back, undoing intervening tags in reverse order - $oldItem = pop @styleStack; - ($oldTag) = ($oldItem =~ m/^.(\S+)/); - $result .= "</$oldTag>"; - if (substr($oldItem,0,1) eq $type) - { - print OUT "found $oldItem " if ($debug>1); - while (@oldItems) - { - # restore the intermediates again - $oldItem = shift @oldItems; - push(@styleStack, $oldItem); - $result .= "<".substr($oldItem,1).">"; - } - last; - } - else - { - unshift(@oldItems, $oldItem); - } - } - } - print OUT "oldItems=(@oldItems) " if ($debug>1); - push(@styleStack, @oldItems); # if we didn't find anything of type - if ($tag) - { - $result .= "<$tag>"; - push(@styleStack, $type.$tag); - } - print OUT "-> '$result' -->\n" if ($debug>1); - return $result; -} - -sub resetStyles -{ - if (@styleStack) - { - print OUT "<!-- resetStyles [".join(",", @styleStack)."] -->\n"; - print OUT "<HR> resetStyles [".join(",", @styleStack)."] <HR>\n" if ($debug); - } - while (@styleStack) - { - $oldItem = pop @styleStack; - ($oldTag) = ($oldItem =~ m/^.(\S+)/); - print OUT "</$oldTag>"; - } - $currentSize = 0; - $currentShift = 0; -} - -sub blockquote -{ - print OUT "<BLOCKQUOTE>\n"; - ++$blockquote; -} - -sub endBlockquote -{ - resetStyles(); - while ($blockquote > 0) - { - print OUT "</BLOCKQUOTE>\n"; - --$blockquote; - } -} - -sub indent -{ - plainOutput(pushStyle("I", "TABLE")); - $width = $_[0]; - $width = " width=$width%" if ($width); - plainOutput("<TR><TD$width> </TD><TD>\n"); -} - -sub outdent -{ - plainOutput("</TD></TR>\n"); - plainOutput(pushStyle("I")); -} - -sub inlineStyle -{ - $_[0] =~ m/^(.)(.*)$/; - if ($1 eq "f") - { fontChange($2); } - elsif ($1 eq "s" && ! $noFill) - { sizeChange($2); } - else - { superSub($1); } -} - -sub fontChange -{ - $fnt = $_[0]; - $fnt =~ s/^\(//; - - if ($fnt eq "P" || $fnt eq "R" || $fnt eq "1" || $fnt eq "") - { $font = ""; } - elsif ($fnt eq "B" || $fnt eq "3") - { $font = "B"; } - elsif ($fnt eq "I" || $fnt eq "2") - { $font = "I"; } - else - { $font = "TT"; } - return pushStyle("F", $font); -} - -sub sizeChange -{ - $size= $_[0]; - if ($size =~ m/^[+-]/) - { $currentSize += $size; } - else - { $currentSize = $size-10; } - $currentSize = 0 if (! $size); - - $sz = $currentSize; - $sz = -2 if ($sz < -2); - $sz = 2 if ($sz > 2); - - if ($currentSize eq "0") - { $size = ""; } - else - { $size = "FONT size=$sz"; } - return pushStyle("S", $size); -} - -sub superSub -{ - $sub = $_[0]; - ++$currentShift if ($sub eq "u"); - --$currentShift if ($sub eq "d"); - $tag = ""; - $tag = "SUP" if ($currentShift > 0); - $tag = "SUB" if ($currentShift < 0); - return pushStyle("D", $tag); -} - -sub startNoFill -{ - print OUT "<PRE>\n" unless($noFill); - $noFill = 1; -} - -sub endNoFill -{ - print OUT "</PRE>\n" if ($noFill); - $noFill = 0; -} - - -sub processEqns -{ - if ($eqnMode==2 && $_[0] =~ m/^\.EN/) - { - $eqnMode = 0; - outputLine(flushEqn()); - plainOutput("\n"); - return; - } - $eqnBuffer .= $_[0]." "; -} - -sub processEqnd -{ - processEqns(@_); - return flushEqn(); -} - -sub flushEqn -{ - @p = grep($_ !~ m/^ *$/, split(/("[^"]*"|\s+|[{}~^])/, $eqnBuffer) ); - $eqnBuffer = ""; - #return "[".join(',', @p)." -> ".&doEqn(@p)."]\n"; - $res = &doEqn(@p); - #$res =~ s,\\\((..),$special{$1}||"\\($1",ge; - #$res =~ s,<,<,g; - #$res =~ s,>,>,g; - return $res; -} - -sub doEqn -{ - my @p = @_; - my $result = ""; - my $res; - my $c; - while (@p) - { - ($res, @p) = doEqn1(@p); - $result .= $res; - } - return $result; -} - -sub doEqn1 -{ - my @p = @_; - my $res = ""; - my $c; - - $c = shift @p; - if ($eqndefs{$c}) - { - @x = split(/\0/, $eqndefs{$c}); - unshift @p, @x; - $c = shift @p; - } - if ($c =~ m/^"(.*)"$/) - { - $res = $1; - } - elsif ($c eq "delim") - { - $c = shift @p; - if ($c eq "off") - { - $eqnStart = ""; - $eqnEnd = ""; - } - else - { - $c =~ m/^(.)(.)/; - $eqnStart = quotemeta($1); - $eqnEnd = quotemeta($2); - } - } - elsif ($c eq "define" || $c eq "tdefine" || $c eq "ndefine") - { - $t = shift @p; - $d = shift @p; - $def = ""; - if (length($d) != 1) - { - $def = $d; - $def =~ s/^.(.*)./\1/; - } - else - { - while (@p && $p[0] ne $d) - { - $def .= shift @p; - $def .= "\0"; - } - chop $def; - shift @p; - } - $eqndefs{$t} = $def unless ($c eq "ndefine"); - } - elsif ($c eq "{") - { - my $level = 1; - my $i; - for ($i=0; $i<=$#p; ++$i) - { - ++$level if ($p[$i] eq "{"); - --$level if ($p[$i] eq "}"); - last if ($level==0); - } - $res = doEqn(@p[0..$i-1]); - @p = @p[$i+1..$#p]; - } - elsif ($c eq "sup") - { - ($c,@p) = &doEqn1(@p); - $res = "\\u$c\\d"; - } - elsif ($c eq "to") - { - ($c,@p) = &doEqn1(@p); - $res = "\\u$c\\d "; - } - elsif ($c eq "sub" || $c eq "from") - { - ($c,@p) = &doEqn1(@p); - $res = "\\d$c\\u"; - } - elsif ($c eq "matrix") - { - ($c,@p) = &doEqn1(@p); - $res = "matrix ( $c )"; - } - elsif ($c eq "bold") - { - ($c,@p) = &doEqn1(@p); - $res = "\\fB$c\\fP"; - } - elsif ($c eq "italic") - { - ($c,@p) = &doEqn1(@p); - $res = "\\fI$c\\fP"; - } - elsif ($c eq "roman") - { - } - elsif ($c eq "font" || $c eq "gfont" || $c eq "size" || $c eq "gsize") - { - shift @p; - } - elsif ($c eq "mark" || $c eq "lineup") - { - } - elsif ($c eq "~" || $c eq "^") - { - $res = " "; - } - elsif ($c eq "over") - { - $res = " / "; - } - elsif ($c eq "half") - { - $res = "\\(12"; - } - elsif ($c eq "prime") - { - $res = "\\' "; - } - elsif ($c eq "dot") - { - $res = "\\u.\\d "; - } - elsif ($c eq "dotdot") - { - $res = "\\u..\\d "; - } - elsif ($c eq "tilde") - { - $res = "\\u~\\d "; - } - elsif ($c eq "hat") - { - $res = "\\u^\\d "; - } - elsif ($c eq "bar" || $c eq "vec") - { - $res = "\\(rn "; - } - elsif ($c eq "under") - { - $res = "_ "; - } - elsif ( $c eq "sqrt" || $c eq "lim" || $c eq "sum" || $c eq "pile" || $c eq "lpile" || - $c eq "rpile" || $c eq "cpile" || $c eq "int" || $c eq "prod" ) - { - $res = " $c "; - } - elsif ($c eq "cdot") - { - $res = " . "; - } - elsif ($c eq "inf") - { - $res = "\\(if"; - } - elsif ($c eq "above" || $c eq "lcol" || $c eq "ccol") - { - $res = " "; - } - elsif ($c eq "sin" || $c eq "cos" || $c eq "tan" || $c eq "log" || $c eq "ln" ) - { - $res = " $c "; - } - elsif ($c eq "left" || $c eq "right" || $c eq "nothing") - { - } - elsif ($c =~ m/^[A-Za-z]/) - { - $res = "\\fI$c\\fP"; - } - else - { - $res = $c; - } - - return ($res, @p); -} - -##### Search manpath and initialise special char array ##### - -sub initialise -{ - # Determine groff version if possible - my $groffver = `groff -v`; - $groffver =~ /^GNU groff version (\S+)/; - $groffver = $1; - - # Parse the macro definition file for section names - if (open(MACRO, "/usr/lib/tmac/tmac.an") || - open(MACRO, "/usr/lib/tmac/an") || - open(MACRO, "/usr/lib/groff/tmac/tmac.an") || - open(MACRO, "/usr/lib/groff/tmac/an.tmac") || - open(MACRO, "/usr/share/tmac/tmac.an") || - open(MACRO, "/usr/share/tmac/an.tmac") || - open(MACRO, "/usr/share/groff/tmac/tmac.an") || - open(MACRO, "/usr/share/groff/tmac/an.tmac") || - open(MACRO, "/usr/share/groff/$groffver/tmac/an.tmac") ) - { - while (<MACRO>) - { - chop; - if (m/\$2'([0-9a-zA-Z]+)' .ds ]D (.*)$/) - { - $sn = $2; - unless ($sn =~ m/[a-z]/) - { - $sn = "\u\L$sn"; - $sn =~ s/ (.)/ \u\1/g; - } - $sectionName{"\L$1"} = $sn; - } - if (m/\$1'([^']+)' .ds Tx "?(.*)$/) - { - $title{"$1"} = $2; - } - if (m/^.ds ]W (.*)$/) - { - $osver = $1; - } - } - } - else - { - print STDERR "Failed to read tmac.an definitions\n" unless ($cgiMode); - } - if (open(MACRO, "/usr/lib/tmac/tz.map")) - { - while (<MACRO>) - { - chop; - if (m/\$1'([^']+)' .ds Tz "?(.*)$/) - { - $title{"$1"} = $2; - } - } - } - - # Prevent redefinition of macros that have special meaning to us - $reservedMacros = '^(SH|SS|Sh|Ss)$'; - - # Predefine special number registers - $number{'.l'} = 75; - - # String variables defined by man package - $vars{'lq'} = '“'; - $vars{'rq'} = '”'; - $vars{'R'} = '\\(rg'; - $vars{'S'} = '\\s0'; - - # String variables defined by mdoc package - $vars{'Le'} = '\\(<='; - $vars{'<='} = '\\(<='; - $vars{'Ge'} = '\\(>='; - $vars{'Lt'} = '<'; - $vars{'Gt'} = '>'; - $vars{'Ne'} = '\\(!='; - $vars{'>='} = '\\(>='; - $vars{'q'} = '"'; # see also special case in preProcessLine - $vars{'Lq'} = '“'; - $vars{'Rq'} = '”'; - $vars{'ua'} = '\\(ua'; - $vars{'ga'} = '\\(ga'; - $vars{'Pi'} = '\\(*p'; - $vars{'Pm'} = '\\(+-'; - $vars{'Na'} = 'NaN'; - $vars{'If'} = '\\(if'; - $vars{'Ba'} = '|'; - - # String variables defined by ms package (access to accented characters) - $vars{'bu'} = '»'; - $vars{'66'} = '“'; - $vars{'99'} = '”'; - $vars{'*!'} = '¡'; - $vars{'ct'} = '¢'; - $vars{'po'} = '£'; - $vars{'gc'} = '¤'; - $vars{'ye'} = '¥'; - #$vars{'??'} = '¦'; - $vars{'sc'} = '§'; - $vars{'*:'} = '¨'; - $vars{'co'} = '©'; - $vars{'_a'} = 'ª'; - $vars{'<<'} = '«'; - $vars{'no'} = '¬'; - $vars{'hy'} = '­'; - $vars{'rg'} = '®'; - $vars{'ba'} = '¯'; - $vars{'de'} = '°'; - $vars{'pm'} = '±'; - #$vars{'??'} = '²'; - #$vars{'??'} = '³'; - $vars{'aa'} = '´'; - $vars{'mu'} = 'µ'; - $vars{'pg'} = '¶'; - $vars{'c.'} = '·'; - $vars{'cd'} = '¸'; - #$vars{'??'} = '¹'; - $vars{'_o'} = 'º'; - $vars{'>>'} = '»'; - $vars{'14'} = '¼'; - $vars{'12'} = '½'; - #$vars{'??'} = '¾'; - $vars{'*?'} = '¿'; - $vars{'`A'} = 'À'; - $vars{"'A"} = 'Á'; - $vars{'^A'} = 'Â'; - $vars{'~A'} = 'Ã'; - $vars{':A'} = 'Ä'; - $vars{'oA'} = 'Å'; - $vars{'AE'} = 'Æ'; - $vars{',C'} = 'Ç'; - $vars{'`E'} = 'È'; - $vars{"'E"} = 'É'; - $vars{'^E'} = 'Ê'; - $vars{':E'} = 'Ë'; - $vars{'`I'} = 'Ì'; - $vars{"'I"} = 'Í'; - $vars{'^I'} = 'Î'; - $vars{':I'} = 'Ï'; - $vars{'-D'} = 'Ð'; - $vars{'~N'} = 'Ñ'; - $vars{'`O'} = 'Ò'; - $vars{"'O"} = 'Ó'; - $vars{'^O'} = 'Ô'; - $vars{'~O'} = 'Õ'; - $vars{':O'} = 'Ö'; - #$vars{'mu'} = '×'; - $vars{'NU'} = 'Ø'; - $vars{'`U'} = 'Ù'; - $vars{"'U"} = 'Ú'; - $vars{'^U'} = 'Û'; - $vars{':U'} = 'Ü'; - #$vars{'??'} = 'Ý'; - $vars{'Th'} = 'Þ'; - $vars{'*b'} = 'ß'; - $vars{'`a'} = 'à'; - $vars{"'a"} = 'á'; - $vars{'^a'} = 'â'; - $vars{'~a'} = 'ã'; - $vars{':a'} = 'ä'; - $vars{'oa'} = 'å'; - $vars{'ae'} = 'æ'; - $vars{',c'} = 'ç'; - $vars{'`e'} = 'è'; - $vars{"'e"} = 'é'; - $vars{'^e'} = 'ê'; - $vars{':e'} = 'ë'; - $vars{'`i'} = 'ì'; - $vars{"'i"} = 'í'; - $vars{'^i'} = 'î'; - $vars{':i'} = 'ï'; - #$vars{'??'} = 'ð'; - $vars{'~n'} = 'ñ'; - $vars{'`o'} = 'ò'; - $vars{"'o"} = 'ó'; - $vars{'^o'} = 'ô'; - $vars{'~o'} = 'õ'; - $vars{':o'} = 'ö'; - $vars{'di'} = '÷'; - $vars{'nu'} = 'ø'; - $vars{'`u'} = 'ù'; - $vars{"'u"} = 'ú'; - $vars{'^u'} = 'û'; - $vars{':u'} = 'ü'; - #$vars{'??'} = 'ý'; - $vars{'th'} = 'þ'; - $vars{':y'} = 'ÿ'; - - # troff special characters and their closest equivalent - - $special{'em'} = '—'; - $special{'hy'} = '-'; - $special{'\-'} = '–'; # was - - $special{'bu'} = 'o'; - $special{'sq'} = '[]'; - $special{'ru'} = '_'; - $special{'14'} = '¼'; - $special{'12'} = '½'; - $special{'34'} = '¾'; - $special{'fi'} = 'fi'; - $special{'fl'} = 'fl'; - $special{'ff'} = 'ff'; - $special{'Fi'} = 'ffi'; - $special{'Fl'} = 'ffl'; - $special{'de'} = '°'; - $special{'dg'} = '†'; # was 182, para symbol - $special{'fm'} = "\\'"; - $special{'ct'} = '¢'; - $special{'rg'} = '®'; - $special{'co'} = '©'; - $special{'pl'} = '+'; - $special{'mi'} = '-'; - $special{'eq'} = '='; - $special{'**'} = '*'; - $special{'sc'} = '§'; - $special{'aa'} = '´'; # was ' - $special{'ga'} = '`'; # was ` - $special{'ul'} = '_'; - $special{'sl'} = '/'; - $special{'*a'} = 'a'; - $special{'*b'} = 'ß'; - $special{'*g'} = 'y'; - $special{'*d'} = 'd'; - $special{'*e'} = 'e'; - $special{'*z'} = 'z'; - $special{'*y'} = 'n'; - $special{'*h'} = 'th'; - $special{'*i'} = 'i'; - $special{'*k'} = 'k'; - $special{'*l'} = 'l'; - $special{'*m'} = 'µ'; - $special{'*n'} = 'v'; - $special{'*c'} = '3'; - $special{'*o'} = 'o'; - $special{'*p'} = 'pi'; - $special{'*r'} = 'p'; - $special{'*s'} = 's'; - $special{'*t'} = 't'; - $special{'*u'} = 'u'; - $special{'*f'} = 'ph'; - $special{'*x'} = 'x'; - $special{'*q'} = 'ps'; - $special{'*w'} = 'o'; - $special{'*A'} = 'A'; - $special{'*B'} = 'B'; - $special{'*G'} = '|\\u_\\d'; - $special{'*D'} = '/\'; - $special{'*E'} = 'E'; - $special{'*Z'} = 'Z'; - $special{'*Y'} = 'H'; - $special{'*H'} = 'TH'; - $special{'*I'} = 'I'; - $special{'*K'} = 'K'; - $special{'*L'} = 'L'; - $special{'*M'} = 'M'; - $special{'*N'} = 'N'; - $special{'*C'} = 'Z'; - $special{'*O'} = 'O'; - $special{'*P'} = '||'; - $special{'*R'} = 'P'; - $special{'*S'} = 'S'; - $special{'*T'} = 'T'; - $special{'*U'} = 'Y'; - $special{'*F'} = 'PH'; - $special{'*X'} = 'X'; - $special{'*Q'} = 'PS'; - $special{'*W'} = 'O'; - $special{'ts'} = 's'; - $special{'sr'} = 'v/'; - $special{'rn'} = '\\u–\\d'; # was 175 - $special{'>='} = '>='; - $special{'<='} = '<='; - $special{'=='} = '=='; - $special{'~='} = '~='; - $special{'ap'} = '~'; # was ~ - $special{'!='} = '!='; - $special{'->'} = '->'; - $special{'<-'} = '<-'; - $special{'ua'} = '^'; - $special{'da'} = 'v'; - $special{'mu'} = '×'; - $special{'di'} = '÷'; - $special{'+-'} = '±'; - $special{'cu'} = 'U'; - $special{'ca'} = '^'; - $special{'sb'} = '('; - $special{'sp'} = ')'; - $special{'ib'} = '(='; - $special{'ip'} = '=)'; - $special{'if'} = 'oo'; - $special{'pd'} = '6'; - $special{'gr'} = 'V'; - $special{'no'} = '¬'; - $special{'is'} = 'I'; - $special{'pt'} = '~'; - $special{'es'} = 'Ø'; - $special{'mo'} = 'e'; - $special{'br'} = '|'; - $special{'dd'} = '‡'; # was 165, yen - $special{'rh'} = '=>'; - $special{'lh'} = '<='; - $special{'or'} = '|'; - $special{'ci'} = 'O'; - $special{'lt'} = '('; - $special{'lb'} = '('; - $special{'rt'} = ')'; - $special{'rb'} = ')'; - $special{'lk'} = '|'; - $special{'rk'} = '|'; - $special{'bv'} = '|'; - $special{'lf'} = '|'; - $special{'rf'} = '|'; - $special{'lc'} = '|'; - $special{'rc'} = '|'; - - # Not true troff characters but very common typos - $special{'cp'} = '©'; - $special{'tm'} = '®'; - $special{'en'} = '-'; - - # Build a list of directories containing man pages - @manpath = (); - if (open(MPC, "/etc/manpath.config") || open(MPC, "/etc/man.config")) - { - while (<MPC>) - { - if (m/^(MANDB_MAP|MANPATH)\s+(\S+)/) - { - push(@manpath, $2); - } - } - } - @manpath = split(/:/, $ENV{'MANPATH'}) unless (@manpath); - @manpath = ("/usr/man") unless (@manpath); -} - -# Search through @manpath and construct @mandirs (non-empty subsections) -sub loadManDirs -{ - return if (@mandirs); - print STDERR "Searching ",join(":", @manpath)," for mandirs\n" unless($cgiMode); - foreach $tld (@manpath) - { - $tld =~ m/^(.*)$/; - $tld = $1; # untaint manpath - if (opendir(DIR, $tld)) - { - # foreach $d (<$tld/man[0-9a-z]*>) - foreach $d (sort readdir(DIR)) - { - if ($d =~ m/^man\w/ && -d "$tld/$d") - { - push (@mandirs, "$tld/$d"); - } - } - closedir DIR; - } - } -} - -##### Utility to search manpath for a given command ##### - -sub findPage -{ - $request = $_[0]; - $request =~ s,^/,,; - @multipleMatches = (); - - $file = $_[0]; - return $file if (-f $file || -f "$file.gz" || -f "$file.bz2"); - - # Search the path for the requested man page, which may be of the form: - # "/usr/man/man1/ls.1", "ls.1" or "ls". - ($page,$sect) = ($request =~ m/^(.+)\.([^.]+)$/); - $sect = "\L$sect"; - - # Search the specified section first (if specified) - if ($sect) - { - foreach $md (@manpath) - { - $dir = $md; - $file = "$dir/man$sect/$page.$sect"; - push(@multipleMatches, $file) if (-f $file || -f "$file.gz" || -f "$file.bz2"); - } - } - else - { - $page = $request; - } - if (@multipleMatches == 1) - { - return pop @multipleMatches; - } - - # If not found need to search through each directory - loadManDirs(); - foreach $dir (@mandirs) - { - ($s) = ($dir =~ m/man([0-9A-Za-z]+)$/); - $file = "$dir/$page.$s"; - push(@multipleMatches, $file) if (-f $file || -f "$file.gz" || -f "$file.bz2"); - $file = "$dir/$request"; - push(@multipleMatches, $file) if (-f $file || -f "$file.gz" || -f "$file.bz2"); - if ($sect && "$page.$sect" ne $request) - { - $file = "$dir/$page.$sect"; - push(@multipleMatches, $file) if (-f $file || -f "$file.gz" || -f "$file.bz2"); - } - } - if (@multipleMatches == 1) - { - return pop @multipleMatches; - } - if (@multipleMatches > 1) - { - return ""; - } - # Ok, didn't find it using section numbers. Perhaps there's a page with the - # right name but wrong section number lurking there somewhere. (This search is slow) - # eg. page.1x in man1 (not man1x) directory - foreach $dir (@mandirs) - { - opendir(DIR, $dir); - foreach $f (readdir DIR) - { - if ($f =~ m/^$page\./) - { - $f =~ s/\.(gz|bz2)$//; - push(@multipleMatches, "$dir/$f"); - } - } - } - if (@multipleMatches == 1) - { - return pop @multipleMatches; - } - return ""; -} - -sub loadPerlPages -{ - my ($dir,$f,$name,@files); - loadManDirs(); - return if (%perlPages); - foreach $dir (@mandirs) - { - if (opendir(DIR, $dir)) - { - @files = sort readdir DIR; - foreach $f (@files) - { - next if ($f eq "." || $f eq ".." || $f !~ m/\./); - next unless ("$dir/$f" =~ m/perl/); - $f =~ s/\.(gz|bz2)$//; - ($name) = ($f =~ m,(.+)\.[^.]*$,); - $perlPages{$name} = "$dir/$f"; - } - closedir DIR; - } - } - delete $perlPages{'perl'}; # too ubiquitous to be useful -} - -sub fmtTime -{ - my $time = $_[0]; - my @days = qw (Sun Mon Tue Wed Thu Fri Sat); - my @months = qw (Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); - my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$istdst) = localtime($time); - return sprintf ("%s, %02d %s %4d %02d:%02d:%02d GMT", - $days[$wday],$mday,$months[$mon],1900+$year,$hour,$min,$sec); -} - diff --git a/dist-tools/shipper/COPYING b/dist-tools/shipper/COPYING deleted file mode 100644 index d60c31a9..00000000 --- a/dist-tools/shipper/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/dist-tools/shipper/Makefile b/dist-tools/shipper/Makefile deleted file mode 100644 index 1e6f6896..00000000 --- a/dist-tools/shipper/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Makefile for the shipper project - -VERS=$(shell sed <shipper.spec -n -e '/Version: \(.*\)/s//\1/p') - -MANDIR=$(DESTDIR)/usr/share/man/man1 -BINDIR=$(DESTDIR)/usr/bin - -DOCS = README COPYING shipper.xml rpm2lsm.xml shipper.1 rpm2lsm.1 -SOURCES = shipper buildrpms rpm2lsm Makefile $(DOCS) shipper.spec - -all: shipper-$(VERS).tar.gz - -install: shipper.1 rpm2lsm.1 - cp shipper buildrpms rpm2lsm $(BINDIR) - gzip <shipper.1 >$(MANDIR)/shipper.1.gz - gzip <rpm2lsm.1 >$(MANDIR)/rpm2lsm.1.gz - -shipper.1: shipper.xml - xmlto man shipper.xml -shipper.html: shipper.xml - xmlto html-nochunks shipper.xml - -rpm2lsm.1: rpm2lsm.xml - xmlto man rpm2lsm.xml -rpm2lsm.html: rpm2lsm.xml - xmlto html-nochunks rpm2lsm.xml - -shipper-$(VERS).tar.gz: $(SOURCES) - @mkdir shipper-$(VERS) - @cp $(SOURCES) shipper-$(VERS) - @tar -czf shipper-$(VERS).tar.gz shipper-$(VERS) - @rm -fr shipper-$(VERS) - -dist: shipper-$(VERS).tar.gz - -release: shipper-$(VERS).tar.gz shipper.html rpm2lsm.html - shipper -f; rm CHANGES ANNOUNCE* *.html *.lsm *.1 - diff --git a/dist-tools/shipper/README b/dist-tools/shipper/README deleted file mode 100644 index c06f813a..00000000 --- a/dist-tools/shipper/README +++ /dev/null @@ -1,7 +0,0 @@ - README for shipper - -shipper automates the tedious process of shipping a software release to -several standard places, including ibiblio, the Red Hat submission directory, -and your own hosted website. It also knows how to post a release announcement -to freshmeat.net via freshmeat-submit. Two auxiliary tools, buildrpms and -rpm2lsm, build RPMs and generate LSM files from them respectively. diff --git a/dist-tools/shipper/buildrpms b/dist-tools/shipper/buildrpms deleted file mode 100755 index 11b3ddfd..00000000 --- a/dist-tools/shipper/buildrpms +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Build RPMs from the source in the current directory. This script sets -# up an RPM "_topdir" and builds the RPMs under there, then copies the -# binary and source RPMs to the current directory. -# -# Written by Sean Reifschneider <jafo-rpms@tummy.com>, 2003 - -TARBALL=$1 # tarball to build from - -# set up temporary directory -TMPDIR=`pwd`/rpm-build.$$ -[ ! -z "$TMPDIR" -a "$TMPDIR" != / ] && rm -rf "$TMPDIR" -mkdir -p "$TMPDIR"/BUILD -mkdir -p "$TMPDIR"/RPMS -mkdir -p "$TMPDIR"/SOURCES -mkdir -p "$TMPDIR"/SPECS -mkdir -p "$TMPDIR"/SRPMS - -# set up rpmmacros file -MACROFILE="$TMPDIR"/rpmmacros -RCFILE="$TMPDIR"/rpmrc -sed "s|~/.rpmmacros|$MACROFILE|" /usr/lib/rpm/rpmrc >"$RCFILE" -echo "%_topdir $TMPDIR" >"$MACROFILE" -echo "%_topdir $TMPDIR" >"$MACROFILE" - -ARCH=--target=$(uname -m) - -# build RPMs -rpmbuild --rcfile "$RCFILE" $ARCH -ta $TARBALL \ -|| rpm --rcfile "$RCFILE" $ARCH -ta $TARBALL -status=$? - -if [ $status = '0' ] -then - # move RPMs to this directory - mv "$TMPDIR"/RPMS/*/*.rpm . - mv "$TMPDIR"/SRPMS/*.rpm . -fi - -# clean up build directory -[ ! -z "$TMPDIR" -a "$TMPDIR" != / ] && rm -rf "$TMPDIR" - -exit $status diff --git a/dist-tools/shipper/rpm2lsm b/dist-tools/shipper/rpm2lsm deleted file mode 100755 index 6a05d6c7..00000000 --- a/dist-tools/shipper/rpm2lsm +++ /dev/null @@ -1,108 +0,0 @@ -#/bin/sh -# -# rpm2lsm -- generate Linux Software Map file from RPM meta information -# -# Author: Eric S. Raymond <esr@thyrsus.com>, 31 July 2002 -# Project page: http://www.catb.org/~esr/ -# -# Requires fmt(1), awk(1), and rpm(8). - -while getopts a:m:k:p: c; -do - case $c in - 'a') author=$OPTARG;; - 'm') maintainer=$OPTARG;; - 'k') keywords=$OPTARG;; - 'p') platforms=$OPTARG;; - '?') echo "rpm2lsm: invalid switch specified - aborting."; exit 1;; - esac -done -shift `expr $OPTIND - 1` - -# If no RPM was given, look in the current directory and pick the last -# one in sort order. That's likely to be the most recent. -if [ -z "$1" ] -then - set -- *.rpm - while [ "$2" ] - do - shift - done -fi - -# Mine out all the single-token fields we'll need -rpm=$1 -set -- `rpm --queryformat="%{name} %{version} %{release}" -qp $rpm` -name=$1 -version=$2 -release=$3 - -# Extract and reformat the desciption -description=`rpm --queryformat="%{description}" -qp $rpm | fmt -w 65 | sed '2,$s/^/ /'` - -# Who am I? -fullname=`cat /etc/passwd | awk -F : "/^${USER}/ "'{print $5}'` -fullname="${USER}@${HOSTNAME} ($fullname)" - -if [ -z "$author" ] -then - if [ -f AUTHORS ] - then - author=`cat AUTHORS` - else - author=$fullname - fi -fi - -# Fill in keywords if present -if [ -n "$keywords" ] -then - keywords="Keywords: $keywords\n" -fi - -# Default the maintainer field properly -if [ -z "$maintainer" ] -then - maintainer=`rpm --queryformat="%{packager}" -qp $rpm` - if [ "$maintainer" = "(none)" ] - then - maintainer=$author - fi -fi - -# The date -date=`date '+%Y-%m-%d'` - -cat >/usr/tmp/rpm2lsm.$$ <<EOF -Begin3 -Title: %{name} -Version: %{version} -Entered-date: ${date} -Description: ${description} -${keywords}Author: ${author} -Maintained-by: ${maintainer} -Primary-site: %{url} -EOF - -# File patterns that we ship -tarballs="${name}-${version}.tar.gz ${name}-${version}.tgz" -rpms=${name}-${version}-${release}.*.rpm - -trap "rm -f /usr/tmp/rpm2lsm.$$" 0 2 15 -for file in $tarballs $rpms -do - if [ -f $file ] - then - set -- `du $file`; size=$1 - echo " ${size} ${file}" >>/usr/tmp/rpm2lsm.$$ - fi -done - -cat >>/usr/tmp/rpm2lsm.$$ <<EOF -Platforms: ${platforms:-All} -Copying-policy: %{license} -End -EOF - -format=`cat /usr/tmp/rpm2lsm.$$` -rpm --queryformat="$format" -qp $rpm diff --git a/dist-tools/shipper/rpm2lsm.1 b/dist-tools/shipper/rpm2lsm.1 deleted file mode 100644 index d11df03e..00000000 --- a/dist-tools/shipper/rpm2lsm.1 +++ /dev/null @@ -1,95 +0,0 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "RPM2LSM" 1 "" "" "" -.SH NAME -rpm2lsm \- generate Linux Software Map entries from RPMs -.SH "SYNOPSIS" - -.nf -\fBrpm2lsm\fR [-a \fIauthor\fR] [-k \fIkeywords\fR] [-p \fIplatforms\fR] [-m \fImaintainer\fR] - \fIrpmfile\fR -.fi - -.SH "DESCRIPTION" - -.PP -This tool extracts tag information from an RPM file to generate a Linux Software Map (version 3) entry on standard output. Command-line switches support adding LSM fields that have no equivalents in RPMs. Here are the field-generation rules: - -.TP -Title: -Taken straight from the RPM Name field. - -.TP -Version: -Taken straight from the RPM Version field. - -.TP -Entered-Date: -LSM-generation time in YYYY-MM-DD format. - -.TP -Description: -Taken straight from the RPM Description field. - -.TP -Keywords: -Taken from the value of the \fB-k\fR command-line option. If no such option is given, it is omitted. - -.TP -Author: -Taken from the value of the \fB-a\fR command-line option. If no such option is given, it looks for an AUTHORS file in the current directory (GNU convention) and uses that. If no AUTHORS file is present, your email addess and full name from the password file - -.TP -Maintained-By: -Taken from the value of the \fB-m\fR command-line option. If that was not given, taken from the RPM Packager field. If that was not given, fill in the Author name. - -.TP -Primary-Site: -The first (site) line is taken from the RPM URL field. Second and subsequent lines list tarballs and RPMs that match on name, version number, and release number with the RPM algument. For each file, size in 1K blocks is filled in. - -.TP -Alternate-Site: -This field is not generated. - -.TP -Original-Site: -This field is not generated. - -.TP -Platforms: -Taken from the value of the \fB-p\fR command-line option. If no such option is given, 'All' is filled in. - -.TP -Copying-Policy: -Taken straight from the RPM License field. - -.PP -These are all the fields supported in LSM version 3. You can see the : LSM template http://ibiblio.org/pub/Linux/LSM-TEMPLATE for full details. - -.SH "AUTHOR" - -.PP -Eric S. Raymond <esr@thyrsus.com>. For updates, see : http://www.catb.org/~esr/software.htmlhttp://www.catb.org/~esr/software.html. - -.SH "SEE ALSO" - -.PP -\fBrpm\fR(8). - diff --git a/dist-tools/shipper/rpm2lsm.xml b/dist-tools/shipper/rpm2lsm.xml deleted file mode 100644 index 6856cbab..00000000 --- a/dist-tools/shipper/rpm2lsm.xml +++ /dev/null @@ -1,135 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<refentry id='rpm2lsm.1'> -<refmeta> -<refentrytitle>rpm2lsm</refentrytitle> -<manvolnum>1</manvolnum> -</refmeta> -<refnamediv id='name'> -<refname>rpm2lsm</refname> -<refpurpose>generate Linux Software Map entries from RPMs</refpurpose> -</refnamediv> -<refsynopsisdiv id='synopsis'> - -<cmdsynopsis> - <command>rpm2lsm</command> - <arg choice='opt'>-a <replaceable>author</replaceable></arg> - <arg choice='opt'>-k <replaceable>keywords</replaceable></arg> - <arg choice='opt'>-p <replaceable>platforms</replaceable></arg> - <arg choice='opt'>-m <replaceable>maintainer</replaceable></arg> - <arg choice='plain'><replaceable>rpmfile</replaceable></arg> -</cmdsynopsis> - -</refsynopsisdiv> - -<refsect1 id='description'><title>DESCRIPTION</title> -<para>This tool extracts tag information from an RPM file to generate a -Linux Software Map (version 3) entry on standard output. Command-line -switches support adding LSM fields that have no equivalents in RPMs. -Here are the field-generation rules:</para> -<variablelist remap='TP'> -<varlistentry> -<term>Title:</term> -<listitem> -<para>Taken straight from the RPM Name field.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Version:</term> -<listitem> -<para>Taken straight from the RPM Version field.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Entered-Date:</term> -<listitem> -<para>LSM-generation time in YYYY-MM-DD format.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Description:</term> -<listitem> -<para>Taken straight from the RPM Description field.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Keywords:</term> -<listitem> -<para>Taken from the value of the <option>-k</option> command-line option. -If no such option is given, it is omitted.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Author:</term> -<listitem> -<para>Taken from the value of the <option>-a</option> command-line -option. If no such option is given, it looks for an AUTHORS file in -the current directory (GNU convention) and uses that. If no AUTHORS -file is present, your email addess and full name from the password -file</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Maintained-By:</term> -<listitem> -<para>Taken from the value of the <option>-m</option> command-line -option. If that was not given, taken from the RPM Packager field. -If that was not given, fill in the Author name.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Primary-Site:</term> -<listitem> -<para>The first (site) line is taken from the RPM URL field. Second -and subsequent lines list tarballs and RPMs that match on name, version -number, and release number with the RPM algument. For each file, -size in 1K blocks is filled in. -</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Alternate-Site:</term> -<listitem> -<para>This field is not generated.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Original-Site:</term> -<listitem> -<para>This field is not generated.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Platforms:</term> -<listitem> -<para>Taken from the value of the <option>-p</option> command-line option. -If no such option is given, 'All' is filled in.</para> -</listitem> -</varlistentry> -<varlistentry> -<term>Copying-Policy:</term> -<listitem> -<para>Taken straight from the RPM License field.</para> -</listitem> -</varlistentry> -</variablelist> - -<para>These are all the fields supported in LSM version 3. You can see the -<ulink url='http://ibiblio.org/pub/Linux/LSM-TEMPLATE'> -LSM template -</ulink> -for full details.</para> -</refsect1> - -<refsect1 id='author'><title>AUTHOR</title> -<para>Eric S. Raymond <email>esr@thyrsus.com</email>. -For updates, see <ulink url="http://www.catb.org/~esr/software.html"> -http://www.catb.org/~esr/software.html</ulink>.</para> -</refsect1> - -<refsect1 id='see_also'><title>SEE ALSO</title> -<para><citerefentry><refentrytitle>rpm</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> -</refsect1> -</refentry> - diff --git a/dist-tools/shipper/shipper b/dist-tools/shipper/shipper deleted file mode 100755 index 9d5ce1b3..00000000 --- a/dist-tools/shipper/shipper +++ /dev/null @@ -1,583 +0,0 @@ -#!/usr/bin/env python -# -# shipper -- a tool for shipping software - -import sys, os, readline, re, commands, time, glob, optparse, stat - -# -# State variables -# -destinations = [] # List of remote directories to update -channels = ['ibiblio', 'redhat', 'freshmeat'] -whoami = None # Who am I? (Used for FTP logins) -date = None # User has not yet set a date -package = None # Nor a package name -homepage = None # Nor a home page -arch = None # The machine architecture -keywords = None # Keywords for LSMs -freshmeat_name = None # Name of the project ob Freshmeat -changelog = None # Project changelog -lastchange = None # Last entry in changelog -summary = None # One-line summary of the package -description = None # Nor a description - -indextemplate = """ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' - 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'> -<html> -<head> -<link rel='stylesheet' href='/~esr/sitestyle.css' type='text/css' /> -<meta name='description' content='Resource page for %(package)s' /> -<meta name='generator' content='shipper' /> -<meta name='MSSmartTagsPreventParsing' content='TRUE' /> -<title>Resource page for %(package)s %(version)s</title> -</head> -<body> - -<h1>Resource page for %(package)s %(version)s</td></h1> - -<p>%(description)s</p> - -<br /> -%(resourcetable)s -<br /> - -<p>Last modified %(date)s.</p> - -</div> -</body> -</html> -""" -mailtemplate = """Subject: Announcing release %(version)s of %(package)s - -Release %(version)s of %(package)s is now available at: - - %(homepage)s - -Here are the most recent changes: - -%(lastchange)s --- - shipper, acting for %(whoami)s -""" - -# It's unpleasant that we have to include these here, but -# the freshmeat release focus has to be validated even if the -# user is offline and the XML-RPC service not accessible. -freshmeat_focus_types = ( -"N/A", -"Initial freshmeat announcement", -"Documentation", -"Code cleanup", -"Minor feature enhancements", -"Major feature enhancements", -"Minor bugfixes", -"Major bugfixes", -"Minor security fixes", -"Major security fixes", -) - -def croak(msg): - sys.stderr.write("shipper: " + msg + "\n") - sys.exit(1) - -# -# Shipping methods -# - -def do_or_die(cmd): - "Wither execute a command or fail noisily" - if options.verbose: - print "***", cmd - if os.system(cmd): - croak("command '%s' failed!" % cmd) - -def upload_or_die(cmd): - if options.noupload: - print cmd - else: - do_or_die(cmd) - -def upload(destination, files): - # Upload a file via ftp or sftp, handles - print "# Uploading to %s" % destination - files = filter(os.path.exists, files) - if destination.startswith("ftp://"): - destination = destination[6:].split("/") - host = destination.pop(0) - directory = "/".join(destination) - commands = ["lftp", "open -u anonymous," + whoami + " " + host + "\n"] - if directory: - commands.append("cd " + directory + "\n") - commands.append("mput " + " ".join(files) + "\n") - commands.append("close\n") - if options.noupload: - print "".join(commands) - else: - pfp = os.popen(commands.pop(0), "w") - pfp.writelines(commands) - pfp.close() - elif destination.find("::") > -1: - upload_or_die("rsync " + " ".join(files) + " " + destination) - elif destination.find(":") > -1: - (host, directory) = destination.split(":") - for file in files: - # This is a really ugly way to deal with the problem - # of write-protected files in the remote directory. - # Unfortunately, sftp(1) is rather brain-dead -- no - # way to ignore failure on a remove, and refuses to - # do renames with an obscure error message. - remote = os.path.join(directory, package, file) - upload_or_die("scp " + file + " " + host + ":" + remote+".new;") - upload_or_die("ssh %s 'mv -f %s.new %s'" % (host, remote, remote)) - else: - sys.stderr.write("Don't know what to do with destination %s!") - -def freshmeat_ship(manifest): - "Ship a specified update to freshmeat." - if options.verbose: - print "Announcing to freshmeat..." - upload_or_die("freshmeat-submit <" + manifest[0]) - -# -# Metadata extraction -# - -def grep(pattern, file): - "Mine for a specified pattern in a file." - fp = open(file) - try: - while True: - line = fp.readline() - if not line: - return None - m = re.search(pattern, line) - if m: - return m.group(1) - finally: - fp.close() - return None - -class Specfile: - def __init__(self, filename): - self.filename = filename - self.type = None - if filename.endswith(".spec"): - self.type = "RPM" - self.package = self.extract("Name") - self.version = self.extract("Version") - self.homepage = self.extract("URL") - self.summary = self.extract("Summary") - self.arch = self.extract("BuildArch") or commands.getoutput("rpm --showrc | sed -n '/^build arch/s/.* //p'") - self.description = self.rpm_get_multiline("description") - self.changelog = self.rpm_get_multiline("changelog") - elif filename == "control": - self.type = "deb" - self.name = self.extract("Package") - self.version = self.extract("Version").split("-")[0] - self.homepage = self.extract("XBS-Home-Page") - self.summary = self.extract("Description") - self.arch = self.extract("Architecture") - if not self.arch: - croak("this control file lacks an Architecture field") - # FIXME: parse Debian description entries and changelog file - self.description = self.changelog = None - def extract(self, fld): - "Extract a one-line field, possibly embedded as a magic comment." - if self.type == "RPM": - return grep("^#?"+fld+":\s*(.*)", self.filename) - elif self.type == "deb": - return grep("^(?:XBS-)?"+fld+": (.*)", self.filename) - def rpm_get_multiline(self, fieldname): - "Grab everything from leader line to just before the next leader line." - global desc - fp = open(self.filename) - desc = "" - gather = False - while True: - line = fp.readline() - if not line: - break - # Pick up fieldnames *without* translation options. - if line.strip() == "%" + fieldname: - gather = True - continue - elif line[0] == "%": - gather = False - if gather: - desc += line - fp.close() - if desc: - return desc.strip() + "\n" - else: - return None -# -# Main sequence -# - -try: - # - # Process options - # - - parser = optparse.OptionParser(usage="%prog: [-h] [-n] [-f] [-v]") - parser.add_option("-v", "--verbose", - action="store_true", dest="verbose", default=False, - help="print progress messages to stdout") - parser.add_option("-n", "--noupload", - action="store_true", dest="noupload", default=False, - help="don't do uploads, just build deliverables") - parser.add_option("-N", "--nobuild", - action="store_true", dest="nobuild", default=False, - help="dump configuration only, no builds or uploads") - parser.add_option("-f", "--force", - action="store_true", dest="force", default=False, - help="force rebuilding of all local deliverables") - (options, args) = parser.parse_args() - - # - # Extract metadata and compute control information - # - - def disable(s): channels.remove(s) - - # Security check, don't let an attacker elevate privileges - def securecheck(file): - if stat.S_IMODE(os.stat(file).st_mode) & 00002: - croak("%s must not be world-writeable!" % file) - - # Read in variable overrides - securecheck(".") - home_profile = os.path.join(os.getenv('HOME'), ".shipper") - if os.path.exists(home_profile): - securecheck(home_profile) - execfile(home_profile) - here_profile = ".shipper" - if os.path.exists(here_profile): - securecheck(here_profile) - execfile(here_profile) - - # Set various sensible defaults - if not whoami: - whoami = os.getenv('USERNAME') + "@" + os.getenv('HOSTNAME') - - # Where to get the metadata - specfiles = glob.glob("*.spec") - if len(specfiles) == 1: - metadata = Specfile(specfiles[0]) - elif os.path.exists("control"): - metadata = Specfile("control") - else: - croak("must be exactly one RPM or dpkg specfile in the directory!") - - # Get the package name - if not package: - package = metadata.package - if not package: - croak("can't get package name!") - - # Extract the package vers from the specfile or Makefile - specvers = metadata.version - makevers = None - if os.path.exists("Makefile"): - makevers = grep("^VERS[A-Z]* *= *(.*)", "Makefile") - # Maybe it's a shell command intended to extract version from specfile - if makevers and makevers[0] == '$': - makevers = commands.getoutput(makevers[7:-1]) - if specvers != makevers: - croak("specfile version %s != Makefile version %s"%(specvers,makevers)) - elif specvers == None: - croak("can't get package version") - elif specvers[0] not in "0123456789": - croak("package version %s appears garbled" % specvers) - else: - version = specvers - - # Specfiles may set their own destinations - local_destinations = metadata.extract("Destinations") - if local_destinations: - local_destinations = map(lambda x: x.strip(), local_destinations.split(",")) - destinations += local_destinations - if not destinations: - print "warning: destinations empty, shipping to public channels only." - - print"# Uploading version %s of %s" % (version, package) - - # Extract remaining variables for templating - if not homepage: - homepage = metadata.homepage - if not date: - date = time.asctime() - if not summary: - summary = metadata.summary - if not description: - description = metadata.description - if not arch: - arch = metadata.arch - if not keywords: - keywords = metadata.extract("Keywords") - if not freshmeat_name: - freshmeat_name = metadata.extract("Freshmeat-Name") - - # Finally, derive the change log and lastchange entry; - # we'll need the latter for freshmeat.net - freshmeat_lastchange = lastchange = changelog = None - # ChangeLog, if present, takes precedence; - # we assume if both are present that the specfile log is about packaging. - if os.path.exists("ChangeLog"): - ifp = open("ChangeLog", "r") - changelog = ifp.read() - ifp.close() - lastchange = "" - for line in changelog.split("\n"): - while line.strip() or not "*" in lastchange: - lastchange += line + "\n" - else: - break - # freshmeat.net doesn't like bulleted items in a changes field. - freshmeat_lastchange = "See the ChangeLog file for recent changes." - elif metadata.changelog: - changelog = metadata.changelog - lastchange = "" - for line in changelog.split("\n"): - if not lastchange and (not line.strip() or line[0] == '*'): - continue - elif line.strip(): - lastchange += line + "\n" - else: - break - # This usually produces a lastchange entry that freshmeat will take. - freshmeat_lastchange = lastchange - - # - # Now compute the names of deliverables - # - - # These are all potential deliverable files that include the version number - tarball = package + "-" + version + ".tar.gz" - srcrpm = package + "-" + version + "-1.src.rpm" - binrpm = package + "-" + version + "-1." + arch + ".rpm" - zip = package + "-" + version + ".zip" - lsm = package + "-" + version + ".lsm" - - # Map web deliverables to explanations for the resource table - # Stuff not included here: ANNOUNCE.EMAIL, ANNOUNCE.FRESHMEAT, lsm. - stock_deliverables = [ - ("README", "roadmap file"), - (tarball, "source tarball"), - (zip, "ZIP archive"), - (binrpm, "installable RPM"), # Generated - (srcrpm, "source RPM"), # Generated - ("ChangeLog", "change log"), - ("CHANGES", "change log"), # Generated - ("NEWS", "Project news"), - ("HISTORY", "Project history"), - ("BUGS", "Known bugs"), - ("TODO", "To-do file"), - ] - - # - # Might be time to dump - # - if options.nobuild: - for variable in ('destinations', 'channels', 'whoami', 'date', - 'package', 'homepage', 'arch', 'keywords', \ - 'freshmeat_name', 'summary'): - print "%s = %s" % (variable, `eval(variable)`) - for variable in ('description', 'changelog', 'lastchange', 'mailtemplate', 'indextemplate'): - if not eval(variable): - print "No %s" % variable - else: - print "%s = <<EOF\n%sEOF" % (variable, eval(variable)) - sys.exit(0) - # - # Build deliverables - # - - suppress = " >/dev/null 2>&1" - if options.verbose: - suppress = "" - - # Sanity checks - if not os.path.exists(tarball): - croak("no tarball %s!" % tarball) - if metadata.type == "RPM" and not metadata.extract("BuildRoot"): - croak("specfile %s doesn't have a BuildRoot!" % metadata.filename) - - def newer(f1, f2): - return os.path.exists(f1) and (os.stat(f1).st_mtime > os.stat(f2).st_mtime) - - # Compute the deliverables, we need this even if not rebuilding the index - web_deliverables = [] - # Anything in the list of standard deliverables is eligible. - for (file, explanation) in stock_deliverables: - if os.path.exists(file): - web_deliverables.append((file, explanation)) - # So is anything with an HTML extendion - for file in glob.glob('*.html'): - if file == 'index.html': - continue - stem = file[:-4] - for ext in ("man", "1", "2", "3", "4", "5", "6", "7", "8", "9", "xml"): - if os.path.exists(stem + ext): - explanation = "HTML rendering of " + stem + ext - break - else: - explanation = "HTML page." - web_deliverables.append((file, explanation)) - # Compute final deliverables - deliverables = map(lambda x: x[0], web_deliverables)+["index.html"] - - try: - delete_at_end = [] - - # RPMs first. - if options.force or \ - (not os.path.exists(binrpm) or not os.path.exists(srcrpm)): - print "# Building RPMs..." - if newer(srcrpm, tarball) and newer(binrpm, tarball): - print "RPMs are up to date" - else: - do_or_die("buildrpms %s %s" % (tarball, suppress)) - delete_at_end.append(srcrpm) - delete_at_end.append(binrpm) - - # Next, the LSM if needed - if 'ibiblio' in channels and \ - (options.force or not os.path.exists(lsm)): - print "# Building LSM..." - if keywords: - do_or_die("rpm2lsm -k '"+keywords+"' "+binrpm+" >"+lsm) - else: - print "# Warning: LSM being built with no keywords." - do_or_die("rpm2lsm " + binrpm + ">" + lsm) - delete_at_end.append(lsm) - - # Next the index page if it doesn't exist. - if homepage and (options.force or not os.path.exists("index.html")): - print "# Building index page..." - # Now build the resource table - resourcetable = '<table border="1" align="center" summary="Downloadable resources">\n' - for (file, explanation) in web_deliverables: - resourcetable += "<tr><td><a href='%s'>%s</a></td><td>%s</td></tr>\n" % (file,file,explanation) - resourcetable += "</table>" - # OK, now build the index page itself - ofp = open("index.html", "w") - ofp.write(indextemplate % globals()) - ofp.close() - delete_at_end.append("index.html") - - # Next the CHANGES file. Build this only if (a) there is no ChangeLog, - # and (b) there is a specfile %changelog. - if not os.path.exists("ChangeLog") and \ - (options.force or not os.path.exists("CHANGES")) and changelog: - print "# Building CHANGES..." - ofp = open("CHANGES", "w") - ofp.write(" Changelog for " + package + "\n\n") - ofp.write(changelog) - ofp.close() - delete_at_end.append("CHANGES") - - # The freshmeat announcement - if 'freshmeat' in channels \ - and options.force or not os.path.exists("ANNOUNCE.FRESHMEAT"): - print "# Building ANNOUNCE.FRESHMEAT..." - if not homepage: - print "# Can't announce to freshmeat without a primary website!" - elif not lastchange: - print "# Can't announce to freshmeat without a changes field!" - else: - while True: - focus = raw_input("# freshmeat.net release focus (? for list): ") - if focus == '?': - i = 0 - for f in freshmeat_focus_types: - print "%d: %s" % (i, f) - i += 1 - elif focus in "0123456789": - print "# OK:", freshmeat_focus_types[int(focus)] - break - elif focus.lower() in map(lambda x: x.lower(), freshmeat_focus_types): - break - else: - croak("not a valid freshmeat.net release focus!") - ofp = open("ANNOUNCE.FRESHMEAT", "w") - ofp.write("Project: %s\n"%(freshmeat_name or package)) - ofp.write("Version: %s\n"% version) - ofp.write("Release-Focus: %s\n" % focus) - ofp.write("Home-Page-URL: %s\n" % homepage) - if os.path.exists(tarball): - ofp.write("Gzipped-Tar-URL: %s\n" % os.path.join(homepage,tarball)) - if os.path.exists(zip): - ofp.write("Zipped-Tar-URL: %s\n" % os.path.join(homepage, zip)) - if os.path.exists("CHANGES"): - ofp.write("Changelog-URL: %s\n" % os.path.join(homepage, "CHANGES")) - if os.path.exists(binrpm): - ofp.write("RPM-URL: %s\n" % os.path.join(homepage, binrpm)) - # freshmeat.net doesn't like bulleted entries. - freshmeatlog = lastchange[2:].replace("\n ", "\n") - ofp.write("\n" + freshmeatlog) - ofp.close() - delete_at_end.append("ANNOUNCE.FRESHMEAT") - - # Finally, email notification - if filter(lambda x: x.startswith("mailto:"), destinations) \ - and (options.force or not os.path.exists("ANNOUNCE.EMAIL")): - print "# Building ANNOUNCE.EMAIL..." - ofp = open("ANNOUNCE.EMAIL", "w") - ofp.write(mailtemplate % globals()) - ofp.close() - delete_at_end.append("ANNOUNCE.FRESHMEAT") - - # - # Now actually ship - # - - # Shipping methods, locations, and deliverables for public channels. - hardwired = { - 'freshmeat' : (lambda: freshmeat_ship(("ANNOUNCE.FRESHMEAT",))), - 'ibiblio' : (lambda: upload("ftp://ibiblio.org/incoming/linux", - (tarball, binrpm, srcrpm, lsm))), - 'redhat' : (lambda: upload("ftp://incoming.redhat.com/libc6", - (tarball, binrpm, srcrpm))), - } - - - # First ship to private channels. Order is important here, we - # need to hit the user's primary website first so everything - # will be in place when announcements are generated. - for destination in destinations: - if destination.startswith("ftp:"): - upload(destination, (tarball, binrpm, srcrpm,)) - elif destination.startswith("mailto:"): - print "# Mailing to %s" % destination - command = "sendmail -i -oem -f %s %s <ANNOUNCE.EMAIL" % (whoami, destination[7:]) - if options.noupload: - print command - else: - do_or_die(command) - else: - upload(destination, deliverables) - - # Now ship to public channels - for channel in channels: - print "# Shipping to public channel", channel - apply(hardwired[channel]) - finally: - cleanup = "rm -f " + " ".join(delete_at_end) - if options.noupload: - print cleanup - else: - for file in delete_at_end: - os.system(cleanup) - print "# Done" -except KeyboardInterrupt: - print "# Bye!" - - - -# The following sets edit modes for GNU EMACS -# Local Variables: -# mode:python -# End: diff --git a/dist-tools/shipper/shipper.1 b/dist-tools/shipper/shipper.1 deleted file mode 100644 index a2ca011d..00000000 --- a/dist-tools/shipper/shipper.1 +++ /dev/null @@ -1,294 +0,0 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "SHIPPER" 1 "" "" "" -.SH NAME - shipper \- automatic drop-shipping of project releases -.SH "SYNOPSIS" - -.nf -\fBshipper\fR [-h] [-n] [-N] [-f] [-v] -.fi - -.nf -\fBbuildrpms\fR {\fItarball\fR} -.fi - -.SH "DESCRIPTION" - -.PP -shipper is a tool for shipping project releases. Its job is to make it possible for you to run the command \fBshipper\fR in the top-level directory of a project and have a release be properly exported to all the places that you normally deliver it -- your personal website, Linux source code archive sites, and distribution submission queues. A second goal is to arrange your shipping process in such a way that metadata like your project version only have to be kept in one place and modified once per release. The overall goal is to reduce the friction cost of shipping releases to as near zero as possible. - -.PP -buildrpms is a helper script that builds source and binary RPMs from a specified tarball with a BuildRoot field. shipper also calls \fBrpm2lsm\fR(1) to do part of its work. - -.PP -As much as possible, shipper tries to deduce what it should do rather than requiring you to tell it. In order to do this, it relies on your project obeying standard GNU-like naming conventions. It also relies on being able to mine project metadata out of a package specfile. (Presently the only variety of package specfile supported is an RPM spec; this may change in the future, when we fully support shipping Debian packages.) - -.PP -In normal use, you need set only one configuration variable, which is the list of private destinations to ship to. You may also want to add some magic ``Keywords'' comments to your project specfiles. Once you have shipper up and running, you can experiment with more advanced features such as having the program generate project web pages for you. - -.SH "THEORY OF OPERATION" - -.PP -shipper pushes deliverables out to destinations. Deliverables include: source tarballs, source zip archives, source RPMs, binary RPMs, ChangeLog files, README files, LSM files, and various other project metadata files. Destinations include both private destinations like websites, FTP archive sites and mailing lists, and public channels like ibiblio, freshmeat.net, and the submission queues for various well-known operating-system distributions. The shipper framework is extensible and it is relatively easy to add new channel types and new deliverables; in the future, we hope to support (for example) Debian packages as deliverables and SourceForge as a channel. - -.PP -shipper's first step is to find the project name and version, then to check that the minimum set of files that shipper requires to continue is in place. To start with, shipper needs a source tarball and a specfile. Once it knows those are in place, it can extract various pieces of information it will need to do its real work. It also reads in a handful of configuration variables. The -N (nobuild) option causes it to dump all configuration values and stop there. - -.PP -The first real work that gets done is finding or building local deliverables. These are either generated deliverables (like RPMs) that can be rebuilt automatically, or or stock deliverables (like a README file) that have to be changed by hand. shipper rebuilds any generated deliverable that doesn't exist when it starts up. Building local deliverables is separated from uploading because it means that you can stop and inspect what you're going to ship before committing to an upload. - -.PP -The -n (noupload) option stops before uploading, leaving all local deliverables in place but displaying the exact upload commands that would have been used to ship them. The -f (force) option forces a rebuild of all generated deliverables, even those that already exist. The command \fBshipper -f -n\fR will show you exactly what shipper would do for a real upload. - -.PP -Once all local deliverables have been built, shipper can begin uploading files and posting announcements. It does private destinations first, then public channels. This means, for example, that if you give shipper your personal website as a destination, the website will get updated each time before any submissions or announcements are sent to public sites like ibiblio.org or freshmeat.net. - -.PP -When uploads are complete, shipper cleans up after itself by deleting any deliverables it created for this run. Deliverables that were found and up to date are not removed. - -.PP -Finally, note that shipper makes one important assumption about the structure of your website(s). Beneath each directory in your \fIdestinations\fR list, there will be one subdirectory for each project, with the directory leaf name being the same as the project. Thus, for example, if you have three projects named ruby, diamond and sapphire, and your personal site is at \fIgemstones.net:/public/www/precious/\fR, shipper will expect to be able to drop deliverables in three directories \fIgemstones.net:/public/www/precious/ruby\fR, \fIgemstones.net:/public/www/precious/diamond/\fR, and \fIgemstones.net:/public/www/precious/sapphire/\fR. Note that shipper will not create these project directories for you if they're missing; this is deliberate, so that uploads to sites that are not prepared for them will fail noisily. - -.SH "HOW SHIPPER DEDUCES WHAT TO DO" - -.PP -The behavior of shipper depends on a handful of internal variables. Some of these variables have defaults computed at startup time. All can be set or overridden in the per-user \fI~/.shipper\fR file, and overridden in any per-project \fI.shipper\fR file. Both files are Python code and the syntax of variable settings is Python's. - -.PP -If a variable is set in a config file, that value is locked in (except for the \fIdestinations\fR variable which can be appended to from a specfile, see below) Variables that are not set in a config file may be set by the values of fields in your project specfile. - -.PP -For basic use, it is only necessary to set one such variable: \fIdestinations\fR, the list of destinations to ship to. Normally you'll set this globally, pointing all your projects at your main distribution website, in your \fI~/.shipper\fR file; it is also possible to add destinations on a per-project basis by giving a comma-separated list in a #Destinations: comment in the specfile. You can set the variable in a per-project \fI.shipper\fR to ignore your global destination list. - -.PP -The first thing shipper looks for is a specfile in the current directory; there must be exactly one. It extracts the project name from the Name field. Next step is to find the project version (the variable \fIpackage\fR). This is extracted from the specfile, or by looking for a makefile macro with a name beginning with VERS; if the value of that macro is a shell command wrapped in $(shell ...), it is executed and the output is captured to yield the version. If both versions are present, they are consistency-checked. - -.PP -shipper gets most of the rest of the data it uses to decide what to do from headers in the specfile. The following table lists all the variables and their corresponding specfile fields. shipper uses the RPM spec file fields: the Debian entries are informational only. -VariableRPM specfile fieldDebian specfile fieldMeaning\fIdestinations\fR#Destinations:XBS-Destinations: -.PP -A list of remote directories to ship to using \fBscp\fR(1). Each location is a place to drop deliverables: either a [user@]site:path destination that \fBscp\fR(1) can use, or an FTP url that \fBlftp\fR(1) can use. Note that actual project directories are computed by appending the value of \fIpackage\fR to the destination you're shipping to. - -.PP -There is no default.. If you do not set this variable, shipper will ship only to public channels. -\fIchannels\fR-- -.PP -The list of public channels to be shipped to after the private channels in the \fIdestination\fR list. You can disable one or more of these in a config file by calling the function \fBdisable()\fR; for example with \fBdisable('freshmeat')\fR. -\fIwhoami\fR-- -.PP -A plausible email address for the user. If not specified in the config file, it's generated from \fB$USERNAME\fR and \fB$HOSTNAME\fR. -\fIdate\fR-- -.PP -The program's startup time. This can be used in the web page and email announcement templates. - -.PP -You can use the Python function time.strftime("...") in your \fI~/.shipper\fR file to format this date to your taste. If you don't set this in the config file, the program will set it for you. -\fIindextemplate\fR-- -.PP -Template HTML from which to generate index.html for shipping. There is a default which generates a very simple page containing a title, a date, and a table listing downloadable resources. This is used when shipping to a web directory, if no index page exists when shipper is run. -\fImailtemplate\fR-- -.PP -Template text from which to generate the file ANNOUNCE.EMAIL to be shipped to destinations that are mailto URLs. There is a default which generates a very simple email containing a subject, a pointer to the project web page, and the last entry in the project changelog. -\fIpackage\fRName:Package: -.PP -Project name, used to generate the stem part of the names of RPMs and other deliverables that shipper builds. If the specfile is a Debian control file, the Debian-specific part of the version number (after the dash) is removed. -\fIversion\fRVersion:Version: -.PP -Project version, used in generating the names of RPMs and other deliverables that shipper builds. -\fIhomepage\fRURL:XBS-Home-Page: -.PP -Project home page URL. Used when generating project announcements. -\fIarch\fRBuildArch:Architecture: -.PP -Build architecture. If this field is ``noarch'', noarch rather than binary RPMs will be built. -\fIkeywords\fR#Keywords:XBS-Keywords: -.PP -Topic keywords. Used when generating LSM files. -\fIfreshmeat_name\fR#Freshmeat-Name:XBS-Freshmeat-Name: -.PP -Freshmeat shortname, used in generating freshmeat.net announcements. If this isn't present, it defaults to the project name; you only need to set it if they differ. -\fIsummary\fRSummaryDescription: -.PP -The one-line project summary field from your specfile. -\fIdescription\fR%descriptionDescription: -.PP -The Description field from your specfile. -\fIchangelog\fRChangeLog or %changelog- -.PP -If a \fIChangeLog\fR file exists in the project directory, its entire contents. Otherwise, if it exists, the entire changelog section from the specfile. -\fIlastchange\fRChangeLog or %changelog- -.PP -If the source of your changlog was your specfile, this is the most recent entry from your changelog without its date/author/release header. If the source was Changelog, a line of text directing the user to see the ChangeLog file. This becomes the Changes field in your freshmeat.net announcement, and freshmeat.net doesn't like the bulleted format of GNU ChangeLog entries. -\fIresourcetable\fR-- -.PP -The HTML table of links to downloadable resources. This variable is only computed if the index page is built. Any setting of it in the startup files is ignored. - -.PP -All these variables are available for substitution at the time a web page or email announcement is generated. In general, any variable you set in your \fI~/.shipper\fR file will be available at the time the web page or email announcement is generated. Use the Python "%(variable)s" syntax, not shell-substitution syntax. - -.SH "FINDING AND BUILDING LOCAL DELIVERABLES" - -.PP -The following files are considered stock deliverables and may be shipped if they are present when shipper starts up: -FileExplanationREADME -.PP -Project roadmap file. -tarball -.PP -The current source tarball, that is the file named ${package}-${version}.tar.gz. -zipfile -.PP -The current source zip archive, that is the file named ${package}-${version}.zip. -NEWS -.PP -Project news file. -ChangeLog -.PP -Project change log. -HISTORY -.PP -Project history file. -BUGS -.PP -Project bug list. -TODO -.PP -Current to-do list. -*.html -.PP -Any files with an .html extension will be shipped to all website destinations. - -.PP -Here are the generated deliverables that shipper will build and ship, if they don't exist when it starts up. Any of these that are created will be deleted after a successful upload. -TypeExplanationindex.html -.PP -An index web page, to be shipped to any website destination. -RPMs -.PP -Source and either binary or noarch RPMs. -LSM -.PP -If the ibiblio channel is enabled, shipper will generate a Linux Software Map file for it. -CHANGES -.PP -If there is no ChangeLog file but there was a %changelog in your specfile, shipper will generate a CHANGES from the changelog entries in the specfile and ship that. -ANNOUNCE.FRESHMEAT -.PP -If there is no ANNOUNCE.FRESHMEAT file, shipper will generate one. It will be a job card that can be fed to freshmeat.net's XML-RPC interface via \fBfreshmeat-submit\fR(1). -ANNOUNCE.EMAIL -.PP -If there is no ANNOUNCE.EMAIL file, shipper will generate one to be emailed to destinations that are mailto URLs. - -.SH "SHIPPING TO DESTINATIONS" - -.PP -In operation, shipper walks through a list of destinations, building the required deliverables for each one and performing the required shipping actions to push them out to the destination. Here are the channel types shipper knows about: -Channel TypeDeliverablesSpecified byExplanationibibliotarball, RPMs, LSM file- -.PP -If the ibiblio channel is enabled (it is by default), shipper will attempt to ship a source tarball, RPMs, and an an LSM file to ibiblio.org via FTP. The LSM file will be automatically generated. -redhatRPMs- -.PP -If the Red Hat channel is enabled (it is by default), shipper will attempt to ship source and binary RPMs to the Red Hat submission directory via FTP. -freshmeatANNOUNCE.FRESHMEAT- -.PP -If the freshmeat channel is enabled (it is by default), shipper will attempt to post a release announcement on freshmeat.net using \fBfreshmeat-submit\fR(1). The announcement will include URLs for whichever of the following deliverables are shipped, using the URL field from your specfile: tarball, zipfile, RPMs, CHANGES. The user will be prompted for a Freshmeat release-focus. This announcement is generated into the local deliverable ANNOUNCE.FRESHMEAT. -Generic Web siteREADME, tarball, zipfile, RPMs, CHANGES, NEWS, HISTORY, *.html, -BUGS, TODO.scp destination ([user@]host:dir) -.PP -This channel type represents a website. shipper uses \fBscp\fR(1) to put deliverables on websites. If the user part of the scp destination is absent, it will be taken from the environment variable \fBUSERNAME\fR. - -.PP -No generic Web sites are shipped to by default. You must declare them by putting scp destinations in the \fIdestinations\fR variable. -Generic FTP sitetarball, RPMsFTP URL -.PP -Old-fashioned FTP site with no metadata. The FTP URL is parsed to get the sitename and directory where deliverables should be dropped. The FTP username to be used will be taken from the environment variable \fBUSERNAME\fR. The FTP password will be looked up in your \fI~/.netrc\fR file. - -.PP -No generic FTP sites are shipped to by default. You must declare them by putting FTP urls in the \fIdestinations\fR variable. -Email addressANNOUNCE.EMAILmailto URL -.PP -The contents of the generated ANNOUNCE.EMAIL file is emailed to each email address specified as a channel. - -.PP -No email channels are set up by default. You must declare them by putting mailto: urls in the \fIdestinations\fR variable. -rsync unitSRPMrsync address ([user@]host::unit) -.PP -An SRPM is shipped to each destination that is rcognized as an rsync address (by the double colon). - -.PP -No rsync channels are set up by default. You must declare them by putting rsync addresses in the \fIdestinations\fR variable. - -.SH "COMMAND-LINE OPTIONS" - -.PP -The -n option of shipper suppresses uploads, just building all deliverables locally. The -N option suppresses both uploads and builds, generating a configuration dumop instead. The -f option forces rebuilding of local deliverables even if they already exist. The -v option makes shipper chatty about what it's doing. The -h option prints a usage message and exits. - -.SH "HINTS AND TIPS" - -.PP -The following variable definition in your makefile will ensure that the makefile version is derived from (and thus always consistent with) the specfile version. - -.nf - -VERS=$(shell sed <*.spec -n -e '/Version: \\(.*\\)/s//\\1/p') - -.fi - -.PP -A makefile production like the following will allow you to type \fBmake release\fR and be sure that all the deliverables shipper knows about will be rebuilt before being shipped. - -.nf - -release: package-$(VERS).tar.gz package.html - shipper -f - -.fi - -.PP -You will want to change package to your project name. Note that you should not use this recipe if your project has its own (non-generated) index page, as the -f option will overwrite \fIindex.html\fR. - -.PP -To make \fBrpm\fR(1) build noarch rather than binary RPMs, insert the following header in your specfile: - -.nf - -BuildArch: noarch - -.fi - -.SH "AUTHOR" - -.PP -Eric S. Raymond <esr@thyrsus.com>. The buildrpms script was originally by Sean Reifschneider. - -.PP -There is a project web page at : http://www.catb.org/~esr/shipper/http://www.catb.org/~esr/shipper/. - -.SH "BUGS" - -.PP -The rsync channel type is untested. Shipping Debian packages should be supported. - -.SH "SEE ALSO" - -.PP - \fBfreshmeat-submit\fR(1), \fBlftp\fR(1), \fBrpm2lsm\fR(1), \fBscp\fR(1), \fBssh\fR(1). - diff --git a/dist-tools/shipper/shipper.spec b/dist-tools/shipper/shipper.spec deleted file mode 100644 index 3a3646a5..00000000 --- a/dist-tools/shipper/shipper.spec +++ /dev/null @@ -1,69 +0,0 @@ -Name: shipper -Version: 0.5 -Release: 1 -URL: http://www.catb.org/~esr/shipper/ -Source0: %{name}-%{version}.tar.gz -License: GPL -Group: Utilities -Summary: automated shipping of open-source project releases -Requires: lftp, openssh-clients, freshmeat-submit -BuildRoot: %{_tmppath}/%{name}-root -BuildArch: noarch -#Keywords: packaging, distribution - -%description -shipper is a power distribution tool for developers with multiple -projects who do frequent releases. It automates the tedious process -of shipping a software release to several standard places, including -ibiblio, the Red Hat submission directory, and your own hosted -website. It also knows how to post a release announcement to -freshmeat.net via freshmeat-submit. Two auxiliary tools, buildrpms -and rpm2lsm, build RPMs and generate LSM files from them respectively. - -%prep -%setup -q - -%build -make %{?_smp_mflags} shipper.1 rpm2lsm.1 - -%install -[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" -mkdir -p "$RPM_BUILD_ROOT"%{_bindir} -mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man1/ -cp shipper rpm2lsm buildrpms "$RPM_BUILD_ROOT"%{_bindir} -cp shipper.1 rpm2lsm.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/ - -%clean -[ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT" - -%files -%defattr(-,root,root,-) -%doc README COPYING -%{_bindir}/shipper -%{_bindir}/rpm2lsm -%{_bindir}/buildrpms -%{_mandir}/man1/shipper.1* -%{_mandir}/man1/rpm2lsm.1* - -%changelog -* Fri Feb 6 2004 Eric S. Raymond <esr@snark.thyrsus.com> 0.5-1 -- Added security check so the ~/.shipper and .shipper files can't be used - for privilege elevation. Fixed upload omission bug in case where neither - -n nor -f was on and the webpage wasn't being built. Deliverables - created for upload are deleted at end of run. - -* Sun Jan 11 2004 Eric S. Raymond <esr@snark.thyrsus.com> 0.4-1 -- Correct extraction of freshmeat name. Build generated deliverables - only if we know they will be needed. Help is now available at the - freshmeat-focus prompt. - -* Sat Jan 10 2004 Eric S. Raymond <esr@snark.thyrsus.com> 0.3-1 -- First alpha release of unified shipper package. It can ship itself. - -* Wed Dec 17 2003 Eric S. Raymond <esr@snark.thyrsus.com> -- rpm2lsm now grabs an RPM from the current directory if no argument, - and parses an AUTHORS file if present (GNU convention). Also, - this release fixes a bug in USERNAME handling. - -* Thu Aug 1 2002 Eric S. Raymond <esr@snark.thyrsus.com> -- Initial release of rpm2lsm, since folded into shipper package. diff --git a/dist-tools/shipper/shipper.xml b/dist-tools/shipper/shipper.xml deleted file mode 100644 index 765f0f54..00000000 --- a/dist-tools/shipper/shipper.xml +++ /dev/null @@ -1,752 +0,0 @@ -<!DOCTYPE refentry PUBLIC - "-//OASIS//DTD DocBook XML V4.1.2//EN" - "docbook/docbookx.dtd"> -<refentry id='shipper.1'> -<refmeta> -<refentrytitle>shipper</refentrytitle> -<manvolnum>1</manvolnum> -</refmeta> -<refnamediv id='name'> -<refname> shipper</refname> -<refpurpose>automatic drop-shipping of project releases</refpurpose> -</refnamediv> -<refsynopsisdiv id='synopsis'> - -<cmdsynopsis> - <command>shipper</command> - <arg choice='opt'>-h</arg> - <arg choice='opt'>-n</arg> - <arg choice='opt'>-N</arg> - <arg choice='opt'>-f</arg> - <arg choice='opt'>-v</arg> -</cmdsynopsis> -<cmdsynopsis> - <command>buildrpms</command> - <arg choice='req'><replaceable>tarball</replaceable></arg> -</cmdsynopsis> -</refsynopsisdiv> - -<refsect1><title>Description</title> - -<para><application>shipper</application> is a tool for shipping -project releases. Its job is to make it possible for you to run the -command <command>shipper</command> in the top-level directory of a -project and have a release be properly exported to all the places that -you normally deliver it — your personal website, Linux source -code archive sites, and distribution submission queues. A second goal -is to arrange your shipping process in such a way that metadata like -your project version only have to be kept in one place and modified -once per release. The overall goal is to reduce the friction cost -of shipping releases to as near zero as possible.</para> - -<para><application>buildrpms</application> is a helper script that -builds source and binary RPMs from a specified tarball with a -BuildRoot field. <application>shipper</application> also calls -<citerefentry> -<refentrytitle>rpm2lsm</refentrytitle> -<manvolnum>1</manvolnum></citerefentry> to do part of its work.</para> - -<para>As much as possible, <application>shipper</application> tries to -deduce what it should do rather than requiring you to tell it. In -order to do this, it relies on your project obeying standard GNU-like -naming conventions. It also relies on being able to mine project -metadata out of a package specfile. (Presently the only variety of -package specfile supported is an RPM spec; this may change in the future, -when we fully support shipping Debian packages.)</para> - -<para>In normal use, you need set only one configuration variable, -which is the list of private destinations to ship to. You may also -want to add some magic <quote>Keywords</quote> comments to your -project specfiles. Once you have <application>shipper</application> -up and running, you can experiment with more advanced features -such as having the program generate project web pages for you.</para> -</refsect1> - -<refsect1><title>Theory of Operation</title> - -<para><application>shipper</application> pushes -<emphasis>deliverables</emphasis> out to -<emphasis>destinations</emphasis>. Deliverables include: source tarballs, -source zip archives, source RPMs, binary RPMs, ChangeLog files, README -files, LSM files, and various other project metadata files. Destinations -include both <emphasis>private destinations</emphasis> like websites, FTP -archive sites and mailing lists, and <emphasis>public -channels</emphasis> like ibiblio, freshmeat.net, and the submission -queues for various well-known operating-system distributions. The -shipper framework is extensible and it is relatively easy to add new -channel types and new deliverables; in the future, we hope to support -(for example) Debian packages as deliverables and SourceForge as a -channel.</para> - -<para><application>shipper</application>'s first step is to find the -project name and version, then to check that the minimum set of files that -<application>shipper</application> requires to continue is in place. -To start with, <application>shipper</application> needs a source -tarball and a specfile. Once it knows those are in place, it -can extract various pieces of information it will need to do its -real work. It also reads in a handful of configuration variables. -The -N (nobuild) option causes it to dump all configuration values and -stop there.</para> - -<para>The first real work that gets done is finding or building local -deliverables. These are either <emphasis>generated -deliverables</emphasis> (like RPMs) that can be rebuilt automatically, -or or <emphasis>stock deliverables</emphasis> (like a README file) -that have to be changed by hand. <application>shipper</application> -rebuilds any generated deliverable that doesn't exist when it starts -up. Building local deliverables is separated from uploading because -it means that you can stop and inspect what you're going to ship -before committing to an upload.</para> - -<para>The -n (noupload) option stops before uploading, leaving all -local deliverables in place but displaying the exact upload commands -that would have been used to ship them. The -f (force) option forces -a rebuild of all generated deliverables, even those that already -exist. The command <command>shipper -f -n</command> will show you -exactly what <application>shipper</application> would do for a real -upload.</para> - -<para>Once all local deliverables have been built, -<application>shipper</application> can begin uploading files and -posting announcements. It does private destinations first, then public -channels. This means, for example, that if you give -<application>shipper</application> your personal website as a destination, the -website will get updated each time <emphasis>before</emphasis> -any submissions or announcements are sent to public sites like -ibiblio.org or freshmeat.net.</para> - -<para>When uploads are complete, <application>shipper</application> -cleans up after itself by deleting any deliverables it created for -this run. Deliverables that were found and up to date are not -removed.</para> - -<para>Finally, note that <application>shipper</application> makes one -important assumption about the structure of your website(s). Beneath -each directory in your <varname>destinations</varname> list, there -will be one subdirectory for each project, with the directory leaf -name being the same as the project. Thus, for example, if you have -three projects named ruby, diamond and sapphire, and your personal -site is at <filename>gemstones.net:/public/www/precious/</filename>, -<application>shipper</application> will expect to be able to drop -deliverables in three directories -<filename>gemstones.net:/public/www/precious/ruby</filename>, -<filename>gemstones.net:/public/www/precious/diamond/</filename>, and -<filename>gemstones.net:/public/www/precious/sapphire/</filename>. -Note that <application>shipper</application> will not create these -project directories for you if they're missing; this is deliberate, so -that uploads to sites that are not prepared for them will fail -noisily.</para> - -</refsect1> - -<refsect1><title>How Shipper Deduces What To Do</title> - -<para>The behavior of shipper depends on a handful of internal -variables. Some of these variables have defaults computed at startup -time. All can be set or overridden in the per-user -<filename>~/.shipper</filename> file, and overridden in any -per-project <filename>.shipper</filename> file. Both files are Python -code and the syntax of variable settings is Python's.</para> - -<para>If a variable is set in a config file, that value is locked in -(except for the <varname>destinations</varname> variable which can be -appended to from a specfile, see below) Variables that are -<emphasis>not</emphasis> set in a config file may be set by the values -of fields in your project specfile.</para> - -<para>For basic use, it is only necessary to set one such variable: -<varname>destinations</varname>, the list of destinations to ship to. -Normally you'll set this globally, pointing all your projects at your -main distribution website, in your <filename>~/.shipper</filename> -file; it is also possible to add destinations on a per-project basis -by giving a comma-separated list in a #Destinations: comment in the -specfile. You can set the variable in a per-project -<filename>.shipper</filename> to ignore your global destination -list.</para> - -<para>The first thing shipper looks for is a specfile in the -current directory; there must be exactly one. It extracts the project -name from the Name field. Next step is to find the project version -(the variable <varname>package</varname>). This is extracted from the -specfile, or by looking for a makefile macro with a name -beginning with VERS; if the value of that macro is a shell command -wrapped in $(shell ...), it is executed and the output is captured to -yield the version. If both versions are present, they are -consistency-checked.</para> - -<para><application>shipper</application> gets most of the rest of the -data it uses to decide what to do from headers in the specfile. -The following table lists all the variables and their corresponding -specfile fields. <application>shipper</application> uses the RPM spec -file fields: the Debian entries are informational only.</para> - -<informaltable> -<tgroup cols="4"> -<thead> -<row> -<entry>Variable</entry> -<entry>RPM specfile field</entry> -<entry>Debian specfile field</entry> -<entry>Meaning</entry> -</row> -</thead> -<tbody> -<row> -<entry><varname>destinations</varname></entry> -<entry>#Destinations:</entry> -<entry>XBS-Destinations:</entry> -<entry> -<para>A list of remote directories to ship to using -<citerefentry> -<refentrytitle>scp</refentrytitle> <manvolnum>1</manvolnum> -</citerefentry>. Each location is a place to drop deliverables: -either a [user@]site:path destination that -<citerefentry> -<refentrytitle>scp</refentrytitle> <manvolnum>1</manvolnum> -</citerefentry> can use, or an FTP url that -<citerefentry> -<refentrytitle>lftp</refentrytitle> <manvolnum>1</manvolnum> -</citerefentry> -can use. Note that actual project directories are computed by -appending the value of <varname>package</varname> to -the destination you're shipping to.</para> - -<para><emphasis role='bold'>There is no default.</emphasis>. If you -do not set this variable, <application>shipper</application> will -ship only to public channels.</para> -</entry> -</row> -<row> -<entry><varname>channels</varname></entry> -<entry align='center'>-</entry> -<entry align='center'>-</entry> -<entry> -<para>The list of public channels to be shipped to after the private -channels in the <varname>destination</varname> list. You can disable -one or more of these in a config file by calling the function -<function>disable()</function>; for example with -<command>disable('freshmeat')</command>.</para> -</entry> -</row> -<row> -<entry><varname>whoami</varname></entry> -<entry align='center'>-</entry> -<entry align='center'>-</entry> -<entry> -<para>A plausible email address for the user. If not specified in the -config file, it's generated from -<envar>$USERNAME</envar> and <envar>$HOSTNAME</envar>.</para> -</entry> -</row> -<row> -<entry><varname>date</varname></entry> -<entry align='center'>-</entry> -<entry align='center'>-</entry> -<entry> -<para>The program's startup time. This can be used in the web page and -email announcement templates.</para> - -<para>You can use the Python function time.strftime("...") in your -<filename>~/.shipper</filename> file to format this date to your -taste. If you don't set this in the config file, the program will -set it for you.</para> -</entry> -</row> -<row> -<entry><varname>indextemplate</varname></entry> -<entry align='center'>-</entry> -<entry align='center'>-</entry> -<entry> -<para>Template HTML from which to generate index.html for shipping. There is a -default which generates a very simple page containing a title, a -date, and a table listing downloadable resources. This is used when -shipping to a web directory, if no index page exists when shipper -is run.</para> -</entry> -</row> -<row> -<entry><varname>mailtemplate</varname></entry> -<entry align='center'>-</entry> -<entry align='center'>-</entry> -<entry> -<para>Template text from which to generate the file ANNOUNCE.EMAIL to be -shipped to destinations that are mailto URLs. There is a default which -generates a very simple email containing a subject, a pointer to the -project web page, and the last entry in the project changelog.</para> -</entry> -</row> -<row> -<entry><varname>package</varname></entry> -<entry>Name:</entry> -<entry>Package:</entry> -<entry> -<para>Project name, used to generate the stem part of the names of RPMs and -other deliverables that <application>shipper</application> -builds. If the specfile is a Debian control file, the Debian-specific -part of the version number (after the dash) is removed.</para> -</entry> -</row> -<row> -<entry><varname>version</varname></entry> -<entry>Version:</entry> -<entry>Version:</entry> -<entry> -<para>Project version, used in generating the names of RPMs and -other deliverables that <application>shipper</application> -builds.</para> -</entry> -</row> -<row> -<entry><varname>homepage</varname></entry> -<entry>URL:</entry> -<entry>XBS-Home-Page:</entry> -<entry> -<para>Project home page URL. Used when generating project -announcements.</para> -</entry> -</row> -<row> -<entry><varname>arch</varname></entry> -<entry>BuildArch:</entry> -<entry>Architecture:</entry> -<entry> -<para>Build architecture. If this field is <quote>noarch</quote>, -noarch rather than binary RPMs will be built.</para> -</entry> -</row> -<row> -<entry><varname>keywords</varname></entry> -<entry>#Keywords:</entry> -<entry>XBS-Keywords:</entry> -<entry> -<para>Topic keywords. Used when generating LSM files.</para> -</entry> -</row> -<row> -<entry><varname>freshmeat_name</varname></entry> -<entry>#Freshmeat-Name:</entry> -<entry>XBS-Freshmeat-Name:</entry> -<entry> -<para>Freshmeat shortname, used in generating freshmeat.net -announcements. If this isn't present, it defaults to the project -name; you only need to set it if they differ.</para> -</entry> -</row> -<row> -<entry><varname>summary</varname></entry> -<entry>Summary</entry> -<entry>Description:</entry> -<entry> -<para>The one-line project summary field from your specfile.</para> -</entry> -</row> -<row> -<entry><varname>description</varname></entry> -<entry>%description</entry> -<entry>Description:</entry> -<entry> -<para>The Description field from your specfile.</para> -</entry> -</row> -<row> -<entry><varname>changelog</varname></entry> -<entry>ChangeLog or %changelog</entry> -<entry align='center'>-</entry> -<entry> -<para>If a <filename>ChangeLog</filename> file exists in the project -directory, its entire contents. Otherwise, if it exists, -the entire changelog section from the specfile.</para> -</entry> -</row> -<row> -<entry><varname>lastchange</varname></entry> -<entry>ChangeLog or %changelog</entry> -<entry align='center'>-</entry> -<entry> -<para> -If the source of your changlog was your specfile, this is the -most recent entry from your changelog without -its date/author/release header. If the source was Changelog, a -line of text directing the user to see the ChangeLog file. -This becomes the Changes field in your freshmeat.net announcement, -and freshmeat.net doesn't like the bulleted format of GNU ChangeLog -entries.</para> -</entry> -</row> -<row> -<entry><varname>resourcetable</varname></entry> <entry -align='center'>-</entry> <entry align='center'>-</entry> -<entry> -<para>The HTML table of links to downloadable resources. This -variable is only computed if the index page is built. Any setting -of it in the startup files is ignored.</para> -</entry> -</row> -</tbody> -</tgroup> -</informaltable> - -<para>All these variables are available for substitution at the time a -web page or email announcement is generated. In general, any variable -you set in your <filename>~/.shipper</filename> file will be available -at the time the web page or email announcement is generated. Use the -Python "%(variable)s" syntax, not shell-substitution syntax.</para> - -</refsect1> - -<refsect1><title>Finding and Building Local Deliverables</title> - -<para>The following files are considered stock deliverables and may be -shipped if they are present when <application>shipper</application> -starts up:</para> - -<informaltable> -<tgroup cols="2"> -<thead> -<row> -<entry>File</entry> -<entry>Explanation</entry> -</row> -</thead> -<tbody> -<row> -<entry>README</entry> -<entry> -<para>Project roadmap file.</para> -</entry> -</row> -<row> -<entry>tarball</entry> -<entry> -<para>The current source tarball, that is the file named ${package}-${version}.tar.gz.</para> -</entry> -</row> -<row> -<entry>zipfile</entry> -<entry> -<para>The current source zip archive, that is the file named ${package}-${version}.zip.</para> -</entry> -</row> -<row> -<entry>NEWS</entry> -<entry> -<para>Project news file.</para> -</entry> -</row> -<row> -<entry>ChangeLog</entry> -<entry> -<para>Project change log.</para> -</entry> -</row> -<row> -<entry>HISTORY</entry> -<entry> -<para>Project history file.</para> -</entry> -</row> -<row> -<entry>BUGS</entry> -<entry> -<para>Project bug list.</para> -</entry> -</row> -<row> -<entry>TODO</entry> -<entry> -<para>Current to-do list.</para> -</entry> -</row> -<row> -<entry>*.html</entry> -<entry> -<para>Any files with an .html extension will be shipped to all -website destinations.</para> -</entry> -</row> -</tbody> -</tgroup> -</informaltable> - -<para>Here are the generated deliverables that -<application>shipper</application> will build and ship, if they don't -exist when it starts up. Any of these that are created will be -deleted after a successful upload.</para> - -<informaltable> -<tgroup cols="2"> -<thead> -<row> -<entry>Type</entry> -<entry>Explanation</entry> -</row> -</thead> -<tbody> -<row> -<entry>index.html</entry> -<entry> -<para>An index web page, to be shipped to any website destination.</para> -</entry> -</row> -<row> -<entry>RPMs</entry> -<entry> -<para>Source and either binary or noarch RPMs.</para> -</entry> -</row> -<row> -<entry>LSM</entry> -<entry> -<para>If the ibiblio channel is enabled, -<application>shipper</application> will generate a Linux Software Map -file for it.</para> -</entry> -</row> -<row> -<entry>CHANGES</entry> -<entry> -<para>If there is no ChangeLog file but there was a %changelog in your -specfile, <application>shipper</application> will generate a CHANGES -from the changelog entries in the specfile and ship that.</para> -</entry> -</row> -<row> -<entry>ANNOUNCE.FRESHMEAT</entry> -<entry> -<para>If there is no ANNOUNCE.FRESHMEAT file, -<application>shipper</application> will generate one. It will be a -job card that can be fed to freshmeat.net's XML-RPC interface via -<citerefentry><refentrytitle>freshmeat-submit</refentrytitle><manvolnum>1</manvolnum></citerefentry>. -</para> -</entry> -</row> -<row> -<entry>ANNOUNCE.EMAIL</entry> -<entry> -<para>If there is no ANNOUNCE.EMAIL file, <application>shipper</application> -will generate one to be emailed to destinations that are mailto URLs.</para> -</entry> -</row> -</tbody> -</tgroup> -</informaltable> -</refsect1> - -<refsect1><title>Shipping to Destinations</title> -<para>In operation, <application>shipper</application> walks through a -list of destinations, building the required deliverables for each one and -performing the required shipping actions to push them out to the -destination. Here are the channel types -<application>shipper</application> knows about:</para> - -<informaltable> -<tgroup cols="4"> -<colspec align='left'/> -<colspec align='left'/> -<colspec align='center'/> -<colspec align='left'/> -<thead> -<row> -<entry>Channel Type</entry> -<entry>Deliverables</entry> -<entry>Specified by</entry> -<entry>Explanation</entry> -</row> -</thead> -<tbody> -<row> -<entry>ibiblio</entry> -<entry>tarball, RPMs, LSM file</entry> -<entry>-</entry> -<entry> -<para>If the ibiblio channel is enabled (it is by default), -<application>shipper</application> will attempt to ship a source -tarball, RPMs, and an an LSM file to ibiblio.org via FTP. The LSM -file will be automatically generated.</para> -</entry> -</row> -<row> -<entry>redhat</entry> -<entry>RPMs</entry> -<entry>-</entry> -<entry> -<para>If the Red Hat channel is enabled (it is by default), -<application>shipper</application> will attempt to ship source -and binary RPMs to the Red Hat submission directory via FTP.</para> -</entry> -</row> -<row> -<entry>freshmeat</entry> -<entry>ANNOUNCE.FRESHMEAT</entry> -<entry>-</entry> -<entry> -<para>If the freshmeat channel is enabled (it is by default), -<application>shipper</application> will attempt to post a release -announcement on freshmeat.net using -<citerefentry><refentrytitle>freshmeat-submit</refentrytitle><manvolnum>1</manvolnum></citerefentry>. -The -announcement will include URLs for whichever of the following -deliverables are shipped, using the URL field from your specfile: tarball, -zipfile, RPMs, CHANGES. The user will be -prompted for a Freshmeat release-focus. This announcement is -generated into the local deliverable ANNOUNCE.FRESHMEAT.</para> -</entry> -</row> -<row> -<entry>Generic Web site</entry> -<entry>README, tarball, zipfile, RPMs, CHANGES, NEWS, HISTORY, *.html, -BUGS, TODO.</entry> -<entry>scp destination ([user@]host:dir)</entry> -<entry> -<para>This channel type represents a website. -<application>shipper</application> uses -<citerefentry><refentrytitle>scp</refentrytitle><manvolnum>1</manvolnum></citerefentry> -to put deliverables on websites. If the user part of the scp -destination is absent, it will be taken from the environment variable -<envar>USERNAME</envar>.</para> - -<para>No generic Web sites are shipped to by default. You must declare -them by putting scp destinations in the <varname>destinations</varname> -variable.</para> -</entry> -</row> -<row> -<entry>Generic FTP site</entry> -<entry>tarball, RPMs</entry> -<entry>FTP URL</entry> -<entry> -<para>Old-fashioned FTP site with no metadata. The FTP URL is parsed -to get the sitename and directory where deliverables should be dropped. The -FTP username to be used will be taken from the environment variable -<envar>USERNAME</envar>. The FTP password will be looked up in your -<filename>~/.netrc</filename> file.</para> - -<para>No generic FTP sites are shipped to by default. You must -declare them by putting FTP urls in the -<varname>destinations</varname> variable.</para> -</entry> -</row> -<row> -<entry>Email address</entry> -<entry>ANNOUNCE.EMAIL</entry> -<entry>mailto URL</entry> -<entry> -<para>The contents of the generated ANNOUNCE.EMAIL file is emailed to -each email address specified as a channel.</para> - -<para>No email channels are set up by default. You must -declare them by putting mailto: urls in the -<varname>destinations</varname> variable.</para> -</entry> -</row> -<row> -<entry>rsync unit</entry> -<entry>SRPM</entry> -<entry>rsync address ([user@]host::unit)</entry> -<entry> -<para>An SRPM is shipped to each destination that is rcognized as -an rsync address (by the double colon).</para> - -<para>No rsync channels are set up by default. You must -declare them by putting rsync addresses in the -<varname>destinations</varname> variable.</para> -</entry> -</row> -</tbody> -</tgroup> -</informaltable> -</refsect1> - -<refsect1><title>Command-line Options</title> - -<para>The -n option of <application>shipper</application> suppresses -uploads, just building all deliverables locally. The -N option -suppresses both uploads and builds, generating a configuration dumop -instead. The -f option forces rebuilding of local deliverables even -if they already exist. The -v option makes -<application>shipper</application> chatty about what it's doing. The --h option prints a usage message and exits.</para> - -</refsect1> - -<refsect1><title>Hints and Tips</title> -<para>The following variable definition in your makefile will ensure -that the makefile version is derived from (and thus always consistent -with) the specfile version.</para> - -<programlisting> -VERS=$(shell sed <*.spec -n -e '/Version: \(.*\)/s//\1/p') -</programlisting> - -<para>A makefile production like the following will allow -you to type <command>make release</command> and be sure that all -the deliverables <application>shipper</application> knows about -will be rebuilt before being shipped.</para> - -<programlisting> -release: <emphasis>package</emphasis>-$(VERS).tar.gz <emphasis>package</emphasis>.html - shipper -f -</programlisting> - -<para>You will want to change <emphasis>package</emphasis> to your -project name. Note that you should not use this recipe if your -project has its own (non-generated) index page, as the -f option will -overwrite <filename>index.html</filename>.</para> - -<para>To make -<citerefentry> -<refentrytitle>rpm</refentrytitle><manvolnum>1</manvolnum> -</citerefentry> -build noarch rather than binary RPMs, insert the following header in -your specfile:</para> - -<programlisting> -BuildArch: noarch -</programlisting> -</refsect1> - -<refsect1><title>Author</title> -<para>Eric S. Raymond <email>esr@thyrsus.com</email>. The buildrpms -script was originally by Sean Reifschneider.</para> - -<para>There is a project web page at -<ulink -url="http://www.catb.org/~esr/shipper/">http://www.catb.org/~esr/shipper/</ulink>.</para> -</refsect1> - -<refsect1><title>Bugs</title> -<para>The rsync channel type is untested. Shipping Debian packages -should be supported.</para> -</refsect1> - -<refsect1><title>See Also</title> - -<para> -<citerefentry> -<refentrytitle>freshmeat-submit</refentrytitle> -<manvolnum>1</manvolnum> -</citerefentry>, -<citerefentry> -<refentrytitle>lftp</refentrytitle> -<manvolnum>1</manvolnum> -</citerefentry>, -<citerefentry> -<refentrytitle>rpm2lsm</refentrytitle> -<manvolnum>1</manvolnum> -</citerefentry>, -<citerefentry> -<refentrytitle>scp</refentrytitle> -<manvolnum>1</manvolnum> -</citerefentry>, -<citerefentry> -<refentrytitle>ssh</refentrytitle> -<manvolnum>1</manvolnum> -</citerefentry>.</para> -</refsect1> -</refentry> - -<!-- -Local Variables: -compile-command: "make shipper.html" -End: ---> @@ -866,6 +866,7 @@ static int do_session( SIGHANDLERTYPE alrmsave; ctl->server.base_protocol = proto; + stage = STAGE_GETAUTH; msgsizes = NULL; pass = 0; @@ -965,6 +966,12 @@ static int do_session( goto closeUp; } + /* initialize protocol */ + if (ctl->server.base_protocol->construct) { + err = (ctl->server.base_protocol->construct)(ctl); + if (err) goto cleanUp; + } + /* open a socket to the mail server */ oldphase = phase; phase = OPEN_WAIT; @@ -1153,7 +1160,6 @@ static int do_session( goto cleanUp; /* try to get authorized to fetch mail */ - stage = STAGE_GETAUTH; if (ctl->server.base_protocol->getauth) { set_timeout(mytimeout); @@ -1243,10 +1249,18 @@ is restored.")); ctl->remotename, ctl->server.truename); } + else if (err == PS_SOCKET) + { + report(stderr, GT_("Socket or TLS error on %s@%s\n"), + ctl->remotename, + ctl->server.truename); + } else + { report(stderr, GT_("Unknown login or authentication error on %s@%s\n"), ctl->remotename, ctl->server.truename); + } goto cleanUp; } @@ -1539,6 +1553,11 @@ is restored.")); cleanupSockClose(mailserver_socket_temp); mailserver_socket_temp = -1; } + + /* clean up protocol */ + if (ctl->server.base_protocol->destruct) { + ctl->server.base_protocol->destruct(ctl); + } } /* no report on PS_AUTHFAIL */ @@ -143,6 +143,8 @@ static const struct method etrn = NULL, /* no mailbox support */ etrn_logout, /* log out, we're done */ FALSE, /* no, we can't re-poll */ + NULL, /* no constructor */ + NULL /* no destructor */ }; int doETRN (struct query *ctl) diff --git a/fetchmail-SA-2021-01.txt b/fetchmail-SA-2021-01.txt index 2a5ca262..3ad2b47e 100644 --- a/fetchmail-SA-2021-01.txt +++ b/fetchmail-SA-2021-01.txt @@ -6,8 +6,8 @@ fetchmail-SA-2021-01: DoS or information disclosure logging long messages Topics: fetchmail denial of service or information disclosure when logging long messages Author: Matthias Andree -Version: 1.2 -Announced: 2021-07-28 (original), 2021-08-03 (last update) +Version: 1.3 +Announced: 2021-07-28 (original), 2021-08-09 (last update) Type: missing variable initialization can cause read from bad memory locations Impact: fetchmail logs random information, or segfaults and aborts, @@ -23,15 +23,18 @@ Project URL: https://www.fetchmail.info/ Affects: - fetchmail releases up to and including 6.3.8 - fetchmail releases 6.3.17 up to incl. 6.4.19 + (but note 6.4.20 regresses for buffered output, + f.i. with --logfile) -Not affected: - fetchmail releases 6.4.20 and newer +Not affected: - fetchmail releases 6.4.21 and newer + (fetchmail 6.4.20 fixes the immediate bug but regresses + and causes message truncation on buffered output) - fetchmail releases 6.3.9 to 6.3.16 -Corrected in: c546c829 Git commit hash - 2021-07-28 fetchmail 6.4.20 release tarball +Corrected in: c546c829 + d3db2da1 Git commit hash (both needed) + 2021-08-09 fetchmail 6.4.21 release tarball 2021-08-03 7.0.0-alpha9/6.5.0-beta4 snapshots - 0. Release history ================== @@ -39,6 +42,7 @@ Corrected in: c546c829 Git commit hash 2021-07-28 1.0 release 2021-07-28 1.1 update Git commit hash with correction 2021-08-03 1.2 add references to CVE-2008-2711/fetchmail-SA-2008-01 +2021-08-09 1.3 mention buffered logging regression (--logfile) 1. Background @@ -71,7 +75,7 @@ some systems log literally "(null)", some systems trigger SIGSEGV (signal #11), which crashes fetchmail, causing a denial of service on fetchmail's end. The same bug then named CVE-2008-2711 had already been fixed in fetchmail 6.3.9, -but a code refactoring in fetchmail 6.3.17 (commit 414a3809 in 2010) +but a code refactoring in fetchmail 6.3.17 (commit 414a3809 in 2010) reintroduced the bug. Fetchmail versions 6.4.19 and older are no longer supported, however. @@ -81,17 +85,31 @@ The bugfix used in 6.4.20 uses a different, more thorough, approach. 3. Solution =========== -Install fetchmail 6.4.20 or newer. +Install fetchmail 6.4.21 or newer. The fetchmail source code is available from <https://sourceforge.net/projects/fetchmail/files/>. Distributors are encouraged to review the NEWS file and move forward to -6.4.20, rather than backport individual security fixes, because doing so +6.4.21, rather than backport individual security fixes, because doing so routinely misses other fixes crucial to fetchmail's proper operation, for which no security announcements are issued, or documentation, or translation updates. +The regression fix for the new non-security bug in 6.4.20 that causes +log message truncation simply consists of editing report.c to rotate lines 289 +through 291, such that the /corrected/ report.c then looks like this: + + 286 n = snprintf (partial_message + partial_message_size_used, + 287 partial_message_size - partial_message_size_used, + 288 message, a1, a2, a3, a4, a5, a6, a7, a8); + 289 + 290 if (n > 0) partial_message_size_used += n; + 291 #endif + 292 + 293 if (unbuffered && partial_message_size_used != 0) + + Fetchmail 6.4.X releases have been made with a focus on unchanged user and program interfaces so as to avoid disruptions when upgrading from 6.3.Z or 6.4.X to 6.4.Y with Y > X. Care was taken to not change the interface @@ -114,17 +132,17 @@ Use the information herein at your own risk. END of fetchmail-SA-2021-01 -----BEGIN PGP SIGNATURE----- -iQIzBAEBCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmEJW1kACgkQ5BKxVu/z -hVrcow//VOWtxFhC1H/BSUsyrx4n+vXJjpBxgu9uK/1RlA7//Bldh8y7X6XgfeBp -yEKwW71ecdLv4GAzDYoQ5ejrIWwjwkP4hOpFFrXBfv542qgUNIBXCJIkm8Ws4bF2 -IjWWfHqHrvQLaxdZ9R00GPr+3cKsc8OHjkq2tX23uBBgQ4xPn/Q6veBbm/Ok9lUn -Oge7ffn4eiHZ1d04sH/SyB6raEQuXyCAYVT1a2BBPiMUwsKBDj/LF7OtBrpRbdr9 -Sc1McL99w1lE85j1BI8xRFCmx+FuK2QQBfi1zst99b3IV+MYRC2vuowieMdzy37M -Wf6TtVWwWoZdxrRG0LIok43Kn4pklrFA67Wk4vCepxULOvlMPUsiCsv5TBJOdq2I -oLXpquSYz20BxyS3OxS2uu5WgD9IWMOJIn7ZoA8GqHLgSvClmD11njvQJq7bCUNu -SP6DC+WWbwoWM1oYZS2IHVccIh/rMvu2nptRz6adVASMebnY7rZCveN0YmcSXBUU -RbCW1cav1VO+BPvlV3AIX6VEjv7q9s839AieLTCkdar7LKf/ktKXQlNAtqbnPW5Q -O7ujhs+VvjlB7IfjhnoF77tu5NDtktTGgyW37XQPPLwpgpyvEyEWmzvB4hoxrWfV -+WNNfwmc6sUEs4hzgBmgtaX2exBvWscKk5xe5ks5ULRLJLZ9PnY= -=NnuJ +iQIzBAEBCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmERUo4ACgkQ5BKxVu/z +hVrq4RAAnvtDbwEvjSEWFVvmZTG7qcrOxAs1SCb+dp33PKy8EPfzE3vjCHEsrwRv +XjX6dKWK61wG7+7kGUyeNlBXASWso2BSR9TypRVi2PXK5aKUgSi0qs0eGpR11jnx +QN9b96rklFb6odJVua/PwWKUG6vBILX1o8DgvoMX4B5S7LipgD/gecuqQyD0t0l5 +TSyJZRaU763B7c4sZjuEwXtfqA49AbBSICq7qAbOa5R695ZelDvFgV3HHCoJIZqN +W2gMtsfCDboyViDf5jHllnbUmAl4bPCHOOcC53zfsESL37/pNYxgAsY2RHyWyhbU +yqVNH/0XTA5UxjN3i81mPbIo0oPI1Yejsbk+V73bI8hBaDtwqZ3BtU/gRYN5ODQi +w2DokSJ5cju7mDX4Ua05ee5n7U3291SJIc/XiMRDh2FauRM1JF2TeLwtgN0iwLM/ +OxZZSjtLrb/X2noBa3jRbJ5sho94mw/suW5jyuVAxKZzJCzgp45f7AeuqtvzYi1X +0TWLwQCEjoPBAySpdi36AZmJfiY2gfFgVSXlE5Piekg4n/QRRn+Qt9227WKJKkH2 +IwTqDIBkvjHXMnmNZTHLf28kKesF0BfYMpo9kDn+Cg4Gln4r0T4zRBB8HwljWfnx +j/4EAI+Nl9NpZ+xZFJe3YBJeOsXpSc+MAqK6tNWK4sKDCzHtnVU= +=NnPX -----END PGP SIGNATURE----- diff --git a/fetchmail-SA-2021-02.txt b/fetchmail-SA-2021-02.txt new file mode 100644 index 00000000..8bbc934f --- /dev/null +++ b/fetchmail-SA-2021-02.txt @@ -0,0 +1,149 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +fetchmail-SA-2021-02: STARTTLS session encryption bypassing + +Topics: fetchmail fails to enforce an encrypted connection + +Author: Matthias Andree +Version: 1.0 +Announced: 2021-08-26 (0.9), 2021-09-13 (1.0) +Type: failure to enforce configured security policy +Impact: fetchmail continues an unencrypted connection, + thus reading unauthenticated input and sending + information unencrypted over its transport +Danger: medium +Acknowledgment: Andrew C. Aitchison for reporting this against fetchmail + Damian Poddebniak, Fabian Ising, Hanno Böck, and Sebastian + Schinzel for their Usenix Security 21 paper NO STARTTLS + +CVE Name: CVE-2021-39272 +URL: https://www.fetchmail.info/fetchmail-SA-2021-02.txt +Project URL: https://www.fetchmail.info/ + +Affects: - fetchmail releases up to and including 6.4.21 + +Not affected: - fetchmail releases 6.4.22 and newer + +Corrected in: 2021-09-13 fetchmail 6.4.22 release tarball + +0. History of this announcement +=============================== + +2021-08-10 Andrew C. Aitchison contacts fetchmail maintainer with pointer + to Usenix Security 21 paper by Damian Poddebniak et al. +2021-08-16 a simplified recommendation to configure --ssl where possible + (see section 3b. below) to mitigate impact was sent to the + fetchmail mailing lists +2021-08-26 0.9 initial release along with fetchmail 6.4.22.rc1 +2021-08-27 0.9.1 update references to 6.4.22.rc2. +2021-08-29 0.9.2 update references to 6.4.22.rc3 and correct 0.9.1 date. +2021-09-13 1.0 remove reference to rc3 from "corrected in" and bump v. to 1.0. + + +1. Background +============= + +fetchmail is a software package to retrieve mail from remote POP3, IMAP, +ETRN or ODMR servers and forward it to local SMTP, LMTP servers or +message delivery agents. fetchmail supports SSL and TLS security layers +through the OpenSSL library, if enabled at compile time and if also +enabled at run time, in both SSL/TLS-wrapped mode on dedicated ports as +well as in-band-negotiated "STARTTLS" and "STLS" modes through the +regular protocol ports. + + +2. Problem description and Impact +================================= + +fetchmail permits requiring that an IMAP or POP3 protocol exchange uses +a TLS-encrypted transport, in 6.4 by way of an --sslproto auto or similar +configuration. + This TLS encryption can be established either as Implicit TLS connection, +which negotiates TLS first, or as a STARTTLS which starts as cleartext +protocol exchange that gets upgraded in the same TCP stream to TLS. + +Without special configuration, fetchmail would opportunistically try to +upgrade cleartext connections to TLS by STARTTLS, but allow cleartext protocol +exchange, which is documented. + +IMAP also supports sessions that start in "authenticated state" (PREAUTH). +In this latter case, IMAP (RFC-3501) does not permit sending STARTTLS +negotiations, which are only permissible in not-authenticated state. + In such a combination of circumstances (1. IMAP protocol in use, 2. the +server greets with PREAUTH, announcing authenticated state, 3. the user +configured TLS mandatory, 4. the user did not configure "ssl" mode that uses +separate ports for Implicit SSL/TLS), fetchmail 6.4.21 and older would +not encrypt the session. + +There was a similar situation for POP3: if the remote name contained +@compuserve.com, and if the server supported a non-standard "AUTH" command +without mechanism argument and if it responded with a list that contained "RPA" +(also in mixed or lower case), then fetchmail would not attempt STARTTLS. +While the password itself is then protected by the RPA scheme (which employs +MD5 however), fetchmail 6.4.21 and older would not encrypt the session. + +Also, a configuration containing --auth ssh (meaning that fetchmail should not +authenticate, on the assumption that the session will be pre-authenticated for +instance through SSH running a mail server with --plugin, or TLS client +certificates), would also defeat STARTTLS as result of an implementation defect. +This affected both POP3 and IMAP. + + +3. Solutions +============ + +PREFACE: distributors backporting fixes to old versions are asked to diff the +manual page and review the changes, and the NEWS file, because the manual page +has been updated with newer recommendations. The same backport recommendations +hold for the README.SSL file. + + +3a. Install fetchmail 6.4.22 or newer. + +The fetchmail source code is available from +<https://sourceforge.net/projects/fetchmail/files/>. + +The Git-based source code repository is currently published via +https://gitlab.com/fetchmail/fetchmail/-/tree/legacy_64 (primary) +https://sourceforge.net/p/fetchmail/git/ci/legacy_64/tree/ (copy) + + +3b. Where the IMAP or POP3 server supports this form of access, +fetchmail can be configured to use Implicit TLS, called "ssl" mode, meaning it +will connect to a dedicated port (default: 993 for IMAP, 995 for POP3) and +negotiate TLS without prior clear-text protocol exchange. + Also, --ssl can be given on the command line, which switches all +configured server statements to this Implicit TLS mode. + + +A. Copyright, License and Non-Warranty +====================================== + +(C) Copyright 2021 by Matthias Andree, <matthias.andree@gmx.de>. +Some rights reserved. + +© Copyright 2021 by Matthias Andree. This file is licensed under CC +BY-ND 4.0. To view a copy of this license, visit +http://creativecommons.org/licenses/by-nd/4.0/ + +THIS WORK IS PROVIDED FREE OF CHARGE AND WITHOUT ANY WARRANTIES. +Use the information herein at your own risk. + +END of fetchmail-SA-2021-02 +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmE/ue8ACgkQ5BKxVu/z +hVqhNg//eqyQpbFMUt29merXUWlMYuZJOjbtbXOFiUWxKvul2Id+/7ldUWeZyDKB +eNDgNAY44cq9thY5hf+gf3C5D1jBPbxc3ChirNuykIAs+Z6Me8LbgSF/ax+aZ9wk +IecIWIkSlmdTNkEdA+vGRM8u5POBJGBNdMwTgrMd3Zj4LSZkYGYRy57g5tefrng3 +3edHFaevZGyFo8qeNldKttycxEzSMF0n2yFtb4xNZThj8nw69/YlmV2ixTgrADq+ +/hMjUiAzgI0dNXApPLO+mmvnnCVxvB4jYWCYDoL+IC36PDs8/0vn2m/RBhONqvoH +r6i7ToaEOtbIDKwhL3ZrCvDWLMUGgXqkufPl0rsY/ibSepzl9qb6mpHXGzvLiM5x +PCylIJrHZKk0zD2QWkAl6mWYmiVnJLxlMSgjBtZwlabetBqyLvkzeCMTkpETRPmF +cOL1x844s0q+z6MSNbAPQBkBZKRQ6A2SpVFMLWQ54shPOyTkyg33QWdeYuPwq2qx +rHGeOELyXpftIQ8uqzsYnHQNsF+ZCV0PjqI1hyexGGkk3Z+tUH0DHqWwBvk2LHU9 +lAnLwPwQTtEY89jTkYj3aCGST0ip1P2Ad575gHJAAb4bQQozYx8mGViHQwFeg724 +EBxUL8sFTXthstHIKeVi53xkqa/FcKlR+Y3062LY4lAkDUUhK2I= +=pqxb +-----END PGP SIGNATURE----- diff --git a/fetchmail.c b/fetchmail.c index a345e2fa..30500073 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -55,9 +55,9 @@ #endif /* ENETUNREACH */ #ifdef SSL_ENABLE +#include "tls-aux.h" /* compatibility and helper functions */ #include <openssl/ssl.h> /* for OPENSSL_NO_SSL2 and ..._SSL3 checks */ #include <openssl/opensslv.h> /* for version queries */ -#include "tls-aux.h" /* compatibility and helper functions */ #endif /* prototypes for internal functions */ @@ -146,11 +146,11 @@ static void printcopyright(FILE *fp) { " Robert M. Funk, Graham Wilson\n" "Copyright (C) 2005 - 2012 Sunil Shetye\n" "Copyright (C) 2005 - %d Matthias Andree\n" - ), 2021); + ), 2024); fprintf(fp, GT_("Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions. For details,\n" "please see the file COPYING in the source or documentation directory.\n")); -#ifdef SSL_ENABLE +#if defined(SSL_ENABLE) && !defined(USING_WOLFSSL) /* Do not translate this */ fprintf(fp, "This product includes software developed by the OpenSSL Project\nfor use in the OpenSSL Toolkit. (http://www.openssl.org/)\n"); #endif @@ -270,7 +270,11 @@ int main(int argc, char **argv) #ifndef SSL_ENABLE "-SSL" #else +#ifdef USING_WOLFSSL + "+WOLFSSL" +#else "+SSL-SSLv2" +#endif #if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0) || defined(OPENSSL_NO_SSL3) "-SSLv3" #endif @@ -313,12 +317,15 @@ int main(int argc, char **argv) printf(GT_("OpenSSL: %s\nEngines: %s\n"), OpenSSL_version(OPENSSL_DIR), OpenSSL_version(OPENSSL_ENGINES_DIR)); -#if !HAVE_DECL_TLS1_3_VERSION || defined(OPENSSL_NO_TLS1_3) +# if !HAVE_DECL_TLS1_3_VERSION || defined(OPENSSL_NO_TLS1_3) printf(GT_("WARNING: Your SSL/TLS library does not support TLS v1.3.\n")); -#endif -#ifdef LIBRESSL_VERSION_NUMBER - printf(GT_("WARNING: Compiled against LibreSSL, which is not a supported configuration.\n")); -#endif +# endif +# if defined(LIBRESSL_VERSION_NUMBER) && !defined(__OpenBSD__) + /* OpenBSD ships LibreSSL as part of the base system, so is exempt + * because it can pull the GPL v2 clause 3 exception */ + printf(GT_("ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n")); + exit(PS_UNDEFINED); +# endif #else printf(GT_("WARNING: Compiled without SSL/TLS.\n")); #endif @@ -350,13 +357,13 @@ int main(int argc, char **argv) xfree(run.logfile); } -#if 0 +# if 0 /* not in daemon mode -> turn off logfile option */ if (0 == run.poll_interval) { if (outlevel >= O_NORMAL) { fprintf(stderr, GT_("Not running in daemon mode, ignoring logfile option.\n")); } xfree(run.logfile); } -#endif +# endif /* log file not writable -> turn off logfile option */ if (run.logfile && 0 != access(run.logfile, F_OK)) { @@ -765,7 +772,7 @@ int main(int argc, char **argv) /* Boldly assume that we also have res_init() if we have * res_search(), and call res_init() to re-read the resolv.conf * file, so that we can pick up changes to that file that are - * written by dhpccd, dhclient, pppd, openvpn and similar. */ + * written by dhcpcd, dhclient, pppd, openvpn and similar. */ /* NOTE: This assumes that /etc/resolv.conf is written * atomically (i. e. a temporary file is written, flushed and @@ -996,7 +1003,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) list_merge(&h2->antispam, &h1->antispam, force); #define FLAG_MERGE(fld) do { if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld; } while (0) -#define STRING_MERGE(fld) do { if (force ? !!h1->fld : !h2->fld) { if (h2->fld) free((void *)h2->fld), h2->fld = 0; if (h1->fld) h2->fld = xstrdup(h1->fld); } } while (0) +#define STRING_MERGE(fld) do { if (force ? !!h1->fld : !h2->fld) { if (h2->fld) free((void *)h2->fld), h2->fld = 0; if (h1->fld) { if (h1->fld != STRING_DISABLED) h2->fld = xstrdup(h1->fld); else h2->fld = STRING_DISABLED; } } } while (0) STRING_MERGE(server.via); FLAG_MERGE(server.protocol); STRING_MERGE(server.service); @@ -1412,6 +1419,16 @@ static int load_params(int argc, char **argv, int optind) ctl->server.pollname); exit(PS_SYNTAX); } + switch (ctl->server.protocol) { + case P_POP3: case P_APOP: + if (port == 995 && !ctl->use_ssl) report(stderr, GT_("WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n"), ctl->server.pollname); + if (port == 110 && ctl->use_ssl) report(stderr, GT_("WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n"), ctl->server.pollname); + break; + case P_IMAP: + if (port == 993 && !ctl->use_ssl) report(stderr, GT_("WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n"), ctl->server.pollname); + if (port == 143 && ctl->use_ssl) report(stderr, GT_("WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n"), ctl->server.pollname); + break; + } } if (ctl->listener == LMTP_MODE) { diff --git a/fetchmail.h b/fetchmail.h index a5f15e8d..a7edaf3f 100644 --- a/fetchmail.h +++ b/fetchmail.h @@ -249,6 +249,8 @@ struct method /* describe methods for protocol state machine */ int (*logout_cmd)(int, struct query *); /* logout command */ flag retry; /* can getrange poll for new messages? */ + int (*construct)(struct query *); /* session setup before first command */ + int (*destruct)(struct query *); /* cleanup after session */ }; enum badheader { BHREJECT = 0, BHACCEPT }; @@ -265,7 +267,7 @@ struct hostdata /* shared among all user connections to given server */ int interval; /* # cycles to skip between polls */ int authenticate; /* authentication mode to try */ int timeout; /* inactivity timout in seconds */ - char *envelope; /* envelope address list header */ + char *envelope; /* envelope address list header - WARNING - can take value STRING_DISABLED (-1)! */ int envskip; /* skip to numbered envelope header */ char *qvirtual; /* prefix removed from local user id */ flag skip; /* suppress poll in implicit mode? */ @@ -585,7 +587,7 @@ char *rcpt_address(struct query *, const char *, int); int stuffline(struct query *, char *); int open_sink(struct query*, struct msgblk *, int*, int*); void release_sink(struct query *); -int close_sink(struct query *, struct msgblk *, flag); +int close_sink(struct query *, struct msgblk *, flag); /**< \returns TRUE for successful delivery and FALSE for failure. */ int open_warning_by_mail(struct query *); #if defined(HAVE_STDARG_H) void stuff_warning(const char *, @@ -634,6 +636,7 @@ int prc_parse_file(const char *, const flag); int prc_filecheck(const char *, const flag); /* base64.c */ +unsigned len64frombits(unsigned inlen); /** calculate length needed to encode inlen octets. warnings: 1. caller needs to add 1 for a trailing \0 byte himself. 2. returns 0 for inlen 0! */ int to64frombits(char *, const void *, int inlen, size_t outlen); int from64tobits(void *, const char *, int mxoutlen); diff --git a/fetchmail.man b/fetchmail.man index ade9bc70..01003651 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -7,10 +7,10 @@ .\" For license terms, see the file COPYING in this directory. .\" .\" -.\" Load www macros to process .URL requests, this requires groff: -.mso www.tmac .\" -.TH fetchmail 1 2021-03-29 "fetchmail 6.4.20" "fetchmail reference manual" +.\" The date is the last change of actual content, the version should match +.\" the distribution (configure.ac). +.TH FETCHMAIL 1 2022-10-30 "fetchmail 6.4.38" "fetchmail reference manual" .SH NAME fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server @@ -22,7 +22,7 @@ fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server .SH DESCRIPTION \fBfetchmail\fP is a mail-retrieval and forwarding utility; it fetches -mail from remote mailservers and forwards it to your local (client) +mail from remote mail servers and forwards it to your local (client) machine's delivery system. You can then handle the retrieved mail using normal mail user agents such as \fBmutt\fP(1), \fBelm\fP(1) or \fBMail\fP(1). The \fBfetchmail\fP utility can be run in a daemon mode @@ -39,8 +39,7 @@ TCP/IP links (such as SLIP or PPP connections), it may also be useful as a message transfer agent for sites which refuse for security reasons to permit (sender-initiated) SMTP transactions with sendmail. -.SS SUPPORT, TROUBLESHOOTING -.PP +.SH SUPPORT, TROUBLESHOOTING For troubleshooting, tracing and debugging, you need to increase fetchmail's verbosity to actually see what happens. To do that, please run \fBboth of the two following commands, @@ -62,15 +61,20 @@ env LC_ALL=C fetchmail \-vvv \-\-nodetach \-\-nosyslog (This command line actually runs fetchmail with verbose English output.) .PP Also see -.URL "https://fetchmail.sourceforge.io/fetchmail-FAQ.html#G3" "item #G3 in fetchmail's FAQ" +.UR "https://fetchmail.sourceforge.io/fetchmail-FAQ.html#G3" +item #G3 in fetchmail's FAQ +.UE . .PP You can omit the LC_ALL=C part above if you want output in the local language (if supported). However if you are posting to mailing lists, please leave it in. The maintainers do not necessarily understand your language, please use English. - - +.SH "TLS (SSL) QUICKSTART" +Your fetchmail distribution should have come with a README.SSL file, which see. +It is recommended to configure all polls with --ssl --sslproto tls1.2+ +if supported by the server, which configures fetchmail along recent IETF +proposed standards and best current practices, RFC-8314, RFC-8996, RFC-8997. .SH CONCEPTS If \fBfetchmail\fP is used with a POP or an IMAP server (but not with @@ -96,7 +100,7 @@ from the mail headers of each message. In this mode of operation, .IP Note that neither the POP nor IMAP protocols were intended for use in this fashion, and hence envelope information is often not directly -available. The ISP must stores the envelope information in some message +available. The ISP must store the envelope information in some message header \fBand\fP. The ISP must also store one copy of the message per recipient. If either of the conditions is not fulfilled, this process is unreliable, because \fBfetchmail\fP must then resort to guessing the @@ -135,7 +139,7 @@ setting up fetchmail for single-user mode, it is recommended that you use Novice mode. Expert mode provides complete control of fetchmail configuration, including the multidrop features. In either case, the 'Autoprobe' button will tell you the most capable protocol a given -mailserver supports, and warn you of potential problems with that +mail server supports, and warn you of potential problems with that server. .SH PREFACE ON THIS MANUAL @@ -191,17 +195,17 @@ Displays option help. Displays the version information for your copy of \fBfetchmail\fP. No mail fetch is performed. Instead, for each server specified, all the option information that would be computed if \fBfetchmail\fP were connecting to that -server is displayed. Any non-printables in passwords or other string names -are shown as backslashed C-like escape sequences. This option is useful for -verifying that your options are set the way you want them. +server is displayed. Any non-printable characters in passwords or other string +names are shown as back-slashed C-like escape sequences. This option is useful +for verifying that your options are set the way you want them. .TP .B \-c | \-\-check Return a status code to indicate whether there is mail waiting, without actually fetching or deleting mail (see EXIT CODES below). This option turns off daemon mode (in which it would be useless). It -doesn't play well with queries to multiple sites, and doesn't work +does not play well with queries to multiple sites, and does not work with ETRN or ODMR. It will return a false positive if you leave read but -undeleted mail in your server mailbox and your fetch protocol can't +undeleted mail in your server mailbox and your fetch protocol cannot tell kept messages from new ones. This means it will work with IMAP, not work with POP2, and may occasionally flake out under POP3. .TP @@ -212,7 +216,7 @@ suppress actual error messages). The \-\-verbose option overrides this. .TP .B \-v | \-\-verbose Verbose mode. All control messages passed between \fBfetchmail\fP -and the mailserver are echoed to stdout. Overrides \-\-silent. +and the mail server are echoed to stdout. Overrides \-\-silent. Doubling this option (\-v \-v) causes extra diagnostic information to be printed. .TP @@ -234,7 +238,7 @@ and will be changed to hard bounce mode in the next fetchmail release. .B \-a | \-\-all | (since v6.3.3) \-\-fetchall (Keyword: fetchall, since v3.0) .br -Retrieve both old (seen) and new messages from the mailserver. The +Retrieve both old (seen) and new messages from the mail server. The default is to fetch only messages the server has not marked seen. Under POP3, this option also forces the use of RETR rather than TOP. Note that POP2 retrieval behaves as though \-\-all is always on (see @@ -246,17 +250,17 @@ command-line option was added in v6.3.3. .B \-k | \-\-keep (Keyword: keep) .br -Keep retrieved messages on the remote mailserver. Normally, messages -are deleted from the folder on the mailserver after they have been retrieved. +Keep retrieved messages on the remote mail server. Normally, messages +are deleted from the folder on the mail server after they have been retrieved. Specifying the \fBkeep\fP option causes retrieved messages to remain in -your folder on the mailserver. This option does not work with ETRN or +your folder on the mail server. This option does not work with ETRN or ODMR. If used with POP3, it is recommended to also specify the \-\-uidl option or uidl keyword. .TP .B \-K | \-\-nokeep (Keyword: nokeep) .br -Delete retrieved messages from the remote mailserver. This +Delete retrieved messages from the remote mail server. This option forces retrieved mail to be deleted. It may be useful if you have specified a default of \fBkeep\fP in your \&\fI.fetchmailrc\fP. This option is forced on with ETRN and ODMR. @@ -265,20 +269,20 @@ you have specified a default of \fBkeep\fP in your (Keyword: flush) .br POP3/IMAP only. This is a dangerous option and can cause mail loss when -used improperly. It deletes old (seen) messages from the mailserver +used improperly. It deletes old (seen) messages from the mail server before retrieving new messages. \fBWarning:\fP This can cause mail loss if you check your mail with other clients than fetchmail, and cause fetchmail to delete a message it had never fetched before. It can also cause mail loss if the mail server marks the message seen after retrieval (IMAP2 servers). You should probably not use this option in your configuration file. If you use it with POP3, you must use the 'uidl' -option. What you probably want is the default setting: if you don't +option. What you probably want is the default setting: if you do not specify '\-k', then fetchmail will automatically delete messages after successful delivery. .TP .B \-\-limitflush POP3/IMAP only, since version 6.3.0. Delete oversized messages from the -mailserver before retrieving new messages. The size limit should be +mail server before retrieving new messages. The size limit should be separately specified with the \-\-limit option. This option does not work with ETRN or ODMR. .SS Protocol and Query Options @@ -287,7 +291,7 @@ work with ETRN or ODMR. (Keyword: proto[col]) .br Specify the protocol to use when communicating with the remote -mailserver. If no protocol is specified, the default is AUTO. +mail server. If no protocol is specified, the default is AUTO. \fBproto\fP may be one of the following: .RS .IP AUTO @@ -307,11 +311,12 @@ Use POP3 with Kerberos V4 authentication on port 1109. .IP SDPS Use POP3 with Demon Internet's SDPS extensions. .IP IMAP -IMAP2bis, IMAP4, or IMAP4rev1 (\fBfetchmail\fP automatically detects their capabilities). +IMAP2bis, IMAP4, or IMAP4rev1 (\fBfetchmail\fP automatically detects their +capabilities). .IP ETRN Use the ESMTP ETRN option. .IP ODMR -Use the the On-Demand Mail Relay ESMTP profile. +Use the On-Demand Mail Relay ESMTP profile. .RE .PP All these alternatives work in basically the same way (communicating @@ -358,7 +363,7 @@ lacks the required service-port assignments. See the FAQ item R12 and the \-\-ssl documentation for details. This replaces the older \-\-port option. .P -Note that this does not magically switch between TLS-wrapped and starttls +Note that this does not magically switch between TLS-wrapped and STARTTLS modes, if you specify a port number or service name here that is TLS-wrapped, meaning it starts to negotiate TLS before sending application data in the clear, you may need to specify \-\-ssl on the command line or ssl in your rcfile. @@ -380,8 +385,8 @@ option may be removed in a future fetchmail version. .B \-t <seconds> | \-\-timeout <seconds> (Keyword: timeout) .br -The timeout option allows you to set a server-nonresponse -timeout in seconds. If a mailserver does not send a greeting message +The timeout option allows you to set a server-non-response +timeout in seconds. If a mail server does not send a greeting message or respond to commands for the given number of seconds, \fBfetchmail\fP will drop the connection to it. Without such a timeout \fBfetchmail\fP might hang until the TCP connection times out, trying to fetch @@ -399,15 +404,15 @@ avoid a painful situation where fetchmail has been configured with a short timeout (a minute or less), ships a long message (many MBytes) to the local MTA, which then takes longer than timeout to respond "OK", which it eventually will; that would mean the mail gets delivered properly, but fetchmail cannot -notice it and will thus refetch this big message over and over again. +notice it and will thus re-fetch this big message over and over again. .TP .B \-\-plugin <command> (Keyword: plugin) .br The plugin option allows you to use an external program to establish the TCP connection. This is useful if you want to use ssh, or need some special -firewalling setup. The program will be looked up in $PATH and can optionally -be passed the hostname and port as arguments using "%h" and "%p" respectively +firewall setup. The program will be looked up in $PATH and can optionally +be passed the host name and port as arguments using "%h" and "%p" respectively (note that the interpolation logic is rather primitive, and these tokens must be bounded by whitespace or beginning of string or end of string). Fetchmail will write to the plugin's stdin and read from the plugin's @@ -422,7 +427,7 @@ connections. .B \-r <name> | \-\-folder <name> (Keyword: folder[s]) .br -Causes a specified non-default mail folder on the mailserver (or +Causes a specified non-default mail folder on the mail server (or comma-separated list of folders) to be retrieved. The syntax of the folder name is server-dependent. This option is not available under POP3, ETRN, or ODMR. @@ -442,9 +447,10 @@ from. The folder information is written only since version 6.3.4. (Keyword: ssl) .br Causes the connection to the mail server to be encrypted via SSL, by -negotiating SSL directly after connecting (SSL-wrapped mode). -Please see the description of \-\-sslproto below! More information is -available in the \fIREADME.SSL\fP file that ships with fetchmail. +negotiating SSL directly after connecting (called SSL-wrapped mode, or +Implicit TLS by RFC-8314). Please see the description of \-\-sslproto +below! More information is available in the \fIREADME.SSL\fP file that +ships with fetchmail. .IP Note that even if this option is omitted, fetchmail may still negotiate SSL in-band for POP3 or IMAP, through the STLS or STARTTLS feature. You @@ -504,25 +510,28 @@ controls both the SSL/TLS protocol version and, if \-\-ssl is not specified, the STARTTLS behaviour (upgrading the protocol to an SSL or TLS connection in-band). Some other options may however make TLS mandatory. -.PP +.IP Only if this option and \-\-ssl are both missing for a poll, there will be opportunistic TLS for POP3 and IMAP, where fetchmail will attempt to upgrade to TLSv1 or newer. -.PP +.IP Recognized values for \-\-sslproto are given below. You should normally -chose one of the auto-negotiating options, i. e. '\fBauto\fP' or one of -the options ending in a plus (\fB+\fP) character. Note that depending -on OpenSSL library version and configuration, some options cause -run-time errors because the requested SSL or TLS versions are not +choose one of the auto-negotiating options, i. e. '\fBtls1.2+\fP' or +\&'\fBauto\fP' or one of the other options ending in a plus (\fB+\fP) character. +Note that depending on OpenSSL library version and configuration, some options +cause run-time errors because the requested SSL or TLS versions are not supported by the particular installed OpenSSL library. .RS -.IP "\fB''\fP, the empty string" -Disable STARTTLS. If \-\-ssl is given for the same server, log an error -and pretend that '\fBauto\fP' had been used instead. +.IP '\fBTLS1.2+\fP' +(recommended). Since v6.4.0. Require TLS. Auto-negotiate TLSv1.2 or newer. .IP '\fBauto\fP' -(default). Since v6.4.0. Require TLS. Auto-negotiate TLSv1 or newer, disable SSLv3 downgrade. +(default). Since v6.4.0. Require TLS. Auto-negotiate TLSv1 or newer, disable +SSLv3 downgrade. (fetchmail 6.3.26 and older have auto-negotiated all protocols that their OpenSSL library supported, including the broken SSLv3). +.IP "\fB''\fP, the empty string" +Disable STARTTLS. If \-\-ssl is given for the same server, log an error +and pretend that '\fBauto\fP' had been used instead. .IP \&'\fBSSL23\fP' see '\fBauto\fP'. .IP \&'\fBSSL3\fP' @@ -543,8 +552,6 @@ Since v6.4.0. Require TLS v1.1 exactly. Since v6.4.0. Require TLS. Auto-negotiate TLSv1.1 or newer. .IP \&'\fBTLS1.2\fP' Since v6.4.0. Require TLS v1.2 exactly. -.IP '\fBTLS1.2+\fP' -Since v6.4.0. Require TLS. Auto-negotiate TLSv1.2 or newer. .IP \&'\fBTLS1.3\fP' Since v6.4.0. Require TLS v1.3 exactly. .IP '\fBTLS1.3+\fP' @@ -560,7 +567,7 @@ force an unencrypted connection) or 'auto' (to enforce TLS). (Keyword: sslcertck, default enabled since v6.4.0) .br .B \-\-sslcertck causes fetchmail to require that SSL/TLS be used and -disconnect if it can not successfully negotiate SSL or TLS, or if it +disconnect unless it can successfully negotiate SSL or TLS, or if it cannot successfully verify and validate the certificate and follow it to a trust anchor (or trusted root certificate). The trust anchors are given as a set of local trusted certificates (see the \fBsslcertfile\fP @@ -568,10 +575,6 @@ and \fBsslcertpath\fP options). If the server certificate cannot be obtained or is not signed by one of the trusted ones (directly or indirectly), fetchmail will disconnect, regardless of the \fBsslfingerprint\fP option. -.IP -Note that CRL (certificate revocation lists) are only supported in -OpenSSL 0.9.7 and newer! Your system clock should also be reasonably -accurate when using this option. .TP .B \-\-nosslcertck (Keyword: no sslcertck, only in v6.4.X) @@ -604,8 +607,8 @@ Sets the directory fetchmail uses to look up local certificates. The default is your OpenSSL default directory. The directory must be hashed the way OpenSSL expects it - every time you add or modify a certificate in the directory, you need to use the \fBc_rehash\fP tool (which comes with OpenSSL in the tools/ -subdirectory). Also, after OpenSSL upgrades, you may need to run -\fBc_rehash\fP; particularly when upgrading from 0.9.X to 1.0.0. +sub-directory). Also, after OpenSSL upgrades, you may need to run +\fBc_rehash\fP. .IP This can be given in addition to \fB\-\-sslcertfile\fP above, which see for precedence rules. @@ -622,10 +625,10 @@ administrator of your upstream server and ask for a proper SSL certificate to be used. If that cannot be attained, this option can be used to specify the name (CommonName) that fetchmail expects on the server certificate. A correctly configured server will have this set to -the hostname by which it is reached, and by default fetchmail will +the host name by which it is reached, and by default fetchmail will expect as much. Use this option when the CommonName is set to some other value, to avoid the "Server CommonName mismatch" warning, and only if -the upstream server can't be made to use proper certificates. +the upstream server's operator cannot be made to use proper certificates. .TP .B \-\-sslfingerprint <fingerprint> (Keyword: sslfingerprint) @@ -661,10 +664,10 @@ For details, see (Keyword: smtp[host]) .br Specify a hunt list of hosts to forward mail to (one or more -hostnames, comma-separated). Hosts are tried in list order; the first +host names, comma-separated). Hosts are tried in list order; the first one that is up becomes the forwarding target for the current run. If this option is not specified, 'localhost' is used as the default. -Each hostname may have a port number following the host name. The +Each host name may have a port number following the host name. The port number is separated from the host name by a slash; the default port is "smtp". If you specify an absolute path name (beginning with a /), it will be interpreted as the name of a UNIX socket accepting @@ -726,12 +729,12 @@ circumstances. Also see \-\-softbounce (default) and its inverse. .br This option lets \fBfetchmail\fP use a Message or Local Delivery Agent (MDA or LDA) directly, rather than forward via SMTP or LMTP. - +.IP To avoid losing mail, use this option only with MDAs like maildrop or MTAs like sendmail that exit with a nonzero status on disk-full and other delivery errors; the nonzero status tells fetchmail that delivery failed and prevents the message from being deleted on the server. - +.IP If \fBfetchmail\fP is running as root, it sets its user id while delivering mail through an MDA as follows: First, the FETCHMAILUSER, LOGNAME, and USER environment variables are checked in this order. The @@ -739,12 +742,12 @@ value of the first variable from his list that is defined (even if it is empty!) is looked up in the system user database. If none of the variables is defined, fetchmail will use the real user id it was started with. If one of the variables was defined, but the user stated there -isn't found, fetchmail continues running as root, without checking +is not found, fetchmail continues running as root, without checking remaining variables on the list. Practically, this means that if you run fetchmail as root (not recommended), it is most useful to define the FETCHMAILUSER environment variable to set the user that the MDA should run as. Some MDAs (such as maildrop) are designed to be setuid root and -setuid to the recipient's user id, so you don't lose functionality this +setuid to the recipient's user id, so you do not lose functionality this way even when running fetchmail as unprivileged user. Check the MDA's manual for details. @@ -811,7 +814,7 @@ mail to an SMTP listener daemon. An argument of '\-' causes the SMTP batch to be written to standard output, which is of limited use: this only makes sense for debugging, because fetchmail's regular output is interspersed on the same channel, -so this isn't suitable for mail delivery. This special mode may be +so this is not suitable for mail delivery. This special mode may be removed in a later release. Note that fetchmail's reconstruction of MAIL FROM and RCPT TO lines is @@ -823,7 +826,7 @@ MULTIDROP MAILBOXES below apply. This mode has precedence before (Keyword: bad\-header; since v6.3.15) .br Specify how fetchmail is supposed to treat messages with bad headers, -i. e. headers with bad syntax. Traditionally, fetchmail has rejected such +i.e., headers with bad syntax. Traditionally, fetchmail has rejected such messages, but some distributors modified fetchmail to accept them. You can now configure fetchmail's behaviour per server. @@ -856,7 +859,7 @@ Takes an interval in seconds. When you call \fBfetchmail\fP with a 'limit' option in daemon mode, this controls the interval at which warnings about oversized messages are mailed to the calling user (or the user specified by the 'postmaster' option). One such -notification is always mailed at the end of the the first poll that +notification is always mailed at the end of the first poll that the oversized message is detected. Thereafter, re-notification is suppressed until after the warning interval elapses (it will take place at the end of the first following poll). @@ -921,7 +924,7 @@ defense against line drops on POP3 servers. Under IMAP, \fBfetchmail\fP normally issues an EXPUNGE command after each deletion in order to force the deletion to be done immediately. This is safest when your connection to the server is flaky and expensive, as it avoids -resending duplicate mail after a line hit. However, on large +re-sending duplicate mail after a line hit. However, on large mailboxes the overhead of re-indexing after every message can slam the server pretty hard, so if your connection is reliable it is good to do expunges less frequently. Also note that some servers enforce a delay @@ -938,7 +941,7 @@ or ODMR. .B \-u <name> | \-\-user <name> | \-\-username <name> (Keyword: user[name]) .br -Specifies the user identification to be used when logging in to the mailserver. +Specifies the user identification to be used when logging in to the mail server. The appropriate user identification is both server and user-dependent. The default is your login name on the client machine that is running \fBfetchmail\fP. @@ -951,8 +954,8 @@ Require that a specific interface device be up and have a specific local or remote IPv4 (IPv6 is not supported by this option yet) address (or range) before polling. Frequently \fBfetchmail\fP is used over a transient point-to-point TCP/IP link established directly -to a mailserver via SLIP or PPP. That is a relatively secure channel. -But when other TCP/IP routes to the mailserver exist (e.g. when the link +to a mail server via SLIP or PPP. That is a relatively secure channel. +But when other TCP/IP routes to the mail server exist (e.g., when the link is connected to an alternate ISP), your username and password may be vulnerable to snooping (especially when daemon mode automatically polls for mail, shipping a clear password over the net at predictable @@ -964,11 +967,11 @@ address, polling will be skipped. The format is: interface/iii.iii.iii.iii[/mmm.mmm.mmm.mmm] .fi .sp -The field before the first slash is the interface name (i.e. sl0, ppp0 +The field before the first slash is the interface name (i.e., sl0, ppp0 etc.). The field before the second slash is the acceptable IP address. The field after the second slash is a mask which specifies a range of IP addresses to accept. If no mask is present 255.255.255.255 is -assumed (i.e. an exact match). This option is currently only supported +assumed (i.e., an exact match). This option is currently only supported under Linux and FreeBSD. Please see the \fBmonitor\fP section for below for FreeBSD specific information. .sp @@ -978,7 +981,7 @@ Note that this option may be removed from a future fetchmail version. (Keyword: monitor) .br Daemon mode can cause transient links which are automatically taken down -after a period of inactivity (e.g. PPP links) to remain up +after a period of inactivity (e.g., PPP links) to remain up indefinitely. This option identifies a system TCP/IP interface to be monitored for activity. After each poll interval, if the link is up but no other activity has occurred on the link, then the poll will be @@ -986,7 +989,7 @@ skipped. However, when fetchmail is woken up by a signal, the monitor check is skipped and the poll goes through unconditionally. This option is currently only supported under Linux and FreeBSD. For the \fBmonitor\fP and \fBinterface\fP options to work for non root -users under FreeBSD, the fetchmail binary must be installed SGID kmem. +users under FreeBSD, the fetchmail binary must be installed setgid kmem. This would be a security hole, but fetchmail runs with the effective GID set to that of the kmem group \fIonly\fP when interface data is being collected. @@ -1003,24 +1006,31 @@ excruciating exactness, \fBkerberos_v4\fP), \fBgssapi\fP, \fBcram\-md5\fP, \fBotp\fP, \fBntlm\fP, \fBmsn\fP (only for POP3), \fBexternal\fP (only IMAP) and \fBssh\fP. When \fBany\fP (the default) is specified, fetchmail tries -first methods that don't require a password (EXTERNAL, GSSAPI, KERBEROS\ IV, +first methods that do not require a password (EXTERNAL, GSSAPI, KERBEROS\ IV, KERBEROS\ 5); then it looks for methods that mask your password (CRAM-MD5, NTLM, X\-OTP - note that MSN is only supported for POP3, but not -autoprobed); and only if the server doesn't -support any of those will it ship your password en clair. Other values -may be used to force various authentication methods -(\fBssh\fP suppresses authentication and is thus useful for IMAP PREAUTH). -(\fBexternal\fP suppresses authentication and is thus useful for IMAP EXTERNAL). +auto-probed); and only if the server does not +support any of those will it ship your password unencrypted. Other values +may be used to force various authentication methods: +\fBssh\fP suppresses authentication and is thus useful for IMAP PREAUTH +(if you are using a secure \-\-plugin, for instance, a properly configured +ssh, you may also need to set \-\-sslproto\ '' or, in the rcfile, sslproto\ '', +in order to avoid fetchmail negotiating STARTTLS over SSH). +\fBexternal\fP suppresses authentication and is thus useful for IMAP EXTERNAL. Any value other than \fBpassword\fP, \fBcram\-md5\fP, \fBntlm\fP, \&\fBmsn\fP or \fBotp\fP suppresses fetchmail's normal inquiry for a password. Specify \fBssh\fP when you are using an end-to-end secure -connection such as an ssh tunnel; specify \fBexternal\fP when you use +connection such as an ssh tunnel (in this case you may also want to specify +\&\fB\-\-sslproto\ ''\fP, which see); specify \fBexternal\fP when you use TLS with client authentication and specify \fBgssapi\fP or \&\fBkerberos_v4\fP if you are using a protocol variant that employs GSSAPI or K4. Choosing KPOP protocol automatically selects Kerberos authentication. This option does not work with ETRN. GSSAPI service names are in line with RFC-2743 and IANA registrations, see -.URL https://www.iana.org/assignments/gssapi-service-names/ "Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple Authentication and Security Layer (SASL) Service Names" . +.UR https://www.iana.org/assignments/gssapi-service-names/ +Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple +Authentication and Security Layer (SASL) Service Names +.UE . .SS Miscellaneous Options .TP .B \-f <pathname> | \-\-fetchmailrc <pathname> @@ -1055,7 +1065,7 @@ on a second line. .br Normally, \fBfetchmail\fP edits RFC-822 address headers (To, From, Cc, Bcc, and Reply\-To) in fetched mail so that any mail IDs local to the -server are expanded to full addresses (@ and the mailserver hostname are +server are expanded to full addresses (@ and the mail server host name are appended). This enables replies on the client to get addressed correctly (otherwise your mailer might think they should be addressed to local users on the client machine!). This option disables the rewrite. @@ -1082,7 +1092,7 @@ but discouraged because it is not fully reliable. Note that fetchmail expects the Received-line to be in a specific format: It must contain "by \fIhost\fP for \fIaddress\fP", where -\fIhost\fP must match one of the mailserver names that fetchmail +\fIhost\fP must match one of the mail server names that fetchmail recognizes for the account in question. .sp The optional count argument (only available in the configuration file) @@ -1101,12 +1111,12 @@ if either is applicable). This option is useful if you are using (or your mail redirection provider) is using qmail. One of the basic features of qmail is the \fIDelivered\-To:\fP message header. Whenever qmail delivers a message to a local mailbox -it puts the username and hostname of the envelope recipient on this +it puts the username and host name of the envelope recipient on this line. The major reason for this is to prevent mail loops. To set up qmail to batch mail for a disconnected site the ISP-mailhost will have normally put that site in its 'Virtualhosts' control file so it will add a prefix to all mail addresses for this site. This results in mail -.\" The \&@\& tries to stop HTML converters from making a mailto URL here. +.\" The \&@\& tries to stop HTML converters from making a mailto: URL here: sent to 'username\&@\&userhost.userdom.dom.com' having a \fIDelivered\-To:\fR line of the form: .IP @@ -1142,9 +1152,9 @@ Normal user authentication in \fBfetchmail\fP is very much like the authentication mechanism of .BR ftp (1). The correct user-id and password depend upon the underlying security -system at the mailserver. +system at the mail server. .PP -If the mailserver is a Unix machine on which you have an ordinary user +If the mail server is a Unix machine on which you have an ordinary user account, your regular login name and password are used with .BR fetchmail . If you use the same login name on both the server and the client machines, @@ -1155,24 +1165,23 @@ client machine as the user-id on the server machine. If you use a different login name on the server machine, specify that login name with the .B \-u -option. e.g. if your login name is 'jsmith' on a machine named 'mailgrunt', +option. E.g., if your login name is 'jsmith' on a machine named 'mailgrunt', you would start \fBfetchmail\fP as follows: .IP fetchmail \-u jsmith mailgrunt .PP The default behavior of \fBfetchmail\fP is to prompt you for your -mailserver password before the connection is established. This is the +mail server password before the connection is established. This is the safest way to use \fBfetchmail\fP and ensures that your password will not be compromised. You may also specify your password in your \fI~/.fetchmailrc\fP file. This is convenient when using \fBfetchmail\fP in daemon mode or with scripts. .SS Using netrc files -.PP If you do not specify a password, and \fBfetchmail\fP cannot extract one from your \fI~/.fetchmailrc\fP file, it will look for a \fI~/.netrc\fP file in your home directory before requesting one interactively; if an -entry matching the mailserver is found in that file, the password will +entry matching the mail server is found in that file, the password will be used. Fetchmail first looks for a match on poll name; if it finds none, it checks for a match on via name. See the .BR ftp (1) @@ -1192,27 +1201,17 @@ provide more than one password. This feature may allow you to avoid duplicating password information in more than one file. .PP -On mailservers that do not provide ordinary user accounts, your user-id and +On mail servers that do not provide ordinary user accounts, your user-id and password are usually assigned by the server administrator when you apply for -a mailbox on the server. Contact your server administrator if you don't know +a mailbox on the server. Contact your server administrator if you do not know the correct user-id and password for your mailbox account. .SS Secure Socket Layers (SSL) and Transport Layer Security (TLS) -.PP All retrieval protocols can use SSL or TLS wrapping for the -transport. Additionally, POP3 and IMAP retrival can also negotiate +transport. Additionally, POP3 and IMAP retrieval can also negotiate SSL/TLS by means of STARTTLS (or STLS). .PP -Note that fetchmail currently uses the OpenSSL library, which is -severely underdocumented, so failures may occur just because the -programmers are not aware of OpenSSL's requirement of the day. -For instance, since v6.3.16, fetchmail calls -OpenSSL_add_all_algorithms(), which is necessary to support certificates -using SHA256 on OpenSSL 0.9.8 -- this information is deeply hidden in -the documentation and not at all obvious. Please do not hesitate to -report subtle SSL failures. -.PP -You can access SSL encrypted services by specifying the options starting +You can access TLS-encrypted services by specifying the options starting with \-\-ssl, such as \-\-ssl, \-\-sslproto, \-\-sslcertck, and others. You can also do this using the corresponding user options in the .fetchmailrc file. Some services, such as POP3 and IMAP, have @@ -1222,10 +1221,13 @@ no explicit port is specified. Also, the \-\-sslcertck command line or sslcertck run control file option should be used to force strict certificate checking with older fetchmail versions - see below. .PP -If SSL is not configured, fetchmail will usually opportunistically try to use -STARTTLS. STARTTLS can be enforced by using \-\-sslproto\~auto and +If TLS or SSL is not configured, fetchmail will usually still try to use +STARTTLS somewhat opportunistically. In practice, is it still mandatory +because \-\-sslcertck is a default setting and implicitly requires STARTTLS. +.PP +STARTTLS can be enforced by using \-\-sslproto\~auto and defeated by using \-\-sslproto\~''. -TLS connections use the same port as the unencrypted version of the +STARTTLS connections use the same port as the unencrypted version of the protocol and negotiate TLS via special command. The \-\-sslcertck command line or sslcertck run control file option should be used to force strict certificate checking - see below. @@ -1243,7 +1245,7 @@ certificate. If the \-\-sslcertck command line option or sslcertck run control file option is used, fetchmail will instead abort if any of these checks fail, because it must assume that there is a man-in-the-middle attack in this scenario, hence fetchmail must not -expose cleartext passwords. Use of the sslcertck or \-\-sslcertck option +expose clear-text passwords. Use of the sslcertck or \-\-sslcertck option is therefore advised; it has become the default in fetchmail 6.4.0. .PP Some SSL encrypted servers may request a client side certificate. A client @@ -1258,21 +1260,22 @@ the certificate files is that required by the underlying SSL libraries .PP A word of care about the use of SSL: While above mentioned setup with self-signed server certificates retrieved over the wires -can protect you from a passive eavesdropper, it doesn't help against an -active attacker. It's clearly an improvement over sending the +can protect you from a passive eavesdropper, it does not help against an +active attacker. It is clearly an improvement over sending the passwords in clear, but you should be aware that a man-in-the-middle attack is trivially possible (in particular with tools such as -.URL "https://monkey.org/~dugsong/dsniff/" "dsniff" , -). Use of strict certificate checking with a certification authority +.UR "https://monkey.org/~dugsong/dsniff/" +dsniff +.UE ). +Use of strict certificate checking with a certification authority recognized by server and client, or perhaps of an SSH tunnel (see below for some examples) is preferable if you care seriously about the security of your mailbox and passwords. .SH POP3 VARIANTS -.PP Early versions of POP3 (RFC1081, RFC1225) supported a crude form of independent authentication using the \fI.rhosts\fP file on the -mailserver side. Under this RPOP variant, a fixed per-user ID +mail server side. Under this RPOP variant, a fixed per-user ID equivalent to a password was sent in clear over a link to a reserved port, with the command RPOP rather than PASS to alert the server that it should do special checking. RPOP is supported by \fBfetchmail\fP @@ -1317,25 +1320,24 @@ fetchmail, but the behavior may change in future versions. In particular, fetchmail may prefer the RETR command because the TOP command causes much grief on some servers and is only optional. .SH ALTERNATE AUTHENTICATION FORMS/METHODS -.PP If your \fBfetchmail\fP was built with Kerberos support and you specify Kerberos authentication (either with \-\-auth or the \fI.fetchmailrc\fP option \fBauthenticate kerberos_v4\fP) it will try to get a Kerberos -ticket from the mailserver at the start of each query. Note: if +ticket from the mail server at the start of each query. Note: if either the pollname or via name is 'hesiod', fetchmail will try to use -Hesiod to look up the mailserver. +Hesiod to look up the mail server. .PP If you use POP3 or IMAP with GSSAPI authentication, \fBfetchmail\fP will expect the server to have RFC1731- or RFC1734-conforming GSSAPI capability, and will use it. Currently this has only been tested over -Kerberos V, so you're expected to already have a ticket-granting +Kerberos\ 5, so you are expected to already have a ticket-granting ticket. You may pass a username different from your principal name using the standard \fB\-\-user\fP command or by the \fI.fetchmailrc\fP option \fBuser\fP. .PP If your IMAP daemon returns the PREAUTH response in its greeting line, fetchmail will notice this and skip the normal authentication step. -This can be useful, e.g. if you start imapd explicitly using ssh. +This can be useful, e.g., if you start imapd explicitly using ssh. In this case you can declare the authentication value 'ssh' on that site entry to stop \fI.fetchmail\fP from asking you for a password when it starts up. @@ -1354,19 +1356,18 @@ avoids sending secrets over the net unencrypted. .PP Compuserve's RPA authentication is supported. If you compile in the support, \fBfetchmail\fP will try to perform an RPA pass-phrase -authentication instead of sending over the password en clair if it -detects "@compuserve.com" in the hostname. +authentication instead of sending over the password unencrypted if it +detects "@compuserve.com" in the host name. .PP If you are using IMAP, Microsoft's NTLM authentication (used by Microsoft Exchange) is supported. If you compile in the support, \fBfetchmail\fP will try to perform an NTLM authentication (instead of sending over the -password en clair) whenever the server returns AUTH=NTLM in its +password unencrypted) whenever the server returns AUTH=NTLM in its capability response. Specify a user option value that looks like \&'user@domain': the part to the left of the @ will be passed as the username and the part to the right as the NTLM domain. .SS ESMTP AUTH -.PP \fBfetchmail\fP also supports authentication to the ESMTP server on the client side according to RFC 2554. You can specify a name/password pair to be used with the keywords 'esmtpname' and 'esmtppassword'; the former @@ -1401,13 +1402,12 @@ fetchmail will always start in daemon mode unless you override it with the command-line option \-\-daemon 0 or \-d0. .PP Only one daemon process is permitted per user; in daemon mode, -\fBfetchmail\fP sets up a per-user lockfile to guarantee this. +\fBfetchmail\fP sets up a per-user lock file to guarantee this. (You can however cheat and set the FETCHMAILHOME environment variable to overcome this setting, but in that case, it is your responsibility to -make sure you aren't polling the same server with two processes at the +make sure you are not polling the same server with two processes at the same time.) .SS Awakening the background daemon -.PP Normally, calling fetchmail with a daemon in the background sends a wake-up signal to the daemon and quits without output. The background daemon then starts its next poll cycle immediately. The wake-up signal, @@ -1415,7 +1415,6 @@ SIGUSR1, can also be sent manually. The wake-up action also clears any \&'wedged' flags indicating that connections have wedged due to failed authentication or multiple timeouts. .SS Terminating the background daemon -.PP The option .B \-q or @@ -1427,7 +1426,6 @@ will kill the running daemon process and then quit. Otherwise, \fBfetchmail\fP will first kill a running daemon process and then continue running with the other options. .SS Useful options for daemon mode -.PP The .B \-L <filename> or @@ -1440,7 +1438,7 @@ command with the filename as its sole argument to create it. .br This option allows you to redirect status messages into a specified logfile (follow the option with the logfile name). The -logfile is opened for append, so previous messages aren't deleted. This +logfile is opened for append, so previous messages are not deleted. This is primarily useful for debugging configurations. Note that fetchmail does not detect if the logfile is rotated, the logfile is only opened once when fetchmail starts. You need to restart fetchmail after rotating @@ -1463,7 +1461,7 @@ The .B \-\-nosyslog option turns off use of .BR syslog (3), -assuming it's turned on in the \fI~/.fetchmailrc\fP file. +assuming it is turned on in the \fI~/.fetchmailrc\fP file. This option is overridden, in certain situations, by \fB\-\-logfile\fP (which see). .PP @@ -1483,10 +1481,10 @@ Note that while running in daemon mode polling a POP2 or IMAP2bis server, transient errors (such as DNS failures or sendmail delivery refusals) may force the fetchall option on for the duration of the next polling cycle. This is a robustness feature. It means that if a message is -fetched (and thus marked seen by the mailserver) but not delivered +fetched (and thus marked seen by the mail server) but not delivered locally due to some transient error, it will be re-fetched during the -next poll cycle. (The IMAP logic doesn't delete messages until -they're delivered, so this problem does not arise.) +next poll cycle. (The IMAP logic does not delete messages until +they are delivered, so this problem does not arise.) .PP If you touch or change the \fI~/.fetchmailrc\fP file while fetchmail is running in daemon mode, this will be detected at the beginning of the @@ -1498,7 +1496,6 @@ needs to query for passwords, of that if you break the silently vanish away on startup. .SH ADMINISTRATIVE OPTIONS -.PP The .B \-\-postmaster <name> option (keyword: set postmaster) specifies the last-resort username to @@ -1528,7 +1525,7 @@ transmission, and tells the MTA it forwards to that the mail came from the machine fetchmail itself is running on. If the invisible option is on, the Received header is suppressed and fetchmail tries to spoof the MTA it forwards to into thinking it came directly from the -mailserver host. +mail server host. .PP The .B \-\-showdots @@ -1553,7 +1550,7 @@ default is not adding any such header. In this is called 'tracepolls'. .SH RETRIEVAL FAILURE MODES -The protocols \fBfetchmail\fP uses to talk to mailservers are next to +The protocols \fBfetchmail\fP uses to talk to mail servers are next to bulletproof. In normal operation forwarding to port 25, no message is ever deleted (or even marked for deletion) on the host until the SMTP listener on the client side has acknowledged to \fBfetchmail\fP that @@ -1578,11 +1575,11 @@ happens, you will lose mail. The normal mode of \fBfetchmail\fP is to try to download only 'new' messages, leaving untouched (and undeleted) messages you have already read directly on the server (or fetched with a previous \fIfetchmail -\-\-keep\fP). But you may find that messages you've already read on the -server are being fetched (and deleted) even when you don't specify +\-\-keep\fP). But you may find that messages you have already read on the +server are being fetched (and deleted) even when you do not specify \-\-all. There are several reasons this can happen. .PP -One could be that you're using POP2. The POP2 protocol includes no +One could be that you are using POP2. The POP2 protocol includes no representation of 'new' or 'old' state in messages, so \fBfetchmail\fP must treat all messages as new all the time. But POP2 is obsolete, so this is unlikely. @@ -1594,19 +1591,19 @@ messages are appended to the end of the mailbox; when this is not true it may treat some old messages as new and vice versa. Using UIDL whilst setting fastuidl 0 might fix this, otherwise, consider switching to IMAP. .PP -Yet another POP3 problem is that if they can't make tempfiles in the +Yet another POP3 problem is that if they cannot make temporary files in the user's home directory, some POP3 servers will hand back an undocumented response that causes fetchmail to spuriously report "No mail". .PP The IMAP code uses the presence or absence of the server flag \eSeen -to decide whether or not a message is new. This isn't the right thing +to decide whether or not a message is new. This is not the right thing to do, fetchmail should check the UIDVALIDITY and use UID, but it -doesn't do that yet. Under Unix, it counts on your IMAP server to notice +does not do that yet. Under Unix, it counts on your IMAP server to notice the BSD-style Status flags set by mail user agents and set the \eSeen flag from them when appropriate. All Unix IMAP servers we know of do -this, though it's not specified by the IMAP RFCs. If you ever trip over -a server that doesn't, the symptom will be that messages you have +this, though it is not specified by the IMAP RFCs. If you ever trip over +a server that does not, the symptom will be that messages you have already read on your host will look new to the server. In this (unlikely) case, only messages you fetched with \fIfetchmail \-\-keep\fP will be both undeleted and marked old. @@ -1649,13 +1646,13 @@ the message can be set with the 'antispam' option. This is one of the \fIonly\fP three circumstance under which fetchmail ever discards mail (the others are the 552 and 553 errors described below, and the suppression of -multidropped messages with a message-ID already seen). +multi-dropped messages with a message-ID already seen). .PP If \fBfetchmail\fP is fetching from an IMAP server, the antispam response will be detected and the message rejected immediately after the headers have been fetched, -without reading the message body. Thus, you won't pay for downloading +without reading the message body. Thus, you will not pay for downloading spam message bodies. .PP By default, the list of antispam responses is empty. @@ -1677,7 +1674,7 @@ Delete the message from the server. Send bounce-mail to the originator. .TP 5 553 (invalid sending domain) -Delete the message from the server. Don't even try to send +Delete the message from the server. Do not even try to send bounce-mail to the originator. .PP Other errors greater or equal to 500 trigger bounce mail back to the @@ -1691,7 +1688,8 @@ When there is a conflict between the command-line arguments and the arguments in this file, the command-line arguments take precedence. .PP To protect the security of your passwords, -your \fI~/.fetchmailrc\fP may not normally have more than 0700 (u=rwx,g=,o=) permissions; +your \fI~/.fetchmailrc\fP may not normally have more than 0700 (u=rwx,g=,o=) +permissions; \fBfetchmail\fP will complain and exit otherwise (this check is suppressed when \-\-version is on). @@ -1701,13 +1699,12 @@ be executed when \fBfetchmail\fP is called with no arguments. .SS Run Control Syntax -.PP Comments begin with a '#' and extend through the end of the line. Otherwise the file consists of a series of server entries or global option statements in a free-format, token-oriented syntax. .PP There are four kinds of tokens: grammar keywords, numbers -(i.e. decimal digit sequences), unquoted strings, and quoted strings. +(i.e., decimal digit sequences), unquoted strings, and quoted strings. A quoted string is bounded by double quotes and may contain whitespace (and quoted digits are treated as a string). Note that quoted strings will also contain line feed characters if they run across @@ -1745,17 +1742,18 @@ For backward compatibility, the word 'server' is a synonym for 'poll'. .PP You can use the noise keywords 'and', 'with', \&'has', 'wants', and 'options' anywhere in an entry to make -it resemble English. They're ignored, but but can make entries much +it resemble English. They are ignored, but can make entries much easier to read at a glance. The punctuation characters ':', ';' and \&',' are also ignored. -.SS Poll vs. Skip +.SS Poll versus Skip The 'poll' verb tells fetchmail to query this host when it is run with no arguments. The 'skip' verb tells \fBfetchmail\fP not to poll this host unless it is explicitly named on the command line. (The 'skip' verb allows you to experiment with test entries safely, or easily disable entries for hosts that are temporarily down.) -.SS Keyword/Option Summary + +.SH KEYWORD/OPTION SUMMARY Here are the legal options. Keyword suffixes enclosed in square brackets are optional. Those corresponding to short command-line options are followed by '\-' and the appropriate option letter. If @@ -1831,7 +1829,7 @@ l l l lw34. Keyword Opt Mode Function _ via \& \& T{ -Specify DNS name of mailserver, overriding poll name +Specify DNS name of mail server, overriding poll name T} proto[col] \-p \& T{ Specify protocol (case insensitive): @@ -1863,7 +1861,7 @@ qvirtual \-Q m T{ Qmail virtual domain prefix to remove from user name T} aka \& m T{ -Specify alternate DNS names of mailserver +Specify alternate DNS names of mail server T} interface \-I \& T{ specify IP interface(s) that must be up for server poll to take place @@ -1958,7 +1956,7 @@ T} sslcertpath \& \& T{ Specify c_rehash-ed directory with trusted CA certificates. T} -sslfingerprint <HASH> \& \& T{ +sslfingerprint \& \& T{ Specify the expected server certificate finger print from an MD5 hash. Fetchmail will disconnect and log an error if it does not match. T} @@ -1999,7 +1997,7 @@ postconnect \& \& T{ Command to be executed after each connection T} keep \-k \& T{ -Don't delete seen messages from server (for POP3, uidl is recommended) +Do not delete seen messages from server (for POP3, uidl is recommended) T} flush \-F \& T{ Flush all seen messages before querying (DANGEROUS) @@ -2038,34 +2036,34 @@ no keep \-K \& T{ Delete seen messages from server (default) T} no flush \& \& T{ -Don't flush all seen messages before querying (default) +Do not flush all seen messages before querying (default) T} no fetchall \& \& T{ Retrieve only new messages (default) T} no rewrite \& \& T{ -Don't rewrite headers +Do not rewrite headers T} no stripcr \& \& T{ -Don't strip carriage returns (default) +Do not strip carriage returns (default) T} no forcecr \& \& T{ -Don't force carriage returns at EOL (default) +Do not force carriage returns at EOL (default) T} no pass8bits \& \& T{ -Don't force BODY=8BITMIME to ESMTP listener (default) +Do not force BODY=8BITMIME to ESMTP listener (default) T} no dropstatus \& \& T{ -Don't drop Status headers (default) +Do not drop Status headers (default) T} no dropdelivered \& \& T{ -Don't drop Delivered\-To headers (default) +Do not drop Delivered\-To headers (default) T} no mimedecode \& \& T{ -Don't convert quoted-printable to 8-bit in MIME messages (default) +Do not convert quoted-printable to 8-bit in MIME messages (default) T} no idle \& \& T{ -Don't idle waiting for new messages after each poll (IMAP only) +Do not idle waiting for new messages after each poll (IMAP only) T} limit \-l \& T{ Set message size limit @@ -2099,12 +2097,11 @@ option) and \fIfollow\fP all server descriptions and options. In the .fetchmailrc file, the 'envelope' string argument may be preceded by a whitespace-separated number. This number, if specified, is the number of such headers to skip over (that is, an argument of 1 -selects the second header of the given type). This is sometime useful +selects the second header of the given type). This is sometimes useful for ignoring bogus envelope headers created by an ISP's local delivery agent or internal forwards (through mail inspection systems, for instance). .SS Keywords Not Corresponding To Option Switches -.PP The 'folder' and 'smtphost' options (unlike their command-line equivalents) can take a space- or comma-separated list of names following them. @@ -2120,24 +2117,23 @@ and 'no envelope'. The 'via' option is for if you want to have more than one configuration pointing at the same site. If it is present, the string argument will be taken as the actual DNS name of the -mailserver host to query. +mail server host to query. This will override the argument of poll, which can then simply be a -distinct label for the configuration (e.g. what you would give on the +distinct label for the configuration (e.g., what you would give on the command line to explicitly query this host). .PP The 'interval' option (which takes a numeric argument) allows you to poll a server less frequently than the basic poll interval. If you say \&'interval N' the server this option is attached to will only be queried every N poll intervals. -.SS Singledrop vs. Multidrop options -.PP +.SS Singledrop versus Multidrop options Please ensure you read the section titled \fBTHE USE AND ABUSE OF MULTIDROP MAILBOXES \fP if you intend to use multidrop mode. .PP The 'is' or 'to' keywords associate the following local (client) name(s) (or server-name to client-name mappings separated by =) with -the mailserver user name in the entry. If an is/to list has '*' as +the mail server user name in the entry. If an is/to list has '*' as its last name, unrecognized names are simply passed through. Note that until \fBfetchmail\fP version 6.3.4 inclusively, these lists could only contain local parts of user names (fetchmail would only look at the part @@ -2148,7 +2144,7 @@ similar mappings. .PP A single local name can be used to support redirecting your mail when your username on the client machine is different from your name on the -mailserver. When there is only a single local name, mail is forwarded +mail server. When there is only a single local name, mail is forwarded to that local username regardless of the message's Received, To, Cc, and Bcc headers. In this case, \fBfetchmail\fP @@ -2157,14 +2153,14 @@ never does DNS lookups. When there is more than one local name (or name mapping), \fBfetchmail\fP looks at the envelope header, if configured, and otherwise at the Received, To, Cc, and Bcc headers of retrieved mail -(this is 'multidrop mode'). It looks for addresses with hostname parts +(this is 'multidrop mode'). It looks for addresses with host name parts that match your poll name or your 'via', 'aka' or 'localdomains' -options, and usually also for hostname parts which DNS tells it are -aliases of the mailserver. See the discussion of 'dns', 'checkalias', +options, and usually also for host name parts which DNS tells it are +aliases of the mail server. See the discussion of 'dns', 'checkalias', \&'localdomains', and 'aka' for details on how matching addresses are handled. .PP -If \fBfetchmail\fP cannot match any mailserver usernames or +If \fBfetchmail\fP cannot match any mail server usernames or localdomain addresses, the mail will be bounced. Normally it will be bounced to the sender, but if the 'bouncemail' global option is off, the mail will go to the local postmaster instead. @@ -2173,17 +2169,17 @@ global option is off, the mail will go to the local postmaster instead. The 'dns' option (normally on) controls the way addresses from multidrop mailboxes are checked. On, it enables logic to check each host address that does not match an 'aka' or 'localdomains' declaration -by looking it up with DNS. When a mailserver username is recognized -attached to a matching hostname part, its local mapping is added to +by looking it up with DNS. When a mail server username is recognized +attached to a matching host name part, its local mapping is added to the list of local recipients. .PP The 'checkalias' option (normally off) extends the lookups performed by the 'dns' keyword in multidrop mode, providing a way to cope with remote MTAs that identify themselves using their canonical name, while -they're polled using an alias. +they are polled using an alias. When such a server is polled, checks to extract the envelope address fail, and \fBfetchmail\fP reverts to delivery using the To/Cc/Bcc -headers (See below \&'Header vs. Envelope addresses'). +headers (See below \&'Header versus Envelope addresses'). Specifying this option instructs \fBfetchmail\fP to retrieve all the IP addresses associated with both the poll name and the name used by the remote MTA and to do a comparison of the IP addresses. This comes in @@ -2195,11 +2191,11 @@ The 'aka' option is for use with multidrop mailboxes. It allows you to pre-declare a list of DNS aliases for a server. This is an optimization hack that allows you to trade space for speed. When \fBfetchmail\fP, while processing a multidrop mailbox, grovels through -message headers looking for names of the mailserver, pre-declaring +message headers looking for names of the mail server, pre-declaring common ones can save it from having to do DNS lookups. Note: the names you give as arguments to 'aka' are matched as suffixes -- if you specify -(say) 'aka netaxs.com', this will match not just a hostname netaxs.com, -but any hostname that ends with '.netaxs.com'; such as (say) +(say) 'aka netaxs.com', this will match not just a host name netaxs.com, +but any host name that ends with '.netaxs.com'; such as (say) pop3.netaxs.com and mail.netaxs.com. .PP The 'localdomains' option allows you to declare a list of domains @@ -2224,14 +2220,14 @@ to be used with the entry's server. The 'preconnect' keyword allows you to specify a shell command to be executed just before each time \fBfetchmail\fP -establishes a mailserver connection. This may be useful if you are +establishes a mail server connection. This may be useful if you are attempting to set up secure POP connections with the aid of .BR ssh (1). -If the command returns a nonzero status, the poll of that mailserver +If the command returns a nonzero status, the poll of that mail server will be aborted. .PP Similarly, the 'postconnect' keyword similarly allows you to specify a -shell command to be executed just after each time a mailserver +shell command to be executed just after each time a mail server connection is taken down. .PP The 'forcecr' option controls whether lines terminated by LF only are @@ -2270,8 +2266,8 @@ inserted by some buggy POP servers are unconditionally discarded.) .PP The 'dropdelivered' option controls whether Delivered\-To headers will be kept in fetched mail (the default) or discarded. These headers are -added by Qmail and Postfix mailservers in order to avoid mail loops but -may get in your way if you try to "mirror" a mailserver within the same +added by qmail and Postfix mail servers in order to avoid mail loops but +may get in your way if you try to "mirror" a mail server within the same domain. Use with caution. .PP The 'mimedecode' option controls whether MIME messages using the @@ -2297,7 +2293,7 @@ can save bandwidth by eliminating TCP/IP connects and LOGIN/LOGOUT sequences. On the other hand, an IDLE connection will eat almost all of your fetchmail's time, because it will never drop the connection and allow other polls to occur unless the server times out the IDLE. -It also doesn't work with multiple folders; only the first folder will +It also does not work with multiple folders; only the first folder will ever be polled. .PP The 'properties' option is an extension mechanism. It takes a string @@ -2366,7 +2362,9 @@ in random locations even if you use the software the same way. For solving hardware-induced segfaults, find the faulty component and repair or replace it. -.URL https://www.bitwizard.nl/sig11/ "The Sig11 FAQ" +.UR https://www.bitwizard.nl/sig11/ +The Sig11 FAQ +.UE may help you with details. For solving software-induced segfaults, the developers may need a "stack @@ -2427,8 +2425,8 @@ fetchmail looks through headers in the following order: .sp .nf Return-Path: - Resent-Sender: (ignored if it doesn't contain an @ or !) - Sender: (ignored if it doesn't contain an @ or !) + Resent-Sender: (ignored if it does not contain an @ or !) + Sender: (ignored if it does not contain an @ or !) Resent-From: From: Reply-To: @@ -2438,20 +2436,20 @@ fetchmail looks through headers in the following order: The originating address is used for logging, and to set the MAIL FROM address when forwarding to SMTP. This order is intended to cope gracefully with receiving mailing list messages in multidrop mode. The -intent is that if a local address doesn't exist, the bounce message -won't be returned blindly to the author or to the list itself, but +intent is that if a local address does not exist, the bounce message +will not be returned blindly to the author or to the list itself, but rather to the list manager (which is less annoying). In multidrop mode, destination headers are processed as follows: First, fetchmail looks for the header specified by the 'envelope' option in order to determine the local recipient address. If the mail is -addressed to more than one recipient, the Received line won't contain +addressed to more than one recipient, the Received line will not contain any information regarding recipient addresses. Then fetchmail looks for the Resent-To:, Resent-Cc:, and Resent-Bcc: lines. If they exist, they should contain the final recipients and have precedence over their To:/Cc:/Bcc: counterparts. If the Resent\-* -lines don't exist, the To:, Cc:, Bcc: and Apparently-To: lines are +lines do not exist, the To:, Cc:, Bcc: and Apparently-To: lines are looked for. (The presence of a Resent\-To: is taken to imply that the person referred by the To: address has already received the original copy of the mail.) @@ -2495,7 +2493,7 @@ poll other.provider.net proto pop2 user "John.Smith" pass "My^Hat" .fi .PP -Here's the same version with more whitespace and some noise words: +Here is the same version with more whitespace and some noise words: .IP .nf @@ -2512,7 +2510,7 @@ latter with a number, enclose the string in double quotes. Thus: .IP .nf poll mail.provider.net with proto pop3: - user "jsmith" there has password "4u but u can't krak this" + user "jsmith" there has password "4u but u cannot krak this" is jws here and wants mda "/bin/mail" .fi @@ -2533,9 +2531,9 @@ poll mail.provider.net .fi .PP -It's possible to specify more than one user per server. +It is possible to specify more than one user per server. The 'user' keyword leads off a user description, and every user specification -in a multi-user entry must include it. Here's an example: +in a multi-user entry must include it. Here is an example: .IP .nf @@ -2551,7 +2549,7 @@ pop.provider.net username 'jones'. Mail for 'jones' is kept on the server after download. .PP -Here's what a simple retrieval configuration for a multidrop mailbox +Here is what a simple retrieval configuration for a multidrop mailbox looks like: .IP @@ -2575,7 +2573,7 @@ user@domain specifications here, these would never match. the left-hand side of a user mapping. .PP -Here's an example of another kind of multidrop connection: +Here is an example of another kind of multidrop connection: .IP .nf @@ -2592,7 +2590,7 @@ loonytoons.org or toons.org domains (including sub-domain addresses like listener without modification. Be careful of mail loops if you do this! .PP -Here's an example configuration using ssh and the plugin option. The +Here is an example configuration using ssh and the plugin option. The queries are made directly on the stdin and stdout of imapd via ssh. Note that in this setup, IMAP authentication can be skipped. @@ -2608,7 +2606,7 @@ Use the multiple-local-recipients feature with caution -- it can bite. All multidrop features are ineffective in ETRN and ODMR modes. Also, note that in multidrop mode duplicate mails may be suppressed. -A piece of mail is considered duplicate if it does not have a discernable +A piece of mail is considered duplicate if it does not have a discernible envelope recipient address, has the same header as the message immediately preceding and more than one addressee. Such runs of messages may be generated when copies of a message addressed @@ -2626,8 +2624,8 @@ available, it should be used for reliable delivery of mailing list and blind carbon copy (Bcc) messages. See the subsection Duplicate suppression below for suggestions. -.SS Header vs. Envelope addresses -The fundamental problem is that by having your mailserver toss several +.SS Header versus Envelope addresses +The fundamental problem is that by having your mail server toss several peoples' mail in a single maildrop box, you may have thrown away potentially vital information about who each piece of mail was actually addressed to (the 'envelope address', as opposed to the @@ -2637,11 +2635,11 @@ in order to reroute mail properly. .PP Sometimes \fBfetchmail\fP -can deduce the envelope address. If the mailserver MTA is +can deduce the envelope address. If the mail server MTA is \fBsendmail\fP and the item of mail had just one recipient, the MTA will have written a 'by/for' clause that gives the envelope addressee into its Received -header. But this doesn't work reliably for other MTAs, nor if there is +header. But this does not work reliably for other MTAs, nor if there is more than one recipient. By default, \fBfetchmail\fP looks for envelope addresses in these lines; you can restore this default with \&\-E "Received" or 'envelope Received'. @@ -2672,7 +2670,7 @@ When they all fail, fetchmail must fall back on the contents of To/Cc headers (Bcc headers are not available - see below) to try to determine recipient addressees -- and these are unreliable. In particular, mailing-list software often ships mail with only -the list broadcast address in the To header. +the list broadcast address in the To: header. .PP \fBNote that a future version of \fBfetchmail\fP may remove To/Cc parsing!\fP .PP @@ -2685,15 +2683,15 @@ This is what makes the multidrop feature risky without proper envelope information. .PP A related problem is that when you blind-copy a mail message, the Bcc -information is carried \fIonly\fP as envelope address (it's removed from +information is carried \fIonly\fP as envelope address (it is removed from the headers by the sending mail server, so fetchmail can see it only if there is an X\-Envelope\-To header). Thus, blind-copying to someone who -gets mail over a fetchmail multidrop link will fail unless the the -mailserver host routinely writes X\-Envelope\-To or an equivalent header +gets mail over a fetchmail multidrop link will fail unless the +mail server host routinely writes X\-Envelope\-To or an equivalent header into messages in your maildrop. .PP \fBIn conclusion, mailing lists and Bcc'd mail can only work if the -server you're fetching from\fP +server you are fetching from\fP .IP (1) \fBstores one copy of the message per recipient in your domain and\fP .IP (2) @@ -2713,19 +2711,19 @@ Then, when mail including 'fetchmail\-friends' as a local address gets fetched, the list name will be appended to the list of recipients your SMTP listener sees. Therefore it will undergo alias expansion locally. Be sure to include 'esr' in the local alias -expansion of fetchmail\-friends, or you'll never see mail sent only to +expansion of fetchmail\-friends, or you will never see mail sent only to the list. Also be sure that your listener has the "me-too" option set (sendmail's \-oXm command-line option or OXm declaration) so your name -isn't removed from alias expansions in messages you send. +is not removed from alias expansions in messages you send. .PP -This trick is not without its problems, however. You'll begin to see +This trick is not without its problems, however. You will begin to see this when a message comes in that is addressed only to a mailing list you do \fInot\fP have declared as a local name. Each such message will feature an 'X\-Fetchmail\-Warning' header which is generated because fetchmail cannot find a valid local name in the recipient addresses. Such messages default (as was described above) to being sent to the local user running \fBfetchmail\fP, but the program has no -way to know that that's actually the right thing. +way to know that this is actually the right thing. .SS Bad Ways To Abuse Multidrop Mailboxes Multidrop mailboxes and @@ -2738,18 +2736,17 @@ can deduce an envelope address, such mail will only go to the account running fetchmail (probably root). Also, blind-copied users are very likely never to see their mail at all. .PP -If you're tempted to use -\fBfetchmail\fP +If you are tempted to use \fBfetchmail\fP to retrieve mail for multiple users from a single mail drop via POP or IMAP, think again (and reread the section on header and envelope addresses above). It would be smarter to just let the mail sit in the -mailserver's queue and use fetchmail's ETRN or ODMR modes to trigger +mail server's queue and use fetchmail's ETRN or ODMR modes to trigger SMTP sends periodically (of course, this means you have to poll more -frequently than the mailserver's expiry period). If you can't arrange +frequently than the mail server's expiry period). If you cannot arrange this, try setting up a UUCP feed. .PP If you absolutely \fImust\fP use multidrop for this purpose, make sure -your mailserver writes an envelope-address header that fetchmail can +your mail server writes an envelope-address header that fetchmail can see. Otherwise you \fIwill\fP lose mail and it \fIwill\fP come back to haunt you. @@ -2757,15 +2754,15 @@ to haunt you. Normally, when multiple users are declared \fBfetchmail\fP extracts recipient addresses as described above and checks each host -part with DNS to see if it's an alias of the mailserver. If so, the +part with DNS to see if it is an alias of the mail server. If so, the name mappings described in the "to ... here" declaration are done and the mail locally delivered. .PP This is a convenient but also slow method. To speed -it up, pre-declare mailserver aliases with 'aka'; these are checked -before DNS lookups are done. If you're certain your aka list contains +it up, pre-declare mail server aliases with 'aka'; these are checked +before DNS lookups are done. If you are certain your aka list contains \fBall\fP -DNS aliases of the mailserver (and all MX names pointing at it - note +DNS aliases of the mail server (and all MX names pointing at it - note this may change in a future version) you can declare 'no dns' to suppress DNS lookups entirely and \fIonly\fP match against the aka list. @@ -2821,7 +2818,7 @@ untouched, maps 1 to 0, and maps all other codes to 1. See also item #C8 in the FAQ. .IP 2 An error was encountered when attempting to open a socket to retrieve -mail. If you don't know what a socket is, don't worry about it -- +mail. If you do not know what a socket is, do not worry about it -- just treat this as an 'unrecoverable error'. This error can also be because a protocol fetchmail wants to use is not listed in /etc/services. .IP 3 @@ -2844,7 +2841,7 @@ fire if \fBfetchmail\fP timed out while waiting for the server. Client-side exclusion error. This means \fBfetchmail\fP either found another copy of itself already running, or failed in such -a way that it isn't sure whether another copy is running. +a way that it is not sure whether another copy is running. .IP 9 The user authentication step failed because the server responded "lock busy". Try again after a brief pause! This error is not implemented @@ -2879,14 +2876,16 @@ that of the last host queried. .SH FILES .TP 5 -~/.fetchmailrc, $HOME/.fetchmailrc, $HOME_ETC/.fetchmailrc, $FETCHMAILHOME/fetchmailrc +~/.fetchmailrc, $HOME/.fetchmailrc, $HOME_ETC/.fetchmailrc, \ +$FETCHMAILHOME/fetchmailrc default run control file (location can be overridden with environment variables) .TP 5 ~/.fetchids, $HOME/.fetchids, $HOME_ETC/.fetchids, $FETCHMAILHOME/.fetchids default location of file recording last message UIDs seen per host. (location can be overridden with environment variables) .TP 5 -~/.fetchmail.pid, $HOME/.fetchmail.pid, $HOME_ETC/.fetchmail.pid, $FETCHMAILHOME/fetchmail.pid +~/.fetchmail.pid, $HOME/.fetchmail.pid, $HOME_ETC/.fetchmail.pid, \ +$FETCHMAILHOME/fetchmail.pid default location of lock file (sometimes called pidfile or PID file, see option pidfile) to help prevent concurrent runs (non-root mode). (location can be overridden with environment variables) @@ -2900,30 +2899,32 @@ passwords as a last resort before prompting for one interactively. lock file (pidfile) to help prevent concurrent runs (root mode, Linux systems). .TP 5 /etc/fetchmail.pid -lock file (pidfile) to help prevent concurrent runs (root mode, systems without /var/run). +lock file (pidfile) to help prevent concurrent runs (root mode, systems without +/var/run). .SH ENVIRONMENT -Fetchmail's behavior can be altered by providing it with environment variables. Some may -alter the operation of libraries that fetchmail links against, for instance, OpenSSL. +Fetchmail's behavior can be altered by providing it with environment variables. +Some may alter the operation of libraries that fetchmail links against, for +instance, OpenSSL. Note that in daemon mode, you will need to quit the background daemon process and start a new fetchmail daemon for environment changes to take effect. .IP \fBFETCHMAILHOME\fP If this environment variable is set to a valid and existing directory name, fetchmail will read $FETCHMAILHOME/fetchmailrc -(the dot is missing in this case), $FETCHMAILHOME/.fetchids (keeping its dot) and -$FETCHMAILHOME/fetchmail.pid (without dot) rather than from the user's home -directory. The .netrc file is always looked for in the the invoking +(the dot is missing in this case), $FETCHMAILHOME/.fetchids (keeping its dot) +and $FETCHMAILHOME/fetchmail.pid (without dot) rather than from the user's +home directory. The .netrc file is always looked for in the invoking user's home directory (or $HOME_ETC) regardless of FETCHMAILHOME's setting. .IP \fBFETCHMAILUSER\fP If this environment variable is set, it is used as the name of the calling user (default local name) for purposes such as mailing error notifications. Otherwise, if either the LOGNAME or USER variable is -correctly set (e.g. the corresponding UID matches the session user ID) +correctly set (e.g., the corresponding UID matches the session user ID) then that name is used as the default local name. Otherwise \fBgetpwuid\fP(3) must be able to retrieve a password entry for the session ID (this elaborate logic is designed to handle the case of -multiple names per userid gracefully). +multiple names per user ID gracefully). .IP \fBFETCHMAIL_DISABLE_CBC_IV_COUNTERMEASURE\fP (since v6.3.22): @@ -2950,9 +2951,16 @@ The latter locations take precedence over the system default locations. This is useful in case there are broken certificates in the system directories and the user has no administrator privileges to remedy the problem. +.IP \fBFETCHMAIL_WOLFSSL_DEBUG\fP +(since v6.4.25): +If fetchmail is compiled and linked with wolfSSL, if wolfSSL was built with +\-\-enable\-debug, and if this environment variable is set and not empty, +then enable wolfSSL's debug mode. This will emit huge amounts of debug output +to stderr. + .IP \fBHOME\fP (documented since 6.4.1): -This variable is nomally set to the user's home directory. If it is set +This variable is normally set to the user's home directory. If it is set to a different directory than what is in the password database, HOME takes precedence. @@ -2963,7 +2971,7 @@ i. e. fetchmail will read .fetchmailrc, .fetchids, .fetchmail.pid and .netrc from $HOME_ETC instead of $HOME (or if HOME is also unset, from the passwd file's home directory location). -If HOME_ETC and FETCHMAILHOME are both set, FETCHMAILHOME takes prececence +If HOME_ETC and FETCHMAILHOME are both set, FETCHMAILHOME takes precedence and HOME_ETC will be ignored. .IP \fBSOCKS_CONF\fP @@ -3004,14 +3012,13 @@ Running \fBfetchmail\fP in foreground while a background fetchmail is running will do whichever of these is appropriate to wake it up. .SH BUGS, LIMITATIONS, AND KNOWN PROBLEMS -.PP Please check the \fBNEWS\fP file that shipped with fetchmail for more known bugs than those listed here. .PP Fetchmail cannot handle user names that contain blanks after a "@" character, for instance "demonstr@ti on". These are rather uncommon and -only hurt when using UID-based \-\-keep setups, so the 6.3.X versions of -fetchmail won't be fixed. +only hurt when using UID-based \-\-keep setups, so the 6.X.Y versions of +fetchmail will not be fixed. .PP Fetchmail cannot handle configurations where you have multiple accounts that use the same server name and the same login. Any user@server @@ -3024,9 +3031,9 @@ MX lookups may go away in a future release. .PP The mda and plugin options interact badly. In order to collect error status from the MDA, fetchmail has to change its normal signal -handling so that dead plugin processes don't get reaped until the end +handling so that dead plugin processes do not get reaped until the end of the poll cycle. This can cause resource starvation if too many -zombies accumulate. So either don't deliver to a MDA using plugins or +zombies accumulate. So either do not deliver to a MDA using plugins or risk being overrun by an army of undead. .PP The \-\-interface option does not support IPv6 and it is doubtful if it @@ -3041,7 +3048,7 @@ In a message with multiple envelope headers, only the last one processed will be visible to fetchmail. .PP Use of some of these protocols requires that the program send -unencrypted passwords over the TCP/IP connection to the mailserver. +unencrypted passwords over the TCP/IP connection to the mail server. This creates a risk that name/password pairs might be snaffled with a packet sniffer or more sophisticated monitoring software. Under Linux and FreeBSD, the \-\-interface option can be used to restrict polling to @@ -3057,8 +3064,8 @@ Use of the %F or %T escapes in an mda option could open a security hole, because they pass text manipulable by an attacker to a shell command. Potential shell characters are replaced by '_' before execution. The hole is further reduced by the fact that fetchmail -temporarily discards any suid privileges it may have while running the -MDA. For maximum safety, however, don't use an mda command containing +temporarily discards any set-uid privileges it may have while running the +MDA. For maximum safety, however, do not use an mda command containing %F or %T when fetchmail is run from the root account itself. .PP Fetchmail's method of sending bounces due to errors or spam-blocking and @@ -3067,7 +3074,7 @@ mail via SMTP. .PP If you modify \fI~/.fetchmailrc\fP while a background instance is running and break the syntax, the background instance will die silently. -Unfortunately, it can't die noisily because we don't yet know whether +Unfortunately, it cannot die noisily because we do not yet know whether syslog should be enabled. On some systems, fetchmail dies quietly even if there is no syntax error; this seems to have something to do with buggy terminal ioctl code in the kernel. @@ -3088,11 +3095,15 @@ The BSMTP error handling is virtually nonexistent and may leave broken messages behind. .PP Send comments, bug reports, gripes, and the like to the -.MTO "fetchmail-devel@lists.sourceforge.net" "fetchmail-devel list" +.UR "mailto:fetchmail-devel@lists.sourceforge.net" +fetchmail-devel list +.UE .PP An -.URL "https://fetchmail.sourceforge.io/fetchmail-FAQ.html" "HTML FAQ" +.UR "https://fetchmail.sourceforge.io/fetchmail-FAQ.html" +fetchmail FAQ (in HTML form) +.UE is available at the fetchmail home page, it should also accompany your installation. @@ -3102,40 +3113,47 @@ major assistance from Sunil Shetye (for code) and Rob MacGregor (for the mailing lists). .PP Most of the code is from -.MTO esr@snark.thyrsus.com "Eric S. Raymond" -\&. Too many other people to name here have contributed code and patches. +.UR "mailto:esr@snark.thyrsus.com" +Eric S. Raymond +.UE . +Too many other people to name here have contributed code and patches. .PP This program is descended from and replaces .BR popclient , by -.MTO "ceharris@mal.com" "Carl Harris" -\&; the internals have become quite different, but some of its interface +.UR "mailto:ceharris@mal.com" +Carl Harris +.UE ; +the internals have become quite different, but some of its interface design is directly traceable to that ancestral program. .PP This manual page has been improved by Matthias Andree, R.\ Hannes Beinert, and H\['e]ctor Garc\['i]a. .SH SEE ALSO -.PP .BR README , .BR README.SSL , .BR README.SSL-SERVER , -.URL "https://www.fetchmail.info/fetchmail-FAQ.html" "The Fetchmail FAQ" , +.UR "https://www.fetchmail.info/fetchmail-FAQ.html" +The Fetchmail FAQ +.UE , .BR mutt (1), .BR elm (1), .BR mail (1), .BR sendmail (8), .BR popd (8), .BR imapd (8), -.BR netrc (5). -.PP -.URL "https://www.fetchmail.info/" "The fetchmail home page." -.PP -.URL "https://fetchmail.sourceforge.io/" "The fetchmail home page (alternative URI)." -.PP -.URL "https://www.courier-mta.org/maildrop/" "The maildrop home page." +.BR netrc (5), +.UR "https://www.fetchmail.info/" +the fetchmail home page +.UE , +.UR "https://fetchmail.sourceforge.io/" +(alternative URI) +.UE ; +.UR "https://www.courier-mta.org/maildrop/" +the maildrop home page. +.UE .SH APPLICABLE STANDARDS -.PP Note that this list is just a collection of references and not a statement as to the actual protocol conformance or requirements in fetchmail. @@ -3181,7 +3199,10 @@ RFC 2033. .TP 5 GSSAPI: RFC 1508, RFC 1734, -.URL https://www.iana.org/assignments/gssapi-service-names/ "Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple Authentication and Security Layer (SASL) Service Names" . +.UR https://www.iana.org/assignments/gssapi-service-names/ +Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple +Authentication and Security Layer (SASL) Service Names +.UE . .TP 5 TLS: RFC 2595. @@ -35,9 +35,22 @@ static int preauth = FALSE; /* session variables initialized in capa_probe() or imap_getauth() */ static char capabilities[MSGBUFSIZE+1]; static int imap_version = IMAP4; -static flag do_idle = FALSE, has_idle = FALSE; +static flag has_idle = FALSE; static int expunge_period = 1; +static void clear_sessiondata(void) { + /* must match defaults above */ + preauth = FALSE; + memset(capabilities, 0, sizeof(capabilities)); + imap_version = IMAP4; + has_idle = FALSE; + expunge_period = 1; +} + +/* the next ones need to be kept in synch - C89 does not consider strlen() + * a const initializer */ +const char *const capa_begin = " [CAPABILITY "; const unsigned capa_len = 13; + /* mailbox variables initialized in imap_getrange() */ static int count = 0, oldcount = 0, recentcount = 0, unseen = 0, deletions = 0; static unsigned int startcount = 1; @@ -51,6 +64,56 @@ static int actual_deletions = 0; static int saved_timeout = 0, idle_timeout = 0; static time_t idle_start_time = 0; +static int imap_setup(struct query *ctl) +{ + (void)ctl; + clear_sessiondata(); + return PS_SUCCESS; +} + +static int imap_cleanup(struct query *ctl) +{ + (void)ctl; + clear_sessiondata(); + return PS_SUCCESS; +} + +static void copy_capabilities(const char *buf) +{ + strlcpy(capabilities, buf, sizeof(capabilities)); + capabilities[strcspn(capabilities, "]")] = '\0'; /* truncate at ] */ + + /* UW-IMAP server 10.173 notifies in all caps, but RFC2060 says we + should expect a response in mixed-case */ + if (strstr(capabilities, "IMAP4REV1")) { + imap_version = IMAP4rev1; /* RFC-3501 (2060) */ + if (outlevel >= O_DEBUG) + report(stdout, GT_("Protocol identified as IMAP4 rev 1\n")); + } else if (strstr(capabilities, "IMAP4")) { + imap_version = IMAP4; /* RFC-1730 */ + if (outlevel >= O_DEBUG) + report(stdout, GT_("Protocol identified as IMAP4 rev 0\n")); + } else { + imap_version = IMAP2; + if (outlevel >= O_DEBUG) + report(stdout, GT_("Protocol identified as IMAP2 or IMAP2BIS\n")); + } + + /* + * Handle idling. We depend on coming through here on startup + * and after each timeout (including timeouts during idles). + */ + if (strstr(capabilities, "IDLE")) + has_idle = TRUE; + else + has_idle = FALSE; + if (outlevel >= O_VERBOSE) + report(stdout, GT_("will idle after poll\n")); /* FIXME: rename this to can... idle for next release */ + + peek_capable = (imap_version >= IMAP4); +} + + static int imap_untagged_response(int sock, const char *buf) /* interpret untagged status responses */ { @@ -59,7 +122,7 @@ static int imap_untagged_response(int sock, const char *buf) if (stage == STAGE_GETAUTH && !strncmp(buf, "* CAPABILITY", 12)) { - strlcpy(capabilities, buf + 12, sizeof(capabilities)); + copy_capabilities(buf + 12); } else if (stage == STAGE_GETAUTH && !strncmp(buf, "* PREAUTH", 9)) @@ -190,6 +253,7 @@ static int imap_response(int sock, char *argbuf, struct RecvSplit *rs) /* parse command response */ { char buf[MSGBUFSIZE+1]; + char *tmp; do { int ok; @@ -207,6 +271,9 @@ static int imap_response(int sock, char *argbuf, struct RecvSplit *rs) if (islower((unsigned char)*cp)) *cp = toupper((unsigned char)*cp); + /* FIXME: does not look for or handle command continuation requests, + * i. e. the token "+" instead of tag or "*" */ + /* untagged responses start with "* " */ if (buf[0] == '*' && buf[1] == ' ') { ok = imap_untagged_response(sock, buf); @@ -226,6 +293,19 @@ static int imap_response(int sock, char *argbuf, struct RecvSplit *rs) return(ok); } + /* on login, the server may volunteer new CAPABILITY information + * with the tagged OK response, record it */ + /* WARNING: this must match with what's in imap_getauth()! */ + if (stage == STAGE_GETAUTH + && (tmp = strstr(buf, capa_begin))) + { + copy_capabilities(tmp + capa_len); + + if (outlevel >= O_DEBUG) { + report(stdout, GT_("found updated capabilities list\n")); + } + } + if (stage == STAGE_IDLE) { /* reduce the timeout: servers may not reset their timeout @@ -334,88 +414,55 @@ static void imap_canonicalize(char *result, char *raw, size_t maxlen) static int capa_probe(int sock, struct query *ctl) /* set capability variables from a CAPA probe */ { - int ok; + int err; - /* probe to see if we're running IMAP4 and can use RFC822.PEEK */ - capabilities[0] = '\0'; - if ((ok = gen_transact(sock, "CAPABILITY")) == PS_SUCCESS) - { - char *cp; - - /* capability checks are supposed to be caseblind */ - for (cp = capabilities; *cp; cp++) - *cp = toupper((unsigned char)*cp); - - /* UW-IMAP server 10.173 notifies in all caps, but RFC2060 says we - should expect a response in mixed-case */ - if (strstr(capabilities, "IMAP4REV1")) - { - imap_version = IMAP4rev1; - if (outlevel >= O_DEBUG) - report(stdout, GT_("Protocol identified as IMAP4 rev 1\n")); - } - else - { - imap_version = IMAP4; - if (outlevel >= O_DEBUG) - report(stdout, GT_("Protocol identified as IMAP4 rev 0\n")); - } - } - else if (ok == PS_ERROR) - { - imap_version = IMAP2; - if (outlevel >= O_DEBUG) - report(stdout, GT_("Protocol identified as IMAP2 or IMAP2BIS\n")); - } - else - return ok; + (void)ctl; - /* - * Handle idling. We depend on coming through here on startup - * and after each timeout (including timeouts during idles). - */ - do_idle = ctl->idle; - if (ctl->idle) - { - if (strstr(capabilities, "IDLE")) - has_idle = TRUE; - else - has_idle = FALSE; - if (outlevel >= O_VERBOSE) - report(stdout, GT_("will idle after poll\n")); + /* probe to see if we're running IMAP4 and can use RFC822.PEEK */ + memset(capabilities, 0, sizeof capabilities); + err = gen_transact(sock, "CAPABILITY"); + /* if successful, copy_capabilities() will have handled it */ + if (err == PS_ERROR) { + /* this is OK for IMAP2 which did not support a CAPABILITY command */ + err = PS_SUCCESS; } - peek_capable = (imap_version >= IMAP4); - - return PS_SUCCESS; + return err; } -static int do_authcert (int sock, const char *command, const char *name) +static int do_auth_external (int sock, const char *command, const char *name) /* do authentication "external" (authentication provided by client cert) */ { + /* FIXME: not compliant with RFC 4422 (SASL) without RFC 4959 (SASL-IR)- + * does not support the usual server challenge/response + */ char buf[256]; + if (!strstr(capabilities, "SASL-IR")) { + report(stderr, GT_("server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n")); + return PS_AUTHFAIL; + } if (name && name[0]) { - size_t len = strlen(name); - if ((len / 3) + ((len % 3) ? 4 : 0) < sizeof(buf)) + size_t len = strlen(name); + if (len64frombits(len) + 1 <= sizeof(buf)) /* +1: need to fit \0 byte */ to64frombits (buf, name, strlen(name), sizeof buf); else return PS_AUTHFAIL; /* buffer too small. */ } else - buf[0]=0; + { + strcpy(buf, "="); + } return gen_transact(sock, "%s EXTERNAL %s",command,buf); } +/** apply for connection authorization, possibly executing STARTTLS */ static int imap_getauth(int sock, struct query *ctl, char *greeting) -/* apply for connection authorization */ { int ok = 0; char *commonname; - (void)greeting; - /* * Assumption: expunges are cheap, so we want to do them * after every message unless user said otherwise. @@ -425,17 +472,12 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) else expunge_period = 1; - if ((ok = capa_probe(sock, ctl))) - return ok; - - /* - * If either (a) we saw a PREAUTH token in the greeting, or - * (b) the user specified ssh preauthentication, then we're done. - */ - if (preauth || ctl->server.authenticate == A_SSH) - { - preauth = FALSE; /* reset for the next session */ - return(PS_SUCCESS); + /* check if imap_ok() has already parsed CAPABILITY from the greeting when + * driver.c ran it on the server's greeting message - note this must match + * with what's in imap_response()! */ + if (!strstr(greeting, capa_begin)) { + int err = capa_probe(sock, ctl); + if (err) return err; } commonname = ctl->server.pollname; @@ -445,6 +487,19 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) commonname = ctl->sslcommonname; #ifdef SSL_ENABLE + /* Defend against a PREAUTH-prevents-STARTTLS attack */ + if (preauth && must_starttls(ctl)) { + if (ctl->server.plugin && A_SSH == ctl->server.authenticate) { + report(stderr, GT_("%s: configuration requires TLS, but STARTTLS is not permitted " + "because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n"), commonname); + } else { + report(stderr, GT_("%s: configuration requires TLS, but STARTTLS is not permitted " + "because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n"), commonname); + } + preauth = FALSE; /* reset for the next session */ + return PS_SOCKET; + } + if (maybe_starttls(ctl)) { if ((strstr(capabilities, "STARTTLS") && maybe_starttls(ctl)) || must_starttls(ctl)) /* if TLS is mandatory, ignore capabilities */ @@ -456,6 +511,11 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) ctl->sslcertfile, ctl->sslcertpath, ctl->sslfingerprint, commonname, ctl->server.pollname, &ctl->remotename)) != -1) { + if (outlevel >= O_VERBOSE) + { + report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); + } + /* * RFC 2595 says this: * @@ -469,11 +529,10 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) * Now that we're confident in our TLS connection we can * guarantee a secure capability re-probe. */ + clear_sessiondata(); if ((ok = capa_probe(sock, ctl))) - return ok; - if (outlevel >= O_VERBOSE) { - report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); + return ok; } } else if (must_starttls(ctl)) { /* Config required TLS but we couldn't guarantee it, so we must @@ -504,11 +563,24 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) } #endif /* SSL_ENABLE */ + /* + * If either (a) we saw a PREAUTH token in the greeting, or + * (b) the user specified ssh preauthentication, then we're done. + */ + if (preauth || ctl->server.authenticate == A_SSH) + { + preauth = FALSE; /* reset for the next session */ + return(PS_SUCCESS); + } + /* * Time to authenticate the user. * Try the protocol variants that don't require passwords first. */ - ok = PS_AUTHFAIL; + ok = PS_AUTHFAIL; /* formally, never read, + but let's leave this in place as a safe default + for future maintenance */ + (void)ok; /* Yahoo hack - we'll just try ID if it was offered by the server, * and IGNORE errors. */ @@ -519,19 +591,23 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) } } - if ((ctl->server.authenticate == A_ANY + if (ctl->server.authenticate == A_ANY || ctl->server.authenticate == A_EXTERNAL) - && strstr(capabilities, "AUTH=EXTERNAL")) { - ok = do_authcert(sock, "AUTHENTICATE", ctl->remotename); - if (ok) - { - /* SASL cancellation of authentication */ - gen_send(sock, "*"); - if (ctl->server.authenticate != A_ANY) - return ok; - } else { - return ok; + if (!strstr(capabilities, "AUTH=EXTERNAL")) { + if (ctl->server.authenticate == A_EXTERNAL) { + report(stderr, GT_("%s: --auth external requested but server does not advertise it.\n"), commonname); + return PS_AUTHFAIL; + } + } else { + int err = do_auth_external(sock, "AUTHENTICATE", ctl->remotename); + if (err) + { + if (ctl->server.authenticate != A_ANY) + return err; + } else { + return PS_SUCCESS; + } } } @@ -630,44 +706,44 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting) /* * We're stuck with sending the password en clair. - * The reason for this odd-looking logic is that some - * servers return LOGINDISABLED even though login - * actually works. So arrange things in such a way that - * setting auth passwd makes it ignore this capability. - */ - if((ctl->server.authenticate==A_ANY&&!strstr(capabilities,"LOGINDISABLED")) - || ctl->server.authenticate == A_PASSWORD) + * Older fetchmail versions permitted overriding LOGINDISABLED, documenting + * that it still works on some servers, but 6.4.22 disables this. */ + if (ctl->server.authenticate == A_ANY + || ctl->server.authenticate == A_PASSWORD) { - /* these sizes guarantee no buffer overflow */ - static char *remotename, *password; /* XXX FIXME: not thread-safe but dynamic buffer is leaky on timeout */ - size_t rnl, pwl; - rnl = 2 * strlen(ctl->remotename) + 1; - pwl = 2 * strlen(ctl->password) + 1; - if (remotename) xfree(remotename); - remotename = (char *)xmalloc(rnl); - if (password) xfree(password); - password = (char *)xmalloc(pwl); - - imap_canonicalize(remotename, ctl->remotename, rnl); - imap_canonicalize(password, ctl->password, pwl); - - snprintf(shroud, sizeof (shroud), "\"%s\"", password); - ok = gen_transact(sock, "LOGIN \"%s\" \"%s\"", remotename, password); - memset(shroud, 0x55, sizeof(shroud)); - shroud[0] = '\0'; - memset(password, 0x55, strlen(password)); - xfree(password); - xfree(remotename); - if (ok) - { - if(ctl->server.authenticate != A_ANY) - return ok; + if (strstr(capabilities, "LOGINDISABLED")) { + if (ctl->server.authenticate == A_PASSWORD) { + report(stderr, GT_("%s: --auth password requested but server forbids it (LOGINDISABLED).\n"), commonname); + return PS_AUTHFAIL; + } + } else { + /* these sizes guarantee no buffer overflow */ + static char *remotename, *password; /* XXX FIXME: not thread-safe but dynamic buffer is leaky on timeout */ + size_t rnl, pwl; + rnl = 2 * strlen(ctl->remotename) + 1; + pwl = 2 * strlen(ctl->password) + 1; + if (remotename) xfree(remotename); + remotename = (char *)xmalloc(rnl); + if (password) xfree(password); + password = (char *)xmalloc(pwl); + + imap_canonicalize(remotename, ctl->remotename, rnl); + imap_canonicalize(password, ctl->password, pwl); + + snprintf(shroud, sizeof (shroud), "\"%s\"", password); + ok = gen_transact(sock, "LOGIN \"%s\" \"%s\"", remotename, password); + memset(shroud, 0x55, sizeof(shroud)); + shroud[0] = '\0'; + memset(password, 0x55, strlen(password)); + xfree(password); + xfree(remotename); + return ok; /* this assumes that password is the last authentication method to try */ } - else - return(ok); } - return(ok); + /* if we're here, we've run out of authentication methods */ + report(stderr, GT_("%s: we've run out of authentication methods and cannot log in.\n"), commonname); + return PS_AUTHFAIL; } static int internal_expunge(int sock) @@ -717,7 +793,7 @@ static int imap_idle(int sock) /* special timeout to terminate the IDLE and re-issue it * at least every 28 minutes: * (the server may have an inactivity timeout) */ - mytimeout = idle_timeout = 1680; /* 28 min */ + mytimeout = idle_timeout = 600; time(&idle_start_time); stage = STAGE_IDLE; /* enter IDLE mode */ @@ -897,7 +973,7 @@ static int imap_getrange(int sock, * * this is a while loop because imap_idle() might return on other * mailbox changes also */ - while (recentcount == 0 && do_idle) { + while (recentcount == 0 && ctl->idle && has_idle) { smtp_close(ctl, 1); ok = imap_idle(sock); if (ok) @@ -954,7 +1030,7 @@ static int imap_getrange(int sock, count), count); } - if (count == 0 && do_idle) + if (count == 0 && ctl->idle && has_idle) { /* no messages? then we may need to idle until we get some */ while (count == 0) { @@ -1404,6 +1480,8 @@ static const struct method imap = imap_end_mailbox_poll, /* end-of-mailbox processing */ imap_logout, /* expunge and exit */ TRUE, /* yes, we can re-poll */ + imap_setup, /* setup method */ + imap_cleanup /* cleanup method */ }; int doIMAP(struct query *ctl) @@ -59,8 +59,12 @@ void fm_lock_setup(struct runctl *ctl) static void unlockit(void) /* must-do actions for exit (but we can't count on being able to do malloc) */ { - if (lockfile && lock_acquired) - unlink(lockfile) && truncate(lockfile, (off_t)0); + if (lockfile && lock_acquired) { + if (unlink(lockfile)) { + int dummy = truncate(lockfile, (off_t)0); + (void)dummy; + } + } } void fm_lock_dispose(void) @@ -17,6 +17,7 @@ #include <ctype.h> #include <stdlib.h> #include <string.h> +#include <errno.h> #include "netrc.h" #include "i18n.h" @@ -84,6 +85,7 @@ parse_netrc (char *file) const char *premature_token; netrc_entry *current, *retval; int ln; + int error_flag = 0; /* The latest token we've seen in the file. */ enum @@ -97,6 +99,9 @@ parse_netrc (char *file) if (!fp) { /* Just return NULL if we can't open the file. */ + if (ENOENT != errno) { + report(stderr, "%s: cannot open file for reading: %s\n", file, strerror(errno)); + } return NULL; } @@ -216,7 +221,7 @@ parse_netrc (char *file) if (premature_token) { - fprintf (stderr, + report(stderr, GT_("%s:%d: warning: found \"%s\" before any host names\n"), file, ln, premature_token); premature_token = NULL; @@ -255,19 +260,33 @@ parse_netrc (char *file) else { - fprintf (stderr, GT_("%s:%d: warning: unknown token \"%s\"\n"), + report(stderr, GT_("%s:%d: warning: unknown token \"%s\"\n"), file, ln, tok); } } } } - fclose (fp); + if (ferror(fp)) { + report(stderr, GT_("%s: error reading file (%s).\n"), file, strerror(errno)); + error_flag = 1; + clearerr(fp); + } + + if (fclose(fp)) { + report(stderr, GT_("%s: error reading file (%s).\n"), file, strerror(errno)); + error_flag = 1; + } /* Finalize the last machine entry we found. */ maybe_add_to_list (¤t, &retval); free (current); + if (error_flag) { + free_netrc(retval); + return NULL; + } + /* Reverse the order of the list so that it appears in file order. */ current = retval; retval = NULL; @@ -345,21 +364,22 @@ int main (int argc, char **argv) case 4: break; default: - fprintf (stderr, "Usage: %s <file> [<host> <login>]\n", argv[0]); + fprintf(stderr, "Usage: %s <file> [<host> <login>]\n", argv[0]); exit(EXIT_FAILURE); } - if (stat (file, &sb)) + report_init(1); + + if (stat(file, &sb)) { - fprintf (stderr, "%s: cannot stat %s: %s\n", argv[0], file, + fprintf(stderr, "PRE-CHECK for %s: cannot stat %s: %s\n", argv[0], file, strerror (errno)); - exit (1); } - head = parse_netrc (file); + head = parse_netrc(file); if (!head) { - fprintf (stderr, "%s: no entries found in %s\n", argv[0], file); + fprintf(stderr, "%s: read error or no entries found in %s\n", argv[0], file); exit (1); } @@ -40,7 +40,7 @@ typedef struct _netrc_entry { __BEGIN_DECLS /* Parse FILE as a .netrc file (as described in ftp(1)), and return a list of entries. NULL is returned if the file could not be - parsed. */ + parsed. Diagnostic messages are through report(), except for fopen() errors with ENOENT. */ netrc_entry *parse_netrc __P((char *file)); /* Return the netrc entry from LIST corresponding to HOST. NULL is @@ -234,6 +234,8 @@ static const struct method odmr = NULL, /* no mailbox support */ odmr_logout, /* log out, we're done */ FALSE, /* no, we can't re-poll */ + NULL, /* no constructor */ + NULL /* no destructor */ }; int doODMR (struct query *ctl) @@ -1,3 +1,3 @@ # available languages: #ca cs da de el en_GB eo es fi fr gl id it ja nl pl pt_BR ro ru sk sq sr sv tr vi zh_CN - ca cs da de en_GB eo es fr id it ja nl pl ro ru sq sr sv vi zh_CN + cs de eo es fr ja pl ro ru sq sr sv vi @@ -5,17 +5,18 @@ # Jiří Pavlovský <pavlovsk@ff.cuni.cz>, 1999 - 2001. # Miloslav Trmac <mitr@volny.cz>, 2005. # Petr Pisar <petr.pisar@atlas.cz>, 2008, 2009, 2010, 2011, 2012, 2013, 2015. -# Petr Pisar <petr.pisar@atlas.cz>, 2019, 2020, 2021. +# Petr Pisar <petr.pisar@atlas.cz>, 2019, 2020, 2021, 2022, 2023. # +# (IMAP) capability → schopnost # Subject Common Name → obecné jméno (CN) subjektu # Subject Alternative Name → alternativní jméno subjektu (× otherName) # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.16-rc1\n" +"Project-Id-Version: fetchmail 6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-01-30 19:09+01:00\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-04 18:44+01:00\n" "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" "Language: cs\n" @@ -165,41 +166,41 @@ msgstr[0] "limit stahování %d dosažen; %d zpráva ponechána na serveru %s ú msgstr[1] "limit stahování %d dosažen; %d zprávy ponechány na serveru %s účet %s\n" msgstr[2] "limit stahování %d dosažen; %d zpráv ponecháno na serveru %s účet %s\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "po %d sekundách vypršel čas při připojování k serveru %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "po %d sekundách vypršel čas při čekání na server %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "po %d sekundách vypršel čas při čekání na %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "po %d sekundách vypršel čas při čekání odpověď posluchače.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "po %d sekundách vypršel čas.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail zaznamenává opakované vypršení času" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmailu vypršel čas více než %d-krát při pokusu stáhnout poštu z %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -214,73 +215,73 @@ msgstr "" "\n" "Fetchmail již nebude vybírat z této schránky, dokud jej znovu nespustíte.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "příkaz před spojením ukončen signálem %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "příkaz před spojením selhal s návratovým kódem %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "nemohu najít schránku HESIOD %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Vedoucí server nemá jméno.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "nemohu nalézt kanonické doménové jméno pro %s (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "spojení %s k %s selhalo" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "Spojení SSL selhalo.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Chyba \"zámek se používá\" na %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Chyba \"server zaneprázdněn\" na %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Chyba autorizace na %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (dříve autorizován)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "Rady naleznete na http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "Autentizace fetchmailu na %s@%s selhala" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail nemohl stáhnout poštu z %s@%s.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -294,7 +295,7 @@ msgstr "" "fetchmail není schopen odlišit, protože server neposlal rozumnou chybovou\n" "hlášku." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -313,7 +314,7 @@ msgstr "" "Démon fetchmail bude pokračovat v činnosti a při každém cyklu se pokusí\n" "připojit. Žádná další upozornění nebudou do obnovení služby zasílána." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -332,61 +333,66 @@ msgstr "" "Démon fetchmail bude pokračovat v činnosti a při každém cyklu se pokusí\n" "připojit. Žádná další upozornění nebudou do obnovení služby zasílána." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Okamžitě znovu kontroluji %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Chyba socketu nebo TLS na %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Neznámá chyba při přihlášení nebo autentizaci na %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Úspěšná autorizace na %s@%s\n" # XXX: This is e-mail header as literal. Dont't touch "Subject: " header name. -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "Autentizace fetchmailu %s@%s uspěla" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail se úspěšně přihlásil k %s@%s.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Služba byla obnovena.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "vybírám nebo znovu kontroluji složku %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "vybírám nebo znovu kontroluji implicitní složku\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s na %s (složka %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s na %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Stahuji z %s\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" @@ -394,14 +400,14 @@ msgstr[0] "%d zpráva (%d %s) pro %s" msgstr[1] "%d zprávy (%d %s) pro %s" msgstr[2] "%d zpráv (%d %s) pro %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "přečtena" msgstr[1] "přečteny" msgstr[2] "přečteno" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" @@ -409,104 +415,104 @@ msgstr[0] "%d zpráva pro %s" msgstr[1] "%d zprávy pro %s" msgstr[2] "%d zpráv pro %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d oktetů).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Žádná pošta pro %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "nesmyslný počet zpráv!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "Přeskočeno příliš mnoho e-mailů (%d > %d) kvůli dočasným chybám %s\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "socketu" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "hlavičky RFC822" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "synchronizace mezi klientem a serverem" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "protokolu klient/server" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "zámku na serveru" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "transakce SMTP" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "hledání v DNS" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "nedefinovaná" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "Chyba %s při stahování z %s@%s a doručování na SMTP stroj %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "neznámý" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "Chyba %s při stahování z %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "příkaz po spojení ukončen signálem %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "příkaz po spojení selhal s návratovým kódem %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Kerberos V4 není podporován.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Kerberos V5 není podporován.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Přepínač --flush není s %s podporován\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Přepínač --all není s %s podporován\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Přepínač --limit nepodporuje argument %s\n" @@ -628,19 +634,19 @@ msgstr "Chyba syntaxe v parametrech ETRN\n" msgid "Unknown ETRN error %d\n" msgstr "Neznámá chyba ETRN %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Přepínač --keep není s ETRN podporován.\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Přepínač --flush není s ETRN podporován.\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Přepínač --folder není s ETRN podporován.\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Přepínač --check není s ETRN podporován.\n" @@ -681,12 +687,12 @@ msgstr "fetchmail: spuštěn s" msgid "could not get current working directory\n" msgstr "nemohu získat aktuální pracovní adresář\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Toto je fetchmail verze %s" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -695,7 +701,7 @@ msgstr "" "Přeloženo s knihovnou SSL %#lx „%s“\n" "Nyní se používá knihovna SSL %#lx „%s“\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -704,421 +710,441 @@ msgstr "" "OpenSSL: %s\n" "Šifrovací moduly: %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "POZOR: Vaše knihovna s SSL/TLS nepodporuje TLS v1.3.\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "POZOR: Přeloženo s LibreSSL, což není podporovaná konfigurace.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "CHYBA: Přeloženo proti LibreSSL, což porušuje autorská práva kvůli chybějící výjimce podle odstavce 2b licence GPL. Vizte COPYING. Končí se.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "POZOR: Přeloženo bez SSL/TLS.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "Přepínač nodetach je přítomen, přepínač logfile se ignoruje.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Neběžím jako démon, přepínač logfile se ignoruje.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Soubor s protokolem „%s“ neexistuje, přepínač logfile se ignoruje.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Do souboru s protokolem „%s“ nelze zapisovat, končí se.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "Obě volby syslog a logfile jsou nastaveny, syslog se ignoruje a protokol bude zapisován do %s" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Zpracovávám přepínače z příkazového řádku%s%s\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " a " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Nenastaven žádný poštovní server - možná chybí %s?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: nebyl specifikován žádný poštovní server.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: žádný jiný fetchmail neběží\n" # First %s is "background" or "foreground" attribute -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: chyba při zabíjení fetchmailu %s s PID %ld; končím.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "na pozadí" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "v popředí" # First %s is "background" or "foreground" attribute -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: fetchmail %s s PID %ld byl zabit.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: nemohu kontrolovat poštu, když běží jiný fetchmail ke stejnému počítači.\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: nelze se dotazovat zadaných serverů, běží-li jiný fetchmail s PID %ld.\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: v popředí běží jiný fetchmail s PID %ld.\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: neakceptuji přepínače, když na fetchmail běží na pozadí.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: fetchmail na pozadí s PID %ld byl probuzen.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: starší proces s PID %ld záhadně zemřel.\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: nemohu najít heslo pro %s@%s.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Zadejte heslo pro %s@%s: " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: Nelze se odpojit na pozadí. Končí se.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "spouštím démona fetchmail %s\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "%s, kam se mají připojovat záznamy, nebylo možné otevřít\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "režim --check zapnut, poštu nestahuji\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "nemohu zkontrolovat čas %s (chyba %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "znovu spouštím fetchmail (%s změněn)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "pokus znovu se spustit může selhat, protože adresář nebyl obnoven\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "pokus znovu spustit fetchmail selhal\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "stahování z %s přeskočeno (chyba autentizace nebo mnohokrát vypršel čas)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "ještě nenastal čas, neptám se %s\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Stav spojení=0 (SUCCESS)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Stav spojení=1 (NOMAIL)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Stav spojení=2 (SOCKET)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Stav spojení=3 (AUTHFAIL)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Stav spojení=4 (PROTOCOL)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Stav spojení=5 (SYNTAX)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Stav spojení=6 (IOERR)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Stav spojení=7 (ERROR)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Stav spojení=8 (EXCLUDE)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Stav spojení=9 (LOCKBUSY)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Stav spojení=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Stav spojení=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Stav spojení=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Stav spojení=13 (MAXFETCH)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Stav spojení=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Žádné ze spojení není aktivní. Končím.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "v %s spím na %d sekund\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "probuzen %s\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "probuzen signálem %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "probuzen v %s\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "normální ukončení, stav %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "nemohu zkontrolovat čas konfiguračního souboru\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Varování: počítač %s je v konfiguračním souboru zmíněn vícekrát\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "fetchmail: Chyba: záznam „defaults“ je v konfiguračním souboru zmíněn vícekrát nebo „defaults“ není prvním záznamem.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "SSL není podporováno.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "Podpora pro KERBEROS v4 je nastavena, ale není zakompilována.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "Podpora pro KERBEROS v5 je nastavena, ale není zakompilována.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Podpora pro GSSAPI je nastavena, ale není zakompilována.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: varování: není dostupné DNS pro kontrolu výběru společných schránek z %s\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "varování: společné schránky pro %s vyžadují přepínač envelope!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "varování: Nežádejte podporu, pokud všechna pošta půjde k postmasterovi!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: chybná konfigurace %s, zadejte kladné číslo portu pro službu nebo port\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: Nastavení %s není platné, PROP vyžaduje privilegovaný port\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "POZOR: chybná konfigurace %s, běžně je třeba --ssl pro port 995 / službu pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "POZOR: chybná konfigurace %s, běžně je třeba port 995 / služba pop3s pro --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "POZOR: chybná konfigurace %s, běžně je třeba --ssl pro port 993 / službu imaps.\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "POZOR: chybná konfigurace %s, běžně je třeba port 993 / služba imaps pro --ssl.\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "Nastavení %s není platné, LMTP nesmí používat implicitní port SMTP\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Jak fetchall, tak i keep jsou v démonu zapnuty nebo režim idle je chyba!\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: chyba: režim zahálení nefunguje při více složkách nebo účtech!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "ukončen signálem %d\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s se ptá %s (protokol %s) v %s: stahování začato\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "Podpora POP2 není nastavena.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "Podpora POP3 není nastavena.\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "Podpora IMAPu není nastavena.\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "Podpora ETRN není nastavena.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "Podpora ODMR není nastavena.\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "zvolen nepodporovaný protokol.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s se ptá %s (protokol %s) v %s: stahování dokončeno\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Interval stahování je %d sekund\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Soubor záznamů je %s\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Soubor ID je %s\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Zprávy o průběhu budou zaznamenávány pomocí syslogu\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail se bude skrývat a nebude generovat Received\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail bude zobrazovat tečky průběhu i v souborech záznamů.\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail bude přeposílat špatně adresované zprávy ze společných schránek na %s.\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail bude chybové zprávy posílat postmasterovi.\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail bude chybové zprávy posílat odesílateli.\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail bude považovat trvalé chyby za trvalé (zprávy bude zahazovat).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail bude považovat trvalé chyby za dočasné (zprávy bude uchovávat).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Možnosti pro stahování z %s@%s:\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Pošta bude stahována z %s\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" @@ -1126,405 +1152,405 @@ msgstr[0] " K stahování z tohoto serveru dojde každý %d interval.\n" msgstr[1] " K stahování z tohoto serveru dojde každé %d intervaly.\n" msgstr[2] " K stahování z tohoto serveru dojde každých %d intervalů.\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Skutečné jméno serveru je %s.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Pokud není zadán žádný počítač, nebude se stahovat z tohoto počítače.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Pokud není zadán žádný počítač, bude se stahovat z tohoto počítače.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Bude požadováno heslo.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " Tajemství APOP = \"%s\".\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP id = \"%s\"\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Heslo = \"%s\".\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Protokol je KPOP s autentizací Kerberos %s" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Protokol je %s" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (pomocí služby %s)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (pomocí implicitního portu)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (vynuceně používám UIDL)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Budou vyzkoušeny všechny dostupné metody autentizace.\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Bude vynucena autentizace heslem.\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " Bude vynucena autentizace MSN.\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " Bude vynucena autentizace NTLM.\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " Bude vynucena autentizace OTP.\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " Bude vynucena autentizace CRAM-MD5.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " Bude vynucena autentizace GSSAPI.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Bude vynucena autentizace Kerberos V4.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Bude vynucena autentizace Kerberos V5.\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Předpokládám šifrované spojení.\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Principal poštovní služby je: %s\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " Sezení šifrovaná s SSL povolena.\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " Protokol SSL: %s.\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " Kontrola SSL certifikátu serveru povolena.\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " Kontrola SSL certifikátu serveru zakázána.\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Soubor výchozích důvěryhodných certifikátů SSL: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Soubor důvěryhodných certifikátů SSL: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " Adresář výchozích důvěryhodných certifikátů SSL: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Adresář důvěryhodných certifikátů SSL: %s\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " Obecné jméno (CN) SSL serveru: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Otisk klíče SSL (porovnáván s klíčem serveru): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Čas čekání na odpověď serveru je %d sekund" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (implicitní).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Zvolena implicitní poštovní schránka.\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Zvolené poštovní schránky jsou:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Budou staženy všechny zprávy (--all zapnuto).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Budou staženy jen nové zprávy (--all vypnuto).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Stažené zprávy budou ponechány na serveru (--keep zapnuto).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Stažené zprávy nebudou ponechány na serveru (--keep vypnuto).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Před začátkem stahování budou staré zprávy smazány (--flush zapnuto).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Před začátkem stahování nebudou staré zprávy smazány (--flush vypnuto).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Před začátkem stahování budou příliš velké zprávy smazány (--limitflush zapnuto).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Před začátkem stahování nebudou příliš velké zprávy smazány (--limitflush vypnuto).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Přepisování adres místních na serveru je povoleno (--norewrite vypnuto).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Přepisování adres místních na serveru je zakázáno (--norewrite zapnuto).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Mazání CR je povoleno (stripcr zapnuto).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Mazání CR je zakázáno (stripcr vypnuto).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Vynucení CR je povoleno (forcecr zapnuto).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Vynucení CR je zakázáno (forcecr vypnuto).\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Interpretace Content-Transfer-Encoding je zakázána (pass8bits zapnuto).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Interpretace Content-Transfer-Encoding je povolena (pass8bits vypnuto).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " Dekódování MIME je povoleno (mimedecode zapnuto).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " Dekódování MIME je zakázáno (mimedecode vypnuto).\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Nečinnost po stahování je povolena (idle zapnuto).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " Nečinnost po stahování je zakázána (idle vypnuto).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Neprázdné řádky Status budou zahozeny (dropstatus zapnuto)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Neprázdné řádky Status budou ponechány (dropstatus vypnuto)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Řádky Delivered-To budou zahozeny (dropdelivered zapnuto)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Řádky Delivered-To budou ponechány (dropdelivered vypnuto)\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Limit velikosti zprávy je %d oktetů (--limit %d).\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Žádný limit velikosti zprávy (--limit 0).\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Interval varování o velikosti zpráv je %d vteřin (--warnings %d).\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Varování o velikosti při každém stahování (--warnings 0).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Limit přijatých zpráv je %d (--fetchlimit %d).\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Žádný Limit přijatých (--fetchlimit 0).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " Limit velikosti stahovaných zpráv je %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Žádný limit velikosti stahovaných (--fetchsizelimit 0).\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Hledat UID při každém stahování binárně (--fastuidl 1).\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Hledat UID při binárně při %d z %d stahování (--fastuidl %d).\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Hledat UID při každém stahování lineárně (--fastuidl 0).\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Limit dávky zpráv SMTP je %d.\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Žádný limit dávky zpráv SMTP (--batchlimit 0).\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Interval odstraňování mezi čištěním vynucen na %d (--expunge %d).\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Žádná vynucená čištění (--expunge 0).\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Domény, pro které se bude stahovat pošta, jsou:" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (implicitní)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Zprávy budou připojeny k %s jako BSMTP\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Zprávy budou doručeny pomocí \"%s\".\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Zprávy budou přeposlány pomocí %cMTP na:" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Název počítače v řádku MAIL FROM bude %s\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Adresa, kterou vkládat v řádcích RCPT TO posílaných v SMTP, bude %s\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Rozpoznávané odpovědi serveru blokující spam jsou:" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Blokování spamu zakázáno\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Připojení k serveru bude navázáno pomocí \"%s\"\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Žádný příkaz před spojením.\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Připojení k serveru bude ukončeno pomocí \"%s\"\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Žádný příkaz po spojení.\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Nedeklarována žádná místní jména tohoto počítače.\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Režim společných schránek: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Režim soukromých schránek: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" @@ -1532,115 +1558,115 @@ msgstr[0] "Rozpoznáváno %d místní jméno.\n" msgstr[1] "Rozpoznávána %d místní jména.\n" msgstr[2] "Rozpoznáváno %d místních jmen.\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " Vyhledávání DNS jmen pro adresy společných schránek je povoleno.s\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " Vyhledávání DNS jmen pro adresy společných schránek je zakázáno.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Přezdívky serveru budou porovnávány s adresami společných schránek podle IP adres.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Přezdívky serveru budou porovnávány s adresami společných schránek podle názvu.\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Směrování dle adresy v obálce je zakázáno\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Předpokládá se, že hlavička obálky je: %s\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Počet hlaviček obálky, které budou přeskočeny: %d\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Předpona %s bude odtržena od id uživatele\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Žádné odtrhávání předpony\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Deklarované přezdívky poštovního serveru:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Místní domény:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Spojení musí procházet přes %s.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Nezadán žádný požadavek na rozhraní.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Stahovací smyčka bude sledovat %s.\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Nezadáno žádné sledované rozhraní.\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Připojení k serveru budou navazovány zásuvným modulem %s (--plugin %s).\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Nezadán žádný příkaz zásuvného modulu.\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Připojení k posluchači budou navazovány zásuvným modulem %s (--plugout %s).\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Nezadán žádný příkaz výstupního zásuvného modulu.\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Z tohoto počítače neukládána žádná UID.\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " Ukládáno %d UID.\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Informace pro sledování stahování budou přidány do hlavičky Received.\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Informace pro sledování stahování nebudou přidány do hlavičky Received.\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Zprávy s chybnými hlavičkami budou odmítnuty.\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Zprávy s chybnými hlavičkami budou vpuštěny.\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Předávané vlastnosti \"%s\".\n" @@ -1755,85 +1781,118 @@ msgstr "Chyba při uvolňování ověření\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: vlákno spí na %d s.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protokol rozpoznán jako IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protokol rozpoznán jako IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "po stahování budu nečinný\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Z IMAP serveru obdržena odpověď BYE: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "nesmyslný počet zpráv v „%s“!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "nesmyslný počet u EXPUNGE v „%s“!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protokol rozpoznán jako IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "nalezen aktualizovaný seznam schopností\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protokol rozpoznán jako IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "server neoznámil rozšíření SASL-IR, ale implementace fetchmailu jej pro AUTHENTICATE EXTERNAL vyžaduje\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: konfigurace vyžaduje TLS, ale STARTTLS není dovoleno kvůli stavu autentizováno (PREAUTH). Spojení bude přerušeno. Je-li váš zásuvný modul bezpečný, můžete STARTTLS překonat pomocí --sslproto '' (vizte manuál).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "po stahování budu nečinný\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: konfigurace vyžaduje TLS, ale STARTTLS není dovoleno kvůli stavu autentizováno (PREAUTH). Spojení bude přerušeno. Server se povoluje, zkuste místo toho --ssl (vizte manuál).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: přechod do TLS uspěl.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: přechod do TLS se nezdařil.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: dobrovolný přechod do TLS se nezdařil, zkouším pokračovat\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: POZOR: server nabídl STARTTLS, ale je zadáno sslproto ''.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: je vyžadován --auth external, ale server jej neoznamuje.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost OTP\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost NTLM\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: je vyžadován --auth password, ale server jej zakazuje (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: vyčerpali jsme všechny autentizační metody, a tak se nelze přihlásit.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "mazání zpráv se neshoduje (%d ve skutečnosti != %d očekáváno)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu nebyla přečtena\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u nebyla přečtena\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "opakované stahování selhalo\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" @@ -1841,11 +1900,11 @@ msgstr[0] "%d zpráva čeká po opětovném stahování\n" msgstr[1] "%d zprávy čekají po opětovném stahování\n" msgstr[2] "%d zpráv čeká po opětovném stahování\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "výběr poštovní schránky selhal\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" @@ -1853,11 +1912,11 @@ msgstr[0] "%d zpráva čeká po prvním stahování\n" msgstr[1] "%d zprávy čekají po prvním stahování\n" msgstr[2] "%d zpráv čeká po prvním stahování\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "čištění selhalo\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" @@ -1865,20 +1924,20 @@ msgstr[0] "%d zpráva čeká po vyčištění\n" msgstr[1] "%d zprávy čekají po vyčištění\n" msgstr[2] "%d zpráv čeká po vyčištění\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "hledání nepřečtených zpráv selhalo\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u je první nepřečtená\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Varování: ignoruji chybné informace o velikostech zpráv vrácené serverem.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Chybná odpověď FETCH: %s.\n" @@ -1983,51 +2042,56 @@ msgstr "nemohu dekódovat BASE64 odpovědi o připravenosti\n" msgid "challenge mismatch\n" msgstr "výzvy nesouhlasí\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: chyba při čtení souboru zámku „%s“: %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: odstraňuje se starý soubor zámku „%s“\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "fetchmail: souboru zámku „%s“ nelze odstranit (%s), zkusí se do něj zapsat\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: do souboru zámku „%s“ nelze zapsat (%s): končí se\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: chyba při otevírání souboru zámku „%s“: %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: tvorba zámku selhala, soubor s PID „%s“: %s\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: nelze odstranit, ani zkrátit soubor s PID „%s“: %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: varování: nalezeno \"%s\" dříve než jméno počítače\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: varování: neznámý token \"%s\"\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: chyba při čtení souboru (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Pozor: přijata chybně utvořená výzva na „AUTH(ENTICATE) NTLM“!\n" @@ -2074,19 +2138,19 @@ msgstr "Neznámá chyba ODMR „%s“\n" msgid "receiving message data\n" msgstr "přijímám obsah zprávy\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Přepínač --keep není s ODMR podporován\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Přepínač --flush není s ODMR podporován\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Přepínač --folder není s ODMR podporován\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Přepínač --check není s ODMR podporován\n" @@ -2098,7 +2162,7 @@ msgstr "od serveru přijato fatální\n" msgid "Could not decode OTP challenge\n" msgstr "Nemohu dekódovat výzvu OTP\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Tajné heslo: " @@ -2432,83 +2496,83 @@ msgstr "POP2 nepodporuje STLD. Nelze pokračovat.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 podporuje pouze přihlašování heslem. Nelze pokračovat.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Pozor: Nalezen server „Maillennium POP3“, použije se příkaz RETR namísto TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "Pro tuto relaci je TLS povinné, ale server odmítl příkaz CAPA.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "Pro tuto relaci je STLS povinné, ale server odmítl příkaz CAPA.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Avšak příkaz CAPA je pro TLS nutný.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Avšak podpora příkazu CAPA je pro STLS nutná.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: dobrovolný přechod do TLS se nezdařil, zkouším pokračovat.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: POZOR: server nabídl STLS, ale je zadáno sslproto ''.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Vyčerpali jsme všechny povolené autentikátory, a tak nelze pokračovat.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "Požadovaný časový údaj APOP nebyl v pozdravu nalezen\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Syntaktická chyba v časovém údaji z pozdravu\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Neplatné časové razítko APOPu.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Žádost o nedefinovaný protokol v POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "zamčeno! Je aktivní jiné sezení?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Odpověď UIDL ze nadřazeného serveru nelze obsloužit.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Server odpověděl s UID chybné zprávy.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) bylo odstraněno, ale je stále přítomno!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Zprávy vloženy do seznamu na serveru. To neumím zpracovat.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "chyba protokolu\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "chyba protokolu při stahování UIDL\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) bylo odstraněno, ale je stále přítomno!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Přepínač --folder není s POP3 podporován\n" @@ -2551,11 +2615,11 @@ msgstr "Soubor %s nesmí mít více oprávnění než -rwx------ (0700).\n" msgid "File %s must be owned by you.\n" msgstr "Musíte vlastnit soubor %s.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Neznámá chyba systému" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (zpráva protokolu nedokončena)\n" @@ -2926,80 +2990,85 @@ msgstr "Autentizace ESMTP LOGIN...\n" msgid "smtp listener protocol error\n" msgstr "chyba protokolu démona smtp\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc selhalo\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: zásuvný modul pro stroj %s službu %s je prázdný, nelze pokračovat!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair selhalo\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: fork selhalo\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 selhalo\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "spouštím %s (počítač %s služba %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) selhalo\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "Chyba getaddrinfo(„%s“,„%s“): %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Zkuste přidat přepínač --service (vizte též položku R12 ve FAQ).\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "neznámý (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Pokouším se připojit na %s/%s…" -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "socket nelze vytvořit: %s\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "název %d: socket rodiny %d druhu %d nelze vytvořit: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "spojení selhalo.\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "spojení k %s:%s [%s/%s] selhalo: %s.\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "název %d: spojení k %s:%s [%s/%s] selhalo: %s.\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "spojeno.\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -3008,229 +3077,244 @@ msgstr "" "Chyby připojení z tohoto dotazu:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "Zpráva z OpenSSL: %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "Zpětné volání pro ověřování SSL: hloubka %d, preverify_ok %d, chyba %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Zpětné volání pro ověřování SSL: hloubka %d, verify_ok %d, chyba %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Certifikát serveru:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Řetěz certifikátů od kořene k protějšku počínaje hloubkou %d:\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "Certifikát v hloubce %d:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Organizace vydavatele: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Varování: Název organizace vydavatele příliš dlouhý (možná zkrácen).\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Neznámá organizace\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Obecné jméno (CN) vydavatele: %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Varování: Obecné jméno (CN) vydavatele je příliš dlouhé (možná zkráceno).\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Neznámé obecné jméno (CN) vydavatele\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "Obecné jméno (CN) subjektu: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Špatný certifikát: Obecné jméno (CN) subjektu je příliš dlouhé!\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Špatný certifikát: Obecné jméno subjektu obsahuje NUL, zrušuje se!\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Alternativní jméno subjektu: %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Špatný certifikát: Alternativní jméno subjektu obsahuje NUL, zrušuje se!\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Obecné jméno (CN) serveru neodpovídá: %s != %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Jméno serveru nenastaveno, nemohu ověřit certifikát!\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Neznámé obecné jméno (CN) serveru\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Jméno serveru není v certifikátu zadáno!\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() selhalo!\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Nedostatek paměti!\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "Vyrovnávací paměť pro otisk je příliš malá!\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "otisk klíče %s: %s\n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "otisky %s odpovídají.\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "otisky %s neodpovídají.\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Chyba ověřování certifikátu serveru: %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Řetěz certifikátů je rozbitý u: %s\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "To může znamenat, že server neposkytl certifikáty mezilehlých autorit, s čímž fetchmail nemůže nic udělat. Podrobnější vysvětlení lze nalézt v dokumentu README.SSL-SERVER, který je s fetchmailem dodáván.\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Chybí důvěryhodný certifikát: %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "To může znamenat, že podpisový certifikát kořenové autority není uveden v seznamu certifikátů důvěryhodných autorit nebo že je třeba v adresáři s certifikáty spustit c_rehash. Podrobnější vysvětlení lze nalézt v dokumentaci --sslcertpath a --sslcertfile v manuálové stránce. Pro podrobnosti vizte README.SSL.\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Vaše verze OpenSSL nepodporuje SSLv3.\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Vaše verze OpenSSL nepodporuje TLS v1.1.\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Vaše verze OpenSSL nepodporuje TLS v1.2.\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Vaše verze OpenSSL nepodporuje TLS v1.3.\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "Zadán neplatný protokol SSL „%s“, použije se výchozí automatický výběr (auto).\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Zavedená knihovna wolfSSL %#lx je starší než verze hlaviček %#lx. Konec.\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "Zavedená knihovna OpenSSL %#lx je starší než verze hlaviček %#lx. Konec.\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "Zavedená knihovna OpenSSL %#lx je novější než verze hlaviček %#lx. Pokračuje se.\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Deskriptor souboru mimo rozsah pro SSL" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Vezměte na vědomí, že některé distribuce vypínají starší verze protokolů podivnými způsoby. Zkuste novější verzi protokolu.\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Nelze načíst seznam důvěryhodných certifikátu (soubor=„%s“, adresář=„%s“), chyba %d:\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Pozor: SSL_set_tlsext_host_name(%p, \"%s\") selhalo (kód %#lx), pokračuje se.\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: socket %d: funkce wolfSSL_check_domain_name(%#p, \"%s\") vrátila %d, pokračuje se\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Pozor: X509_VERIFY_PARAM_set1_host(%p, \"%s\") selhalo (kód %#x), pokračuje se.\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Server předčasně ukončil spojení během volání SSL_connect().\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Chyba systému během SSL_connect(): %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "dojednání spojení selhalo na úrovni protokolu nebo transportní vrstvy." -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Současnou šifru SSL/TLS nelze získat – žádné spojení nebylo ustanoveno?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: používá se protokol %s, šifra %s, %d/%d bitů tajemství/procesních\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Ověření certifikátu/otisku bylo nějak přeskočeno!\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Pozor: spojení není zabezpečeno, přesto se bude pokračovat. (Raději použijte --sslcertck!)\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Další pokus čtení ze socketu Cygwin\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Další pokus čtení ze socketu Cygwin selhal!\n" @@ -3421,6 +3505,9 @@ msgstr "malloc selhalo\n" msgid "realloc failed\n" msgstr "realloc selhalo\n" +#~ msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" +#~ msgstr "POZOR: Přeloženo s LibreSSL, což není podporovaná konfigurace.\n" + #~ msgid "Required LOGIN capability not supported by server\n" #~ msgstr "Server nepodporuje požadovanou schopnost LOGIN\n" @@ -6,10 +6,10 @@ # Matthias Andree <matthias.andree@gmx.de>, 2004 - 2020. msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.16-rc1\n" +"Project-Id-Version: fetchmail 6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-07-28 18:09+0200\n" -"PO-Revision-Date: 2021-01-30 15:17+0100\n" +"POT-Creation-Date: 2024-01-31 21:23+0100\n" +"PO-Revision-Date: 2023-01-04 12:15+0100\n" "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" "Language: de\n" @@ -169,49 +169,49 @@ msgstr[0] "" msgstr[1] "" "fetchlimit %d erreicht; %d Nachrichten auf Server %s Konto %s verblieben\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "" "Zeitüberschreitung nach %d Sekunden beim Warten auf Verbindung mit Server " "%s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "Zeitüberschreitung nach %d Sekunden beim Warten auf Server %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "Zeitüberschreitung nach %d Sekunden beim Warten auf %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "" "Zeitüberschreitung nach %d Sekunden beim Warten Antwort des SMTP/LMTP-" "Servers.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "Zeitüberschreitung nach %d Sekunden.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail beobachtet wiederholte Zeitüberschreitungen" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "" -"Fetchmail saw more than %d timeouts while attempting to get mail from %s@" -"%s.\n" +"Fetchmail saw more than %d timeouts while attempting to get mail from " +"%s@%s.\n" msgstr "" "Fetchmail hat mehr als %d Zeitüberschreitungen erlitten beim Versuch, Mail " "von %s@%s abzuholen.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -228,76 +228,76 @@ msgstr "" "Fetchmail wird diese Mailbox nicht mehr abfragen, bis Sie es erneut " "starten.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "Vor-Verbindungs-Befehl wurde mit Signal %d beendet\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "Vor-Verbindungs-Befehl scheiterte mit Status %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "konnte das HESIOD-Postfach für %s nicht finden\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Erster Server hat keinen Namen.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "konnte kanonischen DNS-Namen von %s (%s) nicht finden: %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "%s-Verbindung zu %s fehlgeschlagen" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "SSL-Verbindung fehlgeschlagen.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Lock-beschäftigt-Fehler bei %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Server-beschäftigt-Fehler bei %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Authentifikationsfehlschlag bei %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (vormals autorisiert)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "" "Hilfe (auf Englisch): siehe http://www.fetchmail.info/fetchmail-FAQ." "html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "Fetchmail: Authentifikation fehlgeschlagen bei %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail konnte keine Mail von %s@%s erhalten.\n" # -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -312,7 +312,7 @@ msgstr "" "brauchbare Fehlermeldung geliefert hat." # -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -334,7 +334,7 @@ msgstr "" "Wiederherstellung des Dienstes keine weiteren Meldungen gesendet." # -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -355,180 +355,185 @@ msgstr "" "versuchen, eine Verbindung herzustellen. Es werden bis zur\n" "Wiederherstellung des Dienstes keine weiteren Meldungen gesendet." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Sofortige erneute Abfrage von %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Socket- oder TLS-Fehler bei %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Unbekannter Einlogg- oder Authentifikationsfehler bei %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Authentifikation bei %s@%s erfolgreich\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "Fetchmail: Authentifikation bei %s@%s erfolgreich" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail war in der Lage, sich bei %s@%s einzuloggen.\n" # -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Der Dienst ist wieder hergestellt.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "Ordner %s wird gewählt oder erneut abgefragt\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "Vorgabe-Ordner wird gewählt oder erneut abgefragt\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s bei %s (Ordner %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s bei %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Frage %s ab\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d Nachricht (%d %s) für %s" msgstr[1] "%d Nachrichten (%d %s) für %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "gesehene" msgstr[1] "gesehene" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d Nachricht für %s" msgstr[1] "%d Nachrichten für %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d Bytes).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Keine Post für %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "ungültige Nachrichtenanzahl!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "" "Zu viele Nachrichten (%d > %d) wegen vorübergehender Fehler auf %s " "übersprungen.\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "Socket" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "fehlende oder fehlerhafte RFC822-Kopfzeile" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "Klient/Server-Synchronisation" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "Klient/Server-Protokoll" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "Lock auf Server beschäftigt" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "SMTP-Transaktion" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "DNS-Nachschlagen" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "undefinierter" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "%s-Fehler beim Abholen von %s@%s und Auslieferung zum SMTP-Host %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "unbekannt" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "%s-Fehler beim Abholen von %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "Nach-Verbindungs-Befehl wurde mit Signal %d beendet\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "Nach-Verbindungs-Befehl scheiterte mit Status %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Kerberos-V4-Unterstützung nicht vorhanden.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Kerberos-V5-Unterstützung nicht vorhanden.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Option --flush wird mit %s nicht unterstützt\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Option --all wird mit %s nicht unterstützt\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Option --limit wird mit %s nicht unterstützt\n" @@ -655,19 +660,19 @@ msgstr "ETRN-Syntaxfehler in Parametern\n" msgid "Unknown ETRN error %d\n" msgstr "Unbekannter ETRN-Fehler %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Option --keep wird mit ETRN nicht unterstützt\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Option --flush wird mit ETRN nicht unterstützt\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Option --folder wird mit ETRN nicht unterstützt\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Option --check wird mit ETRN nicht unterstützt\n" @@ -709,12 +714,12 @@ msgstr "fetchmail: aufgerufen mit" msgid "could not get current working directory\n" msgstr "konnte aktuelles Arbeitsverzeichnis nicht feststellen\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Dies ist fetchmail Version %s" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -723,7 +728,7 @@ msgstr "" "Mit SSL-Bibliothek %#lx \"%s\" übersetzt\n" "Laufzeit benutzt %#lx \"%s\" als SSL-Bibliothek\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -732,89 +737,90 @@ msgstr "" "OpenSSL: %s\n" "Module (\"Engines\"): %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "WARNUNG: Ihre SSL/TLS-Bibliothek unterstützt TLS v1.3 nicht.\n" -#: fetchmail.c:320 +#: fetchmail.c:326 msgid "" -"WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" +"ERROR: Compiled against LibreSSL, which is a copyright violation for lack of " +"GPL clause 2b exception. See COPYING. Aborting.\n" msgstr "" -"WARNUNG: Mit LibreSSL übersetzt, diese Konfiguration wird nicht " -"unterstützt.\n" +"FEHLER: Gegen LibreSSL übersetzt. Das ist eine Urheberrechtsverletzung " +"mangels Ausnahme für die GPL-Klausel 2b. Siehe COPYING. Breche ab.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "WARNUNG: Ohne SSL/TLS-Unterstützung übersetzt.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "" "Die nodetach-Option ist in Gebrauch, die logfile-Option wird ignoriert.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Nicht im Daemon-Modus, ignoriere die logfile-Option.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Die Logdatei \"%s\" existiert nicht, ignoriere die logfile-Option.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Die Logdatei \"%s\" ist nicht beschreibbar, breche ab.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "" "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "" "syslog und logfile sind beide gesetzt, ignoriere syslog und logge nach %s" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Erhalte Optionen von Kommandozeile%s%s\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " und " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Keine Mailserver konfiguriert -- vielleicht fehlt %s?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: es wurden keine Mailserver angegeben.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: es läuft kein weiteres fetchmail\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "" "fetchmail: Fehler beim Beenden von %s-fetchmail mit Kennung %ld; Abbruch.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "Hintergrund" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "Vordergrund" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s-fetchmail mit Kennung %ld beendet.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "" "fetchmail: can't check mail while another fetchmail to same host is " "running.\n" @@ -822,7 +828,7 @@ msgstr "" "fetchmail: kann Mail nicht abholen, solange auf dem Rechner ein weiteres " "fetchmail läuft.\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "" "fetchmail: can't poll specified hosts with another fetchmail running at " @@ -831,216 +837,216 @@ msgstr "" "fetchmail: kann spezifizierte Hosts nicht abfragen, solange ein weiteres " "fetchmail mit Kennung %ld läuft.\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: ein weiteres Vordergrund-fetchmail läuft mit Kennung %ld.\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "" "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "" "fetchmail: kann keine Optionen akzeptieren, solange Hintergrund-fetchmail " "läuft.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: Hintergrund-fetchmail mit Kennung %ld aufgeweckt.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "" "fetchmail: älterer Prozess mit Kennung %ld wurde auf mysteriöse Weise " "beendet.\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: kann kein Passwort für %s@%s finden.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Geben Sie das Passwort für %s@%s ein: " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: Kann nicht in den Hintergrund gehen. Abbruch.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "fetchmail %s Dämon wird gestartet\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "konnte %s nicht öffnen, um Protokolle anzuhängen\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "--check eingeschaltet, hole keine Mail\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "konnte keine Zeitüberprüfung bei %s durchführen (Fehler %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "starte fetchmail erneut (%s verändert)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "" "Der Versuch, fetchmail erneut auszuführen, kann fehlschlagen,\n" "da da Verzeichnis nicht wieder hergestellt wurde\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "Versuch, fetchmail erneut auszuführen, fehlgeschlagen\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "" "Abfrage von %s übersprungen (fehlgeschlagene Authentifikation oder zu viele " "Zeitüberschreitungen)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "Intervall nicht erreicht, %s wird nicht abgefragt\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Abfragestatus=0 (SUCCESS)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Abfragestatus=1 (NOMAIL)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Abfragestatus=2 (SOCKET)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Abfragestatus=3 (AUTHFAIL)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Abfragestatus=4 (PROTOCOL)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Abfragestatus=5 (SYNTAX)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Abfragestatus=6 (IOERR)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Abfragestatus=7 (ERROR)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Abfragestatus=8 (EXCLUDE)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Abfragestatus=9 (LOCKBUSY)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Abfragestatus=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Abfragestatus=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Abfragestatus=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Abfragestatus=13 (MAXFETCH)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Abfragestatus=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Alle Verbindungen haben sich aufgehängt. Abbruch.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "%s: schlafe %d Sekunden lang\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "geweckt durch %s\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "geweckt durch Signal %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "geweckt um %s\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "normale Beendigung, Status %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "konnte den Zeitstempel der Run-Control-Datei nicht prüfen\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Warnung: Server %s mehrmals in der Konfigurationsdatei vorhanden\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "" -"fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults" -"\" is not the first record.\n" +"fetchmail: Error: multiple \"defaults\" records in config file, or " +"\"defaults\" is not the first record.\n" msgstr "" "fetchmail: Fehler: mehrere „defaults”-Einträge in Konfigurationsdatei, oder " "„defaults” ist nicht der erste Eintrag.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "SSL-Unterstützung ist nicht einkompiliert.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "" "KERBEROS-v4-Unterstützung ist konfiguriert, aber nicht einkompiliert.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "" "KERBEROS-v5-Unterstützung ist konfiguriert, aber nicht einkompiliert.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "GSSAPI-Unterstützung ist konfiguriert, aber nicht einkompiliert.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "" "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" @@ -1048,17 +1054,17 @@ msgstr "" "fetchmail: Warnung: Kein DNS verfügbar, um Multidrop-Abholung von %s zu " "überprüfen\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "Warnung: multidrop für %s erfordert Verwendung der envelope-Option!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "" "Warnung: Fragen Sie nicht nach Hilfe, wenn alle Mail zum Postmaster geht!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "" "fetchmail: %s configuration invalid, specify positive port number for " @@ -1067,338 +1073,374 @@ msgstr "" "fetchmail: %s-Konfiguration ungültig, bitte eine positive Portnummer für " "Port/Service angeben\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "" "fetchmail: %s-Konfiguration ungültig, RPOP erfordert einen privilegierten " "Port\n" -#: fetchmail.c:1430 +#: fetchmail.c:1424 +#, c-format +msgid "" +"WARNING: %s configuration invalid, you normally need --ssl for port 995/" +"service pop3s.\n" +msgstr "" +"WARNUNG: Konfiguration für %s ungültig, normalerweise brauchen Sie --ssl für " +"Port 995/service pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "" +"WARNING: %s configuration invalid, you normally need port 995/service pop3s " +"for --ssl.\n" +msgstr "" +"WARNUNG: Konfiguration für %s ungültig, normalerweise brauchen Sie port 995/" +"service pop3s für --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "" +"WARNING: %s configuration invalid, you normally need --ssl for port 993/" +"service imaps.\n" +msgstr "" +"WARNUNG: Konfiguration für %s ungültig, normalerweise brauchen Sie --ssl für " +"port 993/service imaps.\n" + +#: fetchmail.c:1429 +#, c-format +msgid "" +"WARNING: %s configuration invalid, you normally need port 993/service imaps " +"for --ssl.\n" +msgstr "" +"WARNUNG: Konfiguration für %s ungültig, normalerweise brauchen Sie port 993/" +"service imaps für --ssl.\n" + +#: fetchmail.c:1447 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "" "%s-Konfiguration ungültig, LMTP kann nicht den SMTP-Standard-Port benutzen\n" -#: fetchmail.c:1444 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "" "Im Dämon- oder Idle-Betrieb dürfen Sie fetchall und keep nicht\n" "gleichzeitig anschalten!\n" -#: fetchmail.c:1454 +#: fetchmail.c:1471 msgid "" "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "" "fetchmail: Fehler: idle funktioniert nicht für mehrere Ordner oder Kontos!\n" -#: fetchmail.c:1478 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "beendet mit Signal %d\n" -#: fetchmail.c:1551 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s fragt %s ab (Protokoll %s) um %s: Abfrage gestartet\n" -#: fetchmail.c:1576 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "POP2-Unterstützung ist nicht konfiguriert.\n" -#: fetchmail.c:1588 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "POP3-Unterstützung ist nicht konfiguriert.\n" -#: fetchmail.c:1598 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "IMAP-Unterstützung ist nicht konfiguriert.\n" -#: fetchmail.c:1604 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "ETRN-Unterstützung ist nicht konfiguriert.\n" -#: fetchmail.c:1612 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "ODMR-Unterstützung ist nicht konfiguriert.\n" -#: fetchmail.c:1619 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "nicht unterstütztes Protokoll ausgewählt.\n" -#: fetchmail.c:1630 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s fragt ab %s (Protokoll %s) um %s: Abfrage beendet\n" -#: fetchmail.c:1655 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Abfrageintervall ist %d Sekunden\n" -#: fetchmail.c:1657 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Log-Datei ist %s\n" -#: fetchmail.c:1659 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Idfile ist %s\n" -#: fetchmail.c:1662 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Fortschrittsnachrichten werden via syslog geloggt\n" -#: fetchmail.c:1665 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail wird sich maskieren und kein eigenes „Received“ erzeugen\n" -#: fetchmail.c:1667 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail wird Fortschrittspunkte auch in Log-Dateien schreiben.\n" -#: fetchmail.c:1669 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "" "Fetchmail wird fehladressierte Multidrop-Nachricht an %s weiterleiten.\n" -#: fetchmail.c:1673 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail wird Fehlerbenachrichtigungen an „postmaster“ richten.\n" -#: fetchmail.c:1675 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail wird Fehlerbenachrichtigungen an den Absender richten.\n" -#: fetchmail.c:1678 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "" "Fetchmail wird permanente Fehler als solche behandeln (Nachrichten " "verwerfen).\n" -#: fetchmail.c:1680 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "" "Fetchmail wird permantente Fehler behandeln als wären sie\n" "vorübergehend (und Nachrichten behalten).\n" -#: fetchmail.c:1687 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Optionen für Abholen von %s@%s:\n" -#: fetchmail.c:1691 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " E-Mail wird abgeholt via %s\n" -#: fetchmail.c:1694 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " Abfrage dieses Servers wird jedesmal erfolgen.\n" msgstr[1] " Abfrage dieses Servers wird alle %d Intervalle erfolgen.\n" -#: fetchmail.c:1698 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Wahrer Name des Servers ist %s.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr "" " Dieser Host wird nicht abgefragt, wenn er nicht ausdrücklich angegeben " "ist.\n" -#: fetchmail.c:1702 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Dieser Host wird abgefragt, wenn kein Host angegeben ist.\n" -#: fetchmail.c:1706 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Passwörter werden abgefragt.\n" -#: fetchmail.c:1710 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " APOP-Geheimnis = „%s“.\n" -#: fetchmail.c:1713 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP id = „%s“.\n" -#: fetchmail.c:1716 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Passwort = „%s“.\n" -#: fetchmail.c:1725 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Protokoll ist KPOP mit Kerberos-%s-Authentifikation" -#: fetchmail.c:1728 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Protokoll ist %s" -#: fetchmail.c:1730 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (unter Benutzung von Service %s)" -#: fetchmail.c:1732 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (unter Benutzung des Standard-Ports)" -#: fetchmail.c:1734 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (erzwungener UIDL-Gebrauch)" -#: fetchmail.c:1740 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Alle verfügbaren Authentifikationsmethoden werden versucht.\n" -#: fetchmail.c:1743 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Passwort-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1746 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " MSN-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1749 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " NTLM-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1752 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " OTP-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1755 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " CRAM-MD5-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1758 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " GSSAPI-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1761 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Kerberos-V4-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1764 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Kerberos-V5-Authentifikation wird erzwungen.\n" -#: fetchmail.c:1767 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Ende-zu-Ende-Verschlüsselung wird unterstellt.\n" -#: fetchmail.c:1771 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Auftraggeber (\"principal\") des Mailservice ist: %s\n" -#: fetchmail.c:1774 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " SSL-verschlüsselte Sitzungen ermöglicht.\n" -#: fetchmail.c:1776 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " SSL-Protokoll: %s.\n" -#: fetchmail.c:1778 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " SSL-Server-Zertifikat-Überprüfung ermöglicht.\n" -#: fetchmail.c:1780 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " SSL-Server-Zertifikat-Überprüfung abgeschaltet.\n" -#: fetchmail.c:1782 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Voreingestellte SSL-Datei für vertrauenswürdige Zertifikate: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " SSL-Datei für vertrauenswürdige Zertifikate: %s\n" -#: fetchmail.c:1785 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr "" " Voreingestelltes SSL-Verzeichnis für vertrauenswürdige Zertifikate: %s\n" -#: fetchmail.c:1787 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " SSL-Verzeichnis für vertrauenswürdige Zertifikate: %s\n" -#: fetchmail.c:1789 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " SSL-Server-CommonName: %s\n" -#: fetchmail.c:1791 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " SSL-Schlüssel-Fingerabdruck (gegen Server-Schlüssel überprüft): %s\n" -#: fetchmail.c:1794 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Auszeit für nichtantwortenden Server ist %d Sekunden" -#: fetchmail.c:1796 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (Voreinstellung).\n" -#: fetchmail.c:1803 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Standard-Postfach ausgewählt.\n" -#: fetchmail.c:1808 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Gewählte Postfächer sind:" -#: fetchmail.c:1814 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Alle Nachrichten werden abgeholt (--all on).\n" -#: fetchmail.c:1815 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Nur neue Nachrichten werden abgeholt (--all off).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Abgeholte Nachrichten werden auf dem Server belassen (--keep on).\n" -#: fetchmail.c:1818 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr "" " Abgeholte Nachrichten werden nicht auf dem Server belassen (--keep off).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr "" " Alte Nachrichten werden vor der Nachrichtenabholung gelöscht (--flush " "on).\n" -#: fetchmail.c:1821 +#: fetchmail.c:1838 msgid "" " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr "" " Alte Nachrichten werden vor der Nachrichtenabholung nicht gelöscht (--" "flush off).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1840 msgid "" " Oversized messages will be flushed before message retrieval (--limitflush " "on).\n" @@ -1406,7 +1448,7 @@ msgstr "" " Übergroße Nachrichten werden vor der Nachrichtenabholung gelöscht (--" "limitflush on).\n" -#: fetchmail.c:1824 +#: fetchmail.c:1841 msgid "" " Oversized messages will not be flushed before message retrieval (--" "limitflush off).\n" @@ -1414,349 +1456,349 @@ msgstr "" " Übergroße Nachrichten werden vor der Nachrichtenabholung nicht gelöscht (--" "limitflush off).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Umschreiben von server-lokalen Adressen ist an (--norewrite off).\n" -#: fetchmail.c:1827 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Umschreiben von server-lokalen Adressen ist aus (--norewrite on).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Entfernen von Carriage-Return-Zeichen ist ein (stripcr on).\n" -#: fetchmail.c:1830 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Entfernen von Carriage-Return-Zeichen ist aus (stripcr off).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Erzwingen von Carriage-Return-Zeichen ist ein (forcecr on).\n" -#: fetchmail.c:1833 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Erzwingen von Carriage-Return-Zeichen ist aus (forcecr off).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1852 msgid "" " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr "" " Interpretation von Content-Transfer-Encoding ist aus (pass8bits on).\n" -#: fetchmail.c:1836 +#: fetchmail.c:1853 msgid "" " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr "" " Interpretation von Content-Transfer-Encoding ist ein (pass8bits off).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME-Decodierung ist ein (mimedecode on).\n" -#: fetchmail.c:1839 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME-Decodierung ist aus (mimedecode off).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " „Idle“ nach Abfrage ist ein (idle on).\n" -#: fetchmail.c:1842 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " „Idle“ nach Abfrage ist aus (idle off).\n" -#: fetchmail.c:1844 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Nichtleere Statuszeilen werden verworfen (dropstatus on)\n" -#: fetchmail.c:1845 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Nichtleere Statuszeilen werden beibehalten (dropstatus off)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Delivered-To-Zeilen werden verworfen (dropdelivered on)\n" -#: fetchmail.c:1848 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Delivered-To-Zeilen werden beibehalten (dropdelivered off)\n" -#: fetchmail.c:1852 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Nachrichtengrößen-Beschränkung ist %d Bytes (--limit %d).\n" -#: fetchmail.c:1855 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Keine Beschränkung der Nachrichtengröße (--limit 0).\n" -#: fetchmail.c:1857 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr "" " Nachrichtengröße-Warnungsintervall ist %d Sekunden (--warnings %d).\n" -#: fetchmail.c:1860 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Größenwarnungen bei jeder Abfragen (--warnings 0).\n" -#: fetchmail.c:1863 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Limit für erhaltene Nachrichten ist %d (--fetchlimit %d).\n" -#: fetchmail.c:1866 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Kein Limit für erhaltene Nachrichten (--fetchlimit 0).\n" -#: fetchmail.c:1868 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr "" " Limit für die Größe erhaltener Nachrichten ist %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1871 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Keine Beschränkung der Nachrichtengröße (--fetchsizelimit 0).\n" -#: fetchmail.c:1875 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr "" " Bei jeder Abfrage binäre Suche nach UIDs durchführen (--fastuidl 1).\n" -#: fetchmail.c:1877 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr "" " Binäre Suche nach UIDs bei %d von %d Abfragen durchführen (--fastuidl " "%d).\n" -#: fetchmail.c:1880 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr "" " Bei jeder Abfrage lineare Suche nach UIDs durchführen (--fastuidl 0).\n" -#: fetchmail.c:1882 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Limit für SMTP-Stapelauslieferung ist %d.\n" -#: fetchmail.c:1884 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Kein Limit für SMTP-Stapelauslieferung (--batchlimit 0).\n" -#: fetchmail.c:1888 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr "" " Anzahl der Löschvorgänge zwischen tatsächlichen Säuberungen auf %d gesetzt " "(--expunge %d).\n" -#: fetchmail.c:1890 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Keine erzwungenen Säuberungen (--expunge 0).\n" -#: fetchmail.c:1897 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Domänen, für die Mail abgeholt werden wird, sind:" -#: fetchmail.c:1902 fetchmail.c:1922 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (Voreinstellung)" -#: fetchmail.c:1907 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Nachrichten werden an %s als BSMTP angehängt\n" -#: fetchmail.c:1909 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Nachrichten werden mit „%s“ ausgeliefert.\n" -#: fetchmail.c:1916 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Nachrichten werden mit %cMTP weitergeleitet an:" -#: fetchmail.c:1927 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Host-Teil der „MAIL FROM“-Zeile ist %s\n" -#: fetchmail.c:1930 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr "" " Adresse, die in „RCPT TO“-Zeilen, die an SMTP ausgeliefert werden, " "verwendet wird, ist %s\n" -#: fetchmail.c:1939 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Erkannte Spam-Abblock-Antworten des SMTP/LMTP-Servers sind:" -#: fetchmail.c:1945 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Spam-Abblocken deaktiviert\n" -#: fetchmail.c:1948 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Server-Verbindung wird aktiviert mit „%s“.\n" -#: fetchmail.c:1951 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Kein Vor-Verbindungs-Befehl.\n" -#: fetchmail.c:1953 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Server-Verbindung wird beendet mit „%s“.\n" -#: fetchmail.c:1956 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Kein Nach-Verbindungs-Befehl.\n" -#: fetchmail.c:1959 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Keine lokalen Namen (localnames) für diesen Host definiert.\n" -#: fetchmail.c:1969 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Multi-Drop-Modus: " -#: fetchmail.c:1971 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Einzel-Drop-Modus: " -#: fetchmail.c:1973 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d lokaler Name erkannt.\n" msgstr[1] "%d lokale Namen erkannt.\n" -#: fetchmail.c:1988 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " DNS-Suche für Multi-Drop-Adressen ist ein.\n" -#: fetchmail.c:1989 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " DNS-Suche für Multi-Drop-Adressen ist aus.\n" -#: fetchmail.c:1993 +#: fetchmail.c:2010 msgid "" " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr "" " Server-Aliasnamen werden anhand der IP mit mit multidrop-Adressen " "verglichen.\n" -#: fetchmail.c:1995 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr "" " Server-Aliasnamen werden anhand des Namens mit multidrop-Adressen " "verglichen.\n" -#: fetchmail.c:1998 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Umschlag-Adress-Routing ist deaktiviert\n" -#: fetchmail.c:2001 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Umschlag-Header wird angenommen als: %s\n" -#: fetchmail.c:2004 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Anzahl der zu überspringenden Umschlag-Kopfzeilen: %d\n" -#: fetchmail.c:2007 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Präfix %s wird von Nutzer-ID entfernt\n" -#: fetchmail.c:2010 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Keine Präfix-Entfernung\n" -#: fetchmail.c:2015 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Vordeklarierte Mailserver-Aliase:" -#: fetchmail.c:2023 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Lokale Domänen:" -#: fetchmail.c:2033 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Verbindung muss durch Schnittstelle %s geschehen.\n" -#: fetchmail.c:2035 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Kein Schnittstellen-Bindung angefordert.\n" -#: fetchmail.c:2037 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Abfrageschleife wird %s überwachen.\n" -#: fetchmail.c:2039 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Kein Überwachungsinterface angegeben.\n" -#: fetchmail.c:2043 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr "" " Serververbindungen werden mittels Plugin %s durchgeführt (--plugin %s).\n" -#: fetchmail.c:2045 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Kein Plugin-Befehl angegeben.\n" -#: fetchmail.c:2047 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr "" " SMTP/LMTP-Server-Verbindungen werden mittels Plugout %s durchgeführt (--" "plugout %s).\n" -#: fetchmail.c:2049 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Kein Plugout-Befehl angegeben.\n" -#: fetchmail.c:2056 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Keine UIDs von diesem Host gespeichert.\n" -#: fetchmail.c:2059 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UIDs gespeichert.\n" -#: fetchmail.c:2065 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr "" " Abfrage-Nachverfolgungsinformationen werden dem Received-Header " "hinzugefügt.\n" -#: fetchmail.c:2067 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr "" " Dem Received-Kopf werden keine Nachverfolgungsinformationen hinzugefügt.\n" -#: fetchmail.c:2072 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Nachrichten mit defekten Headern werden abgewiesen.\n" -#: fetchmail.c:2075 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Nachrichten mit defekten Headern werden ausgeliefert.\n" -#: fetchmail.c:2080 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Eigenschaften zum Durchleiten „%s“.\n" @@ -1880,131 +1922,183 @@ msgstr "Fehler beim Freigeben der Beglaubigungen\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: Thread schläft für %d Sek.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protokoll identifiziert als IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protokoll identifiziert als IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protokoll identifiziert als IMAP2 oder IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "werde nach Abfrage untätig sein\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "\"BYE\"-Antwort vom IMAP-Server erhalten: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "ungültige Nachrichtenanzahl in \"%s\"!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "ungültige Zahl für EXPUNGE in \"%s\"!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protokoll identifiziert als IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "aktualisierte Liste der capabilities gefunden\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protokoll identifiziert als IMAP4 rev 0\n" +#: imap.c:442 +msgid "" +"server did not advertise SASL-IR extension but fetchmail's implementation " +"requires it for AUTHENTICATE EXTERNAL\n" +msgstr "" +"Der Server hat die SASL-IR-Erweiterung nicht angeboten, fetchmails " +"Implementierung benötigt die aber für AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protokoll identifiziert als IMAP2 oder IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "" +"%s: configuration requires TLS, but STARTTLS is not permitted because of " +"authenticated state (PREAUTH). Aborting connection. If your plugin is " +"secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "" +"%s: die Konfiguration verlangt TLS, aber STARTTLS ist aufgrund eingeloggtem " +"Zustand (PREAUTH) unzulässig. Breche Verbindung ab. Wenn Ihr plugin sicher " +"ist, können Sie STARTTLS abschalten mit --sslproto '' (siehe Handbuch).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "werde nach Abfrage untätig sein\n" +#: imap.c:496 +#, c-format +msgid "" +"%s: configuration requires TLS, but STARTTLS is not permitted because of " +"authenticated state (PREAUTH). Aborting connection. Server permitting, try " +"--ssl instead (see manual).\n" +msgstr "" +"%s: die Konfiguration verlangt TLS, aber STARTTLS ist aufgrund eingeloggtem " +"Zustand (PREAUTH) unzulässig. Breche Verbindung ab. Wenn der Server es " +"erlaubt, versuchen Sie --ssl (siehe Handbuch).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: Upgrade auf TLS erfolgreich.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: Upgrade auf TLS fehlgeschlagen.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "" "%s: opportunistisches Upgrade auf TLS fehlgeschlagen, versuche " "weiterzumachen\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "" "%s: WARNUNG: Server hat STARTTLS angeboten, aber sslproto '' ist angegeben.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: --auth external angefordert, Server unterstützt dies aber nicht.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Benötigte OTP-Fähigkeit nicht in fetchmail einkompiliert\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Benötigte NTLM-Fähigkeit nicht in fetchmail einkompiliert\n" -#: imap.c:693 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "" +"%s: --auth password angefordert, Server verbietet das aber (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "" +"%s: keine weiteren Authentifizierungsverfahren verfügbar, Login nicht " +"möglich.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "unerwartete Expunge-Bestätigung (%d tatsächlich != %d erwartet)\n" -#: imap.c:820 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu ist ungelesen\n" -#: imap.c:870 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u ist ungelesen\n" -#: imap.c:905 imap.c:964 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "erneute Abfrage fehlgeschlagen\n" -#: imap.c:913 imap.c:969 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d Nachricht wartet nach erneuter Abfrage\n" msgstr[1] "%d Nachrichten warten nach erneuter Abfrage\n" -#: imap.c:930 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "Postfach-Auswahl fehlgeschlagen\n" -#: imap.c:934 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "%d Nachricht wartet nach der ersten Abfrage\n" msgstr[1] "%d Nachrichten warten nach der ersten Abfrage\n" -#: imap.c:948 +#: imap.c:1024 msgid "expunge failed\n" msgstr "Säubern (EXPUNGE) fehlgeschlagen\n" -#: imap.c:952 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "%d Nachricht wartet nach dem Säubern (EXPUNGE)\n" msgstr[1] "%d Nachrichten warten nach dem Säubern (EXPUNGE)\n" -#: imap.c:991 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "Suche nach ungelesenen Nachrichten fehlgeschlagen\n" -#: imap.c:996 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u ist erste ungelesene\n" -#: imap.c:1080 +#: imap.c:1156 msgid "" "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Warnung: ignoriere falsche Größendaten vom Server.\n" -#: imap.c:1179 imap.c:1186 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Unpassende Antwort auf FETCH: %s.\n" @@ -2112,53 +2206,58 @@ msgstr "konnte BASE64-Bestätigungs-Erwiderung nicht dekodieren\n" msgid "challenge mismatch\n" msgstr "Challenge stimmt nicht überein\n" -#: lock.c:87 +#: lock.c:91 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: Fehler beim Lesen der Lockdatei „%s”: %s\n" -#: lock.c:98 +#: lock.c:102 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: entferne alte Lockdatei \"%s\"\n" -#: lock.c:102 +#: lock.c:106 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "" "fetchmail: Fehler beim Öffnen der Lockdatei „%s”: %s, versuche, in die Datei " "zu schreiben\n" -#: lock.c:116 +#: lock.c:120 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: kann nicht in Lockdatei „%s” schreiben (%s), beende\n" -#: lock.c:126 +#: lock.c:130 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: Fehler beim Öffnen der Lockdatei „%s”: %s\n" -#: lock.c:176 +#: lock.c:180 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: Lock-Herstellung fehlgeschlagen, pidfile \"%s\": %s\n" -#: lock.c:187 +#: lock.c:191 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: kann Lockdatei „%s” weder entfernen noch löschen: %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: Warnung: fand „%s“ vor irgendwelchen Hostnamen\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: Warnung: unbekanntes Token „%s“\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: Fehler beim Lesen der Datei (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Warnung: Unpassende Challenge für \"AUTH(ENTICATE) NTLM\" empfangen!\n" @@ -2205,19 +2304,19 @@ msgstr "Unbekannter ODMR-Fehler \"%s\"\n" msgid "receiving message data\n" msgstr "Empfange Nachrichten\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Option --keep wird mit ODMR nicht unterstützt\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Option --flush wird mit ODMR nicht unterstützt\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Option --folder wird mit ODMR nicht unterstützt\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Option --check wird mit ODMR nicht unterstützt\n" @@ -2229,7 +2328,7 @@ msgstr "Server-Antwort (X-OTP) fatal\n" msgid "Could not decode OTP challenge\n" msgstr "Konnte OTP-Herausforderung nicht dekodieren\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Geheime Passphrase: " @@ -2596,90 +2695,90 @@ msgstr "POP2 unterstützt STLS nicht. Gebe auf.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 unterstützt nur die Einloggen per Passwort. Gebe auf.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "" "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Warnung: „Maillennium POP3” gefunden, benutze RETR-Befehl statt TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" msgstr "" -"TLS ist für diese Sitzung nötig, aber der Server hat den CAPA-Befehl " +"STLS ist für diese Sitzung nötig, aber der Server hat den CAPA-Befehl " "abgelehnt.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Der CAPA-Befehl ist allerdings für TLS erforderlich.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Der CAPA-Befehl ist allerdings für STLS erforderlich.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "" "%s: opportunistisches Upgrade auf TLS fehlgeschlagen, versuche Fortsetzung.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "" "%s: WARNUNG: Server hat STLS angeboten, aber sslproto '' ist angegeben.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "" "Keine weiteren Authentifizierungsverfahren verfügbar, Fortsetzung nicht " "möglich.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "Erforderlicher APOP-Zeitstempel in Begrüßung nicht gefunden\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Ungültiger APOP-Zeitstempel.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Anfrage nach undefiniertem Protokoll in POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "Lock beschäftigt! Ist eine weitere Sitzung aktiv?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Kann die UIDL-Antwort des Servers nicht verarbeiten.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Server hat mit UID der falschen Nachricht geantwortet.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) wurde gelöscht, ist aber immer noch da!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Nachrichten in Liste auf Server eingefügt. Kann damit nicht umgehen.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "Protokollfehler\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "Protokollfehler beim Holen der UIDL\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) wurde gelöscht, ist aber immer noch da!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Option --folder wird mit POP3 nicht unterstützt\n" @@ -3112,80 +3211,86 @@ msgstr "ESMTP-LOGIN-Authentifikation...\n" msgid "smtp listener protocol error\n" msgstr "Protokollfehler im SMTP-Server\n" -#: socket.c:112 socket.c:141 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc fehlgeschlagen\n" -#: socket.c:173 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "" +"fetchmail: plugin für Host %s Dienst %s ist leer, kann nicht ausführen!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail socketpair fehlgeschlagen\n" -#: socket.c:179 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: fork fehlgeschlagen\n" -#: socket.c:186 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 fehlgeschlagen\n" -#: socket.c:192 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "benutze %s (Host %s, Service %s)\n" -#: socket.c:197 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) fehlgeschlagen\n" -#: socket.c:272 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "getaddrinfo(\"%s\",\"%s\")-Fehler: %s\n" -#: socket.c:275 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Geben Sie die --service-Option an (siehe auch FAQ-Punkt R12).\n" -#: socket.c:289 socket.c:292 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "unbekannt (%s)" -#: socket.c:295 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Versuche, mit %s/%s zu verbinden..." -#: socket.c:304 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "kann Socket nicht erzeugen: %s\n" -#: socket.c:306 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "Name %d: kann Socket in Familie %d Typ %d nicht erzeugen: %s\n" -#: socket.c:324 +#: socket.c:338 msgid "connection failed.\n" msgstr "Verbindung fehlgeschlagen.\n" -#: socket.c:325 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "Verbindung zu %s:%s [%s/%s] fehlgeschlagen: %s.\n" -#: socket.c:327 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "Name %d: Verbindung zu %s:%s [%s/%s] fehlgeschlagen: %s.\n" -#: socket.c:333 +#: socket.c:347 msgid "connected.\n" msgstr "verbunden.\n" -#: socket.c:346 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -3194,137 +3299,137 @@ msgstr "" "Verbindungsfehler für diesen Abruf:\n" "%s" -#: socket.c:421 +#: socket.c:459 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL berichtete: %s\n" -#: socket.c:656 +#: socket.c:699 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" msgstr "SSL-Prüfung-Rückruf bei Tiefe %d: preverify_ok == %d, err = %d, %s\n" -#: socket.c:662 +#: socket.c:705 msgid "Server certificate:\n" msgstr "Server-Zertifikat:\n" -#: socket.c:667 +#: socket.c:710 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Zertifizierungskette, von der Wurzel zum Server, ab Tiefe %d:\n" -#: socket.c:670 +#: socket.c:713 #, c-format msgid "Certificate at depth %d:\n" msgstr "Zertifikat bei Baumtiefe %d:\n" -#: socket.c:676 +#: socket.c:719 #, c-format msgid "Issuer Organization: %s\n" msgstr "Herausgeber-Organisation: %s\n" -#: socket.c:679 +#: socket.c:722 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "" "Warnung: Herausgeber-Organisations-Name zu lang (möglicherweise " "beschnitten).\n" -#: socket.c:681 +#: socket.c:724 msgid "Unknown Organization\n" msgstr "Unbekannte Organisation\n" -#: socket.c:683 +#: socket.c:726 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Herausgeber-CommonName: %s\n" -#: socket.c:686 +#: socket.c:729 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "" "Warnung: Herausgeber-CommonName zu lang (möglicherweise beschnitten).\n" -#: socket.c:688 +#: socket.c:731 msgid "Unknown Issuer CommonName\n" msgstr "Unbekannter Herausgeber-CommonName\n" -#: socket.c:694 +#: socket.c:737 #, c-format msgid "Subject CommonName: %s\n" msgstr "Subjekt-CommonName: %s\n" -#: socket.c:700 +#: socket.c:743 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Ungültiges Zertifikat: Server-CommonName zu lang!\n" -#: socket.c:706 +#: socket.c:749 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Ungültiges Zertifikat: Subject-CommonName enthält NUL, breche ab!\n" -#: socket.c:734 +#: socket.c:777 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Subject Alternative Name: %s\n" -#: socket.c:740 +#: socket.c:783 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "" "Ungültiges Zertifikat: Subject-Alternative-Name enthält NUL, breche ab!\n" -#: socket.c:757 +#: socket.c:800 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Server-CommonName stimmt nicht überein: %s != %s\n" -#: socket.c:764 +#: socket.c:807 msgid "Server name not set, could not verify certificate!\n" msgstr "Server-Name nicht gesetzt, konnte Zertifikat nicht verifizieren!\n" -#: socket.c:769 +#: socket.c:812 msgid "Unknown Server CommonName\n" msgstr "Unbekannter Server-CommonName\n" -#: socket.c:771 +#: socket.c:814 msgid "Server name not specified in certificate!\n" msgstr "Server-Name nicht in Zertifikat spezifiziert!\n" -#: socket.c:783 +#: socket.c:826 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() fehlgeschlagen!\n" -#: socket.c:787 +#: socket.c:830 msgid "Out of memory!\n" msgstr "Kein Speicher mehr frei!\n" -#: socket.c:795 +#: socket.c:838 msgid "Digest text buffer too small!\n" msgstr "Textpuffer für Digest zu klein!\n" -#: socket.c:801 +#: socket.c:844 #, c-format msgid "%s key fingerprint: %s\n" msgstr "%s-Schlüssel-Fingerabdruck: %s\n" -#: socket.c:805 +#: socket.c:848 #, c-format msgid "%s fingerprints match.\n" msgstr "%s-Fingerabdrücke stimmen überein.\n" -#: socket.c:807 +#: socket.c:850 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s-Fingerabdrücke stimmen nicht überein!\n" -#: socket.c:819 +#: socket.c:862 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Fehler bei Server-Zertifikat-Überprüfung: %s\n" -#: socket.c:834 +#: socket.c:877 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Unterbrochene Zertifizierungskette bei: %s\n" -#: socket.c:836 +#: socket.c:879 msgid "" "This could mean that the server did not provide the intermediate CA's " "certificate(s), which is nothing fetchmail could do anything about. For " @@ -3336,12 +3441,12 @@ msgstr "" "nichts ändern. Für weitere Information, siehe das mit Fetchmail " "ausgelieferte Dokument README.SSL-SERVER.\n" -#: socket.c:846 +#: socket.c:889 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Fehlendes Zertifikat als Vertrauensquelle: %s\n" -#: socket.c:849 +#: socket.c:892 msgid "" "This could mean that the root CA's signing certificate is not in the trusted " "CA certificate location, or that c_rehash needs to be run on the certificate " @@ -3354,30 +3459,38 @@ msgstr "" "Handbuchseite im bei --sslcertpath beschrieben. Siehe auch die " "englischsprachige Datei README.SSL für weiteres.\n" -#: socket.c:923 socket.c:999 +#: socket.c:966 socket.c:1042 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Ihre OpenSSL-Version unterstützt SSLv3 nicht.\n" -#: socket.c:941 socket.c:1017 +#: socket.c:984 socket.c:1060 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Ihre OpenSSL-Version unterstützt TLS v1.1 nicht.\n" -#: socket.c:952 socket.c:1028 +#: socket.c:995 socket.c:1071 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Ihre OpenSSL-Version unterstützt TLS v1.2 nicht.\n" -#: socket.c:963 socket.c:1039 +#: socket.c:1006 socket.c:1082 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Ihre OpenSSL-Version unterstützt TLS v1.3 nicht.\n" -#: socket.c:972 socket.c:1049 +#: socket.c:1015 socket.c:1092 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "" "Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung automatische " "Wahl (auto).\n" -#: socket.c:1082 +#: socket.c:1131 +#, c-format +msgid "" +"Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "" +"Geladene wolfSSL-Bibliothek %#lx is älter als Header %#lx, verweigere " +"Arbeit.\n" + +#: socket.c:1137 #, c-format msgid "" "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" @@ -3385,7 +3498,7 @@ msgstr "" "Geladene OpenSSL-Bibliothek %#lx is älter als Header %#lx, verweigere " "Arbeit.\n" -#: socket.c:1087 +#: socket.c:1142 #, c-format msgid "" "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" @@ -3393,11 +3506,11 @@ msgstr "" "Geladene OpenSSL-Bibliothek %#lx neuer als Header %#lx, versuche, " "weiterzumachen.\n" -#: socket.c:1107 +#: socket.c:1162 msgid "File descriptor out of range for SSL" msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL" -#: socket.c:1128 +#: socket.c:1184 msgid "" "Note that some distributions disable older protocol versions in weird non-" "standard ways. Try a newer protocol version.\n" @@ -3406,7 +3519,14 @@ msgstr "" "nicht-standardisierte Weisen abschalten. Versuchen Sie eine neuere " "Protokollversion.\n" -#: socket.c:1196 +#: socket.c:1246 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "" +"Kann Verify-Locations nicht laden (Datei=\"%s\", Verzeichnis=\"%s\"), Fehler " +"%d:\n" + +#: socket.c:1281 #, c-format msgid "" "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to " @@ -3415,7 +3535,16 @@ msgstr "" "Warnung: SSL_set_tlsext_host_name(%p, \\\"%s\\\") fehlgeschlagen (code " "%#lx), versuche fortzusetzen.\n" -#: socket.c:1211 +#: socket.c:1295 +#, c-format +msgid "" +"fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, " +"trying to continue\n" +msgstr "" +"fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \\\"%s\\\") lieferte %d, " +"versuche fortzusetzen.\n" + +#: socket.c:1311 #, c-format msgid "" "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying " @@ -3424,35 +3553,35 @@ msgstr "" "Warnung: X509_VERIFY_PARAM_set1_host(%p, \\\"%s\\\") fehlgeschlagen (code " "%#x), versuche fortzusetzen.\n" -#: socket.c:1248 +#: socket.c:1364 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "" "Der Server hat die Verbindung bei SSL_connect() vorzeitig geschlossen.\n" -#: socket.c:1251 +#: socket.c:1367 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Systemfehler während SSL_connect(): %s\n" -#: socket.c:1251 +#: socket.c:1367 msgid "handshake failed at protocol or connection level." msgstr "Aushandlung auf Protokoll- oder Verbindungsebene fehlgeschlagen." -#: socket.c:1271 +#: socket.c:1387 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "" "Kann aktuelle SSL/TLS-Chiffre nicht ermitteln - keine Sitzung aufgebaut?\n" -#: socket.c:1274 +#: socket.c:1390 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: Protokoll %s, Chiffre %s, %d/%d geheime/verarbeitete bits\n" -#: socket.c:1281 +#: socket.c:1397 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n" -#: socket.c:1298 +#: socket.c:1414 msgid "" "Warning: the connection is insecure, continuing anyways. (Better use --" "sslcertck!)\n" @@ -3460,11 +3589,11 @@ msgstr "" "Warnung: Die Verbindung ist unsicher, mache trotzdem weiter. (Nehmen Sie " "lieber --sslcertck!)\n" -#: socket.c:1340 +#: socket.c:1456 msgid "Cygwin socket read retry\n" msgstr "Cygwin-Socket-Lese-Wiederholung\n" -#: socket.c:1343 +#: socket.c:1459 msgid "Cygwin socket read retry failed!\n" msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n" @@ -3,14 +3,14 @@ # This file is distributed under the same license as the fetchmail package. # Sian Mountbatten <poenikatu@fastmail.co.uk>, 2012 # Felipe Castro <fefcas@gmail.com>, 2013, 2019. -# Keith Bowes <zooplah@gmail.com>, 2020, 2021. +# Keith Bowes <zooplah@gmail.com>, 2020, 2021, 2023. # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.16-rc1\n" +"Project-Id-Version: fetchmail 6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-01-30 12:51-0500\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-05-15 15:54-0400\n" "Last-Translator: Keith Bowes <zooplah@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" "Language: eo\n" @@ -158,41 +158,41 @@ msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "haviglimo %d atingita; %d mesaĝo restas en servilo %s konto %s\n" msgstr[1] "haviglimo %d atingita; %d mesaĝoj restas en servilo %s konto %s\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "tempolimo atingita post %d sekundoj atendante konekti al servilo %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "tempolimo atingita post %d sekundoj atendante servilon %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "tempolimo atingita post %d sekundoj atendante por %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "tempolimo atingita post %d sekunkoj atendante por aŭskultulo respondi.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "tempolimo atingita post %d sekundoj.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail alfrontas ripetitajn tempolimojn" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmail alfrontis pli ol %d atingitajn tempolimojn dum penado havigi la poŝton de %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -208,73 +208,73 @@ msgstr "" "\n" "Fetchmail ne enketos ĉi tiun poŝtskatolon denove ĝis kiam vi rekigis ĝin.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "antaŭ-konekta komando estis finigata kun signalo %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "antaŭ-konekta komando malsukcesis kun stato %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "ne eblis trovi HESIOD pobox por %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Kondukservilo ne havas nomon.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "ne eblis trovi kanonan DNS-nomon de %s (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "%s konekto al %s malsukcesis" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "SSL konekto malsukcesis.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Ŝlos-okupata eraro sur %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Servil-okupata eraro sur %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Permesiga malsukceso sur %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (antaŭe permesita)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "Por helpo, vidu http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "fetchmail aŭtentikokontrolo malsukcesis sur %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail ne povis havigi poŝton de %s@%s.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -287,7 +287,7 @@ msgstr "" "alia malsukcesa reĝimo (kiel okupata servilo), kiun fetchmail ne povas\n" "distingi ĉar la servilo ne sendis utilan eraran mesaĝon." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -306,7 +306,7 @@ msgstr "" "La fetchmail-demono daŭros ruli kaj provos konekti je ĉiu ciklo. Neniu\n" "estontaj sciigoj estos sendataj ĝis kiam la servo estos restarigita." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -326,177 +326,182 @@ msgstr "" "La fetchmail-demono daŭros ruli kaj provos konekti je ĉiu ciklo. Neniu\n" "estontaj sciigoj estos sendata ĝis kiam la servo estos restarigita." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Reenketi tuj sur %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Ŝtopilingo aŭ TLS- eraro de %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Nekonata ensaluto aŭ aŭtentikiga eraro sur %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Aŭtentiko ĝustas sur %s@%s\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "fetchmail-aŭtentiko ĝustas sur %s@%s" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail povis ensaluti en %s@%s.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "La servo estas restarigita.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "elekta aŭ reenketa dosierujo %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "apriora elekta aŭ reenketa dosierujo\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s ĉe %s (dosierujo %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s ĉe %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Enketas %s\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d mesaĝo (%d %s) por %s" msgstr[1] "%d mesaĝoj (%d %s) por %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "vidita" msgstr[1] "vidita" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d mesaĝo por %s" msgstr[1] "%d mesaĝoj por %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d bitokoj).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Neniu poŝto por %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "falsa mesaĝ-nombro!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "Tro multaj poŝtoj pretersaltitaj (%d > %d) pro dummomentaj eraroj por %s\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "ingo" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "mankas aŭ malbona RFC822-ĉapo" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "klienta/servila sinkronigo" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "klienta/servila protokolo" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "ŝlosilo okupata en servilo" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "SMTP-transakcio" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "DNS-serĉo" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "nedifinita" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "%s eraro dum alporto el %s@%s kaj transdono al SMTP-gatstigejo %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "nekonata" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "%s eraro dum alporto el %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "post-konekta komando estis finigata kun signalo %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "post-konekta komando malsukcesis kun stato %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Subteno al Kerberos V4 ne estas ligita.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Subteno al Kerberos V5 ne estas ligita.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Opcio --flush ne subtenatas kun %s\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Opcio --all ne subtenatas kun %s\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Opcio --limit ne subtenatas kun %s\n" @@ -619,19 +624,19 @@ msgstr "ETRN-sintaksa eraro en parametroj\n" msgid "Unknown ETRN error %d\n" msgstr "Nekonata ETRN-eraro %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Opcio --keep ne subtenatas kun ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Opcio --flush ne subtenatas kun ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Opcio --folder ne subtenatas kun ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Opcio --check ne subtenatas kun ETRN\n" @@ -672,12 +677,12 @@ msgstr "fetchmail: vokita kun" msgid "could not get current working directory\n" msgstr "ne eblis havigi nunan labordosierujon\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Ĉi tio estas fetchmail eldono %s" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -686,7 +691,7 @@ msgstr "" "Kompilumita kun la SSL-biblioteko %#lx \"%s\"\n" "Plenumiĝas kun la SSL-biblioteko %#lx \"%s\"\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -695,939 +700,959 @@ msgstr "" "OpenSSL: %s\n" "Motoroj: %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "AVERTO: Via SSL/TLS-biblioteko ne komprenas eldonon 1.3 de TLS.\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "AVERTO: Kompilumita kontraŭ LibreSSL, kie ne estas subtenata.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "ERARO: Kompilumita kontraŭ LibreSSL, kiu estas kopirajta malobservo pro la manko de escepto por klaŭzo 2b de la GPL-permesilo (dosiero COPYING). Haltigas.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "AVERTO: Kompilumita sen SSL/TLS.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "La opcio nodetach aktivas, ni preteratentas la opcion logfile.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Ni ne rulas laŭ demona reĝimo, ni preteratentas la opcion logfile.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "La protokoldosiero \"%s\" ne ekzistas, ni preteratentas la opcion logfile.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "La protokoldosiero \"%s\" ne skribeblas, ni ĉesas.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "La opcioj syslog kaj logfile estas ambaŭ aktivaj, ni preterpasas syslog kaj protokolas en %s" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Prenante opciojn el komandlinio%s%s\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " kaj " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Neniu poŝtserviloj starigitaj -- eble %s mankas?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: neniu poŝtserviloj estas specifitaj.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: neniu alia fetchmail rulas\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: eraro haltigante %s fetchmail ĉe %ld; ni foriras.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "fono" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "malfono" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s fetchmail ĉe %ld ĉesigita.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: ne eblas kontroli poŝton dum alia fetchmail por la sama gastigejo rulas.\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: ne eblas enketi specifitajn gastigejojn kun alia fetchmail rulanta ĉe %ld.\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: alia malfona fetchmail rulas ĉe %ld.\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: ne eblas akcepti opciojn dum fona fetchmail rulas.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: fona fetchmail ĉe %ld estis vekigata.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: pli aĝa gefrato ĉe %ld mortis mistere.\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: ne eblas trovi pasvorton por %s@%s.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Enmetu pasvorton por %s@%s: " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: Ne eblas malfiksiĝi en fonon. Ni ĉesas.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "ekigo de fetchmail-demono %s\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "ne eblis malfermi %s por postmeti protokolojn\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "reĝimo --check ebligita, ni ne alportas poŝton\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "ne eblis tempkontroli %s (eraro %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "reekigo de fetchmail (%s ŝanĝis)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "provo re-ruli povos malsukcesi ĉar dosierujo ne estas restarigita\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "provo re-ruli fetchmail malsukcesis\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "enketo de %s estas preterpasita (malsukcesa aŭtentiko aŭ tro da tempolimoj)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "intervalo ne atingita, ni ne informpetas %s\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Informpeta stato=0 (SUKCESO)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Informpeta stato=1 (NEPOŜTO)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Informpeta stato=2 (INGO)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Informpeta stato=3 (AŬTFIASKO)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Informpeta stato=4 (PROTOKOLO)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Informpeta stato=5 (SINTAKSO)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Informpeta stato=6 (ENELERAR)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Informpeta stato=7 (ERARO)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Informpeta stato=8 (ELBARI)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Informpeta stato=9 (ŜLOSILOKUPATA)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Informpeta stato=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Informpeta stato=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Informpeta stato=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Informpeta stato=13 (MAKSALPORT)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Informpeta stato=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Ĉiuj konektoj estas fendita. Ni ĉesas.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "dormado je %s dum %d sekundoj\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "vekigita de %s\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "vekigita de la signalo %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "vekigita je %s\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "normala finiĝo, stato %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "ne eblis tempkontroli la rul-kontrolan dosieron\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Averto: pluraj mencioj de gastigejo %s en agorda dosiero\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "fetchmail: Eraro: pluraj rikordoj \"defaults\" en agorda dosiero, aŭ \"defaults\" ne estas la una rikordo.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "Subteno al SSL ne estas enkompilumita.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "Subteno al KERBEROS v4 estas agordita, sed ne enkompilumita.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "Subteno al KERBEROS v5 estas agordita, sed ne enkompilumita.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Subteno al GSSAPI estas agordita, sed ne enkompilumita.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: averto: neniu DNS disponeblas por kontroli mult-falaj alportoj el %s\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "averto: mult-falo por %s postulas kovertan opcion!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "averto: Ne petu subtenon se ĉiu poŝto iras al la poŝtestro!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: %s agordo nevalida, specifu pozitivan pordan numeron por servo aŭ pordo\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: %s agordo nevalida, RPOP postulas privilegian pordon\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "AVERTO: %s agordo nevalida, oni ordinare bezonas la parametron --ssl por pordo 995/servo pop3s\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "AVERTO: %s agordo nevalida, oni ordinare bezonas pordon 995/servon pop3 por --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "AVERTO: nevalida agordo %s, oni ordinare bezonas parametron --ssl por pordo 993/servo imaps.\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "AVERTO: %s agordo nevalida, oni ordinare bezonas pordon 993/servon imaps por --ssl.\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "%s agordo nevalida, LMTP ne povas uzi aprioran SMTP pordon\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Kaj 'fetchall' kaj 'keep' aktivaj sub demona aŭ senokupa reĝimo estas eraro!\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: Eraro: senokupa reĝimo ne funkcias por multoblaj dosierujoj aŭ kontoj!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "ĉesigita kun signalo %d\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s informpetas %s (protokolo %s) ĉe %s: enketo estas komencita\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "Subteno al POP2 ne estas agordita.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "Subteno al POP3 ne estas agordita.\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "Subteno al IMAP ne estas agordita.\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "Subteno al ETRN ne estas agordita.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "Subteno al ODMR ne estas agordita.\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "nesubtenata protokolo estis elektata.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s informpetas %s (protokolo %s) ĉe %s: enketo kompletita\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Enketa intervalo estas %d sekundoj\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Protokoldosiero estas %s\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Id-dosiero estas %s\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Progresmesaĝoj estos protokolitaj per syslog\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail maskiĝos kaj ne generos Received\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail montros progrespunktojn eĉ en protokolaj dosieroj.\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail plusendos misadresitajn mult-falajn mesaĝojn al %s.\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail direktos erarpoŝton al la poŝtestro.\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail direktos erarpoŝton al la sendinto.\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail traktos daŭrantajn erarojn kiel daŭraj (faligi mesaĝojn).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail traktos daŭrantajn erarojn kiel provizorajn (gardi mesaĝojn).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Opcioj por havigado el %s@%s:\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Poŝto estos havigata per %s\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " Enketo de ĉi tiu servilo okazos je ĉiu %d intervalo.\n" msgstr[1] " Enketo de ĉi tiu servilo okazos je ĉiu %d intervaloj.\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Vera nomo de servilo estas %s.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Ĉi tiu gastigejo ne estos informpetita kiam neniu gastigejo estas specifita.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Ĉi tiu gastigejo estos informpetita kiam neniu gastigejo estas specifita.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Pasvorto estos atendata.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " APOP-sekreto = \"%s\".\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP-id = \"%s\".\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Pasvorto = \"%s\".\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Protokolo estas KPOP kun autentikigo Kerberos %s" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Protokolo estas %s" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (uzado de servo %s)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (uzado de apriora pordo)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (perforto uzi UIDL)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Ĉiuj disponeblaj aŭtentikaj metodoj estos provataj.\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Pasvorta aŭtentikigo estos perfortatata.\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " MSN-aŭtentikigo estos perfortatata.\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " NTLM-aŭtentikigo estos perfortata.\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " OTP-aŭtentikigo estos perfortatata.\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " CRAM-MD5-aŭtentikigo estos perfortata.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " GSSAPI-aŭtentikigo estos perfortata.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Kerberos-V4-aŭtentikigo estos perfortata.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Kerberos-V5-aŭtentikigo estos perfortata.\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Fino-al-fina ĉifro estas supozata.\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Poŝta serva ĉefo estas: %s\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " SSL-ĉifritaj seancoj estas ebligitaj.\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " SSL-protokolo: %s.\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " SSL-servila atestila kontrolado estas ebligita.\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " SSL-servila atestila kontrolado estas malebligita.\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Apriora SSL-fidinda atestila dosiero: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " SSL-fidinda atestila dosiero: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " Apriora SSL-fidinda atestila dosierujo: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " SSL-fidinda atestila dosierujo: %s\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " SSL-servilo CommonName: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " SSL-ŝlosila fingropremo (kontrolita kontraŭ la servila ŝlosilo): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Servila neresponda tempolimo estas %d sekundoj" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (apriore).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Apriora poŝtskatolo estas elektita.\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Elektitaj poŝtskatoloj estas:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Ĉiuj mesaĝoj estos havigataj (--all aktiva).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Nur novaj mesaĝoj estos havigataj (--all malaktiva).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Alportitaj mesaĝoj estos tenataj en la servilo (--keep aktiva).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Alportitaj mesaĝoj ne estos gardataj ĉe la servilo (--keep malaktiva).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Malnovaj mesaĝoj estos forigataj antaŭ mesaĝhavigo (--flush aktiva).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Malnovaj mesaĝoj ne estos forigataj antaŭ mesaĝhavigo (--flush malaktiva).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Trograndaj mesaĝoj estos forigataj antaŭ mesaĝhavigo (--limitflush aktiva).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Trograndaj mesaĝoj ne estos forigataj antaŭ mesaĝhavigo (--limitflush malaktiva).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Reskribo de servila-lokaj adresoj estas ebligita (--norewrite malaktiva).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Reskribo de servila-lokaj adresoj estas malebligita (--norewrite aktiva).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Ĉaretrevena forigo estas ebligita (stripcr aktiva).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Ĉaretrevena forigo estas malebligita (stripcr malaktiva).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Ĉaretrevena perforto estas ebligita (forecdr aktiva).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Ĉaretrevena perforto estas malebligita (forcecr malaktiva).\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Interpretado de Content-Transfer-Encoding estas malebligita (pass8bits aktiva).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Interpretado de Content-Transfer-Encoding estas ebligita (paas8bits malaktiva).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME-malĉifro estas ebligita (mimedecode aktiva).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME-malĉifro estas malebligita (mimedecode malaktiva).\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Senokupado post enketo estas ebligita (idle aktiva).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " Senokupado post enketo malebligita (idle malaktiva).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Nevakaj linioj Status estos forĵetataj (dropstatus aktiva)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Nevakaj linioj Status estos tenataj (dropstatus malaktiva)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Linioj Delivered-To estos forĵetataj (dropdelivered aktiva)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Linioj Delivered-To estos tenataj (dropdelivered malaktiva)\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Grando-limo de mesaĝo estas %d bitokoj (--limit %d).\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Neniu grando-limo de mesaĝo (--limit 0).\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Intervalo de averto pri mesaĝo-grando estas %d sekundoj (--warnings %d).\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Avertoj pri grando je ĉiu enketo (--warnings 0).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Limo por Received-message estas %d (--fetchlimit %d).\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Neniu limo por received-message (--fetchlimit 0).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " Grando-limo por mesaĝ-alporto estas %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Neniu grando-limo por mesaĝ-alporto (--fetchsizelimit 0).\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Faru duuman serĉon de UID-oj dum ĉiu enketo (--fastuidl 1).\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Faru duuman serĉon de UID-oj dum %d el %d enketoj (--fastuidl %d).\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Faru linearan serĉon de UID-oj dum ĉiu enketo (--fastuidl 0).\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Stapla limo de SMTP-mesaĝo estas %d.\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Neniu stapla limo de SMTP-mesaĝo (--batchlimit 0).\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " La forig-intervalo inter forviŝoj estas perfortita al %d (--expunge %d).\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Neniu perfortita forviŝo (--expurge 0).\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Domajnoj por kiuj poŝto estos alportataj:" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (apriore)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Mesaĝoj estos postmetataj al %s kiel BSMTP\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Mesaĝoj estos transdonataj kun \"%s\".\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Mesaĝoj estos %cMTP-plusendataj al:" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Gastigeja parto de la linio MAIL FROM estos %s\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Adreso metota en linioj RCPT TO, sendata al SMTP estos %s\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Rekonataj aŭskultantaj spam-blokaj respondoj estas:" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Spam-blokado malebligita\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Servila konekto estos starigataj kun \"%s\".\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Neniu antaŭ-konekta komando.\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Servila konekto estos ĉesigata kun \"%s\".\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Neniu antaŭ-konekta komando.\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Neniu 'localnames' estas deklarita por ĉi tiu gastigejo.\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Mult-fala reĝimo: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Unuop-fala reĝimo: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d loka nomo rekonita.\n" msgstr[1] "%d lokaj nomoj rekonitaj.\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " DNS-serĉo por mult-falaj adresoj estas ebligita.\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " DNS-serĉo por mult-falaj adresoj estas malebligita.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Servilaj alinomoj estos komparataj kun mult-falaj adresoj per IP adreso.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Servilaj alinomoj estos komparataj kun mult-falaj adresoj per nomo.\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Enkursigo per kovert-adreso estas malebligita\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Koverta ĉapo estas supozata esti: %s\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Nombro da kovertaj ĉapoj por esti pretersaltataj: %d\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Prefikso %s estos forigata de la uzanto-id\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Neniu prefiksa forigo\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Antaŭdeklaritaj poŝtservilaj alinomoj:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Lokaj domajnoj:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " La konekto devas esti tra interfaco %s.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Neniu interfaca postulo estas specifita.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Enketa iteracio observados %s.\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Neniu observ-interfaco estas specifita.\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Servilaj konektoj estos farataj per la enkonektilo %s (--plugin %s).\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Neniu enkonekta komando estas specifita.\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Aŭskultantaj konektoj estos faritaj per la elkonektilo %s (--plugout %s).\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Neniu elkonektila komando estas specifita.\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Neniu UID konservita el ĉi tiu gastigejo.\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UID-oj konservitaj.\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Enket-spura informo estos aldonata al la ĉapo Received.\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Neniu enket-spura informo estos aldonata al la ĉapo Received.\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Mesaĝoj kun malbonaj ĉapoj estos malakceptataj.\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Mesaĝoj kun malbonaj ĉapoj estos pasataj.\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Trapasaj atributoj \"%s\".\n" @@ -1742,127 +1767,160 @@ msgstr "Eraro dum liberigo de legitimaĵoj\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: fadeno dormas dum %d sek.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protokolo identigita kiel IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protokolo identigita kiel IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protokolo identigita kiel IMAP2 aŭ IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "ni restos senokupe post enketo\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Ni ricevis respondon BYE de IMAP-servilo: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "falsa mesaĝ-nombro en \"%s\"!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "falsa EXPUNGE-nombro en \"%s\"!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protokolo identigita kiel IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "trovis ĝisdatigitan liston de kapabloj\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protokolo identigita kiel IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "servo ne reklamis la etendon SASL_IR sed la efektivigo de fetchmail postulas ĝin por AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protokolo identigita kiel IMAP2 aŭ IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: agordo postulas je TLS, sed STARTTLS ne estas permesata pro aŭtentigita stato (PREAUTH). Konekto abortita. Se la kromprogramo sekuras, vi povas superregi kontraŭ STARTTLS per --sslproto '' (vidu manlibron).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "ni restos senokupe post enketo\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: agordo postulas je TLS, sed STARTTLS ne estas permesata pro aŭtentigita stato (PREAUTH). Konekto abortita. Se la servilo permesas, anstataŭe provu kun --ssl (vidu manlibron).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: promociigo al TLS sukcesis.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: promociigo al TLS malsukcesis.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: oportuneca promociigo al TLS malsukcesis, ni provas daŭrigi\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: AVERTO: la servilo oferis STARTTLS sed sslproto '' estis donita.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: --auth eksteraĵo petita sed servilo ne reklamas ĝin.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Postulata OTP-kapablo ne estas kompilita en fetchmail\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Postulata NTLM-kapablo ne estas kompilita en fetchmail\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: --auth pasvorto petita sed la servilo malpermasas ĝin (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: ni elĉerpis permesatajn aŭtentikigilojn kaj ne povas ensaluti.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "poŝta forviŝa malkongruo (%d akutala != %d atendata)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu estas nevidita\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u estas nevidita\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "re-enketo malsukcesis\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d mesaĝo atendas post re-enketo\n" msgstr[1] "%d mesaĝoj atendas post re-enketo\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "poŝtskatola elekto malsukcesis\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "%d mesaĝo atendas post unua enketo\n" msgstr[1] "%d mesaĝoj atendas post unua enketo\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "forviŝo malsukcesis\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "%d mesaĝo atendas post forviŝo\n" msgstr[1] "%d mesaĝoj atendas post forviŝo\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "serĉo por neviditaj mesaĝoj malsukcesis\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u estas la unua nevidita\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Averto: ni ignoras falsajn datumojn por mesaĝaj grandoj revenitaj de la servilo.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Nekorekta FETCH-respondo: %s.\n" @@ -1967,51 +2025,56 @@ msgstr "ne eblis malĉifri BAZA64-pret-respondon\n" msgid "challenge mismatch\n" msgstr "defia malkongruo\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: eraro legante ŝlosildosieron \"%s\": %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: forigas malfreŝan ŝlosildosieron \"%s\"\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "fetchmail: ne eblas malligi ŝlosildosieron \"%s\" (%s), provanta skribi al ĝi\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: ne eblas skribi al ŝlosildosieron\"%s\" (%s), finiĝanta\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: eraro malfermante ŝlosildosieron \"%s\": %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: ŝlosil-kreo malsukcesis, pid-dosieron \"%s\": %s.\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: ne eblas forigi aŭ mallongigi pid-dosieron \"%s\": %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: averto: estis trovata \"%s\" antaŭ iun ajn gastigejnomon\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: averto: nekonata ĵetono \"%s\"\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: eraro dum legi dosieron (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Averto: ni ricevis misaranĝitan defion al \"AUTH(ENTICATE) NTLM\"!\n" @@ -2058,19 +2121,19 @@ msgstr "Nekonata ODMR-eraro \"%s\"\n" msgid "receiving message data\n" msgstr "ni ricevas mesaĝ-datumaron\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Opcio --keep ne estas subtenata kun ODMR\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Opcio --flush ne estas subtenata kun ODMR\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Opcio --folder ne estas subtenata kun ODMR\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Opcio --check ne estas subtenata kun ODMR\n" @@ -2082,7 +2145,7 @@ msgstr "servila recv neriparebla\n" msgid "Could not decode OTP challenge\n" msgstr "Ne eblis malĉifri OTP-defion\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Sekreta pasfrazo: " @@ -2415,85 +2478,85 @@ msgstr "POP2 ne subtenas STLS. Ni rezignas.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 nur subtenas pavortan aŭtentikigon. Ni rezignas.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Averto: trovinte \"Maillennium POP3\", ni uzas RETR-komandon anstataŭ TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "TLS nepras por ĉi tiu seanco, sed la servilo rifuzis CAPA-komandon.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "STLS nepras por ĉi tiu seanco, sed la servilo rifuzis CAPA-komandon.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "La CAPA-komando estas tamen necesa por TLS.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "La CAPA-komando estas tamen necesa por STLS.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: oportuneca promociigo al TLS malsukcesis, ni provas daŭrigi.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "" "%s: AVERTO: la servilo oferis STLS, sed sslproto '' estis donita.\n" "\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Ni elĉerpis permesatajn aŭtentikigilojn kaj ne povas daŭrigi.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "Postulata APOP-tempindiko ne estis trovata en saluto\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Tempindika sintaksa eraro en saluto\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Nevalida APOP-tempindiko.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Nedifinita protokola peto en POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "ŝlosilo okupata! Ĉu alia seanco aktivas?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Ne eblas trakti UIDL-respondon el la origina servilo.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Servilo respondis kun UID por malĝusta mesaĝo.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (nombro=%u) estis forigata, sed ankoraŭ ĉeestas!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Mesaĝoj enmetitaj en liston en servilo. Ne eblas trakti ĉi tion.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "protokola eraro\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "protokola eraro dum havigo de UIDL-oj\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (nombro=%d) estis forigata, sed ankoraŭ ĉeestas!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Opcio --folder ne estas subtenata kun POP3\n" @@ -2536,11 +2599,11 @@ msgstr "Dosiero %s ne devas havi permesojn pli ampleksaj ol -rwx------ (0700).\n msgid "File %s must be owned by you.\n" msgstr "Dosiero %s devas esti posedata de vi.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Nekonata sistema eraro" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (protokola mesaĝo nekompleta)\n" @@ -2911,80 +2974,85 @@ msgstr "Aŭtentikigo ESMTP LOGIN...\n" msgid "smtp listener protocol error\n" msgstr "smtp-aŭskultanta protokola eraro\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc malsukcesis\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: kromprogramo por retnodo %s, servo %s malplenas, ne eblas plenumi!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair malsukcesis\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: fork malsukcesis\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 malsukcesis\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "ni rulas %s (gastigejo %s servo %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) malsukcesis\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "getaddrinfo(\"%s\",\"%s\") eraro: %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Provu aldoni la opcion --service (konsultu ankaŭ FAQ-eron R12).\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "nekonata (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Ni provas konekti al %s/%s..." -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "ne eblas krei ingon: %s\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "nomo %d: ne eblas krei ingan familion %d tipo %d: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "konekto malsukcesis.\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "konekto al %s:%s [%s/%s] malsukcesis: %s.\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "nomo %d: konekto al %s:%s [%s/%s] malsukcesis: %s.\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "konektita.\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2993,229 +3061,244 @@ msgstr "" "Konektaj eraroj por ĉi tiu enketo:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL raportis: %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "SSL kontrola retrovoka profundo %d: preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "SSL kontrola retrovoka profundo %d: verify_ok == %d, err = %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Servila atestilo:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Atestila ĉeno, de radiko al samtavolo, komencas ĉe profundo %d:\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "Atestilo ĉe profundo %d:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Eldonanta organizo: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Averto: Eldonanta Organiza Nomo tro longas (eble distranĉita).\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Nekonata organizo\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Eldonanta Komun-nomo: %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Averto: Eldonanta Komun-nomo tro longas (eble distranĉita).\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Nekonata Eldonanta Komun-nomo\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "Tema Komun-nomo: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Malbona atestilo: Tema Komun-nomo tro longas!\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Malbona atestilo: Tema Komun-nomo enhavas SENVALOROn, ni ĉesigas!\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Tema Alternativa Nomo: %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Malbona atestilo: Tema Alternativa Nomo enhavas SENVALOROn, ni ĉesigas!\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Servila Komun-noma nekongruo: %s != %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Servila nomo ne estas difinita, ne eblis kontroli atestilon!\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Nekonata Servila Komun-nomo\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Servila nomo ne estas specifita en atestilo!\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() malsukcesis!\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Memoro estas elĉerpita!\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "Resuma teksta bufro tro malgrandas!\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "%s ŝlosila fingropremo: %s\n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "%s fingropremoj kongruas.\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s fingropremoj ne kongruas!\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Servila atestila kontrola eraro: %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Rompita atestila ĉeno ĉe: %s\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "Tio povus signifi ke la servilo ne provizis la intermeza(j)n atestilo(j)n de CA, pri kiu fetchmail povas fari nenion. Por detaloj, bonvolu konsulti la dokumenton README.SSL-SERVER, kiu venas kun fetchmail.\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Mankas fidinda ankra atestilo: %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "Tio ĉi povus indiki ke la radika subskriba atestilo de CA ne estas en la fidinda CA-atestila loko, aŭ ke c_rehash bezonas esti plenumigita en la atestila dosierujo. Por detaloj, bonvolu konsulti la dokumentadon de --sslcertpath kaj --sslcertfile en la manlibro. Vidu je README.SSL por detaloj.\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Via versio de OpenSSL ne subtenas SSLv3.\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Via versio de OpenSSL ne subtenas TLS v1.1.\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Via versio de OpenSSL ne subtenas TLS v1.2.\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Via versio de OpenSSL ne subtenas TLS v1.3.\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "Nevalida SSL-protokolo '%s' estas specifita, ni uzas aŭtomatan elekton (auto).\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Ŝargita biblioteko wolfSSL %#lx pli malnova ol kapoj %#lx, rifuzas funkcii.\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "Ŝargita biblioteko OpenSSL %#lx pli malnova ol kapoj %#lx, rifuzas funkcii.\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "Ŝargita biblioteko OpenSSL %#lx pli nova ol kapoj %#lx, provas daŭrigi.\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Dosiera priskribilo forestas de la intervalo por SSL" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Rimarku ke kelkaj distribuoj malebligas pli malnovajn versiojn de protokolo laŭ stranga maniero. Provu pli novan version de protokolo.\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Ne eblas ŝargi aŭtentigajn lokojn (dosiero=\"%s\", dosierujo=\"%s\"), eraro %d:\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Averto: SSL_set_tlsext_host_name(%p, \"%s\") malsukcesis (kodo %#lx), ni provas daŭrigi.\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: ŝtopilingo %d: wolfSSL_check_domain_name(%#p, \"%s\"), %d redonita, ni provas daŭrigi\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Averto: X509_VERIFY_PARAM_set1_host(%p, \"%s\") malsukcesis (kodo %#x), ni provas daŭrigi.\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "La servilo malŝaltis la konekton tro frue dum SSL_connect().\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Sistem-eraro dum SSL_connect(): %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "kvitanco malsukcesis ĉe protokola aŭ konekta nivelo." -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Ne eblas preni kurantan ĉifron de SSL/TLS - ĉu neniun seancon?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: uzas protokolon %s, ĉifron %s, %d/%d sekretaj/procezitaj bitoj\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Atestila/fingroprema kontrolo estis iel preterpasita!\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Averto: la konekto estas nesekura, ni daŭrigas tamen. (Plibonas uzi --sslcertck!)\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Reprovo legi Cygwin-ingon\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Reprovo legi Cygwin-ingon fiaskis!\n" @@ -1,48 +1,49 @@ # Fetchmail Spanish Translation -# Copyright 1999, 2005 Free Software Foundation, Inc. +# Copyright (C) 2022 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. # Javier Kohen <jkohen@users.sourceforge.net>, 1999. -# # Francisco Molinero <paco@byasl.com>, 2009. +# Cristian Othón Martínez Vera <cfuga@cfuga.mx>, 2022, 2023. # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.3.12\n" -"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2009-08-24 21:16+0200\n" -"PO-Revision-Date: 2009-10-06 19:04+0200\n" -"Last-Translator: Francisco Molinero <paco@byasl.com>\n" -"Language-Team: Spanish <es@li.org>\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" +"Project-Id-Version: fetchmail 6.4.35\n" +"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-04 11:01-0600\n" +"Last-Translator: Cristian Othón Martínez Vera <cfuga@cfuga.mx>\n" +"Language-Team: Spanish <es@tp.org.es>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: checkalias.c:179 +#: checkalias.c:174 #, c-format msgid "Checking if %s is really the same node as %s\n" msgstr "Verificando si %s es realmente el mismo nodo que %s\n" -#: checkalias.c:183 +#: checkalias.c:178 msgid "Yes, their IP addresses match\n" msgstr "Sí, sus direcciones IP coinciden\n" -#: checkalias.c:187 +#: checkalias.c:182 msgid "No, their IP addresses don't match\n" msgstr "No, sus direcciones IP no coinciden\n" -#: checkalias.c:203 +#: checkalias.c:207 #, c-format msgid "nameserver failure while looking for '%s' during poll of %s: %s\n" msgstr "fallo en la resolución de nombres buscando «%s» durante la consulta de %s:%s\n" -#: checkalias.c:228 +#: checkalias.c:230 #, c-format msgid "nameserver failure while looking for `%s' during poll of %s.\n" msgstr "fallo en la resolución de nombres buscando «%s» durante la consulta de %s.\n" -#: cram.c:95 +#: cram.c:95 ntlmsubr.c:65 msgid "could not decode BASE64 challenge\n" msgstr "no fue posible decodificar el desafío BASE64\n" @@ -51,151 +52,146 @@ msgstr "no fue posible decodificar el desafío BASE64\n" msgid "decoded as %s\n" msgstr "decodificado como %s\n" -#: driver.c:191 +#: driver.c:199 #, c-format msgid "kerberos error %s\n" msgstr "error de kerberos %s\n" -#: driver.c:249 +#: driver.c:259 driver.c:265 #, c-format -msgid "krb5_sendauth: %s [server says '%s'] \n" -msgstr "krb5_sendauth: %s [el servidor dice «%s»] \n" +msgid "krb5_sendauth: %s [server says '%s']\n" +msgstr "krb5_sendauth: %s [el servidor dice «%s»]\n" -#: driver.c:254 -#, c-format -msgid "krb5_sendauth: %s [server says '%*s'] \n" -msgstr "krb5_sendauth: %s [el servidor dice «%*s»] \n" - -#: driver.c:335 -msgid "Subject: Fetchmail oversized-messages warning" -msgstr "Asunto: aviso de fetchmail, mensajes excedidos en tamaño" +#: driver.c:345 +msgid "Fetchmail oversized-messages warning" +msgstr "Aviso de fetchmail para mensajes excedidos en tamaño" -#: driver.c:339 +#: driver.c:349 #, c-format msgid "The following oversized messages were deleted on server %s account %s:" msgstr "Los siguientes mensajes excedidos de tamaño se borraron del servidor %s cuenta %s:" -#: driver.c:343 +#: driver.c:353 #, c-format msgid "The following oversized messages remain on server %s account %s:" msgstr "Los siguientes mensajes excedidos de tamaño permanecen en el servidor %s cuenta %s:" -#: driver.c:362 +#: driver.c:372 #, c-format msgid " %d message %d octets long deleted by fetchmail." msgid_plural " %d messages %d octets long deleted by fetchmail." msgstr[0] " %d mensaje de %d octetos de largo borrado por fetchmail." msgstr[1] " %d mensajes de %d octetos de largo borrados por fetchmail." -#: driver.c:367 +#: driver.c:377 #, c-format msgid " %d message %d octets long skipped by fetchmail." msgid_plural " %d messages %d octets long skipped by fetchmail." msgstr[0] " %d mensaje de %d octetos de largo omitido por fetchmail." msgstr[1] " %d mensajes de %d octetos de largo omitidos por fetchmail." -#: driver.c:511 +#: driver.c:522 #, c-format msgid "skipping message %s@%s:%d" msgstr "omitiendo mensaje %s@%s:%d" -#: driver.c:565 +#: driver.c:577 #, c-format msgid "skipping message %s@%s:%d (%d octets)" msgstr "omitiendo mensaje %s@%s:%d (%d octetos)" -#: driver.c:581 +#: driver.c:593 msgid " (length -1)" msgstr " (longitud -1)" -#: driver.c:584 +#: driver.c:596 msgid " (oversized)" msgstr " (demasiado grande)" -#: driver.c:602 +#: driver.c:614 #, c-format msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n" msgstr "no fue posible recibir los encabezados, mensaje %s@%s:%d (%d octetos)\n" -#: driver.c:619 +#: driver.c:632 #, c-format msgid "reading message %s@%s:%d of %d" msgstr "leyendo el mensaje %s@%s:%d de %d" -#: driver.c:624 +#: driver.c:637 #, c-format msgid " (%d octets)" msgstr " (%d octetos)" -#: driver.c:625 +#: driver.c:638 #, c-format msgid " (%d header octets)" msgstr " (%d octetos en la cabecera) " -#: driver.c:692 +#: driver.c:708 #, c-format msgid " (%d body octets)" msgstr " (%d octetos en el cuerpo) " -#: driver.c:751 +#: driver.c:770 #, c-format msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n" msgstr "el mensaje %s@%s:%d no tenía la longitud esperada (%d actual != %d esperada)\n" -#: driver.c:783 +#: driver.c:802 msgid " retained\n" msgstr " retenido\n" -#: driver.c:793 +#: driver.c:812 msgid " flushed\n" msgstr " eliminado\n" -#: driver.c:810 +#: driver.c:824 msgid " not flushed\n" msgstr " no eliminado\n" -#: driver.c:828 +#: driver.c:842 #, c-format msgid "fetchlimit %d reached; %d message left on server %s account %s\n" msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "límite de %d mensajes alcanzado; se dejó %d mensaje en la cuenta %s del servidor %s\n" msgstr[1] "límite de %d mensajes alcanzado; se dejaron %d mensajes en la cuenta %s del servidor %s\n" -#: driver.c:885 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "tiempo agotado después de %d segundos de espera para conectarse con el servidor %s.\n" -#: driver.c:889 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "tiempo agotado después de %d segundos de espera por el servidor %s.\n" -#: driver.c:893 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "tiempo agotado después de %d segundos de espera por %s.\n" -#: driver.c:898 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "tiempo agotado después de %d segundos de esperar respuesta del cliente.\n" -#: driver.c:901 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "tiempo agotado después de %d segundos.\n" -#: driver.c:913 -msgid "Subject: fetchmail sees repeated timeouts" -msgstr "Asunto: fetchmail ve repetidos excesos del tiempo de espera" +#: driver.c:928 +msgid "fetchmail sees repeated timeouts" +msgstr "fetchmail ve repetidos excesos del tiempo de espera" -#: driver.c:916 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmail vio más de %d excesos en el tiempo de espera mientras intentaba obtener correo de %s@%s.\n" -#: driver.c:920 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -210,78 +206,73 @@ msgstr "" "para diagnosticar el problema.\n" "Fetchmail no consultará esta casilla hasta que lo reinicie.\n" -#: driver.c:946 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "la orden de preconexión falló con la señal %d\n" -#: driver.c:949 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "la orden de preconexión falló con la señal %d\n" -#: driver.c:973 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "no fue posible encontrar la casilla HESIOD para %s\n" -#: driver.c:994 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "El servidor líder no tiene nombre.\n" -#: driver.c:1021 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "no se encontró el nombre DNS canónico de %s (%s): %s\n" -#: driver.c:1068 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "Falló la conexión de %s a %s" -#: driver.c:1084 -msgid "Subject: Fetchmail unreachable-server warning." -msgstr "Asunto: aviso de fetchmail servidor fuera de alcance." - -#: driver.c:1086 -#, c-format -msgid "Fetchmail could not reach the mail server %s:" -msgstr "Fetchmail no puede alcanzar al servidor de correo %s:" - -#: driver.c:1114 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "Fallo en la conexión SSL.\n" -#: driver.c:1167 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Error «lock-busy» en %s@%s\n" -#: driver.c:1171 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Error: servidor ocupado en %s@%s\n" -#: driver.c:1176 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Fallo de autorización en %s@%s%s\n" -#: driver.c:1179 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (previamente autorizado)" -#: driver.c:1200 +#: driver.c:1187 +msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" +msgstr "Para obtener ayuda, consulte http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" + +#: driver.c:1208 #, c-format -msgid "Subject: fetchmail authentication failed on %s@%s" -msgstr "Asunto: la autenticación de fetchmail falló en %s@%s" +msgid "fetchmail authentication failed on %s@%s" +msgstr "la autenticación de fetchmail falló en %s@%s" -#: driver.c:1204 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail no pudo obtener correo de %s@%s.\n" -#: driver.c:1208 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -303,7 +294,7 @@ msgstr "" "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n" "servicio se restablezca." -#: driver.c:1214 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -323,7 +314,7 @@ msgstr "" "en cada ciclo. No se enviarán futuras notificaciones hasta que el servicio\n" "se restaure." -#: driver.c:1224 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -344,177 +335,187 @@ msgstr "" "conexión en cada ciclo. No se enviarán más notificaciones hasta que el\n" "servicio se restablezca." -#: driver.c:1240 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Volver a consultar inmediatamente %s@%s\n" -#: driver.c:1245 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Error de zócalo o TLS en %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Error de entrada o de autenticación desconocido en %s@%s\n" -#: driver.c:1269 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Autorización correcta en %s@%s\n" -#: driver.c:1275 +#: driver.c:1291 #, c-format -msgid "Subject: fetchmail authentication OK on %s@%s" -msgstr "Asunto: autenticación de fetchmail correcta en %s@%s" +msgid "fetchmail authentication OK on %s@%s" +msgstr "autenticación de fetchmail correcta en %s@%s" -#: driver.c:1279 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail pudo registrarse en %s@%s.\n" -#: driver.c:1283 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "El servicio se ha reestablecido.\n" -#: driver.c:1315 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "seleccionando o volviendo a consultar la carpeta %s\n" -#: driver.c:1317 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "seleccionando o volviendo a consultar la carpeta predeterminada\n" -#: driver.c:1329 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s en %s (carpeta %s)" -#: driver.c:1332 rcfile_y.y:384 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s en %s" -#: driver.c:1337 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Consultando %s\n" -#: driver.c:1341 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d mensaje (%d %s) para %s" msgstr[1] "%d mensajes (%d %s) para %s" -#: driver.c:1344 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "visto" msgstr[1] "vistos" -#: driver.c:1347 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d mensaje para %s" msgstr[1] "%d mensajes para %s" -#: driver.c:1354 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d octetos).\n" -#: driver.c:1360 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "No hay correo para %s\n" -#: driver.c:1393 imap.c:90 +#: driver.c:1410 msgid "bogus message count!" msgstr "¡cantidad de mensajes incorrecta!" -#: driver.c:1537 +#: driver.c:1462 +#, c-format +msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" +msgstr "Demasiados mensajes saltados (%d > %d) debido a errores transitorios para %s\n" + +#: driver.c:1568 msgid "socket" msgstr "zócalo" -#: driver.c:1540 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "el encabezado RFC822 falta o es incorrecto" -#: driver.c:1543 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1546 +#: driver.c:1577 msgid "client/server synchronization" msgstr "sincronización cliente/servidor" -#: driver.c:1549 +#: driver.c:1580 msgid "client/server protocol" msgstr "protocolo cliente/servidor" -#: driver.c:1552 +#: driver.c:1583 msgid "lock busy on server" msgstr "bloqueo ocupado en el servidor" -#: driver.c:1555 +#: driver.c:1586 msgid "SMTP transaction" msgstr "Transacción SMTP" -#: driver.c:1558 +#: driver.c:1589 msgid "DNS lookup" msgstr "búsqueda en DNS" -#: driver.c:1561 +#: driver.c:1592 msgid "undefined" msgstr "indefinido" -#: driver.c:1567 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "error %s al recibir de %s@%s y entregar al anfitrión SMTP %s\n" -#: driver.c:1569 +#: driver.c:1600 msgid "unknown" msgstr "desconocida" -#: driver.c:1571 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "error %s al recibir de %s@%s\n" -#: driver.c:1583 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "la orden de postconexión falló con la señal %d\n" -#: driver.c:1585 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "la orden de postconexión falló con estado %d\n" -#: driver.c:1604 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Soporte de Kerberos V4 no incluido.\n" -#: driver.c:1612 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Soporte de Kerberos V5 no incluido.\n" -#: driver.c:1623 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Opción --flush no permitida con %s\n" -#: driver.c:1629 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Opción --all no permitida con %s\n" -#: driver.c:1638 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Opción --limit no permitida con %s\n" -#: env.c:59 +#: env.c:58 #, c-format msgid "" "%s: The QMAILINJECT environment variable is set.\n" @@ -529,7 +530,7 @@ msgstr "" "Pruebe “env QMAILINJECT= %s SUS ARGUMENTOS AQUÍ”\n" "%s: Abortar.\n" -#: env.c:71 +#: env.c:70 #, c-format msgid "" "%s: The NULLMAILER_FLAGS environment variable is set.\n" @@ -545,26 +546,34 @@ msgstr "" "Prueba “env NULLMAILER_FLAGS= %s SUS ARGUMENTOS AQUÍ”\n" "%s: Abortar.\n" -#: env.c:83 +#: env.c:82 #, c-format msgid "%s: You don't exist. Go away.\n" msgstr "%s: No existe. Fuera.\n" -#: env.c:145 +#: env.c:143 +msgid "Cannot find absolute path for user's home directory.\n" +msgstr "No se puede encontrar la ruta absoluta para el directorio inicial del usuario.\n" + +#: env.c:167 +msgid "Cannot find absolute path for fetchmail's home directory.\n" +msgstr "No se puede encontrar la ruta absoluta para el directorio inicial de fetchmail.\n" + +#: env.c:200 #, c-format msgid "%s: can't determine your host!" msgstr "%s: ¡no se puede determinar su anfitrión!" -#: env.c:168 +#: env.c:223 #, c-format -msgid "gethostbyname failed for %s\n" -msgstr "gethostbyname falló para %s\n" +msgid "getaddrinfo failed for \"%s\": %s\n" +msgstr "getaddrinfo falló para \"%s\": %s\n" -#: env.c:170 +#: env.c:224 msgid "Cannot find my own host in hosts database to qualify it!\n" msgstr "No puedo encontrar mi propio anfitrión en la base de datos de anfitriones para cualificarlo.\n" -#: env.c:174 +#: env.c:228 msgid "" "Trying to continue with unqualified hostname.\n" "DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n" @@ -574,7 +583,7 @@ msgstr "" "NO informe de cabeceras «Received:» rotas, líneas HELO/EHLO o problemas similares\n" "REPARE su /etc/hosts, DNS, NIS o LDAP.\n" -#: etrn.c:49 odmr.c:60 +#: etrn.c:49 odmr.c:61 #, c-format msgid "%s's SMTP listener does not support ESMTP\n" msgstr "El servidor de SMTP de %s no permite ESMTP\n" @@ -622,35 +631,38 @@ msgstr "Error de sintaxis ETRN en los parámetros\n" msgid "Unknown ETRN error %d\n" msgstr "Error ETRN desconocido %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "La opción --keep no se permite con ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "La opción --flush no se permite con ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "La opción --folder se permite con ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "La opción --check no se permite con ETRN\n" -#: fetchmail.c:137 +#: fetchmail.c:144 +#, c-format msgid "" "Copyright (C) 2002, 2003 Eric S. Raymond\n" -"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n" -"Copyright (C) 2005 - 2006 Sunil Shetye\n" -"Copyright (C) 2005 - 2009 Matthias Andree\n" +"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" +" Robert M. Funk, Graham Wilson\n" +"Copyright (C) 2005 - 2012 Sunil Shetye\n" +"Copyright (C) 2005 - %d Matthias Andree\n" msgstr "" "Copyright (C) 2002, 2003 Eric S. Raymond\n" -"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n" -"Copyright (C) 2005 - 2006 Sunil Shetye\n" -"Copyright (C) 2005 - 2009 Matthias Andree\n" +"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" +" Robert M. Funk, Graham Wilson\n" +"Copyright (C) 2005 - 2012 Sunil Shetye\n" +"Copyright (C) 2005 - %d Matthias Andree\n" -#: fetchmail.c:142 +#: fetchmail.c:150 msgid "" "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions. For details,\n" @@ -660,900 +672,1007 @@ msgstr "" "le anima a redistribuirlo bajo ciertas concidiones. Para conocer más detalles,\n" "vea el archivo COPYING en la fuente o en el directorio de documentación.\n" -#: fetchmail.c:176 +#: fetchmail.c:190 msgid "WARNING: Running as root is discouraged.\n" msgstr "AVISO: se recomienda no ejecutar esta aplicación como root.\n" -#: fetchmail.c:188 +#: fetchmail.c:202 msgid "fetchmail: invoked with" msgstr "fetchmail: invocado con" -#: fetchmail.c:212 +#: fetchmail.c:225 msgid "could not get current working directory\n" msgstr "no fue posible obtener el directorio de trabajo actual\n" -#: fetchmail.c:283 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Esta es la versión %s de fetchmail" -#: fetchmail.c:403 +#: fetchmail.c:313 +#, c-format +msgid "" +"Compiled with SSL library %#lx \"%s\"\n" +"Run-time uses SSL library %#lx \"%s\"\n" +msgstr "" +"Compilado con la biblioteca SSL %#lx \"%s\"\n" +"El tiempo de ejecución usa la biblioteca SSL %#lx \"%s\"\n" + +#: fetchmail.c:317 +#, c-format +msgid "" +"OpenSSL: %s\n" +"Engines: %s\n" +msgstr "" +"OpenSSL: %s\n" +"Motores: %s\n" + +#: fetchmail.c:321 +msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" +msgstr "AVISO: Su biblioteca de SSL/TLS no admite TLS v1.3.\n" + +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "ERROR: Compilado contra LibreSSL, lo cual es una violación de copyright por la falta de la cláusula GPl excepción 2b. Consulte COPYING. Abortando.\n" + +#: fetchmail.c:330 +msgid "WARNING: Compiled without SSL/TLS.\n" +msgstr "AVISO: Compilado sin SSL/TLS.\n" + +#: fetchmail.c:356 +msgid "The nodetach option is in effect, ignoring logfile option.\n" +msgstr "La opción nodetach está en efecto, se ignora la opción logfile.\n" + +#: fetchmail.c:363 +msgid "Not running in daemon mode, ignoring logfile option.\n" +msgstr "No se está ejecutando en segundo plano, se ignora la opción logfile.\n" + +#: fetchmail.c:370 +#, c-format +msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" +msgstr "El archivo de registro \"%s\" no existe, se ignora la opción logfile.\n" + +#: fetchmail.c:376 +#, c-format +msgid "Logfile \"%s\" is not writable, aborting.\n" +msgstr "No se puede escribir el archivo de registro \"%s\", abortando.\n" + +#: fetchmail.c:394 +#, c-format +msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" +msgstr "las opciones syslog y logfile están activas al mismo tiempo, se ignora syslog y se guarda el registro a %s" + +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Tomando opciones de la línea de órdenes%s%s\n" -#: fetchmail.c:404 +#: fetchmail.c:486 msgid " and " msgstr " y " -#: fetchmail.c:409 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "No hay servidores de correo configurados -- ¿puede faltar %s?\n" -#: fetchmail.c:430 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: no se han especificado servidores de correo.\n" -#: fetchmail.c:442 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: ningún otro fetchmail se está ejecutando\n" -#: fetchmail.c:448 +#: fetchmail.c:530 #, c-format -msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n" -msgstr "fetchmail: error terminando %s fetchmail (%d); abandonando.\n" +msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" +msgstr "fetchmail: error terminando %s fetchmail en %ld; abandonando.\n" -#: fetchmail.c:449 fetchmail.c:458 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "segundo plano" -#: fetchmail.c:449 fetchmail.c:458 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "primer plano" -#: fetchmail.c:457 +#: fetchmail.c:539 #, c-format -msgid "fetchmail: %s fetchmail at %d killed.\n" -msgstr "fetchmail: %s fetchmail (%d) terminado.\n" +msgid "fetchmail: %s fetchmail at %ld killed.\n" +msgstr "fetchmail: %s fetchmail en %ld terminado.\n" -#: fetchmail.c:480 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: no es posible verificar el correo mientras otro fetchmail está en ejecución hacia el mismo anfitrión\n" -#: fetchmail.c:486 +#: fetchmail.c:568 #, c-format -msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n" -msgstr "fetchmail: no es posible consultar los anfitriones especificados con otro fetchmail (%d) en ejecución.\n" +msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" +msgstr "fetchmail: no es posible consultar los anfitriones especificados con otro fetchmail en ejecución en %ld.\n" -#: fetchmail.c:493 +#: fetchmail.c:575 #, c-format -msgid "fetchmail: another foreground fetchmail is running at %d.\n" -msgstr "fetchmail: otro fetchmail (%d) está en ejecución en primer plano.\n" +msgid "fetchmail: another foreground fetchmail is running at %ld.\n" +msgstr "fetchmail: otro fetchmail está en ejecución en primer plano en %ld.\n" -#: fetchmail.c:503 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: no es posible aceptar opciones mientras un fetchmail está en ejecución en segundo plano.\n" -#: fetchmail.c:509 +#: fetchmail.c:597 #, c-format -msgid "fetchmail: background fetchmail at %d awakened.\n" -msgstr "fetchmail: fetchmail (%d) en segundo plano despertado.\n" +msgid "fetchmail: background fetchmail at %ld awakened.\n" +msgstr "fetchmail: fetchmail %ld en segundo plano despertado.\n" -#: fetchmail.c:521 +#: fetchmail.c:609 #, c-format -msgid "fetchmail: elder sibling at %d died mysteriously.\n" -msgstr "fetchmail: el proceso hijo más antiguo (%d) murió misteriosamente.\n" +msgid "fetchmail: elder sibling at %ld died mysteriously.\n" +msgstr "fetchmail: el proceso hijo más antiguo en %ld murió misteriosamente.\n" -#: fetchmail.c:536 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: no se puede encontrar una contraseña para %s@%s.\n" -#: fetchmail.c:540 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Introduzca contraseña para %s@%s: " -#: fetchmail.c:582 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: No se puede separar en segundo plano. Abortando.\n" -#: fetchmail.c:586 +#: fetchmail.c:674 #, c-format -msgid "starting fetchmail %s daemon \n" -msgstr "iniciando fetchmail %s en segundo plano \n" +msgid "starting fetchmail %s daemon\n" +msgstr "iniciando fetchmail %s en segundo plano\n" -#: fetchmail.c:602 fetchmail.c:604 +#: fetchmail.c:690 fetchmail.c:692 #, c-format -msgid "could not open %s to append logs to \n" +msgid "could not open %s to append logs to\n" msgstr "no fue posible abrir %s para anexarle mensajes de registro\n" -#: fetchmail.c:606 -msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n" -msgstr "fetchmail: Aviso: syslog y logfile están establecidos. Compruebe ambos registros\n" - -#: fetchmail.c:625 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "--check mode activado, no recibir correo\n" -#: fetchmail.c:647 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "no se pudo temporizar %s (error %d)\n" -#: fetchmail.c:652 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "reiniciando fetchmail (%s cambió)\n" -#: fetchmail.c:657 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "el intento de volver a ejectuar puede fallar dado que el directorio no se ha restaurado\n" -#: fetchmail.c:684 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "el intento de volver a ejecutar fetchmail falló\n" -#: fetchmail.c:714 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "la consulta %s se omitió (fallo en la autenticación o demasiados excesos de espera)\n" -#: fetchmail.c:726 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "intervalo no alcanzado, no se consultará %s\n" -#: fetchmail.c:764 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Estado de la consulta=0 (SUCCESS)\n" -#: fetchmail.c:766 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Estado de la consulta=1 (NOMAIL)\n" -#: fetchmail.c:768 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Estado de la consulta=2 (SOCKET)\n" -#: fetchmail.c:770 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Estado de la consulta=3 (AUTHFAIL)\n" -#: fetchmail.c:772 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Estado de la consulta=4 (PROTOCOL)\n" -#: fetchmail.c:774 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Estado de la consulta=5 (SYNTAX)\n" -#: fetchmail.c:776 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Estado de la consulta=6 (IOERR)\n" -#: fetchmail.c:778 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Estado de la consulta=7 (ERROR)\n" -#: fetchmail.c:780 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Estado de la consulta=8 (EXCLUDE)\n" -#: fetchmail.c:782 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Estado de la consulta=9 (LOCKBUSY)\n" -#: fetchmail.c:784 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Estado de la consulta=10 (SMTP)\n" -#: fetchmail.c:786 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Estado de la consulta=11 (DNS)\n" -#: fetchmail.c:788 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Estado de la consulta=12 (BSMTP)\n" -#: fetchmail.c:790 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Estado de la consulta=13 (MAXFETCH)\n" -#: fetchmail.c:792 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Estado de la consulta=%d\n" -#: fetchmail.c:834 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Todas las conexiones están trabadas. Saliendo.\n" -#: fetchmail.c:842 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "durmiendo en %s por %d segundos\n" -#: fetchmail.c:866 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "despertado por %s\n" -#: fetchmail.c:869 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "despertado por la señal %d\n" -#: fetchmail.c:877 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "despertado en %s\n" -#: fetchmail.c:882 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "terminación normal, estado %d\n" -#: fetchmail.c:1036 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "no se pudo temporizar el archivo de control de ejecución\n" -#: fetchmail.c:1069 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Aviso: múltiples menciones del anfitrión %s en el archivo de configuración\n" -#: fetchmail.c:1102 -msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n" -msgstr "fetchmail: Error: múltiples registros «predeterminados» en el archivo de configuración.\n" +#: fetchmail.c:1203 +msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" +msgstr "fetchmail: Error: múltiples registros «defaults» en el archivo de configuración, o «defaults» no es el primer registro.\n" -#: fetchmail.c:1224 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "El soporte de SSL no se compiló.\n" -#: fetchmail.c:1231 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "El soporte de KERBEROS v4 está configurado pero no compilado\n" -#: fetchmail.c:1237 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "El soporte de KERBEROS v5 está configurado pero no compilado\n" -#: fetchmail.c:1243 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "El soporte de GSSAPI está configurado pero no compilado\n" -#: fetchmail.c:1273 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: aviso: no hay DNS disponible para verificar recepciones «multidrop» de %s\n" -#: fetchmail.c:1284 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "aviso: ¡«multidrop» para %s requiere la opción «envelope»!\n" -#: fetchmail.c:1285 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "aviso: ¡no pida soporte técnico si todo el correo está dirigido al postmaster!\n" -#: fetchmail.c:1302 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: la configuración %s no es válida, especifique un número de puerto positivo para el servicio el puerto\n" -#: fetchmail.c:1309 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: la configuración %s no es válida, RPOP requiere un puerto privilegiado\n" -#: fetchmail.c:1327 +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "AVISO: la configuración %s no es válida, normalmente necesita --ssl para el puerto 995/servicio pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "AVISO: la configuración %s no es válida, normalmente necesita el puerto 995/servicio pop3s para --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "AVISO: la configuración %s no es válida, normalmente necesita --ssl para el puerto 993/servicio imaps.\n" + +#: fetchmail.c:1429 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "AVISO: la configuración %s no es válida, normalmente necesita el puerto 993/servicio imaps para --ssl.\n" + +#: fetchmail.c:1447 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "configuración de %s inválida, LMTP no puede usar el puerto SMTP predeterminado\n" -#: fetchmail.c:1341 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Ambos, «fetchall» y «keep on» en el demonio o en el modo de espera, es un error\n" -#: fetchmail.c:1366 +#: fetchmail.c:1471 +msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" +msgstr "fetchmail: Error: ¡el modo idle no funciona para carpetas o cuentas múltiples!\n" + +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "terminado con señal %d\n" -#: fetchmail.c:1439 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s consultando a %s (protocolo %s) en %s: pregunta iniciada\n" -#: fetchmail.c:1464 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "El soporte de POP2 no está configurado.\n" -#: fetchmail.c:1476 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "El soporte de POP3 no está configurado.\n" -#: fetchmail.c:1486 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "El soporte de IMAP no está configurado.\n" -#: fetchmail.c:1492 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "El soporte de ETRN no está configurado.\n" -#: fetchmail.c:1500 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "El soporte de ODMR no está configurado.\n" -#: fetchmail.c:1507 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "se seleccionó un protocolo no permitido.\n" -#: fetchmail.c:1517 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s interrogando %s (protocolo %s) en %s: consulta terminada\n" -#: fetchmail.c:1534 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "El intervalo entre consultas es de %d segundos\n" -#: fetchmail.c:1536 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "El archivo de registro es %s\n" -#: fetchmail.c:1538 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "El archivo con identificaciones es %s\n" -#: fetchmail.c:1541 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Los mensajes de progreso se registrarán vía syslog\n" -#: fetchmail.c:1544 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail enmascarará y no generará «Received»\n" -#: fetchmail.c:1546 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail mostrará puntos de progreso incluso en los archivos de registro.\n" -#: fetchmail.c:1548 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail reenviará mensajes «multidrop» mal direccionados a %s.\n" -#: fetchmail.c:1552 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail dirigirá el correo de error al «postmaster».\n" -#: fetchmail.c:1554 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail dirigirá el correo de error al remitente.\n" -#: fetchmail.c:1557 -msgid "Fetchmail will treat permanent errors as permanent (drop messsages).\n" +#: fetchmail.c:1695 +msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail tratará los errores permanentes como permanentes (soltar mensajes).\n" -#: fetchmail.c:1559 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail tratará los errores permanentes como temporales (mantener mensajes).\n" -#: fetchmail.c:1566 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Opciones para recibir de %s@%s:\n" -#: fetchmail.c:1570 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " El correo se recibirá vía %s\n" -#: fetchmail.c:1573 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " La consulta de este servidor ocurrirá cada %d intervalo.\n" msgstr[1] " La consulta de este servidor ocurrirá cada %d intervalos.\n" -#: fetchmail.c:1577 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " El nombre verdadero del servidor es %s.\n" -#: fetchmail.c:1580 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Este anfitrión no será consultado cuando no se especifica un anfitrión.\n" -#: fetchmail.c:1581 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Este anfitrión será consultado cuando no se especifique ningún anfitrión.\n" -#: fetchmail.c:1585 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Se pedirá la contraseña.\n" -#: fetchmail.c:1589 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " Secreto APOP = «%s».\n" -#: fetchmail.c:1592 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " Identidad RPOP = «%s».\n" -#: fetchmail.c:1595 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Contraseña = «%s».\n" -#: fetchmail.c:1604 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " El protocolo es KPOP con autenticación Kerberos %s" -#: fetchmail.c:1607 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " El protocolo es %s" -#: fetchmail.c:1609 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (usando servicio %s)" -#: fetchmail.c:1611 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (usando puerto predeterminado)" -#: fetchmail.c:1613 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (forzando el uso de UIDL)" -#: fetchmail.c:1619 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Se probarán todos los métodos de autenticación disponibles.\n" -#: fetchmail.c:1622 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Se forzará autenticación con contraseña.\n" -#: fetchmail.c:1625 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " Se forzará autenticación MSN.\n" -#: fetchmail.c:1628 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " Se forzará autenticación NTLM.\n" -#: fetchmail.c:1631 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " Se forzará autenticación OTP.\n" -#: fetchmail.c:1634 -msgid " CRAM-Md5 authentication will be forced.\n" -msgstr " Se forzará autenticación CRAM-Md5.\n" +#: fetchmail.c:1772 +msgid " CRAM-MD5 authentication will be forced.\n" +msgstr " Se forzará autenticación CRAM-MD5.\n" -#: fetchmail.c:1637 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " Se forzará autenticación GSSAPI.\n" -#: fetchmail.c:1640 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Se forzará autenticación Kerberos V4.\n" -#: fetchmail.c:1643 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Se forzará autenticación Kerberos V5.\n" -#: fetchmail.c:1646 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Se asume cifrado de un extremo a otro.\n" -#: fetchmail.c:1650 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " El principal del servicio de correo es: %s\n" -#: fetchmail.c:1653 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " Sesiones cifradas con SSL activadas.\n" -#: fetchmail.c:1655 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " Protocolo SSL: %s.\n" -#: fetchmail.c:1657 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " Comprobación de certificados SSL del servidor activada.\n" -#: fetchmail.c:1659 +#: fetchmail.c:1797 +msgid " SSL server certificate checking disabled.\n" +msgstr " Comprobación de certificados SSL del servidor desactivada.\n" + +#: fetchmail.c:1799 +#, c-format +msgid " SSL default trusted certificate file: %s\n" +msgstr " Fichero del certificado SSL de confianza predeterminado: %s\n" + +#: fetchmail.c:1801 +#, c-format +msgid " SSL trusted certificate file: %s\n" +msgstr " Fichero del certificado SSL de confianza: %s\n" + +#: fetchmail.c:1802 +#, c-format +msgid " SSL default trusted certificate directory: %s\n" +msgstr " Directorio del certificado SSL de confianza predeterminado: %s\n" + +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Directorio del certificado SSL de confianza: %s\n" -#: fetchmail.c:1662 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr "«CommonName» del servidor SSL: %s\n" -#: fetchmail.c:1664 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Huella digital de la clave SSL (comprobada con la clave del servidor): %s\n" -#: fetchmail.c:1667 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " El tiempo de espera para respuestas del servidor es de %d segundos" -#: fetchmail.c:1669 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (predeterminado).\n" -#: fetchmail.c:1676 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " La casilla predeterminada está seleccionada.\n" -#: fetchmail.c:1681 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Las casillas seleccionadas son:" -#: fetchmail.c:1687 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Todos los mensajes se recibirán (--all on).\n" -#: fetchmail.c:1688 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Sólo se recibirán mensajes nuevos (--all off).\n" -#: fetchmail.c:1690 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Los mensajes recibidos permanecerán en el servidor (--keep on).\n" -#: fetchmail.c:1691 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Los mensajes recibidos se eliminarán del servidor (--keep off).\n" -#: fetchmail.c:1693 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Los mensajes viejos serán eliminados antes de recibir nuevos (--flush on).\n" -#: fetchmail.c:1694 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " No se eliminarán los mensajes viejos antes de recibir nuevos (--flush off).\n" -#: fetchmail.c:1696 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Los mensajes demasiado grandes se eliminarán antes de recibir nuevos (--limitflush on).\n" -#: fetchmail.c:1697 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Los mensajes demasiado garndes no se eliminarán antes de recibir nuevos (--limitflush off).\n" -#: fetchmail.c:1699 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Se reescribirán las direcciones locales (--norewrite off).\n" -#: fetchmail.c:1700 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " No se reescribirán las direcciones locales (--norewrite on).\n" -#: fetchmail.c:1702 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Los retornos de carro se eliminarán (stripcr on).\n" -#: fetchmail.c:1703 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " No se eliminarán los retornos de carro (stripcr off).\n" -#: fetchmail.c:1705 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Se añadirán retornos de carro (forcecr on).\n" -#: fetchmail.c:1706 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " No se añadirán retornos de carro (forcecr off).\n" -#: fetchmail.c:1708 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Se ignorará el contenido de «Content-Transfer-Encoding» (pass8bits on).\n" -#: fetchmail.c:1709 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Se respetará el contenido de «Content-Transfer-Encoding» (pass8bits off).\n" -#: fetchmail.c:1711 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " La decodificación MIME está activada (mimedecode on).\n" -#: fetchmail.c:1712 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " La decodificación MIME está desactivada (mimedecode off).\n" -#: fetchmail.c:1714 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Se permanecerá a la espera tras la consulta (idle on).\n" -#: fetchmail.c:1715 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " No se permanecerá a la espera tras la consulta (idle off).\n" -#: fetchmail.c:1717 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Las líneas «Status» que no estén vacías se descartarán (dropstatus on).\n" -#: fetchmail.c:1718 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Las líneas «Status» que no estén vacías se conservarán (dropstatus off).\n" -#: fetchmail.c:1720 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Las líneas «Delivered-To» se descartarán (dropdelivered on).\n" -#: fetchmail.c:1721 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Las líneas «Delivered-To» se conservarán (dropdelivered off).\n" -#: fetchmail.c:1725 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " El tamaño de los mensajes está limitado a %d octetos (--limit %d).\n" -#: fetchmail.c:1728 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " El tamaño de los mensajes no está limitado (--limit 0).\n" -#: fetchmail.c:1730 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Los avisos sobre el tamaño de los mensajes se darán cada %d segundos (--warnings %d).\n" -#: fetchmail.c:1733 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Los avisos sobre el tamaño de los mensajes se darán en cada consulta (--warnings 0).\n" -#: fetchmail.c:1736 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " La cantidad de mensajes recibidos está limitada a %d (--fetchlimit %d).\n" -#: fetchmail.c:1739 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " La cantidad de mensajes recibidos no está limitada (--fetchlimit 0).\n" -#: fetchmail.c:1741 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " El límite de tamaño para los mensajes recibidos es de %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1744 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " El tamaño de los mensajes no está limitado (--fetchsizelimit 0).\n" -#: fetchmail.c:1748 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Utilizar búsqueda binaria de UID durante cada consulta (--fastuidl 1).\n" -#: fetchmail.c:1750 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Utilizar búsqueda binaria de UID durante %d de cada %d consultas (--fastuidl %d).\n" -#: fetchmail.c:1753 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Utilizar búsqueda lineal de UID durante cada consulta (--fastuidl 0).\n" -#: fetchmail.c:1755 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " El límite de mensajes por lote SMTP es %d.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " La cantidad de mensajes emitidos no está limitada (--batchlimit 0).\n" -#: fetchmail.c:1761 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " El intervalo de borrado entre eliminaciones está forzado a %d (--expunge %d).\n" -#: fetchmail.c:1763 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " No forzar eliminaciones (--expunge 0).\n" -#: fetchmail.c:1770 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Los dominios para los cuales se recibirá correo son:" -#: fetchmail.c:1775 fetchmail.c:1795 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (predeterminado)" -#: fetchmail.c:1780 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Los mensajes serán anexados a %s como BSMTP\n" -#: fetchmail.c:1782 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Los mensajes se entregarán con «%s».\n" -#: fetchmail.c:1789 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Los mensajes se reenviarán con %cMTP a:" -#: fetchmail.c:1800 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " El nombre del anfitrión en la línea «MAIL FROM» será %s\n" -#: fetchmail.c:1803 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " La dirección a poner en las líneas RCPT TO enviadas al STMP será %s\n" -#: fetchmail.c:1812 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Las respuestas de servidor reconocidas como bloques de basura son:" -#: fetchmail.c:1818 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " El bloqueo de basura está desactivado\n" -#: fetchmail.c:1821 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " La conexión al servidor se iniciará con «%s».\n" -#: fetchmail.c:1824 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " No hay orden de preconexión.\n" -#: fetchmail.c:1826 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " La conexión al servidor se terminará con «%s».\n" -#: fetchmail.c:1829 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " No hay orden de postconexión.\n" -#: fetchmail.c:1832 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " No hay nombres locales declarados para este anfitrión.\n" -#: fetchmail.c:1842 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Modo «multi-drop»: " -#: fetchmail.c:1844 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Modo «single-drop»: " -#: fetchmail.c:1846 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d nombre local reconocido.\n" msgstr[1] "%d nombres locales reconocidos.\n" -#: fetchmail.c:1861 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " Se consultará al DNS por las direcciones «multidrop».\n" -#: fetchmail.c:1862 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " No se consultará al DNS por las direcciones «multidrop».\n" -#: fetchmail.c:1866 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Se comparará la dirección IP de los alias del servidor contra las direcciones «multidrop».\n" -#: fetchmail.c:1868 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Se comparará el nombre de los alias del servidor contra las direcciones «multidrop».\n" -#: fetchmail.c:1871 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " El enrutado por la dirección de la envoltura está desactivado\n" -#: fetchmail.c:1874 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Se asume que el encabezado de la envoltura es: %s\n" -#: fetchmail.c:1877 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Número del encabezado de la envoltura a omitir: %d\n" -#: fetchmail.c:1880 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " El prefijo %s se eliminará del nombre de usuario\n" -#: fetchmail.c:1883 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " No se eliminará ningún prefijo\n" -#: fetchmail.c:1890 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Alias predeclarados del servidor de correo:" -#: fetchmail.c:1899 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Dominios locales:" -#: fetchmail.c:1909 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " La conexión debe ser a través de la interfaz %s.\n" -#: fetchmail.c:1911 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " No se especificaron requerimientos de la interfaz.\n" -#: fetchmail.c:1913 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " El bucle de consulta se monitorizará %s.\n" -#: fetchmail.c:1915 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " No se especificó una interfaz de monitorización.\n" -#: fetchmail.c:1919 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Las conexiones al servidor se llevarán a cabo a través del complemento %s (--plugin %s).\n" -#: fetchmail.c:1921 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " No se especificó una orden para el complemento.\n" -#: fetchmail.c:1923 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Las conexiones al cliente se llevarán a cabo a través del «plugout» %s (--plugout %s).\n" -#: fetchmail.c:1925 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " No se especificó una orden para el «plugout».\n" -#: fetchmail.c:1930 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " No hay UID guardadas de este anfitrión.\n" -#: fetchmail.c:1939 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UID guardadas.\n" -#: fetchmail.c:1947 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Se añadirá información de traceado sobre la consulta al encabezado «Received».\n" -#: fetchmail.c:1949 -msgid "" -" No poll trace information will be added to the Received header.\n" -".\n" +#: fetchmail.c:2084 +msgid " No poll trace information will be added to the Received header.\n" msgstr " No se añadirá información de traceado sobre la consulta al encabezado «Received».\n" -#: fetchmail.c:1952 +#: fetchmail.c:2089 +msgid " Messages with bad headers will be rejected.\n" +msgstr " Los mensajes con encabezados erróneos serán rechazados.\n" + +#: fetchmail.c:2092 +msgid " Messages with bad headers will be passed on.\n" +msgstr " Los mensajes con encabezados erróneos serán admitidos.\n" + +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Propiedades de paso «%s».\n" +#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30 +#, c-format +msgid "Cannot modify signal mask: %s" +msgstr "No se puede modificar la máscara de señal: %s" + +#: fm_realpath.c:35 +msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n" +msgstr "Su sistema operativo no define PATH_MAX ni acepta realpath(f, NULL). Abortando.\n" + #: getpass.c:71 msgid "ERROR: no support for getpassword() routine\n" msgstr "ERROR: no hay soporte para la rutina getpassword()\n" @@ -1566,55 +1685,87 @@ msgstr "" "\n" "SIGINT recibido... abortando.\n" -#: gssapi.c:66 +#: gssapi.c:53 +#, c-format +msgid "GSSAPI error in gss_display_status called from <%s>\n" +msgstr "Error de GSSAPI en gss_display_status llamado desde <%s>\n" + +#: gssapi.c:56 +#, c-format +msgid "GSSAPI error %s: %.*s\n" +msgstr "Error de GSSAPI %s: %.*s\n" + +#: gssapi.c:91 #, c-format msgid "Couldn't get service name for [%s]\n" msgstr "No fue posible obtener el nombre de servicio para [%s]\n" -#: gssapi.c:72 +#: gssapi.c:96 #, c-format msgid "Using service name [%s]\n" msgstr "Usando nombre de servicio [%s]\n" -#: gssapi.c:89 +#: gssapi.c:123 +msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n" +msgstr "No se encontraron credenciales GSSAPI adecuadas. Se salta la autenticación GSSAPI.\n" + +#: gssapi.c:124 +msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n" +msgstr "Si quiere usar GSSAPI, necesita primero credenciales, posiblemente de kinit.\n" + +#: gssapi.c:160 +#, c-format +msgid "Received malformed challenge to \"%s GSSAPI\"!\n" +msgstr "¡Se recibió un reto malformado para \"GSSAPI %s\"!\n" + +#: gssapi.c:170 msgid "Sending credentials\n" msgstr "Enviando credenciales\n" -#: gssapi.c:107 +#: gssapi.c:201 msgid "Error exchanging credentials\n" msgstr "Error intercambiando credenciales\n" -#: gssapi.c:152 +#: gssapi.c:243 msgid "Couldn't unwrap security level data\n" msgstr "No fue posible desenvolver los datos del nivel de seguridad\n" -#: gssapi.c:157 +#: gssapi.c:248 msgid "Credential exchange complete\n" msgstr "Intercambio de credenciales completo\n" -#: gssapi.c:161 +#: gssapi.c:252 msgid "Server requires integrity and/or privacy\n" msgstr "El servidor requiere integridad o privacidad\n" -#: gssapi.c:170 +#: gssapi.c:261 #, c-format msgid "Unwrapped security level flags: %s%s%s\n" msgstr "Opciones de nivel de seguridad desenvueltas: %s%s%s\n" -#: gssapi.c:174 +#: gssapi.c:265 #, c-format msgid "Maximum GSS token size is %ld\n" msgstr "El máximo tamaño del componente GSS es %ld\n" -#: gssapi.c:187 +#: gssapi.c:274 +msgid "GSSAPI username too long for static buffer.\n" +msgstr "El nombre de usuario GSSAPI es demasiado grande para el almacenamiento estático.\n" + +#: gssapi.c:283 msgid "Error creating security level request\n" msgstr "Error creando petición de nivel de seguridad\n" -#: gssapi.c:198 +#: gssapi.c:287 +#, c-format +msgid "GSSAPI send_token too large (%lu) while sending username.\n" +msgstr "send_token de GSSAPI es demasiado grande (%lu) al enviar el nombre de usuario.\n" + +#: gssapi.c:298 msgid "Releasing GSS credentials\n" msgstr "Liberando las credenciales GSS\n" -#: gssapi.c:201 +#: gssapi.c:302 msgid "Error releasing credentials\n" msgstr "Error liberando las credenciales\n" @@ -1623,105 +1774,164 @@ msgstr "Error liberando las credenciales\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: la tarea dormirá durante %d segundos\n" -#: imap.c:326 +#: imap.c:91 msgid "Protocol identified as IMAP4 rev 1\n" msgstr "Protocolo identificado como IMAP4 rev 1\n" -#: imap.c:332 +#: imap.c:95 msgid "Protocol identified as IMAP4 rev 0\n" msgstr "Protocolo identificado como IMAP4 rev 0\n" -#: imap.c:339 +#: imap.c:99 msgid "Protocol identified as IMAP2 or IMAP2BIS\n" msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n" -#: imap.c:354 +#: imap.c:111 msgid "will idle after poll\n" msgstr "descansará después de consultar\n" -#: imap.c:446 pop3.c:518 +#: imap.c:138 +#, c-format +msgid "Received BYE response from IMAP server: %s\n" +msgstr "Se recibió una respuesta BYE del servidor IMAP: %s\n" + +#: imap.c:160 +#, c-format +msgid "bogus message count in \"%s\"!" +msgstr "¡cantidad de mensajes incorrecta en \"%s\"!" + +#: imap.c:207 +#, c-format +msgid "bogus EXPUNGE count in \"%s\"!" +msgstr "¡cuenta de EXPUNGE incorrecta en \"%s\"!" + +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "se encontró la lista de capacidades actualizada\n" + +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "el servidor no anuncia la extensión SASL-IR pero la implementación de fetchmail la requiere para AUTHENTICATE EXTERNAL\n" + +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: la configuración requiere TLS, pero no se permite STARTTLS por el estado de autenticación (PREAUTH). Abortando la conexión. Si su plugin es seguro, puede derrotar a STARTTLS on --sslproto '' (vea el manual).\n" + +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: la configuración requiere TLS, pero no se permite STARTTLS por el estado de autenticación (PREAUTH). Abortando la conexión. Si el servidor lo permite, pruebe en su lugar --ssl (vea el manual).\n" + +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: actualización a TLS correcta.\n" -#: imap.c:455 pop3.c:527 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: falló la actualización a TLS.\n" -#: imap.c:459 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: falló la actualización oportunista a TLS, intentando continuar\n" -#: imap.c:579 +#: imap.c:561 +#, c-format +msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" +msgstr "%s: AVISO: el servidor ofreción STARTTLS pero se proporcionó sslproto ''.\n" + +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: se solicitó --auth external pero el servidor no la anuncia.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "La capacidad OTP requerida no se compiló en fetchmail\n" -#: imap.c:601 pop3.c:385 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "La capacidad NTLM requerida no se compiló en fetchmail\n" -#: imap.c:610 -msgid "Required LOGIN capability not supported by server\n" -msgstr "La capacidad LOGIN requerida no está permitida por el servidor\n" +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: se solicitó una contraseña --auth pero el servidor lo prohibe (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: Hemos agotado los autenticadores permitidos y no puede continuar.\n" -#: imap.c:676 +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "la eliminación de correo no coincide (%d actual != %d esperado)\n" -#: imap.c:782 imap.c:841 +#: imap.c:896 +#, c-format +msgid "%lu is unseen\n" +msgstr "%lu no fue visto\n" + +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 +#, c-format +msgid "%u is unseen\n" +msgstr "%u no fue visto\n" + +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "falló el reintento de consulta\n" -#: imap.c:790 imap.c:846 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "Queda %d mensaje esperando tras reintentar la consulta\n" msgstr[1] "Quedan %d mensajes esperando tras reintentar la consulta\n" -#: imap.c:807 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "falló la selección de casilla\n" -#: imap.c:811 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "Queda %d mensaje esperando tras la consulta inicial\n" msgstr[1] "Quedan %d mensajes esperando tras la consulta inicial\n" -#: imap.c:825 +#: imap.c:1024 msgid "expunge failed\n" msgstr "falló la eliminación\n" -#: imap.c:829 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "Queda %d mensaje esperando tras la eliminación\n" msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n" -#: imap.c:871 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "la búsqueda de mensajes no vistos falló\n" -#: imap.c:899 -#, c-format -msgid "%lu is unseen\n" -msgstr "%lu no fue visto\n" - -#: imap.c:911 pop3.c:889 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u es el primero que no fue visto\n" -#: imap.c:1002 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Aviso: ignorando datos de errores para los tamaños de mensaje devueltos por el servidor.\n" +#: imap.c:1255 imap.c:1262 +#, c-format +msgid "Incorrect FETCH response: %s.\n" +msgstr "Respuesta FETCH incorrecta: %s.\n" + #: interface.c:256 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem." msgstr "No es posible abrir la interfaz kvm. Asegúrese de que fetchmail este SGID kmem." @@ -1758,44 +1968,44 @@ msgstr "No se encontró una interfaz con el nombre %s" msgid "No IP address found for %s" msgstr "No se encontró dirección IP para %s" -#: interface.c:589 +#: interface.c:590 msgid "missing IP interface address\n" msgstr "falta la dirección IP de la interfaz\n" -#: interface.c:605 +#: interface.c:606 msgid "invalid IP interface address\n" msgstr "la dirección IP de la interfaz no es válida\n" -#: interface.c:611 +#: interface.c:612 msgid "invalid IP interface mask\n" msgstr "la máscara IP de la interfaz no es válida\n" -#: interface.c:650 +#: interface.c:651 #, c-format msgid "activity on %s -noted- as %d\n" msgstr "actividad en %s -vista- como %d\n" -#: interface.c:665 +#: interface.c:666 #, c-format msgid "skipping poll of %s, %s down\n" msgstr "omitiendo consulta %s, %s desactivada\n" -#: interface.c:684 +#: interface.c:685 #, c-format msgid "skipping poll of %s, %s IP address excluded\n" msgstr "no se consulta %s, la dirección IP de %s se excluyó\n" -#: interface.c:696 +#: interface.c:697 #, c-format msgid "activity on %s checked as %d\n" msgstr "actividad en %s verificada como %d\n" -#: interface.c:722 +#: interface.c:723 #, c-format msgid "skipping poll of %s, %s inactive\n" msgstr "no se consulta %s, %s inactiva\n" -#: interface.c:729 +#: interface.c:730 #, c-format msgid "activity on %s was %d, is %d\n" msgstr "la actividad en %s era %d, es %d\n" @@ -1804,718 +2014,790 @@ msgstr "la actividad en %s era %d, es %d\n" msgid "could not decode initial BASE64 challenge\n" msgstr "no fue posible decodificar el desafío BASE64 inicial\n" -#: kerberos.c:139 +#: kerberos.c:137 #, c-format msgid "principal %s in ticket does not match -u %s\n" msgstr "%s principal en el «ticket» no coincide con -u %s\n" -#: kerberos.c:147 +#: kerberos.c:145 #, c-format msgid "non-null instance (%s) might cause strange behavior\n" msgstr "La instancia no nula (%s) puede causar un comportamiento extraño\n" -#: kerberos.c:213 +#: kerberos.c:211 msgid "could not decode BASE64 ready response\n" msgstr "no fue posible decodificar la respuesta BASE64 «ready»\n" -#: kerberos.c:220 +#: kerberos.c:218 msgid "challenge mismatch\n" msgstr "desafío no coincidente\n" -#: lock.c:86 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: error leyendo el archivo de bloqueo «%s»: %s\n" -#: lock.c:97 -msgid "fetchmail: removing stale lockfile\n" -msgstr "fetchmail: eliminando archivo de bloqueo viejo\n" +#: lock.c:101 +#, c-format +msgid "fetchmail: removing stale lockfile \"%s\"\n" +msgstr "fetchmail: eliminando archivo de bloqueo viejo \"%s\"\n" + +#: lock.c:105 +#, c-format +msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" +msgstr "fetchmail: no se puede borrar el archivo de bloqueo \"%s\" (%s), tratando de escribir en él\n" -#: lock.c:121 +#: lock.c:119 +#, c-format +msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" +msgstr "fetchmail: no se puede escribir en el archivo de bloqueo «%s» (%s), terminando\n" + +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: error abriendo archivo de bloqueo \"%s\": %s\n" -#: lock.c:168 -msgid "fetchmail: lock creation failed.\n" -msgstr "fetchmail: falló la creación del bloqueo.\n" +#: lock.c:179 +#, c-format +msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" +msgstr "fetchmail: falló la creación del bloqueo, archivo pid \"%s\": %s\n" + +#: lock.c:190 +#, c-format +msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" +msgstr "fetchmail: no se puede borrar o truncar el archivo de pid «%s»: %s\n" -#: netrc.c:219 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: aviso: «%s» encontrado antes que cualquier nombre de anfitrión\n" -#: netrc.c:257 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: aviso: el componente «%s» es desconocido\n" -#: odmr.c:66 +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: error al leer el fichero (%s).\n" + +#: ntlmsubr.c:35 +msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" +msgstr "Aviso: ¡Se recibió un reto malformado para \"AUTH(ENTICATE) NTLM\"!\n" + +#: ntlmsubr.c:84 +msgid "NTLM challenge contains invalid data.\n" +msgstr "El reto NTLM contiene datos inválidos.\n" + +#: odmr.c:67 #, c-format msgid "%s's SMTP listener does not support ATRN\n" msgstr "El SMTP de %s no permite ATRN\n" -#: odmr.c:104 +#: odmr.c:105 msgid "Turnaround now...\n" msgstr "Dese la vuelta ahora...\n" -#: odmr.c:109 +#: odmr.c:110 msgid "ATRN request refused.\n" msgstr "Petición ATRN rechazada.\n" -#: odmr.c:113 +#: odmr.c:114 msgid "Unable to process ATRN request now\n" msgstr "No es posible procesar el pedido ATRN\n" -#: odmr.c:118 +#: odmr.c:119 msgid "You have no mail.\n" msgstr "No tiene correo.\n" -#: odmr.c:122 +#: odmr.c:123 msgid "Command not implemented\n" msgstr "Orden no implementada\n" -#: odmr.c:126 +#: odmr.c:127 msgid "Authentication required.\n" msgstr "Autenticación requerida.\n" -#: odmr.c:130 +#: odmr.c:132 #, c-format -msgid "Unknown ODMR error %d\n" -msgstr "Error ODMR desconocido %d\n" +msgid "Unknown ODMR error \"%s\"\n" +msgstr "Error ODMR \"%s\" desconocido\n" -#: odmr.c:189 +#: odmr.c:192 msgid "receiving message data\n" msgstr "recibiendo datos del mensaje\n" -#: odmr.c:242 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "La opción --keep no se permite con ODMR\n" -#: odmr.c:246 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "La opción --flush no se permite con ODMR\n" -#: odmr.c:250 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "La opción --folder no se permite con ODMR\n" -#: odmr.c:254 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "La opción --check no se permite con ODMR\n" -#: opie.c:42 +#: opie.c:43 msgid "server recv fatal\n" msgstr "fatal recv del servidor\n" -#: opie.c:56 +#: opie.c:57 msgid "Could not decode OTP challenge\n" msgstr "No fue posible decodificar el desafío OTP\n" -#: opie.c:64 pop3.c:610 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Frase clave secreta: " -#: options.c:172 options.c:216 +#: options.c:179 options.c:223 #, c-format msgid "String '%s' is not a valid number string.\n" msgstr "La cadena «%s» no es un cadena de números válida.\n" -#: options.c:181 +#: options.c:188 #, c-format msgid "Value of string '%s' is %s than %d.\n" msgstr "El valor de la cadena «%s» es %s que %d.\n" -#: options.c:182 +#: options.c:189 msgid "smaller" msgstr "menor" -#: options.c:182 +#: options.c:189 msgid "larger" msgstr "mayor" -#: options.c:349 +#: options.c:337 +#, c-format +msgid "Invalid bad-header policy `%s' specified.\n" +msgstr "Se especificó la política bad-header «%s» inválida.\n" + +#: options.c:378 #, c-format msgid "Invalid protocol `%s' specified.\n" -msgstr "El protocolo «%s» especificado no es válido.\n" +msgstr "Se especificó el protocolo «%s» inválido.\n" -#: options.c:396 +#: options.c:425 #, c-format msgid "Invalid authentication `%s' specified.\n" -msgstr "Se especificó una autenticación «%s» inválida.\n" +msgstr "Se especificó la autenticación «%s» inválida.\n" -#: options.c:601 +#: options.c:641 msgid "usage: fetchmail [options] [server ...]\n" msgstr "uso: fetchmail [opciones] [servidor ...]\n" -#: options.c:602 +#: options.c:642 msgid " Options are as follows:\n" msgstr " Las opciones son las siguientes:\n" -#: options.c:603 +#: options.c:643 msgid " -?, --help display this option help\n" msgstr " -?, --help muestra esta ayuda\n" -#: options.c:604 +#: options.c:644 msgid " -V, --version display version info\n" msgstr " -V, --version muestra información sobre la versión\n" -#: options.c:606 +#: options.c:646 msgid " -c, --check check for messages without fetching\n" msgstr " -c, --check verifica si hay mensajes sin recibir\n" -#: options.c:607 +#: options.c:647 msgid " -s, --silent work silently\n" msgstr " -s, --silent trabajar silenciosamente\n" -#: options.c:608 +#: options.c:648 msgid " -v, --verbose work noisily (diagnostic output)\n" msgstr " -v, --verbose trabajar ruidosamente (información de diagnóstico)\n" -#: options.c:609 +#: options.c:649 msgid " -d, --daemon run as a daemon once per n seconds\n" msgstr " -d, --daemon correr en segundo plano y activarse una vez cada n segundos\n" -#: options.c:610 +#: options.c:650 msgid " -N, --nodetach don't detach daemon process\n" msgstr " -N, --nodetach no lanzar un proceso en segundo plano\n" -#: options.c:611 +#: options.c:651 msgid " -q, --quit kill daemon process\n" msgstr " -q, --quit terminar el proceso en segundo plano\n" -#: options.c:612 +#: options.c:652 msgid " -L, --logfile specify logfile name\n" msgstr " -L, --logfile especificar el nombre del archivo de registro\n" -#: options.c:613 +#: options.c:653 msgid " --syslog use syslog(3) for most messages when running as a daemon\n" msgstr " --syslog usar syslog(3) para la mayoría de los mensajes cuando se ejecuta en segundo plano\n" -#: options.c:614 +#: options.c:654 +msgid " --nosyslog turns off use of syslog(3)\n" +msgstr " --nosyslog desactivar el uso de syslog(3)\n" + +#: options.c:655 msgid " --invisible don't write Received & enable host spoofing\n" msgstr " --invisible no escribir «Received» y activar falsificación del anfitrión\n" -#: options.c:615 +#: options.c:656 msgid " -f, --fetchmailrc specify alternate run control file\n" msgstr " -f, --fetchmailrc especificar archivo de control de ejecución alterno\n" -#: options.c:616 +#: options.c:657 msgid " -i, --idfile specify alternate UIDs file\n" msgstr " -i, --idfile especificar archivo de UID alterno\n" -#: options.c:617 +#: options.c:658 msgid " --pidfile specify alternate PID (lock) file\n" msgstr " --pidfile especificar archivo PID alternativo (bloqueado)\n" -#: options.c:618 +#: options.c:659 msgid " --postmaster specify recipient of last resort\n" msgstr " --postmaster especificar el recipiente de último recurso\n" -#: options.c:619 +#: options.c:660 msgid " --nobounce redirect bounces from user to postmaster.\n" msgstr " --nobounce redirigir rebotes del usuario al postmaster.\n" -#: options.c:620 +#: options.c:661 msgid " --nosoftbounce fetchmail deletes permanently undeliverable messages.\n" msgstr " --nosoftbounce fetchmail borra permanentemente los mensajes que no se pueden entregar.\n" -#: options.c:621 +#: options.c:662 msgid " --softbounce keep permanently undeliverable messages on server (default).\n" msgstr " --softbounce mantiene permanentemente los mensajes que no se pueden entregar en el servidor (predeterminado).\n" -#: options.c:623 +#: options.c:664 msgid " -I, --interface interface required specification\n" msgstr " -I, --interface especificación de interfaz requerida\n" -#: options.c:624 +#: options.c:665 msgid " -M, --monitor monitor interface for activity\n" msgstr " -M, --monitor monitorizar interfaz por actividad\n" -#: options.c:627 +#: options.c:668 msgid " --ssl enable ssl encrypted session\n" msgstr " --ssl activar sesión cifrada con ssl\n" -#: options.c:628 +#: options.c:669 msgid " --sslkey ssl private key file\n" msgstr " --sslkey archivo de clave privada ssl\n" -#: options.c:629 +#: options.c:670 msgid " --sslcert ssl client certificate\n" msgstr " --sslcert certificado ssl del cliente\n" -#: options.c:630 +#: options.c:671 msgid " --sslcertck do strict server certificate check (recommended)\n" msgstr " --sslcert comprobación estricta del certificado del servidor (recomendado)\n" -#: options.c:631 -msgid " --sslcertpath path to ssl certificates\n" -msgstr " --sslcertpath ubicación de los certificados ssl\n" +#: options.c:672 +msgid " --nosslcertck skip strict server certificate check (insecure)\n" +msgstr " --nosslcertck salta la comprobación estricta del certificado del servidor (inseguro)\n" + +#: options.c:673 +msgid " --sslcertfile path to trusted-CA ssl certificate file\n" +msgstr " --sslcertfile ubicación del fichero de certificados ssl confiables\n" + +#: options.c:674 +msgid " --sslcertpath path to trusted-CA ssl certificate directory\n" +msgstr " --sslcertpath ubicación del directorio de los certificados ssl confiables\n" -#: options.c:632 +#: options.c:675 msgid " --sslcommonname expect this CommonName from server (discouraged)\n" msgstr " --sslcommonname esperar este «CommonName» del servidor (desaconsejado)\n" -#: options.c:633 +#: options.c:676 msgid " --sslfingerprint fingerprint that must match that of the server's cert.\n" msgstr " --sslfingerprint huella digital que debe coincidir con la del certificado del servidor.\n" -#: options.c:634 -msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n" -msgstr " --sslproto forzar protocolo (SSL2/SSL3/TLS1)\n" +#: options.c:677 +msgid " --sslproto force ssl protocol (see manual)\n" +msgstr " --sslproto forzar protocolo (consulte el manual)\n" -#: options.c:636 +#: options.c:679 msgid " --plugin specify external command to open connection\n" msgstr " --plugin especificar la orden externa para abrir una conexión\n" -#: options.c:637 +#: options.c:680 msgid " --plugout specify external command to open smtp connection\n" msgstr " --plugout especificar la orden externa para abrir una conexión smtp\n" -#: options.c:639 -msgid " -p, --protocol specify retrieval protocol (see man page)\n" -msgstr " -p, --protocol especificar el protocolo de recepción (ver página man)\n" +#: options.c:681 +msgid "" +" --bad-header {reject|accept}\n" +" specify policy for handling messages with bad headers\n" +msgstr "" +" --bad-header {reject|accept}\n" +" especificar la política para manejar mensajes con encabezados erróneos\n" + +#: options.c:684 +msgid " -p, --proto[col] specify retrieval protocol (see man page)\n" +msgstr " -p, --proto[col] especificar el protocolo de recepción (ver página man)\n" -#: options.c:640 +#: options.c:685 msgid " -U, --uidl force the use of UIDLs (pop3 only)\n" msgstr " -U, --uidl forzar el uso de UIDL (sólo pop3)\n" -#: options.c:641 +#: options.c:686 +msgid " --idle tells the IMAP server to send notice of new messages\n" +msgstr " --idle indicar al servidor IMAP que envíe notificaciones de mensajes nuevos\n" + +#: options.c:687 msgid " --port TCP port to connect to (obsolete, use --service)\n" msgstr " --port Puerto TCP a conectar (obsoleto, use --service)\n" -#: options.c:642 +#: options.c:688 msgid " -P, --service TCP service to connect to (can be numeric TCP port)\n" msgstr " -P, --service Servicio TCP al que conectarse (puede ser un puerto TCP numérico)\n" -#: options.c:643 -msgid " --auth authentication type (password/kerberos/ssh/otp)\n" -msgstr " --auth tipo de autenticación (contraseña/kerberos/ssh/otp)\n" +#: options.c:689 +msgid " --auth authentication type (see manual)\n" +msgstr " --auth tipo de autenticación (consulte el manual)\n" -#: options.c:644 +#: options.c:690 msgid " -t, --timeout server nonresponse timeout\n" msgstr " -t, --timeout tiempo de espera por respuesta del servidor\n" -#: options.c:645 +#: options.c:691 msgid " -E, --envelope envelope address header\n" msgstr " -E, --envelope envolver encabezados de dirección\n" -#: options.c:646 +#: options.c:692 msgid " -Q, --qvirtual prefix to remove from local user id\n" msgstr " -Q, --qvirtual prefijo a eliminar de la identificación local del usuario\n" -#: options.c:647 +#: options.c:693 msgid " --principal mail service principal\n" msgstr " --principal principal del servicio de correo\n" -#: options.c:648 +#: options.c:694 msgid " --tracepolls add poll-tracing information to Received header\n" msgstr " --tracepolls añadir información sobre traceado de consultas al encabezado «Received»\n" -#: options.c:650 -msgid " -u, --username specify users's login on server\n" -msgstr " -u, --username especificar el acceso del usuario en el servidor\n" +#: options.c:696 +msgid " -u, --user[name] specify users's login on server\n" +msgstr " -u, --user[name] especificar el acceso del usuario en el servidor\n" -#: options.c:651 +#: options.c:697 msgid " -a, --[fetch]all retrieve old and new messages\n" msgstr " -a, --[fetch]all recuperar antiguos y nuevos mensajes\n" -#: options.c:652 +#: options.c:698 msgid " -K, --nokeep delete new messages after retrieval\n" msgstr " -K, --nokeep borrar nuevos mensajes después de recibidos\n" -#: options.c:653 +#: options.c:699 msgid " -k, --keep save new messages after retrieval\n" msgstr " -k, --keep guardar nuevos mensajes después de recibidos\n" -#: options.c:654 +#: options.c:700 msgid " -F, --flush delete old messages from server\n" msgstr " -F, --flush borrar viejos mensajes del servidor\n" -#: options.c:655 +#: options.c:701 msgid " --limitflush delete oversized messages\n" msgstr " --limitflush borrar mensajes demasiado grandes\n" -#: options.c:656 +#: options.c:702 msgid " -n, --norewrite don't rewrite header addresses\n" msgstr " -n, --norewrite no reescribir las direcciones del encabezado\n" -#: options.c:657 +#: options.c:703 msgid " -l, --limit don't fetch messages over given size\n" msgstr " -l, --limit no recibir mensajes más grandes de lo especificado\n" -#: options.c:658 +#: options.c:704 msgid " -w, --warnings interval between warning mail notification\n" msgstr " -w, --warnings intervalo entre las notificaciones de correo\n" -#: options.c:660 +#: options.c:706 msgid " -S, --smtphost set SMTP forwarding host\n" msgstr " -S, --smtphost configurar el anfitrión de reenvío de SMTP\n" -#: options.c:661 +#: options.c:707 msgid " --fetchdomains fetch mail for specified domains\n" msgstr " --fetchdomains recibir correo para los dominios especificados\n" -#: options.c:662 +#: options.c:708 msgid " -D, --smtpaddress set SMTP delivery domain to use\n" msgstr " -D, --smtpaddress configurar el dominio de entrega de SMTP a usar\n" -#: options.c:663 +#: options.c:709 msgid " --smtpname set SMTP full name username@domain\n" msgstr " --smtpname usar nombreusuario@dominio como nombre completo para SMTP\n" -#: options.c:664 +#: options.c:710 msgid " -Z, --antispam, set antispam response values\n" msgstr " -Z, --antispam configurar los valores de respuesta anti basura\n" -#: options.c:665 +#: options.c:711 msgid " -b, --batchlimit set batch limit for SMTP connections\n" msgstr " -b, --batchlimit configurar el límite de mensajes para las conexiones SMTP\n" -#: options.c:666 +#: options.c:712 msgid " -B, --fetchlimit set fetch limit for server connections\n" msgstr " -B, --fetchlimit configurar el límite de mensajes para las conexiones al servidor\n" -#: options.c:667 +#: options.c:713 msgid " --fetchsizelimit set fetch message size limit\n" msgstr " --fetchsizelimit configurar el límite de tamaño de mensaje\n" -#: options.c:668 +#: options.c:714 msgid " --fastuidl do a binary search for UIDLs\n" msgstr " --fastuidl utilizar búsqueda binaria para los UIDL\n" -#: options.c:669 +#: options.c:715 msgid " -e, --expunge set max deletions between expunges\n" msgstr " -e, --expunge configurar la cantidad de mensajes borrados entre eliminaciones\n" -#: options.c:670 +#: options.c:716 msgid " -m, --mda set MDA to use for forwarding\n" msgstr " -m, --mda configurar el MDA para que reenvíe\n" -#: options.c:671 +#: options.c:717 msgid " --bsmtp set output BSMTP file\n" msgstr " --bsmtp configurar archivo de salida de BSMTP\n" -#: options.c:672 +#: options.c:718 msgid " --lmtp use LMTP (RFC2033) for delivery\n" msgstr " --lmtp usar LMTP (RFC2033) para entrega\n" -#: options.c:673 +#: options.c:719 msgid " -r, --folder specify remote folder name\n" msgstr " -r, --folder especificar nombre de la carpeta remota\n" -#: options.c:674 +#: options.c:720 msgid " --showdots show progress dots even in logfiles\n" msgstr " --showdots mostrar puntos de progreso incluso en los archivos de registro\n" -#: pop3.c:355 -msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n" -msgstr "Aviso: «Servidor Maillennium POP3/PROXYr» encontrado. use la orden RETR en vez de TOP.\n" +#: pop2.c:67 +msgid "POP2 does not support STLS. Giving up.\n" +msgstr "POP2 no soporta STLS. Me rindo.\n" -#: pop3.c:454 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "TLS es obligatorio para esta sesión, pero el servidor rechaza la orden CAPA\n" +#: pop2.c:73 +msgid "POP2 only supports password authentication. Giving up.\n" +msgstr "POP2 solamente soporta autenticación con contraseña. Me rindo.\n" -#: pop3.c:455 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "La orden CAPA, no obstante, es necesaria para TLS.\n" +#: pop3.c:338 +msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" +msgstr "Aviso: «Servidor Maillennium POP3/PROXY» encontrado, se usa la orden RETR en vez de TOP.\n" -#: pop3.c:538 +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "STLS es obligatorio para esta sesión, pero el servidor rechaza la orden CAPA\n" + +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "El soporte para la orden CAPA, no obstante, es necesaria para STLS.\n" + +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: la actualización oportunista a TLS falló, intentando continuar.\n" -#: pop3.c:646 +#: pop3.c:476 +#, c-format +msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" +msgstr "%s: AVISO: el servidor ofreció STLS, pero se proporcionó sslproto ''.\n" + +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Hemos agotado los autenticadores permitidos y no puede continuar.\n" -#: pop3.c:660 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "El sello de tiempo APOP requerido no se ha encontrada en el saludo\n" -#: pop3.c:669 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Error de sintaxis en el sello de tiempo en el saludo\n" -#: pop3.c:685 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Sello de tiempo APOP inválido.\n" -#: pop3.c:709 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Petición de protocolo indefinido en POP3_auth\n" -#: pop3.c:730 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n" -#: pop3.c:809 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n" -#: pop3.c:832 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n" -#: pop3.c:859 pop3.c:1105 +#: pop3.c:843 #, c-format -msgid "id=%s (num=%d) was deleted, but is still present!\n" -msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n" +msgid "id=%s (num=%u) was deleted, but is still present!\n" +msgstr "id=%s (num=%u) fue borrado, ¡pero aún se encuentra presente!\n" -#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121 -#, c-format -msgid "%u is unseen\n" -msgstr "%u no fue visto\n" - -#: pop3.c:965 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n" -#: pop3.c:1057 +#: pop3.c:1053 msgid "protocol error\n" msgstr "error de protocolo\n" -#: pop3.c:1073 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "error de protocolo durante la recepción de UIDL\n" -#: pop3.c:1443 +#: pop3.c:1100 +#, c-format +msgid "id=%s (num=%d) was deleted, but is still present!\n" +msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n" + +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "La opción --folder no está permitida con POP3\n" -#: rcfile_y.y:126 +#: rcfile_y.y:130 msgid "server option after user options" msgstr "opciones de servidor tras opciones de usuario" -#: rcfile_y.y:169 +#: rcfile_y.y:173 msgid "SDPS not enabled." msgstr "SDPS no activado." -#: rcfile_y.y:215 +#: rcfile_y.y:217 msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n" msgstr "fetchmail: la opción «interface» solo está permitida bajo Linux (sin IPv6) y FreeBSD\n" -#: rcfile_y.y:222 +#: rcfile_y.y:225 msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n" msgstr "fetchmail: la opción «monitor» sólo está permitida bajo Linux (sin IPv6) y FreeBSD\n" -#: rcfile_y.y:335 +#: rcfile_y.y:339 msgid "SSL is not enabled" msgstr "SSL no está activado" -#: rcfile_y.y:385 +#: rcfile_y.y:391 msgid "end of input" msgstr "fin de entrada" -#: rcfile_y.y:423 +#: rcfile_y.y:429 #, c-format msgid "File %s must be a regular file.\n" msgstr "El archivo %s debe ser de tipo normal.\n" -#: rcfile_y.y:433 +#: rcfile_y.y:439 #, c-format msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "El archivo %s no debe tener más que los permisos -rwx------ (0700).\n" -#: rcfile_y.y:445 +#: rcfile_y.y:451 #, c-format msgid "File %s must be owned by you.\n" msgstr "Usted debe ser el propietario del archivo %s.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Error de sistema desconocido" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (mensaje de registro incompleto)\n" -#: rfc822.c:76 +#: rfc822.c:83 #, c-format -msgid "About to rewrite %s" -msgstr "A punto de reescribir %s" +msgid "About to rewrite %s...\n" +msgstr "A punto de reescribir %s...\n" -#: rfc822.c:212 +#: rfc822.c:221 #, c-format -msgid "Rewritten version is %s\n" -msgstr "La versión reescrita es %s\n" +msgid "...rewritten version is %s.\n" +msgstr "...La versión reescrita es %s.\n" -#: rpa.c:117 +#: rpa.c:118 msgid "Success" msgstr "Éxito" -#: rpa.c:118 +#: rpa.c:119 msgid "Restricted user (something wrong with account)" msgstr "Usuario restringido (hay un problema con la cuenta)" -#: rpa.c:119 +#: rpa.c:120 msgid "Invalid userid or passphrase" msgstr "Nombre de usuario o contraseña inválidos" -#: rpa.c:120 +#: rpa.c:121 msgid "Deity error" msgstr "Error en deidad" -#: rpa.c:173 +#: rpa.c:174 msgid "RPA token 2: Base64 decode error\n" msgstr "Componente RPA 2: error de decodificación Base64\n" -#: rpa.c:184 +#: rpa.c:185 #, c-format msgid "Service chose RPA version %d.%d\n" msgstr "El servicio eligió RPA versión %d.%d\n" -#: rpa.c:190 +#: rpa.c:191 #, c-format msgid "Service challenge (l=%d):\n" msgstr "Desafío del servicio (l=%d):\n" -#: rpa.c:199 +#: rpa.c:200 #, c-format msgid "Service timestamp %s\n" msgstr "Sello de tiempo del servicio %s\n" -#: rpa.c:204 +#: rpa.c:205 msgid "RPA token 2 length error\n" msgstr "Error de longitud en el componente RPA 2\n" -#: rpa.c:208 +#: rpa.c:209 #, c-format msgid "Realm list: %s\n" msgstr "Lista de reinos: %s\n" -#: rpa.c:212 +#: rpa.c:213 msgid "RPA error in service@realm string\n" msgstr "Error de RPA en la cadena servicio@reino\n" -#: rpa.c:249 +#: rpa.c:250 msgid "RPA token 4: Base64 decode error\n" msgstr "Componente RPA 4: error de decodificación\n" -#: rpa.c:260 +#: rpa.c:261 #, c-format msgid "User authentication (l=%d):\n" msgstr "Autenticación de usuario (l=%d):\n" -#: rpa.c:274 +#: rpa.c:275 #, c-format msgid "RPA status: %02X\n" msgstr "Estado RPA: %02X\n" -#: rpa.c:280 +#: rpa.c:281 msgid "RPA token 4 length error\n" msgstr "Error de longitud en el componente RPA 4\n" -#: rpa.c:287 +#: rpa.c:288 #, c-format msgid "RPA rejects you: %s\n" msgstr "RPA lo rechaza: %s\n" -#: rpa.c:289 +#: rpa.c:290 msgid "RPA rejects you, reason unknown\n" msgstr "RPA lo rechaza, razón desconocida\n" -#: rpa.c:297 +#: rpa.c:298 #, c-format msgid "RPA User Authentication length error: %d\n" msgstr "Error de longitud en la autenticación de usuario RPA: %d\n" -#: rpa.c:302 +#: rpa.c:303 #, c-format msgid "RPA Session key length error: %d\n" msgstr "Error de longitud en la clave de sesión RPA: %d\n" -#: rpa.c:308 +#: rpa.c:309 msgid "RPA _service_ auth fail. Spoof server?\n" msgstr "Fallo en la autenticación del _servicio_ RPA. ¿Servidor falso?\n" -#: rpa.c:313 +#: rpa.c:314 msgid "Session key established:\n" msgstr "Clave de sesión establecida:\n" -#: rpa.c:344 +#: rpa.c:345 msgid "RPA authorisation complete\n" msgstr "Autorización RPA completa\n" -#: rpa.c:371 +#: rpa.c:372 msgid "Get response\n" msgstr "Obtener respuesta\n" -#: rpa.c:401 +#: rpa.c:402 #, c-format msgid "Get response return %d [%s]\n" msgstr "Obtener respuesta %d [%s]\n" -#: rpa.c:462 +#: rpa.c:463 msgid "Hdr not 60\n" msgstr "Encabezado no es 60\n" -#: rpa.c:483 +#: rpa.c:484 msgid "Token length error\n" msgstr "Error de longitud en el componente\n" -#: rpa.c:488 +#: rpa.c:489 #, c-format msgid "Token Length %d disagrees with rxlen %d\n" msgstr "La longitud %d del componente no está de acuerdo con rxlen %d\n" -#: rpa.c:494 +#: rpa.c:495 msgid "Mechanism field incorrect\n" msgstr "Campo del mecanismo incorrecto\n" -#: rpa.c:530 +#: rpa.c:531 #, c-format msgid "dec64 error at char %d: %x\n" msgstr "Error de dec64 en el carácter %d: %x\n" -#: rpa.c:545 +#: rpa.c:546 msgid "Inbound binary data:\n" msgstr "Datos binarios entrantes:\n" -#: rpa.c:581 +#: rpa.c:582 msgid "Outbound data:\n" msgstr "Datos salientes:\n" -#: rpa.c:644 +#: rpa.c:645 msgid "RPA String too long\n" msgstr "Cadena RPA muy larga\n" -#: rpa.c:649 +#: rpa.c:650 msgid "Unicode:\n" msgstr "Unicode:\n" -#: rpa.c:708 +#: rpa.c:709 msgid "RPA Failed open of /dev/urandom. This shouldn't\n" msgstr "RPA falló abriendo /dev/urandom. Esto no debería\n" -#: rpa.c:709 +#: rpa.c:710 msgid " prevent you logging in, but means you\n" msgstr " prevenir su ingreso, pero significa que\n" -#: rpa.c:710 +#: rpa.c:711 msgid " cannot be sure you are talking to the\n" msgstr " no se puede estar seguro de estar hablando\n" -#: rpa.c:711 +#: rpa.c:712 msgid " service that you think you are (replay\n" msgstr " al servicio que usted cree (son posibles\n" -#: rpa.c:712 +#: rpa.c:713 msgid " attacks by a dishonest service are possible.)\n" msgstr " ataques de respuesta por un servicio deshonesto).\n" -#: rpa.c:723 +#: rpa.c:724 msgid "User challenge:\n" msgstr "Desafío de usuario:\n" -#: rpa.c:873 +#: rpa.c:874 msgid "MD5 being applied to data block:\n" msgstr "Aplicando MD5 al bloque de datos:\n" -#: rpa.c:886 -msgid "MD5 result is: \n" -msgstr "El resultado de MD5 es: \n" +#: rpa.c:887 +msgid "MD5 result is:\n" +msgstr "El resultado de MD5 es:\n" #: servport.c:53 #, c-format @@ -2531,182 +2813,199 @@ msgstr "No se puede resolver el servicio %s al número de puerto.\n" msgid "Please specify the service as decimal port number.\n" msgstr "Especifique el servicio como un número de puerto decimal.\n" -#: sink.c:220 +#: sink.c:231 #, c-format msgid "forwarding to %s\n" msgstr "reenviando a %s\n" -#: sink.c:306 +#: sink.c:319 msgid "SMTP: (bounce-message body)\n" msgstr "SMTP: (cuerpo de mensaje de rebote)\n" -#: sink.c:309 +#: sink.c:322 #, c-format msgid "mail from %s bounced to %s\n" msgstr "correo de %s rebotado a %s\n" -#: sink.c:446 -#, c-format -msgid "Saved error is still %d\n" -msgstr "El error guardado es aún %d\n" - -#: sink.c:506 sink.c:605 +#: sink.c:497 sink.c:590 #, c-format msgid "%cMTP error: %s\n" msgstr "Error de %cMTP: %s\n" -#: sink.c:550 +#: sink.c:535 msgid "SMTP server requires STARTTLS, keeping message.\n" msgstr "El servidor SMTP necesita STARTTLS, manteniendo mensaje.\n" -#: sink.c:730 +#: sink.c:714 #, c-format msgid "BSMTP file open failed: %s\n" msgstr "Fallo en la apertura del archivo de BSMTP: %s\n" -#: sink.c:776 -msgid "BSMTP preamble write failed.\n" -msgstr "Fallo en la escritura del preámbulo\n" +#: sink.c:760 +#, c-format +msgid "BSMTP preamble write failed: %s.\n" +msgstr "Fallo en la escritura del preámbulo BSMTP: %s.\n" -#: sink.c:990 +#: sink.c:974 #, c-format msgid "%cMTP listener doesn't like recipient address `%s'\n" msgstr "Al servidor %cMTP no le gusta la dirección de recipiente «%s»\n" -#: sink.c:997 +#: sink.c:981 #, c-format msgid "%cMTP listener doesn't really like recipient address `%s'\n" msgstr "Al servidor %cMTP realmente no le gusta la dirección de recipiente «%s»\n" -#: sink.c:1043 +#: sink.c:1027 msgid "no address matches; no postmaster set.\n" msgstr "no hay direcciones coincidentes; no se configuró un postmaster.\n" -#: sink.c:1055 +#: sink.c:1039 #, c-format msgid "can't even send to %s!\n" msgstr "¡ni siquiera es posible enviar a %s!\n" -#: sink.c:1061 +#: sink.c:1045 #, c-format msgid "no address matches; forwarding to %s.\n" msgstr "no hay direcciones coincidentes; reenviando a %s.\n" -#: sink.c:1217 +#: sink.c:1167 +#, c-format +msgid "MDA option contains single-quoted %%%c expansion.\n" +msgstr "la opción MDA contiene una expansión %%%c con comillas sencillas.\n" + +#: sink.c:1168 +msgid "Refusing to deliver. Check the manual and fix your mda option.\n" +msgstr "No se puede entregar. Revise el manual y verifique su opción mda.\n" + +#: sink.c:1211 #, c-format msgid "about to deliver with: %s\n" msgstr "a punto de entregar con: %s\n" +#: sink.c:1222 +#, c-format +msgid "Cannot switch effective user id to %ld: %s\n" +msgstr "No se puede cambiar el id del usuario efectivo a %ld: %s\n" + +#: sink.c:1234 +#, c-format +msgid "Cannot switch effective user id back to original %ld: %s\n" +msgstr "No se puede cambiar el id del usuario efectivo al %ld original: %s\n" + #: sink.c:1241 msgid "MDA open failed\n" msgstr "Fallo en la apertura de MDA\n" -#: sink.c:1278 +#: sink.c:1280 #, c-format msgid "%cMTP connect to %s failed\n" msgstr "Fallo en la conexión de %cMTP a %s\n" -#: sink.c:1302 +#: sink.c:1304 #, c-format msgid "can't raise the listener; falling back to %s" msgstr "no se puede despertar al servidor; recurriendo a %s" -#: sink.c:1364 +#: sink.c:1362 +#, c-format +msgid "Message termination or close of BSMTP file failed: %s\n" +msgstr "Falló la terminación del mensaje o el cerrado del fichero BSMTP: %s\n" + +#: sink.c:1387 #, c-format msgid "Error writing to MDA: %s\n" msgstr "Error escribiendo a MDA: %s\n" -#: sink.c:1367 +#: sink.c:1390 #, c-format msgid "MDA died of signal %d\n" msgstr "MDA murió por la señal %d\n" -#: sink.c:1370 +#: sink.c:1393 #, c-format msgid "MDA returned nonzero status %d\n" msgstr "MDA devolvió un estado %d distinto de cero\n" -#: sink.c:1373 +#: sink.c:1396 #, c-format msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n" msgstr "Extraño: MDA pclose devolvió %d y errno %d/%s, no se puede manejar en %s:%d\n" -#: sink.c:1395 -msgid "Message termination or close of BSMTP file failed\n" -msgstr "Fallo la terminación del mensaje o el cerrado de BSMTP\n" - -#: sink.c:1417 +#: sink.c:1421 msgid "SMTP listener refused delivery\n" msgstr "El servidor SMTP rechazó la entrega\n" -#: sink.c:1447 +#: sink.c:1451 msgid "LMTP delivery error on EOM\n" msgstr "Error de entrega de LMTP en EOM\n" -#: sink.c:1450 +#: sink.c:1454 #, c-format msgid "Unexpected non-503 response to LMTP EOM: %s\n" msgstr "Respuesta diferente a 503 no esperada a LMTP EOM: %s\n" -#: sink.c:1605 -msgid "" -"-- \n" -"The Fetchmail Daemon" -msgstr "" -"-- \n" -"El demonio de Fetchmail" +#: sink.c:1620 +msgid "The Fetchmail Daemon" +msgstr "El demonio de Fetchmail" -#: smtp.c:81 +#: smtp.c:84 msgid "ESMTP CRAM-MD5 Authentication...\n" msgstr "Autenticación ESMTP CRAM-MD5...\n" -#: smtp.c:87 smtp.c:137 +#: smtp.c:90 smtp.c:143 msgid "Server rejected the AUTH command.\n" msgstr "El servidor rechazó la orden AUTH.\n" -#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159 +#: smtp.c:98 smtp.c:150 smtp.c:159 smtp.c:165 msgid "Bad base64 reply from server.\n" msgstr "Mala respuesta base64 del servidor.\n" -#: smtp.c:99 +#: smtp.c:102 #, c-format msgid "Challenge decoded: %s\n" msgstr "Desafío decodificado: %s\n" -#: smtp.c:116 +#: smtp.c:119 msgid "ESMTP PLAIN Authentication...\n" msgstr "Autenticación ESMTP PLAIN...\n" -#: smtp.c:131 +#: smtp.c:137 msgid "ESMTP LOGIN Authentication...\n" msgstr "Autenticación ESMTP LOGIN...\n" -#: smtp.c:349 smtp.c:377 +#: smtp.c:354 smtp.c:382 msgid "smtp listener protocol error\n" msgstr "error de protocolo en el servidor smtp\n" -#: socket.c:115 socket.c:141 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc falló\n" -#: socket.c:173 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: plugin para el anfitrión %s servicio %s está vacío. ¡No se puede ejecutar!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: par de sockets falló\n" -#: socket.c:179 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: falló la bifurcación\n" -#: socket.c:186 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 falló\n" -#: socket.c:192 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "ejecutando %s (anfitrión %s servicio %s)\n" -#: socket.c:195 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) falló\n" @@ -2720,173 +3019,310 @@ msgstr "getaddrinfo(«%s»,«%s») error: %s\n" msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Intentando añadir la opción --service (vea también FAQ elemento R12).\n" -#: socket.c:300 socket.c:303 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "desconocido (%s)" -#: socket.c:306 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Intentando conectar a %s/%s..." -#: socket.c:314 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "no se puede crear el zócalo %s\n" -#: socket.c:330 +#: socket.c:320 +#, c-format +msgid "name %d: cannot create socket family %d type %d: %s\n" +msgstr "nombre %d: no se puede crear el zócalo familia %d tipo %d: %s\n" + +#: socket.c:338 msgid "connection failed.\n" msgstr "Fallo en la conexión.\n" -#: socket.c:332 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "conexión a %s:%s [%s/%s] fallida: %s.\n" -#: socket.c:338 +#: socket.c:341 +#, c-format +msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" +msgstr "nombre %d: conexión a %s:%s [%s/%s] fallida: %s.\n" + +#: socket.c:347 msgid "connected.\n" msgstr "conectado.\n" -#: socket.c:616 +#: socket.c:360 +#, c-format +msgid "" +"Connection errors for this poll:\n" +"%s" +msgstr "" +"Errores de conexión para esta consulta:\n" +"%s" + +#: socket.c:450 +#, c-format +msgid "OpenSSL reported: %s\n" +msgstr "OpenSSL reportado: %s\n" + +#: socket.c:690 +#, c-format +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Llamada de verificación SSL nivel %d: verify_ok == %d, err %d, %s\n" + +#: socket.c:696 +msgid "Server certificate:\n" +msgstr "Certificado del servidor\n" + +#: socket.c:701 +#, c-format +msgid "Certificate chain, from root to peer, starting at depth %d:\n" +msgstr "Cadena de certificados, desde la raíz hasta el asociado, iniciando en el nivel %d\n" + +#: socket.c:704 +#, c-format +msgid "Certificate at depth %d:\n" +msgstr "Certificado en el nivel %d:\n" + +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Organización emisora: %s\n" -#: socket.c:619 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Aviso: el nombre de la organización emisora es muy largo (posiblemente truncado).\n" -#: socket.c:621 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Organización desconocida\n" -#: socket.c:623 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "«CommonName» del emisor: %s\n" -#: socket.c:626 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Aviso: el «CommonName» del emisor es muy largo (posiblemente truncado).\n" -#: socket.c:628 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "«CommonName» del emisor desconocido\n" -#: socket.c:632 +#: socket.c:728 #, c-format -msgid "Server CommonName: %s\n" -msgstr "«CommonName» del servidor: %s\n" +msgid "Subject CommonName: %s\n" +msgstr "«CommonName» del sujeto: %s\n" -#: socket.c:638 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Certificado incorrecto: el «CommonName» del asunto es muy largo.\n" -#: socket.c:644 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Certificado incorrecto: el «CommonName» del asunto contiene NUL, abortando.\n" -#: socket.c:665 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Nombre alternativo del asunto: %s\n" -#: socket.c:671 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Certificado incorrecto: El nombre alternativo del asunto contiene NUL, abortando.\n" -#: socket.c:699 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "«CommonName» del servidor no coincide: %s = %s\n" -#: socket.c:706 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "El nombre de servidor no fue configurado, ¡no fue posible verificar el certificado!\n" -#: socket.c:711 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "«CommonName» del servidor desconocido\n" -#: socket.c:713 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "¡No se especifica el nombre del servidor en el certificado!\n" -#: socket.c:725 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() falló\n" -#: socket.c:729 +#: socket.c:821 msgid "Out of memory!\n" msgstr "¡No hay memoria!\n" -#: socket.c:737 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "¡El espacio para el resumen de texto es muy pequeño!\n" -#: socket.c:743 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "Huella digital de la clave %s: %s\n" -#: socket.c:747 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "Las huellas digitales de %s coinciden.\n" -#: socket.c:749 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "¡Las huellas digitales de %s no coinciden!\n" -#: socket.c:758 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Falló la verificación del certificado del servidor: %s\n" -#: socket.c:764 +#: socket.c:868 #, c-format -msgid "unknown issuer (first %d characters): %s\n" -msgstr "Emisor desconocido (primeros %d caracteres): %s\n" +msgid "Broken certification chain at: %s\n" +msgstr "Cadena de certificación rota en: %s\n" -#: socket.c:851 +#: socket.c:870 +msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" +msgstr "Esto puede significar que el servidor no proporcionó los certificados intermedios confiables, y fetchmail no puede hacer nada al respecto. Para más detalles, por favor consulte el documento README.SSL-SERVER que viene con fetchmail.\n" + +#: socket.c:880 +#, c-format +msgid "Missing trust anchor certificate: %s\n" +msgstr "Falta el certificado ancla de confianza: %s\n" + +#: socket.c:883 +msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" +msgstr "Esto significa que el certificado raíz de firma confiable no está en las ubicaciones de certificados confiables, o que se necesita ejecutar c_rehash en el directorio de certificado. Para más detalles, por favor consulte la documentación de --sslcertpath y --sslcertfile en la página de manual. Consulte README.SSL para más detalles.\n" + +#: socket.c:957 socket.c:1033 +msgid "Your OpenSSL version does not support SSLv3.\n" +msgstr "Su versión de OpenSSL no admite SSLv3.\n" + +#: socket.c:975 socket.c:1051 +msgid "Your OpenSSL version does not support TLS v1.1.\n" +msgstr "Su versión de OpenSSL no admite TLS v1.1.\n" + +#: socket.c:986 socket.c:1062 +msgid "Your OpenSSL version does not support TLS v1.2.\n" +msgstr "Su versión de OpenSSL no admite TLS v1.2.\n" + +#: socket.c:997 socket.c:1073 +msgid "Your OpenSSL version does not support TLS v1.3.\n" +msgstr "Su versión de OpenSSL no admite TLS v1.3.\n" + +#: socket.c:1006 socket.c:1083 +#, c-format +msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" +msgstr "El protocolo SSL «%s» especificado es inválido, usando el predeterminado (auto).\n" + +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "La biblioteca wolfSSL %#lx cargada es más antigua que los encabezados %#lx, no se puede continuar.\n" + +#: socket.c:1128 +#, c-format +msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "La biblioteca OpenSSL %#lx cargada es más antigua que los encabezados %#lx, no se puede continuar.\n" + +#: socket.c:1133 +#, c-format +msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" +msgstr "La biblioteca OpenSSL %#lx cargada es más nueva que los encabezados %#lx, intentando continuar.\n" + +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Descriptor de archivo fuera de rango para SSL" -#: socket.c:867 +#: socket.c:1175 +msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" +msgstr "Note que algunas distribuciones desactivan versiones de protocolo más antiguas en formas extrañas. Intente una versión de protoloco más reciente.\n" + +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "No se pueden cargar las ubicaciones de verificación (archivo=\"%s\", dir=\"%s\"), error %d:\n" + +#: socket.c:1272 +#, c-format +msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" +msgstr "Aviso: falló SSL_set_tlsext_host_name(%p, \"%s\") (código %#lx), intentando continuar.\n" + +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") devolvió %d, intentando continuar.\n" + +#: socket.c:1302 #, c-format -msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n" -msgstr "El protocolo SSL «%s» especificado es inválido, usando el predeterminado (SSLv23).\n" +msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" +msgstr "Aviso: falló X509_VERIFY_PARAM_set1_host(%p, \"%s\") (código %#x), intentando continuar.\n" -#: socket.c:943 +#: socket.c:1355 +msgid "Server shut down connection prematurely during SSL_connect().\n" +msgstr "El servidor cerró la conexión prematuramente durante SSL_connect().\n" + +#: socket.c:1358 +#, c-format +msgid "System error during SSL_connect(): %s\n" +msgstr "Error de sistema durante SSL_connect(): %s\n" + +#: socket.c:1358 +msgid "handshake failed at protocol or connection level." +msgstr "la negociación falló en el nivel de protocolo o conexión." + +#: socket.c:1378 +msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" +msgstr "No se puede obtener el cifrado SSL/TLS actual - ¿no hay una sesión establecida?\n" + +#: socket.c:1381 +#, c-format +msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" +msgstr "SSL/TLS: se usa el protocolo %s, cifrado %s, bits %d/%d secretos/procesados\n" + +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "¡La verificación de certificado/huella digital fue de algún modo omitida!\n" -#: socket.c:1021 +#: socket.c:1405 +msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" +msgstr "Aviso: la conexión es insegura, continuando de cualquier manera. (¡Mejor use --sslcertck!)\n" + +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Reintento de lectura del zócalo cygwin\n" -#: socket.c:1024 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "¡Falló el reintento de lectura del zócalo cygwin\n" -#: transact.c:65 +#: transact.c:79 #, c-format msgid "mapped address %s to local %s\n" msgstr "dirección %s asignada al %s local\n" -#: transact.c:87 +#: transact.c:101 #, c-format msgid "mapped %s to local %s\n" msgstr "%s asignado al %s local\n" -#: transact.c:154 +#: transact.c:168 #, c-format msgid "passed through %s matching %s\n" msgstr "se atravesó %s coincidiendo con %s\n" -#: transact.c:224 +#: transact.c:240 #, c-format msgid "" "analyzing Received line:\n" @@ -2895,139 +3331,199 @@ msgstr "" "analizando línea «Received»:\n" "%s" -#: transact.c:263 +#: transact.c:279 #, c-format msgid "line accepted, %s is an alias of the mailserver\n" msgstr "línea aceptada, %s es un alias del servidor de correo\n" -#: transact.c:269 +#: transact.c:285 #, c-format msgid "line rejected, %s is not an alias of the mailserver\n" msgstr "línea rechazada, %s no es un alias del servidor de correo\n" -#: transact.c:343 +#: transact.c:359 msgid "no Received address found\n" msgstr "no se encontró la dirección de «Received»\n" -#: transact.c:352 +#: transact.c:368 #, c-format msgid "found Received address `%s'\n" msgstr "se encontró la dirección de «Received» «%s»\n" -#: transact.c:592 -msgid "incorrect header line found while scanning headers\n" -msgstr "encabezado incorrecto encontrado durante la exploración de encabezados\n" +#: transact.c:613 +msgid "incorrect header line found - see manpage for bad-header option\n" +msgstr "se encontró una línea de encabezado incorrecta - consulte la página de manual para la opción bad-header\n" -#: transact.c:594 +#: transact.c:615 #, c-format msgid "line: %s" msgstr "línea: %s" -#: transact.c:1133 +#: transact.c:1087 transact.c:1097 +#, c-format +msgid "Parsing envelope \"%s\" names \"%-.*s\"\n" +msgstr "Analizando el sobre \"%s\" nombres \"%-.*s\"\n" + +#: transact.c:1112 +#, c-format +msgid "Parsing Received names \"%-.*s\"\n" +msgstr "Analizando los nombres «Received» \"%-.*s\"\n" + +#: transact.c:1124 +msgid "No envelope recipient found, resorting to header guessing.\n" +msgstr "No se encontró un destinatario en el sobre, adivinando con la información del encabezado.\n" + +#: transact.c:1142 +#, c-format +msgid "Guessing from header \"%-.*s\".\n" +msgstr "Adivinando del encabezado \"%-.*s\"\n" + +#: transact.c:1157 #, c-format msgid "no local matches, forwarding to %s\n" msgstr "no hay coincidencias locales, reenviado a %s\n" -#: transact.c:1148 +#: transact.c:1172 msgid "forwarding and deletion suppressed due to DNS errors\n" msgstr "reenvío y borrado suprimido debido a errores de DNS\n" -#: transact.c:1258 +#: transact.c:1283 msgid "writing RFC822 msgblk.headers\n" msgstr "escribiendo encabezados RFC822\n" -#: transact.c:1277 +#: transact.c:1302 msgid "no recipient addresses matched declared local names" msgstr "ninguna dirección de destino coincidió con los nombres locales declarados" -#: transact.c:1284 +#: transact.c:1309 #, c-format msgid "recipient address %s didn't match any local name" msgstr "la dirección de destino %s no coincide con ningún nombre local" -#: transact.c:1293 +#: transact.c:1318 msgid "message has embedded NULs" msgstr "el mensaje contiene NULs" -#: transact.c:1301 +#: transact.c:1326 msgid "SMTP listener rejected local recipient addresses: " msgstr "El servidor SMTP rechazó las direcciones locales de destino: " -#: transact.c:1440 +#: transact.c:1376 msgid "error writing message text\n" msgstr "error al escribir el texto del mensaje\n" -#: uid.c:250 +#: transact.c:1652 +#, c-format +msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n" +msgstr "El espacio es demasiado pequeño. Es un error en la invocación de %s:%lu.\n" + +#: uid.c:262 +#, c-format +msgid "Open or read error while reading idfile %s: %s\n" +msgstr "Error al abrir o leer mientras se lee el archivo de ids «%s»: %s\n" + +#: uid.c:273 #, c-format -msgid "Old UID list from %s:" -msgstr "Lista de UID antiguas de %s:" +msgid "Old UID list from %s:\n" +msgstr "Lista de UID antiguas de %s:\n" -#: uid.c:255 uid.c:266 uid.c:523 uid.c:573 +#: uid.c:277 uid.c:286 uid.c:355 msgid " <empty>" msgstr " <vacía>" -#: uid.c:262 -msgid "Scratch list of UIDs:" -msgstr "Lista borrador de UID:" +#: uid.c:284 +msgid "Scratch list of UIDs:\n" +msgstr "Lista borrador de UIDs:\n" -#: uid.c:517 uid.c:569 +#: uid.c:369 uid.c:413 #, c-format -msgid "Merged UID list from %s:" -msgstr "Se combinó la lista de UID de %s:" +msgid "Merged UID list from %s:\n" +msgstr "Lista de UID combinada de %s:\n" -#: uid.c:519 +#: uid.c:372 #, c-format -msgid "New UID list from %s:" -msgstr "Lista de UID nuevas de %s:" - -#: uid.c:548 -msgid "swapping UID lists\n" -msgstr "se intercambian listas de UID\n" +msgid "New UID list from %s:\n" +msgstr "Lista nueva de UID de %s:\n" -#: uid.c:556 +#: uid.c:402 msgid "not swapping UID lists, no UIDs seen this query\n" msgstr "no se intercambian las listas de UID, no se encontraron UID en esta consulta\n" -#: uid.c:581 +#: uid.c:422 msgid "discarding new UID list\n" msgstr "descartando la nueva lista de UID\n" -#: uid.c:617 +#: uid.c:479 msgid "Deleting fetchids file.\n" msgstr "Borrando el archivo fetchids.\n" -#: uid.c:620 +#: uid.c:482 #, c-format msgid "Error deleting %s: %s\n" msgstr "Error borrando %s: %s\n" -#: uid.c:626 +#: uid.c:489 msgid "Writing fetchids file.\n" msgstr "Escribiendo el archivo fetchids.\n" -#: uid.c:645 +#: uid.c:503 uid.c:512 +#, c-format +msgid "Write error on fetchids file %s: %s\n" +msgstr "Error escribiendo en el archivo fetchids %s: %s\n" + +#: uid.c:524 #, c-format msgid "Error writing to fetchids file %s, old file left in place.\n" msgstr "Error escribiendo al archivo fetchids %s. Se dejó el archivo original intacto.\n" -#: uid.c:649 +#: uid.c:528 #, c-format msgid "Cannot rename fetchids file %s to %s: %s\n" msgstr "No se puede renombrar el archivo fetchids %s a %s: %s\n" -#: uid.c:653 +#: uid.c:532 #, c-format msgid "Cannot open fetchids file %s for writing: %s\n" msgstr "No se puede abrir el archivo fetchids %s para escritura: %s\n" -#: xmalloc.c:33 +#: xmalloc.c:28 msgid "malloc failed\n" msgstr "malloc falló\n" -#: xmalloc.c:47 +#: xmalloc.c:42 msgid "realloc failed\n" msgstr "realloc falló\n" +#~ msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" +#~ msgstr "AVISO: Compilado con LibreSSL, es una configuración sin soporte.\n" + +#~ msgid "Required LOGIN capability not supported by server\n" +#~ msgstr "La capacidad LOGIN requerida no está permitida por el servidor\n" + +#~ msgid "Saved error is still %d\n" +#~ msgstr "El error guardado es aún %d\n" + +#~ msgid "swapping UID lists\n" +#~ msgstr "se intercambian listas de UID\n" + +#~ msgid "Subject: Fetchmail unreachable-server warning." +#~ msgstr "Asunto: aviso de fetchmail servidor fuera de alcance." + +#~ msgid "Fetchmail could not reach the mail server %s:" +#~ msgstr "Fetchmail no puede alcanzar al servidor de correo %s:" + +#~ msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n" +#~ msgstr "fetchmail: Aviso: syslog y logfile están establecidos. Compruebe ambos registros\n" + +#~ msgid "unknown issuer (first %d characters): %s\n" +#~ msgstr "Emisor desconocido (primeros %d caracteres): %s\n" + +#~ msgid "krb5_sendauth: %s [server says '%*s'] \n" +#~ msgstr "krb5_sendauth: %s [el servidor dice «%*s»] \n" + +#~ msgid "Server CommonName: %s\n" +#~ msgstr "«CommonName» del servidor: %s\n" + #~ msgid "message delimiter found while scanning headers\n" #~ msgstr "delimitador de mensajes encontrado durante la exploración de encabezados\n" @@ -1,18 +1,18 @@ # translation of fetchmail to French -# Copyright (C) 2021 Eric S. Raymond (msgids) +# Copyright (C) 2023 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. # Guy Brand <guybrand@chimie.u-strasbg.fr>, Avril 2000 # mise à jour par Sébastien KALT <ustilago@bigfoot.com> # mise à jour par Thierry Vignaud <tvignaud@mandrakesoft.com> # mise à jour par Matthias Andree <matthias.andree@gmx.de> # Guy Brand <guybrand@chimie.u-strasbg.fr>, 1999-2000. -# Frédéric Marchal <fmarchal@perso.be>, 2021. +# Frédéric Marchal <fmarchal@perso.be>, 2023. msgid "" msgstr "" -"Project-Id-Version: fetchmail-6.4.16-rc1\n" +"Project-Id-Version: fetchmail-6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-02-01 07:08+0100\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-04 17:38+0100\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" @@ -159,41 +159,41 @@ msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "fetchlimit %d atteinte; %d message demeure sur le serveur %s (compte %s)\n" msgstr[1] "fetchlimit %d atteinte; %d messages demeurent sur le serveur %s (compte %s)\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "délai dépassé après %d secondes d'attente d'une connexion avec le serveur %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "délai dépassé après %d secondes d'attente du serveur %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "délai dépassé après %d secondes d'attente de %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "délai dépassé après %d secondes d'attente de la réponse du client.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "délai d'attente dépassé après %d secondes.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail a rencontré des dépassements de délai à plusieurs reprises" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmail a rencontré plus de %d dépassements de délais en récupérant du courrier depuis %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -211,74 +211,74 @@ msgstr "" "Fetchmail n'interrogera pas de nouveau cette boîte aux lettres\n" "tant que vous ne l'aurez pas redémarré.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "la commande de pré-connexion a été terminée par le signal %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "la commande de pré-connexion a échoué avec le statut %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "impossible de trouver la boîte HESIOD pour %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Le serveur principal n'a pas de nom\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "impossible de trouver le nom canonique DNS de %s (%s) : %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "Échec de connexion %s avec %s" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "Échec de la connexion SSL\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Erreur « lock-busy » sur %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Erreur « busy » sur %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Échec de l'autorisation sur %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (précédemment autorisée)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "Si vous avez besoin d'aide, consultez http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "l'authentification de fetchmail a échoué sur %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail n'a pas pu recevoir le courrier de %s@%s.\n" # XXX FIXME -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -292,7 +292,7 @@ msgstr "" "que fetchmail ne sait pas distinguer car le serveur n'envoie pas de\n" "message d'erreur utile en cas d'échec du login." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -312,7 +312,7 @@ msgstr "" "à chaque réveil. Il n'y aura plus d'autre notification jusqu'à ce que\n" "le service soit réactivé." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -333,177 +333,182 @@ msgstr "" "à chaque réveil. Il n'y aura plus d'autre notifications jusqu'à ce que\n" "le service soit réactivé." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Re-récupération immédiate sur %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Erreur de connexion ou TLS sur %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Erreur de login ou d'identification inconnue pour %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Autorisation OK sur %s@%s\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "l'authentification de fetchmail a réussi sur %s@%s" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail a pu écrire dans le journal (%s@%s).\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Le service a été réactivé\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "sélection ou re-réception du dossier %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "sélection ou re-réception du dossier par défaut\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s dans %s (dossier %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s dans %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Réception de %s\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d message (%d %s) pour %s" msgstr[1] "%d messages (%d %s) pour %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "déjà vu" msgstr[1] "déjà vus" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d message pour %s" msgstr[1] "%d messages pour %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d octets).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Aucun message pour %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "nombre de messages erroné !" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "Trop de mails ignorés (%d > %d) à cause d'erreur transitoires sur %s\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "socket" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "l'en-tête RFC822 est manquant ou endommagé" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "synchronisation client/serveur" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "protocole client/serveur" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "verrou occupé sur le serveur" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "Transaction SMTP" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "requête au DNS" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "non définie" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "erreur %s durant la réception de %s@%s et l'envoi vers le serveur SMTP %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "inconnu" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "erreur %s durant la réception de %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "la commande de post-connexion est terminée par le signal %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "la commande de post-connexion a échoué avec l'état %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Support de Kerberos V4 non inclus.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Support de Kerberos V5 non inclus.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Option --flush non supportée avec %s\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Option --all non supportée avec %s\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Option --limit non supportée avec %s\n" @@ -627,19 +632,19 @@ msgstr "Erreur de syntaxe ETRN dans les paramètres\n" msgid "Unknown ETRN error %d\n" msgstr "Erreur ETRN inconnue %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "L'option --keep n'est pas supportée avec ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "L'option --keep n'est pas supportée avec ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "L'option --folder n'est pas supportée avec ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "L'option --check n'est pas supportée avec ETRN\n" @@ -680,12 +685,12 @@ msgstr "fetchmail appelé avec" msgid "could not get current working directory\n" msgstr "impossible de trouver le répertoire de travail courant\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Ceci est fetchmail, version %s" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -694,7 +699,7 @@ msgstr "" "Compilé avec la bibliothèque SSL %#lx « %s »\n" "L'exécutable utilise la bibliothèque SSL %#lx « %s »\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -703,939 +708,959 @@ msgstr "" "OpenSSL : %s\n" "Moteurs : %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "AVERTISSEMENT : Votre bibliothèque SSL/TLS ne supporte pas TLS v1.3.\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "AVERTISSEMENT : Compilé avec LibreSSL, ce n'est pas une configuration supportée.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "ERREUR: Compilé avec LibreSSL, ceci enfreint le copyright en vertu de l'absence de l'exception dans la clause 2b du GPL. Consultez COPYING. Abandon.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "AVERTISSEMENT : Compilé sans SSL/TLS.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "L'option « nodetach » est active. L'option « logfile » est ignorée.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Ne fonctionne pas en mode démon. L'option « logfile » est ignorée.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Le fichier journal « %s » n'existe pas. L'option « logfile » est ignorée.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Le fichier journal « %s » n'est pas accessible en écriture. Abandon.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "Les options « syslog » et « logfile » sont toutes les deux spécifiées. « syslog » est ignoré et le journal est écrit dans %s" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Lecture des options sur la ligne de commande %s%s\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " et " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Pas de serveur de courrier paramétré -- %s est peut-être manquant ?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: aucun serveur de courrier n'a été spécifié.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: aucun autre fetchmail est en cours d'exécution\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: erreur en terminant fetchmail %s (%ld); abandon.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "en tâche de fond" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "au premier plan" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: fetchmail %s (%ld) terminé.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: impossible de vérifier le courrier lorsqu'un autre fetchmail est exécuté sur le même hôte\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: impossible de récupérer le courrier si un autre fetchmail est exécuté avec le pid %ld.\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: un autre fetchmail, au premier plan, s'exécute avec le pid %ld.\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: les options ne sont pas disponibles lorsque fetchmail fonctionne en tâche de fond.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: fetchmail en tâche de fond (%ld) a été réactivé.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: processus fils plus ancien (%ld) terminé mystérieusement.\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: ne trouve pas de mot de passe pour %s@%s.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Entrez le mot de passe pour %s@%s : " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: impossible de détacher en tâche de fond. Terminé.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "démarrage de fetchmail %s en tâche de fond\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "impossible d'ouvrir %s pour y ajouter les messages\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "--check mode activé, aucun mail téléchargé\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "impossible de lire l'horodatage de %s (erreur %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "redémarrage de fetchmail (%s a changé)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "la tentative de réexécution peut échouer car le répertoire n'a pas été recréé\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "la tentative d'exécuter à nouveau fetchmail a échoué\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "réception de %s ignorée (échec d'authentification ou dépassement de délai)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "intervalle non atteint, pas de requête vers %s\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "État de la requête=0 (SUCCES)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "État de la requête=1 (PAS DE MAIL)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "État de la requête=2 (SOCKET)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "État de la requête=3 (ÉCHEC DE L'AUTHENTIFICATION)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "État de la requête=4 (PROTOCOLE)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "État de la requête=5 (SYNTAXE)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "État de la requête=6 (ERREUR E/S)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "État de la requête=7 (ERREUR)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "État de la requête=8 (EXCLU)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "État de la requête=9 (verrou déjà pris)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "État de la requête=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "État de la requête=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "État de la requête=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "État de la requête=13 (NOMBRE MAXIMUM DE MESSAGES ATTEINT)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "État de la requête=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Toutes les connexions sont établies. Terminé.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "mise en sommeil à %s pour %d secondes\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "réveillé par %s\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "réveillé par un signal %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "réveillé à %s\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "fin normale, état %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "impossible de contrôler le temps du fichier run-control\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Attention : plusieurs mentions de l'hôte %s dans le fichier de configuration\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "fetchmail: Erreur: plusieurs blocs «defaults» dans le fichier de configuration, ou « defaults » n'est pas le premier enregistrement.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "Le support de SSL n'a pas été activé à la compilation.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "Le support de KERBEROS v4 est configuré, mais pas activé à la compilation.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "Le support de KERBEROS v5 est configuré, mais pas activé à la compilation.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Le support de GSSAPI est configuré, mais pas activé à la compilation.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: attention: aucun DNS disponible pour vérifier les réceptions « multidrop » depuis %s\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "attention: des réceptions « multidrop » depuis %s exigent l'option « envelope » !\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "attention: N'attendez pas d'aide du support si tous les mails sont expédiés au postmaster !\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: configuration de %s non valide, le service requiert un numéro de port positif\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: configuration de %s non valide, RPOP requiert un port privilégié\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "Avertissement: configuration de %s non valide, vous avez normalement besoin de --ssl pour le port 995/service pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "Avertissement: configuration de %s non valide, vous avez normalement besoin du port 995/service pop3s pour --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "Avertissement: configuration de %s non valide, vous avez normalement besoin de --ssl pour le port 993/service imaps.\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "Avertissement: configuration de %s non valide, vous avez normalement besoin du port 993/service imaps pour --ssl.\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "configuration de %s non valide, LMTP ne peut utiliser le port SMTP par défaut\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Utiliser « fetchall » et « keep » ensemble en mode démon ou mode « idle » (inactif) est une erreur !\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: Erreur : le mode « idle » (inactif) ne fonctionne pas avec plusieurs dossiers ou comptes !\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "terminé par un signal %d\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s interroge %s (protocole %s) à %s : récupération en cours\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "Le support de POP2 n'est pas configuré.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "Le support de POP3 n'est pas configuré.\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "Le support d'IMAP n'est pas configuré.\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "Le support d'ETRN n'est pas configuré.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "Le support de ODMR n'est pas configuré.\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "protocole sélectionné non supporté.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s interroge %s (protocole %s) à %s : interrogation finie\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "L'intervalle entre les réceptions est de %d secondes\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Le fichier de traces est %s\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Le fichier des identificateurs est %s\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Les messages de progression sont enregistrés via syslog\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail va se dissimuler et ne générer aucun « Received »\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail affichera des points de progression, même dans le journal\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail réexpédiera les messages « multidrop » mal aiguillés vers %s.\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail expédiera les erreurs de messagerie au postmaster.\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail expédiera les erreurs de messagerie à l'envoyeur\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail traitera les erreurs permanentes comme permanentes (perd les messages).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail traitera les erreurs permanentes comme temporaires (garde les messages).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Options pour la réception depuis %s@%s :\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Le courrier sera reçu via %s\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " La réception depuis ce serveur s'opérera à chaque (%d) intervalle.\n" msgstr[1] " La réception depuis ce serveur s'opérera tous les %d intervalles.\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Le vrai nom du serveur est %s.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Cet hôte ne sera pas interrogé lorsqu'aucun hôte n'est spécifié.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Cet hôte sera interrogé lorsqu'aucun hôte n'est spécifié.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Le mot de passe sera requis.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " Secret APOP = « %s ».\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " Identification RPOP = « %s ».\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Mot de passe = « %s ».\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Le protocole est KPOP avec authentification Kerberos %s" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Le protocole est %s" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (utilisation du service %s)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (utilisation du port par défaut)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (force l'usage des UIDL)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Toutes les méthodes d'authentification vont être essayées.\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr "Authentification par mot de passe forcée.\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr "L'authentification MSN forcée.\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr "L'authentification NTLM forcée.\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " Authentification OTP forcée.\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " L'authentification CRAM-MD5 va être forcée.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " Authentification GSSAPI forcée.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Authentification de Kerberos V4 forcée.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Authentification de Kerberos V5 forcée.\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " chiffrement « End-to-end » pris en charge.\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Le principal service de mail est: %s\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " Les sessions SSL chiffrées sont supportées.\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " Protocole SSL: %s\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " Activation de la vérification des certificats SSL du serveur.\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " Désactivation de la vérification des certificats SSL du serveur.\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Fichier de certificat SSL sûr par défaut: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Fichier de certificat SSL sûr: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " Répertoire des certificats SSL sûrs par défaut: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Répertoire des certificats SSL sûrs: %s\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr "Nom commun SSL du serveur: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Signature de la clé SSL (vérifié via le serveur de clés): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Le délai d'attente d'une réponse du serveur est de %d secondes" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (par défaut).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " La boîte aux lettres par défaut est sélectionnée.\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Les boîtes aux lettres sélectionnées sont :" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Tous les messages seront reçus (--all on).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Seulement les nouveaux messages seront reçus (--all off).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Tout message récupéré sera conservé sur le serveur (--keep on).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Tout message récupéré ne sera pas conservé sur le serveur (--keep off).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Tout ancien message sera éliminé avant relève du courrier (--flush on).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Tout ancien message ne sera pas éliminé avant relève du courrier (--flush off).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Tout message trop grand sera éliminé avant relève du courrier (--limitflush on).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Tout message trop grand ne sera pas éliminé avant relève du courrier (--limitflush off).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " La ré-écriture des adresses locales est activée (--norewrite off).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " La ré-écriture des adresses locales est désactivée (--norewrite on).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " La suppression des retour-chariots est activé (stripcr on).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " La suppression des retour-chariots est désactivée (stripcr off).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Le forçage des retour-chariots est activé (forcecr on).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Le forçage des retour-chariots est désactivé (forcecr off).\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " L'interprétation des « Content-Transfer-Encoding » est désactivée (pass8bits on).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " L'interprétation des « Content-Transfer-Encoding » est activée (pass8bits off).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " Le décodage MIME est activé (mimedecode on).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " Le décodage MIME est désactivé (mimedecode off).\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " L'inactivité après la réception est activée (idle on).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " L'inactivité après la réception est désactivée (idle off).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Les lignes « Status » non vides seront ignorées (dropstatus on).\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Les lignes « Status » non vides seront conservées (dropstatus off).\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Les lignes « Delivered-To » non vides seront ignorées (dropdelivered on).\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Les lignes « Delivered-To » non vides seront conservées (dropdelivered off).\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " La taille des messages est limitée à %d octets (--limit %d).\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " La taille des messages n'est pas limitée (--limit 0).\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Alertes sur la taille des messages toutes les %d secondes (--warnings %d).\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Alertes sur la taille des messages à chaque réception (--warnings 0).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Le nombre de messages reçus est limité à %d (--fetchlimit %d).\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Le nombre de messages reçus n'est pas limité (--fetchlimit 0).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " La limite de taille de récupération de messages est %d (--fetchsizelimit %d)\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Aucune limite de taille de récupération de messages (--fetchsizelimit 0)\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Effectue la recherche binaire des UIDs à chaque sondage (--fastuidl 1).\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Effectue la recherche binaire des UIDs durant %d sondages sur %d (--fastuidl %d).\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Effectue la recherche linéaire des UIDs à chaque sondage (--fastuidl 0).\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Le nombre de messages expédiés est limité à %d.\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Le nombre de messages expédiés n'est pas limité (--batchlimit 0).\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Purge à chaque fois que %d messages ont été éliminés (--expunge %d).\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Aucune purge forcée n'aura lieu (--expunge 0).\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Domaines pour lesquels le mail est récupéré :" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (par défaut)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Les messages seront ajoutés après %s en tant que BSMTP\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Les messages seront acheminés avec « %s ».\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Les messages seront réexpédiés via %cMTP vers :" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Le nom de la machine sur la ligne « MAIL FROM » sera %s\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " L'adresse placée après la commande SMTP « RCPT TO » sera %s\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Les réponses du serveur reconnaissant des blocs de « spam » sont :" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Le blocage du « spam » est désactivé\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " La connexion au serveur sera initiée avec « %s ».\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Aucune commande de pré-connexion définie.\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " La connexion au serveur sera terminée avec « %s ».\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Aucune commande de post-connexion définie.\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Aucun nom local déclaré pour cet hôte.\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Mode « multi-drop »: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Mode « single-drop »: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d nom local reconnu.\n" msgstr[1] "%d noms locaux reconnus.\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " La requête DNS des adresses « multidrop » est activée.\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " La requête DNS des adresses « multidrop » est désactivée.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Les alias du serveur seront comparés avec les adresses « multidrop » par leurs adresses IP.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Les alias du serveur seront comparés avec les adresses « multidrop » par leurs noms.\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Le routage vers l'adresse d'enveloppe est désactivé\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " L'en-tête d'enveloppe est pris comme étant : %s\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Numéro de l'en-tête d'enveloppe devant être traité : %d\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Le préfixe %s sera soustrait des id d'utilisateur\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Aucun préfixe ne sera soustrait\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Alias pré-déclarés du serveur de courrier :" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Domaines locaux :" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " La connexion se fera via l'interface %s.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Aucun choix d'interface n'a été spécifié.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " La boucle de réception observera %s.\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Aucune interface à observer n'a été spécifiée.\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Connexions au serveur au travers du « plugin » %s (--plugin %s).\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Aucune commande de « plugin » n'a été spécifiée.\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Connexions au client au travers du « plugout » %s (--plugout %s).\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Aucune commande de « plugout » n'a été spécifiée.\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Aucun UID n'a été enregistré sur cet hôte.\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UID enregistrés.\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Information de traçage de la réception ajoutée aux en-têtes « Received ».\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Aucun ajout d'information de traçage de la réception aux en-têtes « Received ».\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Les messages avec un en-tête corrompu seront rejetés.\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Les messages avec un en-tête corrompu seront transmis.\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Propriétés du passage « %s ».\n" @@ -1750,127 +1775,160 @@ msgstr "Erreur de libération des références d'identification\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: mise en sommeil du thread pour %d secondes.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protocole identifié comme étant IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protocole identifié comme étant IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protocole identifié comme étant IMAP2 ou IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "attendra après la réception\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Réception de la réponse BYE du serveur IMAP: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "nombre de messages erroné dans « %s » !" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "nombre de EXPUNGE erroné dans « %s » !" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protocole identifié comme étant IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "liste des capacités mises à jour trouvée\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protocole identifié comme étant IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "le serveur n'a pas annoncé l'extension SASL-IR mais l'implémentation de fetchmail l'exige pour AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protocole identifié comme étant IMAP2 ou IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: la configuration exige TLS mais STARTTLS n'est pas permis à cause de l'état de l'authentification (PREAUTH). Abandon de la connexion. Si votre greffon est sûr, vous pouvez contourner STARTTLS avec --sslproto '' (consultez le manuel).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "attendra après la réception\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: la configuration exige TLS mais STARTTLS n'est pas permis à cause de l'état de l'authentification (PREAUTH). Abandon de la connexion. Si le serveur le permet, essayez --ssl à la place (consultez le manuel).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: passage au TLS réussi.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: passage au TLS raté.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: échec de la négociation TLS mais on continue quand-même\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: AVERTISSEMENT : le serveur a offert STARTTLS mais sslproto '' a été fourni.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: --auth externe demandé mais le serveur ne l'annonce pas.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "La fonctionnalité OTP requise n'est pas compilée dans fetchmail\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "La fonctionnalité NTLM requise n'est pas compilée dans fetchmail.\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: --auth avec mot de passe demandé mais le serveur l'interdit (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: nous avons épuisé toutes les techniques d'authentification et ne pouvons réaliser la connexion.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "pas de concordance de la purge des messages (%d effectifs != %d attendus)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu n'est pas vu\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u n'est pas vu\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "échec durant la re-réception\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d message en attente après la re-réception\n" msgstr[1] "%d messages en attente après la re-réception\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "échec de la sélection de la boîte aux lettres\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "%d message en attente après la première réception\n" msgstr[1] "%d messages en attente après la première réception\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "échec de la purge\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "%d message en attente après la purge\n" msgstr[1] "%d messages en attente après la purge\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "échec de la recherche des messages non-vus\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u est le premier a n'avoir pas été vu\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Avertissement : des données farfelues retournées par le serveur pour la taille des messages sont ignorées.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Réponse FETCH incorrecte: %s.\n" @@ -1975,51 +2033,56 @@ msgstr "impossible de décoder la réponse BASE64 « ready »\n" msgid "challenge mismatch\n" msgstr "non coïncidence du challenge\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: échec de lecture du fichier verrou « %s »: %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: suppression de l'ancien fichier verrou « %s »\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "fetchmail: échec de la suppression du fichier verrou « %s » (%s), tentative d'écrire dedans\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: échec de l'écriture dans le fichier verrou « %s » (%s), arrêt\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: échec d'ouverture du fichier verrou « %s »: %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: impossible de créer le verrou, fichier pid « %s »: %s\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: impossible de supprimer ou tronquer le fichier pid « %s »: %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: attention: « %s » rencontré avant tout nom d'hôte\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: attention: le composant « %s » est inconnu\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: échec de lecture du fichier (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Attention: challenge mal formé reçu pour « AUTH(ENTICATE) NTLM » !\n" @@ -2066,19 +2129,19 @@ msgstr "Erreur ODMR inconnue « %s »\n" msgid "receiving message data\n" msgstr "lecture des données du message\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "L'option --keep n'est pas supportée avec ODMR\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "L'option --flush n'est pas supportée avec ODMR\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "L'option --folder n'est pas supportée avec ODMR\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "L'option --check n'est pas supportée avec ODMR\n" @@ -2090,7 +2153,7 @@ msgstr "erreur fatale de recv serveur\n" msgid "Could not decode OTP challenge\n" msgstr "Impossible de décoder le challenge OTP\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Mot de passe secret : " @@ -2426,83 +2489,83 @@ msgstr "POP2 ne supporte pas STLS. J'abandonne.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 ne supporte que l'authentification par mot de passe. J'abandonne.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Avertissement: découverte d'un « Maillennium POP3 », la commande RETR est utilisé au lieu de TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "TLS est requis pour cette session mais le serveur refuse la commande CAPA.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "STLS est requis pour cette session mais le serveur refuse la commande CAPA.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "La commande CAPA est absolument nécessaire pour le TLS.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "La commande CAPA est absolument nécessaire pour le STLS.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: échec du passage en TLS mais on continue quand-même.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: AVERTISSEMENT : le serveur a offert STLS mais sslproto '' a été fourni.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Nous avons épuisé toutes les techniques d'authentification permises et ne pouvons continuer.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "L'horodatage APOP requis est absent du message d'invitation\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Erreur de syntaxe dans l'horodatage du message d'invitation\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "L'horodatage APOP n'est pas valable.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Requête de protocole non définie dans POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "Fichier verrou en service. Y a-t-il une autre session active ?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Ne peux pas manier la réponse UIDL du serveur.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Serveur a répondu avec l'UID d'un mauvais message.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) a été effacé mais est toujours présent !\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Messages insérés dans une liste du serveur. Impossible de gérer ça.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "erreur de protocole\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "erreur de protocole durant la réception des UIDL\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) a été effacé mais est toujours présent !\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "L'option --folder n'est pas supportée avec POP3\n" @@ -2545,11 +2608,11 @@ msgstr "Le fichier %s doit avoir au plus les permissions -rwx------ (0700)\n" msgid "File %s must be owned by you.\n" msgstr "Le fichier %s doit vous appartenir.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Erreur système inconnue" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (message de trace incomplet)\n" @@ -2920,80 +2983,85 @@ msgstr "Authentification ESMTP LOGIN ...\n" msgid "smtp listener protocol error\n" msgstr "erreur de protocole avec le serveur smtp\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: échec de malloc\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: le greffon pour l'hôte %s avec le service %s est vide, impossible de l'exécuter !\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: échec de socketpair\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: échec de fork\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "échec de dup2\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "exécution de %s (machine %s, service %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "échec de execvp(%s)\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "échec de getaddrinfo(\"%s\",\"%s\") : %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Essayez d'ajouter l'option --service (voir aussi FAQ R12).\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "inconnu (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Essai de connexion avec %s/%s..." -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "la connexion ne peut pas être créée : %s\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "nom %d: impossible de créer une connexion de la famille %d type %d: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "échec de connexion.\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "Échec de connexion avec %s:%s [%s/%s] : %s.\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "nom %d: échec de connexion avec %s:%s [%s/%s] : %s.\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "connecté.\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -3002,229 +3070,244 @@ msgstr "" "Erreur de connexion pour cette récupération:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL a rapporté : %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "Profondeur de la routine d'appel de vérification SSL %d : preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Profondeur de la routine d'appel de vérification SSL %d : verify_ok == %d, err = %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Certificat du serveur:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Chaîne de certification, depuis la racine jusqu'au correspondant, débutant à la profondeur %d:\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "Certificat à la profondeur %d:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Organisation de l'expéditeur: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Avertissement: le nom de l'organisation de l'expéditeur est trop long (et peut être tronqué).\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Organisation inconnue\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Nom commun de l'émetteur : %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Avertissement: le nom de l'expéditeur est trop long (et peut être tronqué).\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Nom commun de l'expéditeur inconnu\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "Nom commun du sujet: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Certificat erroné: Sujet nom commun trop long !\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Certificat erroné: Sujet nom commun contient un NUL, abandon !\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Nom Alternatif du Sujet : %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Certificat erroné : Nom alternatif du sujet contient un NUL, abandon !\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Pas de concordance du nom commun du serveur: %s != %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Le nom du serveur n'est pas spécifié, impossible de vérifier le certificat !\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Nom commun du serveur inconnu\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Le nom du serveur n'est pas présent dans le certificat !\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "échec de EVP_md5()\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Plus de mémoire !\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "Le tampon résumé est trop court !\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "signature de la clé %s : %s\n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "La signature %s correspond.\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "La signature %s ne correspond pas !\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Erreur de vérification du certificat du serveur : %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Chaîne de certification rompue à : %s\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "Ceci peut signifier que le serveur n'a pas fourni le ou les certificat(s) intermédiaire(s). Il n'y a rien que fetchmail puisse faire à cela. Pour plus de détails, consultez le document README.SSL-SERVER fourni avec fetchmail.\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Certificat approuvé manquant : %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "Ceci pourrait signifier que le certificat de signature du CA racine n'est pas dans la liste des certificats des CA de confiance ou que c_rehash doit être exécuté sur le répertoire des certificats. Pour plus de détails, consultez la documentation de --sslcertpath et --sslcertfile dans la page du manuel. Consultez README.SSL pour plus d'informations.\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Votre version de OpenSSL ne supporte pas SSLv3.\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Votre version de OpenSSL ne supporte pas TLS v1.1.\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Votre version de OpenSSL ne supporte pas TLS v1.2.\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Votre version de OpenSSL ne supporte pas TLS v1.3.\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "Le protocole SSL « %s » spécifié est invalide, on utilise l'auto sélection par défaut (auto).\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "La bibliothèque wolfSSL %#lx utilisée est plus vieille que l'en-tête %#lx, impossible de travailler.\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "La bibliothèque OpenSSL %#lx utilisée est plus vieille que l'en-tête %#lx, impossible de travailler.\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "La bibliothèque OpenSSL %#lx utilisée est plus récente que l'en-tête %#lx, on essaie de continuer.\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Descripteur de fichier inaccessible pour SSL" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Notez que certaines distributions désactivent les anciennes versions des protocoles de manières étranges et non standard. Essayez un protocole d'une version plus récente.\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Impossible de charger les emplacements de vérification (fichier=\"%s\", rép=\"%s\"), erreur %d :\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Avertissement : SSL_set_tlsext_host_name(%p, \"%s\") a échoué (code %#lx), on essaie de continuer.\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail : sock %d: wolfSSL_check_domain_name(%#p, \"%s\") a retourné %d, on essaie de continuer\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Avertissement : X509_VERIFY_PARAM_set1_host(%p, \"%s\") a échoué (code %#x), on essaie de continuer.\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Le serveur a terminé la connexion prématurément pendant SSL_connect().\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Erreur système pendant SSL_connect() : %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "l'échange a échoué au niveau du protocole ou de la connexion." -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Impossible d'obtenir le chiffrement SSL/TLS actuel – pas de session établie ?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS : utilisation du protocole %s, chiffrement %s, %d/%d bits dans le secret/traité\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "La vérification du certificat ou de la signature n'a pas été faite !\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Attention: la connexion n'est pas sûre mais on continue quand même (il vaut mieux utiliser --sslcertck !).\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Nouvel essai de lecture sur la socket Cygwin\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Le nouvel essai de lecture sur la socket Cygwin a échoué !\n" @@ -3415,6 +3498,9 @@ msgstr "échec de malloc\n" msgid "realloc failed\n" msgstr "échec de realloc\n" +#~ msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" +#~ msgstr "AVERTISSEMENT : Compilé avec LibreSSL, ce n'est pas une configuration supportée.\n" + #~ msgid "Required LOGIN capability not supported by server\n" #~ msgstr "La fonction LOGIN requise n'est pas supportée par le serveur\n" @@ -2,15 +2,15 @@ # Copyright (C) 2005-2013 Eric S. Raymond # Copyright (C) 2020 Free Software Foundation, Inc. # This file is distributed under the same license as the fetchmail package. -# Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>, 2005-2013, 2019, 2020, 2021. +# Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>, 2005-2013, 2019, 2020, 2021, 2022, 2023. # based on the work by Jumpei Baba <jbaba@wb3.so-net.ne.jp>, 2002 # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.16-rc1\n" +"Project-Id-Version: fetchmail 6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-02-09 22:26+0900\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-06 23:08+0900\n" "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" "Language: ja\n" @@ -19,9 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2.1\n" -"X-Poedit-Basepath: fetchmail-6.4.13.rc1\n" -"X-Poedit-SearchPath-0: .\n" +"X-Generator: Poedit 2.4.2\n" #: checkalias.c:174 #, c-format @@ -157,41 +155,41 @@ msgid "fetchlimit %d reached; %d message left on server %s account %s\n" msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "最大取り込み数である %d 通に達しました; メッセージが %d 通、サーバ %s にアカウント %s 宛で残されています。\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "%d 秒間サーバ %s の接続応答を待ちましたが制限時間を超過しました。\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "%d 秒間サーバ %s の応答を待ちましたが制限時間を超過しました。\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "%d 秒間 %s の応答を待ちましたが制限時間を超過しました。\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "転送先のプログラムの応答を %d 秒間待ちましたが制限時間を超過しました。\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "%d 秒間待機しましたが制限時間を超過しました。\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail 実行中に制限時間の超過が繰り返し発生しました" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmail 実行中に %d 回以上、%s@%s 宛に届いたメール受信を試みましたが、その度に制限時間を超過しました。\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -207,73 +205,73 @@ msgstr "" "再起動しない限り fetchmail はこのメールボックスより\n" "メールを取り出しませんので注意して下さい。\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "サーバへの接続開始前に実行したコマンドがシグナル %d で終了しました\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "サーバへの接続開始前に実行したコマンドがステータス %d を返して終了しました。\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "%s にあるべき HESIOD pobox がありません。\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Lead server の名前がありません。\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "%s の 公式 DNS 名(%s)を検索できませんでした: %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "%s プロトコルを利用した %s への接続に失敗しました" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "SSL による接続に失敗しました。\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "アカウント %s@%s が Lock-busy 状態です。\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "%s@%s のサーバが busy 状態です。\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "%s@%s%s の認証に失敗しました\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (以前は認証されました)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "これについてのヘルプは http://www.fetchmail.info/fetchmail-FAQ.html#R15 を見てください\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "fetchmail 実行中 %s@%s の認証に失敗" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail 実行中に %s@%s 宛に届いたメールを取り出せませんでした。\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -286,7 +284,7 @@ msgstr "" "他の要因によるものであると思われますが、何故 login に失敗したのか\n" "サーバから有益な情報が送信されていないため、fetchmail では判断しかねます。" -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -305,7 +303,7 @@ msgstr "" "fetchmail デーモンは引続き接続を試みます。\n" "サービスが復旧しない限り何も通知が出されないことを了承願います。" -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -323,174 +321,179 @@ msgstr "" "fetchmail デーモンは引続き接続を試みます。\n" "サービスが復旧しない限り何も通知が出されないことを了承願います。" -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "すぐに %s@%s 宛メッセージの再取得を試みます\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "%s@%s でソケット または TLS のエラーです\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" -msgstr "%s@%s に対する不明なログイン又は認証のエラーです。\n" +msgstr "%s@%s に対する不明なログイン又は認証のエラーです\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "%s@%s に対する認証が行われました。\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "fetchmail %s@%s 認証完了" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "%s@%s のログインが完了し fetchmail によるアクセスが可能となりました。\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "サービスが復帰しました。\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "選択をして下さい。選択されない場合はフォルダ %s に再度アクセスします。\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "選択をして下さい。選択されない場合はデフォルトのフォルダに再度アクセスします。\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "アカウント %s , サーバ %s (フォルダ %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "アカウント %s , サーバ %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "%s にアクセスしています。\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d 通のメッセージ (そのうち %d 通は %s) が%s宛に届いています" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "既に読み込んでいます" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d 通のメッセージが %s 宛に届いています" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d バイト)\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "%s 宛にメッセージは届いていません。\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "メッセージ数が偽造されています!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "多くのメールがスキップされました(%d > %d) %s による一時的なエラーのためです\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "socket" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "RFC822 ヘッダの欠落か誤謬" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "クライアント/サーバ同期" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "クライアント/サーバプロトコル" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "サーバの lock busy" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "SMTP 通信" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "DNS 参照" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "不明なエラー" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "%sエラーが発生しました。%s@%sからメールを受信し SMTP サーバ %s へ送信しているところでした。\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "(不明なホスト)" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "%sエラーが %s@%s よりメールを受信している最中に発生しました。\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "接続終了後に実行したコマンドがシグナル %d で終了しました\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "接続終了後に実行するコマンドがステータス %d を返しました。\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Kerberos V4 には対応しておりません。\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Kerberos V5 には対応しておりません。\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "オプション --flush と %s は同時に設定できません。\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "オプション --all と %s は同時に設定できません。\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "オプション --limit と %s は同時に設定できません。\n" @@ -610,19 +613,19 @@ msgstr "ETRN のパラメータが誤っています。\n" msgid "Unknown ETRN error %d\n" msgstr "不明な ETRN のエラーです (%d)\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "オプション --keep は ETRN とは同時に利用できません。\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "オプション --flush は ETRN とは同時に利用できません。\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "オプション --folder は ETRN とは同時に利用できません。\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "オプション --check は ETRN とは同時に利用できません。\n" @@ -663,12 +666,12 @@ msgstr "fetchmail: 次の物を援用しています。" msgid "could not get current working directory\n" msgstr "カレントディレクトリを取得できません\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "fetchmail リリース %s " -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -677,7 +680,7 @@ msgstr "" "コンパイルに使用された SSL ライブラリー %#lx \"%s\"\n" "実行時に使用する SSL ライブラリー %#lx \"%s\"\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -687,937 +690,959 @@ msgstr "" "エンジン: %s\n" "\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "警告: 使用中の SSL/TLS ライブラリーは TLS v1.3 をサポートしていません。\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "警告: LibreSSLを使用してコンパイルされています。サポートされた構成ではありません。\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "エラー: LibreSSL を使うようコンパイルされていますが、これは GPL の 条文2b 例外を欠いており、著作権の侵害になってしまいます。 COPYING ファイルを参照してください。中断します。\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "警告: SSL/TLS なしでコンパイルされています。\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "nodetach オプションが有効ですので、logfile オプションを無視します。\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "デーモンモードではありませんので、logfile オプションを無視します。\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "ログファイル \"%s\" が存在しませんので logfile オプションを無視します。\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "ログファイル \"%s\" には書き込みできません、中止します。\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "syslog と logfile オプションが両方とも設定されているので syslog を無視し、%s にログを書き込みます" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "コマンドライン%s%sよりオプションを設定します。\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " 及び " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "メールサーバの準備が整いません -- おそらく %s が存在しないためです\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: メールサーバが指定されておりません。\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: 他の fetchmail は実行されていません。\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: エラーの発生により%s fetchmail (PID=%ld) を終了します。\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "バックグラウンドの" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "フォアグラウンドの" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s fetchmail (PID=%ld) を終了しました。\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: 同じホストに対して別の fetchmail が交信しているためメールの確認が出来ません。\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: 他の fetchmail (PID=%ld) が実行中のため指定されたホストと接続できません。\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: 他の fetchmail (PID=%ld) がフォアグラウンド動作中です。\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: バックグラウンドで fetchmail が動作中のためオプションが受け付けられません。\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: バックグラウンドの fetchmail (PID=%ld) が動作を再開しました。\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: 同時に動作していた fetchmail (PID=%ld) が突然消滅しました。\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: %s@%s にログインするためのパスワードがありません。\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "%s@%s にログインするためのパスワードを入力して下さい : " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: バックグラウンドに移れません。終了します。\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "fetchmail %s デーモンを動作開始します\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "ログを追加するために %s を開くことが出来ませんでした\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "--check モードが有効なので、メールを取り込みません\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "%s の編集された時間を調べることができません。(エラー %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "%s が編集されたため fetchmail を再起動します。\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "ディレクトリが回復できないので、再実行は失敗するでしょう。\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "fetchmail の再起動に失敗しました。\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "認証失敗か制限時間超過が頻発したため %s との交信を飛ばします。\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "時間間隔に達していないので %s の一時保管を行いません。\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Query status=0 (SUCCESS)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Query status=1 (NOMAIL)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Query status=2 (SOCKET)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Query status=3 (AUTHFAIL)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Query status=4 (PROTOCOL)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Query status=5 (SYNTAX)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Query status=6 (IOERR)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Query status=7 (ERROR)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Query status=8 (EXCLUDE)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Query status=9 (LOCKBUSY)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Query status=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Query status=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Query status=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Query status=13 (MAXFETCH)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Query status=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "全ての接続が動作不全に陥ってしまいました。終了します。\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "%s から %d秒休眠状態になります。\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "%s 信号を受信したため動作を再開しました。\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "%d 番の信号を受信したため動作を再開しました。\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "%s に動作を再開しました。\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "通常の終了です。status %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "動作制御ファイルの編集時間を確認することができませんでした。\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "警告 : 設定ファイル中にホスト %s を複数回記述しています\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "fetchmail: エラー : 設定ファイル中に \"defaults\" を複数回記述しているか、\"defaults\" が最初のレコードではありません。\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "SSL 対応がコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "KERBEROS v4 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "KERBEROS v5 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "GSSAPI 対応が設定されていますがコンパイルの時点で有効にされておりません。\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: 警告 : %s より multidrop fetch を確認するための DNS が有効でありません。\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "警告: %s へのマルチドロップを行うにはエンベロープオプションが必要です!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "警告: すべてのメールが postmaster 宛にフォワードされてしまう可能性があります!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: サーバ %s の設定が無効です。サービス番号、ポート番号は負の数ではいけません。\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: サーバ %s の設定が無効です。 RPOP では privileged port を利用する必要があります。\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "警告: %s 設定が無効です。通常、ポート995の POP3Sサービスには --ssl が必要です。\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "警告: %s 設定が無効です。通常、--ssl にはポート995の POP3Sサービスが必要です。\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "警告: %s 設定が無効です。通常、ポート993の IMAPSサービスには --ssl が必要です。\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "" +"警告: %s 設定が無効です。通常、--ssl にはポート993の IMAPSサービスが必要です。\n" +"\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "サーバ %s の設定が無効です。LMTP はデフォルトの SMTP ポートを利用できません。\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "fetchall と keep オプションはデーモンモード、休止モードでは同時に指定できません。\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: エラー: アイドルモードは複数のフォルダまたはアカウントに対しては動作しません!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "シグナル %d で終了しました。\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s は %s とプロトコル %s を用いて %s に交信しています。交信が開始されました。\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "POP2 に対応した設定が行われておりません。\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "POP3 に対応した設定が行われておりません。\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "IMAP に対応した設定が行われておりません。\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "ETRN に対応した設定が行われておりません。\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "ODMR に対応した設定が行われておりません。\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "対応していないプロトコルが選択されました。\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s は %s とプロトコル %s を用いて %s に交信しています。交信が終了しました。\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "交信間隔は %d 秒です。\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "ログファイルは %s です。\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "ID ファイルは %s です。\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "進行状況のメッセージは syslog を通して記録されます。\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail はアドレスを書き換え、Received を生成しません。\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail はログファイル中にも進行状況を示す . を書き込みます。\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail は誤った宛先の書かれたメッセージを %s に転送します。\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail は postmaster 宛にエラーメールを送信します。\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail は送り主にエラーメッセージを送信します。\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail は恒久的なエラーを恒久的なものとして扱います（メッセージを破棄）。\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail は恒久的なエラーを一時的なものとして扱います（メッセージを保存）。\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "アカウント %s@%s でのオプションです。\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " メールはホスト %s を介してやりとりされます。\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " このサーバに対してのアクセスは %d の間隔で行われます。\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " サーバの本名は %s です。\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " このホストはホストが指示されない場合にはアクセスされません。\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " このホストはホストが指示されない場合にアクセスされます。\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " パスワード入力が必要です。\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " APOP secret = \"%s\".\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP id = \"%s\".\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " パスワード = \"%s\"\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Kerberos %s 認証による KPOP プロトコルを利用します" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " %s プロトコルを利用します" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (%s サービスを利用します)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (デフォルトのポートを利用します)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (UIDL の利用を強制します)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " 利用可能な全ての認証方式を試みます。\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " パスワードによる認証を強制的に行います。\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " MSN 認証を強制的に行います。\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " NTLM 認証を強制的に行います。\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " OTP による認証を強制的に行います。\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " CRAM-MD5 方式による認証を強制的に行います。\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " GSSAPI 方式による認証を強制的に行います。\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Kerberos V4 方式による認証を強制的に行います。\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Kerberos V5 方式による認証を強制的に行います。\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " End-to-end 暗号化であるとします。\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " メールサービスは %s によって行われます。\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " SSL による暗号化通信が行われます。\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " SSL プロトコル %s。\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " SSL サーバ証明書の確認が設定されました。\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " SSL サーバ証明書の確認を無効にしました。\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " SSL が信頼する既定の証明書ファイル: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " SSL 信頼する証明書はファイル %s に格納されています。\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " SSL が信頼する既定の証明書ディレクトリー: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " SSL 信用可能証明書は %s に格納されています。\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " SSLサーバの CommonName: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " SSL key fingerprint (server key と照合されました): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " サーバの応答制限時間は %d 秒です" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (デフォルト)。\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " デフォルトのメールボックスが選択されました。\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " 選択されたメールボックス:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " すべてのメッセージを取得します。 (--all on)\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " 新しいメッセージだけを取得します。 (--all off)\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " 取得したメッセージをサーバにも保持します。 (--keep on)\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " 取得したメッセージはサーバに保持しません (--keep off)\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " 古いメッセージは取得の前に消去されます。 (--flush on)\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " メッセージ取得の前に古いメッセージを消去しません。 (--flush off)\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " 容量超過したメッセージは取得の前に消去されます。 (--limitflush on)\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " メッセージ取得の前に容量超過したメッセージを消去しません。 (--limitflush off)\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " server-local アドレスへの書き換えを行います。 (--norewrite off)\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " server-local アドレスへの書き換えを行いません。 (--norewrite on)\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " 改行記号の除去を行います。 (stripcr on)\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " 改行記号の除去を行いません。 (stripcr off)\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " 改行記号の追加を行います。 (forcecr on)\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " 改行記号の追加を行いません。 (forcecr off)\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Content-Transfer-Encoding の変換を行いません。 (pass8bits on)\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Content-Transfer-Encoding の変換を行います。 (pass8bits off)\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME のデコードを行います。 (mimedecode on)\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME のデコードを行いません。 (mimedecode off)\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " サーバアクセス後、休止します。 (idle on)\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " サーバアクセス後、休止しません。 (idle off)\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " 記述のある Status 行を破棄します。 (dropstatus on)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " 記述のある Status 行を保持します。 (dropstatus off)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Delivered-To 行を保持します。 (dropdelivered on)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Delivered-To 行を破棄します。 (dropdelivered off)\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " メッセージの大きさの最大 %d バイトに制限されます。 (--limit %d)\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " メッセージの大きさに制限はありません。 (--limit 0)\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " メッセージの大きさに対する警告は %d 秒毎に行われます。 (--warnings %d)\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " サーバアクセスの度にメッセージの大きさの警告を行います。 (--warnings 0)\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " 一回の接続で取得できるメッセージは %d 通に制限されます。(--fetchlimit %d)\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " 一回の接続で取得できるメッセージの数に制限はありません。 (--fetchlimit 0)\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " 取得できるメッセージのサイズは %d に制限されます。(--fetchsizelimit %d)\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " メッセージの大きさに制限はありません。 (--fetchsizelimit 0)\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr "接続ごとに UID の二分木検索を行います。(--fastuidl 1)\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " %d 回 (%d 接続のうち) UID の二分木検索を行います。(--fastuidl %d)\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr "接続ごとに UID の線形検索を行います。(--fastuidl 0)\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " 一回の接続で転送できるメッセージは %d 通に制限されます。\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " 一回の接続で転送できるメッセージの数に制限はありません。 (--batchlimit 0)\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " メッセージは %d 通毎に削除されます。 (--expunge %d)\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " メッセージを削除する間隔は設定されていません。 (--expunge 0)\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " メールを取得するドメインは :" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (デフォルト)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " ファイル %s に BSMTP 形式でメッセージが追記されます。\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " アプリケーション\"%s\"によってメッセージが送信されます。\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " 受信したメッセージは %cMTP によって次に示すサーバへ転送されます :" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " ホストの MAIL FROM 行のアドレスは %s です。\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " SMTP によって配信される RCPT TO 行に記されたアドレスは %s です。\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " 送信先のスパムブロックに対する応答は :" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " スパムブロックは行われません。\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " サーバとの接続は\"%s\"によって行われます。\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " 接続前に実行する命令はありません。\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " サーバとの接続は\"%s\"によって切断されます。\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " 接続終了時に行う命令はありません。\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " このホストに対する localname は宣言されていません。\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " `multi-drop' モード: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " `single-drop' モード: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d 個の localname が存在します。\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " multidrop アドレスを検索する DNS が有効です。\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " multidrop アドレスを検索する DNS が無効です。\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " サーバの別名は multidrop アドレスと IP アドレスで比較されます。\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " サーバの別名は multidrop アドレスとホスト名で比較されます。\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Envelope-address によるルーティングは行われません。\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Envelope header は %s とされます。\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " %d 個を超える Envelope header はスキップされます。\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Prefix %s はユーザ ID から除去されます。\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Prefix は除去されません。\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " 予め宣言されたメールサーバの別名:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " ローカルドメイン:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " 接続はインターフェイス %s を通して行われます。\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " 接続に利用すべきインターフェイスの指定はありません。\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " 接続は %s の状態を監視して行われます。\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " 状態を監視して接続はおこないません。\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " サーバとの接続にはプラグイン \"%s\" を利用します。(--plugin %s)\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " サーバとの接続に利用するプラグインの指定はありません。\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " アプリケーションとの接続にはプラグアウト\"%s\"を利用します。(--plugout %s)\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " アプリケーションとの接続に利用するプラグアウトの指定はありません。\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " このホストからの UID は記録されていません。\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d 個の UID が記録されています。\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " 接続情報は Received ヘッダに追加されます。\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Poll 追跡情報は Received ヘッダに追加されません。\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " 不良ヘッダを持つメッセージを拒否します。\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " 不良ヘッダを持つメッセージを受け入れます。\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " プロパティ \"%s\" は無視されます。\n" @@ -1732,124 +1757,157 @@ msgstr "証明書の発行エラーです。\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: スレッドは %d 秒間スリープします。\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "プロトコルは IMAP4 rev 1 と認識されました。\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "プロトコルは IMAP4 rev 0 と認識されました。\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "プロトコルは IMAP2 又は IMAP2BIS と認識されました。\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "接続の後、休止します。\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "IMAP サーバから BYE 応答を受け取りました: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "\"%s\" 内でメッセージ数が偽造されています!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "\"%s\" 内でEXPUNGEの数が偽造されています!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "プロトコルは IMAP4 rev 1 と認識されました。\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "更新された機能一覧が見つかりました\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "プロトコルは IMAP4 rev 0 と認識されました。\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "サーバーの SASL-IR拡張の有無が不明ですが、fetchmail の実装でAUTHENTICATE EXTERNALを使用するならば必要になります\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "プロトコルは IMAP2 又は IMAP2BIS と認識されました。\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: この設定では TLS が必要ですが、認証の状況(PREAUTH)からSTARTTLS の使用は許可されていません。 接続を中断します。 あなたのプラグインが安全ならば、--sslproto '' を使ってSTARTTLSを無効にすることができます。(マニュアル参照)。\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "接続の後、休止します。\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: この設定では TLS が必要ですが、認証の状況(PREAUTH)からSTARTTLS の使用は許可されていません。 接続を中断します。 代わる手段としてサーバーで--ssl が使えるか試してみてください。(マニュアル参照)。\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: TLS へのアップグレードに成功。\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: TLS へのアップグレードに失敗。\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: 警告: サーバーが STARTTLS を提案しましたが sslproto '' が提示されました。\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: --auth external が要求されましたがサーバーで利用できません.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "OTP が要求されましたが、fetchmail が OTP 対応でコンパイルされていません。\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "要求された NTLM 処理能力は fetchmail に組み込まれていません。\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: --auth password が要求されましたがサーバーが使用を禁じています。(LOGINDISABLED)\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: 可能な認証手段をすべて試みましたが、ログインできません。\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "メッセージの削除数が合いません (%d (実際) != %d (予想)) \n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu は未読です。\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u は未読です。\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "再アクセスに失敗しました。\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d 通のメッセージが再アクセスの後に存在します。\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "メールボックスの選択に失敗しました\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "最初のアクセスから %d 通のメッセージがあります。\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "削除に失敗しました。\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "削除の後、%d 通のメッセージが残っています。\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "未読メッセージの検索に失敗しました。\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u は最初の未読メッセージです。\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "警告: サーバからメッセージサイズとして報告された数値が不適切だったので無視します。\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "正しくないFETCH応答が返ってきました: %s\n" @@ -1954,51 +2012,56 @@ msgstr "BASE64 レディ応答をデコードできませんでした\n" msgid "challenge mismatch\n" msgstr "challenge の不一致です。\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: ロックファイル \"%s\" の読み込みに失敗しました。: %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: 古いロックファイル \"%s\" を削除します。\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "fetchmail: ロックファイル \"%s\" を unlink できません。: （%s）、書き込んでみます\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: ロックファイル \"%s\" への書き込みに失敗しました。(%s)、 終了します。\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: ロックファイル \"%s\" を開けません。: %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: ロックファイルの生成に失敗しました。PIDファイル \"%s\": %s\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: PIDファイル \"%s\" の削除または切り詰めができませんでした。: %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: 警告: ホスト名の前に \"%s\" を検知しました。\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: 警告: 不明なトークン \"%s\"\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: ファイル (%s) の読み込みに失敗しました。\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "警告: \"AUTH(ENTICATE) NTLM\" に対し、偽造された試行を受信しました!\n" @@ -2045,19 +2108,19 @@ msgstr "不明な ODMR のエラー \"%s\" です。\n" msgid "receiving message data\n" msgstr "メッセージを受信しています\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "オプション --keep は ODMR では対応しておりません。\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "オプション --flush は ODMR では対応しておりません。\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "オプション --folder は ODMR では対応しておりません。\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "オプション --check は ODMR では対応しておりません。\n" @@ -2069,7 +2132,7 @@ msgstr "server recv fatal\n" msgid "Could not decode OTP challenge\n" msgstr "OTP challenge のデコードが出来ませんでした。\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Secret pass phrase: " @@ -2404,83 +2467,83 @@ msgstr "POP2 は STLS をサポートしません。断念します。\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 はパスワードによる認証のみサポートします。断念します。\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "警告: \"Maillennium POP3\"サーバです。TOP の代わりに RETR コマンドを使用します。\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "このセッションには TLS が必要ですが、サーバが CAPA コマンドを拒否しました。\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "このセッションには STLS が必要ですが、サーバが CAPA コマンドを拒否しました。\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "CAPA コマンドは TLS では必須です。\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "しかしながら、CAPA コマンドは STLS では必須です。\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: TLS への適合的アップグレードに失敗、継続可能か試しています。\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: 警告: サーバーが STLS を提案しましたが sslproto '' が提示されました。\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "使用を許可されたすべての認証手段を試みましたが、すべて失敗しました。実行を継続できません。\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "greeting 中に APOP タイムスタンプが存在しません。\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "greeting 中の タイムスタンプが不正です。\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "無効な APOP タイムスタンプです。\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "POP3_auth 中で定義されていないプロトコルが要求されました。\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "lock busy 状態です。別の交信が行われていないか確認して下さい。\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "上流サーバからの UIDL 応答に対応できません。\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "サーバが誤ったメッセージの UID に応答しました。\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) は削除されましたが、まだ存在しています!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "サーバリストにメッセージが挿入されています。取り扱うことができません。\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "プロトコルエラーです。\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "UIDL を取り込み中にプロトコルエラーが発生しました\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) は削除されましたが、まだ存在しています!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "POP3 では --folder オプションは利用できません。\n" @@ -2523,11 +2586,11 @@ msgstr "ファイル %s のパーミッションは -rwx------ (0700) でない msgid "File %s must be owned by you.\n" msgstr "%s の所有者は貴方自身である必要があります。\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "不明なシステムエラーです" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (ログメッセージが不完全です)\n" @@ -2898,80 +2961,85 @@ msgstr "ESMTP で LOGIN 認証をします...\n" msgid "smtp listener protocol error\n" msgstr "SMTP リスナでプロトコルエラーが発生しました\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc ができませんでした。\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: %s の サービス %s のプラグインが空で、実行できません!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair に失敗しました。\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: fork できませんでした。\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 ができませんでした。\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "%s を実行中です。(ホスト %s サービス %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) ができませんでした。\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "getaddrinfo(\"%s\",\"%s\") エラー: %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "オプション --service を足して試してください(FAQ の R12 も参照のこと)。\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "不明 (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "%s/%s へ接続しようとしています..." -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "ソケット %s を作成できません\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "名前 %d: ソケットファミリー %d タイプ %d を作成できません: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "接続に失敗しました。\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "%s:%s への接続に失敗しました。バッファ [%s/%s] : %s\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "名前 %d: %s:%s [%s/%s] への接続を開けません: %s\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "接続しました。\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2980,233 +3048,248 @@ msgstr "" "今回の問い合わせで接続エラーが発生しました:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL からの報告: %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "SSL の検証コールバック深度 %d: preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "SSL の検証コールバック深度 %d: verify_ok == %d, err = %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "サーバ証明書:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "root から peer への証明パスで深さ %d で始まっています\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "深さ%d での証明書:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "発行元の組織: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "警告 : 発行元の組織名が長過ぎます。(捏造された可能性があります)\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "不明な組織です。\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "発行元の CommonName: %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "警告 : 発行元の CommonName が長過ぎます。 (捏造された可能性があります)\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "不明な発行元の CommonName です。\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "Subject CommonName: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "不正証明書 : Subject CommonName が長過ぎます。\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "不正証明書 : Subject CommonName が NUL を含んでいます。中止します。\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "サブジェクトの別名: %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "不正証明書 : サブジェクトの別名 が NUL を含んでいます。中止します。\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "サーバの CommonName が一致しません : %s != %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "サーバ名が設定されておらず、証明書を検証できません。\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "不明なサーバの CommonName です。\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "証明書中にサーバ名が指定されていません。\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() ができませんでした。\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "メモリ不足です。\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "ダイジェストテキストバッファが少な過ぎます。\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "%s の key fingerprint は次の通りです。: %s \n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "%s の fingerprints が一致しました。\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s の fingerprints が一致しませんでした。\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "サーバ証明書検証エラー: %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "証明パスが %s で壊れています\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "このエラーは、サーバが中間CAの証明書を提供しなかったことを意味し、fetchmail はどうすることもできません。詳しくは fetchmail に同梱されているドキュメント README.SSL-SERVER を参照してください。\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "トラストアンカー証明書がありません: %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "これは、root CA が署名した証明書が 信頼される CA 証明書の保管場所にないか、証明書のあるディレクトリで c_rehash を走らせる必要があることを示しています。詳しくは、マニュアルページの --sslcertpath と --sslcertfile についての記述を参照してください。README.SSL も必要に応じて参照してください。\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "" "使用中の OpenSSL バージョンは SSL v3 をサポートしていません。\n" "\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "" "使用中の OpenSSL バージョンは TLS v1.1 をサポートしていません。\n" "\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "使用中の OpenSSL バージョンは TLS v1.2 をサポートしていません。\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "使用中の OpenSSL バージョンは TLS v1.3 をサポートしていません。\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "無効な SSL プロトコル `%s' が指定されたため、デフォルトの自動選択 (auto)を利用します。\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "読み込んだ wolfSSL ライブラリ %#lx はヘッダーの %#lx より古く、動作しません。\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "読み込んだ OpenSSL ライブラリ %#lx はヘッダーの %#lx より古く、動作しません。\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "読み込んだ OpenSSL ライブラリ %#lx はヘッダーの %#lx より新しいので、続けます。\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "ファイル識別子が SSL としては長過ぎます" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "古いプロトコルバージョンを、おかしな方法で無効にするディストリビューションもあります。新しいプロトコルバージョンを試してください。\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "検証箇所を読み込めません (file=\"%s\", dir=\"%s\"), error %d:\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "警告: SSL_set_tlsext_host_name(%p, \"%s\") が失敗しました (code %#lx), 続けます。\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") が %d を返しました, 続けます。\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "警告: X509_VERIFY_PARAM_set1_host(%p, \"%s\") が失敗しました (code %#x), 続けます。\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "サーバーが SSL_connect() での接続を 確立する前に切断しました。\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "SSL_connect() の実行中にシステムエラーが発生 : %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "ハンドシェイクがプロトコルレベルまたはコネクションレベルで失敗しました。" -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "現在の SSL/TLS 暗号を取得することができません - セッションが確立されていない?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: プロトコル %s 暗号 %s を使用中、 %d/%d 秘密/処理済み ビット数\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "証明書/fingerprint 検証が幾つか飛ばされました。\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "警告:接続は保護されていません、続けます。(--sslcertckの使用をお勧めします!)\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Cygwin ソケット読み込み リトライ\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Cygwin ソケット読み込み リトライ が失敗しました!\n" @@ -3397,6 +3480,9 @@ msgstr "malloc できませんでした。\n" msgid "realloc failed\n" msgstr "realloc できませんでした。\n" +#~ msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" +#~ msgstr "警告: LibreSSLを使用してコンパイルされています。サポートされた構成ではありません。\n" + #~ msgid "Required LOGIN capability not supported by server\n" #~ msgstr "要求された LOGIN 処理能力はサーバでサポートされていません。\n" @@ -2,15 +2,15 @@ # Copyright (C) 1998, 2002, 2003, 2005, 2009 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. # Paweł Krawczyk <kravietz@ceti.pl>, 1998-1999. -# Jakub Bogusz <qboosh@pld-linux.org>, 2002-2021. +# Jakub Bogusz <qboosh@pld-linux.org>, 2002-2023. # Thanks for few updates to Adam Gołębiowski, 2003. # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.16-rc1\n" +"Project-Id-Version: fetchmail 6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-01-30 19:15+0100\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-04 17:15+0100\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -160,41 +160,41 @@ msgstr[0] "limit pobranych listów %d osiągnięty: %d pozostał na serwerze %s msgstr[1] "limit pobranych listów %d osiągnięty: %d pozostały na serwerze %s na koncie %s\n" msgstr[2] "limit pobranych listów %d osiągnięty: %d pozostało na serwerze %s na koncie %s\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na połączenie z %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na serwer %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "limit czasu %d sekund przekroczony podczas oczekiwania na %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "przekroczony czas oczekiwania na odpowiedź po %d sekundach.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "przekroczony czas oczekiwania po %d sekundach.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail zgłasza wielokrotne przekroczenie czasu oczekiwania" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Po %d timeoutach fetchmail nie mógł pobrać poczty z %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -210,73 +210,73 @@ msgstr "" "\n" "Fetchmail nie będzie sprawdzał tej skrzynki do czasu restartu.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "polecenie do uruchomienia przed połączeniem zakończone sygnałem %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "polecenie do uruchomienia przed połączeniem wyszło z błędem %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "nie mogę znaleźć skrzynki HESIOD dla %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Serwer prowadzący nie ma nazwy.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "nie mogę znaleźć kanonicznej nazwy DNS %s (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "połączenie %s z %s nie powiodło się" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "połączenie SSL nie powiodło się.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Błąd blokady pliku dla %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Serwer zajęty dla %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Błąd autoryzacji dla %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (poprzednio zautoryzowano)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "Wskazówki można znaleźć pod http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "błąd uwierzytelnienia fetchmaila dla %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail nie mógł pobrać poczty z %s@%s.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -290,7 +290,7 @@ msgstr "" "którego fetchmail nie może rozróżnić, ponieważ serwer nie wysłał\n" "przydatnego komunikatu o błędzie." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -309,7 +309,7 @@ msgstr "" "Demon fetchmaila będzie nadal próbował się połączyć w każdym cyklu.\n" "Dalsze powiadomienia do czasu odzyskania usługi nie będą wysyłane." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -328,60 +328,65 @@ msgstr "" "Demon fetchmaila będzie nadal próbował się połączyć w każdym cyklu.\n" "Dalsze powiadomienia do czasu wznowienia usługi nie będą wysyłane." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Natychmiastowe ponowne ściąganie z %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Błąd gniazda lub TLS dla %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Nieznany login lub błąd uwierzytelniania dla %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Autoryzacja powiodła się dla %s@%s\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "uwierzytelnienie fetchmaila powiodło się dla %s@%s" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail mógł zalogować się na %s@%s.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Usługa została wznowiona.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "ponowna próba połączenia z folderem %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "ponowna próba połączenia z domyślnym folderem\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s na %s (folder %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s na %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Próba połączenia z %s\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" @@ -389,14 +394,14 @@ msgstr[0] "%d list (%d %s) dla %s" msgstr[1] "%d listy (%d %s) dla %s" msgstr[2] "%d listów (%d %s) dla %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "widziany" msgstr[1] "widziane" msgstr[2] "widzianych" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" @@ -404,104 +409,104 @@ msgstr[0] "%d list dla %s" msgstr[1] "%d listy dla %s" msgstr[2] "%d listów dla %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr "(%d bajtów).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Nie ma poczty dla %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "błędna liczba listów!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "Z powodu chwilowych błędów pominięto zbyt dużo listów (%d > %d) dla %s\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "gniazda" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "w nagłówkach RFC822 (brak lub błędne)" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "synchronizacji między serwerem i klientem" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "protokołu między serwerem i klientem" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "plik zablokowany na serwerze" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "transakcji SMTP" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "DNS-u" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "nieokreślony" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "błąd %s podczas pobierania z %s@%s i dostarczania po SMTP do %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "nieznany" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "błąd %s podczas pobierania listów z %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "polecenie wykonane po pobraniu poczty zakończone sygnałem %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "polecenie wykonane po pobraniu poczty zwróciło błąd %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Obsługa Kerberosa V4 nie została dołączona do programu.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Obsługa Kerberosa V5 nie została dołączona do programu.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Opcja --flush nie działa z %s\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Opcja --all nie działa za %s\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Opcja --limit nie działa z %s\n" @@ -623,19 +628,19 @@ msgstr "Błąd składniowy ETRN w parametrach\n" msgid "Unknown ETRN error %d\n" msgstr "Nieznany błąd ETRN %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Opcja --keep nie działa z ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Opcja --flush nie działa z ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Opcja --folder nie działa z ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Opcja --check nie działa z ETRN\n" @@ -676,12 +681,12 @@ msgstr "fetchmail: uruchomiony z" msgid "could not get current working directory\n" msgstr "nie można uzyskać bieżącego katalogu\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Tu fetchmail, wersja %s" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -690,7 +695,7 @@ msgstr "" "Skompilowano z biblioteką SSL %#lx \"%s\"\n" " Uruchomiono z biblioteką SSL %#lx \"%s\"\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -699,419 +704,439 @@ msgstr "" "OpenSSL: %s\n" "Silniki: %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "UWAGA: ta wersja biblioteki SSL/TLS nie obsługuje TLS v1.3.\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "UWAGA: skompilowano z LibreSSL, co nie jest obsługiwaną konfiguracją.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "BŁĄD: Skompilowano z LibreSSL, co jest naruszeniem praw autorskich ze względu na brak wyjątku od klauzuli 2b GPL. Więcej w COPYING. Przerwano.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "UWAGA: skompilowano bez SSL/TLS.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "Opcja nodetach jest aktywna, zignorowano opcję logfile.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Program nie działa w trybie demona, zignorowano opcję logfile.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Plik logu \"%s\" nie istnieje, zignorowano opcję logfile.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Plik logu \"%s\" nie można zapisywać, przerwano.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "Ustawiono jednocześnie opcje syslog i logfile; zignorowano syslog, logowanie do %s" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Pobieram opcje z linii poleceń%s%s\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " i " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Brak skonfigurowany serwerów pocztowych -- może brakuje %s?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: nie podano żadnych serwerów pocztowych.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: nie działa żaden inny proces fetchmaila\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: wystąpił błąd podczas próby zabicia %s fetchmaila, PID %ld; przerwano.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "działającego w tle" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "działającego na terminalu" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: zabito %s fetchmaila o numerze procesu %ld.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: nie mogę sprawdzić poczty, bo działa inny fetchmail do tego serwera\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: nie mogę połączyć się z podanymi hostami, bo działa inny fetchmail (proces %ld).\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: działa inny fetchmail uruchomiony na terminalu (proces %ld).\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: nie mogę przyjmować opcji, ponieważ inny fetchmail działa już w tle.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: działający w tle fetchmail (proces %ld) został uaktywniony.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: starszy proces %ld zginął w niewyjaśnionych okolicznościach.\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: nie można znaleźć hasła dla %s@%s.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Podaj hasło dla %s@%s: " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: Nie można przejść w tło. Zakończenie.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "uruchamianie fetchmaila %s w trybie demona\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "nie można otworzyć %s w celu dołączania logów\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "tryb --check włączony, nie pobieranie poczty\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "nie można sprawdzić czasu %s (błąd %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "restart fetchmaila (zmieniono %s)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "próba restartu może się nie udać, ponieważ katalog nie został odtworzony\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "próba ponownego uruchomienia fetchmaila nie powiodła się\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "połączenie z %s pominięte (błędy autoryzacji lub timeouty)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "fetchmail: nie nadszedł jeszcze czas na połączenie z %s\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Wynik zapytania=0 (SUKCES)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Wynik zapytania=1 (BRAK POCZTY)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Wynik zapytania=2 (GNIAZDO)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Wynik zapytania=3 (BŁĄD AUTORYZACJI)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Wynik zapytania=4 (PROTOKÓŁ)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Wynik zapytania=5 (SKŁADNIA)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Wynik zapytania=6 (BŁĄD IO)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Wynik zapytania=7 (BŁĄD)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Wynik zapytania=8 (WYŁĄCZENIE)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Wynik zapytania=9 (BLOKADA)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Wynik zapytania=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Wynik zapytania=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Wynik zapytania=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Wynik zapytania=13 (MAKSIMUM POBRANO)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Wynik zapytania=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Nie mogę pobrać poczty z żadnego serwera. Kończę pracę.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "usypiam o godzinie %s na %d sekund\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "uaktywniony przez %s\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "uaktywniony przez sygnał %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "uaktywniony o %s\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "praca zakończona poprawnie, kod wyjścia %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "nie można sprawdzić czasu pliku kontroli uruchomienia\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Uwaga: host %s występuje wielokrotnie w pliku konfiguracyjnym\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "fetchmail: Błąd: wiele rekordów \"defaults\" w pliku konfiguracyjnym lub \"defaults\" nie jest pierwszym rekordem.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "obsługa SSL nie została wkompilowana.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "obsługa KERBEROSA v4 jest skonfigurowana, ale nie została wkompilowana.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "obsługa KERBEROSA v5 jest skonfigurowana, ale nie została wkompilowana.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "obsługa GSSAPI jest skonfigurowana, ale nie została wkompilowana.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: uwaga: brak serwera DNS potrzebnego do sprawdzenia %s\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "uwaga: multidrop dla %s wymaga opcji envelope!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "uwaga: Nie proś o pomoc jeśli cała poczta pójdzie do postmastera!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: konfiguracja dla %s jest błędna - należy podać dodatni numer portu\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: konfiguracja dla %s jest błędna - RPOP wymaga uprzywilejowanego portu\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "UWAGA: konfiguracja dla %s jest błędna - zwykle trzeba podać --ssl dla portu 995/usługi pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "UWAGA: konfiguracja dla %s jest błędna - zwykle trzeba podać port 995/usługę pop3s dla --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "UWAGA: konfiguracja dla %s jest błędna - zwykle trzeba podać --ssl dla portu 993/usługi imaps.\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "UWAGA: konfiguracja dla %s jest błędna - zwykle trzeba podać port 993/usługę imaps dla --ssl.\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "konfiguracja dla %s jest błędna - LMTP nie używa domyślnego portu SMTP\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Jednoczesne fetchall i keep w trybie demona lub bezczynności to błąd!\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: Błąd: tryb bezczynny nie działa z wieloma skrzynkami lub kontami!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "przerwany sygnałem %d\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s łączy się z %s (protokół %s) o godzinie %s: odpytywanie rozpoczęte\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "obsługa protokołu POP2 nie została wkompilowana.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "obsługa protokołu POP3 nie została wkompilowana.\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "obsługa protokołu IMAP nie została wkompilowana.\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "obsługa polecenia ETRN nie została wkompilowana.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "obsługa protokołu ODMR nie została wkompilowana.\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "Wybrany protokół nie jest obsługiwany przez fetchmaila.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s łączy się z %s (protokół %s) o godzinie %s: odpytywanie zakończone\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Czas między sprawdzaniem skrzynek wynosi %d sekund\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Plik diagnostyczny to %s\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Plik identyfikacyjny to %s\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Komunikaty o postępach połączenia będą zgłaszane przez sysloga\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail będzie się ukrywał i nie wygeneruje nagłówka Received\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail będzie pokazywał znaki postępu nawet w plikach logów.\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail wyśle źle zaadresowane listy do %s.\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail przekieruje pocztę z błędami do postmastera.\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail przekieruje pocztę z błędami do nadawcy.\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail będzie traktował trwałe błędy jako trwałe (usunie listy).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail będzie traktował trwałe błędy jako tymczasowe (zachowa listy).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Parametry pobierania poczty ze skrzynki %s@%s:\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Poczta będzie pobierana przez %s\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" @@ -1119,406 +1144,406 @@ msgstr[0] " Połączenie z tym serwerem odbędzie się co %d okres.\n" msgstr[1] " Połączenie z tym serwerem odbędzie się co %d okresy.\n" msgstr[2] " Połączenie z tym serwerem odbędzie się co %d okresów.\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Prawdziwa nazwa serwera to %s.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Z tym serwerem nie będę się łączył jeśli nie zostanie podany żaden inny serwer.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Z tym serwerem będę się łączył jeśli nie zostanie podany żaden inny serwer.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Będę pytał o hasło.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " Hasło APOP = \"%s\".\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " Użytkownik RPOP = \"%s\".\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Hasło = \"%s\".\n" # %s zawiera numer wersji protokołu -PK -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Używam protokołu KPOP z uwierzytelnieniem przez Kerberos %s" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Używam protokołu %s" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (usługa %s)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (połączenie na domyślny port)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (będą stosowane UIDL)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Będą próbowane wszystkie dostępne metody uwierzytelnienia.\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie przy pomocy hasła.\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie MSN.\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie NTLM.\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie OTP.\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie CRAM-MD5.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie GSSAPI.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie Kerberos V4.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Zostanie wymuszone uwierzytelnienie Kerberos V5.\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Zakładam szyfrowanie end-to-end.\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Zarządcą usługi pocztowej jest: %s\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " Sesje kodowane SSL włączone.\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " Protokół SSL: %s.\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " Sprawdzanie certyfikatu SSL serwera włączone.\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " Sprawdzanie certyfikatu SSL serwera wyłączone.\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Plik domyślnego zaufanego certyfikatu SSL: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Plik zaufanego certyfikatu SSL: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " Katalog domyślnego zaufanego certyfikatu SSL: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Katalog zaufanego certyfikatu SSL: %s\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " CommonName serwera SSL: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Odcisk klucza SSL (sprawdzony z kluczem serwera): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Limit czasu na odpowiedź serwera wynosi %d sekund" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (domyślne).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Wybrana jest domyślna skrzynka odbiorcza.\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Wybrano następujące skrzynki:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Zostaną pobrane wszystkie listy (--all włączone).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Zostaną pobrane tylko nowe listy (--all wyłączone).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Pobrane listy będą pozostawione na serwerze (--keep włączone).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Pobrane listy nie będą pozostawione na serwerze (--keep wyłączone).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Stare listy będą kasowane przed pobraniem poczty (--flush włączone).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Stare listy nie będą kasowane przed pobraniem poczty (--flush wyłączone).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Zbyt duże listy będą kasowane przed pobraniem poczty (--limitflush włączone).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Zbyt duże listy nie będą kasowane przed pobraniem poczty (--limitflush wyłączone).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Przepisywanie adresów na postać lokalną jest włączone (--norewrite wyłączone).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Przepisywanie adresów na postać lokalną jest wyłączone (--norewrite włączone).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Usuwanie znaków CR z końców linii jest włączone (stripcr włączone).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Usuwanie znaków CR z końców linii jest wyłączone (stripcr wyłączone).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Dodawanie znaków CR na końcach linii jest włączone (forcecr włączone).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Dodawanie znaków CR na końcach linii jest wyłączone (forcecr wyłączone).\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Interpretowanie nagłówka Content-Transfer-Encoding jest wyłączone (pass8bits włączone).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Interpretowanie nagłówka Content-Transfer-Encoding jest włączone (pass8bits wyłączone).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " Dekodowanie MIME jest włączone (mimedecode włączone).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " Dekodowanie MIME jest wyłączone (mimedecode wyłączone).\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Zwłoka po odpytaniu jest włączona (idle włączone).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " Zwłoka po odpytaniu jest wyłączona (idle wyłączone).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Niepuste nagłówki Status będą usuwane (dropstatus włączone).\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Niepuste nagłówki Status będą zachowane (dropstatus wyłączone).\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Linie Delivered-To będą usuwane (dropdelivered włączone).\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Linie Delivered-To będą zachowane (dropdelivered wyłączone).\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Limit wielkości listu wynosi %d bajtów (--limit %d).\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Limit wielkości listu nie jest ustawiony (--limit 0).\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Ostrzeżenia o wielkości listu będą wyświetlane co %d sekund (--warnings %d).\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Ostrzeżenia o wielkości będą wyświetlane przy każdym łączeniu (--warnings 0).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Limit liczby otrzymanych listów wynosi %d (--fetchlimit %d).\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Limit liczby otrzymanych listów nie jest ustawiony (--fetchlimit 0).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " Limit wielkości listu wynosi %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Limit wielkości listu nie jest ustawiony (--fetchsizelimit 0).\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Binarne przeszukiwanie UID-ów przy każdym ściąganiu (--fastuidl 1).\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Binarne przeszukiwanie UID-ów przy %d z %d ściągań (--fastuidl %d).\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Liniowe przeszukiwanie UID-ów przy każdym ściąganiu (--fastuidl 0).\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Listy będą wysyłane przez SMTP w grupach po %d.\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Limit ilości listów wysyłanych przez SMTP nie ustawiony (--batchlimit 0).\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Odstęp między kasowaniem listów wymuszony na %d (--expunge %d).\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Listy nie będą kasowane (--expunge 0).\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Domeny dla których poczta będzie ściągana to:" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (domyśny)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Listy będą dopisywane do %s jako BSMTP\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Listy będą lokalne doręczane przy użyciu \"%s\".\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Listy będą przesłane przy pomocy %cMTP do:" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Nazwa hosta w MAIL FROM jest ustawiona na %s\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Adresem do umieszczenia w liniach RCPT TO przekazanych SMTP będzie %s\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Rozpoznawane odpowiedzi blokad antyspamowych to:" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Blokowanie spamu wyłączone\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Połączenie do serwera zostanie nawiązane przy pomocy \"%s\".\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Przed połączeniem nie będzie wykonywane żadne dodatkowe polecenie.\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Połączenie z serwerem zostanie zamknięte przy pomocy \"%s\".\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Po zamknięciu połączenia nie będzie wykonywane żadne dodatkowe polecenie.\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Brak nazw lokalnych ustawionych dla tego hosta.\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Tryb wielu skrzynek: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Tryb jednej skrzynki: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" @@ -1526,115 +1551,115 @@ msgstr[0] "%d znana nazwa lokalna.\n" msgstr[1] "%d znane nazwy lokalne.\n" msgstr[2] "%d znanych nazw lokalnych.\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " Odpytywanie DNS dla adresów wieloskrzynkowych jest włączone.\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " Odpytywanie DNS dla adresów wieloskrzynkowych jest wyłączone.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Aliasy serwera będą porównywane z adresami skrzynek po adresie IP.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Aliasy serwera będą porównywane z adresami skrzynek po nazwie.\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Obsługa poczty według adresów w kopercie jest wyłączone\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Nagłówek koperty został ustawiony na: %s\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Liczba nagłówków koperty do pominięcia: %d\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Przedrostek %s będzie usuwany z nazwy użytkownika\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Żadne przedrostki nie będą usuwane\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Zadeklarowane aliasy serwera pocztowego:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Domeny lokalne:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Połączenia będą nawiązywane tylko przez interfejs %s.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Nie jest określony żaden obowiązkowy interfejs.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Podczas prób połączenia w pętli będzie monitorowany %s.\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Żaden interfejs nie będzie monitorowany.\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Połączenia z serwerem będą nawiązywane przez wtyczkę %s (--plugin %s).\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Nie jest skonfigurowane żadne polecenie nawiązujące połączenie\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Połączenie z serwerem odbiorcy zostanie nawiązane programem %s (--plugout %s).\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Nie jest skonfigurowane żadne polecenie zamykające połączenie.\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Żadne UID-y nie zostały zachowane z sesji z tym hostem.\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " Zachowano %d UID-ów.\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Informacje o śledzeniu połączenia będą dodane do nagłówka Received.\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Informacje o śledzeniu połączenia nie będą dodane do nagłówka Received.\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Listy z błędnymi nagłówkami będą odrzucane.\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Listy z błędnymi nagłówkami będą przepuszczane.\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Przepuszczane ustawienia \"%s\".\n" @@ -1749,85 +1774,118 @@ msgstr "Wystąpił błąd podczas zwalniania danych uwierzytelniających\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: usypiam na %d sekund.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protokół rozpoznany jako IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protokół rozpoznany jako IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protokół rozpoznany jako IMAP2 lub IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "przejdzie w stan bezczynności po odpytaniu\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Otrzymano odpowiedź BYE od serwera IMAP: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "błędna liczba listów w \"%s\"!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "błędna liczba EXPUNGE w \"%s\"!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protokół rozpoznany jako IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "znaleziono uaktualnioną listę metod\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protokół rozpoznany jako IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "serwer nie zgłosił rozszerzenia SASL-IR, ale implementacja fetchmaila wymaga go do AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protokół rozpoznany jako IMAP2 lub IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: konfiguracja wymaga TLS, ale STARTTLS nie jest dozwolone w stanie uwierzytelnienia (PREAUTH). Przerwanie połączenia. Jeśli wtyczka jest bezpieczna, można zniwelować STARTTLS przez --sslproto '' (p. podręcznik).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "przejdzie w stan bezczynności po odpytaniu\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: konfiguracja wymaga TLS, ale STARTTLS nie jest dozwolone w stanie uwierzytelnienia (PREAUTH). Przerwanie połączenia. Serwer zezwala, można spróbować --ssl (p. podręcznik).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: przejście na TLS powiodło się.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: przejście na TLS nie powiodło się.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: zgodne przejście na TLS nie powiodło się, próba kontynuacji\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: UWAGA: serwer zaoferował STARTTLS, ale podano sslproto ''.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: żądano --auth external, ale serwer nie zgłasza tej metody.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: żądano --auth password, ale serwer tego zabrania (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: wyczerpano sposoby uwierzytelnienia, nie można się zalogować.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "niezgodność przy usuwaniu poczty (faktyczna %d != oczekiwana %d)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu jest nieprzeczytany\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u jest nieprzeczytany\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "ponowne połączenie nie powiodło się\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" @@ -1835,11 +1893,11 @@ msgstr[0] "%d list oczekujący po ponownym pobraniu\n" msgstr[1] "%d listy oczekujące po ponownym pobraniu\n" msgstr[2] "%d listów oczekujących po ponownym pobraniu\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "wybór skrzynki zakończył się niepowodzeniem\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" @@ -1847,11 +1905,11 @@ msgstr[0] "%d list oczekujący po pierwszym pobraniu\n" msgstr[1] "%d listy oczekujące po pierwszym pobraniu\n" msgstr[2] "%d listów oczekujących po pierwszym pobraniu\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "usuwanie nie powiodło się\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" @@ -1859,20 +1917,20 @@ msgstr[0] "%d list oczekujący po usuwaniu\n" msgstr[1] "%d listy oczekujące po usuwaniu\n" msgstr[2] "%d listów oczekujących po usuwaniu\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "poszukiwanie nieprzeczytanych listów nie powiodło się\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u jest pierwszym nieprzeczytanym\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Uwaga: zignorowano nieprawdziwe dane o rozmiarze wiadomości zwrócone przez serwer.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Niepoprawna odpowiedź na FETCH: %s.\n" @@ -1979,51 +2037,56 @@ msgstr "odkodowanie odpowiedzi BASE64 jest niemożliwe\n" msgid "challenge mismatch\n" msgstr "niezgodność wyzwania\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: błąd podczas odczytu pliku blokady \"%s\": %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: usuwam nieważny plik blokady \"%s\"\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "fetchmail: nie można usunąć pliku blokady \"%s\" (%s), próba zapisu do niego\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: nie można pisać do pliku blokady \"%s\" (%s), zakończenie\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: błąd podczas otwierania pliku blokady \"%s\": %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: tworzenie blokady nie powiodło się, plik pid \"%s\": %s\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: nie można usunąć lub obciąć pliku pid \"%s\": %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: uwaga: przed każdą nazwą hosta występuje \"%s\"\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: uwaga: nieznany symbol \"%s\"\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: błąd podczas odczytu pliku (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Uwaga: odebrano źle sformułowane wyzwanie \"AUTH(ENTICATE) NTLM\"!\n" @@ -2070,19 +2133,19 @@ msgstr "Nieznany błąd ODMR \"%s\"\n" msgid "receiving message data\n" msgstr "odbieranie danych listu\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Opcja --keep nie działa z ODMR\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Opcja --flush nie działa z ODMR\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Opcja --folder nie działa z ODMR\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Opcja --check nie działa z ODMR\n" @@ -2094,7 +2157,7 @@ msgstr "recv z serwera nie powiodło się\n" msgid "Could not decode OTP challenge\n" msgstr "Rozkodowanie wyzwania OTP było niemożliwe\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Tajne hasło: " @@ -2427,83 +2490,83 @@ msgstr "POP2 nie obsługuje STLS. Poddaję się.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 obsługuje tylko uwierzytelnienie hasłem. Poddaję się.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Uwaga: Odkryto serwer \"Maillennium POP3\", użycie polecenia RETR zamiast TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "TLS jest wymagany dla tej sesji, ale serwer odrzucił polecenie CAPA.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "STLS jest wymagany dla tej sesji, ale serwer odrzucił polecenie CAPA.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Polecenie CAPA jest jednak niezbędne dla TLS.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Polecenie CAPA jest jednak niezbędne dla STLS.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: zgodne przejście na TLS nie powiodło się, próba kontynuacji.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: UWAGA: serwer oferował STLS, ale podano sslproto ''.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Wyczerpano dozwolone sposoby uwierzytelnienia, nie można kontynuować.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "W powitaniu serwera brakuje wymaganego znacznika czasu APOP\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Błąd składni znacznika czasu w powitaniu\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Błędny znacznik czasu APOP.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Prośba o nieznany protokół w POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Nie można obsłużyć odpowiedzi UIDL od serwera.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Serwer odpowiedział z UID-em dla niewłaściwego listu.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) został skasowany, ale nadal istnieje!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Przesyłki zostały dodane do listy na serwerze. Nie mogę tego obsłużyć.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "błąd protokołu\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "błąd protokołu podczas pobierania UIDL\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) został skasowany, ale nadal istnieje!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Opcja --folder nie działa z POP3\n" @@ -2546,11 +2609,11 @@ msgstr "Plik %s nie może mieć uprawnień większych niż -rwx------ (0700).\n" msgid "File %s must be owned by you.\n" msgstr "Plik %s musi być własnością użytkownika.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Nieznany błąd systemu" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (komunikat logu niekompletny)\n" @@ -2922,80 +2985,85 @@ msgstr "Uwierzytelnienie ESMTP LOGIN...\n" msgid "smtp listener protocol error\n" msgstr "błąd protokołu serwera smtp\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: błąd malloc\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: wtyczka dla hosta %s, usługi %s jest pusta, nie można jej uruchomić!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: błąd socketpair\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: błąd fork\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "błąd dup2\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "uruchamiam %s (host %s usługa %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "błąd execvp(%s)\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "błąd getaddrinfo(\"%s\",\"%s\"): %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Proszę spróbować dodać opcję --service (p. także punkt R12 FAQ).\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "nieznany (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Próba połączenia z %s/%s..." -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "nie można utworzyć gniazda: %s\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "nazwa %d: nie można utworzyć gniazda rodziny %d typu %d: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "połączenie nie powiodło się.\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "połączenie z %s:%s [%s/%s] nie powiodło się: %s.\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "nazwa %d: połączenie z %s:%s [%s/%s] nie powiodło się: %s.\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "połączono.\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -3004,229 +3072,244 @@ msgstr "" "Błędy połączeń w czasie tego ściągania:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL zgłosił: %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "Głębokość wywołania wstecznego weryfikacji SSL %d: preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Głębokość wywołania wstecznego weryfikacji SSL %d: verify_ok == %d, err = %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Certyfikat serwera:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Łańcuch certyfikatów od korzenia do serwera, począwszy od głębokości %d:\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "Certyfikat na głębokości %d:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Organizacja wystawcy: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Uwaga: nazwa Organizacji wystawcy za długa (prawdopodobnie ucięta).\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Nieznana organizacja\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "CommonName wystawcy: %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Uwaga: CommonName wystawcy za długie (prawdopodobnie ucięte).\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Nieznane CommonName wystawcy\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "CommonName podmiotu: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Błędny certyfikat: za długie CommonName podmiotu!\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Błędny certyfikat: CommonName podmiotu zawiera NUL, przerwano!\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Alternatywna nazwa podmiotu: %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Błędny certyfikat: alternatywna nazwa podmiotu zawiera NUL, przerwano!\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Niezgodność CommonName serwera: %s != %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Nazwa serwera nie ustawiona, nie można sprawdzić certyfikatu!\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Nieznane CommonName serwera\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Nazwa serwera nie podana w certyfikacie!\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "błąd EVP_md5()!\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Brak pamięci!\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "Bufor skrótu tekstu za mały!\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "Odcisk klucza %s: %s\n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "%s odcisków się zgadza.\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s odcisków się nie zgadza!\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Błąd weryfikacji certyfikatu serwera: %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Przerwany łańcuch certyfikatów przy: %s\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "Może to oznaczać, że serwer nie zapewnia certyfikatów CA pośrednich, z czym fetchmail nie jest w stanie nic zrobić. Szczegółowe informacje można znaleźć w dokumencie README.SSL-SERVER dostarczonym z fetchmailem.\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Brak certyfikatu początkowego zaufania: %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "Może to oznaczać, że certyfikat podpisujący początkowego CA nie znajduje się w zbiorze zaufanych certyfikatów CA, albo w katalogu certyfikatów trzeba uruchomić c_rehash. Szczegółowe informacje można znaleźć na stronie podręcznika dla opcji --sslcertpath i --sslcertfile oraz w pliku README.SSL.\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Ta wersja OpenSSL nie obsługuje SSLv3.\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Ta wersja OpenSSL nie obsługuje TLS v1.1.\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Ta wersja OpenSSL nie obsługuje TLS v1.2.\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Ta wersja OpenSSL nie obsługuje TLS v1.3.\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "Podano błędny protokół SSL '%s', użycie domyślnego automatycznego wyboru (auto).\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Załadowana biblioteka wolfSSL %#lx starsza niż nagłówki %#lx, odmowa działania.\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "Załadowana biblioteka OpenSSL %#lx starsza niż nagłówki %#lx, odmowa działania.\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "Załadowana biblioteka OpenSSL %#lx nowsza niż nagłówki %#lx, próba kontynuacji.\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Deskryptor pliku poza zakresem dla SSL" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Uwaga: niektóre dystrybucje wyłączają starsze wersje protokołów w niestandardowy sposób. Próba nowszej wersji protokołu.\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Nie można załadować lokalizacji weryfikacji (plik=\"%s\", katalog=\"%s\"), błąd %d:\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Uwaga: SSL_set_tlsext_host_name(%p, \"%s\") nie powiodło się (kod %#lx), próba kontynuacji.\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: gniazdo %d: wolfSSL_check_domain_name(%#p, \"%s\") zwróciło %d, próba kontynuacji\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Uwaga: X509_VERIFY_PARAM_set1_host(%p, \"%s\") nie powiodło się (kod %#x), próba kontynuacji.\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Serwer przedwcześnie zamknął połączenie podczas SSL_connect().\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Błąd systemowy podczas SSL_connect(): %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "powitanie nie powiodło się na poziomie protokołu lub połączenia." -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Nie można utrzymać obecnego szyfru SSL/TLS - nie nawiązano sesji?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: użycie protokołu %s, szyfr %s, %d/%d bitów tajnych/przetworzonych\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Weryfikacja certyfikatu/odcisku klucza z jakiegoś powodu pominięta!\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Uwaga: połączenie nie jest bezpieczne, kontynuacja mimo to (lepiej używać --sslcertck!)\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Powtórzenie odczytu z gniazda cygwinowego\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Powtórzenie odczytu z gniazda cygwinowego nie powiodło się!\n" @@ -1,28 +1,46 @@ # Romanian translation of fetchmail. -# Copyright (C) 2020 Eric S. Raymond (msgids) +# Copyright (C) 2020 - 2023 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. +# # Florentina Mușat <florentina.musat.28@gmail.com>, 2020. +# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2022-2023. +# +# Cronologia traducerii fișierului „fetchmail”: +# Traducera inițială, făcută de FM, pentru versiunea fetchmail 6.4.5-rc2. +# Actualizare a algoritmului formelor de plural (de la „trei-vechi” la „trei-nou”). +# NU și a mesajelor traduse (acestea au rămas neschimbate). +# Eliminare a mesajelor ce-au dispărut în ultima versiune. +# Actualizări realizate de Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 15.01.2022. +# Actualizare a algoritmului formelor de plural (de la „trei” la „patru”, experimental). +# Actualizare a traducerii pentru versiunea 6.4.25.rc1, făcută de R-GC, 2022. +# Actualizare a traducerii pentru versiunea 6.4.31, făcută de R-GC, 2022. +# Actualizare a traducerii pentru versiunea 6.4.35, făcută de R-GC, 2023. +# Actualizare a traducerii pentru versiunea Y, făcută de X, Z(anul). # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.5-rc2\n" +"Project-Id-Version: fetchmail 6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2020-05-04 12:30+0200\n" -"PO-Revision-Date: 2020-07-04 13:39+0300\n" -"Last-Translator: Florentina Mușat <florentina.musat.28@gmail.com>\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-04 18:48+0100\n" +"Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "Language: ro\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && n%100<=19) ? 1 : 2);\n" -"X-Generator: Poedit 2.3.1\n" +"Plural-Forms: nplurals=4; plural=((n==1) ? 0 : (n==2) ? 1 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 2 : 3);\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 3.2.2\n" +# R-GC, scrie: +# „node”, se referă la nodul de rețea, ce +# este reprezentat de-o adresă IP a unui +# dispozitiv hardware. Adică, o mașină. #: checkalias.c:174 #, c-format msgid "Checking if %s is really the same node as %s\n" -msgstr "Se verifică dacă %s este chiar același nod ca %s\n" +msgstr "Se verifică dacă %s și %s sunt într-adevăr aceeași mașină\n" #: checkalias.c:178 msgid "Yes, their IP addresses match\n" @@ -35,21 +53,21 @@ msgstr "Nu, adresele lor IP nu se potrivesc\n" #: checkalias.c:207 #, c-format msgid "nameserver failure while looking for '%s' during poll of %s: %s\n" -msgstr "eșec la serverul de nume în timpul căutării pentru „%s” în timpul sondării a %s: %s\n" +msgstr "serverul de nume a eșuat la rezolvarea numelui pentru „%s” în timpul sondajului %s: %s\n" #: checkalias.c:230 #, c-format msgid "nameserver failure while looking for `%s' during poll of %s.\n" -msgstr "eșec la serverul de nume în timpul căutării după „%s” în timpul sondării a %s.\n" +msgstr "serverul de nume a eșuat la rezolvarea numelui pentru „%s” în timpul sondajului %s.\n" #: cram.c:95 ntlmsubr.c:65 msgid "could not decode BASE64 challenge\n" -msgstr "nu s-a putut decoda provocarea BASE64\n" +msgstr "nu s-a putut decodifica provocarea BASE64\n" #: cram.c:103 #, c-format msgid "decoded as %s\n" -msgstr "decodat ca %s\n" +msgstr "decodificat ca %s\n" #: driver.c:199 #, c-format @@ -61,35 +79,81 @@ msgstr "eroare kerberos %s\n" msgid "krb5_sendauth: %s [server says '%s']\n" msgstr "krb5_sendauth: %s [serverul spune „%s”]\n" +# R-GC, scrie: +# mesajul, într-o versiune anterioară, era: +# msgid "Subject: Fetchmail oversized-messages warning" +# *** +# aici se putea deduce mai clar, că +# avertismentul este făcut de «fetchmail», +# care „sesizează” că, mesajele primite, sunt +# supradimensionate; și avizează asupra acestui lucru. +# *** +# Traducerea anterioară, făcută de către FM, era: +# „Avertisment de mesaje supradimensionate fetchmail”, care mi se +# pare cam ambiguă, utilizatorul poate să +# înțeleagă că: «mesajele (de avertisment +# ale) lui fetchmail sunt supradimensionate» +# *** +# Am „în mînecă”, o altă traducere, +# a aceluiași mesaj: +# „Fetchmail avertizează: mesaje supradimensionate” +# *** +# Opinii/Idei? +# După revizarea fișierului, DȘ, zice: +# „→ propunerea din comentariu este mai bună decât traducerea...” +# === +# modificare aplicată; textul dinainte: +# „Avertisment fetchmail: mesaje supradimensionate” #: driver.c:345 msgid "Fetchmail oversized-messages warning" -msgstr "Avertisment de mesaje supradimensionate fetchmail" +msgstr "Fetchmail avertizează: mesaje supradimensionate" #: driver.c:349 #, c-format msgid "The following oversized messages were deleted on server %s account %s:" -msgstr "Următoarele mesaje supradimensionate au fost șterse de pe serverul %s contul %s:" +msgstr "Următoarele mesaje supradimensionate au fost șterse de pe serverul %s, contul %s:" #: driver.c:353 #, c-format msgid "The following oversized messages remain on server %s account %s:" -msgstr "Următoarele mesaje supradimensionate rămân pe serverul %s contul %s:" - +msgstr "Următoarele mesaje supradimensionate rămân pe serverul %s, contul %s:" + +# R-GC, scrie: +# cred c-ar trebui modificată traducerea de la: +# „... lung de %d octeți ...”, la: +# „... lung de %d de octeți ...” +# datorită „teoriei probabilităților”, cîte +# probabilități sunt ca mesajul să fie mai scurt +# de 20 de octeți, și cîte, în comparativă, mai +# lungi de 20 de octeți? +# Valabil bineînțeles, și pentru mesajele +# următoare... (modificarea) +# *** +# Opinii/Idei? +# După revizarea fișierului, DȘ, zice: +# „→ cred că ar trebui lăsat fără „de” pentru că nu știm sigur câți sunt, +# așa că lăsăm mesajul generic” +# === +# am verificat că un email gol, doar cu un antet scurt, are dimensiunea mai mare de +# 300 de Octeți; motiv pentru care voi +# aplica modificările: „... +de octeți” #: driver.c:372 #, c-format msgid " %d message %d octets long deleted by fetchmail." msgid_plural " %d messages %d octets long deleted by fetchmail." -msgstr[0] " %d mesaj lung de %d octeți șters de fetchmail." -msgstr[1] " %d mesaje lungi de %d octeți șterse de fetchmail." -msgstr[2] " %d de mesaje lungi de %d octeți șterse de fetchmail." +msgstr[0] " un mesaj lung de %d de octeți șters de fetchmail." +msgstr[1] " două mesaje lungi de %d de octeți șterse de fetchmail." +msgstr[2] " %d mesaje lungi de %d de octeți șterse de fetchmail." +msgstr[3] " %d de mesaje lungi de %d de octeți șterse de fetchmail." #: driver.c:377 #, c-format msgid " %d message %d octets long skipped by fetchmail." msgid_plural " %d messages %d octets long skipped by fetchmail." -msgstr[0] " %d mesaj lung de %d octeți omis de fetchmail." -msgstr[1] " %d mesaje lungi de %d octeți omise de fetchmail." -msgstr[2] " %d de mesaje lungi de %d octeți omise de fetchmail." +msgstr[0] " un mesaj lung de %d de octeți omis de fetchmail." +msgstr[1] " două mesaje lungi de %d de octeți omise de fetchmail." +msgstr[2] " %d mesaje lungi de %d de octeți omise de fetchmail." +msgstr[3] " %d de mesaje lungi de %d de octeți omise de fetchmail." #: driver.c:522 #, c-format @@ -117,7 +181,7 @@ msgstr "nu s-au putut aduce antetele, mesajul %s@%s:%d (%d octeți)\n" #: driver.c:632 #, c-format msgid "reading message %s@%s:%d of %d" -msgstr "se citește mesajul %s@%s:%d of %d" +msgstr "se citește mesajul %s@%s:%d din %d" #: driver.c:637 #, c-format @@ -127,12 +191,12 @@ msgstr " (%d octeți)" #: driver.c:638 #, c-format msgid " (%d header octets)" -msgstr " (%d octeți de antet)" +msgstr " (%d de octeți în antetul mesajului)" #: driver.c:708 #, c-format msgid " (%d body octets)" -msgstr " (%d octeți de corp)" +msgstr " (%d de octeți în corpul mesajului)" #: driver.c:770 #, c-format @@ -151,49 +215,83 @@ msgstr " golit\n" msgid " not flushed\n" msgstr " negolit\n" +# R-GC, scrie: +# la traducerea formelor de singular, plural, +# de forma: „un mesaj”, respectiv „două +# mesaje”, Poedit s-a opus. +# . +# Bănuiesc c-ar fi unele diferențe în codul +# sursă între acest mesaj și celelalte unde a +# acceptat această formă de traducere... +# *** +# Nu știu dacă „left on”, nu ar fi trebuit +# tradus ca: „lăsat pe”, în loc de „rămas pe”. +# Este o diferență subtilă... #: driver.c:842 #, c-format msgid "fetchlimit %d reached; %d message left on server %s account %s\n" msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" -msgstr[0] "limita de aducere %d ajunsă; %d mesaj rămas pe serverul %s contul %s\n" -msgstr[1] "limita de aducere %d ajunsă; %d mesaje rămase pe serverul %s contul %s\n" -msgstr[2] "limita de aducere %d ajunsă; %d de mesaje rămase pe serverul %s contul %s\n" - -#: driver.c:899 +msgstr[0] "limita de aducere %d atinsă; %d mesaj rămas pe serverul %s contul %s\n" +msgstr[1] "limita de aducere %d atinsă; %d mesaje rămase pe serverul %s contul %s\n" +msgstr[2] "limita de aducere %d atinsă; %d mesaje rămase pe serverul %s contul %s\n" +msgstr[3] "limita de aducere %d atinsă; %d de mesaje rămase pe serverul %s contul %s\n" + +# R-Gc, scrie: +# cum traducerea inițială mi s-a părut neclară: +# „limită de timp după %d secunde așteptând să se conecteze la serverul %s.”, +# am modificat-o la: +# „după %d secunde, a expirat timpul de așteptare pentru conectarea la serverul %s.”, care transmite +# un mesaj clar, utilizatorului. +# *** +# am modificat de aceași formă, restul mesajelor +# pe „aceeași temă”. +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" -msgstr "limită de timp după %d secunde așteptând să se conecteze la serverul %s.\n" +msgstr "după %d secunde, a expirat timpul de așteptare pentru conectarea la serverul %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" -msgstr "limită de timp după %d secunde așteptând pentru serverul %s.\n" +msgstr "după %d secunde, a expirat timpul de așteptare pentru serverul %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" -msgstr "limită de timp după %d secunde așteptând pentru %s.\n" - -#: driver.c:912 +msgstr "după %d secunde, a expirat timpul de așteptare pentru %s.\n" + +# R-GC, scrie: +# nu-mi prea place cum sună fraza asta cu +# „ascultătorul”; am impresia că acest +# „ascultător”, este o funcție-demon a +# serverului fetchmail... +# Așa că, aș schimba fraza în: +# „... pentru ca demonul/serverul fetchmail să răspundă.” +# Notă: acesta nu este singurul mesaj din fișier +# unde apare termenul «listener», dar este +# primul în ordinea redactării fișierului. +# *** +# Opinii/Idei? +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" -msgstr "limită de timp după %d secunde așteptând pentru ca ascultătorul să răspundă.\n" +msgstr "după %d secunde, a expirat timpul de așteptare pentru ca ascultătorul să răspundă.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" -msgstr "limită de timp după %d secunde.\n" +msgstr "limită de timp atinsă, după %d secunde.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" -msgstr "fetchmail vede limitele de timp repetate" +msgstr "fetchmail notează repetate depășiri ale limitei de timp" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" -msgstr "Fetchmail a văzut mai multe de %d limite de timp în timp ce încerca să obțină mail de la %s@%s.\n" +msgstr "Fetchmail a notat mai mult de %d depășiri ale limitei de timp, în timp ce încerca să obțină mesaje de email de la %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -203,79 +301,79 @@ msgid "" "Fetchmail won't poll this mailbox again until you restart it.\n" msgstr "" "Aceasta poate să însemne că serverul de mail este blocat, sau că serverul\n" -"SMTP este înțepenit, sau că fișierul cutiei de mail de pe server a fost\n" -"coruptă de o eroare de server. Puteți rula „fetchmail -v -v” pentru a\n" +"SMTP este înțepenit, sau că fișierul căsuței de mail de pe server a fost\n" +"corupt de o eroare a serverului. Puteți rula «fetchmail -v -v» pentru a\n" "diagnostica problema.\n" "\n" -"Fetchmail nu va sonda această cutie de mail din nou până ce nu îl reporniți.\n" +"Fetchmail nu va sonda această căsuță de email din nou până ce nu îl reporniți.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "comandă de pre-conectare terminată cu semnalul %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "comanda de pre-conectare a eșuat cu starea %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" -msgstr "nu s-a putut găsi cutia po HESIOD pentru %s\n" +msgstr "nu s-a putut găsi căsuța poștală HESIOD pentru %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" -msgstr "Serverul de conducere nu are un nume.\n" +msgstr "Serverul principal nu are un nume.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "nu s-a putut găsi numele DNS canonic pentru %s (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "conexiunea %s la %s a eșuat" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "Conexiunea SSL a eșuat.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" -msgstr "Eroare de blocare ocupată pe %s@%s\n" +msgstr "Eroare de blocare-ocupat pe %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Eroare de server ocupat pe %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Eșec de autorizare pe %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (autorizat anterior)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "Pentru ajutor, consultați http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "autentificarea fetchmail a eșuat pe %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" -msgstr "Fetchmail nu a putut obține mail de la %s@%s.\n" +msgstr "Fetchmail nu a putut obține mesajele de email de la %s@%s.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -283,13 +381,13 @@ msgid "" "that fetchmail cannot distinguish because the server didn't send a useful\n" "error message." msgstr "" -"Încercarea de a obține autorizare a eșuat.\n" -"De vreme ce am reușit deja în obținerea autorizării pentru această\n" -"conexiune, este probabil un alt mod de eșuare (precum un server ocupat)\n" +"Încercarea de a obține autorizarea a eșuat.\n" +"Deoarece s-a reușit deja mai demult obținerea autorizării pentru această\n" +"conexiune, probabil există un alt motiv de eșuare (precum un server ocupat)\n" "pe care fetchmail nu îl poate distinge pentru că serverul nu a trimis un mesaj\n" "de eroare util." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -301,15 +399,15 @@ msgid "" "is restored." msgstr "" "\n" -"În orice caz, dacă AȚI schimbat detaliile contului de la pornirea\n" +"În orice caz, dacă AȚI schimbat detaliile contului după pornirea\n" "serviciului fetchmail, trebuie să opriți serviciul, să modificați configurarea\n" -"lui fetchmail, și apoi să reporniți serviciul.\n" +"lui fetchmail, și apoi să reporniți demonul.\n" "\n" "Serviciul fetchmail va continua să ruleze și să încerce să se conecteze\n" "la fiecare ciclu. Nu se vor trimite înștiințări viitoare până când serviciul\n" -"este restaurat." +"este restabilit." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -322,190 +420,213 @@ msgid "" msgstr "" "Încercarea de a obține autorizare a eșuat.\n" "Acest lucru probabil înseamnă că parola nu este validă, dar unele servere au\n" -"alte moduri de eșuare pe care fetchmail nu le poate distinge de acesta\n" -"pentru că ele nu trimit mesaje de eroare utile la eșecul de autentificare.\n" +"alte moduri de eșuare pe care fetchmail nu le poate distinge de acestea\n" +"pentru că ele nu trimit mesaje de eroare utile la eșuarea autentificării\n" "\n" "Serviciul fetchmail va continua să ruleze și să încerce să se conecteze\n" "la fiecare ciclu. Nu se vor trimite înștiințări viitoare până când serviciul\n" -"este restaurat." +"nu este restabilit." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Sondează din nou imediat pe %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Eroare de soclu sau TLS pe %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" -msgstr "Eroare de autentificare și de login necunoscută pe %s@%s\n" +msgstr "Eroare necunoscută de conectare la cont sau de autentificare pe %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" -msgstr "Autorizarea OK pe %s@%s\n" +msgstr "Autorizarea este OK pe %s@%s\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "autentificarea fetchmail OK pe %s@%s" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail a putut să se autentifice la %s@%s.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" -msgstr "Serviciul a fost restaurat.\n" +msgstr "Serviciul a fost restabilit.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "se selectează sau se sondează din nou dosarul %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "se selectează sau se sondează din nou dosarul implicit\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s la %s (dosarul %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s la %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Se sondează %s\n" -#: driver.c:1344 +# R-GC, scrie: +# alt mesaj la care Poedit se opune la +# aplicarea formelor de singular/plural. +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d mesaj (%d %s) pentru %s" msgstr[1] "%d mesaje (%d %s) pentru %s" -msgstr[2] "%d de mesaje (%d %s) pentru %s" +msgstr[2] "%d mesaje (%d %s) pentru %s" +msgstr[3] "%d de mesaje (%d %s) pentru %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "văzut" msgstr[1] "văzute" msgstr[2] "văzute" +msgstr[3] "văzute" -#: driver.c:1350 +# R-GC, scrie: +# alt mesaj la care Poedit se opune la +# aplicarea formelor de singular/plural. +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d mesaj pentru %s" msgstr[1] "%d mesaje pentru %s" -msgstr[2] "%d de mesaje pentru %s" +msgstr[2] "%d mesaje pentru %s" +msgstr[3] "%d de mesaje pentru %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d octeți).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" -msgstr "Nu există mail pentru %s\n" +msgstr "Nu există niciun mesaj de email pentru %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "număr de mesaje fals!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" -msgstr "Prea multe mailuri omise (%d > %d) din cauza erorilor tranzitorii pentru %s\n" +msgstr "Prea multe mesaje de email omise (%d > %d) din cauza erorilor tranzitorii pentru %s\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "soclu" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "antet RFC822 defect sau care lipsește" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "sincronizare client/server" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "protocol client/server" -#: driver.c:1564 +# R-GC, scrie: +# nu știu exact dacă este vorba de-o blocare +# de tipul ușii de WC din tren, de exemplu, sau +# este vorba că acțiunea de blocarea este +# ocupată cu altceva... +# *** +# Idei? +#: driver.c:1583 msgid "lock busy on server" -msgstr "blocare ocupată pe server" +msgstr "blocare-ocupat pe server" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "Tranzacție SMTP" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "Căutare DNS" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "nedefinit" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "eroare %s în timpul aducerii de la %s@%s și livrării la gazda SMTP %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "necunoscut" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "eroare %s în timpul aducerii de la %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "comanda post-conexiune terminată cu semnalul %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "comanda post-conexiune a eșuat cu starea %d\n" -#: driver.c:1616 +# R-GC, scrie: +# se pare că este vorba de opțiunile de compilare, nu au fost activate și de aceea suportul respectiv nu poate fi „conectat”. +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" -msgstr "Suportul V4 Kerberos nu este legat.\n" +msgstr "Suportul V4 Kerberos nu este conectat.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" -msgstr "Suportul V5 Kerberos nu este legat.\n" +msgstr "Suportul V5 Kerberos nu este conectat.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" -msgstr "Opțiunea --flush nu este suportată cu %s\n" +msgstr "Opțiunea „--flush” nu este suportată cu %s\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" -msgstr "Opțiunea --all nu este suportată cu %s\n" +msgstr "Opțiunea „--all” nu este suportată cu %s\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" -msgstr "Opțiunea --limit nu este suportată cu %s\n" +msgstr "Opțiunea „--limit” nu este suportată cu %s\n" #: env.c:58 #, c-format @@ -517,10 +638,10 @@ msgid "" "%s: Abort.\n" msgstr "" "%s: Variabila de mediu QMAILINJECT este stabilită.\n" -"Acest lucru este periculos pentru că poate face wrapperul lui qmail-inject sau al lui qmail\n" -"să manipuleze antetele De la: sau ID-mesaj:.\n" -"Încercați „env QMAILINJECT= %s ARGUMENTELE AICI”\n" -"%s: Renunțați.\n" +"Acest lucru este periculos, deoarece poate face ca qmail-inject sau scriptul\n" +"de sendmail al qmail să modifice antetele dvs. De la: sau ID-mesaj:.\n" +"Încercați «env QMAILINJECT= %s ARGUMENTELE AICI»\n" +"%s: Se renunță.\n" #: env.c:70 #, c-format @@ -532,10 +653,10 @@ msgid "" "%s: Abort.\n" msgstr "" "%s: Variabila de mediu NULLMAILER_FLAGS este stabilită.\n" -"Acest lucru este periculod pentru că poate face wrapperul sendmail lui\n" -"nullmailer-inject sau al lui nullmailer să manipuleze antetele De la:, ID-mesaj: sau Cale-Întoarcere:.\n" -"Încercați „env NULLMAILER_FLAGS= %s ARGUMENTELE AICI”\n" -"%s: Renunțați.\n" +"Acest lucru este periculos, deoarece poate face ca nullmailer-inject sau scriptul de\n" +"sendmail al nullmailer să modifice antetele dvs. De la:, ID-mesaj: sau Cale-Întoarcere:.\n" +"Încercați «env NULLMAILER_FLAGS= %s ARGUMENTELE AICI»\n" +"%s: Se renunță.\n" #: env.c:82 #, c-format @@ -557,21 +678,21 @@ msgstr "%s: nu se poate determina gazda!" #: env.c:223 #, c-format -msgid "getaddrinfo failed for %s\n" -msgstr "getaddrinfo a eșuat pentru %s\n" +msgid "getaddrinfo failed for \"%s\": %s\n" +msgstr "getaddrinfo() a eșuat pentru „%s”: %s\n" -#: env.c:225 +#: env.c:224 msgid "Cannot find my own host in hosts database to qualify it!\n" -msgstr "Nu se poate găsit propria gazdă în baza de date de gazde pentru a o califica!\n" +msgstr "Nu se poate găsi propria gazdă în baza de date de gazde pentru a o califica!\n" -#: env.c:229 +#: env.c:228 msgid "" "Trying to continue with unqualified hostname.\n" "DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n" "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n" msgstr "" "Se încearcă să se continue cu un nume de gazdă necalificat.\n" -"NU raportați antetele Primit: nevalide, liniile HELO/EHLO sau problemele similare!\n" +"NU raportați antetele „Received”: nevalide, liniile HELO/EHLO sau problemele similare!\n" "REPARAȚI, în schimb, /etc/hosts, DNS, NIS sau LDAP.\n" #: etrn.c:49 odmr.c:61 @@ -592,7 +713,7 @@ msgstr "Statul la coadă pentru %s a început\n" #: etrn.c:84 #, c-format msgid "No messages waiting for %s\n" -msgstr "Nu așteaptă niciun mesaj pentru %s\n" +msgstr "Niciun mesaj în așteptare pentru %s\n" #: etrn.c:90 #, c-format @@ -622,23 +743,23 @@ msgstr "Eroare de sintaxă ETRN în parametri\n" msgid "Unknown ETRN error %d\n" msgstr "Eroare ETRN necunoscută %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" -msgstr "Opțiunea --keep nu este suportată cu ETRN\n" +msgstr "Opțiunea „--keep” nu este suportată cu ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" -msgstr "Opțiunea --flush nu este suportată cu ETRN\n" +msgstr "Opțiunea „--flush” nu este suportată cu ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" -msgstr "Opțiunea --folder nu este suportată cu ETRN\n" +msgstr "Opțiunea „--folder” nu este suportată cu ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" -msgstr "Opțiunea --check nu este suportată cu ETRN\n" +msgstr "Opțiunea „--check” nu este suportată cu ETRN\n" -#: fetchmail.c:142 +#: fetchmail.c:144 #, c-format msgid "" "Copyright (C) 2002, 2003 Eric S. Raymond\n" @@ -653,7 +774,7 @@ msgstr "" "Drepturi de autor (C) 2005 - 2012 Sunil Shetye\n" "Drepturi de autor (C) 2005 - %d Matthias Andree\n" -#: fetchmail.c:148 +#: fetchmail.c:150 msgid "" "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions. For details,\n" @@ -663,950 +784,1068 @@ msgstr "" "binevenit să îl redistribuiți sub anumite condiții. Pentru detalii,\n" "consultați fișierul COPYING în directorul sursă sau documentație.\n" -#: fetchmail.c:188 +#: fetchmail.c:190 msgid "WARNING: Running as root is discouraged.\n" msgstr "AVERTISMENT: Rularea ca root este descurajată.\n" -#: fetchmail.c:200 +#: fetchmail.c:202 msgid "fetchmail: invoked with" msgstr "fetchmail: invocat cu" -#: fetchmail.c:223 +#: fetchmail.c:225 msgid "could not get current working directory\n" msgstr "nu s-a putut obține directorul de lucru curent\n" -#: fetchmail.c:304 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" -msgstr "Aceasta este lansarea fetchmail %s" +msgstr "Aceasta este versiunea de fetchmail: %s" -#: fetchmail.c:308 +#: fetchmail.c:313 +#, c-format +msgid "" +"Compiled with SSL library %#lx \"%s\"\n" +"Run-time uses SSL library %#lx \"%s\"\n" +msgstr "" +"Compilat cu biblioteca SSL %#lx „%s”\n" +"În timpul rulării utilizează biblioteca SSL %#lx „%s”\n" + +#: fetchmail.c:317 +#, c-format +msgid "" +"OpenSSL: %s\n" +"Engines: %s\n" +msgstr "" +"OpenSSL: %s\n" +"Motoare: %s\n" + +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" -msgstr "AVERTISMENT: Biblioteca SSL/TLS nu suportă TLS v1.3.\n" +msgstr "AVERTISMENT: Biblioteca dvs. SSL/TLS, nu suportă TLS v1.3.\n" -#: fetchmail.c:311 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "AVERTISMENT: Compilat împotriva LibreSSL, care nu este o configurare suportată.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "EROARE: Compilat cu LibreSSL, care încalcă drepturile de autor prin lipsa excepției din clauza 2b a GPL. Consultați fișierul COPYING. Se renunță.\n" -#: fetchmail.c:314 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "AVERTISMENT: Compilat fără SSL/TLS.\n" -#: fetchmail.c:339 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" -msgstr "Opțiunea nodetach este în efect, se ignoră opțiunea logfile.\n" +msgstr "Opțiunea „--nodetach” este activă; se ignoră opțiunea „--logfile”.\n" -#: fetchmail.c:346 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" -msgstr "Nu se rulează în modul daemon, se ignoră opțiune logfile.\n" +msgstr "Nu rulează în modul demon, se ignoră opțiunea „--logfile”.\n" -#: fetchmail.c:353 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" -msgstr "Fișierul de înregistrare „%s” nu există, se ignoră opțiunea logfile.\n" +msgstr "Fișierul de jurnal „%s” nu există, se ignoră opțiunea „--logfile”.\n" -#: fetchmail.c:359 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" -msgstr "Fișierul de înregistrare „%s” nu este inscriptibil, se renunță.\n" +msgstr "Fișierul de jurnal „%s” nu este inscriptibil, se renunță.\n" -#: fetchmail.c:377 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" -msgstr "opțiunile syslog și logfile sunt amândouă stabilite, se ignoră syslog, și se înregistrează la %s" +msgstr "opțiunile „--syslog” și „--logfile” sunt amândouă stabilite, se ignoră „--syslog”, și se scrie jurnalul în %s" -#: fetchmail.c:468 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" -msgstr "Se preiau opțiunile de la linia de comandă%s%s\n" +msgstr "Se preiau opțiunile din linia de comandă%s%s\n" -#: fetchmail.c:469 +#: fetchmail.c:486 msgid " and " msgstr " și " -#: fetchmail.c:474 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" -msgstr "Nu există serverele de mail stabilite -- poate că %s lipsește?\n" +msgstr "Nu există servere de email stabilite -- poate că „%s” lipsește?\n" -#: fetchmail.c:495 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: nu au fost specificate servere de mail.\n" -#: fetchmail.c:507 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: nu rulează niciun alt fetchmail\n" -#: fetchmail.c:513 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: eroare la omorârea lui %s fetchmail la %ld; se salvează.\n" -#: fetchmail.c:514 fetchmail.c:523 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "fundal" -#: fetchmail.c:514 fetchmail.c:523 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "prim plan" -#: fetchmail.c:522 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" -msgstr "fetchmail: %s fetchmail la %ld terminat.\n" +msgstr "fetchmail: %s fetchmail la %ld a fost omorât.\n" -#: fetchmail.c:545 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" -msgstr "fetchmail: nu se poate verifica mailul în timp ce rulează alt fetchmail la aceeași gazdă.\n" +msgstr "fetchmail: nu se poate verifica emailul în timp ce rulează alt fetchmail la aceeași gazdă.\n" -#: fetchmail.c:551 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: nu se pot sonda gazdele specificate cu alt fetchmail care rulează la %ld.\n" -#: fetchmail.c:558 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" -msgstr "fetchmail: alt fetchmail de prim plan rulează la %ld.\n" +msgstr "fetchmail: un alt fetchmail în prim plan rulează la %ld.\n" -#: fetchmail.c:568 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" -msgstr "fetchmail: nu se pot accepta opțiunile în timp ce fetchmailul de fundal rulează.\n" +msgstr "fetchmail: nu se pot accepta opțiuni în timp ce un alt fetchmail rulează în fundal.\n" -#: fetchmail.c:580 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" -msgstr "fetchmail: fetchmailul de fundal la %ld s-a trezit.\n" +msgstr "fetchmail: serviciul fetchmail în fundal pe %ld a fost reactivat.\n" -#: fetchmail.c:592 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: fratele mai mare la %ld a murit misterios.\n" -#: fetchmail.c:607 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: nu se poate găsi o parolă pentru %s@%s.\n" -#: fetchmail.c:611 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " -msgstr "Introduce parola pentru %s@%s: " +msgstr "Introduceți parola pentru %s@%s: " -#: fetchmail.c:653 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: Nu se poate detașa în fundal. Se renunță.\n" -#: fetchmail.c:657 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "se pornește serviciul %s fetchmail\n" -#: fetchmail.c:673 fetchmail.c:675 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" -msgstr "nu s-a putut deschide %s pentru a adăuga înregistrările la\n" +msgstr "nu s-a putut deschide %s pentru a adăuga mesaje în jurnal\n" -#: fetchmail.c:694 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" -msgstr "modul --check este activat, nu se aduce mail\n" +msgstr "modul „--check” este activat, nu se preia mail\n" -#: fetchmail.c:716 +# R-GC, scrie: +# cred că mesajul se referă la marca de timp, +# deci, ar trebui să fie, așa: +# „nus-a putut verifica marcajul temporal al %s (eroare %d)” +# *** +# Opinii/Idei? +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "nu s-a putut verifica timpul %s (eroarea %d)\n" -#: fetchmail.c:721 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "se repornește fetchmail (s-a modificat %s)\n" -#: fetchmail.c:725 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" -msgstr "încercarea de a re-executa poate eșua pentru că directorul nu a fost restaurat\n" +msgstr "încercarea de a re-executa poate eșua pentru că directorul nu a fost restabilit\n" -#: fetchmail.c:751 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "încercarea de a re-executa fetchmail a eșuat\n" -#: fetchmail.c:781 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" -msgstr "sondarea a %s omisă (a eșuat autentificarea sau au fost prea multe limite de timp)\n" +msgstr "sondarea a %s a fost omisă (a eșuat autentificarea sau au fost prea multe depășiri ale limitei de timp)\n" -#: fetchmail.c:793 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" -msgstr "intervalul nu este atins, nu se interoghează %s\n" +msgstr "intervalul nu a fost atins, nu se interoghează %s\n" -#: fetchmail.c:831 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Stare interogare=0 (SUCCES)\n" -#: fetchmail.c:833 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Stare interogare=1 (FĂRĂ MAIL)\n" -#: fetchmail.c:835 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Stare interogare=2 (SOCLU)\n" -#: fetchmail.c:837 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Stare interogare=3 (EȘEC DE AUTENTIFICARE)\n" -#: fetchmail.c:839 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Stare interogare=4 (PROTOCOL)\n" -#: fetchmail.c:841 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Stare interogare=5 (SINTAXĂ)\n" -#: fetchmail.c:843 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" -msgstr "Stare interogare=6 (EROARE IO)\n" +msgstr "Stare interogare=6 (EROARE In/Ieș)\n" -#: fetchmail.c:845 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Stare interogare=7 (EROARE)\n" -#: fetchmail.c:847 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Stare interogare=8 (EXCLUDE)\n" -#: fetchmail.c:849 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" -msgstr "Stare interogare=9 (BLOCARE OCUPATĂ)\n" +msgstr "Stare interogare=9 (BLOCARE OCUPAT)\n" -#: fetchmail.c:851 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Stare interogare=10 (SMTP)\n" -#: fetchmail.c:853 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Stare interogare=11 (DNS)\n" -#: fetchmail.c:855 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Stare interogare=12 (BSMTP)\n" -#: fetchmail.c:857 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" -msgstr "Stare interogare=13 (ADUCERE MAXIMĂ)\n" +msgstr "Stare interogare=13 (NUMĂR MAXIM MESAJE PRELUATE ATINS)\n" -#: fetchmail.c:859 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Stare interogare=%d\n" -#: fetchmail.c:901 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Toate conexiunile sunt înțepenite. Se iese.\n" -#: fetchmail.c:909 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "se doarme la %s pentru %d secunde\n" -#: fetchmail.c:933 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "trezit de %s\n" -#: fetchmail.c:936 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "trezit de semnalul %d\n" -#: fetchmail.c:944 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "trezit la %s\n" -#: fetchmail.c:949 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "terminare normală, stare %d\n" -#: fetchmail.c:1113 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "" -"nu s-a putut verifica timpul fișierului de rulare a controlului\n" +"nu s-a putut verifica marcajul de timp al fișierului de control al rulării\n" "\n" -#: fetchmail.c:1147 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" -msgstr "Avertisment: mențiuni multiple a gazdei %s în fișierul de configurare\n" +msgstr "Avertisment: mențiuni multiple ale gazdei %s în fișierul de configurare\n" -#: fetchmail.c:1186 +# R-GC, scrie: +# în acest mesaj, termenul «defaults», nu +# trebuie să fie tradus pentru că este un +# „cuvînt token” al fișierului de configurare. +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" -msgstr "fetchmail: Eroare: multiple înregistrări „implicite” în fișierul de configurare sau „implicite” nu este prima înregistrare.\n" +msgstr "fetchmail: Eroare: multiple înregistrări „defaults” în fișierul de configurare sau „defaults” nu este prima înregistrare.\n" -#: fetchmail.c:1316 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "Suportul SSL nu este compilat.\n" -#: fetchmail.c:1323 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "Suportul v4 KERBEROS este configurat, dar nu este compilat.\n" -#: fetchmail.c:1329 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "Suportul v5 KERBEROS este configurat, dar nu este compilat.\n" -#: fetchmail.c:1335 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Suportul GSSAPI este configurat, dar nu este compilat.\n" -#: fetchmail.c:1365 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" -msgstr "fetchmail: avertisment: niciun DNS disponibil pentru a verifica aducerile de căderi multiple de la %s\n" +msgstr "fetchmail: avertisment: nu există niciun DNS disponibil pentru a verifica preluările de livrări multiple de la %s\n" -#: fetchmail.c:1376 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" -msgstr "avertisment: căderea multiplă pentru %s necesită opțiunea plic!\n" +msgstr "avertisment: livrarea multiplă pentru %s necesită opțiunea „--envelope”!\n" -#: fetchmail.c:1377 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" -msgstr "avertisment: Nu întrebați pentru suport dacă tot mailul merge la masterul de poștă!\n" +msgstr "avertisment: Nu cereți asistență dacă toate e-mailurile ajung la „postmaster”!\n" -#: fetchmail.c:1394 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" -msgstr "fetchmail: configurarea %s nevalidă, specificați un număr de port pozitiv pentru serviciu sau port\n" +msgstr "fetchmail: configurarea %s nu este validă, specificați un număr pozitiv de port pentru serviciu sau port\n" -#: fetchmail.c:1401 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" -msgstr "fetchmail: configurarea %s nevalidă, RPOP necesită un port privilegiat\n" +msgstr "fetchmail: configurarea %s nu este validă, RPOP necesită un port cu permisiuni privilegiate\n" -#: fetchmail.c:1419 +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "AVERTISMENT: configurarea %s nu este validă, în mod normal aveți nevoie de opțiunea „--ssl” pentru portul 995/serviciul pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "AVERTISMENT: configurarea %s nu este validă, în mod normal aveți nevoie de portul 995/serviciul pop3s pentru opțiunea „--ssl”.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "AVERTISMENT: configurarea %s nu este validă, în mod normal aveți nevoie de opțiunea „--ssl” pentru portul 993/serviciul imaps.\n" + +#: fetchmail.c:1429 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "AVERTISMENT: configurarea %s nu este validă, în mod normal aveți nevoie de portul 993/serviciul imaps pentru opțiunea „--ssl”.\n" + +#: fetchmail.c:1447 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" -msgstr "configurarea %s nevalidă, LMTP nu poate utiliza portul SMTP implicit\n" +msgstr "configurarea %s nu este validă, LMTP nu poate utiliza portul SMTP implicit\n" -#: fetchmail.c:1433 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" -msgstr "Amândouă modurile aduce toate sau păstrează în serviciu sau în așteptare sunt o greșeală!\n" +msgstr "Utilizarea opțiunilor „--fetchall” sau „--keep” împreună, în modul demon sau în modul de așteptare, sunt o greșeală!\n" -#: fetchmail.c:1443 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: Eroare: modul în așteptare nu funcționează pentru dosare sau conturi multiple!\n" -#: fetchmail.c:1467 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "terminat cu semnalul %d\n" -#: fetchmail.c:1540 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s interogarea a %s (protocol %s) la %s: sondarea a început\n" -#: fetchmail.c:1565 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "Suportul POP2 nu este configurat.\n" -#: fetchmail.c:1577 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "Suportul POP3 nu este configurat.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "Suportul IMAP nu este configurat.\n" -#: fetchmail.c:1593 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "Suportul ETRN nu este configurat.\n" -#: fetchmail.c:1601 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "Suportul ODMR nu este configurat.\n" -#: fetchmail.c:1608 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" -msgstr "protocol nesuportat selectat.\n" +msgstr "a fost selectat un protocol nesuportat.\n" -#: fetchmail.c:1619 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s interogare a %s (protocol %s) la %s: sondarea este completată\n" -#: fetchmail.c:1644 +# R-GC, scrie: +# îmi imaginez că este vorba de intervalul de +# verificare pentru mesaje noi în cont/server; nu +# cred că vreun utilizator „cu scaun la cap” va +# fixa acest interval sub 20 de secunde. +# . +# De aceea am pus: „... este de X de secunde” +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" -msgstr "Intervalul sondării este %d secunde\n" +msgstr "Intervalul sondării este de %d de secunde\n" -#: fetchmail.c:1646 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" -msgstr "Fișierul de înregistrare este %s\n" +msgstr "Fișierul de jurnal este %s\n" -#: fetchmail.c:1648 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" -msgstr "Fișierul id este %s\n" +msgstr "Fișierul de id-uri este %s\n" -#: fetchmail.c:1651 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Mesajele de progres vor fi înregistrate via syslog\n" -#: fetchmail.c:1654 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" -msgstr "Fetchmail se va masca și nu va genera Primite\n" +msgstr "Fetchmail va masca mesajele și nu va genera «Received»\n" -#: fetchmail.c:1656 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" -msgstr "Fetchmail va arăta punctele de progres chiar și în fișierele de înregistrare.\n" +msgstr "Fetchmail va arăta punctele de progres chiar și în fișierele de jurnal.\n" -#: fetchmail.c:1658 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" -msgstr "Fetchmail va transmite mesajele de cădere multiplă adresate incorect la %s.\n" +msgstr "Fetchmail va redirecționa mesajele de livrare multiplă adresate greșit la %s.\n" -#: fetchmail.c:1662 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" -msgstr "Fetchmail va direcționa mailul de eroare la masterul poștei.\n" +msgstr "Fetchmail va direcționa erorile de email la „postmaster”.\n" -#: fetchmail.c:1664 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" -msgstr "Fetchmail va direcționa mailul de eroare la expeditor.\n" - -#: fetchmail.c:1667 +msgstr "Fetchmail va direcționa erorile de email la expeditor.\n" + +# R-GC, scrie: +# am folosit traducereea mot-a-mot a lui +# „drop = a arunca/aruncă”, dar cred că traducerea +# corectă, ar fi: „a elimina/elimină” +# *** +# Opinii/Idei? +# După revizarea fișierului, DȘ, zice: +# „→ cred că ar putea să rămână „a arunca” pentru că este o acțiune mai +# temporară decât „a elimina”. Adică felul cum îmi imaginez este așa: +# mesajele de eroare sunt produse iar fetchmail decide să le arunce în +# loc să le păstreze și să acționeze asupra lor.” +# === +# sugestie aplicată; sintagma: +# „aruncă mesajele”, rămîne +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" -msgstr "Fetchmail va trata erorile permanente ca permanente (mesaje de cădere).\n" +msgstr "Fetchmail va trata erorile permanente ca permanente (aruncă mesajele).\n" -#: fetchmail.c:1669 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail va trata erorile permanente ca temporare (păstrează mesajele).\n" -#: fetchmail.c:1676 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Opțiunile pentru preluarea de la %s@%s:\n" -#: fetchmail.c:1680 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Mailul va fi preluat via %s\n" -#: fetchmail.c:1683 +# R-GC, scrie: +# *** +# NOTĂ: trebuie verificat ce este cu acest +# «interval»; nu „sună” prea bine: +# „... va avea loc la fiecare N interval”, +# în special pentru singular: +# „... va avea loc la fiecare (un) interval” +# ========================= +# Îmi pare rău, dar asta e „găselnița” mea, +# pentru a înlocui fraza fără sens: +# „... va avea loc la fiecare (un) interval” +# *** +# Opinii/Idei? +# După revizarea fișierului, DȘ, zice: +# „→ chiar nu știu ceva mai bun decât traducerea existentă” +# === +# concluzie: „găselnița”, cel puțin de +# moment, «a trecut examenul» :) +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" -msgstr[0] " Sondarea acestui server se va întâmpla la fiecare %d interval.\n" -msgstr[1] " Sondarea acestui server se va întâmpla la fiecare %d intervale.\n" -msgstr[2] " Sondarea acestui server se va întâmpla la fiecare %d de intervale.\n" +msgstr[0] " Sondarea acestui server va avea loc de fiecare dată la intervalul de timp fixat.\n" +msgstr[1] " Sondarea acestui server va avea loc la fiecare două intervale.\n" +msgstr[2] " Sondarea acestui server va avea loc la fiecare %d intervale\n" +msgstr[3] " Sondarea acestui server va avea loc la fiecare %d de intervale.\n" -#: fetchmail.c:1687 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Numele adevărat al serverului este %s.\n" -#: fetchmail.c:1690 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" -msgstr " Această gazdă nu va fi interogată când nicio gazdă nu este specificată.\n" +msgstr " Această gazdă nu va fi interogată, atunci când nicio gazdă nu este specificată.\n" -#: fetchmail.c:1691 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" -msgstr " Această gazdă va fi interogată când nicio gazdă nu este specificată.\n" +msgstr " Această gazdă va fi interogată, atunci când nicio gazdă nu este specificată.\n" -#: fetchmail.c:1695 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Parola va fi solicitată.\n" -#: fetchmail.c:1699 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " Secret APOP = „%s”.\n" -#: fetchmail.c:1702 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " ID RPOP = „%s”.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Parolă = „%s”.\n" -#: fetchmail.c:1714 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" -msgstr " Protocolul este KPOP cu autentificare %s Kerberos" +msgstr " Protocolul este KPOP cu autentificare Kerberos %s" -#: fetchmail.c:1717 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Protocolul este %s" -#: fetchmail.c:1719 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (se utilizează serviciul %s)" -#: fetchmail.c:1721 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (se utilizează portul implicit)" -#: fetchmail.c:1723 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (se forțează utilizarea UIDL)" -#: fetchmail.c:1729 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Toate metodele de autentificare disponibile vor fi încercate.\n" -#: fetchmail.c:1732 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Autentificarea parolei va fi forțată.\n" -#: fetchmail.c:1735 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " Autentificarea MSN va fi forțată.\n" -#: fetchmail.c:1738 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " Autentificarea NTLM va fi forțată.\n" -#: fetchmail.c:1741 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " Autentificarea OTP va fi forțată.\n" -#: fetchmail.c:1744 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " Autentificarea CRAM-MD5 va fi forțată.\n" -#: fetchmail.c:1747 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " Autentificarea GSSAPI va fi forțată.\n" -#: fetchmail.c:1750 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Autentificarea V4 Kerberos va fi forțată.\n" -#: fetchmail.c:1753 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Autentificarea V5 Kerberos va fi forțată.\n" -#: fetchmail.c:1756 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" -msgstr " Criptarea capăt la capăt este asumată.\n" +msgstr " Este presupusă criptarea de la un capăt la celălalt capăt.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" -msgstr " Principalul serviciului de mail este: %s\n" +msgstr " Principalul serviciu de mail este: %s\n" -#: fetchmail.c:1763 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" -msgstr " Sesiunile criptate SSL activate.\n" +msgstr " Sesiunile criptate SSL sunt activate.\n" -#: fetchmail.c:1765 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " Protocolul SSL: %s.\n" -#: fetchmail.c:1767 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" -msgstr " Verificarea certificatului serverului SSL activată.\n" +msgstr " Verificarea certificatelor pentru serverul SSL este activată.\n" -#: fetchmail.c:1769 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" -msgstr " Verificarea certificatului serverului SSL dezactivată.\n" +msgstr " Verificarea certificatelor pentru serverul SSL este dezactivată.\n" -#: fetchmail.c:1772 +#: fetchmail.c:1799 +#, c-format +msgid " SSL default trusted certificate file: %s\n" +msgstr " Fișier de certificat de încredere SSL implicit: %s\n" + +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Fișier de certificat de încredere SSL: %s\n" -#: fetchmail.c:1774 +#: fetchmail.c:1802 +#, c-format +msgid " SSL default trusted certificate directory: %s\n" +msgstr " Director de certificat de încredere SSL implicit: %s\n" + +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Director de certificat de încredere SSL: %s\n" -#: fetchmail.c:1776 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " NumeComun de server SSL: %s\n" -#: fetchmail.c:1778 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" -msgstr " Amprentă de cheie SSL (verificată împotriva cheii de server): %s\n" +msgstr " Amprentă de cheie SSL (verificată contra cheii de server): %s\n" -#: fetchmail.c:1781 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Limita de timp de non-răspuns a serverului este %d secunde" -#: fetchmail.c:1783 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (implicit).\n" -#: fetchmail.c:1790 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" -msgstr " Cutia de mail implicită selectată.\n" +msgstr " Căsuța de email implicită selectată.\n" -#: fetchmail.c:1795 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" -msgstr " Cutiile de mail selectate sunt:" +msgstr " Căsuțele de email selectate sunt:" -#: fetchmail.c:1801 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" -msgstr " Toate mesajele vor fi descărcate (--all pornit).\n" +msgstr " Toate mesajele vor fi descărcate (opțiunea „--all” este activată).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" -msgstr " Doar mesajele noi vor fi descărcate (--all oprit).\n" +msgstr " Doar mesajele noi vor fi descărcate (opțiunea „--all” este dezactivată).\n" -#: fetchmail.c:1804 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" -msgstr " Mesajele aduse vor fi păstrate pe server (--keep pornit).\n" +msgstr " Mesajele preluate vor fi păstrate pe server (opțiunea „--keep” este activată).\n" -#: fetchmail.c:1805 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" -msgstr " Mesajele aduse nu vor fi păstrate pe server (--keep oprit).\n" +msgstr " Mesajele preluate nu vor fi păstrate pe server (opțiunea „--keep” este dezactivată).\n" -#: fetchmail.c:1807 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" -msgstr " Mesajele vechi vor fi golite înaintea descărcării mesajelor (--flush pornit).\n" +msgstr " Mesajele vechi vor fi eliminate înaintea descărcării mesajelor (opțiunea „--flush” este activată).\n" -#: fetchmail.c:1808 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" -msgstr " Mesajele vechi nu vor fi golite înaintea descărcării mesajelor (--flush oprit).\n" +msgstr " Mesajele vechi nu vor fi eliminate înaintea descărcării mesajelor (opțiunea „--flush” este dezactivată).\n" -#: fetchmail.c:1810 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" -msgstr " Mesajele supradimensionate vor fi golite înaintea descărcării mesajelor (--limitflush pornit).\n" +msgstr " Mesajele supradimensionate vor fi eliminate înaintea descărcării mesajelor (opțiunea „--limitflush” este activată).\n" -#: fetchmail.c:1811 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" -msgstr " Mesajele supradimensionate nu vor fi golite înaintea descărcării mesajelor (--limitflush oprit).\n" +msgstr " Mesajele supradimensionate nu vor fi golite înaintea descărcării mesajelor (opțiunea „--limitflush” este dezactivată).\n" -#: fetchmail.c:1813 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" -msgstr " Rescrierea adreselor locale de server este activată (--norewrite oprit).\n" +msgstr " Rescrierea adreselor locale pe server este activată (opțiunea „--norewrite” este dezactivată).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" -msgstr " Rescrierea de adrese locale de server nu este activată (--norewrite pornit).\n" +msgstr " Rescrierea adreselor locale pe server nu este activată (opțiunea „--norewrite” este activată).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" -msgstr " Dezactivarea transportului-retur este activată (stripcr pornit).\n" +msgstr " Eliminarea returului de caret „CR” este activată (opțiunea „--stripcr” este activată).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" -msgstr " Dezactivarea transportului-retur nu este activată (stripcr oprit).\n" +msgstr " Eliminarea returului de caret „CR” nu este activată (opțiunea „--stripcr” este dezactivată).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" -msgstr " Forțarea transportului-retur este activată (forcecr pornit).\n" +msgstr " Forțarea utilizării returului de caret „CR” este activată (opțiunea „--forcecr” este activată).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" -msgstr " Forțarea transportului-retur nu este activată (forcecr oprit).\n" +msgstr " Forțarea utilizării returului de caret „CR” nu este activată (opțiunea „--forcecr” este dezactivată).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" -msgstr " Interpretarea de codare-transfer-conținut nu este activată (pass8bits pornit).\n" +msgstr " Interpretarea liniei de „Content-Transfer-Encoding (codificarea transferului de conținut)” nu este activată (opțiunea „--pass8bit” este activată).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" -msgstr " Interpretarea de codare-transfer-conținut este activată (pass8bits oprit).\n" +msgstr " Interpretarea liniei de „Content-Transfer-Encoding (codificarea transferului de conținut)” este activată (opțiunea „--pass8bit” este dezactivată).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" -msgstr " Decodarea MIME este activată (mimedecode pornit).\n" +msgstr " Decodificarea MIME este activată (opțiunea „--mimedecode” este activată).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" -msgstr " Decodarea MIME nu este activată (mimedecode oprit).\n" +msgstr " Decodificarea MIME nu este activată (opțiunea „--mimedecode” este dezactivată).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" -msgstr " În așteptare după sondare este activată (idle pornit).\n" +msgstr " Intrarea „în așteptare” după sondare este activată (opțiunea „--idle” este activată).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" -msgstr " În așteptare după sondare nu este activată (idle oprit).\n" +msgstr " Intrarea „în așteptare” după sondare nu este activată (opțiunea „--idle” este dezactivată).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" -msgstr " Liniile de stare non-goale vor fi eliminate (dropstatus pornit)\n" +msgstr " Liniile „Status (de stare)” care nu sunt goale vor fi eliminate (opțiunea „--dropstatus” este activată)\n" -#: fetchmail.c:1832 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" -msgstr " Liniile de stare non-goale vor fi păstrate (dropstatus oprit)\n" +msgstr " Liniile „Status (de stare)” care nu sunt goale vor fi păstrate (opțiunea „--dropstatus” este dezactivată)\n" -#: fetchmail.c:1834 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" -msgstr " Liniile livrat-la vor fi eliminate (dropdelivered pornit)\n" +msgstr " Liniile „Delivered-To (livrat către)” vor fi eliminate (opțiunea „--dropdelivered” este activată)\n" -#: fetchmail.c:1835 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" -msgstr " Liniile livrat-la vor fi păstrate (dropdelivered oprit)\n" +msgstr " Liniile „Delivered-To (livrat către)” vor fi păstrate (opțiunea „--dropdelivered” este dezactivată)\n" -#: fetchmail.c:1839 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" -msgstr " Limita dimensiunii mesajului este %d octeți (--limit %d).\n" +msgstr " Limita de dimensiune a mesajelor este %d de octeți („--limit %d”).\n" -#: fetchmail.c:1842 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" -msgstr " Nicio limită de dimensiune de mesaj (--limit 0).\n" +msgstr " Nu există limită de dimensiune a mesajelor („--limit 0”).\n" -#: fetchmail.c:1844 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" -msgstr " Intervalul de avertisment de dimensiune a mesajului este %d secunde (--warnings %d).\n" +msgstr " Intervalul de avertizare privind dimensiunea mesajului este de %d secunde („--warnings %d”).\n" -#: fetchmail.c:1847 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" -msgstr " Avertismentele dimensiunii la fiecare sondare (--warnings 0).\n" +msgstr " Avertizări privind dimensiunea la fiecare sondaj („--warnings 0”).\n" -#: fetchmail.c:1850 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" -msgstr " Limita de mesaje-primite este %d (--fetchlimit %d).\n" +msgstr " Limita de mesaje primite este %d („--fetchlimit %d”).\n" -#: fetchmail.c:1853 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" -msgstr " Nu există limită de mesaje-primite (--fetchlimit 0).\n" +msgstr " Nu există limită de mesaje primite („--fetchlimit 0”).\n" -#: fetchmail.c:1855 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" -msgstr " Limita dimensiunii mesajului de aducere este %d (--fetchsizelimit %d).\n" +msgstr " Limita de dimensiune a mesajelor primite este %d („--fetchsizelimit %d”).\n" -#: fetchmail.c:1858 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" -msgstr " Nu există limită de dimensiune de mesaj de aducere (--fetchsizelimit 0).\n" +msgstr " Nu există limită de dimensiune a mesajelor primite („--fetchsizelimit 0”).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" -msgstr " Face căutare binară a UID-urilor în timpul fiecărei sondări (--fastuidl 1).\n" +msgstr " Efectuează o căutare binară a UID-urilor în timpul fiecărei sondări („--fastuidl 1”).\n" -#: fetchmail.c:1864 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" -msgstr " Face căutare binară a UID-urilor în timpul a %d din %d sondări (--fastuidl %d).\n" +msgstr " Efectuează o căutare binară a UID-urilor în timpul a %d din %d sondări („--fastuidl %d”).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" -msgstr " Face căutări liniare a UID-urilor în timpul fiecărei sondări (--fastuidl 0).\n" +msgstr " Efectuează o căutare liniară a UID-urilor în timpul fiecărei sondări („--fastuidl 0”).\n" -#: fetchmail.c:1869 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" -msgstr " Limita lotului de mesaj SMTP este %d.\n" +msgstr " Limita lotului de mesaje SMTP este %d.\n" -#: fetchmail.c:1871 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" -msgstr " Nu există limită de lot de mesaj SMTP (--batchlimit 0).\n" +msgstr " Nu există limită de lot de mesaje SMTP („--batchlimit 0”).\n" -#: fetchmail.c:1875 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" -msgstr " Intervalul de ștergere între ștergeri forțat la %d (--expunge %d).\n" +msgstr " Intervalul de ștergere între eliminări este forțat la %d („--expunge %d”).\n" -#: fetchmail.c:1877 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" -msgstr " Nicio ștergere forțată (--expunge 0).\n" +msgstr " Nicio eliminare forțată (--expunge 0).\n" -#: fetchmail.c:1884 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" -msgstr " Domeniile pentru care mailul va fi adus sunt:" +msgstr " Domeniile pentru care mailul va fi preluat sunt:" -#: fetchmail.c:1889 fetchmail.c:1909 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (implicit)" -#: fetchmail.c:1894 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Mesajele vor fi adăugate la %s ca BSMTP\n" -#: fetchmail.c:1896 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Mesajele vor fi livrate cu „%s”.\n" -#: fetchmail.c:1903 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" -msgstr " Mesajele vor fi trimise %cMTP la:" +msgstr " Mesajele sunt redirecționate via %cMTP către:" -#: fetchmail.c:1914 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" -msgstr " Partea gazdei a liniei MAIL DE LA va fi %s\n" +msgstr " Numele gazdei din linia „MAIL FROM (mail de la)” va fi %s\n" -#: fetchmail.c:1917 +# R-GC, scrie: +# corect, ar fi fost traducerea mot-a-mot: +# „recipient către”, dar mi s-a părut mai +# sugestivă traducerea de: +# „destinatar la (adresa)”. +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" -msgstr " Adresa de plasat în liniile RCPT LA trimise la SMTP va fi %s\n" +msgstr " Adresa care va fi plasată în liniile „RCPT TO (destinatar la)” expediate către SMTP va fi %s\n" -#: fetchmail.c:1926 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" -msgstr " Răspunsurile de blocare de spam de ascultător recunoscute sunt:" +msgstr " Răspunsurile recunoscute ale ascultătorului la blocarea de spam sunt:" -#: fetchmail.c:1932 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" -msgstr " Blocarea spam nu este activată\n" +msgstr " Blocarea de spam nu este activată\n" -#: fetchmail.c:1935 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" -msgstr " Conexiunea serverului va fi adusă cu „%s”.\n" +msgstr " Conexiunea serverului va fi inițiată cu „%s”.\n" -#: fetchmail.c:1938 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Nicio comandă de pre-conexiune.\n" -#: fetchmail.c:1940 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" -msgstr " Conexiunea serverului va fi dată jos cu „%s”.\n" +msgstr " Conexiunea serverului va fi terminată cu „%s”.\n" -#: fetchmail.c:1943 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Nicio comandă de post-conexiune.\n" -#: fetchmail.c:1946 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Nu există nume locale declarate pentru această gazdă.\n" -#: fetchmail.c:1956 +#: fetchmail.c:1986 msgid " Multi-drop mode: " -msgstr " Modul cădere multiplă: " +msgstr " Modul de livrare multiplă: " -#: fetchmail.c:1958 +#: fetchmail.c:1988 msgid " Single-drop mode: " -msgstr " Modul cădere singură: " +msgstr " Modul de livrare unică: " -#: fetchmail.c:1960 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" -msgstr[0] "%d nume local recunoscut.\n" -msgstr[1] "%d nume locale recunoscute.\n" -msgstr[2] "%d de nume locale recunoscute.\n" +msgstr[0] "un nume local recunoscut.\n" +msgstr[1] "două nume locale recunoscute.\n" +msgstr[2] "%d nume locale recunoscute.\n" +msgstr[3] "%d de nume locale recunoscute.\n" -#: fetchmail.c:1975 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" -msgstr " Căutarea DNS pentru adresele de cădere multiplă este activată.\n" +msgstr " Căutarea DNS pentru adresele de livrare multiplă este activată.\n" -#: fetchmail.c:1976 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" -msgstr " Căutarea DNS pentru adresele de cădere multiplă nu este activată.\n" +msgstr " Căutarea DNS pentru adresele de livrare multiplă nu este activată.\n" -#: fetchmail.c:1980 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" -msgstr " Aliasurile de server vor fi comparate cu adresele de cădere multiplă după adresa IP.\n" +msgstr " Numele de alias ale serverului vor fi comparate cu adresele de livrare multiplă după adresa IP.\n" -#: fetchmail.c:1982 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" -msgstr " Aliasurile serverului vor fi comparate cu adresele de cădere multiplă după nume.\n" +msgstr " Numele de alias ale serverului vor fi comparate cu adresele de livrare multiplă după nume.\n" -#: fetchmail.c:1985 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" -msgstr " Rutarea adresei plic nu este activată\n" +msgstr " Direcționarea adresei de pe plic este dezactivată\n" -#: fetchmail.c:1988 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" -msgstr " Antetul plicului este asumat să fie: %s\n" +msgstr " Antetul plicului se presupune a fi: %s\n" -#: fetchmail.c:1991 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Numărul de antete de plic care se omit: %d\n" -#: fetchmail.c:1994 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Prefixul %s va fi eliminat de la id-ul utilizatorului\n" -#: fetchmail.c:1997 +#: fetchmail.c:2027 msgid " No prefix stripping\n" -msgstr " Nu există dezactivarea prefixului\n" +msgstr " Nu se va elimina niciun prefix\n" -#: fetchmail.c:2002 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" -msgstr " Aliasuri de server de mail pre-declarate:" +msgstr " Numele de alias ale serverului de mail pre-declarate:" -#: fetchmail.c:2010 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Domenii locale:" -#: fetchmail.c:2020 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Conexiunea trebuie să fie printr-o interfață %s.\n" -#: fetchmail.c:2022 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Nu s-a specificat nicio cerință de interfață.\n" -#: fetchmail.c:2024 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Bucla de sondare va monitoriza %s.\n" -#: fetchmail.c:2026 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Nu există o interfață de monitorizare specificată.\n" -#: fetchmail.c:2030 +# R-GC, scrie: +# am făcut traducerea mot-a-mot a lui: +# „plug-in” și „plug-out”, dar cred că +# traducerea corectă, ar fi: +# plugin = modul(ul) de recepție/primire +# plugout = +# modul(ul) de trimitere/expediere +# *** +# Opinii/Idei? +# După revizarea fișierului, DȘ, zice: +# „→ cred că e foarte reușită adaptarea” +# === +# concluzie, mesajul acesta și următoarele +# cu înțeles similar, rămîn nemodificate +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" -msgstr " Conexiunile serverului vor fi făcute via modulul %s (--plugin %s).\n" +msgstr " Conexiunile serverului vor fi făcute via modulul de intrare %s („--plugin %s”).\n" -#: fetchmail.c:2032 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" -msgstr " Nu este specificată nicio comandă de modul.\n" +msgstr " Nu este specificată nicio comandă de modul de intrare.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" -msgstr " Conexiunile de ascultător vor fi făcute via modul dezactivat %s (--plugout %s).\n" +msgstr " Conexiunile de ascultător vor fi făcute via modulul de ieșire %s (--plugout %s).\n" -#: fetchmail.c:2036 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" -msgstr " Nu este specificată nicio comandă de modul dezactivat.\n" +msgstr " Nu este specificată nicio comandă de modul de ieșire.\n" -#: fetchmail.c:2043 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Nu sunt UID-uri salvate de la această gazdă.\n" -#: fetchmail.c:2046 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UID-uri salvate.\n" -#: fetchmail.c:2052 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" -msgstr " Informație de urmărire a sondării vor fi adăugate la antetul Recepționate.\n" +msgstr " Informația de urmărire a sondării va fi adăugată la antetul „Received (Recepționate)”.\n" -#: fetchmail.c:2054 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" -msgstr " Nicio informație de urmărire a sondării nu va fi adăugată la antetul Recepționate.\n" +msgstr " Nicio informație de urmărire a sondării nu va fi adăugată la antetul „Received (Recepționate)”.\n" -#: fetchmail.c:2059 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" -msgstr " Mesajele cu antete defecte vor fi respinse.\n" +msgstr " Mesajele cu antete greșite vor fi respinse.\n" -#: fetchmail.c:2062 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" -msgstr " Mesajele cu antete defecte vor fi transmise mai departe.\n" +msgstr " Mesajele cu antete greșite vor fi admise.\n" -#: fetchmail.c:2067 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Proprietăți de trecere „%s”.\n" @@ -1618,7 +1857,7 @@ msgstr "Nu se poate modifica masca de semnal: %s" #: fm_realpath.c:35 msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n" -msgstr "Sistemul de operare nu definește nici PATH_MAX nici nu va accepta realpath(f, NULL). Se renunță.\n" +msgstr "Sistemul dvs. de operare nu definește nici PATH_MAX și nici nu va accepta realpath(f, NULL). Se renunță.\n" #: getpass.c:71 msgid "ERROR: no support for getpassword() routine\n" @@ -1630,12 +1869,12 @@ msgid "" "Caught SIGINT... bailing out.\n" msgstr "" "\n" -"S-a prins SIGINT... se salvează.\n" +"S-a primit semnalul SIGINT... se salvează.\n" #: gssapi.c:53 #, c-format msgid "GSSAPI error in gss_display_status called from <%s>\n" -msgstr "Eroare GSSAPI în gss_display_status apelată de la <%s>\n" +msgstr "Eroare GSSAPI în gss_display_status() apelată de la <%s>\n" #: gssapi.c:56 #, c-format @@ -1654,7 +1893,7 @@ msgstr "Se utilizează numele de serviciu [%s]\n" #: gssapi.c:123 msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n" -msgstr "Nu s-au găsit certificări GSSAPI potrivite. Se omite autentificarea GSSAPI.\n" +msgstr "Nu s-au găsit certificări GSSAPI adecvate. Se omite autentificarea GSSAPI.\n" #: gssapi.c:124 msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n" @@ -1663,7 +1902,7 @@ msgstr "Dacă doriți să utilizați GSSAPI, aveți nevoie mai întâi de certif #: gssapi.c:160 #, c-format msgid "Received malformed challenge to \"%s GSSAPI\"!\n" -msgstr "S-a recepționat o provocare defectă la „%s GSSAPI”!\n" +msgstr "S-a recepționat o provocare greșit formulată la „%s GSSAPI”!\n" #: gssapi.c:170 msgid "Sending credentials\n" @@ -1675,7 +1914,7 @@ msgstr "Eroare la schimbul de certificări\n" #: gssapi.c:243 msgid "Couldn't unwrap security level data\n" -msgstr "Nu s-au putut desface datele de nivel de securitate\n" +msgstr "Nu s-au putut extrage datele de nivel de securitate\n" #: gssapi.c:248 msgid "Credential exchange complete\n" @@ -1688,16 +1927,16 @@ msgstr "Serverul necesită integritate și/sau confidențialitate\n" #: gssapi.c:261 #, c-format msgid "Unwrapped security level flags: %s%s%s\n" -msgstr "Fanioane de nivel de securitate desfăcute: %s%s%s\n" +msgstr "Opțiuni de nivel de securitate extrase: %s%s%s\n" #: gssapi.c:265 #, c-format msgid "Maximum GSS token size is %ld\n" -msgstr "Dimensiunea de jeton GSS maximă este %ld\n" +msgstr "Dimensiunea maximă a jetonului de acreditări GSS este %ld\n" #: gssapi.c:274 msgid "GSSAPI username too long for static buffer.\n" -msgstr "Numele de utilizator GSSAPI este prea lung pentru preîncărcarea statică.\n" +msgstr "Numele de utilizator GSSAPI este prea lung pentru stocarea statică.\n" #: gssapi.c:283 msgid "Error creating security level request\n" @@ -1706,150 +1945,194 @@ msgstr "Eroare la crearea cererii de nivel de securitate\n" #: gssapi.c:287 #, c-format msgid "GSSAPI send_token too large (%lu) while sending username.\n" -msgstr "Send_token GSSAPI este prea mare (%lu) în timpul trimiterii numelui de utilizator.\n" +msgstr "send_token GSSAPI este prea mare (%lu) la trimiterea numelui de utilizator.\n" #: gssapi.c:298 msgid "Releasing GSS credentials\n" -msgstr "Se lansează certificările GSS\n" +msgstr "Se emit certificările GSS\n" #: gssapi.c:302 msgid "Error releasing credentials\n" -msgstr "Eroare la lansarea certificărilor\n" +msgstr "Eroare la emiterea certificărilor\n" #: idle.c:61 #, c-format msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: firul doarme pentru %d sec.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protocol identificat ca IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protocol identificat ca IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protocol identificat ca IMAP2 sau IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "va intra în așteptare după sondare\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" -msgstr "S-a primit răspunsul BYE de la serverul IMAP: %s\n" +msgstr "S-a primit răspunsul „BYE” de la serverul IMAP: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" -msgstr "număr de mesaj fals în „%s”!" +msgstr "număr de mesaje incorect în „%s”!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" -msgstr "număr de ELIMINARE fals în „%s”!" +msgstr "număr de „EXPUNGE (eliminări)” incorect în „%s”!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protocol identificat ca IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "s-a găsit lista actualizată de funcționalități\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protocol identificat ca IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "serverul nu a anunțat extensia SASL-IR, dar implementarea fetchmail o necesită pentru AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protocol identificat ca IMAP2 sau IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: configurația necesită TLS, dar STARTTLS nu este permis din cauza stării de autentificare (PREAUTH). Se anulează conexiunea. Dacă pluginul dvs. este securizat, puteți învinge STARTTLS cu opțiunea «--sslproto ''» («''» reprezintă un șir gol, consultați manualul).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "va intra în așteptare după sondare\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: configurația necesită TLS, dar STARTTLS nu este permis din cauza stării de autentificare (PREAUTH). Se anulează conexiunea. Dacă serverul permite, încercați în schimb „--ssl” (consultați manualul).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: înnoirea la TLS a fost cu succes.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: înnoirea la TLS a eșuat.\n" -#: imap.c:487 +# R-GC, scrie: +# am modificat traducerea mot-a-mot: +# „%s: înnoirea oportunistă la TLS a eșuat, ...” +# am respins traducerea, corectă: +# „%: oportunitatea de înoire la TLS a eșuat, ...” +# în favoarea celei prezente, care mi se +# pare că transmite mai sugestiv, +# pentru utilizator, mesajul autorului. +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" -msgstr "%s: înnoirea oportunistă la TLS a eșuat, se încearcă să se continue\n" +msgstr "%s: încercarea de înnoire la TLS a eșuat, se încearcă să se continue\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" -msgstr "%s: AVERTISMENT: serverul a oferit STARTTLS dar s-a dat sslproto ''.\n" +msgstr "%s: AVERTISMENT: serverul a oferit STARTTLS, dar s-a dat «--sslproto ''».\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: „--auth external” a fost solicitată, dar serverul nu o anunță.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" -msgstr "Capabilitatea OTP necesară nu este compilată în fetchmail\n" +msgstr "Funcționalitatea OTP necesară nu este compilată în fetchmail\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" -msgstr "Capabilitatea NTLM necesară nu este compilată în fetchmail\n" +msgstr "Funcționalitatea NTLM necesară nu este compilată în fetchmail\n" + +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: a fost solicitată o parolă „--auth password”, dar serverul o interzice (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: am rămas fără metode de autentificare și nu se poate realiza autentificarea.\n" -#: imap.c:691 +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" -msgstr "mailul elimină nepotrivirea (%d actual != %d așteptat)\n" +msgstr "nepotrivire de eliminare a e-mailurilor (%d, actual != %d, așteptat)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu este nevăzut\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "" "%u este nevăzut\n" "\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" -msgstr "re-sondarea a eșuat\n" +msgstr "repetarea sondării a eșuat\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" -msgstr[0] "%d mesaj care așteaptă după re-sondare\n" -msgstr[1] "%d mesaje care așteaptă după re-sondare\n" -msgstr[2] "%d de mesaje care așteaptă după re-sondare\n" +msgstr[0] "un mesaj în așteptare după repetarea sondării\n" +msgstr[1] "două mesaje în așteptare după re-sondare\n" +msgstr[2] "%d mesaje în așteptare după re-sondare\n" +msgstr[3] "%d de mesaje în așteptare după re-sondare\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" -msgstr "selectarea cutiei de mail a eșuat\n" +msgstr "selectarea căsuței de email a eșuat\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" -msgstr[0] "%d mesaj așteaptă după prima sondare\n" -msgstr[1] "%d mesaje așteaptă după prima sondare\n" -msgstr[2] "%d de mesaje așteaptă după prima sondare\n" +msgstr[0] "un mesaj în așteptare după prima sondare\n" +msgstr[1] "două mesaje în așteptare după prima sondare\n" +msgstr[2] "%d mesaje în așteptare după prima sondare\n" +msgstr[3] "%d de mesaje în așteptare după prima sondare\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "eliminarea a eșuat\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" -msgstr[0] "%d mesaj așteaptă după eliminare\n" -msgstr[1] "%d mesaje așteaptă după eliminare\n" -msgstr[2] "%d de mesaje așteaptă după eliminare\n" +msgstr[0] "un mesaj în așteptare după eliminare\n" +msgstr[1] "două mesaje în așteptare după eliminare\n" +msgstr[2] "%d mesaje în așteptare după eliminare\n" +msgstr[3] "%d de mesaje în așteptare după eliminare\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "căutarea după mesaje nevăzute a eșuat\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" -msgstr "%u este primul nevăzut\n" +msgstr "%u este primul ce nu a fost văzut\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" -msgstr "Avertisment: se ignoră datele false pentru dimensiunile de mesaj întoarse de la server.\n" +msgstr "Avertisment: se ignoră datele false pentru dimensiunile de mesaj returnate de către server.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" -msgstr "Răspuns de ADUCERE incorect: %s.\n" +msgstr "Răspuns „FETCH” incorect: %s.\n" #: interface.c:256 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem." @@ -1858,11 +2141,11 @@ msgstr "Nu se poate deschide interfața kvm. Asigurați-vă că fetchmail este k #: interface.c:396 #, c-format msgid "Unable to parse interface name from %s" -msgstr "Nu se poate parsa numele interfeței de la %s" +msgstr "Nu se poate analiza numele interfeței de la %s" #: interface.c:418 msgid "get_ifinfo: sysctl (iflist estimate) failed" -msgstr "get_ifinfo: sysctl (estimat iflist) a eșuat" +msgstr "get_ifinfo: sysctl („iflist estimate” estimarea listei de interfețe) a eșuat" #: interface.c:424 msgid "get_ifinfo: malloc failed" @@ -1870,12 +2153,12 @@ msgstr "get_ifinfo: malloc a eșuat" #: interface.c:430 msgid "get_ifinfo: sysctl (iflist) failed" -msgstr "get_ifinfo: sysctl (iflist) a eșuat" +msgstr "get_ifinfo: sysctl („iflist” lista de interfețe) a eșuat" #: interface.c:448 #, c-format msgid "Routing message version %d not understood." -msgstr "Rutarea mesajului versiunea %d nu a fost înțeleasă." +msgstr "Versiunea mesajului de rutare %d nu a fost înțeleasă." #: interface.c:480 #, c-format @@ -1902,17 +2185,17 @@ msgstr "mască de interfață IP nevalidă\n" #: interface.c:651 #, c-format msgid "activity on %s -noted- as %d\n" -msgstr "activitatea pe%s -notată- ca %d\n" +msgstr "activitatea pe %s -notată- ca %d\n" #: interface.c:666 #, c-format msgid "skipping poll of %s, %s down\n" -msgstr "se omite sondarea a %s, %s este jos\n" +msgstr "se omite sondarea a %s, %s este dezactivată\n" #: interface.c:685 #, c-format msgid "skipping poll of %s, %s IP address excluded\n" -msgstr "se omite sondarea a %s, %s adresă IP exclusă\n" +msgstr "se omite sondarea a %s, adresa IP %s este exclusă\n" #: interface.c:697 #, c-format @@ -1922,7 +2205,7 @@ msgstr "activitatea pe %s verificată ca %d\n" #: interface.c:723 #, c-format msgid "skipping poll of %s, %s inactive\n" -msgstr "omiterea sondării a %s, %s inactiv\n" +msgstr "se omite sondarea a %s, %s este inactiv\n" #: interface.c:730 #, c-format @@ -1931,57 +2214,79 @@ msgstr "activitatea pe %s a fost %d, este %d\n" #: kerberos.c:74 msgid "could not decode initial BASE64 challenge\n" -msgstr "nu s-a putut decoda provocarea BASE64 inițială\n" +msgstr "nu s-a putut decodifica provocarea BASE64 inițială\n" #: kerberos.c:137 #, c-format msgid "principal %s in ticket does not match -u %s\n" -msgstr "%s principală în bilet nu se potrivește cu -u %s\n" +msgstr "%s principal în „ticket” nu se potrivește cu „--user %s”\n" #: kerberos.c:145 #, c-format msgid "non-null instance (%s) might cause strange behavior\n" -msgstr "instanță non-null (%s) poate să cauzeze un comportament ciudat\n" +msgstr "instanța non-null (%s) poate să cauzeze un comportament ciudat\n" #: kerberos.c:211 msgid "could not decode BASE64 ready response\n" -msgstr "nu s-a putut decoda răspunsul pregătit BASE64\n" +msgstr "nu s-a putut decodifica răspunsul pregătit BASE64\n" #: kerberos.c:218 msgid "challenge mismatch\n" -msgstr "nepotrivire de provocare\n" +msgstr "provocare nepotrivită\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: eroare la citirea fișierului de blocare „%s”: %s\n" -#: lock.c:98 -msgid "fetchmail: removing stale lockfile\n" -msgstr "fetchmail: se elimină fișierul de blocare vechi\n" +#: lock.c:101 +#, c-format +msgid "fetchmail: removing stale lockfile \"%s\"\n" +msgstr "fetchmail: se elimină fișierul de blocare învechit „%s”\n" + +#: lock.c:105 +#, c-format +msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" +msgstr "fetchmail: nu se poate elimina fișierul de blocare „%s” (%s), încercând să scrie în el\n" + +#: lock.c:119 +#, c-format +msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" +msgstr "fetchmail: nu se poate scrie în fișierul de blocare „%s” (%s), ieșind\n" -#: lock.c:122 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: eroare la deschiderea fișierului de blocare „%s”: %s\n" -#: lock.c:169 -msgid "fetchmail: lock creation failed.\n" -msgstr "fetchmail: crearea blocării a eșuat.\n" +#: lock.c:179 +#, c-format +msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" +msgstr "fetchmail: crearea blocării a eșuat, fișierul pid „%s”: %s\n" -#: netrc.c:220 +#: lock.c:190 +#, c-format +msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" +msgstr "fetchmail: nu se poate elimina sau trunchia fișierul pid „%s”: %s\n" + +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" -msgstr "%s:%d: avertisment: s-a găsit „%s” înaintea de oricare alte nume de gazdă\n" +msgstr "%s:%d: avertisment: „%s” a fost găsit înaintea oricărui nume de gazdă\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: avertisment: jeton necunoscut „%s”\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: eroare la citirea fișierului (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" -msgstr "Avertisment: s-a primit provocarea deteriorată la „AUT(ENTIFICĂ) NTLM”!\n" +msgstr "Avertisment: s-a primit o provocare incorectă pentru „AUTH(ENTICATE) NTLM”!\n" #: ntlmsubr.c:84 msgid "NTLM challenge contains invalid data.\n" @@ -1998,7 +2303,7 @@ msgstr "Întoarceți-vă acum...\n" #: odmr.c:110 msgid "ATRN request refused.\n" -msgstr "Cererea ATRN refuzată.\n" +msgstr "Cererea ATRN a fost refuzată.\n" #: odmr.c:114 msgid "Unable to process ATRN request now\n" @@ -2006,7 +2311,7 @@ msgstr "Nu se poate procesa cererea ATRN acum\n" #: odmr.c:119 msgid "You have no mail.\n" -msgstr "Nu aveți mail.\n" +msgstr "Nu aveți niciun mesaj de email.\n" #: odmr.c:123 msgid "Command not implemented\n" @@ -2025,38 +2330,52 @@ msgstr "Eroare ODMR necunoscută „%s”\n" msgid "receiving message data\n" msgstr "se primesc datele de mesaj\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" -msgstr "Opțiunea --keep nu este suportată cu ODMR\n" +msgstr "Opțiunea „--keep” nu este suportată cu ODMR\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" -msgstr "Opțiunea --flush nu este suportată cu ODMR\n" +msgstr "Opțiunea „--flush” nu este suportată cu ODMR\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" -msgstr "Opțiunea --folder nu este suportată cu ODMR\n" +msgstr "Opțiunea „--folder” nu este suportată cu ODMR\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" -msgstr "Opțiunea --check nu este suportată cu ODMR\n" - +msgstr "Opțiunea „--check” nu este suportată cu ODMR\n" + +# R-GC, scrie: +# pentru a re-traduce/corecta, acest mesaj, +# am folosit informațiile oferite în pagina: +# «https://en.wikipedia.org/wiki/File_descriptor» +# „... +# Operations on a single file descriptor +# read(), write() +# readv(), writev() +# pread(), pwrite() +# recv(), send() <---- +# recvfrom(), sendto() +# recvmsg(), sendmsg() (also used for sending FDs to other processes over a Unix domain socket) +# recvmmsg(), sendmmsg() +# ...” #: opie.c:43 msgid "server recv fatal\n" -msgstr "recv de server fatală\n" +msgstr "eroare fatală de recv() a serverului\n" #: opie.c:57 msgid "Could not decode OTP challenge\n" -msgstr "Nu s-a putut decoda provocarea OTP\n" +msgstr "Nu s-a putut decodifica provocarea OTP\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " -msgstr "Parolă de tip frază secretă: " +msgstr "Fraza secretă de acces: " #: options.c:179 options.c:223 #, c-format msgid "String '%s' is not a valid number string.\n" -msgstr "Șirul „%s” nu este un șir de număr valid.\n" +msgstr "Șirul „%s” nu este un șir de numere valid.\n" #: options.c:188 #, c-format @@ -2065,7 +2384,7 @@ msgstr "Valoarea șirului „%s” este %s decât %d.\n" #: options.c:189 msgid "smaller" -msgstr "mai mic" +msgstr "mai mică" #: options.c:189 msgid "larger" @@ -2074,17 +2393,17 @@ msgstr "mai mare" #: options.c:337 #, c-format msgid "Invalid bad-header policy `%s' specified.\n" -msgstr "Politică de antet deteriorat nevalidă „%s” specificată.\n" +msgstr "S-a specificat politica „--bad-header %s” nevalidă.\n" #: options.c:378 #, c-format msgid "Invalid protocol `%s' specified.\n" -msgstr "Protocol nevalid „%s” specificat.\n" +msgstr "Protocolul „%s” specificat, nu este valid.\n" #: options.c:425 #, c-format msgid "Invalid authentication `%s' specified.\n" -msgstr "Autentificare nevalidă „%s” specificată.\n" +msgstr "Autentificarea „%s” specificată, nu este validă.\n" #: options.c:641 msgid "usage: fetchmail [options] [server ...]\n" @@ -2096,15 +2415,15 @@ msgstr " Opțiunile sunt după cum urmează:\n" #: options.c:643 msgid " -?, --help display this option help\n" -msgstr " -?, --help afișează acest ajutor de opțiune\n" +msgstr " -?, --help afișează acest ajutor\n" #: options.c:644 msgid " -V, --version display version info\n" -msgstr " -V, --version afișează informațiile de versiune\n" +msgstr " -V, --version afișează informațiile despre versiune\n" #: options.c:646 msgid " -c, --check check for messages without fetching\n" -msgstr " -c, --check verifică după mesaje fără aducere\n" +msgstr " -c, --check verifică dacă există mesaje, fără a le prelua\n" #: options.c:647 msgid " -s, --silent work silently\n" @@ -2112,35 +2431,46 @@ msgstr " -s, --silent lucrează silențios\n" #: options.c:648 msgid " -v, --verbose work noisily (diagnostic output)\n" -msgstr " -v, --verbose lucrează zgomotos (ieșire de diagnostic)\n" - +msgstr " -v, --verbose lucrează zgomotos (ieșire de diagnosticare)\n" + +# R-GC, scrie: +# îmi place să fac diferența între serviciile +# normale, ale sistemului sau ale utilizatorului, +# și serviciile demon, care lucrează de cînd +# au fost pornite pînă se oprește sistemul; +# tot timpul sau de formă intermitentă, +# programată implicit, de utlizator sau de-o +# funcție condițională; căutînd un „anume lucru” în sistem sau în afara lui. +# Pentru a exemplifica cele spuse: +# - lxdm = este un serviciu „normal” de sistem/utilizator +# - snort = este un serviciu „demon” #: options.c:649 msgid " -d, --daemon run as a daemon once per n seconds\n" -msgstr " -d, --daemon rulează ca un serviciu odată per n secunde\n" +msgstr " -d, --daemon rulează ca un demon o dată la n secunde\n" #: options.c:650 msgid " -N, --nodetach don't detach daemon process\n" -msgstr " -N, --nodetach nu detașa procesul serviciu\n" +msgstr " -N, --nodetach nu detașa procesul daemon\n" #: options.c:651 msgid " -q, --quit kill daemon process\n" -msgstr " -q, --quit omoară procesul serviciu\n" +msgstr " -q, --quit omoară procesul demon\n" #: options.c:652 msgid " -L, --logfile specify logfile name\n" -msgstr " -L, --logfile specifică numele fișierului de înregistrare\n" +msgstr " -L, --logfile specifică numele fișierului de jurnal\n" #: options.c:653 msgid " --syslog use syslog(3) for most messages when running as a daemon\n" -msgstr " --syslog utilizează syslog(3) pentru majoritatea mesajelor în timpul rulării ca un serviciu\n" +msgstr " --syslog utilizează syslog(3) pentru majoritatea mesajelor în timpul rulării ca un demon\n" #: options.c:654 msgid " --nosyslog turns off use of syslog(3)\n" -msgstr " --nosyslog oprește utilizarea a syslog(3)\n" +msgstr " --nosyslog dezactivează utilizarea lui syslog(3)\n" #: options.c:655 msgid " --invisible don't write Received & enable host spoofing\n" -msgstr " --invisible nu scrie Primite și activează spoofing-ul de gazdă\n" +msgstr " --invisible nu scrie „Received” și activează falsificarea gazdei\n" #: options.c:656 msgid " -f, --fetchmailrc specify alternate run control file\n" @@ -2152,31 +2482,31 @@ msgstr " -i, --idfile specifică fișierul de UID-uri alternativ\n" #: options.c:658 msgid " --pidfile specify alternate PID (lock) file\n" -msgstr " --pidfile specifică fișierul de PID (blocare) alternativ\n" +msgstr " --pidfile specifică fișierul alternativ de PID (blocare)\n" #: options.c:659 msgid " --postmaster specify recipient of last resort\n" -msgstr " --postmaster specifică destinatarul ultimului recurs\n" +msgstr " --postmaster specifică destinatarul în ultimă instanță, dacă totul eșuează\n" #: options.c:660 msgid " --nobounce redirect bounces from user to postmaster.\n" -msgstr " --nobounce redirecționează respingerile de la utilizator la masterul poștei.\n" +msgstr " --nobounce redirecționează respingerile de la utilizator la „postmaster”.\n" #: options.c:661 msgid " --nosoftbounce fetchmail deletes permanently undeliverable messages.\n" -msgstr " --nosoftbounce fetchmail șterge permanent mesajele care nu se pot livra.\n" +msgstr " --nosoftbounce fetchmail șterge permanent mesajele care nu pot fi livrate.\n" #: options.c:662 msgid " --softbounce keep permanently undeliverable messages on server (default).\n" -msgstr " --softbounce păstrează permanent mesajele care nu se pot livra pe server (implicit).\n" +msgstr " --softbounce păstrează permanent mesajele care nu pot fi livrate pe server (implicit).\n" #: options.c:664 msgid " -I, --interface interface required specification\n" -msgstr " -I, --interface interfața necesită specificare\n" +msgstr " -I, --interface specifică interfața necesară\n" #: options.c:665 msgid " -M, --monitor monitor interface for activity\n" -msgstr " -M, --monitor monitorizează interfața pentru activitate\n" +msgstr " -M, --monitor monitorizează activitatea interfeței\n" #: options.c:668 msgid " --ssl enable ssl encrypted session\n" @@ -2192,27 +2522,27 @@ msgstr " --sslcert certificat de client ssl\n" #: options.c:671 msgid " --sslcertck do strict server certificate check (recommended)\n" -msgstr " --sslcertck face o verificare de certificat de server strictă (recomandat)\n" +msgstr " --sslcertck face o verificare strictă a certificatului de server (recomandat)\n" #: options.c:672 msgid " --nosslcertck skip strict server certificate check (insecure)\n" -msgstr " --nosslcertck omite verificarea de certificat de server strictă (nesigur)\n" +msgstr " --nosslcertck omite verificarea strictă a certificatului de server (nesigur)\n" #: options.c:673 msgid " --sslcertfile path to trusted-CA ssl certificate file\n" -msgstr " --sslcertfile cale către fișierul de certificat ssl de încredere CA\n" +msgstr " --sslcertfile calea către fișierul de certificat ssl de încredere CA\n" #: options.c:674 msgid " --sslcertpath path to trusted-CA ssl certificate directory\n" -msgstr " --sslcertpath cale către directorul de certificat ssl de încredere CA\n" +msgstr " --sslcertpath calea către directorul de certificate ssl de încredere CA\n" #: options.c:675 msgid " --sslcommonname expect this CommonName from server (discouraged)\n" -msgstr " --sslcommonname așteaptă acest NumeComun de la server (descurajat)\n" +msgstr " --sslcommonname așteaptă acest „CommonName” de la server (descurajat)\n" #: options.c:676 msgid " --sslfingerprint fingerprint that must match that of the server's cert.\n" -msgstr " --sslfingerprint amprentă care trebuie să se potrivească aceleia a certificatului serverului.\n" +msgstr " --sslfingerprint amprentă care trebuie să se potrivească cu cea de pe certificatul serverului.\n" #: options.c:677 msgid " --sslproto force ssl protocol (see manual)\n" @@ -2232,11 +2562,11 @@ msgid "" " specify policy for handling messages with bad headers\n" msgstr "" " --bad-header {reject|accept}\n" -" specifică politica pentru a manipula mesajele cu antete deteriorate\n" +" specifică politica pentru gestionarea mesajelor cu antete necorespunzătoare\n" #: options.c:684 msgid " -p, --proto[col] specify retrieval protocol (see man page)\n" -msgstr " -p, --proto[col] specifică protocolul de recuperare (consultați pagina man)\n" +msgstr " -p, --proto[col] specifică protocolul de recuperare (consultați pagina manualului)\n" #: options.c:685 msgid " -U, --uidl force the use of UIDLs (pop3 only)\n" @@ -2248,7 +2578,7 @@ msgstr " --idle îi spune serverului IMAP să trimită înștiințar #: options.c:687 msgid " --port TCP port to connect to (obsolete, use --service)\n" -msgstr " --port portul TCP la care să se conecteze (învechit, utilizați --service)\n" +msgstr " --port portul TCP la care să se conecteze (învechit, utilizați „--service”)\n" #: options.c:688 msgid " -P, --service TCP service to connect to (can be numeric TCP port)\n" @@ -2260,11 +2590,11 @@ msgstr " --auth tipul de autentificare (consultați manualul)\n" #: options.c:690 msgid " -t, --timeout server nonresponse timeout\n" -msgstr " -t, --timeout limită de timp de non-răspuns a serverului\n" +msgstr " -t, --timeout specifică timpul de așteptare pentru răspunsul serverului\n" #: options.c:691 msgid " -E, --envelope envelope address header\n" -msgstr " -E, --envelope înfășoară antetul adresei\n" +msgstr " -E, --envelope antetul adresei „plicului”\n" #: options.c:692 msgid " -Q, --qvirtual prefix to remove from local user id\n" @@ -2272,15 +2602,15 @@ msgstr " -Q, --qvirtual prefix pentru a elimina de la id-ul de utilizator lo #: options.c:693 msgid " --principal mail service principal\n" -msgstr " --principal principalul serviciu de mail\n" +msgstr " --principal principalul serviciu de mail (POP3/IMAP, doar cu Kerberos4)\n" #: options.c:694 msgid " --tracepolls add poll-tracing information to Received header\n" -msgstr " --tracepolls adaugă informații de urmărire a sondării la antetul Primite\n" +msgstr " --tracepolls adaugă informații de urmărire a sondării la antetul „Received”\n" #: options.c:696 msgid " -u, --user[name] specify users's login on server\n" -msgstr " -u, --user[name] specifică autentificarea utilizatorului pe server\n" +msgstr " -u, --user[name] specifică autentificarea (numele) utilizatorului pe server\n" #: options.c:697 msgid " -a, --[fetch]all retrieve old and new messages\n" @@ -2308,19 +2638,19 @@ msgstr " -n, --norewrite nu rescrie adresele de antet\n" #: options.c:703 msgid " -l, --limit don't fetch messages over given size\n" -msgstr " -l, --limit nu aduce mesaje peste dimensiunea dată\n" +msgstr " -l, --limit nu preia mesaje peste dimensiunea specificată\n" #: options.c:704 msgid " -w, --warnings interval between warning mail notification\n" -msgstr " -w, --warnings intervalul între înștiințările de mail de avertisment\n" +msgstr " -w, --warnings intervalul dintre înștiințările de email de avertisment\n" #: options.c:706 msgid " -S, --smtphost set SMTP forwarding host\n" -msgstr " -S, --smtphost stabilește gazda de înaintare SMTP\n" +msgstr " -S, --smtphost stabilește gazda de reexpediere SMTP\n" #: options.c:707 msgid " --fetchdomains fetch mail for specified domains\n" -msgstr " --fetchdomains aduce mail pentru domeniile specificate\n" +msgstr " --fetchdomains preia email pentru domeniile specificate\n" #: options.c:708 msgid " -D, --smtpaddress set SMTP delivery domain to use\n" @@ -2352,11 +2682,14 @@ msgstr " --fastuidl face o căutare binară pentru UIDL-uri\n" #: options.c:715 msgid " -e, --expunge set max deletions between expunges\n" -msgstr " -e, --expunge stabilește ștergerile maxime între eliminări\n" +msgstr " -e, --expunge stabilește numărul maxim de mesaje șterse între eliminări\n" +# R-GC, scrie: +# MDA = Message Delivery Agent → → +# «agent de livrare a mesajelor» #: options.c:716 msgid " -m, --mda set MDA to use for forwarding\n" -msgstr " -m, --mda stabilește MDA-ul de utilizat pentru înaintare\n" +msgstr " -m, --mda stabilește MDA-ul (agentul de livrare a mesajelor) de utilizat pentru expediere\n" #: options.c:717 msgid " --bsmtp set output BSMTP file\n" @@ -2372,7 +2705,7 @@ msgstr " -r, --folder specifică numele de dosar de la distanță\n" #: options.c:720 msgid " --showdots show progress dots even in logfiles\n" -msgstr " --showdots arată punctele de progres chiar în fișierele de înregistrare\n" +msgstr " --showdots arată punctele de progres chiar și în fișierele de jurnal\n" #: pop2.c:67 msgid "POP2 does not support STLS. Giving up.\n" @@ -2382,85 +2715,105 @@ msgstr "POP2 nu suportă STLS. Se renunță.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 suportă doar autentificarea prin parolă. Se renunță.\n" -#: pop3.c:330 +# R-GC, scrie: +# am re-tradus/corectat acest mesaj,datorită +# comentariului lăsat de autor în fișierul +# «pop3.c»: +# „ /* +# * The "Maillennium POP3/PROXY server" deliberately truncates +# * TOP replies after c. 64 or 80 kByte (we have varying reports), so +# * disable TOP. Comcast once spewed marketing babble to the extent +# * of protecting Outlook -- pretty overzealous to break a protocol +# * for that that Microsoft could have read, too. Comcast aren't +# * alone in using this software though. +# * <http://lists.ccil.org/pipermail/fetchmail-friends/2004-April/008523.html> +# * (Thanks to Ed Wilts for reminding me of that.) +# * +# * The warning is printed once per server, until fetchmail exits. +# * It will be suppressed when --fetchall or other circumstances make +# * us use RETR anyhow. +# * +# * Matthias Andree +# */” +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" -msgstr "Avertisment: „Maillennium POP3” a fost găsit, se utilizează comanda RETR în locul a TOP.\n" +msgstr "Avertisment: „Maillennium POP3” a fost găsit, se utilizează comanda «RETR» în loc de «TOP».\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "TLS este obligatoriu pentru această sesiune, dar serverul a refuzat comanda CAPA.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "„STLS” este obligatoriu pentru această sesiune, dar serverul a refuzat comanda «CAPA».\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Comanda CAPA este, în orice caz, necesară pentru TLS.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Comanda «CAPA» este, în orice caz, necesară pentru „STLS”.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" -msgstr "%s: înnoirea oportunistă la TLS a eșuat, se încearcă să se continue.\n" +msgstr "%s: încercarea de înnoire la TLS a eșuat, se încearcă să se continue.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" -msgstr "%s: AVERTISMENT: serverul a oferit STLS, dar sslproto a dat ''.\n" +msgstr "%s: AVERTISMENT: serverul a oferit STLS, dar «--sslproto ''» a fost specificată.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Am rămas fără autentificatori autorizați și nu se poate continua.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" -msgstr "Datarea APOP necesară nu s-a găsit în întâmpinare\n" +msgstr "Marcajul temporal APOP necesar, nu a fost găsit în mesajul de întâmpinare\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" -msgstr "Eroare de sintaxă a datării în întâmpinare\n" +msgstr "Eroare de sintaxă a marcajului de timp în mesajul de întâmpinare\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" -msgstr "Datare APOP nevalidă.\n" +msgstr "Marcajul de timp APOP nu este valid.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Cerere de protocol nedefinită în POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "blocarea este ocupată! Există o altă sesiune activă?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" -msgstr "Nu se poate manipula răspunsul UIDL de la serverul upstream.\n" +msgstr "Nu se poate gestiona răspunsul UIDL provenit de la serverul anterior.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Serverul a răspuns cu UID-ul pentru mesajul greșit.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) a fost șters, dar este încă prezent!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" -msgstr "Mesajul inserat în lista de pe server. Nu se poate manipula aceasta.\n" +msgstr "Mesaje inserate în lista de pe server. Nu se poate gestiona aceast lucru.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "eroare de protocol\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "eroare de protocol în timpul aducerii UIDL-urilor\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) a fost șters, dar este încă prezent!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" -msgstr "Opțiunea --folder nu este suportată cu POP3\n" +msgstr "Opțiunea „--folder” nu este suportată cu POP3\n" #: rcfile_y.y:130 msgid "server option after user options" @@ -2472,11 +2825,11 @@ msgstr "SDPS nu este activat." #: rcfile_y.y:217 msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n" -msgstr "fetchmail: opțiunea de interfață este suportată doar sub Linux (fără IPv6) și FreeBSD\n" +msgstr "fetchmail: opțiunea „--interface” este suportată doar sub Linux (fără IPv6) și FreeBSD\n" #: rcfile_y.y:225 msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n" -msgstr "fetchmail: opțiunea de monitorizare este suportată doar sub Linux (fără IPv6) și FreeBSD\n" +msgstr "fetchmail: opțiunea „--monitor” este suportată doar sub Linux (fără IPv6) și FreeBSD\n" #: rcfile_y.y:339 msgid "SSL is not enabled" @@ -2494,21 +2847,21 @@ msgstr "Fișierul %s trebuie să fie un fișier obișnuit.\n" #: rcfile_y.y:439 #, c-format msgid "File %s must have no more than -rwx------ (0700) permissions.\n" -msgstr "Fișierul %s trebuie să nu aibă mai multe de -rwx------ (0700) permisiuni.\n" +msgstr "Fișierul %s nu trebuie să aibă permisiuni mai mult de -rwx------ (0700).\n" #: rcfile_y.y:451 #, c-format msgid "File %s must be owned by you.\n" msgstr "Fișierul %s trebuie să fie deținut de dumneavoastră.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Eroare de sistem necunoscută" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" -msgstr "%s (mesaj de înregistrare incomplet)\n" +msgstr "%s (mesaj de jurnal incomplet)\n" #: rfc822.c:83 #, c-format @@ -2530,15 +2883,15 @@ msgstr "Utilizator restricționat (ceva greșit cu contul)" #: rpa.c:120 msgid "Invalid userid or passphrase" -msgstr "ID de utilizator sau parolă de tip frază nevalidă" +msgstr "ID utilizator sau frază secretă de acces nevalidă" #: rpa.c:121 msgid "Deity error" -msgstr "Eroare de zeitate" +msgstr "Eroare divină" #: rpa.c:174 msgid "RPA token 2: Base64 decode error\n" -msgstr "Jeton RPA 2: eroare de decodare Base64\n" +msgstr "Jeton RPA 2: eroare de decodificare Base64\n" #: rpa.c:185 #, c-format @@ -2553,7 +2906,7 @@ msgstr "Provocarea serviciului (l=%d):\n" #: rpa.c:200 #, c-format msgid "Service timestamp %s\n" -msgstr "Datarea serviciului %s\n" +msgstr "Marcajul temporal al serviciului %s\n" #: rpa.c:205 msgid "RPA token 2 length error\n" @@ -2562,15 +2915,15 @@ msgstr "Eroare de lungime a jetonului RPA 2\n" #: rpa.c:209 #, c-format msgid "Realm list: %s\n" -msgstr "Listă de domeniu: %s\n" +msgstr "Listă de domenii: %s\n" #: rpa.c:213 msgid "RPA error in service@realm string\n" -msgstr "Eroare RPA în serviciu@șir de domeniu\n" +msgstr "Eroare RPA în șirul serviciu@domeniu\n" #: rpa.c:250 msgid "RPA token 4: Base64 decode error\n" -msgstr "Jeton RPA 4: eroare de decodare Base64\n" +msgstr "Jeton RPA 4: eroare de decodificare Base64\n" #: rpa.c:261 #, c-format @@ -2607,7 +2960,7 @@ msgstr "Eroare de lungime de cheie de sesiune RPA: %d\n" #: rpa.c:309 msgid "RPA _service_ auth fail. Spoof server?\n" -msgstr "Eșuare de autentificare de _serviciu_ RPA. Server spoof?\n" +msgstr "Eșuare de autentificare de _serviciu_ RPA. Server falsificat?\n" #: rpa.c:314 msgid "Session key established:\n" @@ -2619,12 +2972,12 @@ msgstr "Autorizare RPA completă\n" #: rpa.c:372 msgid "Get response\n" -msgstr "Obține răspunsul\n" +msgstr "Se obține răspunsul\n" #: rpa.c:402 #, c-format msgid "Get response return %d [%s]\n" -msgstr "Obține întoarcerea răspunsului %d [%s]\n" +msgstr "Se obține mesajul de răspuns %d [%s]\n" #: rpa.c:463 msgid "Hdr not 60\n" @@ -2632,12 +2985,12 @@ msgstr "Antetul nu este 60\n" #: rpa.c:484 msgid "Token length error\n" -msgstr "Eroare de lungime de jeton\n" +msgstr "Eroare de lungime a jetonului\n" #: rpa.c:489 #, c-format msgid "Token Length %d disagrees with rxlen %d\n" -msgstr "Lungimea jetonului %d nu este de acord cu rxlen %d\n" +msgstr "Lungimea jetonului %d este în dezacord cu rxlen %d\n" #: rpa.c:495 msgid "Mechanism field incorrect\n" @@ -2670,7 +3023,7 @@ msgstr "RPA a eșuat să deschidă /dev/urandom. Acest lucru nu ar trebui\n" #: rpa.c:710 msgid " prevent you logging in, but means you\n" -msgstr " să vă prevină din a vă autentifica, dar înseamnă că nu\n" +msgstr " să împiedice a vă autentifica, dar înseamnă că nu\n" #: rpa.c:711 msgid " cannot be sure you are talking to the\n" @@ -2682,7 +3035,7 @@ msgstr " serviciul cu care credeți că vorbiți (atacurile\n" #: rpa.c:713 msgid " attacks by a dishonest service are possible.)\n" -msgstr " de redare de către un serviciu neonest sunt posibile.)\n" +msgstr " de imitare de către un serviciu neonest sunt posibile.)\n" #: rpa.c:724 msgid "User challenge:\n" @@ -2708,21 +3061,21 @@ msgstr "Nu se poate rezolva serviciul %s la numărul de port.\n" #: servport.c:81 msgid "Please specify the service as decimal port number.\n" -msgstr "Specificați serviciul ca un număr de port decimal.\n" +msgstr "Specificați serviciul ca un număr de port zecimal.\n" #: sink.c:231 #, c-format msgid "forwarding to %s\n" -msgstr "se înaintează la %s\n" +msgstr "se retrimite la %s\n" #: sink.c:319 msgid "SMTP: (bounce-message body)\n" -msgstr "SMTP: (corp de mesaj cu săritură)\n" +msgstr "SMTP: (corpul mesajului respins)\n" #: sink.c:322 #, c-format msgid "mail from %s bounced to %s\n" -msgstr "mail de la %s sărit la %s\n" +msgstr "email de la %s returnat la %s\n" #: sink.c:497 sink.c:590 #, c-format @@ -2746,35 +3099,35 @@ msgstr "Scrierea preambulului BSMTP a eșuat: %s.\n" #: sink.c:974 #, c-format msgid "%cMTP listener doesn't like recipient address `%s'\n" -msgstr "Ascultătorului %cMTP nu îi place adresa de recipient „%s”\n" +msgstr "Ascultătorului %cMTP nu-i place adresa destinatarului „%s”\n" #: sink.c:981 #, c-format msgid "%cMTP listener doesn't really like recipient address `%s'\n" -msgstr "Ascultătorului %cMTP nu prea îi place adresa de recipient „%s”\n" +msgstr "Ascultătorului %cMTP nu prea îi place adresa destinatarului „%s”\n" #: sink.c:1027 msgid "no address matches; no postmaster set.\n" -msgstr "nu sunt potriviri de adresă; nu este stabilit niciun master de poștă.\n" +msgstr "nu sunt potriviri de adresă; nu este stabilit niciun „postmaster”.\n" #: sink.c:1039 #, c-format msgid "can't even send to %s!\n" -msgstr "nu se poate nici trimite la %s!\n" +msgstr "nici măcar nu se poate trimite către %s!\n" #: sink.c:1045 #, c-format msgid "no address matches; forwarding to %s.\n" -msgstr "nu sunt potriviri de adresă, se înaintează la %s.\n" +msgstr "nu sunt potriviri de adresă, se retrimite la %s.\n" #: sink.c:1167 #, c-format msgid "MDA option contains single-quoted %%%c expansion.\n" -msgstr "Opțiunea MDA conține expansiunea %%%c cu o singură citare.\n" +msgstr "Opțiunea MDA conține expansiunea „%%%c” între ghilimele simple(' ').\n" #: sink.c:1168 msgid "Refusing to deliver. Check the manual and fix your mda option.\n" -msgstr "Se refuză să se trimită. Verificați manualul și fixați opțiunea mda.\n" +msgstr "Se refuză livrarea. Consultați manualul și corectați opțiunea mda.\n" #: sink.c:1211 #, c-format @@ -2784,12 +3137,12 @@ msgstr "pe cale să se livreze cu: %s\n" #: sink.c:1222 #, c-format msgid "Cannot switch effective user id to %ld: %s\n" -msgstr "Nu se poate comuta id-ul de utilizator efectiv la %ld: %s\n" +msgstr "Nu se poate schimba id-ul de utilizator efectiv la %ld: %s\n" #: sink.c:1234 #, c-format msgid "Cannot switch effective user id back to original %ld: %s\n" -msgstr "Nu se poate comuta id-ul utilizatorului efectiv înapoi la originalul %ld: %s\n" +msgstr "Nu se poate schimba id-ul utilizatorului efectiv înapoi la originalul %ld: %s\n" #: sink.c:1241 msgid "MDA open failed\n" @@ -2803,7 +3156,7 @@ msgstr "Conectarea %cMTP la %s a eșuat\n" #: sink.c:1304 #, c-format msgid "can't raise the listener; falling back to %s" -msgstr "nu se poate ridica ascultătorul; se revine înapoi la %s" +msgstr "nu se poate pornii ascultătorul; se revine înapoi la %s" #: sink.c:1362 #, c-format @@ -2813,7 +3166,7 @@ msgstr "Terminarea mesajului sau închiderea fișierului BSMTP a eșuat: %s\n" #: sink.c:1387 #, c-format msgid "Error writing to MDA: %s\n" -msgstr "Eroare la scrierea la MDA: %s\n" +msgstr "Eroare la scrierea către MDA: %s\n" #: sink.c:1390 #, c-format @@ -2823,133 +3176,142 @@ msgstr "MDA a murit cu semnalul %d\n" #: sink.c:1393 #, c-format msgid "MDA returned nonzero status %d\n" -msgstr "MDA a întors starea nonzero %d\n" +msgstr "MDA a returnat starea nonzero %d\n" #: sink.c:1396 #, c-format msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n" -msgstr "Ciudat: pclose MDA a întors %d și errno %d/%s nu poate manipula la %s:%d\n" +msgstr "Ciudat: pclose() din MDA a returnat %d și codul de eroare %d/%s; nu se poate gestiona acest lucru la %s:%d\n" #: sink.c:1421 msgid "SMTP listener refused delivery\n" msgstr "Ascultătorul SMTP a refuzat livrarea\n" +# R-GC, scrie: +# „EOM = End Of Message” +# . +# „LMTP = Local Mail Transfer Protocol” #: sink.c:1451 msgid "LMTP delivery error on EOM\n" -msgstr "Eroare de livrare LMTP pe EOM\n" +msgstr "Eroare de livrare a protocolului de transfer local de email (LMTP) la sfârșitul mesajului (EOM)\n" #: sink.c:1454 #, c-format msgid "Unexpected non-503 response to LMTP EOM: %s\n" -msgstr "Răspuns non-503 neașteptat la LMTP EOM: %s\n" +msgstr "Răspuns neașteptat diferit de „503” de la LMTP EOM: %s\n" #: sink.c:1620 msgid "The Fetchmail Daemon" -msgstr "Serviciul Fetchmail" +msgstr "Demonul Fetchmail" -#: smtp.c:81 +#: smtp.c:84 msgid "ESMTP CRAM-MD5 Authentication...\n" msgstr "Autentificare ESMTP CRAM-MD5...\n" -#: smtp.c:87 smtp.c:137 +#: smtp.c:90 smtp.c:143 msgid "Server rejected the AUTH command.\n" msgstr "Serverul a refuzat comanda AUTH.\n" -#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159 +#: smtp.c:98 smtp.c:150 smtp.c:159 smtp.c:165 msgid "Bad base64 reply from server.\n" msgstr "Răspuns base64 greșit de la server.\n" -#: smtp.c:99 +#: smtp.c:102 #, c-format msgid "Challenge decoded: %s\n" -msgstr "Provocare decodată: %s\n" +msgstr "Provocare decodificată: %s\n" -#: smtp.c:116 +#: smtp.c:119 msgid "ESMTP PLAIN Authentication...\n" msgstr "Autentificare ESMTP PLAIN...\n" -#: smtp.c:131 +#: smtp.c:137 msgid "ESMTP LOGIN Authentication...\n" msgstr "Autentificare ESMTP LOGIN...\n" -#: smtp.c:348 smtp.c:376 +#: smtp.c:354 smtp.c:382 msgid "smtp listener protocol error\n" msgstr "eroare de protocol de ascultător smtp\n" -#: socket.c:112 socket.c:141 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc a eșuat\n" -#: socket.c:173 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: opțiunii „--plugin” pentru gazda %s serviciul %s îi lipsește argumentul, nu se poate rula!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair a eșuat\n" -#: socket.c:179 +#: socket.c:196 msgid "fetchmail: fork failed\n" -msgstr "fetchmail: fork-ul a eșuat\n" +msgstr "fetchmail: fork() a eșuat\n" -#: socket.c:186 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 a eșuat\n" -#: socket.c:192 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "rulează %s (gazda %s serviciul %s)\n" -#: socket.c:197 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) a eșuat\n" -#: socket.c:272 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "eroare getaddrinfo(\"%s\",\"%s\"): %s\n" -#: socket.c:275 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" -msgstr "Încercați să adăugați opțiunea --service (consultați, de asemenea, elementul de FAQ R12).\n" +msgstr "Încercați să adăugați opțiunea „--service” (consultați, de asemenea, elementul de FAQ R12).\n" -#: socket.c:289 socket.c:292 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "necunoscut (%s)" -#: socket.c:295 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Se încearcă să se conecteze la %s/%s..." -#: socket.c:304 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "nu se poate crea soclul: %s\n" -#: socket.c:306 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "numele %d: nu se poate crea familia de soclu %d tipul %d: %s\n" -#: socket.c:324 +#: socket.c:338 msgid "connection failed.\n" msgstr "conexiunea a eșuat.\n" -#: socket.c:326 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "conexiunea la %s:%s [%s/%s] a eșuat: %s.\n" -#: socket.c:327 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "numele %d: conexiunea la %s:%s [%s/%s] a eșuat: %s.\n" -#: socket.c:333 +#: socket.c:347 msgid "connected.\n" msgstr "conectat.\n" -#: socket.c:346 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2958,241 +3320,256 @@ msgstr "" "Erori de conexiune pentru această sondare:\n" "%s" -#: socket.c:416 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL a raportat: %s\n" -#: socket.c:651 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "SSL verifică adâncimea callback-ului %d: preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Reapelare pentru verificarea SSL nivel %d: verify_ok == %d, err = %d, %s\n" -#: socket.c:657 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Certificat de server:\n" -#: socket.c:662 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" -msgstr "Lanț de certificate, de la root la peer, începând de la adâncimea %d:\n" +msgstr "Lanț de certificate, de la root la peer, începând de la nivelul %d:\n" -#: socket.c:665 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" -msgstr "Certificat la adâncimea %d:\n" +msgstr "Certificat la nivelul %d:\n" -#: socket.c:671 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Organizație emitentă: %s\n" -#: socket.c:674 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" -msgstr "Avertisment: Numele organizației emitente este prea mare (posibil trunchiat).\n" +msgstr "Avertisment: Numele organizației emitente este prea lung (posibil trunchiat).\n" -#: socket.c:676 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Organizație necunoscută\n" -#: socket.c:678 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "NumeComun emitent: %s\n" -#: socket.c:681 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" -msgstr "Avertisment: NumeComun emitent prea mare (posibil trunchiat).\n" +msgstr "Avertisment: NumeComun al emitentului prea lung (posibil trunchiat).\n" -#: socket.c:683 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "NumeComun emitent necunoscut\n" -#: socket.c:689 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "NumeComun subiect: %s\n" -#: socket.c:695 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Certificat deteriorat: NumeComun subiect prea lung!\n" -#: socket.c:701 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Certificat deteriorat: NumeComun subiect conține NUL, se renunță!\n" -#: socket.c:729 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Nume alternativ subiect: %s\n" -#: socket.c:735 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Certificat deteriorat: Nume alternativ subiect conține NUL, se renunță!\n" -#: socket.c:752 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Nepotrivire de NumeComun server: %s != %s\n" -#: socket.c:759 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Numele serverului nu este stabilit, nu s-a putut verifica certificatul!\n" -#: socket.c:764 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "NumeComun al serverului necunoscut\n" -#: socket.c:766 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Numele serverului nu este specificat în certificat!\n" -#: socket.c:778 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() a eșuat!\n" -#: socket.c:782 +#: socket.c:821 msgid "Out of memory!\n" -msgstr "Fără memorie!\n" +msgstr "Memorie insuficientă!\n" -#: socket.c:790 +#: socket.c:829 msgid "Digest text buffer too small!\n" -msgstr "Preîncărcarea de text de digest este prea mică!\n" +msgstr "Memoria tampon pentru suma de control a textului este prea mică!\n" -#: socket.c:796 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "amprentă de cheie %s: %s\n" -#: socket.c:800 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "amprentele %s se potrivesc.\n" -#: socket.c:802 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "amprentele %s nu se potrivesc!\n" -#: socket.c:814 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" -msgstr "Eroare de verificare de certificat de server: %s\n" +msgstr "Eroare de verificare a certificatului serverului: %s\n" -#: socket.c:829 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Lanț de certificare rupt la: %s\n" -#: socket.c:831 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" -msgstr "Acest lucru poate să însemne că serverul nu a furnizat certificatul(ele) CA-ului intermediar, care nu este nimic fetchmail ar putea face ceva. Pentru detalii, consultați documentul README.SSL-SERVER care vine cu fetchmail.\n" +msgstr "Acest lucru poate să însemne că serverul nu a furnizat certificatul(ele) intermediar(e) CA, iar fetchmail nu poate face nimic în această privință. Pentru detalii, consultați documentul README.SSL-SERVER care vine cu fetchmail.\n" -#: socket.c:841 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" -msgstr "Lipsește certificatul de ancoră de încredere: %s\n" +msgstr "Lipsește certificatul inițial de încredere: %s\n" -#: socket.c:844 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" -msgstr "Acest lucru poate să însemne că certificatul semnatar al CA-ului root nu este în locația certificatului CA de încredere, sau că c_rehash are nevoie să fie rulat în directorul certificatului. Pentru detalii, consultați documentația a --sslcertpath și --sslcertfile în pagina manualului. Consultați README.SSL pentru detalii.\n" +msgstr "Acest lucru ar putea însemna că certificatul de semnare al CA rădăcină nu se află în locația de încredere a certificatului CA sau că c_rehash trebuie să fie rulat în directorul de certificate. Pentru detalii, consultați documentația opțiunilor „--sslcertpath” și „--sslcertfile” în pagina manualului. Consultați README.SSL pentru detalii.\n" -#: socket.c:918 socket.c:996 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" -msgstr "Versiunea OpenSSL nu suportă SSLv3.\n" +msgstr "Versiunea aceasta de OpenSSL nu suportă SSLv3.\n" -#: socket.c:936 socket.c:1014 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" -msgstr "Versiunea OpenSSL nu suportă TLS v1.1.\n" +msgstr "Versiunea aceasta de OpenSSL nu suportă TLS v1.1.\n" -#: socket.c:947 socket.c:1025 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" -msgstr "Versiunea OpenSSL nu suportă TLS v1.2.\n" +msgstr "Versiunea aceasta de OpenSSL nu suportă TLS v1.2.\n" -#: socket.c:958 socket.c:1036 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" -msgstr "Versiunea OpenSSL nu suportă TLS v1.3.\n" +msgstr "Versiunea aceasta de OpenSSL nu suportă TLS v1.3.\n" -#: socket.c:967 socket.c:1046 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" -msgstr "Protocol SSL nevalid „%s” specificat, se utilizează selectarea automată (auto) implicită.\n" +msgstr "S-a specificat protocolul SSL „%s” nevalid, se utilizează selectarea automată (auto) implicită.\n" -#: socket.c:1081 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Biblioteca wolfSSL %#lx încărcată, este mai veche decât antetele %#lx, refuzând să funcționeze.\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" -msgstr "S-a încărcat biblioteca OpenSSL %#lx mai veche decât antetele %#lx, refuză să funcționeze.\n" +msgstr "Biblioteca OpenSSL %#lx încărcată este mai veche decât antetele %#lx, refuză să funcționeze.\n" -#: socket.c:1086 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" -msgstr "S-a încărcat biblioteca OpenSSL %#lx mai nouă decât antetele %#lx, se încearcă să se continue.\n" +msgstr "Biblioteca OpenSSL %#lx încărcată este mai nouă decât antetele %#lx, se încearcă să se continue.\n" -#: socket.c:1106 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Descriptorul fișierului este în afara intervalului pentru SSL" -#: socket.c:1127 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" -msgstr "Observați că unele distribuții dezactivează versiunile de protocol mai vechi în moduri non-standard ciudate. Încercați o versiune de protocol nouă.\n" +msgstr "Rețineți că unele distribuții dezactivează versiunile mai vechi de protocol în moduri ciudate, nestandard. Încercați o versiune de protocol nouă.\n" + +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Nu se pot încărca locațiile de verificare (fișier=„%s”, dir=„%s”), eroare %d:\n" -#: socket.c:1195 +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" -msgstr "Avertisment: SSL_set_tlsext_host_name(%p, \"%s\") a eșuat (codul %#lx), se încearcă să se continue.\n" +msgstr "Avertisment: SSL_set_tlsext_host_name(%p, „%s”) a eșuat cu (codul de eroare %#lx), se încearcă să se continue.\n" + +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: soclul %d: wolfSSL_check_domain_name(%#p, „%s”) a returnat %d, se încearcă să se continue.\n" -#: socket.c:1210 +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" -msgstr "Avertisment: X509_VERIFY_PARAM_set1_host(%p, \"%s\") a eșuat (codul %#x), se încearcă să se continue.\n" +msgstr "Avertisment: X509_VERIFY_PARAM_set1_host(%p, \"%s\") a eșuat cu (codul de eroare %#x), se încearcă să se continue.\n" -#: socket.c:1247 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Serverul a închis conexiunea prematur în timpul SSL_connect().\n" -#: socket.c:1250 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Eroare de sistem în timpul SSL_connect(): %s\n" -#: socket.c:1250 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." -msgstr "strângerea de mână a eșuat la nivelul de conexiune sau de protocol." +msgstr "negocierea a eșuat la nivelul de conexiune sau de protocol." -#: socket.c:1270 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Nu se poate obține cifrul SSL/TLS curent - nu există nicio sesiune stabilită?\n" -#: socket.c:1273 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: se utilizează protocolul %s, cifrul %s, biții secreți/procesați %d/%d\n" -#: socket.c:1280 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Verificarea certificatului/amprentei a fost cumva omisă!\n" -#: socket.c:1297 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" -msgstr "Avertisment: conexiunea nu este sigură, se continuă oricum. (Utilizați mai bine --sslcertck!)\n" +msgstr "Avertisment: conexiunea nu este sigură, se continuă oricum. (Utilizați mai bine „--sslcertck”!)\n" -#: socket.c:1339 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Reîncercare de citire a soclului Cygwin\n" -#: socket.c:1342 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Reîncercarea de citire a soclului Cygwin a eșuat!\n" #: transact.c:79 #, c-format msgid "mapped address %s to local %s\n" -msgstr "s-a mapat adresa %s la locala %s\n" +msgstr "adresa %s este alocată la locala %s\n" #: transact.c:101 #, c-format msgid "mapped %s to local %s\n" -msgstr "s-a mapat %s la locala %s\n" +msgstr "s-a alocat %s la locala %s\n" #: transact.c:168 #, c-format @@ -3205,7 +3582,7 @@ msgid "" "analyzing Received line:\n" "%s" msgstr "" -"se analizează linia Primit:\n" +"se analizează linia „Received”:\n" "%s" #: transact.c:279 @@ -3220,70 +3597,70 @@ msgstr "linie respinsă, %s nu este un alias al serverului de mail\n" #: transact.c:359 msgid "no Received address found\n" -msgstr "nicio adresă Primite găsită\n" +msgstr "nu s-a găsit nicio adresă în linia „Received”\n" #: transact.c:368 #, c-format msgid "found Received address `%s'\n" -msgstr "s-a găsit adresa Primite „%s”\n" +msgstr "s-a găsit adresa „%s” în linia „Received”\n" #: transact.c:613 msgid "incorrect header line found - see manpage for bad-header option\n" -msgstr "s-a găsit linia de antet incorectă - consultați pagina de manual pentru opțiunea de antet deteriorat\n" +msgstr "s-a găsit o linie de antet incorectă - consultați pagina de manual pentru opțiunea „--bad-header”\n" #: transact.c:615 #, c-format msgid "line: %s" -msgstr "linie: %s" +msgstr "linia: %s" #: transact.c:1087 transact.c:1097 #, c-format msgid "Parsing envelope \"%s\" names \"%-.*s\"\n" -msgstr "Parsarea plicului „%s” nume „%-.*s”\n" +msgstr "Analizarea plicului „%s” nume „%-.*s”\n" #: transact.c:1112 #, c-format msgid "Parsing Received names \"%-.*s\"\n" -msgstr "Parsarea numelor Primite „%-.*s”\n" +msgstr "Se analizează numele „%-.*s” din linia „Received”\n" #: transact.c:1124 msgid "No envelope recipient found, resorting to header guessing.\n" -msgstr "Nu s-a găsit niciun recipient de plic, se resortează la ghicirea antetului.\n" +msgstr "Nu s-a găsit niciun destinatar pe plic, se încearcă ghicirea lui pe baza informației din antet.\n" #: transact.c:1142 #, c-format msgid "Guessing from header \"%-.*s\".\n" -msgstr "Se ghicește de la antetul „%-.*s”.\n" +msgstr "Se ghicește din antetul „%-.*s”.\n" #: transact.c:1157 #, c-format msgid "no local matches, forwarding to %s\n" -msgstr "nu există potriviri locale, se înaintează la %s\n" +msgstr "nu există potriviri locale, se retrimite la %s\n" #: transact.c:1172 msgid "forwarding and deletion suppressed due to DNS errors\n" -msgstr "înaintarea și ștergerea suprimate din cauza erorilor DNS\n" +msgstr "retrimiterea și ștergerea suprimate din cauza erorilor DNS\n" #: transact.c:1283 msgid "writing RFC822 msgblk.headers\n" -msgstr "scrierea RFC822 msgblk.headers\n" +msgstr "se scriu antetele „msgblk.headers” în conformitate cu RFC822\n" #: transact.c:1302 msgid "no recipient addresses matched declared local names" -msgstr "nu există adrese de recipient care se potrivesc cu numele locale declarate" +msgstr "nu există adrese de destinatar care să se potrivească cu numele locale declarate" #: transact.c:1309 #, c-format msgid "recipient address %s didn't match any local name" -msgstr "adresa de recipient %s nu s-a potrivit niciunui nume local" +msgstr "adresa de destinatar %s nu s-a potrivit niciunui nume local" #: transact.c:1318 msgid "message has embedded NULs" -msgstr "mesajul are NUL-uri codate" +msgstr "mesajul conține caractere „NULL”" #: transact.c:1326 msgid "SMTP listener rejected local recipient addresses: " -msgstr "ascultătorul SMTP a respins adresele de recipient locale: " +msgstr "Ascultătorul SMTP a respins adresele destinatarilor locali: " #: transact.c:1376 msgid "error writing message text\n" @@ -3292,12 +3669,12 @@ msgstr "eroare la scrierea textului mesajului\n" #: transact.c:1652 #, c-format msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n" -msgstr "Preîncărcarea este prea mică. Aceasta este o defecțiune în apelantul lui %s:%lu.\n" +msgstr "Memoria tampon este prea mică. Aceasta este o eroare în rutina de apelare a lui %s:%lu.\n" #: uid.c:262 #, c-format msgid "Open or read error while reading idfile %s: %s\n" -msgstr "Eroare de deschidere sau citire în timpul citirii fișierului id %s: %s\n" +msgstr "Eroare de deschidere sau citire în timpul citirii fișierului de id-uri %s: %s\n" #: uid.c:273 #, c-format @@ -3306,11 +3683,11 @@ msgstr "Listă de UID veche de la %s:\n" #: uid.c:277 uid.c:286 uid.c:355 msgid " <empty>" -msgstr " <empty>" +msgstr " <goală>" #: uid.c:284 msgid "Scratch list of UIDs:\n" -msgstr "Listă de răzuire de UID-uri:\n" +msgstr "Listă de UID-uri începută de la zero:\n" #: uid.c:369 uid.c:413 #, c-format @@ -3324,7 +3701,7 @@ msgstr "Listă de UID nouă de la %s:\n" #: uid.c:402 msgid "not swapping UID lists, no UIDs seen this query\n" -msgstr "nu se comută listele UID, nu există UID-uri care au văzut această interogare\n" +msgstr "listele de UID nu sunt schimbate, nu au fost găsite UID-uri în această interogare\n" #: uid.c:422 msgid "discarding new UID list\n" @@ -3332,7 +3709,7 @@ msgstr "se ignoră lista de UID nouă\n" #: uid.c:479 msgid "Deleting fetchids file.\n" -msgstr "Se șterge fișierul fetchids.\n" +msgstr "Se șterge fișierul „fetchids”.\n" #: uid.c:482 #, c-format @@ -3341,27 +3718,27 @@ msgstr "Eroare la ștergerea a %s: %s\n" #: uid.c:489 msgid "Writing fetchids file.\n" -msgstr "Se scrie fișierul fetchids.\n" +msgstr "Se scrie fișierul „fetchids”.\n" #: uid.c:503 uid.c:512 #, c-format msgid "Write error on fetchids file %s: %s\n" -msgstr "Eroare de scriere la fișierul fetchids %s: %s\n" +msgstr "Eroare de scriere în fișierul „fetchids” %s: %s\n" #: uid.c:524 #, c-format msgid "Error writing to fetchids file %s, old file left in place.\n" -msgstr "Eroare la scrierea la fișierul fetchids %s, fișierul vechi este lăsat pe loc.\n" +msgstr "Eroare la scrierea în fișierul „fetchids” %s, fișierul vechi este lăsat pe loc.\n" #: uid.c:528 #, c-format msgid "Cannot rename fetchids file %s to %s: %s\n" -msgstr "Nu se poate redenumi fișierul fetchids %s la %s: %s\n" +msgstr "Nu se poate redenumi fișierul „fetchids” %s la %s: %s\n" #: uid.c:532 #, c-format msgid "Cannot open fetchids file %s for writing: %s\n" -msgstr "Nu se poate deschide fișierul fetchids %s pentru scriere: %s\n" +msgstr "Nu se poate deschide fișierul „fetchids” %s pentru scriere: %s\n" #: xmalloc.c:28 msgid "malloc failed\n" @@ -2,193 +2,199 @@ # Copyright (C) 2005 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. # Pavel Maryanov <acid_jack@ukr.net>, 2003, 2005, 2006, 2007, 2008, 2009. +# Kirill Isakov <k@isakov.net>, 2023. # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.3.10-pre1\n" -"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n" -"POT-Creation-Date: 2009-05-25 23:50+0200\n" -"PO-Revision-Date: 2009-06-05 14:53+0200\n" -"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n" -"Language-Team: Russian <gnu@mx.ru>\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" +"Project-Id-Version: fetchmail 6.4.35\n" +"Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-03-22 18:55+0600\n" +"Last-Translator: Kirill Isakov <k@isakov.net>\n" +"Language-Team: Russian <gnu@d07.ru>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 3.2.2\n" -#: checkalias.c:179 +#: checkalias.c:174 #, c-format msgid "Checking if %s is really the same node as %s\n" -msgstr "Проверяется, если %s действительно такой же узел, как и %s\n" +msgstr "Проверяю, является ли %s тем же узлом, что и %s\n" -#: checkalias.c:183 +#: checkalias.c:178 msgid "Yes, their IP addresses match\n" msgstr "Да, их IP-адреса совпадают\n" -#: checkalias.c:187 +#: checkalias.c:182 msgid "No, their IP addresses don't match\n" msgstr "Нет, их IP-адреса не совпадают\n" -#: checkalias.c:203 +#: checkalias.c:207 #, c-format msgid "nameserver failure while looking for '%s' during poll of %s: %s\n" -msgstr "Выполняя поиск `%s', nameserver возвратил ошибку во время опроса %s: %s.\n" +msgstr "nameserver вернул ошибку при поиске «%s» во время опроса %s: %s.\n" -#: checkalias.c:228 +#: checkalias.c:230 #, c-format msgid "nameserver failure while looking for `%s' during poll of %s.\n" -msgstr "Выполняя поиск `%s', nameserver возвратил ошибку во время опроса %s.\n" +msgstr "nameserver вернул ошибку при поиске «%s» во время опроса %s.\n" -#: cram.c:95 +#: cram.c:95 ntlmsubr.c:65 msgid "could not decode BASE64 challenge\n" -msgstr "невозможно было декодировать запрос BASE64\n" +msgstr "невозможно декодировать запрос BASE64\n" #: cram.c:103 #, c-format msgid "decoded as %s\n" msgstr "декодирован как %s\n" -#: driver.c:191 +#: driver.c:199 #, c-format msgid "kerberos error %s\n" msgstr "ошибка kerberos %s\n" -#: driver.c:249 driver.c:254 +#: driver.c:259 driver.c:265 #, c-format -msgid "krb5_sendauth: %s [server says '%*s'] \n" -msgstr "krb5_sendauth: %s [сервер сообщил '%*s'] \n" +msgid "krb5_sendauth: %s [server says '%s']\n" +msgstr "krb5_sendauth: %s [сервер сообщил «%s»] \n" -#: driver.c:335 -msgid "Subject: Fetchmail oversized-messages warning" -msgstr "Тема: Предупреждение Fetchmail о превышении размера сообщений" +#: driver.c:345 +msgid "Fetchmail oversized-messages warning" +msgstr "Предупреждение fetchmail о превышении размера сообщений" -#: driver.c:339 +#: driver.c:349 #, c-format msgid "The following oversized messages were deleted on server %s account %s:" msgstr "Следующие сообщения завышенного размера были удалены с почтового сервера %s, учётная запись %s:" -#: driver.c:343 +#: driver.c:353 #, c-format msgid "The following oversized messages remain on server %s account %s:" -msgstr "Следующие сообщения завышенного размера находятся на почтовом сервере %s, учётная запись %s:" +msgstr "Следующие сообщения завышенного размера остались на почтовом сервере %s, учётная запись %s:" -#: driver.c:362 +#: driver.c:372 #, c-format msgid " %d message %d octets long deleted by fetchmail." msgid_plural " %d messages %d octets long deleted by fetchmail." msgstr[0] " fetchmail удалил %d сообщение длиной %d октетов." -msgstr[1] " fetchmail удалил %d сообщений длиной %d октетов." +msgstr[1] " fetchmail удалил %d сообщения длиной %d октетов." +msgstr[2] " fetchmail удалил %d сообщений длиной %d октетов." -#: driver.c:367 +#: driver.c:377 #, c-format msgid " %d message %d octets long skipped by fetchmail." msgid_plural " %d messages %d octets long skipped by fetchmail." msgstr[0] " fetchmail пропустил %d сообщение длиной %d октетов." -msgstr[1] " fetchmail пропустил %d сообщений длиной %d октетов." +msgstr[1] " fetchmail пропустил %d сообщения длиной %d октетов." +msgstr[2] " fetchmail пропустил %d сообщений длиной %d октетов." -#: driver.c:511 +#: driver.c:522 #, c-format msgid "skipping message %s@%s:%d" msgstr "пропускается сообщение %s@%s:%d" -#: driver.c:565 +#: driver.c:577 #, c-format msgid "skipping message %s@%s:%d (%d octets)" msgstr "пропускается сообщение %s@%s:%d (%d октетов)" -#: driver.c:581 +#: driver.c:593 msgid " (length -1)" msgstr " (длина -1)" -#: driver.c:584 +#: driver.c:596 msgid " (oversized)" msgstr " (завышенного размера)" -#: driver.c:602 +#: driver.c:614 #, c-format msgid "couldn't fetch headers, message %s@%s:%d (%d octets)\n" -msgstr "невозможно было извлечь заголовки, сообщение %s@%s:%d (%d октетов)\n" +msgstr "невозможно извлечь заголовки, сообщение %s@%s:%d (%d октетов)\n" -#: driver.c:619 +#: driver.c:632 #, c-format msgid "reading message %s@%s:%d of %d" msgstr "считывается сообщение %s@%s:%d из %d" -#: driver.c:624 +#: driver.c:637 #, c-format msgid " (%d octets)" msgstr " (%d октетов)" -#: driver.c:625 +#: driver.c:638 #, c-format msgid " (%d header octets)" msgstr " (%d октетов в заголовке)" -#: driver.c:692 +#: driver.c:708 #, c-format msgid " (%d body octets)" msgstr " (%d октетов в теле)" -#: driver.c:751 +#: driver.c:770 #, c-format msgid "message %s@%s:%d was not the expected length (%d actual != %d expected)\n" msgstr "длина сообщения %s@%s:%d не совпала с ожидаемой (%d на самом деле != %d ожидалось)\n" -#: driver.c:783 +#: driver.c:802 msgid " retained\n" msgstr " задержано\n" -#: driver.c:793 +#: driver.c:812 msgid " flushed\n" msgstr " очищено\n" -#: driver.c:810 +#: driver.c:824 msgid " not flushed\n" msgstr " не очищено\n" -#: driver.c:828 +#: driver.c:842 #, c-format msgid "fetchlimit %d reached; %d message left on server %s account %s\n" msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "Достигнут предел извлечения %d; осталось %d сообщение, сервер %s, учётная запись %s\n" -msgstr[1] "Достигнут предел извлечения %d; осталось %d сообщений, сервер %s, учётная запись %s\n" +msgstr[1] "Достигнут предел извлечения %d; осталось %d сообщения, сервер %s, учётная запись %s\n" +msgstr[2] "Достигнут предел извлечения %d; осталось %d сообщений, сервер %s, учётная запись %s\n" -#: driver.c:885 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "таймаут после %d секунд ожидания подключения к серверу %s.\n" -#: driver.c:889 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "таймаут после %d секунд ожидания сервера %s.\n" -#: driver.c:893 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "таймаут после %d секунд ожидания %s.\n" -#: driver.c:898 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "таймаут после %d секунд ожидания ответа от слушателя.\n" -#: driver.c:901 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "таймаут после %d секунд.\n" -#: driver.c:913 -msgid "Subject: fetchmail sees repeated timeouts" -msgstr "Тема: fetchmail наблюдает повторяющиеся тайм-ауты" +#: driver.c:928 +msgid "fetchmail sees repeated timeouts" +msgstr "fetchmail наблюдает повторяющиеся таймауты" -#: driver.c:916 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" -msgstr "Fetchmail обнаружил более %d тайм-аутов при попытке получения почты из %s@%s.\n" +msgstr "Fetchmail обнаружил более %d таймаутов при попытке получения почты из %s@%s.\n" -#: driver.c:920 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -197,87 +203,81 @@ msgid "" "\n" "Fetchmail won't poll this mailbox again until you restart it.\n" msgstr "" -"Это может означать, что возникла пробка на вашем почтовом\n" -"сервере или на вашем SMTP-сервере, или ваш файл почтового\n" -"ящика на сервере был поврежден из-за ошибки на сервере.\n" -"Вы можете запустить `fetchmail -v -v', чтобы провести\n" -"диагностику проблемы.\n" +"Это может означать, что возникла пробка на вашем почтовом-\n" +"или SMTP-сервере, или ваш файл почтового ящика на сервере\n" +"был поврежден из-за серверной ошибки. Выполните команду\n" +"«fetchmail -v -v», чтобы провести диагностику проблемы.\n" "\n" "Fetchmail не будет опрашивать этот почтовый ящик до тех\n" "пор, пока вы его не перезапустите.\n" -#: driver.c:946 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" -msgstr "выполняемая до соединения команда завершена с сигналом %d\n" +msgstr "выполняемая до соединения команда завершена сигналом %d\n" -#: driver.c:949 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "сбой команды, выполняемой до соединения; статус: %d\n" -#: driver.c:973 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" -msgstr "невозможно было найти HESIOD pobox для %s\n" +msgstr "не удалось найти HESIOD pobox для %s\n" -#: driver.c:994 +#: driver.c:1015 msgid "Lead server has no name.\n" -msgstr "Ведущий сервер без имени.\n" +msgstr "Ведущий сервер не имеет имени.\n" -#: driver.c:1018 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" -msgstr "невозможно было найти каноническое имя DNS %s (%s): %s\n" +msgstr "не удалось найти каноническое имя DNS %s (%s): %s\n" -#: driver.c:1065 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "сбой %s-подключения к %s" -#: driver.c:1081 -msgid "Subject: Fetchmail unreachable-server warning." -msgstr "Тема: Предупреждение Fetchmail о недоступности сервера." - -#: driver.c:1083 -#, c-format -msgid "Fetchmail could not reach the mail server %s:" -msgstr "Fetchmail не смог установить связь с почтовым сервером %s:" - -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "Сбой подключения через SSL.\n" -#: driver.c:1164 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Ошибка блокировки занятости для %s@%s\n" -#: driver.c:1168 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Ошибка занятости сервера для %s@%s\n" -#: driver.c:1173 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Ошибка авторизации для %s@%s%s\n" -#: driver.c:1176 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (ранее авторизовано)" -#: driver.c:1197 +#: driver.c:1187 +msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" +msgstr "См. помощь на http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" + +#: driver.c:1208 #, c-format -msgid "Subject: fetchmail authentication failed on %s@%s" -msgstr "Тема: Ошибка аутентификации fetchmail для %s@%s" +msgid "fetchmail authentication failed on %s@%s" +msgstr "Ошибка аутентификации fetchmail для %s@%s" -#: driver.c:1201 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail не смог получить почту из %s@%s.\n" -#: driver.c:1205 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -286,12 +286,12 @@ msgid "" "error message." msgstr "" "Не удалось пройти авторизацию.\n" -"Так как, для этого подключения авторизация уже была успешно выполнена,\n" +"Так как для этого подключения авторизация уже была успешно выполнена,\n" "возможно, возникла другая ошибка (например, сервер занят), которую\n" "fetchmail не смог распознать из-за того, что сервер не отправил\n" "сообщение об ошибке." -#: driver.c:1211 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -311,7 +311,7 @@ msgstr "" "подключиться. В дальнейшем уведомления отправляться не будут до тех\n" "пор, пока служба не будет восстановлена." -#: driver.c:1221 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -322,189 +322,201 @@ msgid "" "at each cycle. No future notifications will be sent until service\n" "is restored." msgstr "" -"Не удалось пройти авторизацию.\n" +"Не удалось пройти авторизацию.\n" "Возможно, это означает, что ваш пароль неверен, но\n" "некоторые серверы имеют другие режимы отказов, которые\n" "fetchmail не может выделить из этой ошибки, потому что они\n" -"не отправляют нужных сообщений об ошибке при неудачном\n" -"входе в систему.\n" +"не отправляют сообщений об ошибке при неудачном входе.\n" "\n" -"Демон fetchmail продолжит свою работу и будет пытаться\n" +"Демон fetchmail продолжит работу и будет пытаться\n" "подключиться в каждом цикле. В дальнейшем уведомления\n" "отправляться не будут до тех пор, пока служба не будет\n" "восстановлена." -#: driver.c:1237 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Немедленно повторить опрос для %s@%s\n" -#: driver.c:1242 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Ошибка сокета или TLS для %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Неизвестный логин или ошибка аутентификации для %s@%s\n" -#: driver.c:1266 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Авторизация выполнена для %s@%s\n" -#: driver.c:1272 +#: driver.c:1291 #, c-format -msgid "Subject: fetchmail authentication OK on %s@%s" -msgstr "Тема: Выполнена авторизация fetchmail для %s@%s" +msgid "fetchmail authentication OK on %s@%s" +msgstr "Выполнена аутентификация fetchmail для %s@%s" -#: driver.c:1276 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail вошел в систему %s@%s.\n" -#: driver.c:1280 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Служба была восстановлена.\n" -#: driver.c:1312 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "выбирается или повторяется опрос каталога %s\n" -#: driver.c:1314 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "выбирается или повторяется опрос каталога по умолчанию\n" -#: driver.c:1326 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s на %s (каталог %s)" -#: driver.c:1329 rcfile_y.y:384 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s на %s" -#: driver.c:1334 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Опрашивается %s\n" -#: driver.c:1338 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d сообщение (%d %s) для %s" -msgstr[1] "%d сообщений (%d %s) для %s" +msgstr[1] "%d сообщения (%d %s) для %s" +msgstr[2] "%d сообщений (%d %s) для %s" -#: driver.c:1341 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "просмотрено" msgstr[1] "просмотрено" +msgstr[2] "просмотрено" -#: driver.c:1344 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d сообщение для %s" -msgstr[1] "%d сообщений для %s" +msgstr[1] "%d сообщения для %s" +msgstr[2] "%d сообщений для %s" -#: driver.c:1351 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d октетов).\n" -#: driver.c:1357 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" -msgstr "Для %s почты нет\n" +msgstr "Нет почты для %s\n" -#: driver.c:1390 imap.c:90 +#: driver.c:1410 msgid "bogus message count!" msgstr "фиктивное количество сообщений!" -#: driver.c:1534 +#: driver.c:1462 +#, c-format +msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" +msgstr "Слишком много писем пропущено (%d > %d) из-за временных ошибок для %s\n" + +#: driver.c:1568 msgid "socket" msgstr "сокет" -#: driver.c:1537 +#: driver.c:1571 msgid "missing or bad RFC822 header" -msgstr "отсутствует или неверный заголовок RFC822" +msgstr "заголовок RFC822 отсутствует или некорректен" -#: driver.c:1540 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1543 +#: driver.c:1577 msgid "client/server synchronization" msgstr "синхронизация клиент/сервер" -#: driver.c:1546 +#: driver.c:1580 msgid "client/server protocol" msgstr "протокол клиент/сервер" -#: driver.c:1549 +#: driver.c:1583 msgid "lock busy on server" msgstr "блокировка занятости на сервере" -#: driver.c:1552 +#: driver.c:1586 msgid "SMTP transaction" msgstr "SMTP-транзакция" -#: driver.c:1555 +#: driver.c:1589 msgid "DNS lookup" msgstr "DNS-запрос" -#: driver.c:1558 +#: driver.c:1592 msgid "undefined" msgstr "неопределённый" -#: driver.c:1564 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" -msgstr "Ошибка %s при выборке из %s@%s и доставке на хост SMTP %s\n" +msgstr "Ошибка %s при загрузке почты из %s@%s и доставке на узел SMTP %s\n" -#: driver.c:1566 +#: driver.c:1600 msgid "unknown" -msgstr "неизв." +msgstr "неизвестно" -#: driver.c:1568 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" -msgstr "Ошибка %s при выборке из %s@%s\n" +msgstr "Ошибка %s при загрузке почты из %s@%s\n" -#: driver.c:1580 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" -msgstr "выполняемая после соединения команда завершена с сигналом %d\n" +msgstr "выполняемая после соединения команда завершена сигналом %d\n" -#: driver.c:1582 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" -msgstr "сбой команды, выполняемой после соединения; статус: %d\n" +msgstr "сбой команды, выполняемой после соединения, со статусом %d\n" -#: driver.c:1601 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" -msgstr "Поддержка Kerberos V4 не связана.\n" +msgstr "fetchmail собран без поддержки Kerberos V4.\n" -#: driver.c:1609 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" -msgstr "Поддержка Kerberos V5 не связана.\n" +msgstr "fetchmail собран без поддержки Kerberos V5.\n" -#: driver.c:1620 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Опция --flush не поддерживается с %s\n" -#: driver.c:1626 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Опция --all не поддерживается с %s\n" -#: driver.c:1635 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Опция --limit не поддерживается с %s\n" -#: env.c:59 +#: env.c:58 #, c-format msgid "" "%s: The QMAILINJECT environment variable is set.\n" @@ -514,13 +526,13 @@ msgid "" "%s: Abort.\n" msgstr "" "%s: Установлена переменная окружения QMAILINJECT.\n" -"Она представляет собой опасность, т.к. с ней можно сделать\n" -"qmail-inject или подменить qmail'овский упаковщик sendmail\n" +"Это опасно, так как она позволяет выполнить qmail-inject\n" +"или подменить qmail'овский упаковщик sendmail\n" "своими заголовками From: или Message-ID:.\n" -"Попробуйте \"env QMAILINJECT= %s СВОИ АРГУМЕНТЫ\"\n" -"%s: Сброс.\n" +"Попробуйте «env QMAILINJECT= %s ВАШИ АРГУМЕНТЫ»\n" +"%s: Завершение работы.\n" -#: env.c:71 +#: env.c:70 #, c-format msgid "" "%s: The NULLMAILER_FLAGS environment variable is set.\n" @@ -530,50 +542,58 @@ msgid "" "%s: Abort.\n" msgstr "" "%s: Установлена переменная окружения NULLMAILER_FLAGS.\n" -"Она представляет собой опасность, т.к. с ней можно сделать\n" -"nullmailer-inject или подменить nullmailer'овский упаковщик sendmail\n" +"Это опасно, так как она позволяет выполнить nullmailer-inject\n" +"или подменить nullmailer'овский упаковщик sendmail\n" "своими заголовками From:, Message-ID: или Return-Path:.\n" -"Попробуйте \"env NULLMAILER_FLAGS= %s СВОИ АРГУМЕНТЫ\"\n" -"%s: Сброс.\n" +"Попробуйте «env NULLMAILER_FLAGS= %s ВАШИ АРГУМЕНТЫ»\n" +"%s: Завершение работы.\n" -#: env.c:83 +#: env.c:82 #, c-format msgid "%s: You don't exist. Go away.\n" -msgstr "%s: Ты существуешь. Вали отсюда.\n" +msgstr "%s: Ты не существуешь. Изыди.\n" -#: env.c:145 +#: env.c:143 +msgid "Cannot find absolute path for user's home directory.\n" +msgstr "Не удалось получить абсолютный путь домашнего каталога пользователя.\n" + +#: env.c:167 +msgid "Cannot find absolute path for fetchmail's home directory.\n" +msgstr "Не удалось получить абсолютный путь домашнего каталога fetchmail.\n" + +#: env.c:200 #, c-format msgid "%s: can't determine your host!" -msgstr "%s: невозможно определить ваш хост!" +msgstr "%s: невозможно определить ваш узел!" -#: env.c:168 +#: env.c:223 #, c-format -msgid "gethostbyname failed for %s\n" -msgstr "сбой gethostbyname для %s\n" +msgid "getaddrinfo failed for \"%s\": %s\n" +msgstr "ошибка getaddrinfo для «%s»: %s\n" -#: env.c:170 +#: env.c:224 msgid "Cannot find my own host in hosts database to qualify it!\n" -msgstr "Невозможно найти свой собственный хост в базе данных хостов, чтобы определить его!\n" +msgstr "Не удалось найти собственный узел в базе данных hosts, чтобы определить его полное имя!\n" -#: env.c:174 +#: env.c:228 msgid "" "Trying to continue with unqualified hostname.\n" "DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n" "DO repair your /etc/hosts, DNS, NIS or LDAP instead.\n" msgstr "" -"Пытаемся продолжить с неопределённым именем хоста.\n" -"НЕ СООБЩАЙТЕ о нарушенных заголовках Received:, строках HELO/EHLO или подобных проблемах!\n" +"Пытаемся продолжить с неопределённым именем узла.\n" +"НЕ СООБЩАЙТЕ о сломанных заголовках Received:, строках HELO/EHLO или подобных проблемах!\n" "Вместо этого ИСПРАВЬТЕ свой /etc/hosts, DNS, NIS или LDAP.\n" -#: etrn.c:49 odmr.c:60 +#: etrn.c:49 odmr.c:61 #, c-format msgid "%s's SMTP listener does not support ESMTP\n" -msgstr "SMTP-приемник %s не поддерживает ESMTP\n" +msgstr "SMTP-приёмник %s не поддерживает ESMTP\n" #: etrn.c:55 #, c-format msgid "%s's SMTP listener does not support ETRN\n" -msgstr "SMTP-приемник %s не поддерживает ETRN\n" +msgstr "SMTP-приёмник %s не поддерживает ETRN\n" #: etrn.c:79 #, c-format @@ -598,7 +618,7 @@ msgstr "Невозможно поставить в очередь сообщен #: etrn.c:98 #, c-format msgid "Node %s not allowed: %s\n" -msgstr "Узел %s запрещен: %s\n" +msgstr "Узел %s запрещён: %s\n" #: etrn.c:102 msgid "ETRN syntax error\n" @@ -613,940 +633,1050 @@ msgstr "Ошибка синтаксиса ETRN в параметрах\n" msgid "Unknown ETRN error %d\n" msgstr "Неизвестная ошибка ETRN %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Опция --keep не поддерживается с ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Опция --flush не поддерживается с ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Опция --folder не поддерживается с ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Опция --check не поддерживается с ETRN\n" -#: fetchmail.c:137 +#: fetchmail.c:144 +#, c-format msgid "" "Copyright (C) 2002, 2003 Eric S. Raymond\n" -"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n" -"Copyright (C) 2005 - 2006 Sunil Shetye\n" -"Copyright (C) 2005 - 2009 Matthias Andree\n" +"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" +" Robert M. Funk, Graham Wilson\n" +"Copyright (C) 2005 - 2012 Sunil Shetye\n" +"Copyright (C) 2005 - %d Matthias Andree\n" msgstr "" "Copyright (C) 2002, 2003 Eric S. Raymond\n" -"Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham Wilson\n" -"Copyright (C) 2005 - 2006 Sunil Shetye\n" -"Copyright (C) 2005 - 2009 Matthias Andree\n" +"Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" +" Robert M. Funk, Graham Wilson\n" +"Copyright (C) 2005 - 2012 Sunil Shetye\n" +"Copyright (C) 2005 - %d Matthias Andree\n" -#: fetchmail.c:142 +#: fetchmail.c:150 msgid "" "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions. For details,\n" "please see the file COPYING in the source or documentation directory.\n" msgstr "" "Fetchmail поставляется АБСОЛЮТНО БЕЗО ВСЯКОЙ ГАРАНТИИ. Это свободное\n" -"программное обеспечение и вы можете распространять его далее при\n" -"соблюдении определённых условий. Подробности смотрите в файле COPYING\n" -"в каталоге с документацией или исходными текстами.\n" +"программное обеспечение и вы можете распространять его при соблюдении\n" +"определённых условий. Подробности смотрите в файле COPYING в каталоге\n" +"с документацией или исходными текстами.\n" -#: fetchmail.c:176 +#: fetchmail.c:190 msgid "WARNING: Running as root is discouraged.\n" -msgstr "ПРЕДУПРЕЖДЕНИЕ. Запуск под root'ом не рекомендуется.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Запуск под root не рекомендуется.\n" -#: fetchmail.c:188 +#: fetchmail.c:202 msgid "fetchmail: invoked with" msgstr "fetchmail: запущен с" -#: fetchmail.c:212 +#: fetchmail.c:225 msgid "could not get current working directory\n" -msgstr "невозможно было получить текущий рабочий каталог\n" +msgstr "не удалось получить текущий рабочий каталог\n" -#: fetchmail.c:283 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Это fetchmail версии %s" -#: fetchmail.c:398 +#: fetchmail.c:313 +#, c-format +msgid "" +"Compiled with SSL library %#lx \"%s\"\n" +"Run-time uses SSL library %#lx \"%s\"\n" +msgstr "" +"Собран с библиотекой SSL %#lx «%s»\n" +"Запущен с библиотекой SSL %#lx «%s»\n" + +#: fetchmail.c:317 +#, c-format +msgid "" +"OpenSSL: %s\n" +"Engines: %s\n" +msgstr "" +"OpenSSL: %s\n" +"Движки: %s\n" + +#: fetchmail.c:321 +msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Ваша библиотека SSL/TLS не поддерживает TLS v1.3.\n" + +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "ОШИБКА: Программа собрана с LibreSSL, что нарушает авторские права из-за отсутствия исключения для пункта 2b лицензии GPL. Смотрите файл COPYING. Завершение работы.\n" + +#: fetchmail.c:330 +msgid "WARNING: Compiled without SSL/TLS.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: fetchmail собран без поддержки SSL/TLS.\n" + +#: fetchmail.c:356 +msgid "The nodetach option is in effect, ignoring logfile option.\n" +msgstr "Включена опция nodetach, поэтому опция logfile проигнорирована.\n" + +#: fetchmail.c:363 +msgid "Not running in daemon mode, ignoring logfile option.\n" +msgstr "Программа не запущена в режиме демона, опция logfile проигнорирована.\n" + +#: fetchmail.c:370 +#, c-format +msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" +msgstr "Журнал «%s» не существует, опция logfile проигнорирована.\n" + +#: fetchmail.c:376 +#, c-format +msgid "Logfile \"%s\" is not writable, aborting.\n" +msgstr "Файл журнала «%s» недоступен на запись, завершение работы.\n" + +#: fetchmail.c:394 +#, c-format +msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" +msgstr "назначены опции syslog и logfile, syslog проигнорирован, журнал пишется в %s" + +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Опции берутся из командной строки %s%s\n" -#: fetchmail.c:399 +#: fetchmail.c:486 msgid " and " msgstr " и " -#: fetchmail.c:404 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" -msgstr "Нет настроенных почтовых серверов -- может отсутствует %s?\n" +msgstr "Нет настроенных почтовых серверов — возможно, отсутствует %s?\n" -#: fetchmail.c:425 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: не были указаны почтовые серверы.\n" -#: fetchmail.c:437 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" -msgstr "fetchmail: другие запущенные fetchmail отсутствуют\n" +msgstr "fetchmail: больше не запущен ни один fetchmail\n" -#: fetchmail.c:443 +#: fetchmail.c:530 #, c-format -msgid "fetchmail: error killing %s fetchmail at %d; bailing out.\n" -msgstr "fetchmail: ошибка остановки %s fetchmail на %d; вынужденное завершение.\n" +msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" +msgstr "fetchmail: ошибка остановки %s fetchmail на %ld; вынужденное завершение.\n" -#: fetchmail.c:444 fetchmail.c:453 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "фоновый режим" -#: fetchmail.c:444 fetchmail.c:453 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "приоритетный режим" -#: fetchmail.c:452 +#: fetchmail.c:539 #, c-format -msgid "fetchmail: %s fetchmail at %d killed.\n" -msgstr "fetchmail: %s fetchmail на %d остановлен.\n" +msgid "fetchmail: %s fetchmail at %ld killed.\n" +msgstr "fetchmail: %s fetchmail на %ld остановлен.\n" -#: fetchmail.c:475 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" -msgstr "fetchmail: невозможно проверить почту, пока на том же хосте запущен другой fetchmail.\n" +msgstr "fetchmail: невозможно проверить почту, пока на том же узле запущен другой fetchmail.\n" -#: fetchmail.c:481 +#: fetchmail.c:568 #, c-format -msgid "fetchmail: can't poll specified hosts with another fetchmail running at %d.\n" -msgstr "fetchmail: невозможно опросить указанные хосты из-за другого fetchmail, запущенного на %d.\n" +msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" +msgstr "fetchmail: невозможно опросить указанные узлы из-за другого fetchmail, запущенного на %ld.\n" -#: fetchmail.c:488 +#: fetchmail.c:575 #, c-format -msgid "fetchmail: another foreground fetchmail is running at %d.\n" -msgstr "fetchmail: на %d запущен другой приоритетный fetchmail.\n" +msgid "fetchmail: another foreground fetchmail is running at %ld.\n" +msgstr "fetchmail: на %ld запущен другой приоритетный fetchmail.\n" -#: fetchmail.c:498 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n" -#: fetchmail.c:504 +#: fetchmail.c:597 #, c-format -msgid "fetchmail: background fetchmail at %d awakened.\n" -msgstr "fetchmail: на %d из фонового режима вернулся fetchmail.\n" +msgid "fetchmail: background fetchmail at %ld awakened.\n" +msgstr "fetchmail: на %ld fetchmail вышел из фонового режима.\n" -#: fetchmail.c:516 +#: fetchmail.c:609 #, c-format -msgid "fetchmail: elder sibling at %d died mysteriously.\n" -msgstr "fetchmail: на %d неожиданно завершился более старший процесс того же уровня.\n" +msgid "fetchmail: elder sibling at %ld died mysteriously.\n" +msgstr "fetchmail: на %ld неожиданно завершился более старший процесс того же уровня.\n" -#: fetchmail.c:531 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: невозможно найти пароль для %s@%s.\n" -#: fetchmail.c:535 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Введите пароль для %s@%s: " -#: fetchmail.c:560 fetchmail.c:596 -msgid "fetchmail: Warning: syslog and logfile are set. Check both for logs!\n" -msgstr "fetchmail: Предупреждение: настроено использование syslog и logfile. Проверяйте оба журнала!\n" - -#: fetchmail.c:572 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" -msgstr "fetchmail: невозможно выполнить переход в фоновый режим. Прерывание.\n" +msgstr "fetchmail: Невозможно выполнить переход в фоновый режим. Завершение работы.\n" -#: fetchmail.c:576 +#: fetchmail.c:674 #, c-format -msgid "starting fetchmail %s daemon \n" +msgid "starting fetchmail %s daemon\n" msgstr "запускается демон fetchmail %s\n" -#: fetchmail.c:592 fetchmail.c:594 +#: fetchmail.c:690 fetchmail.c:692 #, c-format -msgid "could not open %s to append logs to \n" -msgstr "невозможно было открыть %s для добавления записей\n" +msgid "could not open %s to append logs to\n" +msgstr "невозможно открыть %s для добавления записей журнала\n" -#: fetchmail.c:615 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" -msgstr "влючен режим --check, выборка почты не выполняется\n" +msgstr "включен режим --check, загрузка почты не выполняется\n" -#: fetchmail.c:637 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" -msgstr "невозможно было проверить время %s (ошибка %d)\n" +msgstr "не удалось проверить время %s (ошибка %d)\n" -#: fetchmail.c:642 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" -msgstr "fetchmail перезапускается (%s изменен)\n" +msgstr "fetchmail перезапускается (%s изменён)\n" -#: fetchmail.c:647 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" -msgstr "возможен сбой при перезапуске, т.к. каталог не был восстановлен\n" +msgstr "возможен сбой при перезапуске, так как каталог не был восстановлен\n" -#: fetchmail.c:674 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "сбой перезапуска fetchmail\n" -#: fetchmail.c:704 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" -msgstr "опрос %s пропущен (ошибка аутентификации или слишком много тайм-аутов)\n" +msgstr "опрос %s пропущен (ошибка аутентификации или слишком много таймаутов)\n" -#: fetchmail.c:716 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "интервал не достигнут, %s не запрашивается\n" -#: fetchmail.c:754 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Статус запроса=0 (SUCCESS)\n" -#: fetchmail.c:756 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Статус запроса=1 (NOMAIL)\n" -#: fetchmail.c:758 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Статус запроса=2 (SOCKET)\n" -#: fetchmail.c:760 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Статус запроса=3 (AUTHFAIL)\n" -#: fetchmail.c:762 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Статус запроса=4 (PROTOCOL)\n" -#: fetchmail.c:764 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" -msgstr "Статус запроса=5 (SYNTAX)\n" +msgstr "Статус запроса=1 (SYNTAX)\n" -#: fetchmail.c:766 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" -msgstr "Статус запроса=6 (IOERR)\n" +msgstr "Статус запроса=2 (IOERR)\n" -#: fetchmail.c:768 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Статус запроса=7 (ERROR)\n" -#: fetchmail.c:770 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Статус запроса=8 (EXCLUDE)\n" -#: fetchmail.c:772 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Статус запроса=9 (LOCKBUSY)\n" -#: fetchmail.c:774 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Статус запроса=10 (SMTP)\n" -#: fetchmail.c:776 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Статус запроса=11 (DNS)\n" -#: fetchmail.c:778 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Статус запроса=12 (BSMTP)\n" -#: fetchmail.c:780 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Статус запроса=13 (MAXFETCH)\n" -#: fetchmail.c:782 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Статус запроса=%d\n" -#: fetchmail.c:824 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" -msgstr "Все соединения перегружены. Завершение работы.\n" +msgstr "Все подключения застряли. Выходим.\n" -#: fetchmail.c:831 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" -msgstr "в спящем режиме в %s на %d секунд\n" +msgstr "ожидание %s на %d секунд\n" -#: fetchmail.c:855 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" -msgstr "разбужен %s'ом\n" +msgstr "пробуждён %s\n" -#: fetchmail.c:858 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" -msgstr "разбужен по сигналу %d\n" +msgstr "пробуждён сигналом %d\n" -#: fetchmail.c:865 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" -msgstr "разбужен на %s\n" +msgstr "пробуждён %s\n" -#: fetchmail.c:871 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "нормальное завершение, статус %d\n" -#: fetchmail.c:1025 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" -msgstr "невозможно было проверить время файла контроля запуска\n" +msgstr "не удалось проверить файл управления\n" -#: fetchmail.c:1058 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" -msgstr "Предупреждение: многократные ссылки на хост %s в файле настройки\n" +msgstr "Предупреждение: несколько упоминаний узла %s в файле настроек\n" -#: fetchmail.c:1091 -msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n" -msgstr "fetchmail: Ошибка: многократные записи \"defaults\" в файле настройки.\n" +#: fetchmail.c:1203 +msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" +msgstr "fetchmail: Ошибка: несколько записей «defaults» в настройках, или «defaults» не указан первым.\n" -#: fetchmail.c:1213 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" -msgstr "Поддержка SSL не была включена при компиляции.\n" +msgstr "Собрано без поддержки SSL.\n" -#: fetchmail.c:1220 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" -msgstr "Поддержка KERBEROS v4 настроена, но не была включена при компиляции.\n" +msgstr "Поддержка KERBEROS v4 настроена, но не включена в программу.\n" -#: fetchmail.c:1226 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" -msgstr "Поддержка KERBEROS v5 настроена, но не была включена при компиляции.\n" +msgstr "Поддержка KERBEROS v5 настроена, но не включена в программу.\n" -#: fetchmail.c:1232 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" -msgstr "Поддержка GSSAPI настроена, но не была включена при компиляции.\n" +msgstr "Поддержка GSSAPI настроена, но не включена в программу.\n" -#: fetchmail.c:1262 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" -msgstr "fetchmail: предупреждение: не доступен DNS для проверки многоканальной выборки из %s\n" +msgstr "fetchmail: предупреждение: из-за недоступности DNS невозможно проверить многоканальный %s\n" -#: fetchmail.c:1273 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" -msgstr "предупреждение: multidrop для %s требует опцию envelope!\n" +msgstr "предупреждение: для многоканальных %s необходима опция envelope!\n" -#: fetchmail.c:1274 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" -msgstr "предупреждение: Не просите технической поддержки, если все сообщения отправляются постмастеру!\n" +msgstr "предупреждение: Не просите о поддержке, если все сообщения отправляются почтовому администратору!\n" -#: fetchmail.c:1291 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" -msgstr "fetchmail: конфигурация %s не верна, укажите положительный номер порта для службы\n" +msgstr "fetchmail: настройки %s некорректны, укажите положительный номер порта для службы\n" -#: fetchmail.c:1298 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" -msgstr "fetchmail: конфигурация %s не верна, для RPOP требуется привилегированный порт\n" +msgstr "fetchmail: настройки %s некорректны, для RPOP требуется привилегированный порт\n" + +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: настройки %s некорректны, обычно для порта 995/службы pop3s требуется флаг --ssl.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: настройки %s некорректны, обычно для --ssl требуется порт 995/служба pop3s.\n" -#: fetchmail.c:1316 +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: настройки %s некорректны, обычно для порта 993/службы imaps требуется флаг --ssl.\n" + +#: fetchmail.c:1429 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "ПРЕДУПРЕЖДЕНИЕ: настройки %s некорректны, обычно для --ssl требуется порт 993/служба imaps.\n" + +#: fetchmail.c:1447 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" -msgstr "конфигурация %s не верна, LMTP не может использовать порт SMTP по умолчанию\n" +msgstr "настройки %s некорректны, LMTP не может использовать порт SMTP по умолчанию\n" -#: fetchmail.c:1330 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" -msgstr "Запускать fetchall, оставляя его при этом в режиме демона или простоя, нельзя!\n" +msgstr "Нельзя запускать fetchall, оставляя его при этом в режиме демона или простоя!\n" + +#: fetchmail.c:1471 +msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" +msgstr "fetchmail: Ошибка: режим idle не поддерживается для нескольких каталогов или учётных записей!\n" -#: fetchmail.c:1355 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" -msgstr "завершен по сигналу %d\n" +msgstr "завершено сигналом %d\n" -#: fetchmail.c:1428 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s запрашивает %s (протокол %s) на %s: опрос начат\n" -#: fetchmail.c:1453 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "Поддержка POP2 не настроена.\n" -#: fetchmail.c:1465 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "Поддержка POP3 не настроена.\n" -#: fetchmail.c:1475 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "Поддержка IMAP не настроена.\n" -#: fetchmail.c:1481 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "Поддержка ETRN не настроена.\n" -#: fetchmail.c:1489 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "Поддержка ODMR не настроена.\n" -#: fetchmail.c:1496 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "выбран неподдерживаемый протокол.\n" -#: fetchmail.c:1506 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s запрашивает %s (протокол %s) на %s: опрос завершен\n" -#: fetchmail.c:1523 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" -msgstr "Интервал опроса - %d секунд\n" +msgstr "Интервал проверки %d секунд.\n" -#: fetchmail.c:1525 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" -msgstr "Лог-файл - %s\n" +msgstr "Лог-файл — %s\n" -#: fetchmail.c:1527 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" -msgstr "ID-файл - %s\n" +msgstr "ID-файл — %s\n" -#: fetchmail.c:1530 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" -msgstr "Обработка сообщений будет регистрироваться через syslog\n" +msgstr "Обработка сообщений будет регистрироваться в syslog\n" -#: fetchmail.c:1533 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail включит маскировку и не создаст поле Received\n" -#: fetchmail.c:1535 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" -msgstr "Fetchmail будет отображать точечную строку прогресса даже в log-файлах.\n" +msgstr "Fetchmail будет отображать точечную строку прогресса даже в лог-файлах.\n" -#: fetchmail.c:1537 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail будет пересылать многоканальные сообщения без адреса на %s.\n" -#: fetchmail.c:1541 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" -msgstr "Fetchmail направит ошибочное письмо постмастеру.\n" +msgstr "Fetchmail направит ошибочное письмо почтовому администратору.\n" -#: fetchmail.c:1543 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail направит ошибочное письмо отправителю.\n" -#: fetchmail.c:1546 -msgid "Fetchmail will treat permanent errors as permanent (drop messsages).\n" -msgstr "Fetchmail будет считать постоянные ошибки постоянными (удалит сообщения).\n" +#: fetchmail.c:1695 +msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" +msgstr "Fetchmail будет считать постоянные ошибки постоянными (отклоняя сообщения).\n" -#: fetchmail.c:1548 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" -msgstr "Fetchmail будет считать постоянные ошибки временными (сохранит сообщения).\n" +msgstr "Fetchmail будет считать постоянные ошибки временными (сохраняя сообщения).\n" -#: fetchmail.c:1555 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" -msgstr "Параметры для получения из %s@%s:\n" +msgstr "Опции получения почты из %s@%s:\n" -#: fetchmail.c:1559 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Почта будет получена через %s\n" -#: fetchmail.c:1562 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " Опрос этого сервера будет выполняться с интервалом %d.\n" -msgstr[1] " Опрос этого сервера будет выполняться с интервалами %d.\n" +msgstr[1] " Опрос этого сервера будет выполняться с интервалом %d.\n" +msgstr[2] " Опрос этого сервера будет выполняться с интервалом %d.\n" -#: fetchmail.c:1566 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" -msgstr " Настоящее имя севера - %s.\n" +msgstr " Настоящее имя севера — %s.\n" -#: fetchmail.c:1569 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" -msgstr " Когда хост не указан, этот хост не будет запрошен.\n" +msgstr " Этот узел не будет опрошен, когда не указан ни один узел.\n" -#: fetchmail.c:1570 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" -msgstr " Когда хост не указан, будет запрошен этот хост.\n" +msgstr " Этот узел будет опрошен, когда не указан ни один узел.\n" -#: fetchmail.c:1574 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Будет затребован пароль.\n" -#: fetchmail.c:1578 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" -msgstr " Секрет APOP = \"%s\".\n" +msgstr " Секрет APOP = «%s».\n" -#: fetchmail.c:1581 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" -msgstr " RPOP id = \"%s\".\n" +msgstr " RPOP id = «%s».\n" -#: fetchmail.c:1584 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" -msgstr " Пароль = \"%s\".\n" +msgstr " Пароль = «%s».\n" -#: fetchmail.c:1593 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" -msgstr " Протокол - KPOP с аутентификацией Kerberos %s" +msgstr " Протокол — KPOP с аутентификацией Kerberos %s" -#: fetchmail.c:1596 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" -msgstr " Протокол - %s" +msgstr " Протокол — %s" -#: fetchmail.c:1598 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (используется служба %s)" -#: fetchmail.c:1600 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (используется порт по умолчанию)" -#: fetchmail.c:1602 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (принудительно используется UIDL)" -#: fetchmail.c:1608 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Будут испробованы все доступные способы аутентификации.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация с паролем.\n" +msgstr " Будет принудительно использована аутентификация с паролем.\n" -#: fetchmail.c:1614 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация MSN.\n" +msgstr " Будет принудительно использована аутентификация MSN.\n" -#: fetchmail.c:1617 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация NTLM.\n" +msgstr " Будет принудительно использована аутентификация NTLM.\n" -#: fetchmail.c:1620 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация OTP.\n" +msgstr " Будет принудительно использована аутентификация OTP.\n" -#: fetchmail.c:1623 -msgid " CRAM-Md5 authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация CRAM-Md5.\n" +#: fetchmail.c:1772 +msgid " CRAM-MD5 authentication will be forced.\n" +msgstr " Будет принудительно использована аутентификация CRAM-MD5.\n" -#: fetchmail.c:1626 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация GSSAPI.\n" +msgstr " Будет принудительно использована аутентификация GSSAPI.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация Kerberos V4.\n" +msgstr " Будет принудительно использована аутентификация Kerberos V4.\n" -#: fetchmail.c:1632 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" -msgstr " Будет использована принудительная аутентификация Kerberos V5.\n" +msgstr " Будет принудительно использована аутентификация Kerberos V5.\n" -#: fetchmail.c:1635 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" -msgstr " Допускается оперативное шифрование.\n" +msgstr " Подразумевается наличие сквозного шифрования.\n" -#: fetchmail.c:1639 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Принципал почтовой службы: %s\n" -#: fetchmail.c:1642 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " Включены сессии, зашифрованные SSL.\n" -#: fetchmail.c:1644 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " Протокол SSL: %s.\n" -#: fetchmail.c:1646 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " Включена проверка сертификата сервера SSL.\n" -#: fetchmail.c:1648 +#: fetchmail.c:1797 +msgid " SSL server certificate checking disabled.\n" +msgstr " Выключена проверка сертификата сервера SSL.\n" + +#: fetchmail.c:1799 +#, c-format +msgid " SSL default trusted certificate file: %s\n" +msgstr " Файл доверенного сертификата SSL по умолчанию: %s\n" + +#: fetchmail.c:1801 +#, c-format +msgid " SSL trusted certificate file: %s\n" +msgstr " Файл доверенного сертификата SSL: %s\n" + +#: fetchmail.c:1802 +#, c-format +msgid " SSL default trusted certificate directory: %s\n" +msgstr " Каталог доверенных сертификатов SSL по умолчанию: %s\n" + +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Каталог доверенных сертификатов SSL: %s\n" -#: fetchmail.c:1651 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " Общепринятое имя SSL-сервера: %s\n" -#: fetchmail.c:1653 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Отпечаток ключа SSL (сверенный с ключом сервера): %s\n" -#: fetchmail.c:1656 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" -msgstr " Таймаут молчания сервера - %d секунд" +msgstr " Таймаут молчания сервера — %d секунд" -#: fetchmail.c:1658 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (по умолчанию).\n" -#: fetchmail.c:1665 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Выбран почтовый ящик по умолчанию.\n" -#: fetchmail.c:1670 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Выбранные почтовые ящики:" -#: fetchmail.c:1676 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Будут получены все сообщения (--all on).\n" -#: fetchmail.c:1677 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Будут получены только новые сообщения (--all off).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Выбранные сообщения будут оставлены на сервере (--keep on).\n" -#: fetchmail.c:1680 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Выбранные сообщения будут удалены с сервера (--keep off).\n" -#: fetchmail.c:1682 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Старые сообщения будут удалены перед получением сообщения (--flush on).\n" -#: fetchmail.c:1683 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Старые сообщения не будут удалены перед получением сообщения (--flush off).\n" -#: fetchmail.c:1685 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Сообщения завышенного размера будут удалены перед получением сообщения (--limitflush on).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Сообщения завышенного размера не будут удалены перед получением сообщения (--limitflush off).\n" -#: fetchmail.c:1688 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Перезапись локальных адресов сервера включена (--norewrite off).\n" -#: fetchmail.c:1689 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Перезапись локальных адресов сервера выключена (--norewrite on).\n" -#: fetchmail.c:1691 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Удаление возврата каретки включено (stripcr on).\n" -#: fetchmail.c:1692 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Удаление возврата каретки выключено (stripcr off).\n" -#: fetchmail.c:1694 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Принудительный возврат каретки включен (forcecr on).\n" -#: fetchmail.c:1695 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Принудительный возврат каретки выключен (forcecr off).\n" -#: fetchmail.c:1697 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Интерпретация кодировки передаваемого контента выключена (pass8bits on).\n" -#: fetchmail.c:1698 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Интерпретация кодировки передаваемого контента включена (pass8bits off).\n" -#: fetchmail.c:1700 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME-декодирование включено (mimedecode on).\n" -#: fetchmail.c:1701 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME-декодирование выключено (mimedecode off).\n" -#: fetchmail.c:1703 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Простой после опроса включен (idle on).\n" -#: fetchmail.c:1704 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " Простой после опроса выключен (idle off).\n" -#: fetchmail.c:1706 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Непустые строки состояния будут удалены (dropstatus on)\n" -#: fetchmail.c:1707 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Непустые строки состояния будут сохранены (dropstatus off)\n" -#: fetchmail.c:1709 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Строки Delivered-To будут удалены (dropdelivered on)\n" -#: fetchmail.c:1710 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Строки Delivered-To будут сохранены (dropdelivered off)\n" -#: fetchmail.c:1714 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" -msgstr " Ограничение на размер сообщения - %d октетов (--limit %d).\n" +msgstr " Ограничение на размер сообщения — %d октетов (--limit %d).\n" -#: fetchmail.c:1717 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Нет ограничения на размер сообщения (--limit 0).\n" -#: fetchmail.c:1719 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" -msgstr " Интервал между предупреждениями о размере сообщения - %d секунд (--warnings %d).\n" +msgstr " Интервал между предупреждениями о размере сообщения — %d секунд (--warnings %d).\n" -#: fetchmail.c:1722 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Предупреждения о размере при каждом опросе (--warnings 0).\n" -#: fetchmail.c:1725 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" -msgstr " Ограничение на полученные сообщения - %d (--fetchlimit %d).\n" +msgstr " Ограничение на полученные сообщения — %d (--fetchlimit %d).\n" -#: fetchmail.c:1728 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Нет ограничения на полученные сообщения (--fetchlimit 0).\n" -#: fetchmail.c:1730 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" -msgstr " Ограничение на размер выборки сообщений - %d (--fetchsizelimit %d).\n" +msgstr " Ограничение на размер загрузки сообщений — %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1733 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" -msgstr " Нет ограничения на размер выборки сообщений (--fetchsizelimit 0).\n" +msgstr " Нет ограничения на размер загрузки сообщений (--fetchsizelimit 0).\n" -#: fetchmail.c:1737 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Выполнять двоичный поиск UID'ов во время каждого опроса (--fastuidl -1).\n" -#: fetchmail.c:1739 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Выполнять двоичный поиск UID'ов во время %d из %d опросов (--fastuidl %d).\n" -#: fetchmail.c:1742 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Выполнять линейный поиск UID'ов во время каждого опроса (--fastuidl 0).\n" -#: fetchmail.c:1744 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" -msgstr " Ограничение на пакет SMTP-сообщений - %d.\n" +msgstr " Ограничение на пакет SMTP-сообщений %d.\n" -#: fetchmail.c:1746 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Нет ограничения на пакет SMTP-сообщений (--batchlimit 0).\n" -#: fetchmail.c:1750 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Интервал между удалениями принудительно установлен в %d (--expunge %d).\n" -#: fetchmail.c:1752 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Нет принудительных удалений (--expunge 0).\n" -#: fetchmail.c:1759 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" -msgstr " Домены, для которых будет выполняться выборка почты:" +msgstr " Домены, для которых будет выполняться загрузка почты:" -#: fetchmail.c:1764 fetchmail.c:1784 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (по умолчанию)" -#: fetchmail.c:1769 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Сообщения будут прикреплены к %s как BSMTP\n" -#: fetchmail.c:1771 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" -msgstr " Сообщения будут доставлены с \"%s\".\n" +msgstr " Сообщения будут доставлены с «%s».\n" -#: fetchmail.c:1778 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Сообщения будут переадресованы по %cMTP на:" -#: fetchmail.c:1789 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" -msgstr " Часть хоста из строки MAIL FROM будет %s\n" +msgstr " Часть узла из строки MAIL FROM будет %s\n" -#: fetchmail.c:1792 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Адрес, вставляемый в строки RCPT TO, отправляемые по SMTP, будет %s\n" -#: fetchmail.c:1801 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Ответные действия на распознанные слушателем спам-блоки:" -#: fetchmail.c:1807 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Блокировка спама отключена\n" -#: fetchmail.c:1810 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" -msgstr " Подключение к серверу будет установлено с \"%s\".\n" +msgstr " Подключение к серверу будет установлено с «%s».\n" -#: fetchmail.c:1813 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Нет команды, выполняемой до соединения.\n" -#: fetchmail.c:1815 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" -msgstr " Подключение к серверу будет разорвано с \"%s\".\n" +msgstr " Подключение к серверу будет разорвано с «%s».\n" -#: fetchmail.c:1818 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Нет команды, выполняемой после соединения.\n" -#: fetchmail.c:1821 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" -msgstr " Нет локальных имен, объявленных для этого хоста.\n" +msgstr " Нет локальных имён, объявленных для этого узла.\n" -#: fetchmail.c:1831 +#: fetchmail.c:1986 msgid " Multi-drop mode: " -msgstr " Многоканальный режим:" +msgstr " Многоканальный режим: " -#: fetchmail.c:1833 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Одноканальный режим: " -#: fetchmail.c:1835 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "распознано %d локальное имя.\n" -msgstr[1] "распознано %d локальных имён.\n" +msgstr[1] "распознано %d локальных имени.\n" +msgstr[2] "распознано %d локальных имён.\n" -#: fetchmail.c:1850 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " DNS-запрос для многоканальных адресов включен.\n" -#: fetchmail.c:1851 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " DNS-запрос для многоканальных адресов выключен.\n" -#: fetchmail.c:1855 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" -msgstr " Алисы сервера будут сравнены с многоканальными адресами по IP-адресу.\n" +msgstr " Псевдонимы сервера будут сравнены с многоканальными адресами по IP-адресу.\n" -#: fetchmail.c:1857 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" -msgstr " Алисы сервера будут сравнены с многоканальными адресами по имени.\n" +msgstr " Псевдонимы сервера будут сравнены с многоканальными адресами по имени.\n" -#: fetchmail.c:1860 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Маршрутизация охватывающего адреса отключена\n" -#: fetchmail.c:1863 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Охватывающий заголовок должен быть: %s\n" -#: fetchmail.c:1866 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Количество пропускаемых охватывающих заголовков: %d\n" -#: fetchmail.c:1869 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Префикс %s будет удален из id пользователя\n" -#: fetchmail.c:1872 +#: fetchmail.c:2027 msgid " No prefix stripping\n" -msgstr " Нет разборки префикса\n" +msgstr " Нет удаления префикса\n" -#: fetchmail.c:1879 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Ранее объявленные алиасы почтового сервера:" -#: fetchmail.c:1888 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Локальные домены:" -#: fetchmail.c:1898 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" -msgstr " Подключение должно быть через интерфейс %s.\n" +msgstr " Подключение должно совершаться через интерфейс %s.\n" -#: fetchmail.c:1900 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" -msgstr " Не указаны требования интерфейса.\n" +msgstr " Не указаны требования к интерфейсу.\n" -#: fetchmail.c:1902 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Цикл опроса будет наблюдать за %s.\n" -#: fetchmail.c:1904 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Не указан интерфейс монитора.\n" -#: fetchmail.c:1908 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Подключения к серверу будут выполняться посредством плагина %s (--plugin %s).\n" -#: fetchmail.c:1910 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Не указана команда плагина.\n" -#: fetchmail.c:1912 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Подключения слушателя будут выполняться через plugout %s (--plugout %s).\n" -#: fetchmail.c:1914 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Не указана команда plugout'а.\n" -#: fetchmail.c:1919 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" -msgstr " С этого хоста нет сохраненных UID'ов.\n" +msgstr " Нет UID'ов, сохранённых с этого узла. \n" -#: fetchmail.c:1928 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " Сохранено %d UID'ов.\n" -#: fetchmail.c:1936 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Информация с трассировкой опроса будет добавлена в заголовок Received.\n" -#: fetchmail.c:1938 -msgid "" -" No poll trace information will be added to the Received header.\n" -".\n" -msgstr "" -" Информация с трассировкой опроса не будет добавлена в заголовок Received.\n" -".\n" +#: fetchmail.c:2084 +msgid " No poll trace information will be added to the Received header.\n" +msgstr " Информация с трассировкой опроса не будет добавлена в заголовок Received.\n" + +#: fetchmail.c:2089 +msgid " Messages with bad headers will be rejected.\n" +msgstr " Сообщения с некорректными заголовками будут отклонены.\n" -#: fetchmail.c:1941 +#: fetchmail.c:2092 +msgid " Messages with bad headers will be passed on.\n" +msgstr " Сообщения с некорректными заголовками будут переданы.\n" + +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" -msgstr " Свойства ретрансляции \"%s\".\n" +msgstr " Свойства ретрансляции «%s».\n" + +#: fm_getaddrinfo.c:23 fm_getaddrinfo.c:30 +#, c-format +msgid "Cannot modify signal mask: %s" +msgstr "Не удалось изменить маску сигналов: %s" + +#: fm_realpath.c:35 +msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n" +msgstr "Операционная система не содержит определения PATH_MAX и не поддерживает realpath(f, NULL). Завершение работы.\n" #: getpass.c:71 msgid "ERROR: no support for getpassword() routine\n" @@ -1560,55 +1690,87 @@ msgstr "" "\n" "Получен SIGINT... завершение работы.\n" -#: gssapi.c:66 +#: gssapi.c:53 +#, c-format +msgid "GSSAPI error in gss_display_status called from <%s>\n" +msgstr "Ошибка GSSAPI в gss_display_status, вызванный из <%s>\n" + +#: gssapi.c:56 +#, c-format +msgid "GSSAPI error %s: %.*s\n" +msgstr "Ошибка GSSAPI %s: %.*s\n" + +#: gssapi.c:91 #, c-format msgid "Couldn't get service name for [%s]\n" -msgstr "Невозможно было получить имя службы для [%s]\n" +msgstr "Не удалось получить имя службы для [%s]\n" -#: gssapi.c:72 +#: gssapi.c:96 #, c-format msgid "Using service name [%s]\n" msgstr "Используется имя службы [%s]\n" -#: gssapi.c:89 +#: gssapi.c:123 +msgid "No suitable GSSAPI credentials found. Skipping GSSAPI authentication.\n" +msgstr "Не найдены подходящие идентификационные данные GSSAPI. Пропускается аутентификация GSSAPI.\n" + +#: gssapi.c:124 +msgid "If you want to use GSSAPI, you need credentials first, possibly from kinit.\n" +msgstr "Для использования GSSAPI необходимо получить идентификационные данные, возможно от kinit.\n" + +#: gssapi.c:160 +#, c-format +msgid "Received malformed challenge to \"%s GSSAPI\"!\n" +msgstr "Получен некорректный вызов на «%s GSSAPI»!\n" + +#: gssapi.c:170 msgid "Sending credentials\n" msgstr "Отправляются идентификационные данные\n" -#: gssapi.c:107 +#: gssapi.c:201 msgid "Error exchanging credentials\n" msgstr "Ошибка обмена идентификационными данными\n" -#: gssapi.c:152 +#: gssapi.c:243 msgid "Couldn't unwrap security level data\n" -msgstr "Невозможно было развернуть данные уровня безопасности\n" +msgstr "Не удалось развернуть данные уровня безопасности\n" -#: gssapi.c:157 +#: gssapi.c:248 msgid "Credential exchange complete\n" msgstr "Обмен идентификационными данными завершен\n" -#: gssapi.c:161 +#: gssapi.c:252 msgid "Server requires integrity and/or privacy\n" msgstr "Серверу требуются целостность и/или конфиденциальность\n" -#: gssapi.c:170 +#: gssapi.c:261 #, c-format msgid "Unwrapped security level flags: %s%s%s\n" msgstr "Флаги развернутого уровня безопасности: %s%s%s\n" -#: gssapi.c:174 +#: gssapi.c:265 #, c-format msgid "Maximum GSS token size is %ld\n" -msgstr "Максимальный размер маркера GSS - %ld\n" +msgstr "Максимальный размер маркера GSS — %ld\n" -#: gssapi.c:187 +#: gssapi.c:274 +msgid "GSSAPI username too long for static buffer.\n" +msgstr "Имя пользователя GSSAPI слишком длинное для фиксированного буфера.\n" + +#: gssapi.c:283 msgid "Error creating security level request\n" msgstr "Ошибка создания запроса уровня безопасности\n" -#: gssapi.c:198 +#: gssapi.c:287 +#, c-format +msgid "GSSAPI send_token too large (%lu) while sending username.\n" +msgstr "Слишком длинный send_token GSSAPI (%lu) при отправке имени пользователя.\n" + +#: gssapi.c:298 msgid "Releasing GSS credentials\n" msgstr "Создаются идентификационные данные GSS\n" -#: gssapi.c:201 +#: gssapi.c:302 msgid "Error releasing credentials\n" msgstr "Ошибка создания идентификационных данных\n" @@ -1617,108 +1779,170 @@ msgstr "Ошибка создания идентификационных дан msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: поток приостановлен в течение %d секунд.\n" -#: imap.c:326 +#: imap.c:91 msgid "Protocol identified as IMAP4 rev 1\n" msgstr "Протокол идентифицирован как IMAP4 ревизия 1\n" -#: imap.c:332 +#: imap.c:95 msgid "Protocol identified as IMAP4 rev 0\n" msgstr "Протокол идентифицирован как IMAP4 ревизия 0\n" -#: imap.c:339 +#: imap.c:99 msgid "Protocol identified as IMAP2 or IMAP2BIS\n" msgstr "Протокол идентифицирован как IMAP2 или IMAP2BIS\n" -#: imap.c:354 +#: imap.c:111 msgid "will idle after poll\n" msgstr "будет приостановлен после опроса\n" -#: imap.c:446 pop3.c:518 +#: imap.c:138 +#, c-format +msgid "Received BYE response from IMAP server: %s\n" +msgstr "Получен ответ BYE от IMAP-сервера: %s\n" + +#: imap.c:160 +#, c-format +msgid "bogus message count in \"%s\"!" +msgstr "фиктивное количество сообщений в «%s»!" + +#: imap.c:207 +#, c-format +msgid "bogus EXPUNGE count in \"%s\"!" +msgstr "фиктивное количество EXPUNGE в «%s»!" + +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "найден обновлённый список расширений\n" + +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "сервер не указал SASL-IR в списке доступных расширений, однако fetchmail требует его для работы AUTHENTICATE EXTERNAL\n" + +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: настройки требуют TLS, но STARTTLS запрещён в текущем состоянии аутентификации (PREAUTH). Подключение разорвано. Если используемый плагин шифрует передаваемые данные, можно принудительно отключить STARTTLS флагом --sslproto '' (см. документацию).\n" + +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: настройки требуют TLS, но STARTTLS запрещён в текущем состоянии аутентификации (PREAUTH). Подключение разорвано. При наличии поддержки со стороны сервера, попробуйте --ssl (см. документацию).\n" + +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: обновление до TLS выполнено успешно.\n" -#: imap.c:455 pop3.c:527 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: сбой обновления до TLS.\n" -#: imap.c:459 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: сбой принудительного обновления до TLS; выполняется попытка продолжить работу\n" -#: imap.c:570 +#: imap.c:561 +#, c-format +msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" +msgstr "%s: ПРЕДУПРЕЖДЕНИЕ: сервер предложил STARTTLS, но настроен sslproto ''.\n" + +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: запрошен --auth external, но он не поддерживается сервером.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Fetchmail скомпилирован без требуемой поддержки OTP\n" -#: imap.c:592 pop3.c:385 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Fetchmail скомпилирован без требуемой поддержки NTLM\n" -#: imap.c:601 -msgid "Required LOGIN capability not supported by server\n" -msgstr "Требуемая опция LOGIN не поддерживается сервером\n" +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: запрошен --auth password, но он запрещён сервером (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: закончились доступные методы аутентификации, вход не удался.\n" -#: imap.c:667 +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" -msgstr "разногласие при удалении писем (%d на самом деле != %d ожидалось)\n" +msgstr "несоответствие при удалении писем (%d на самом деле != %d ожидалось)\n" -#: imap.c:773 imap.c:832 +#: imap.c:896 +#, c-format +msgid "%lu is unseen\n" +msgstr "%lu не просмотрено\n" + +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 +#, c-format +msgid "%u is unseen\n" +msgstr "%u не просмотрено\n" + +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "не удалось повторить опрос\n" -#: imap.c:781 imap.c:837 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "ожидается %d сообщение после повторного опроса\n" -msgstr[1] "ожидается %d сообщений после повторного опроса\n" +msgstr[1] "ожидаются %d сообщения после повторного опроса\n" +msgstr[2] "ожидается %d сообщений после повторного опроса\n" -#: imap.c:798 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "не удалось выбрать почтовый ящик\n" -#: imap.c:802 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "ожидается %d сообщение после первого опроса\n" -msgstr[1] "ожидается %d сообщений после первого опроса\n" +msgstr[1] "ожидаются %d сообщения после первого опроса\n" +msgstr[2] "ожидается %d сообщений после первого опроса\n" -#: imap.c:816 +#: imap.c:1024 msgid "expunge failed\n" msgstr "не удалось удалить\n" -#: imap.c:820 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "ожидается %d сообщение после удаления\n" -msgstr[1] "ожидается %d сообщений после удаления\n" +msgstr[1] "ожидаются %d сообщения после удаления\n" +msgstr[2] "ожидается %d сообщений после удаления\n" -#: imap.c:862 +#: imap.c:1067 msgid "search for unseen messages failed\n" -msgstr "сбой поиска непросмотренных сообщений\n" - -#: imap.c:890 -#, c-format -msgid "%lu is unseen\n" -msgstr "%lu не просмотрено\n" +msgstr "сбой поиска не просмотренных сообщений\n" -#: imap.c:902 pop3.c:889 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u первое не просмотренное\n" -#: imap.c:993 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Предупреждение: игнорируются некорректные данные о размерах сообщений, возвращённые сервером.\n" +#: imap.c:1255 imap.c:1262 +#, c-format +msgid "Incorrect FETCH response: %s.\n" +msgstr "Некорректный ответ на FETCH: %s.\n" + #: interface.c:256 msgid "Unable to open kvm interface. Make sure fetchmail is SGID kmem." -msgstr "Невозможно открыть интерфейс kvm. Убедитесь, что fetchmail является SGID kmem." +msgstr "Невозможно открыть интерфейс kvm. Убедитесь, что fetchmail помечен SGID kmem." #: interface.c:396 #, c-format @@ -1740,7 +1964,7 @@ msgstr "get_ifinfo: сбой sysctl (iflist)" #: interface.c:448 #, c-format msgid "Routing message version %d not understood." -msgstr "Версия маршрутизируемого сообщения %d не понятна." +msgstr "Версия маршрутизируемого сообщения %d непонятна." #: interface.c:480 #, c-format @@ -1752,764 +1976,836 @@ msgstr "Не найден интерфейс с именем %s" msgid "No IP address found for %s" msgstr "Не найден IP-адрес для %s" -#: interface.c:589 +#: interface.c:590 msgid "missing IP interface address\n" msgstr "отсутствует адрес IP-интерфейса\n" -#: interface.c:605 +#: interface.c:606 msgid "invalid IP interface address\n" msgstr "неверный адрес IP-интерфейса\n" -#: interface.c:611 +#: interface.c:612 msgid "invalid IP interface mask\n" msgstr "неверная маска IP-интерфейса\n" -#: interface.c:650 +#: interface.c:651 #, c-format msgid "activity on %s -noted- as %d\n" msgstr "активность на %s -отмечена- как %d\n" -#: interface.c:665 +#: interface.c:666 #, c-format msgid "skipping poll of %s, %s down\n" msgstr "пропускается опрос %s, %s отключен\n" -#: interface.c:684 +#: interface.c:685 #, c-format msgid "skipping poll of %s, %s IP address excluded\n" msgstr "пропускается опрос %s, %s IP-адрес исключен\n" -#: interface.c:696 +#: interface.c:697 #, c-format msgid "activity on %s checked as %d\n" msgstr "активность на %s проверена как %d\n" -#: interface.c:722 +#: interface.c:723 #, c-format msgid "skipping poll of %s, %s inactive\n" msgstr "пропускается опрос %s, %s отключен\n" -#: interface.c:729 +#: interface.c:730 #, c-format msgid "activity on %s was %d, is %d\n" msgstr "активность на %s была %d, %d\n" #: kerberos.c:74 msgid "could not decode initial BASE64 challenge\n" -msgstr "невозможно было декодировать начальный запрос BASE64\n" +msgstr "не удалось декодировать начальный запрос BASE64\n" -#: kerberos.c:139 +#: kerberos.c:137 #, c-format msgid "principal %s in ticket does not match -u %s\n" msgstr "принципал %s в мандате не совпадает с -u %s\n" -#: kerberos.c:147 +#: kerberos.c:145 #, c-format msgid "non-null instance (%s) might cause strange behavior\n" msgstr "ненулевая копия (%s) может вызвать странное поведение\n" -#: kerberos.c:213 +#: kerberos.c:211 msgid "could not decode BASE64 ready response\n" -msgstr "невозможно было декодировать ответ BASE64 о готовности\n" +msgstr "не удалось декодировать ответ BASE64 о готовности\n" -#: kerberos.c:220 +#: kerberos.c:218 msgid "challenge mismatch\n" msgstr "несовпадение запроса\n" -#: lock.c:86 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" -msgstr "fetchmail: ошибка чтения файла блокировки \"%s\": %s\n" +msgstr "fetchmail: ошибка чтения файла блокировки «%s»: %s\n" + +#: lock.c:101 +#, c-format +msgid "fetchmail: removing stale lockfile \"%s\"\n" +msgstr "fetchmail: удаляется устаревший файл блокировки «%s»\n" -#: lock.c:97 -msgid "fetchmail: removing stale lockfile\n" -msgstr "fetchmail: удаляется старый файл блокировки\n" +#: lock.c:105 +#, c-format +msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" +msgstr "fetchmail: не удалось удалить файл блокировки «%s» (%s), пытаюсь записать в него\n" + +#: lock.c:119 +#, c-format +msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" +msgstr "fetchmail: не удалось записать в файл блокировки «%s» (%s), выход\n" -#: lock.c:121 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" -msgstr "fetchmail: ошибка открытия файла блокировки \"%s\": %s\n" +msgstr "fetchmail: ошибка открытия файла блокировки «%s»: %s\n" -#: lock.c:168 -msgid "fetchmail: lock creation failed.\n" -msgstr "fetchmail: не удалось установить блокировку.\n" +#: lock.c:179 +#, c-format +msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" +msgstr "fetchmail: не удалось создать файл блокировки, файл PID «%s»: %s\n" + +#: lock.c:190 +#, c-format +msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" +msgstr "fetchmail: не удалось удалить или опустошить файл PID «%s»: %s\n" -#: netrc.c:219 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" -msgstr "%s:%d: предупреждение: перед всеми именами хостов найден \"%s\"\n" +msgstr "%s:%d: предупреждение: перед всеми именами узлов найден «%s»\n" -#: netrc.c:257 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" -msgstr "%s:%d: предупреждение: неизвестный маркер \"%s\"\n" +msgstr "%s:%d: предупреждение: неизвестный маркер «%s»\n" -#: odmr.c:66 +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: ошибка чтения файла (%s).\n" + +#: ntlmsubr.c:35 +msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" +msgstr "Предупреждение: получен некорректный ответ на «AUTH(ENTICATE) NTLM»!\n" + +#: ntlmsubr.c:84 +msgid "NTLM challenge contains invalid data.\n" +msgstr "NTLM-вызов содержит некорректные данные.\n" + +#: odmr.c:67 #, c-format msgid "%s's SMTP listener does not support ATRN\n" -msgstr "SMTP-приемник %s не поддерживает ATRN\n" +msgstr "SMTP-приёмник %s не поддерживает ATRN\n" -#: odmr.c:104 +#: odmr.c:105 msgid "Turnaround now...\n" msgstr "Реверсирование передачи...\n" -#: odmr.c:109 +#: odmr.c:110 msgid "ATRN request refused.\n" msgstr "Запрос ATRN отклонен.\n" -#: odmr.c:113 +#: odmr.c:114 msgid "Unable to process ATRN request now\n" msgstr "Невозможно сейчас обработать запрос ATRN\n" -#: odmr.c:118 +#: odmr.c:119 msgid "You have no mail.\n" msgstr "Для вас почты нет.\n" -#: odmr.c:122 +#: odmr.c:123 msgid "Command not implemented\n" -msgstr "Команда не выполнена\n" +msgstr "Поддержка команды не реализована\n" -#: odmr.c:126 +#: odmr.c:127 msgid "Authentication required.\n" msgstr "Требуется аутентификация.\n" -#: odmr.c:130 +#: odmr.c:132 #, c-format -msgid "Unknown ODMR error %d\n" -msgstr "Неизвестная ошибка ODMR %d\n" +msgid "Unknown ODMR error \"%s\"\n" +msgstr "Неизвестная ошибка ODMR «%s»\n" -#: odmr.c:189 +#: odmr.c:192 msgid "receiving message data\n" msgstr "принимаются данные сообщения\n" -#: odmr.c:242 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Опция --keep не поддерживается с ODMR\n" -#: odmr.c:246 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Опция --flush не поддерживается с ODMR\n" -#: odmr.c:250 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Опция --folder не поддерживается с ODMR\n" -#: odmr.c:254 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Опция --check не поддерживается с ODMR\n" -#: opie.c:42 +#: opie.c:43 msgid "server recv fatal\n" msgstr "сервер прекратил получение\n" -#: opie.c:56 +#: opie.c:57 msgid "Could not decode OTP challenge\n" -msgstr "Невозможно было декодировать запрос OTP\n" +msgstr "Не удалось декодировать запрос OTP\n" -#: opie.c:64 pop3.c:610 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " -msgstr "Секретная идентификационная фраза:" +msgstr "Секретная идентификационная фраза: " -#: options.c:172 options.c:216 +#: options.c:179 options.c:223 #, c-format msgid "String '%s' is not a valid number string.\n" -msgstr "Строка '%s' не является верной числовой строкой.\n" +msgstr "Строка «%s» не является числовой строкой.\n" -#: options.c:181 +#: options.c:188 #, c-format msgid "Value of string '%s' is %s than %d.\n" -msgstr "Значение строки '%s' - %s, чем %d.\n" +msgstr "Значение строки «%s» %s, чем %d.\n" -#: options.c:182 +#: options.c:189 msgid "smaller" msgstr "меньше" -#: options.c:182 +#: options.c:189 msgid "larger" msgstr "больше" -#: options.c:349 +#: options.c:337 +#, c-format +msgid "Invalid bad-header policy `%s' specified.\n" +msgstr "Указана некорректная политика bad-header «%s».\n" + +#: options.c:378 #, c-format msgid "Invalid protocol `%s' specified.\n" -msgstr "Указан неверный протокол `%s'.\n" +msgstr "Указан неверный протокол «%s».\n" -#: options.c:396 +#: options.c:425 #, c-format msgid "Invalid authentication `%s' specified.\n" -msgstr "Указана неверная аутентификация `%s'.\n" +msgstr "Указана неверная аутентификация «%s».\n" -#: options.c:601 +#: options.c:641 msgid "usage: fetchmail [options] [server ...]\n" msgstr "использование: fetchmail [опции] [сервер ...]\n" -#: options.c:602 +#: options.c:642 msgid " Options are as follows:\n" -msgstr " Используемые опции:\n" +msgstr " Поддерживаемые опции:\n" -#: options.c:603 +#: options.c:643 msgid " -?, --help display this option help\n" -msgstr " -?, --help вывод этой справки\n" +msgstr " -?, --help показать справку по опциям\n" -#: options.c:604 +#: options.c:644 msgid " -V, --version display version info\n" -msgstr " -V, --version вывод информации о версии\n" +msgstr " -V, --version показать информацию о версии\n" -#: options.c:606 +#: options.c:646 msgid " -c, --check check for messages without fetching\n" -msgstr " -c, --check проверка сообщений без выборки\n" +msgstr " -c, --check проверка сообщений без их загрузки\n" -#: options.c:607 +#: options.c:647 msgid " -s, --silent work silently\n" -msgstr " -s, --silent работа без лишней информации\n" +msgstr " -s, --silent работать тихо без вывода лишней информации\n" -#: options.c:608 +#: options.c:648 msgid " -v, --verbose work noisily (diagnostic output)\n" -msgstr " -v, --verbose работа с подробным выводом диагностических данных\n" +msgstr " -v, --verbose работать с подробным выводом диагностических данных\n" -#: options.c:609 +#: options.c:649 msgid " -d, --daemon run as a daemon once per n seconds\n" -msgstr " -d, --daemon запуск в виде демона каждые n секунд\n" +msgstr " -d, --daemon запуск в виде демона каждые n секунд\n" -#: options.c:610 +#: options.c:650 msgid " -N, --nodetach don't detach daemon process\n" -msgstr " -N, --nodetach не отсоединять процесс демона\n" +msgstr " -N, --nodetach не отсоединять процесс демона\n" -#: options.c:611 +#: options.c:651 msgid " -q, --quit kill daemon process\n" -msgstr " -q, --quit останов процесса демона\n" +msgstr " -q, --quit остановить процесса демона\n" -#: options.c:612 +#: options.c:652 msgid " -L, --logfile specify logfile name\n" -msgstr " -L, --logfile указание имени log-файла\n" +msgstr " -L, --logfile указать имя лог-файла\n" -#: options.c:613 +#: options.c:653 msgid " --syslog use syslog(3) for most messages when running as a daemon\n" -msgstr " --syslog использование syslog(3) для большинства сообщений, когда запущен как демон\n" +msgstr " --syslog использовать syslog(3) для большинства сообщений, когда запущен как демон\n" -#: options.c:614 +#: options.c:654 +msgid " --nosyslog turns off use of syslog(3)\n" +msgstr " --nosyslog отключить использование syslog(3)\n" + +#: options.c:655 msgid " --invisible don't write Received & enable host spoofing\n" -msgstr " --invisible не записывать Received и включить спуфинг хоста\n" +msgstr " --invisible не записывать Received и включить спуфинг узла\n" -#: options.c:615 +#: options.c:656 msgid " -f, --fetchmailrc specify alternate run control file\n" -msgstr " -f, --fetchmailrc указание другого файла контроля запуска\n" +msgstr " -f, --fetchmailrc указать другой файл контроля запуска\n" -#: options.c:616 +#: options.c:657 msgid " -i, --idfile specify alternate UIDs file\n" -msgstr " -i, --idfile указание других UID'ов файла\n" +msgstr " -i, --idfile указать другой файл с UID'ами\n" -#: options.c:617 +#: options.c:658 msgid " --pidfile specify alternate PID (lock) file\n" -msgstr " --pidfile указание другого файла с PID'ом\n" +msgstr " --pidfile указать другой файл блокировки с PID'ом\n" -#: options.c:618 +#: options.c:659 msgid " --postmaster specify recipient of last resort\n" -msgstr " --postmaster указать получателя на крайний случай\n" +msgstr " --postmaster указать получателя на крайний случай\n" -#: options.c:619 +#: options.c:660 msgid " --nobounce redirect bounces from user to postmaster.\n" -msgstr " --nobounce перенаправлять рикошеты пользователей постмастеру\n" +msgstr " --nobounce перенаправлять отказы доставки от пользователя к почтовому администратору\n" -#: options.c:620 +#: options.c:661 msgid " --nosoftbounce fetchmail deletes permanently undeliverable messages.\n" -msgstr " --nosoftbounce fetchmail удаляет постоянно недоставляемые сообщения\n" +msgstr " --nosoftbounce удалять постоянно не доставляемые сообщения\n" -#: options.c:621 +#: options.c:662 msgid " --softbounce keep permanently undeliverable messages on server (default).\n" -msgstr " --softbounce сохранять на сервере постоянно недоставляемые сообщения (по умолчанию)\n" +msgstr " --softbounce сохранять на сервере постоянно недоставляемые сообщения (по умолчанию)\n" -#: options.c:623 +#: options.c:664 msgid " -I, --interface interface required specification\n" -msgstr " -I, --interface требуемая для интерфейса спецификация\n" +msgstr " -I, --interface требуемая для интерфейса спецификация\n" -#: options.c:624 +#: options.c:665 msgid " -M, --monitor monitor interface for activity\n" -msgstr " -M, --monitor наблюдение за активностью интерфейса\n" +msgstr " -M, --monitor наблюдать за активностью интерфейса\n" -#: options.c:627 +#: options.c:668 msgid " --ssl enable ssl encrypted session\n" -msgstr " --ssl включение сессии, зашифрованной ssl\n" +msgstr " --ssl включение сессии, зашифрованной SSL\n" -#: options.c:628 +#: options.c:669 msgid " --sslkey ssl private key file\n" -msgstr " --sslkey файл секретного ключа ssl\n" +msgstr " --sslkey файл секретного ключа SSL\n" -#: options.c:629 +#: options.c:670 msgid " --sslcert ssl client certificate\n" -msgstr " --sslcert сертификат клиента ssl\n" +msgstr " --sslcert сертификат клиента SSL\n" -#: options.c:630 +#: options.c:671 msgid " --sslcertck do strict server certificate check (recommended)\n" -msgstr " --sslcertck строгая проверка сертификата севера (рекомендуется)\n" +msgstr " --sslcertck строгая проверка сертификата севера (рекомендуется)\n" -#: options.c:631 -msgid " --sslcertpath path to ssl certificates\n" -msgstr " --sslcertpath путь к сертификатам ssl\n" +#: options.c:672 +msgid " --nosslcertck skip strict server certificate check (insecure)\n" +msgstr " --nosslcertck пропустить строгую проверку сертификатов (опасно)\n" + +#: options.c:673 +msgid " --sslcertfile path to trusted-CA ssl certificate file\n" +msgstr " --sslcertfile путь к файлу доверенных центров сертификации\n" -#: options.c:632 +#: options.c:674 +msgid " --sslcertpath path to trusted-CA ssl certificate directory\n" +msgstr " --sslcertpath путь к каталогу сертификатов доверенных центров сертификации\n" + +#: options.c:675 msgid " --sslcommonname expect this CommonName from server (discouraged)\n" msgstr " --sslcommonname ожидать это общепринятое имя от сервера (не рекомендуется)\n" -#: options.c:633 +#: options.c:676 msgid " --sslfingerprint fingerprint that must match that of the server's cert.\n" -msgstr " --sslfingerprint отпечаток, который должен соответствовать сертификату сервера.\n" +msgstr " --sslfingerprint отпечаток, которому должен соответствовать сертификат сервера.\n" -#: options.c:634 -msgid " --sslproto force ssl protocol (SSL2/SSL3/TLS1)\n" -msgstr " --sslproto принудительное использование протокола ssl (SSL2/SSL3/TLS1)\n" +#: options.c:677 +msgid " --sslproto force ssl protocol (see manual)\n" +msgstr " --sslproto принудительно включить SSL (см. документацию)\n" -#: options.c:636 +#: options.c:679 msgid " --plugin specify external command to open connection\n" -msgstr " --plugin указание внешней команды для установки соединения\n" +msgstr " --plugin внешняя команда для установки соединения\n" -#: options.c:637 +#: options.c:680 msgid " --plugout specify external command to open smtp connection\n" -msgstr " --plugout указание внешней команды для установки соединения smtp\n" +msgstr " --plugout внешняя команда для установки соединения SMTP\n" + +#: options.c:681 +msgid "" +" --bad-header {reject|accept}\n" +" specify policy for handling messages with bad headers\n" +msgstr "" +" --bad-header {reject|accept}\n" +" политика обработки сообщений с некорректными заголовками\n" -#: options.c:639 -msgid " -p, --protocol specify retrieval protocol (see man page)\n" -msgstr " -p, --protocol указание протокола поиска (см. man page)\n" +#: options.c:684 +msgid " -p, --proto[col] specify retrieval protocol (see man page)\n" +msgstr " -p, --proto[col] протокол получения почты (см. документацию)\n" -#: options.c:640 +#: options.c:685 msgid " -U, --uidl force the use of UIDLs (pop3 only)\n" -msgstr " -U, --uidl принудительное использование UIDL'ов (только pop3)\n" +msgstr " -U, --uidl принудительное использование UIDL'ов (только POP3)\n" -#: options.c:641 +#: options.c:686 +msgid " --idle tells the IMAP server to send notice of new messages\n" +msgstr " --idle запросить у сервера получение уведомлений о новых письмах\n" + +#: options.c:687 msgid " --port TCP port to connect to (obsolete, use --service)\n" -msgstr " --port TCP-порт для подключения (устарел, используйте --service)\n" +msgstr " --port TCP-порт для подключения (устарело, используйте --service)\n" -#: options.c:642 +#: options.c:688 msgid " -P, --service TCP service to connect to (can be numeric TCP port)\n" -msgstr " -P, --service служба TCP для подключения (может быть числовым TCP-портом)\n" +msgstr " -P, --service служба TCP для подключения (может быть числовым TCP-портом)\n" -#: options.c:643 -msgid " --auth authentication type (password/kerberos/ssh/otp)\n" -msgstr " --auth тип аутентификации (password/kerberos/ssh/otp)\n" +#: options.c:689 +msgid " --auth authentication type (see manual)\n" +msgstr " --auth тип аутентификации (см. документацию)\n" -#: options.c:644 +#: options.c:690 msgid " -t, --timeout server nonresponse timeout\n" -msgstr " -t, --timeout таймаут молчания сервера\n" +msgstr " -t, --timeout таймаут молчания сервера\n" -#: options.c:645 +#: options.c:691 msgid " -E, --envelope envelope address header\n" -msgstr " -E, --envelope заголовок охватывающего адреса\n" +msgstr " -E, --envelope заголовок охватывающего адреса\n" -#: options.c:646 +#: options.c:692 msgid " -Q, --qvirtual prefix to remove from local user id\n" -msgstr " -Q, --qvirtual префикс, удаляемый из id локального пользователя\n" +msgstr " -Q, --qvirtual префикс, удаляемый из id локального пользователя\n" -#: options.c:647 +#: options.c:693 msgid " --principal mail service principal\n" -msgstr " --principal принципал почтовой службы\n" +msgstr " --principal принципал почтовой службы\n" -#: options.c:648 +#: options.c:694 msgid " --tracepolls add poll-tracing information to Received header\n" -msgstr " --tracepolls добавление информации трассировки опроса в заголовок Received\n" +msgstr " --tracepolls добавлять информацию трассировки опроса в заголовок Received\n" -#: options.c:650 -msgid " -u, --username specify users's login on server\n" -msgstr " -u, --username указание логина пользователя на сервере\n" +#: options.c:696 +msgid " -u, --user[name] specify users's login on server\n" +msgstr " -u, --user[name] указать имя пользователя на сервере\n" -#: options.c:651 +#: options.c:697 msgid " -a, --[fetch]all retrieve old and new messages\n" -msgstr " -a, --[fetch]all получение старых и новых сообщений\n" +msgstr " -a, --[fetch]all получать старые и новые сообщения\n" -#: options.c:652 +#: options.c:698 msgid " -K, --nokeep delete new messages after retrieval\n" -msgstr " -K, --nokeep удаление новых сообщений после получения\n" +msgstr " -K, --nokeep удалять новые сообщения после получения\n" -#: options.c:653 +#: options.c:699 msgid " -k, --keep save new messages after retrieval\n" -msgstr " -k, --keep сохранение новых сообщений после получения\n" +msgstr " -k, --keep сохранять новые сообщения после получения\n" -#: options.c:654 +#: options.c:700 msgid " -F, --flush delete old messages from server\n" -msgstr " -F, --flush удаление старых сообщений с сервера\n" +msgstr " -F, --flush удалять старые сообщения с сервера\n" -#: options.c:655 +#: options.c:701 msgid " --limitflush delete oversized messages\n" -msgstr " --limitflush удаление сообщений завышенного размера\n" +msgstr " --limitflush удалять сообщения завышенного размера\n" -#: options.c:656 +#: options.c:702 msgid " -n, --norewrite don't rewrite header addresses\n" -msgstr " -n, --norewrite не перезаписывать адреса заголовка\n" +msgstr " -n, --norewrite не перезаписывать адреса заголовка\n" -#: options.c:657 +#: options.c:703 msgid " -l, --limit don't fetch messages over given size\n" -msgstr " -l, --limit не делать выборку сообщений больше заданного размера\n" +msgstr " -l, --limit не загружать сообщения больше заданного размера\n" -#: options.c:658 +#: options.c:704 msgid " -w, --warnings interval between warning mail notification\n" -msgstr " -w, --warnings промежутки между предупреждающими почтовыми уведомлениями\n" +msgstr " -w, --warnings промежуток между предупреждающими почтовыми уведомлениями\n" -#: options.c:660 +#: options.c:706 msgid " -S, --smtphost set SMTP forwarding host\n" -msgstr " -S, --smtphost установка хоста переадресации SMTP\n" +msgstr " -S, --smtphost узел переадресации SMTP\n" -#: options.c:661 +#: options.c:707 msgid " --fetchdomains fetch mail for specified domains\n" -msgstr " --fetchdomains выборка почты для указанных доменов\n" +msgstr " --fetchdomains загружать почту для указанных доменов\n" -#: options.c:662 +#: options.c:708 msgid " -D, --smtpaddress set SMTP delivery domain to use\n" -msgstr " -D, --smtpaddress установка домена, используемого для доставки SMTP\n" +msgstr " -D, --smtpaddress назначить домен, используемый для доставки SMTP\n" -#: options.c:663 +#: options.c:709 msgid " --smtpname set SMTP full name username@domain\n" -msgstr " --smtpname установка полного (пользователь@домен) имени SMTP\n" +msgstr " --smtpname установка полного (пользователь@домен) имени SMTP\n" -#: options.c:664 +#: options.c:710 msgid " -Z, --antispam, set antispam response values\n" -msgstr " -Z, --antispam, установка значений антиспамерских ответных действий\n" +msgstr " -Z, --antispam, установка значение антиспамерских ответных действий\n" -#: options.c:665 +#: options.c:711 msgid " -b, --batchlimit set batch limit for SMTP connections\n" -msgstr " -b, --batchlimit установка ограничения на пакет для SMTP-соединений\n" +msgstr " -b, --batchlimit ограничение на пакет для SMTP-соединений\n" -#: options.c:666 +#: options.c:712 msgid " -B, --fetchlimit set fetch limit for server connections\n" -msgstr " -B, --fetchlimit установка ограничения на выборку для соединений сервера\n" +msgstr " -B, --fetchlimit ограничение на загрузку почты для соединений сервера\n" -#: options.c:667 +#: options.c:713 msgid " --fetchsizelimit set fetch message size limit\n" -msgstr " --fetchsizelimit установка ограничения на размер выборки сообщений\n" +msgstr " --fetchsizelimit ограничение на размер загружаемых сообщений\n" -#: options.c:668 +#: options.c:714 msgid " --fastuidl do a binary search for UIDLs\n" -msgstr " --fastuidl выполнить двоичный поиск UIDL'ов\n" +msgstr " --fastuidl выполнить двоичный поиск UIDL'ов\n" -#: options.c:669 +#: options.c:715 msgid " -e, --expunge set max deletions between expunges\n" -msgstr " -e, --expunge установка максимального количества удалений\n" +msgstr " -e, --expunge максимальное количество удалений\n" -#: options.c:670 +#: options.c:716 msgid " -m, --mda set MDA to use for forwarding\n" -msgstr " -m, --mda установка MDA, используемого для переадресации\n" +msgstr " -m, --mda MDA, используемый для переадресации\n" -#: options.c:671 +#: options.c:717 msgid " --bsmtp set output BSMTP file\n" -msgstr " --bsmtp установка файла вывода BSMTP\n" +msgstr " --bsmtp файл вывода BSMTP\n" -#: options.c:672 +#: options.c:718 msgid " --lmtp use LMTP (RFC2033) for delivery\n" -msgstr " --lmtp использование для доставки LMTP (RFC2033)\n" +msgstr " --lmtp использовать для доставки LMTP (RFC2033)\n" -#: options.c:673 +#: options.c:719 msgid " -r, --folder specify remote folder name\n" -msgstr " -r, --folder указание имени удаленного каталога\n" +msgstr " -r, --folder имя удалённого каталога\n" -#: options.c:674 +#: options.c:720 msgid " --showdots show progress dots even in logfiles\n" -msgstr " --showdots отображение точечной строки прогресса даже в log-файлах\n" +msgstr " --showdots выводить точечную строку прогресса даже в лог-файлы\n" + +#: pop2.c:67 +msgid "POP2 does not support STLS. Giving up.\n" +msgstr "POP2 не поддерживает STLS. Завершение работы.\n" + +#: pop2.c:73 +msgid "POP2 only supports password authentication. Giving up.\n" +msgstr "POP2 поддерживает только аутентификацию паролём. Завершение работы.\n" -#: pop3.c:355 -msgid "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead of TOP.\n" -msgstr "Предупреждение: найден POP3/PROXY-сервер Maillennium; вместо TOP используется команда RETR.\n" +#: pop3.c:338 +msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" +msgstr "Предупреждение: встречен «Maillennium POP3», используется команда RETR вместо TOP.\n" -#: pop3.c:454 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "Для этого сеанса требуется использовать TLS, однако сервер отклонил команду CAPA.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "STLS обязателен для этой сессии, но сервер отклонил команду CAPA.\n" -#: pop3.c:455 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Команда CAPA необходима для TLS.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Поддержка команды CAPA обязательна для STLS.\n" -#: pop3.c:538 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" -msgstr "%s: сбой принудительного обновления до TLS; выполняется попытка продолжить работу.\n" +msgstr "%s: сбой принудительного обновления до TLS; попытка продолжить работу.\n" -#: pop3.c:646 +#: pop3.c:476 +#, c-format +msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" +msgstr "%s: ПРЕДУПРЕЖДЕНИЕ: сервер предложил STLS, однако используется параметр sslproto ''.\n" + +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" -msgstr "Закончились допустимые аутентификаторы, продолжение невозможно.\n" +msgstr "Закончились допустимые методы аутентификации, продолжение невозможно.\n" -#: pop3.c:660 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "В приветствии не найдена требуемая временная метка APOP\n" -#: pop3.c:669 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "В приветствии ошибка синтаксиса временной метки\n" -#: pop3.c:685 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Недопустимая временная метка APOP.\n" -#: pop3.c:709 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Неопределённый запрос протокола в POP3_auth\n" -#: pop3.c:730 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" -msgstr "блокировка занятости! Может активен другой сеанс?\n" +msgstr "блокировка занятости! Возможно, активен другой сеанс?\n" -#: pop3.c:809 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Невозможно обработать UIDL-ответ upstream-сервера.\n" -#: pop3.c:832 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Сервер возвратил ответ с UID для неверного сообщения.\n" -#: pop3.c:859 pop3.c:1105 +#: pop3.c:843 #, c-format -msgid "id=%s (num=%d) was deleted, but is still present!\n" -msgstr "id=%s (номер=%d) было удалено, но все еще присутствует!\n" - -#: pop3.c:868 pop3.c:880 pop3.c:1114 pop3.c:1121 -#, c-format -msgid "%u is unseen\n" -msgstr "%u не просмотрено\n" +msgid "id=%s (num=%u) was deleted, but is still present!\n" +msgstr "id=%s (num=%u) всё ещё существует, хотя был удалён!\n" -#: pop3.c:965 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Сообщения добавлены в список на сервере. Обработка невозможна.\n" -#: pop3.c:1057 +#: pop3.c:1053 msgid "protocol error\n" msgstr "ошибка протокола\n" -#: pop3.c:1073 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" -msgstr "ошибка протокола при выборке UIDL'ов\n" +msgstr "ошибка протокола при получении UIDL'ов\n" + +#: pop3.c:1100 +#, c-format +msgid "id=%s (num=%d) was deleted, but is still present!\n" +msgstr "id=%s (номер=%d) было удалено, но все еще присутствует!\n" -#: pop3.c:1443 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Опция --folder не поддерживается с POP3\n" -#: rcfile_y.y:126 +#: rcfile_y.y:130 msgid "server option after user options" msgstr "опция сервера после опций пользователя" -#: rcfile_y.y:169 +#: rcfile_y.y:173 msgid "SDPS not enabled." msgstr "SDPS не включен." -#: rcfile_y.y:215 +#: rcfile_y.y:217 msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n" -msgstr "fetchmail: опция interface поддерживается только в Linux (без IPv6) и FreeBSD\n" +msgstr "fetchmail: опция interface поддерживается только на Linux (без IPv6) и FreeBSD\n" -#: rcfile_y.y:222 +#: rcfile_y.y:225 msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n" -msgstr "fetchmail: опция monitor поддерживается только в Linux (без IPv6) и FreeBSD\n" +msgstr "fetchmail: опция monitor поддерживается только на Linux (без IPv6) и FreeBSD\n" -#: rcfile_y.y:335 +#: rcfile_y.y:339 msgid "SSL is not enabled" msgstr "SSL не включен" -#: rcfile_y.y:385 +#: rcfile_y.y:391 msgid "end of input" msgstr "конец ввода" -#: rcfile_y.y:423 +#: rcfile_y.y:429 #, c-format msgid "File %s must be a regular file.\n" msgstr "Файл %s должен быть обычным файлом.\n" -#: rcfile_y.y:433 +#: rcfile_y.y:439 #, c-format msgid "File %s must have no more than -rwx------ (0700) permissions.\n" -msgstr "Файл %s должен иметь прав доступа не более -rwx------ (0700).\n" +msgstr "Файл %s должен иметь прав доступа не шире -rwx------ (0700).\n" -#: rcfile_y.y:445 +#: rcfile_y.y:451 #, c-format msgid "File %s must be owned by you.\n" msgstr "Владельцем файла %s должны быть вы.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Неизвестная системная ошибка" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (неполное сообщение журнала)\n" -#: rfc822.c:76 +#: rfc822.c:83 #, c-format -msgid "About to rewrite %s" -msgstr "Будет перезаписан %s" +msgid "About to rewrite %s...\n" +msgstr "Собираюсь переписать%s...\n" -#: rfc822.c:212 +#: rfc822.c:221 #, c-format -msgid "Rewritten version is %s\n" -msgstr "Переписанная версия %s\n" +msgid "...rewritten version is %s.\n" +msgstr "....переписанная версия: %s.\n" -#: rpa.c:117 +#: rpa.c:118 msgid "Success" msgstr "Успешно" -#: rpa.c:118 +#: rpa.c:119 msgid "Restricted user (something wrong with account)" msgstr "Ограниченный пользователь (что-то не так с учетной записью)" -#: rpa.c:119 +#: rpa.c:120 msgid "Invalid userid or passphrase" msgstr "Неверный id пользователя или идентификационная фраза" -#: rpa.c:120 +#: rpa.c:121 msgid "Deity error" msgstr "Божественная ошибка" -#: rpa.c:173 +#: rpa.c:174 msgid "RPA token 2: Base64 decode error\n" msgstr "RPA token 2: ошибка декодирования Base64\n" -#: rpa.c:184 +#: rpa.c:185 #, c-format msgid "Service chose RPA version %d.%d\n" msgstr "Служба выбрала RPA версии %d.%d\n" -#: rpa.c:190 +#: rpa.c:191 #, c-format msgid "Service challenge (l=%d):\n" msgstr "Запрос службы (l=%d):\n" -#: rpa.c:199 +#: rpa.c:200 #, c-format msgid "Service timestamp %s\n" msgstr "Временная метка службы %s\n" -#: rpa.c:204 +#: rpa.c:205 msgid "RPA token 2 length error\n" msgstr "Ошибка длины RPA token 2\n" -#: rpa.c:208 +#: rpa.c:209 #, c-format msgid "Realm list: %s\n" msgstr "Список области: %s\n" -#: rpa.c:212 +#: rpa.c:213 msgid "RPA error in service@realm string\n" msgstr "Ошибка RPA в строке служба@область\n" -#: rpa.c:249 +#: rpa.c:250 msgid "RPA token 4: Base64 decode error\n" msgstr "RPA token 4: ошибка декодирования Base64\n" -#: rpa.c:260 +#: rpa.c:261 #, c-format msgid "User authentication (l=%d):\n" msgstr "Аутентификация пользователя (l=%d):\n" -#: rpa.c:274 +#: rpa.c:275 #, c-format msgid "RPA status: %02X\n" msgstr "Статус RPA: %02X\n" -#: rpa.c:280 +#: rpa.c:281 msgid "RPA token 4 length error\n" msgstr "Ошибка длины RPA token 4\n" -#: rpa.c:287 +#: rpa.c:288 #, c-format msgid "RPA rejects you: %s\n" msgstr "RPA отверг вас: %s\n" -#: rpa.c:289 +#: rpa.c:290 msgid "RPA rejects you, reason unknown\n" msgstr "RPA отверг вас, причина неизвестна\n" -#: rpa.c:297 +#: rpa.c:298 #, c-format msgid "RPA User Authentication length error: %d\n" msgstr "Ошибка продолжительности аутентификации пользователя RPA: %d\n" -#: rpa.c:302 +#: rpa.c:303 #, c-format msgid "RPA Session key length error: %d\n" msgstr "Ошибка длины ключа сеанса RPA: %d\n" -#: rpa.c:308 +#: rpa.c:309 msgid "RPA _service_ auth fail. Spoof server?\n" msgstr "Сбой RPA _service_ auth. Ложный сервер?\n" -#: rpa.c:313 +#: rpa.c:314 msgid "Session key established:\n" msgstr "Сеансовый ключ признан:\n" -#: rpa.c:344 +#: rpa.c:345 msgid "RPA authorisation complete\n" msgstr "Авторизация RPA завершена\n" -#: rpa.c:371 +#: rpa.c:372 msgid "Get response\n" msgstr "Получение ответа\n" -#: rpa.c:401 +#: rpa.c:402 #, c-format msgid "Get response return %d [%s]\n" msgstr "Получение обратного ответа %d [%s]\n" -#: rpa.c:462 +#: rpa.c:463 msgid "Hdr not 60\n" msgstr "Заголовок не 60\n" -#: rpa.c:483 +#: rpa.c:484 msgid "Token length error\n" msgstr "Ошибка длины маркера\n" -#: rpa.c:488 +#: rpa.c:489 #, c-format msgid "Token Length %d disagrees with rxlen %d\n" msgstr "Длина маркера %d не совпадает с rxlen %d\n" -#: rpa.c:494 +#: rpa.c:495 msgid "Mechanism field incorrect\n" msgstr "Поле механизма неверно\n" -#: rpa.c:530 +#: rpa.c:531 #, c-format msgid "dec64 error at char %d: %x\n" -msgstr "Ошибка dec64 в символе %d: %x\n" +msgstr "jшибка dec64 в символе %d: %x\n" -#: rpa.c:545 +#: rpa.c:546 msgid "Inbound binary data:\n" msgstr "Входящие двоичные данные:\n" -#: rpa.c:581 +#: rpa.c:582 msgid "Outbound data:\n" msgstr "Исходящие данные:\n" -#: rpa.c:644 +#: rpa.c:645 msgid "RPA String too long\n" msgstr "Строка RPA слишком длинная\n" -#: rpa.c:649 +#: rpa.c:650 msgid "Unicode:\n" -msgstr "Уникод:\n" +msgstr "Unicode:\n" -#: rpa.c:708 +#: rpa.c:709 msgid "RPA Failed open of /dev/urandom. This shouldn't\n" -msgstr "RPA не смог открыть /dev/urandom. Это не должно было\n" +msgstr "RPA не смог открыть /dev/urandom. Это не должно \n" -#: rpa.c:709 +#: rpa.c:710 msgid " prevent you logging in, but means you\n" msgstr " помешать вам войти в систему, но означает, что вы\n" -#: rpa.c:710 +#: rpa.c:711 msgid " cannot be sure you are talking to the\n" -msgstr " не можете быть уверены в том, что общаетесь со\n" +msgstr " можете обмениваться данными не с той службой,\n" -#: rpa.c:711 +#: rpa.c:712 msgid " service that you think you are (replay\n" -msgstr " службой, в которой, как вы думаете, вы есть (возможны\n" +msgstr " которую ожидали увидеть (возможны атаки\n" -#: rpa.c:712 +#: rpa.c:713 msgid " attacks by a dishonest service are possible.)\n" -msgstr " воспроизведения атак подложной службы.)\n" +msgstr " воспроизведения со стороны подложной службы.)\n" -#: rpa.c:723 +#: rpa.c:724 msgid "User challenge:\n" msgstr "Запрос пользователя:\n" -#: rpa.c:873 +#: rpa.c:874 msgid "MD5 being applied to data block:\n" msgstr "MD5 применяется к блоку данных:\n" -#: rpa.c:886 -msgid "MD5 result is: \n" -msgstr "Результат MD5: \n" +#: rpa.c:887 +msgid "MD5 result is:\n" +msgstr "Результат MD5:\n" #: servport.c:53 #, c-format @@ -2525,349 +2821,516 @@ msgstr "Невозможно определить тип службы %s по н msgid "Please specify the service as decimal port number.\n" msgstr "Укажите службу в виде десятичного номера порта.\n" -#: sink.c:220 +#: sink.c:231 #, c-format msgid "forwarding to %s\n" msgstr "переадресовывается на %s\n" -#: sink.c:306 +#: sink.c:319 msgid "SMTP: (bounce-message body)\n" msgstr "SMTP: (тело сообщения-рикошета)\n" -#: sink.c:309 +#: sink.c:322 #, c-format msgid "mail from %s bounced to %s\n" msgstr "письмо от %s отправлено рикошетом на %s\n" -#: sink.c:446 -#, c-format -msgid "Saved error is still %d\n" -msgstr "Сохраненная ошибка все еще %d\n" - -#: sink.c:506 sink.c:605 +#: sink.c:497 sink.c:590 #, c-format msgid "%cMTP error: %s\n" msgstr "Ошибка %cMTP: %s\n" -#: sink.c:550 +#: sink.c:535 msgid "SMTP server requires STARTTLS, keeping message.\n" msgstr "Для SMTP-сервера требуется STARTTLS; сообщение сохранено.\n" -#: sink.c:730 +#: sink.c:714 #, c-format msgid "BSMTP file open failed: %s\n" msgstr "Не удалось открыть файл BSMTP: %s\n" -#: sink.c:776 -msgid "BSMTP preamble write failed.\n" -msgstr "Не удалось записать начальную часть BSMTP.\n" +#: sink.c:760 +#, c-format +msgid "BSMTP preamble write failed: %s.\n" +msgstr "Не удалось записать преамбулу BSMTP: %s.\n" -#: sink.c:990 +#: sink.c:974 #, c-format msgid "%cMTP listener doesn't like recipient address `%s'\n" -msgstr "Слушателю %cMTP не понравился адрес получателя `%s'\n" +msgstr "Слушателю %cMTP не понравился адрес получателя «%s»\n" -#: sink.c:997 +#: sink.c:981 #, c-format msgid "%cMTP listener doesn't really like recipient address `%s'\n" -msgstr "Слушателю %cMTP в самом деле не понравился адрес получателя `%s'\n" +msgstr "Слушателю %cMTP в самом деле не понравился адрес получателя «%s»\n" -#: sink.c:1043 +#: sink.c:1027 msgid "no address matches; no postmaster set.\n" -msgstr "нет сопоставленных адресов; постмастер не установлен.\n" +msgstr "нет сопоставленных адресов; почтовый администратор не установлен.\n" -#: sink.c:1055 +#: sink.c:1039 #, c-format msgid "can't even send to %s!\n" msgstr "даже невозможно отправить на %s!\n" -#: sink.c:1061 +#: sink.c:1045 #, c-format msgid "no address matches; forwarding to %s.\n" msgstr "нет сопоставленных адресов; переадресовывается на %s.\n" -#: sink.c:1217 +#: sink.c:1167 +#, c-format +msgid "MDA option contains single-quoted %%%c expansion.\n" +msgstr "Развёрнутое значение опции MDA содержит апостроф %%%c.\n" + +#: sink.c:1168 +msgid "Refusing to deliver. Check the manual and fix your mda option.\n" +msgstr "Отказываюсь доставлять почту. Изучите документацию и исправьте значение опции mda.\n" + +#: sink.c:1211 #, c-format msgid "about to deliver with: %s\n" msgstr "будет отправлен с: %s\n" +#: sink.c:1222 +#, c-format +msgid "Cannot switch effective user id to %ld: %s\n" +msgstr "Невозможно переключить EUID на %ld: %s\n" + +#: sink.c:1234 +#, c-format +msgid "Cannot switch effective user id back to original %ld: %s\n" +msgstr "Невозможно переключить EUID на оригинальный %ld: %s\n" + #: sink.c:1241 msgid "MDA open failed\n" msgstr "Не удалось открыть MDA\n" -#: sink.c:1278 +#: sink.c:1280 #, c-format msgid "%cMTP connect to %s failed\n" msgstr "Сбой %cMTP-подключения к %s\n" -#: sink.c:1302 +#: sink.c:1304 #, c-format msgid "can't raise the listener; falling back to %s" msgstr "невозможно запустить слушателя; откат на %s" -#: sink.c:1364 +#: sink.c:1362 +#, c-format +msgid "Message termination or close of BSMTP file failed: %s\n" +msgstr "Сбой при окончание письма или закрытии файла BSMTP: %s\n" + +#: sink.c:1387 #, c-format msgid "Error writing to MDA: %s\n" msgstr "Ошибка записи в MDA: %s\n" -#: sink.c:1367 +#: sink.c:1390 #, c-format msgid "MDA died of signal %d\n" msgstr "MDA завершен по сигналу %d\n" -#: sink.c:1370 +#: sink.c:1393 #, c-format msgid "MDA returned nonzero status %d\n" msgstr "MDA возвратил ненулевой статус %d\n" -#: sink.c:1373 +#: sink.c:1396 #, c-format msgid "Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n" -msgstr "Странно: MDA pclose возвратил %d и ошибку с номером %d/%s, невозможно обработать в %s:%d\n" +msgstr "Странно: MDA pclose вернул %d и ошибку с номером %d/%s, невозможно обработать в %s:%d\n" -#: sink.c:1395 -msgid "Message termination or close of BSMTP file failed\n" -msgstr "Не удалось удалить сообщение или закрыть файл BSMTP\n" - -#: sink.c:1417 +#: sink.c:1421 msgid "SMTP listener refused delivery\n" msgstr "Слушатель SMTP отказал в доставке\n" -#: sink.c:1447 +#: sink.c:1451 msgid "LMTP delivery error on EOM\n" msgstr "Ошибка доставки LMTP на EOM\n" -#: sink.c:1450 +#: sink.c:1454 #, c-format msgid "Unexpected non-503 response to LMTP EOM: %s\n" msgstr "Неожиданный не-503 ответ для LMTP EOM: %s\n" -#: sink.c:1605 -msgid "" -"-- \n" -"The Fetchmail Daemon" -msgstr "" -"--\n" -"Демон Fetchmail" +#: sink.c:1620 +msgid "The Fetchmail Daemon" +msgstr "Демон Fetchmail" -#: smtp.c:80 +#: smtp.c:84 msgid "ESMTP CRAM-MD5 Authentication...\n" msgstr "Аутентификация ESMTP CRAM-MD5...\n" -#: smtp.c:87 smtp.c:138 +#: smtp.c:90 smtp.c:143 msgid "Server rejected the AUTH command.\n" msgstr "Сервер отверг команду AUTH.\n" -#: smtp.c:95 smtp.c:145 smtp.c:155 smtp.c:161 +#: smtp.c:98 smtp.c:150 smtp.c:159 smtp.c:165 msgid "Bad base64 reply from server.\n" msgstr "Неверный ответ base64 с сервера.\n" -#: smtp.c:99 +#: smtp.c:102 #, c-format msgid "Challenge decoded: %s\n" msgstr "Запрос декодирован: %s\n" -#: smtp.c:116 +#: smtp.c:119 msgid "ESMTP PLAIN Authentication...\n" msgstr "Аутентификация ESMTP PLAIN...\n" -#: smtp.c:131 +#: smtp.c:137 msgid "ESMTP LOGIN Authentication...\n" msgstr "Аутентификация ESMTP LOGIN...\n" -#: smtp.c:339 smtp.c:362 +#: smtp.c:354 smtp.c:382 msgid "smtp listener protocol error\n" msgstr "ошибка протокола слушателя smtp\n" -#: socket.c:114 socket.c:140 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: сбой malloc\n" -#: socket.c:172 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: плагин для узла %s (сервис %s) пуст, выполнение невозможно!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: сбой socketpair\n" -#: socket.c:178 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: не удалось создать дочерний процесс\n" -#: socket.c:185 +#: socket.c:203 msgid "dup2 failed\n" msgstr "сбой dup2\n" -#: socket.c:191 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" -msgstr "запущен %s (хост %s служба %s)\n" +msgstr "запущен %s (узел %s служба %s)\n" -#: socket.c:194 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "сбой execvp(%s)\n" -#: socket.c:282 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "ошибка getaddrinfo(\"%s\",\"%s\"): %s\n" -#: socket.c:285 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Попробуйте добавить опцию --service (см. FAQ, пункт R12).\n" -#: socket.c:296 socket.c:299 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" -msgstr "неизв. (%s)" +msgstr "неизвестно (%s)" -#: socket.c:302 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Попытка подключения к %s/%s..." -#: socket.c:310 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "невозможно создать сокет: %s\n" -#: socket.c:326 +#: socket.c:320 +#, c-format +msgid "name %d: cannot create socket family %d type %d: %s\n" +msgstr "имя %d: не удалось создать семейство сокетов %d типа %d: %s\n" + +#: socket.c:338 msgid "connection failed.\n" msgstr "не удалось подключиться.\n" -#: socket.c:328 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "сбой подключения к %s:%s [%s/%s]: %s.\n" -#: socket.c:334 +#: socket.c:341 +#, c-format +msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" +msgstr "имя %d: подключение к %s:%s [%s/%s] не удалось: %s.\n" + +#: socket.c:347 msgid "connected.\n" msgstr "соединение установлено.\n" -#: socket.c:611 +#: socket.c:360 +#, c-format +msgid "" +"Connection errors for this poll:\n" +"%s" +msgstr "" +"Ошибки подключения для этого опроса:\n" +"%s" + +#: socket.c:450 +#, c-format +msgid "OpenSSL reported: %s\n" +msgstr "OpenSSL сообщает: %s\n" + +#: socket.c:690 +#, c-format +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Глубина вызовов проверки SSL %d: verify_ok == %d, err = %d, %s\n" + +#: socket.c:696 +msgid "Server certificate:\n" +msgstr "Сертификат сервера:\n" + +#: socket.c:701 +#, c-format +msgid "Certificate chain, from root to peer, starting at depth %d:\n" +msgstr "Цепочка сертификатов от корня, начиная с глубины %d:\n" + +#: socket.c:704 +#, c-format +msgid "Certificate at depth %d:\n" +msgstr "Сертификат на глубине %d:\n" + +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Запрашивающая организация: %s\n" -#: socket.c:613 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Предупреждение: имя запрашивающей организации слишком длинное (возможно укорочено).\n" -#: socket.c:615 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Неизвестная организация\n" -#: socket.c:617 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Общепринятое имя: %s\n" -#: socket.c:619 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Предупреждение: общепринятое имя слишком длинное (возможно укорочено).\n" -#: socket.c:621 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Неизвестное общепринятое имя\n" -#: socket.c:625 +#: socket.c:728 #, c-format -msgid "Server CommonName: %s\n" -msgstr "Общепринятое имя сервера: %s\n" +msgid "Subject CommonName: %s\n" +msgstr "Общепринятое имя: %s\n" -#: socket.c:629 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n" -#: socket.c:675 +#: socket.c:740 +msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" +msgstr "Неправильный сертификат: общее название Темы содержит NUL, завершение работы!\n" + +#: socket.c:768 +#, c-format +msgid "Subject Alternative Name: %s\n" +msgstr "Альтернативное имя (SAN): %s\n" + +#: socket.c:774 +msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" +msgstr "Неправильный сертификат: альтернативное имя (SAN) содержит NUL, завершение работы!\n" + +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Несовпадение общепринятого имени сервера: %s != %s\n" -#: socket.c:681 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Имя сервера не установлено, невозможно проверить сертификат!\n" -#: socket.c:686 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Неизвестное общепринятое имя сервера\n" -#: socket.c:688 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Имя сервера не указано в сертификате!\n" -#: socket.c:700 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "сбой EVP_md5()!\n" -#: socket.c:704 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Нехватка памяти!\n" -#: socket.c:712 +#: socket.c:829 msgid "Digest text buffer too small!\n" -msgstr "Буфер текстового журнала слишком мал!\n" +msgstr "Нехватка места в текстовом буфере контрольной суммы!\n" -#: socket.c:718 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "Отпечаток ключа %s: %s\n" -#: socket.c:722 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "Отпечатки %s совпадают.\n" -#: socket.c:724 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "Отпечатки %s не совпадают!\n" -#: socket.c:733 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Ошибка проверки сертификата сервера: %s\n" -#: socket.c:739 +#: socket.c:868 +#, c-format +msgid "Broken certification chain at: %s\n" +msgstr "Некорректная цепь сертификатов: %s\n" + +#: socket.c:870 +msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" +msgstr "Возможно, сервер не предоставил для проверки промежуточные сертификаты CA, на что fetchmail не может никак повлиять. За подробной информацией обратитесь к файлу README.SSL-SERVER из комплекта fetchmail.\n" + +#: socket.c:880 #, c-format -msgid "unknown issuer (first %d characters): %s\n" -msgstr "неизвестная запрашивающая сторона (первые %d символов): %s\n" +msgid "Missing trust anchor certificate: %s\n" +msgstr "Отсутствует сертификат-якорь доверия: %s\n" -#: socket.c:826 +#: socket.c:883 +msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" +msgstr "Возможно, корневой сертификат CA не входит в число доверенных, или нужно выполнить команду c_rehash на каталоге с сертификатами доверенных центров. За подробной информацией обратитесь к справке по опциям --sslcertpath и --sslcertfile, а также к файлу README.SSL.\n" + +#: socket.c:957 socket.c:1033 +msgid "Your OpenSSL version does not support SSLv3.\n" +msgstr "Ваша версия OpenSSL не поддерживает SSLv3.\n" + +#: socket.c:975 socket.c:1051 +msgid "Your OpenSSL version does not support TLS v1.1.\n" +msgstr "Ваша версия OpenSSL не поддерживает TLS v1.1.\n" + +#: socket.c:986 socket.c:1062 +msgid "Your OpenSSL version does not support TLS v1.2.\n" +msgstr "Ваша версия OpenSSL не поддерживает TLS v1.2.\n" + +#: socket.c:997 socket.c:1073 +msgid "Your OpenSSL version does not support TLS v1.3.\n" +msgstr "Ваша версия OpenSSL не поддерживает TLS v1.3.\n" + +#: socket.c:1006 socket.c:1083 +#, c-format +msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" +msgstr "Указан некорректный SSL-протокол «%s», используем авто-выбор по умолчанию (auto).\n" + +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Библиотека wolfSSL %#lx старше заголовков %#lx, прекращаем работу.\n" + +#: socket.c:1128 +#, c-format +msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Библиотека OpenSSL %#lx старше заголовков %#lx, прекращаем работу.\n" + +#: socket.c:1133 +#, c-format +msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" +msgstr "Библиотека OpenSSL %#lx новее заголовков %#lx, пытаемся продолжить.\n" + +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Дескриптор файла вне диапазона SSL" -#: socket.c:842 +#: socket.c:1175 +msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" +msgstr "Некоторые дистрибутивы отключают поддержку старых протоколов нестандартными способами. Попробуйте использовать более новую версию протокола.\n" + +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Не удалось загрузить сертификаты CA (файл=«%s», каталог=«%s»), ошибка %d:\n" + +#: socket.c:1272 +#, c-format +msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" +msgstr "Предупреждение: сбой SSL_set_tlsext_host_name(%p, \"%s\") (код %#lx), пробуем продолжить.\n" + +#: socket.c:1286 #, c-format -msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n" -msgstr "Указан неверный протокол SSL '%s', используется протокол по умолчанию (SSLv23).\n" +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: сокет %d: wolfSSL_check_domain_name(%#p, \"%s\") вернул %d, пробуем продолжить\n" + +#: socket.c:1302 +#, c-format +msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" +msgstr "Предупреждение: сбой X509_VERIFY_PARAM_set1_host(%p, \"%s\") (код %#x), пробуем продолжить.\n" + +#: socket.c:1355 +msgid "Server shut down connection prematurely during SSL_connect().\n" +msgstr "Сервер преждевременно завершил подключение при вызове SSL_connect().\n" + +#: socket.c:1358 +#, c-format +msgid "System error during SSL_connect(): %s\n" +msgstr "Системная ошибка при вызове SSL_connect(): %s\n" + +#: socket.c:1358 +msgid "handshake failed at protocol or connection level." +msgstr "сбой рукопожатия на уровне протокола или сетевого подключения." -#: socket.c:918 +#: socket.c:1378 +msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" +msgstr "Не удалось получить текущий шифр SSL/TLS — сессия не установлена?\n" + +#: socket.c:1381 +#, c-format +msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" +msgstr "SSL/TLS: используется протокол %s, шифр %s, %d/%d секретных/обработанных бит\n" + +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Проверка сертификата/отпечатка была как-то пропущена!\n" -#: socket.c:996 +#: socket.c:1405 +msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" +msgstr "Предупреждение: соединение небезопасно, продолжаю всё равно. (Используйте --sslcertck!)\n" + +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Повторная попытка чтения сокета Cygwin\n" -#: socket.c:999 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Сбой повторного чтения сокета Cygwin!\n" -#: transact.c:65 +#: transact.c:79 #, c-format msgid "mapped address %s to local %s\n" msgstr "установлено соответствие адреса %s локальному %s\n" -#: transact.c:87 +#: transact.c:101 #, c-format msgid "mapped %s to local %s\n" msgstr "установлено соответствие %s локальному %s\n" -#: transact.c:154 +#: transact.c:168 #, c-format msgid "passed through %s matching %s\n" msgstr "пройден через %s соответствующий %s\n" -#: transact.c:224 +#: transact.c:240 #, c-format msgid "" "analyzing Received line:\n" @@ -2876,145 +3339,165 @@ msgstr "" "анализируется строка Received:\n" "%s" -#: transact.c:263 +#: transact.c:279 #, c-format msgid "line accepted, %s is an alias of the mailserver\n" msgstr "строка принята, %s является алиасом почтового сервера\n" -#: transact.c:269 +#: transact.c:285 #, c-format msgid "line rejected, %s is not an alias of the mailserver\n" msgstr "строка отвергнута, %s не является алиасом почтового сервера\n" -#: transact.c:343 +#: transact.c:359 msgid "no Received address found\n" msgstr "адрес Received не найден\n" -#: transact.c:352 +#: transact.c:368 #, c-format msgid "found Received address `%s'\n" -msgstr "найден адрес Received `%s'\n" - -#: transact.c:566 -msgid "message delimiter found while scanning headers\n" -msgstr "при сканировании заголовков найден разделитель сообщения\n" +msgstr "найден адрес Received «%s»\n" -#: transact.c:597 -msgid "incorrect header line found while scanning headers\n" -msgstr "при сканировании заголовков найдена неверная строка\n" +#: transact.c:613 +msgid "incorrect header line found - see manpage for bad-header option\n" +msgstr "встречен некорректный заголовок — смотрите опцию bad-header в документации\n" -#: transact.c:599 +#: transact.c:615 #, c-format msgid "line: %s" msgstr "строка: %s" -#: transact.c:1138 +#: transact.c:1087 transact.c:1097 +#, c-format +msgid "Parsing envelope \"%s\" names \"%-.*s\"\n" +msgstr "Разбор имён конверта «%s» «%-.*s»\n" + +#: transact.c:1112 +#, c-format +msgid "Parsing Received names \"%-.*s\"\n" +msgstr "Разбор имён Received «%-.*s»\n" + +#: transact.c:1124 +msgid "No envelope recipient found, resorting to header guessing.\n" +msgstr "Не найден получатель в конверте, попытка угадать по заголовкам.\n" + +#: transact.c:1142 +#, c-format +msgid "Guessing from header \"%-.*s\".\n" +msgstr "Предположение по заголовку «%-.*s».\n" + +#: transact.c:1157 #, c-format msgid "no local matches, forwarding to %s\n" msgstr "нет локальных совпадений, переадресовывается на %s\n" -#: transact.c:1153 +#: transact.c:1172 msgid "forwarding and deletion suppressed due to DNS errors\n" msgstr "переадресация и удаление приостановлены из-за ошибок DNS\n" -#: transact.c:1263 +#: transact.c:1283 msgid "writing RFC822 msgblk.headers\n" msgstr "записываются заголовки RFC822 msgblk\n" -#: transact.c:1282 +#: transact.c:1302 msgid "no recipient addresses matched declared local names" msgstr "нет адресов получателей, соответствующих объявленным локальным именам" -#: transact.c:1289 +#: transact.c:1309 #, c-format msgid "recipient address %s didn't match any local name" msgstr "адрес получателя %s не соответствует ни одному локальному имени" -#: transact.c:1298 +#: transact.c:1318 msgid "message has embedded NULs" msgstr "сообщение содержит вложенные NUL" -#: transact.c:1306 +#: transact.c:1326 msgid "SMTP listener rejected local recipient addresses: " msgstr "Слушатель SMTP отверг адреса локальных получателей: " -#: transact.c:1445 +#: transact.c:1376 msgid "error writing message text\n" msgstr "ошибка записи текста сообщения\n" -#: uid.c:250 +#: transact.c:1652 #, c-format -msgid "Old UID list from %s:" -msgstr "Старый список UID из %s:" +msgid "Buffer too small. This is a bug in the caller of %s:%lu.\n" +msgstr "Недостаточно места в буфере. Это сигнализирует об ошибке в вызове %s:%lu.\n" -#: uid.c:255 uid.c:266 uid.c:523 uid.c:573 +#: uid.c:262 +#, c-format +msgid "Open or read error while reading idfile %s: %s\n" +msgstr "Ошибка открытия или чтения ID-файла %s: %s\n" + +#: uid.c:273 +#, c-format +msgid "Old UID list from %s:\n" +msgstr "Старый список UID из %s:\n" + +#: uid.c:277 uid.c:286 uid.c:355 msgid " <empty>" msgstr " <пусто>" -#: uid.c:262 -msgid "Scratch list of UIDs:" -msgstr "Временный список UID'ов:" +#: uid.c:284 +msgid "Scratch list of UIDs:\n" +msgstr "Временный список UID:\n" -#: uid.c:517 uid.c:569 +#: uid.c:369 uid.c:413 #, c-format -msgid "Merged UID list from %s:" -msgstr "Объединенный список UID из %s:" +msgid "Merged UID list from %s:\n" +msgstr "Объединённый список UID из %s:\n" -#: uid.c:519 +#: uid.c:372 #, c-format -msgid "New UID list from %s:" -msgstr "Новый список UID из %s:" +msgid "New UID list from %s:\n" +msgstr "Новый список UID из %s:\n" -#: uid.c:548 -msgid "swapping UID lists\n" -msgstr "обмениваются списки UID\n" - -#: uid.c:556 +#: uid.c:402 msgid "not swapping UID lists, no UIDs seen this query\n" msgstr "списки UID не обмениваются, в этом запросе нет UID'ов\n" -#: uid.c:581 +#: uid.c:422 msgid "discarding new UID list\n" msgstr "отбрасывается новый список UID\n" -#: uid.c:617 +#: uid.c:479 msgid "Deleting fetchids file.\n" msgstr "Удаляется файл fetchids.\n" -#: uid.c:620 +#: uid.c:482 #, c-format msgid "Error deleting %s: %s\n" msgstr "Ошибка удаления %s: %s\n" -#: uid.c:626 +#: uid.c:489 msgid "Writing fetchids file.\n" msgstr "Записывается файл fetchids.\n" -#: uid.c:645 +#: uid.c:503 uid.c:512 +#, c-format +msgid "Write error on fetchids file %s: %s\n" +msgstr "Ошибка записи в fetchids-файл %s: %s\n" + +#: uid.c:524 #, c-format msgid "Error writing to fetchids file %s, old file left in place.\n" msgstr "Ошибка записи в fetchids-файл %s, старый файл остался на месте.\n" -#: uid.c:649 +#: uid.c:528 #, c-format msgid "Cannot rename fetchids file %s to %s: %s\n" msgstr "Невозможно переименовать fetchids-файл %s в %s: %s\n" -#: uid.c:653 +#: uid.c:532 #, c-format msgid "Cannot open fetchids file %s for writing: %s\n" msgstr "Невозможно открыть fetchids-файл %s для записи: %s\n" -#: xmalloc.c:33 +#: xmalloc.c:28 msgid "malloc failed\n" msgstr "сбой malloc\n" -#: xmalloc.c:47 +#: xmalloc.c:42 msgid "realloc failed\n" msgstr "сбой realloc\n" - -#~ msgid "TLS connection failed.\n" -#~ msgstr "Сбой подключения через SSL.\n" - -#~ msgid "SIGPIPE thrown from an MDA or a stream socket error\n" -#~ msgstr "Из MDA заброшен SIGPIPE или ошибка потокового сокета\n" @@ -1,12 +1,12 @@ # Translation of fetchmail to Albanian # This file is distributed under the same license as the fetchmail package. -# Besnik Bleta <besnik@programeshqip.org>, 2004,2008,2015,2019,2020,2021 +# Besnik Bleta <besnik@programeshqip.org>, 2004,2008,2015,2019,2020,2021,2022, 2023 msgid "" msgstr "" -"Project-Id-Version: fetchmail-6.4.16-rc1\n" +"Project-Id-Version: fetchmail-6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-01-30 19:12+0200\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-04 19:16+0200\n" "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n" "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n" "Language: sq\n" @@ -20,7 +20,7 @@ msgstr "" #: checkalias.c:174 #, c-format msgid "Checking if %s is really the same node as %s\n" -msgstr "Po kontrollohet nëse vërtet %s është e njëjta nyjë si %s\n" +msgstr "Po kontrollohet nëse %s është vërtet e njëjta nyje me %s\n" #: checkalias.c:178 msgid "Yes, their IP addresses match\n" @@ -154,41 +154,41 @@ msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "U mbërrit në kufi prurjesh %d; %d mesazh lënë te shërbyesi %s, llogaria %s\n" msgstr[1] "U mbërrit në kufi prurjesh %d; %d mesazhe lënë te shërbyesi %s, llogaria %s\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "mbarim kohe pas %d sekondash në pritje për t’u lidhur me shërbyesin %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "mbarim kohe pas %d sekondash në pritje për shërbyesin %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "mbarim kohe pas %d sekondash në pritje për %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "mbarim kohe pas %d sekondash në pritje që dëgjuesi të përgjigjet.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "mbarim kohe pas %d sekondash.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail-i sheh mbarime të përsëritur kohe" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmail-i pa më tepër se %d mbarime kohe teksa përpiqej të merrte postë prej %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -204,73 +204,73 @@ msgstr "" "\n" "Fetchmail-i s’do të vjelë sërish prej kësaj kutie, para se ta rinisni.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "urdhri para-lidhjeje përfundoi me sinjalin %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "urdhri para-lidhje dështoi me përfundim %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "s’u gjet dot kuti postare HESIOD për %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Shërbyesi udhëheqës s’ka emër.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "s’u gjet dot emër kanonikal DNS për %s (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "Lidhja %s me %s dështoi" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "Lidhja SSL dështoi.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Gabim duket-i-zënë te %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Gabim shërbyes i zënë te %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Dështim autorizimi te %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (autorizuar dikur)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "Për ndihmë, shihni te http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "mirëfilltësimi fetchmail dështoi në %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail-i s’mori dot postë prej %s@%s.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -284,7 +284,7 @@ msgstr "" "të cilën fetchmail-i s’e dallon dot nga të tjerat, ngaqë shërbyesi s’dërgoi\n" "mesazh të dobishëm gabimi." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -304,7 +304,7 @@ msgstr "" "në çdo cikël. Pa u rikthyer shërbimi, nuk do të dërgohen njoftime\n" "të ardhshme." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -325,177 +325,182 @@ msgstr "" "në çdo cikël. Nuk do të dërgohen njoftime në të ardhmen, para se\n" "të rikthehet shërbimi." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Rivil menjëherë te %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Socket ose gabim TLS te %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Gabim mirëfilltësimi ose hyrje e panjohur te %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "OK autorizimi te %s@%s\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "mirëfilltësim fetchmail OK në %s@%s" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail-i mundi të hyjë te %s@%s.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Shërbimi është rivendosur.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "po përzgjidhet ose vilet prej dosjes %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "po përzgjidhet ose vilet prej dosjes parazgjedhje\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s te %s (dosja %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s te %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Po vilet %s\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d mesazh (%d %s) për %s" msgstr[1] "%d mesazhe (%d %s) për %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "i parë" msgstr[1] "i parë" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d mesazh për %s" msgstr[1] "%d mesazhe për %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d oktete).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Pa postë për %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "numërim mesazhesh me gabime!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "U anashkaluan shumë mesazhe (%d > %d) për shkak gabimesh kalimtare për %s\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "\"socket\"" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "krye RFC822 që mungon ose i dëmtuar" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "njëkohësim klient/shërbyes" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "protokoll klient/shërbyes" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "kyçje e zënë te shërbyes" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "Transaksion SMTP" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "Kërkim DNS" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "e papërcaktuar" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "Gabim %s gjatë prurjes prej %s@%s-së dhe shpërndarjes te streha SMTP %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "e panjohur" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "Gabim %s gjatë sjelljes prej %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "urdhri pas-lidhjeje përfundoi me sinjalin %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "urdhri pas-lidhjeje dështoi me gjendjen %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "S’ka lidhje për te mbulimi i Kerberos V4-s.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "S’ka lidhje për te mbulimi i Kerberos V5-s.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Mundësia --flush s’mbulohet me %s\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Mundësia --all s’mbulohet me %s\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Mundësi --limit s’mbulohet me %s\n" @@ -616,19 +621,19 @@ msgstr "Gabim sintakse ETRN në parametra\n" msgid "Unknown ETRN error %d\n" msgstr "Gabim ETRN i panjohur %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Mundësia --keep s’mbulohet me ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Mundësia --flush s’mbulohet me ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Mundësia --folder s’mbulohet me ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Mundësia --check s’mbulohet me ETRN\n" @@ -669,12 +674,12 @@ msgstr "fetchmail: thirrur me" msgid "could not get current working directory\n" msgstr "s’u mor dot drejtoria e tanishme e punës\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Ky është versioni %s i fetchmail-it" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -683,7 +688,7 @@ msgstr "" "Përpiluar me librarinë SSL %#lx \"%s\"\n" "Run-time përdor librarinë SSL %#lx \"%s\"\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -692,939 +697,959 @@ msgstr "" "OpenSSL: %s\n" "Mekanizma: %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "KUJDES: Libraria juaj SSL/TLS s’mbulon TLS v1.3.\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "KUJDES: Përpiluar kundrejt LibreSSL, çka s’është formësim i mbuluar.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "GABIM: Përpiluar kundrejt LibreSSL, që është cenim të drejtash kopjimi, për mungesë përjashtmi nga klauzola GPL 2bn. Shihni pjesën COPYING. Po ndërpritet.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "KUJDES: Përpiluar pa SSL/TLS.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "Mundësia nodetach është në funksionim, po shpërfillet mundësia mbi kartelë regjistrimi.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "S’po xhirohet nën mënyrën demon, po shpërfillet mundësia mbi kartelë regjistrimi.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Kartela regjistër \"%s\" s’ekziston, po shpërfillet mundësia mbi kartelë regjistrimi.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Kartela e regjistrimit \"%s\" s’është e shkrueshme, po ndërpritet.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" -msgstr "Është rregulluar dhe mundësia syslog, dhe ajo logfile, po shpërfillet syslog, dhe po regjistrohet te %s" +msgstr "Është ujdisur dhe mundësia syslog, dhe ajo logfile, po shpërfillet syslog, dhe po regjistrohet te %s" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Po merret mundësi prej rresht urdhrash%s%s\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " dhe " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "S’ka shërbyes poste të rregulluar -- ndoshta mungon %s?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: s’janë treguar shërbyes poste.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: s’po xhiron tjetër fetchmail\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: gabim në asgjësimin e %s fetchmail te %ld; po lihet.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "prapaskenë" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "paraskenë" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s fetchmail te %ld u asgjësua.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: s’kontrollohet dot për postë, kur te e njëjta strehë xhiron një tjetër fetchmail.\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: s’mund të vilet nga strehët e treguara, me një tjetër fetchmail që xhiron te %ld.\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: një tjetër fetchmail po xhiron në paraskenë te %ld.\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: s’pranohen dot mundësi, kur një fetchmail xhiron në prapaskenë.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: një fetchmail në prapaskenë te %ld u zgjua.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: një vëlla më i moshuar te %ld vdiq në mënyrë misterioze.\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: s’gjendet dot një fjalëkalim për %s@%s.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Jepni fjalëkalim për %s@%s: " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: s’mund të shqitet në prapaskenë. Po ndërpritet.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "po niset demoni fetchmail %s\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "s’u hap dot %s për të vargëzuar regjistrime në të\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "Mënyra --check është aktive, s’po vilet postë\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "s’u kontrollua dot koha e %s (gabim %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "po riniset fetchmail (%s ndryshoi)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "përpjekja për rinisje mund të dështojë, ngaqë drejtoria s’është rikthyer\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "përpjekja për rinisje të fetchmail-it dështoi\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "vjelja te %s u anashkalua (dështim mirëfilltësimi ose shumë mbarime kohe)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "interval që s’kapet, s’po kërkohet %s\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Gjendje kërkimi=0 (SUKSES)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Gjendje kërkimi=1 (PAPOSTË)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Gjendje kërkimi=2 (SOCKET)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Gjendje kërkimi=3 (DËSHTMIR)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Gjendje kërkimi=4 (PROTOKOLL)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Gjendje kërkimi=5 (SINTAKSË)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Gjendje kërkimi=6 (GABIO)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Gjendje kërkimi=7 (GABIM)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Gjendje kërkimi=8 (PËRJASHTO)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Gjendje kërkimi=9 (LOCKBUSY)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Gjendje kërkimi=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Gjendje kërkimi=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Gjendje kërkimi=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Gjendje kërkimi=13 (MAKSJELL)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Gjendje kërkimi=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Janë bllokuar krejt lidhjet. Po dilet.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "në gjumë te %s për %d sekonda\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "përmendur prej %s\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "përmendur prej sinjali %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "përmendur më %s\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "mbarim normal, gjendje %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "s’u kontrollua dot koha për kartelën run-control\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Sinjalizim: përmendje e shumëfishtë e strehës %s në kartelën formësim\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "fetchmail: Gabim: zëra të shumëfishtë për \"parazgjedhje\" te kartela formësim, ose \"parazgjedhje\" s’është zëri i parë.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "S’është përpiluar mbulimi i SSL-së.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "Mbulimi për KERBEROS v4 është formësuar, por s’është përpiluar.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "Mbulimi për KERBEROS v5 është formësuar, por s’është përpiluar.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Mbulimi për GSSAPI-n është formësuar, por jo përpiluar.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: sinjalizim: pa DNS gati, te i cili të kontrollohen prurje shpërndarjesh të shumëfishta %s\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "kujdes: shpërndarja e shumëfishtë për %s lyp mundësinë zarf!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "sinjalizim: Mos kërkoni ndihmë, nëse krejt posta i shkon ustait të postës!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: formësimi i %s i pavlefshëm, jepni numër pozitiv porte për shërbimin ose portën\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: formësimi i %s i pavlefshëm, RPOP lyp një portë të privilegjuar\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "KUJDES: formësimi i %s i pavlefshëm, normalisht ju duhet --ssl për portë 993/service pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "KUJDES: formësimi i %s i pavlefshëm, normalisht ju duhet portë 993/service pop3s për --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "KUJDES: formësimi i %s i pavlefshëm, normalisht ju duhet --ssl për portë 993/service imaps.\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "KUJDES: formësimi i %s i pavlefshëm, normalisht ju duhet portë 993/service imaps për --ssl.\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "Formësimi i %s i pavlefshëm, LMTP s’mund të përdorë portën SMTP parazgjedhje\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Prania e fetchall-it njëkohësisht me \"keep on\" në një demon, ose në një gjendje plogështie, përbën gabim!\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: Gabim: mënyra plogështi s’funksionon për shumë dosje ose llogari njëherësh!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "përfunduar me sinjal %d\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja filloi\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "S’është formësuar mbulim për POP2.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "S’është formësuar mbulim për POP3.\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "S’është formësuar mbulim për IMAP.\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "S’është formësuar mbulim për ETRN.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "S’është formësuar mbulim për ODMR.\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "u përzgjodh protokoll i pambuluar.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s po kërkon %s (protokolli %s) te %s: vjelja u plotësua\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Intervali i vjeljes është %d sekonda\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Jetëgjatësia e regjistrit është %s\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Idfile është %s\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Mesazhet e ecurisë do të regjistrohen përmes syslog\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail do të kryejë maskim dhe s’do të prodhojë Të Marrë\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail-i do të tregojë pika ecurie edhe në kartela regjistrimesh.\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail-i do të përcjellë mesazhe të keqadresuar me shpërndarje të shumëfishtë te %s.\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail-i do të drejtojë gabime poste drejt ustait të postës.\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail-i do të drejtojë gabime poste te dërguesi.\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail-i do t’i trajtojë gabimet e përhershme si të përhershme (do t’i hedhë tej mesazhet).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail-i do t’i trajtojë gabimet e përhershme si të përkohshme (do t’i mbajë mesazhet).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Mundësi për marrje prej %s@%s:\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Posta do të merret përmes %s\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " Vjelja e këtij shërbyesi do të ndodhë çdo %d interval.\n" msgstr[1] " Vjelja e këtij shërbyesi do të ndodhë çdo %d intervale.\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Emri i vërtetë i shërbyesit është %s.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Kjo strehë s’do pyetet, kur s’ka strehë të treguar.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Kjo strehë do të pyetet, kur s’ka strehë të treguar.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Do të kërkohet fjalëkalim.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " E fshehtë APOP= \"%s\".\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " Id RPOP = \"%s\".\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Fjalëkalim = \"%s\".\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Protokolli është KPOP me mirëfilltësim Kerberos %s" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Protokolli është %s" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (po përdoret shërbim %s)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (po përdoret portë parazgjedhje)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (po detyrohet përdorimi i UIDL-së)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Do të provohen tërë metodat e mundshme për mirëfilltësim.\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim me fjalëkalim.\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim MSN.\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim NTLM.\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim OTP.\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim CRAM-MD5.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim GSSAPI.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim Kerberos V4.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Do të detyrohet mirëfilltësim Kerberos V5.\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Nënkuptohet fshehtëzim skaj-më-skaj.\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Parësori i shërbimit postar është: %s\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " U aktivizuan sesione SSL të fshehtëzuar.\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " Protokoll SSL: %s.\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " U aktivizua kontroll dëshmie shërbyesi SSL.\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " U çaktivizua kontroll dëshmie shërbyesi SSL.\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Kartelë dëshmie SSL të besuar parazgjedhje: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Kartelë dëshmie SSL të besuar: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " Drejtori parazgjedhje dëshmish SSL të besuara: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Drejtori dëshmish SSL të besueshme: %s\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " Emër i Zakonshëm shërbyesi SSL: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Shenjë gishtash kyçi SSL (kontrolluar kundrejt kyçi shërbyesi): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Afati i mospërgjigjes së shërbyesit është %d sekonda" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (parazgjedhje).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Kuti postare parazgjedhje e përzgjedhur.\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Kutitë postare të përzgjedhura janë:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Do të merren tërë mesazhet (--all on).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Do të merren vetëm mesazhet e rinj (--all off).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Mesazhet e sjellë do të mbahen në shërbyes (--keep on).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Mesazhet e sjellë s’do të mbahen në shërbyes (--keep off).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Mesazhet e vjetër do të zbrazen para marrjes së mesazheve (--flush on).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Mesazhet e vjetër s’do të zbrazen para marrjes së mesazheve (--flush off).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Mesazhet e stërmëdhenj do të zbrazen para marrjes së mesazheve (--limitflush on).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Mesazhet stërmëdhenj s’do të zbrazen para marrjes së mesazheve (--limitflush off).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Rishkrimi i adresave vendore të shërbyesit është i aktivizuar (--norewrite off).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Rishkrimi i adresave vendore të shërbyesit është i çaktivizuar (--norewrite on).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Heqja e carriage-return-it është e aktivizuar (stripcr on).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Heqja e carriage-return-it është e çaktivizuar (stripcr off).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Detyrimi i carriage-return-it është i aktivizuar (forcecr on).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Detyrimi i carriage-return-it është i çaktivizuar (forcecr off).\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Interpretimi i Kodimit të Shpërnguljes së Lëndës është i çaktivizuar (pass8bits on).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Interpretimi i Kodimit të Shpërnguljes së Lëndës është i aktivizuar (pass8bits off).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " Shkodimi MIME është i aktivizuar (mimedecode on).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " Shkodimi MIME është i çaktivizuar (mimedecode off).\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Plogështia pas vjeljes është e aktivizuar (idle on).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " Plogështia pas vjeljes është e çaktivizuar (idle off).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Rreshta Gjendjeje Jo e Zbrazët do të hidhen tej (dropstatus on)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Rreshta Gjendjeje Jo e Zbrazët do të ruhen (dropstatus off)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Rreshtat Nisur Për do të hidhen tej (dropdelivered on)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Rreshtat Nisur Për do të ruhen (dropdelivered off)\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Caku i madhësisë së mesazheve është %d tetëshe (--limit %d).\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Pa cak madhësie mesazhesh (--limit 0).\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Intervali i sinjalizimit të madhësisë së mesazheve është %d sekonda (--warnings %d).\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Sinjalizim madhësie në çdo vjelje (--warnings 0).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Caku për mesazhe të marrë është %d (--fetchlimit %d).\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Pa cak për mesazhe të marrë (--fetchlimit 0).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " Caku i madhësisë së mesazheve që sillen është %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Pa cak madhësie mesazhesh që sillen (--fetchsizelimit 0).\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Kryej kërkim dyor të UID-ve gjatë çdo vjeljeje (--fastuidl 1).\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Kryej kërkim dyor të UID-ve gjatë %d prej %d vjeljeve (--fastuidl %d).\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Kryej kërkim linear të UID-ve gjatë çdo vjeljeje (--fastuidl 0).\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Caku për tufë mesazhesh SMTP është %d.\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Pa cak për tufë mesazhe SMTP (--batchlimit 0).\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Intervali i fshirjesh ndërmjet spastrimesh është vënë me detyrim %d (--expunge %d).\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Pa spastrime të detyruara (--expunge 0).\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Përkatësitë për të cilat do të sillet postë janë:" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (parazgjedhje)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Mesazhet do të vargëzohen te %s si BSMTP\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Mesazhet do të shpërndahen me \"%s\".\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Mesazhet do të përcillen si %cMTP te:" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Pjesa strehë e rreshtit POSTË PREJ do të jetë %s\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Adresa që do vendoset tek rreshtat RCPT TO e dërguar te SMTP do të jetë %s\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Përgjigje të pranuara blloqesh mesazhesh të padëshiruar dëgjuesi janë:" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Bllokimi i mesazheve të padëshiruar është i çaktivizuar\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Lidhja me shërbyesin do të sillet me \"%s\".\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Pa urdhër para-lidhjeje.\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Lidhja me shërbyesin do të mbyllet me \"%s\".\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Pa urdhër pas-lidhjeje.\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Pa emra vendorë të deklaruar për këtë strehë.\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Mënyrë shpërndarje e shumëfishtë: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Mënyrë shpërndarje njëshe: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "U njoh %d emër vendor.\n" msgstr[1] "U njohën %d emra vendorë.\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " Kërkimi DNS për adresa shpërndarjesh të shumëfishta është i aktivizuar.\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " Kërkimi DNS për adresa shpërndarjesh të shumëfishta është i çaktivizuar.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Aliase shërbyesish do të krahasohen me adresa shpërndarjesh të shumëfishta sipas adresash IP.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Aliase shërbyesish do të krahasohen me adresa shpërndarjesh të shumëfishta sipas emrash.\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Rrugëzimi envelope-address është i çaktivizuar\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Kryet e zarfit nënkuptohet të jenë: %s\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Numër kryesh zarfi për t’u anashkaluar: %d\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Parashtesa %s do të hiqet prej id-je përdoruesi\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Pa heqje parashtese\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Aliase emrash shërbyesi të paradeklaruar:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Përkatësi vendore:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Lidhja duhet të jetë përmes ndërfaqes %s.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Pa kusht të përcaktuar rreth ndërfaqes.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Qerthulli i vjeljes do të mbikëqyrë %s.\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Pa ndërfaqe mbikëqyrjeje të përcaktuar.\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Lidhjet me shërbyesin do të kryhen përmes shtojcës %s (--plugin %s).\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Pa urdhër shtojce të përcaktuar.\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Lidhjet me dëgjuesi do të kryhen përmes shtojce daljeje %s (--plugout %s).\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Pa urdhër shtojce daljeje të përcaktuar.\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Pa UID të ruajtur prej kësaj strehe.\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UID të ruajtur.\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Të dhëna gjurmimi vjeljeje do të shtohen te kryet Të Marrë.\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " S’do të shtohen të dhëna gjurmimi vjeljeje te kryet Të Marrë.\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Mesazhet me krye të këqija do të hidhen tej.\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Mesazhet me krye të këqija do të kalohen.\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Veti kalimi-nëpër \"%s\".\n" @@ -1739,127 +1764,160 @@ msgstr "Gabim dhënieje kredencialesh\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: rrjedhë e përgjumur për %d sek.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protokoll i identifikuar si IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protokoll i identifikuar si IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "do të rrijë në plogështi pas vjeljeje\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Prej shërbyesit IMAP u mor përgjigje BYE: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "numërim i rremë mesazhesh te \"%s\"!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "numërim i rremë EXPUNGE te \"%s\"!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protokoll i identifikuar si IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "u gjet listë e përditësuar aftësish sistemi\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protokoll i identifikuar si IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "shërbyesi nuk reklamoi zgjerim SASL-IR, por sendërtimit të fetchmail-it i duhet për AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: formësimi lyp TLS, por STARTTLS nuk lejohet, për shkak të gjendjes së mirëfilltësimit (PREAUTH). Po ndërpritet lidhja. Nëse shtojca juaj është e sigurt, mund ta nxirrni jashtë loje STARTTLS-në me --sslproto (shihni doracakun).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "do të rrijë në plogështi pas vjeljeje\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: formësimi lyp TLS, por STARTTLS nuk lejohet, për shkak të gjendjes së mirëfilltësimit (PREAUTH). Po ndërpritet lidhja. Nëse lejohet nga shërbyesi, provoni më mirë --ssl (shihni doracakun).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: përmirësimi me TLS pati sukses.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: përmirësimi me TLS dështoi.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: përmirësimi oportunist me TLS dështoi, po provohet vazhdimi\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: KUJDES: shërbyesi ofroi STARTTLS, por duke dhënë sslproto ''.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: “--auth external” i domosdoshëm, por nuk reklamohet nga shërbyesi.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Aftësi e domosdoshme OTP e papërpiluar tek fetchmail-i\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Aftësi e domosdoshme NTML e papërpiluar tek fetchmail-i\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: “--auth password” i domosdoshëm, por shërbyesi nuk e lejon (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: na u mbaruan metodat e mirëfilltësimit dhe s’bëhet dot hyrja.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "ngatërresë në fshirje poste (%d faktiku != %d çka pritej)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu është i pavërejtur\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u është i pavërejtur\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "rivjelja dështoi\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d mesazh në pritje pas rivjeljes\n" msgstr[1] "%d mesazhe në pritje pas rivjeljes\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "përzgjedhja e kutisë postare dështoi\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "%d mesazh në pritje pas vjeljes së parë\n" msgstr[1] "%d mesazhe në pritje pas vjeljes së parë\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "spastrimi dështoi\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "%d mesazh në pritje pas spastrimit\n" msgstr[1] "%d mesazhe në pritje pas spastrimit\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "kërkimi për mesazhe të pavërejtur dështoi\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u është i pari i pavërejtur\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Sinjalizim: po shpërfillen të dhëna të rreme për madhësi mesazhesh, të dërguara nga shërbyesi.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Përgjigje FETCH e pasaktë: %s.\n" @@ -1962,53 +2020,58 @@ msgstr "s’u shkodua dot përgjigje e gatshme BASE64\n" #: kerberos.c:218 msgid "challenge mismatch\n" -msgstr "" +msgstr "mospërputhje sfidash\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: gabim gjatë leximit të lockfile-it \"%s\": %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: po hiqet lockfile-i i ndenjur \"%s\"\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "fetchmail: s’hiqet dot lidhja e lockfile-it \"%s\" (%s), po provohet të shkruhet në të\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: s’shkruhet dot te lockfile-i \"%s\" (%s), po dilet\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: gabim gjatë hapjes së lockfile-it \"%s\": %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: krijimi i kyçjes dështoi, pidfile \"%s\": %s\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: s’hiqet ose cungohet dot pidfile-i \"%s\": %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: kujdes: para cilitdo emër strehe u gjet \"%s\"\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: sinjalizim: token \"%s\" i panjohur\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: gabim në lexim kartele (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Kujdes: u mor sfidë e keqformuar te \"AUTH(ENTICATE) NTLM\"!\n" @@ -2055,19 +2118,19 @@ msgstr "Gabim i panjohur ODMR \"%s\"\n" msgid "receiving message data\n" msgstr "po merren të dhëna mesazhi\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Mundësia --keep s’mbulohet me ODMR\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Mundësia --flush s’mbulohet me ODMR\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Mundësia --folder s’mbulohet me ODMR\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Mundësia --check s’mbulohet me ODMR\n" @@ -2079,7 +2142,7 @@ msgstr "recv fatal shërbyesi\n" msgid "Could not decode OTP challenge\n" msgstr "S’u shkodua dot sfidë OTP\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Frazëkalim i fshehtë: " @@ -2412,83 +2475,83 @@ msgstr "POP2 nuk e mbulon STLS-në. Po hiqet dorë.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 mbulon vetëm mirëfilltësim me fjalëkalim. Po hiqet dorë.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Kujdes: U gjet \"Maillennium POP3\", po përdoret urdhri RETR në vend të TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "TLS-ja është e detyrueshme për këtë sesion, por shërbyesi s’e pranoi urdhrin CAPA.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "STLS-ja është e detyrueshme për këtë sesion, por shërbyesi s’e pranoi urdhrin CAPA.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Urdhri CAPA megjithatë është i nevojshëm për TLS-në.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Urdhri CAPA megjithatë është i nevojshëm për STLS-në.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: përmirësimi oportunist me TLS dështoi, po provohet vazhdimi\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: KUJDES: shërbyesi ofroi STLS, por duke dhënë sslproto ''.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Na u mbaruan mirëfilltësuesit e lejuar dhe nuk mund të vazhdojmë.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "S’u gjet vulë kohore e nevojshme APOP në përshëndetje\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Gabim sintakse vule kohore në përshëndetje\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Vulë kohore APOP e pavlefshme.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Kërkesë protokolli e papërcaktuar në POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "kyçje e zënë! Ka ndonjë sesion tjetër aktiv?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "S’trajtohet dot përgjigje UIDL nga shërbyesi i sipërm.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Shërbyesi u përgjigj me UID për mesazh të gabuar.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (num=%u) qe fshirë, por është ende i pranishëm!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Mesazhe të futur në një listë te shërbyesi. S’e trajton dot këtë.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "gabim protokolli\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "gabim protokolli gjatë sjelljes së UIDL-ve\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (num=%d) qe fshirë, por është ende i pranishëm!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Mundësia --folder s’mbulohet me POP3\n" @@ -2531,11 +2594,11 @@ msgstr "Kartela %s s’duhet të ketë më tepër leje se -rwx------ (0700).\n" msgid "File %s must be owned by you.\n" msgstr "Kartela %s duhet të jetë pronë e juaja.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Gabim i panjohur sistemi" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (mesazh i paplotë regjistrimi)\n" @@ -2910,80 +2973,85 @@ msgstr "Mirëfilltësim ESMTP LOGIN…\n" msgid "smtp listener protocol error\n" msgstr "gabim protokolli dëgjuesi smtp\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc-u dështoi\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: shtojca për strehën %s shërbimin %s është e zbrazët, s’mund të xhirohet!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair-i dështoi\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: degëzimi dështoi\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 dështoi\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "po xhirohet %s (streha %s shërbimi %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) dështoi\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "gabim getaddrinfo(\"%s\",\"%s\"): %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Provoni të shtoni mundësinë --service (shihni edhe PBR-të, zëri R12).\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "i panjohur (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Po përpiqet të lidhet me %s/%s…" -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "s’krijohet dot socket: %s\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "emër %d: s’krijohet dot familje socket-i %d lloji %d: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "lidhja dështoi.\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "lidhja me %s:%s [%s/%s] dështoi: %s.\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "emër %d: lidhja me %s:%s [%s/%s] dështoi: %s.\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "i lidhur.\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2992,229 +3060,244 @@ msgstr "" "Gabime lidhjeje për këtë vjelje:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL-ja njoftoi: %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "Thellësi callback-u verifikimi SSL-je %d: preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Thellësi callback-u verifikimi SSL-je %d: verify_ok == %d, err = %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Dëshmi shërbyesi:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Zinxhir dëshmish, nga rrënja te ana tjetër, që fillon me thellësinë %d:\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "Dëshmi me thellësi %d:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Ent Lëshues: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Kujdes: Emër Enti Lëshues shumë i gjatë (mundet u cungua).\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Ent i Panjohur\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Emër i Zakonshëm Lëshuesi: %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Sinjalizim: Emër i Zakonshëm Lëshuesi shumë i gjatë (mundet u cungua).\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Emër i Zakonshëm Lëshuesi i Panjohur\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "Emër i Zakonshëm Subjekti: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Dëshmi e keqe: Emër i Zakonshëm Subjekti shumë i gjatë!\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Dëshmi e keqe: Emri i Zakonshëm i Subjektit përmban NUL, po ndërpritet!\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Emër Alternativ Subjekti: %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Dëshmi e keqe: Emri Alternativ i Subjektit përmban NUL, po ndërpritet!\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Ngatërrim Emri të Zakonshëm Shërbyesi: %s != %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Emër shërbyesi i pacaktuar, s’u verifikua dot dëshmia!\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Emër i Zakonshëm Shërbyesi i Panjohur\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Emër shërbyesi i pacaktuar në dëshmi!\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() dështoi!\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Kujtesë e pamjaftueshme!\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "Shtytëz përmbledhjeje tekstesh shumë e vogël!\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "Gjurmë gishtash kyçi %s: %s\n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "%s gjurmët e gishtave përputhen.\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s gjurmët e gishtave nuk përputhen!\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Gabim verifikim dëshmie shërbyesi: %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Zinxhir i dëmtuar dëshmish te: %s\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "Kjo mund të nënkuptonte se shërbyesi s’dha dëshmi të ndërmjetme AD-je, për çka fetchmail-i s’mund të bëjë asgjë. Për hollësi, ju lutem shihni dokumentin README.SSL-SERVER që shoqëron fetchmail-in.\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" -msgstr "" +msgstr "Mungon dëshmi besimi spirance: %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "Kjo mund të nënkuptonte që dëshmia e nënshkrimit të AD për rrënjën s’gjendet te vendi i dëshmive të besuara për AD-të, ose se lypset që të xhirohet c_rehash te drejtoria e dëshmive. Për hollësi, ju lutemi shihni dokumentimin për --sslcertpath dhe --sslcertfile te faqja e doracakut. Për hollësi, shihni README.SSL.\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Versioni juaj OpenSLL s’mbulon SSLv3.\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Versioni juaj OpenSLL s’mbulon TLS v1.1.\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Versioni juaj OpenSLL s’mbulon TLS v1.2.\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Versioni juaj OpenSLL s’mbulon TLS v1.3.\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "U dha protokoll SSL i pavlefshëm '%s', po përdoret parazgjedhja vetëpërzgjedhje (auto).\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Librari OpenSSL e ngarkuar %#lx më e vjetër se kryet %#lx, s’pranon të funksionojë.\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "Librari OpenSSL e ngarkuar %#lx më e vjetër se kryet %#lx, s’pranon të funksionojë.\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "Librari OpenSSL e ngarkuar %#lx më e re se kryet %#lx, po provohet të vazhdohet.\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Përshkrues kartele jashtë intervali SSL-je" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Kini parasysh se disa shpërndarje i çaktivizojnë versionet e vjetër të protokolleve në rrugë të çuditshme jostandarde. Provoni një version protokolli më të ri.\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "S’ngarkohen dot vendndodhjet (kartelë=\"%s\", drejtori=\"%s\"), gabim %d:\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Kujdes: SSL_set_tlsext_host_name(%p, \"%s\") dështoi (kod %#lx), po provohet të vazhdohet.\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") u përgjigj me %d, po provohet të vazhdohet\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Kujdes: X509_VERIFY_PARAM_set1_host(%p, \"%s\") dështoi (kod %#x), po provohet të vazhdohet.\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Shërbyesi e fiku lidhjen para kohe gjatë SSL_connect().\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Gabim sistemi gjatë SSL_connect(): %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "duar-shtrëngimi dështoi në nivel protokolli ose lidhjeje." -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "S’merret dot shifër e tanishme SSL/TLS - s’është vendosur sesion?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: po përdoret protokolli %s, shifër %s, %d/%d bite të fshehtë/të përpunuar\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Verifikimi i dëshmisë/gjurmës së gishtave pak a shumë u anashkalua!\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Kujdes: lidhja është e pasigurt, po vazhdohet sido qoftë. (Më mirë përdorni --sslcertck!)\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Riprovë për lexim prej një socket-i Cygwin\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Leximi dhe shkrimi prej një socket-i Cygwin dështuan!\n" @@ -3344,7 +3427,7 @@ msgstr " <e zbrazët>" #: uid.c:284 msgid "Scratch list of UIDs:\n" -msgstr "" +msgstr "Listë paraprake UID-sh:\n" #: uid.c:369 uid.c:413 #, c-format @@ -3404,12 +3487,3 @@ msgstr "dështoi malloc\n" #: xmalloc.c:42 msgid "realloc failed\n" msgstr "dështoi realloc\n" - -#~ msgid "Required LOGIN capability not supported by server\n" -#~ msgstr "Aftësi e domosdoshme LOGIN e pambuluar prej shërbyesit\n" - -#~ msgid "Saved error is still %d\n" -#~ msgstr "Gabimi i ruajtur është ende %d\n" - -#~ msgid "swapping UID lists\n" -#~ msgstr "po shkëmbehen lista UID-sh\n" @@ -1,13 +1,14 @@ # Serbian translation of fetchmail. # Copyright © 2020 Eric S. Raymond (msgids) # This file is distributed under the same license as the fetchmail package. -# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2020–2021. +# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2020–2023. +# msgid "" msgstr "" -"Project-Id-Version: fetchmail-6.4.16-rc1\n" +"Project-Id-Version: fetchmail-6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-03-28 18:26+0200\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-02-19 12:00+0100\n" "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -157,41 +158,41 @@ msgstr[0] "ограничење довлачења %d је достигнуто; msgstr[1] "ограничење довлачења %d је достигнуто; %d поруке су остале на серверу „%s“ на налогу „%s“\n" msgstr[2] "ограничење довлачења %d је достигнуто; %d порука је остало на серверу „%s“ на налогу „%s“\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "истекло је време након %d секунде чекајући на повезивање са сервером „%s“.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "истекло је време након %d секунде чекајући на сервер „%s“.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "истекло је време након %d секунде чекајући на „%s“.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "истекло је време након %d секунде чекајући на ослушкивача да одговори.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "истекло је време након %d секунде.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "видим поновљене истеке времена" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Видео сам више од %d истека времена покушавајући да добавим пошту са„%s@%s“.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -207,73 +208,73 @@ msgstr "" "\n" "Добавпошта неће опет пропитивати ово сандуче све док га поново не покренете.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "наредба предповезивања је окончана сигналом %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "наредба предповезивања није успела са стањем %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "не могу да нађем „HESIOD“ поштански претинац за „%s“\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Водећи сервер нема назив.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "не могу да нађем прописни ДНС назив за „%s“ (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "„%s“ повезивање са „%s“ није успело" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "ССЛ веза није успела.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Грешка закључавања заузетости на „%s@%s“\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Грешка заузетости сервера на „%s@%s“\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Овлашћивање није успело на „%s@%s%s“\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (претходно овлашћен)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "За помоћ погледајте „http://www.fetchmail.info/fetchmail-FAQ.html#R15“\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "нисам успео да потврдим идентитет на „%s@%s“" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Не могу да добавим пошту са „%s@%s“.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -287,7 +288,7 @@ msgstr "" "који не могу да разазнам зато што сервер није послао корисну\n" "поруку грешке." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -307,7 +308,7 @@ msgstr "" "при сваком циклусу. Будућих обавештења неће бити све док се услуга\n" "не успостави." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -327,60 +328,65 @@ msgstr "" "при сваком циклусу. Будућих обавештења неће бити све док се услуга\n" "не успостави." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Одмах поново пропитујем на „%s@%s“\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Грешка прикључнице или ТЛС-а на „%s@%s“\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Непозната грешка пријављивања или потврђивања идентитета на „%s@%s“\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Овлашћивање је у реду на „%s@%s“\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "потврђивање идентитета програма је у реду на „%s@%s“" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Успео сам да се пријавим на „%s@%s“.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Услуга је поново успостављена.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "фасцикла бирања или поновног пропитивања „%s“\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "основна фасцикла бирања или поновног пропитивања\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "„%s“ на „%s“ (фасцикла „%s“)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "„%s“ на „%s“" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Пропитујем „%s“\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" @@ -388,14 +394,14 @@ msgstr[0] "%d порука (%d %s) за „%s“" msgstr[1] "%d поруке (%d %s) за „%s“" msgstr[2] "%d порука (%d %s) за „%s“" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "виђена" msgstr[1] "виђене" msgstr[2] "виђене" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" @@ -403,104 +409,104 @@ msgstr[0] "%d порука за „%s“" msgstr[1] "%d поруке за „%s“" msgstr[2] "%d порука за „%s“" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d октета).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Нема поште за „%s“\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "нетачан број порука!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "Превише порука је прескочено (%d > %d) услед грешака прелазности за „%s“\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "прикључница" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "недостаје или је лоше „RFC822“ заглавље" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "усаглашавање клијента/сервера" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "протокол клијента/сервера" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "заузето закључавање на серверу" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "СМТП промет" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "ДНС претрага" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "неодређено" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "„%s“ грешка приликом довлачења са „%s@%s“ и испоручивања СМТП домаћину „%s“\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "непознато" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "„%s“ грешка приликом довлачења са „%s@%s“\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "наредба пост-повезивања је окончана сигналом %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "наредба пост-повезивања није успела са стањем %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Подршка Кербероса V4 није повезана.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Подршка Кербероса V5 није повезана.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Опција „--flush“ није подржана са „%s“\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Опција „--all“ није подржана са „%s“\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Опција „--limit“ није подржана са „%s“\n" @@ -620,19 +626,19 @@ msgstr "Грешка „ETRN“ синтаксе у параметрима\n" msgid "Unknown ETRN error %d\n" msgstr "Непозната „ETRN“ грешка %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Опција „--keep“ није подржана са „ETRN“\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Опција „--flush“ није подржана са „ETRN“\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Опција „--folder“ није подржана са „ETRN“\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Опција „--check“ није подржана са „ETRN“\n" @@ -673,12 +679,12 @@ msgstr "добавпошта: призвано са" msgid "could not get current working directory\n" msgstr "не могу да добавим тренутни радни директоријум\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Ово издање добавпоште је %s" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" @@ -687,7 +693,7 @@ msgstr "" "Преведено ССЛ библиотеком %#lx „%s“\n" "Извршно време користи ССЛ библиотеку %#lx „%s“\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -696,419 +702,439 @@ msgstr "" "ОпенССЛ: %s\n" "Погони: %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "УПОЗОРЕЊЕ: Ваша ССЛ/ТЛС библиотека не подржава ТЛС и1.3.\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "УПОЗОРЕЊЕ: Преведено наспрам „LibreSSL“, што није подржано подешавање.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "ГРЕШКА: Преведено са „LibreSSL“, што је кршење ауторских права због недостатка изуезтка клаузуле „2b“ из ОЈЛ. Видите „УМНОЖАВАЊЕ“. Прекидам.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "УПОЗОРЕЊЕ: Преведено без ССЛ/ТЛС.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "Опција „nodetach“ је у дејству, занемарујем опцију датотеке дневника.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Не радим у режиму демона, занемарујем опцију датотеке дневника.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Датотека дневника „%s“ не постоји, занемарујем опцију датотеке дневника.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Датотека дневника „%s“ није уписива, прекидам.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "постављене су обе опције и „syslog“ и „logfile“, занемарујем „syslog“, и уписујем дневник у „%s“" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Узимам опције са линије наредби„%s%s“\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " и " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Нема подешених сервера поште – можда недостаје „%s“?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "добавпошта: нису наведени сервери поште.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "добавпошта: није покренут ниједан други примерак програма\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "добавпошта: грешка упуцавања „%s“ добавпоште на %ld; извлачим се.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "позадина" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "првоплански" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "добавпошта: „%s“ добавпошта на %ld је отрована.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "добавпошта: не могу да проверим пошту док још један примерак ради на истом домаћину.\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "добавпошта: не могу да пропитујем наведене домаћине са још једним радним примерком програма на „%ld“.\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "добавпошта: још један примерак програма ради у првом плану на %ld.\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "добавпошта: не могу да прихватим опције док примерак програма ради у позадини.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "добавпошта: добавпошта у позадини на %ld је пробуђена.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "добавпошта: старији потомак на %ld је умро тајанствено (убише га злотвори).\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "добавпошта: не могу да нађем лозинку за „%s@%s“.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Унесите лозинку за „%s@%s“: " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "добавпошта: Не могу да откачим у позадини. Прекидам.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "покрећем „%s“ демона добавпоште\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "не могу да отворим „%s“ да прикачим дневнике\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "„--check“ режим је укључен, не довлачим пошту\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "не могу да проверим време „%s“ (грешка %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "поново покрећем добавпошту („%s“ је измењено)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "покушај поновног извршења може неуспети јер директоријум није повраћен\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "покушај поновног извршења добавпоште није успео\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "пропитивање „%s“ је прескочено (потврђивање идентитета није успело или превише истека времена)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "интервал је достигнут, не пропитујем „%s“\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Стање пропитивања=0 (УСПЕШНО)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Стање пропитивања=1 (НЕМА ПОШТЕ)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Стање пропитивања=2 (ПРИКЉУЧНИЦА)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Стање пропитивања=3 (НЕУСПЕХ ПОТВРДИДЕНТ)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Стање пропитивања=4 (ПРОТОКОЛ)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Стање пропитивања=5 (СИНТАКСА)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Стање пропитивања=6 (УИ_ГРЕШКА)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Стање пропитивања=7 (ГРЕШКА)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Стање пропитивања=8 (ИСКЉУЧИ)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Стање пропитивања=9 (ЗАКЉУЧАВАЊЕ ЗАУЗЕТОСТИ)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Стање пропитивања=10 (СМТП)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Стање пропитивања=11 (ДНС)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Стање пропитивања=12 (БСМТП)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Стање пропитивања=13 (МАКСИМУМ ДОВЛАЧЕЊА)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Стање пропитивања=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Све везе су одсечене. Излазим.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "спавам на „%s“ %d секунде\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "пробудио ме је „%s“\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "пробудио ме је сигнал %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "пробуђен сам на „%s“\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "уобичајено окончање, стање %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "не могу временски да проверим датотеку управљања покретањем\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Упозорење: домаћин „%s“ је неколико пута поменут у датотеци подешавања\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "добавпошта: Грешка: неколико „основних“ записа у датотеци подешавања, или „основни“ није први запис.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "ССЛ подршка није преведена.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "Подршка КЕРБЕРОСА и4 је подешена, али није преведена.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "Подршка КЕРБЕРОСА и5 је подешена, али није преведена.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Подршка „GSSAPI“ је подешена, али није преведена.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "добавпошта: упозорење: нема доступног ДНС-а за проверу вишеспојних довлачења са „%s“\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "упозорење: вишеспојност за „%s“ захтева опцију коверте!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "упозорење: Не тражим подршку ако сва пошта иде управнику поште!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "добавпошта: „%s“ подешавање није исправно, наведите позитиван број прикључника за услугу или прикључник\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "добавпошта: „%s“ подешавање није исправно, „RPOP“ захтева привилегован прикључник\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "УПОЗОРЕЊЕ: „%s“ подешавање је неисправно, обично вам је потребно „--ssl“ за прикључник 995/услугу „pop3s“-а.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "УПОЗОРЕЊЕ: „%s“ подешавање је неисправно, обично вам је потребан прикључник 995/услуга „pop3s“-а за „--ssl“.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "УПОЗОРЕЊЕ: „%s“ подешавање је неисправно, обично вам је потребно „--ssl“ за прикључник 993/услугу „imaps“-а.\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "УПОЗОРЕЊЕ: „%s“ подешавање је неисправно, обично вам је потребан прикључник 993/услуга „imaps“-а за „--ssl“.\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "„%s“ подешавање није исправно, ЛМТП не може да користи основни СМТП прикључник\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Довуци све и настави у демону или режим мировања су грешке!\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "добавпошта: Грешка: режим мировања не ради за више фацикли или налога!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "окончано сигналом %d\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "„%s“ испитује „%s“ (протокол „%s“) на „%s“: пропитивање је започело\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "„POP2“ подршка није подешена.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "„POP3“ подршка није подешена.\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "„IMAP“ подршка није подешена.\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "„ETRN“ подршка није подешена.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "„ODMR“ подршка није подешена.\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "изабран је неподржани протокол.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "„%s“ испитује „%s“ (протокол „%s“) на „%s“: пропитивање је обављено\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Интервал пропитивања је %d секунде\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Датотека дневника је „%s“\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Датотека иб-а је „%s“\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Поруке напредовања биће бележене путем системског дневника\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Добавпошта ће се прикрити и неће створити „Примљене“\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Добавпошта ће приказати тачке напредовања чак и у датотекама дневника.\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Добавпошта ће проследити лоше упућене вишеспојне адресе на „%s“.\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Добавпошта ће преусмерити погрешну пошту управнику поште.\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Добавпошта ће преусмерити погрешну пошту пошиљаоцу.\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Добавпошта ће сталне грешке сматрати сталним (одбациће поруке).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Добавпошта ће сталне грешке сматрати привременим (задржаће поруке).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Опције за добављање са „%s@%s“:\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Пошта ће бити добављена путем „%s“\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" @@ -1116,405 +1142,405 @@ msgstr[0] " Пропитивање овог сервера ће се одигр msgstr[1] " Пропитивање овог сервера ће се одиграти свака %d интервала.\n" msgstr[2] " Пропитивање овог сервера ће се одиграти сваких %d интервала.\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Прави назив сервера је „%s“.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Овај домаћин неће бити пропитан када није наведен ниједан домаћин.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Овај домаћин ће бити пропитан када није наведен ниједан домаћин.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Биће постављен упит за лозинку.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " „APOP“ тајна = „%s“.\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " „RPOP“ иб = „%s“.\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Лозинка = „%s“.\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Протокол је „KPOP“ Керберос %s потврђивањем идентитета" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Протокол је „%s“" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (користим услугу „%s“)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (користим основни прикључник)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (присиљавам „UIDL“ коришћење)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Сви доступни начини потврђивања идентитета биће покушани.\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Потврђивање идентитета лозинком биће присилно.\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " „MSN“ потврђивање идентитета биће присилно.\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " „NTLM“ потврђивање идентитета биће присилно.\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " „OTP“ потврђивање идентитета биће присилно.\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " „CRAM-MD5“ потврђивање идентитета биће присилно.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " „GSSAPI“ потврђивање идентитета биће присилно.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Керберос И4 потврђивање идентитета биће присилно.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Керберос И5 потврђивање идентитета биће присилно.\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Шифровање с краја на крај је произвољно узето.\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Главник услуге поште је: %s\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " ССЛ шифроване сесије су омогућене.\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " ССЛ протокол: %s.\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " Провера уверења ССЛ сервера је омогућена.\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " Провера уверења ССЛ сервера је онемогућена.\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Основна датотека ССЛ поверљивог уверења: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Датотека ССЛ поверљивог уверења: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " Основни директоријум ССЛ поверљивог уверења: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Директоријум ССЛ поверљивог уверења: %s\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " Општи_Назив ССЛ сервера: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Отисак ССЛ кључа (провереног за кључем сервера): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Време истека неодговарања сервера је %d секунде" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (основно).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Изабрано је основно поштанско сандуче.\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Изабрани поштански сандучићи су:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Све поруке биће добављене („--all“ је укључено).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Само нове поруке биће добављене („--all“ је искључено).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Довучене поруке биће задржане на серверу („--keep“ је укључено).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Довучене поруке неће бити задржане на серверу („--keep“ је искључено).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Старе поруке ће бити избачене пре добављања порука („--flush“ је укључено).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Старе поруке неће бити избачене пре добављања порука („--flush“ је искључено).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Превелике поруке ће бити избачене пре добављања порука („--limitflush“ је укључено).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Превелике поруке неће бити избачене пре добављања порука („--limitflush“ је искључено).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Преписивање серверско локалних адреса је омогућено („--norewrite“ је искључено).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Преписивање серверско локалних адреса је онемогућено („--norewrite“ је укључено).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Огољење крајњака реда је омогућено („stripcr“ је укључено).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Огољење крајњака реда је онемогућено („stripcr“ је искључено).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Присиљење крајњака реда је омогућено („forcecr“ је укључено).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Присиљење крајњака реда је онемогућено („forcecr“ је искључено).\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Тумачење садржајно преносног кодирања је онемогућено („pass8bits“ је укључено).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Тумачење садржајно преносног кодирања је омогућено („pass8bits“ је искључено).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " МИМЕ декодирање је омогућено („mimedecode“ је укључено).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " МИМЕ декодирање је онемогућено („mimedecode“ је искључено).\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Мировање након пропитивања је омогућено („idle“ је укључено).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " Мировање након пропитивања је онемогућено („idle“ је искључено).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Редови стања непразности биће одбачени (стање одбацивања је укључено)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Редови стања непразности биће задржани (стање одбацивања је искључено)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Редови испоручености биће одбачени (одбацивање испоручених је укључено)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Редови испоручености биће задржани (одбацивање испоручених је искључено)\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Ограничење величине поруке је %d октета (--limit %d).\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Нема ограничења величине поруке (--limit 0).\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Интервал упозорења величине поруке је %d секунде (--warnings %d).\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Величина упозорења при сваком пропитивању („--warnings“ 0).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Ограничење примљене поруке је %d (--fetchlimit %d).\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Без ограничења примљене поруке (--fetchlimit 0).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " Ограничење величине добавке поруке је %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Без ограничење величине добавке поруке (--fetchsizelimit 0).\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Обавља бинарну претрагу УЈИБ-ова за време сваког пропитивања („--fastuidl“ 1).\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Обавља бинарну претрагу УЈИБ-ова за време свака %d од %d пропитивања („--fastuidl“ %d).\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Обавља линеарну претрагу УЈИБ-ова за време сваког пропитивања („--fastuidl“ 0).\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Ограничење групе СМТП порука је %d.\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Без ограничења групе СМТП поруке (--batchlimit 0).\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Интервал брисања између избацивања присиљених на %d (--expunge %d).\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Без присилних избацивања (--expunge 0).\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Домени за које ће пошта бити довлачена су:" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (основно)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Поруке ће бити прикачене на „%s“ као „BSMTP“\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Поруке ће бити испоручене са „%s“.\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Поруке ће бити „%cMTP“-прослеђене до:" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Део домаћина реда „ПОШТУ ШАЉЕ“ биће „%s“\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Адреса која ће бити стављена у редове „ПРИМАЛАЦ ПРИМА“ за испоруку СМТП-у биће „%s“\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Препознати одговори блокирања спама ослушкивача су:" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Блокирање спама је искључено\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Веза сервера биће донета са „%s“.\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Нема наредбе пре-везе.\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Веза сервера биће узета са „%s“.\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Нема наредбе пост-везе.\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Нема објављених локалних назива за овог домаћина.\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Режим вишеспојности: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Режим једноспојности: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" @@ -1522,115 +1548,115 @@ msgstr[0] "%d локални назив је препознат.\n" msgstr[1] "%d локална назива су препозната.\n" msgstr[2] "%d локалних назива је препознато.\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " ДНС претрага за вишеспојне адресе је омогућена.\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " ДНС претрага за вишеспојне адресе је онемогућена.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Алијаси сервера биће упоређени ИП адресом са вишеспојним адресама.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Алијаси сервера биће упоређени називом са вишеспојним адресама.\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Усмеривање адресе коверте је онемогућено\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Заглавље коверте је претпостављено да је: %s\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Број заглавља ковери кој ће бити прескочени: %d\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Префикс „%s“ ће бити уклоњен из иб-а корисника\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Нема огољавања префикса\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Унапред објављени алијаси сервера поште:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Локални домени:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Веза мора бити кроз сучеље „%s“.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Нису наведене потрепштине сучеља.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Петља пропитивања ће пратити „%s“.\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Није наведено сучеље праћења.\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Везе сервера биће направљене путем прикључка „%s“ (--plugin %s).\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Није наведена наредба прикључка.\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Везе ослушкивача биће направљене путем откључка „%s“ (--plugout %s).\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Није наведена наредба откључка.\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Ниједан УИБ није сачуван са овог домаћина.\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d УИБ-а сачуван.\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Подаци праћења пропитивања биће додати заглављу „Примљене“.\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Никакви подаци праћења пропитивања неће бити додати заглављу „Примљене“.\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Поруке са лошим заглављима биће одбачене.\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Поруке са лошим заглављима биће прослеђене.\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Својства проласка кроз „%s“.\n" @@ -1745,85 +1771,118 @@ msgstr "Грешка отпуштања уверења\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "добавпошта: нит ће заспати за %d сек.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Протокол је препознат као ИМАП4 рев 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Протокол је препознат као ИМАП4 рев 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Протокол је препознат као ИМАП2 или „IMAP2BIS“\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "мироваће након пропитивања\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Примих „BYEд одговор са ИМАП сервера: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "нетачан број порука у „%s“!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "нетачан „EXPUNGE“ број у „%s“!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Протокол је препознат као ИМАП4 рев 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "нађох освежен списак могућности\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Протокол је препознат као ИМАП4 рев 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "сервер није обавестио „SASL-IR“ проширење али га примена добавпоште захтева за ПОТВРЂИВАЊЕ ИДЕНТИТЕТА СПОЉНОГ\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Протокол је препознат као ИМАП2 или „IMAP2BIS“\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: подешавање захтева ТЛС, али „STARTTLS“ није дозвољено због стања потврђеног идентитета (PREAUTH). Прекидам везу. Ако је ваш прикључак безбедан, можете победити „STARTTLS“ са „--sslproto ''“ (видите упутство).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "мироваће након пропитивања\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: подешавање захтева ТЛС, али „STARTTLS“ није дозвољено због стања потврђеног идентитета (PREAUTH). Прекидам везу. Ако сервер дозвољава, покушајте „--ssl“ (видите упутство).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: надоградња на ТЛС је успела.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: надоградња на ТЛС није успела.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: пригодна надоградња на ТЛС није успела, покушавам да наставим\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: УПОЗОРЕЊЕ: сервер је понудио „STARTTLS“ али је дато „sslproto ''“.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: „--auth“ спољног је захтевано али сервер није обавестио о томе.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Затражена „OTP“ могућност није преведена у добавпошти\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Затражена „NTLM“ могућност није преведена у добавпошти\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: „--auth“ лозинка је захтевана али ју је сервер заборавио (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: понестало нам је метода потврђивања идентитета и не можемо се пријавити.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "избацивање поште се не поклапа (стварна %d != очекивана %d)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu није виђено\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u није виђено\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "поновно пропитивање није успело\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" @@ -1831,11 +1890,11 @@ msgstr[0] "%d порука чека након поновног пропитив msgstr[1] "%d поруке чекају након поновног пропитивања\n" msgstr[2] "%d порука чека након поновног пропитивања\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "избор поштанског сандучета није успео\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" @@ -1843,11 +1902,11 @@ msgstr[0] "%d порука чека након првог пропитивања msgstr[1] "%d поруке чекају након првог пропитивања\n" msgstr[2] "%d порука чека након првог пропитивања\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "избацивање није успело\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" @@ -1855,20 +1914,20 @@ msgstr[0] "%d порука чека након избацивања\n" msgstr[1] "%d поруке чекају након избацивања\n" msgstr[2] "%d порука чека након избацивања\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "претрага за невиђеним порукама није успела\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u је прва невиђена\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Упозорење: занемарујем нетачне податке за величине порука које је вратио сервер.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Неисправан „FETCH“ одговор: %s.\n" @@ -1973,51 +2032,56 @@ msgstr "не могу да декодирам „BASE64“ спреман одг msgid "challenge mismatch\n" msgstr "изазов се не поклапа\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "добавпошта: грешка читања датотеке закључавања „%s“: %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "добавпошта: уклањам устајалу датотеку закључавања „%s“\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "добавпошта: не могу да развежем датотеку закључавања „%s“ (%s), покушавам да пишем у њу\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "добавпошта: не могу да пишем у датотеку закључавања „%s“ (%s), излазим\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "добавпошта: грешка отварања датотеке закључавања „%s“: %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "добавпошта: стварање закључавања није успело, датотека пиб-а „%s“: %s\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "добавпошта: не могу да уклоним или скратим датотеку пиб-а „%s“: %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: упозорење: нађох „%s“ пре било каквих назива домаћина\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: упозорење: непозната скупина „%s“\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: грешка читања датотеке (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Упозорење: примих лош изазов у „AUTH(ENTICATE) NTLM“!\n" @@ -2064,19 +2128,19 @@ msgstr "Непозната „ODMR“ грешка „%s“\n" msgid "receiving message data\n" msgstr "примам податке поруке\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Опција „--keep“ није подржана са „ODMR“\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Опција „--flush“ није подржана са „ODMR“\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Опција „--folder“ није подржана са „ODMR“\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Опција „--check“ није подржана са „ODMR“\n" @@ -2088,7 +2152,7 @@ msgstr "„recv“ сервера је кобно\n" msgid "Could not decode OTP challenge\n" msgstr "Не могу да декодирам „OTP“ изазов\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Тајна пропусна реч: " @@ -2421,83 +2485,83 @@ msgstr "„POP2“ не подржава „STLS“. Одустајем.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "„POP2“ подржава само потврђивање идентитета лозинком. Одустајем.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Упозорење: Нађох „Maillennium POP3“, користећи наредбу „RETR“ уместо „TOP“.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "„TLS“ је ибавезно за ову сесију, али је сервер одбио наредбу „CAPA“.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "„STLS“ је обавезно за ову сесију, али је сервер одбио наредбу „CAPA“.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Наредба „CAPA“ је свакако неопходна за „TLS“.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Подршка наредбе „CAPA“ је, свакако, неопходна за „STLS“.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: пригодна надоградња на ТЛС није успела, покушавам да наставим.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: УПОЗОРЕЊЕ: сервер је понудио „STLS“, али је дато „sslproto ''“.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Понестало нам је допуштених потврђивача идентитета и не можемо наставити.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "Затражену „APOP“ временску ознаку нисам нашао у поздраву\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Садржајна грешка временске ознаке у поздраву\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Неисправна „APOP“ временска ознака.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Неодређен захтев протокола у „POP3_auth“\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "закључавање је заузето! Да ли је активна још нека сесија?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Не могу да обрадим „UIDL“ одговор са узводног сервера.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Сервер је одговорио са УИБ-ом за погрешну поруку.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "иб=%s (бр.=%u) је обрисан, али је још увек присутан!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Поруке су убачене на списак на серверу. Не могу да радим са тиме.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "Грешка протокола\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "грешка протокола приликом довлачења УЈИБЛ-ова\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "иб=%s (бр.=%d) је обрисан, али је још увек присутан!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Опција „--folder“ није подржана са „POP3“\n" @@ -2540,11 +2604,11 @@ msgstr "Датотека „%s“ треба да има не више од „- msgid "File %s must be owned by you.\n" msgstr "Датотека „%s“ треба да буде у вашем власништву.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Непозната грешка система" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "„%s“ (порука дневника није потпуна)\n" @@ -2915,80 +2979,85 @@ msgstr "„ESMTP LOGIN“ потврђивање идентитета...\n" msgid "smtp listener protocol error\n" msgstr "грешка протокола смтп ослушкивача\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "добавпошта: додела меморије није успела\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "добавпошта: прикључак за домаћина „%s“ услугу „%s“ је празан, не могу да радим!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "добавпошта: пар прикључница није успео\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "добавпошта: исцепак није успео\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "„dup2“ није успело\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "покрећем „%s“ (домаћин „%s“ услуга „%s“)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "„execvp(%s)“ није успело\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "„getaddrinfo(„%s“,„%s“) грешка: %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Покушајте да додате опцију „--service“ (видите такође ЧПП ставку „R12“).\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "непознато (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Покушавам да се повежем на „%s/%s“..." -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "не могу да направим прикључницу: %s\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "назив „%d“: не могу да направим породицу прикључнице „%d“ врсте „%d“: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "повезивање није успело.\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "повезивање на „%s:%s“ [%s/%s] није успело: %s.\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "назив „%d“: повезивање на „%s:%s“ [%s/%s] није успело: %s.\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "повезан.\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2997,229 +3066,244 @@ msgstr "" "Грешке везе за ово пропитивање:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "„OpenSSL“ је известио: %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "Дубина опозива „SSL“ провере %d: preverify_ok == %d, грешка = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Дубина опозива „SSL“ провере %d: verify_ok == %d, грешка = %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Уверење сервера:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Ланац уверења, од корена до парњака, почиње на дубини %d:\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "Уверење на дубини %d:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Организација издавача: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Упозорење: Назив организације издавача је предуг (по могућству скраћен).\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Непозната организација\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Општи назив издавача: %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Упозорење: Општи назив издавача је предуг (по могућству скраћен).\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Непознат општи назив издавача\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "Општи назив субјекта: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Лоше уверење: Општи назив субјекта је предуг!\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Лоше уверење: Општи назив субјекта садржи НИШТА, прекидам!\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Заменски назив субјекта: %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Лоше уверење: Заменски назив субјекта садржи НИШТА, прекидам!\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Општи назив сервера се не поклапа: %s != %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Назив сервера није постављен, не могу да проверим уверење!\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Непознат општи назив сервера\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Назив сервера није наведен у уверњу!\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "„EVP_md5()“ није успело!\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Нема више меморије!\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "Међумеморија прихвата текста је премала!\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "Отисак „%s“ кључа: %s\n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "„%s“ отисак је одговарајући.\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "„%s“ отисци нису одговарајући!\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Грешка провере уверења сервера: %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Прекинут ланац уверења: %s\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "Ово може да значи да сервер није обезбедио посредничко уверење издавача уверења, у вези чега добавпошта не може да уради баш ништа. За више појединости, погледајте документ „README.SSL-SERVER“ који се доставља уз програм.\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Недостаје уверење сидра поверења: %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "Ово може да значи да корено потписно уверење издавача уверења није на месту поверљивог уверења издавача уверења, или да „c_rehash“ треба да се покрене у директоријуму уверења. За више појединости, погледајте документацију „--sslcertpath“ и „--sslcertfile“ на страници упутства. Видите „README.SSL“ за појединости.\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Ваше издање „OpenSSL“-а не подржава „SSLv3“.\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Ваше издање „OpenSSL“-а не подржава „TLS v1.1“.\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Ваше издање „OpenSSL“-а не подржава „TLS v1.2“.\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Ваше издање „OpenSSL“-а не подржава „TLS v1.3“.\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "Неисправан „SSL“ протокол „%s“ је наведен, користим подразумевано самостално бирање (auto).\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Учитах „wolfSSL“ библиотеку „%#lx“ старију од заглавља „%#lx“, одбијам да радим (ступам у штрајк).\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "Учитах „OpenSSL“ библиотеку „%#lx“ старију од заглавља „%#lx“, одбијам да радим (ступам у штрајк).\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "Учитах „OpenSSL“ библиотеку „%#lx“ новију од заглавља „%#lx“, покушаћу да наставим.\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Описник датотеке је ван опсега за „SSL“" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Знајте да неке дистибуције онемогућују старија издања протокола на уврнутим нестандардним начинима. Пробајте новије издање протокола.\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Не могу да учитам место „verify“-ја (file=\"%s\", dir=\"%s\"), грешка %d:\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Упозорење: „SSL_set_tlsext_host_name(%p, \"%s\")“ није успело (код %#lx), покушавам да наставим.\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "добавпошта: прикључак %d: „wolfSSL_check_domain_name(%#p, \"%s\")“ је вратило %d, покушавам да наставим\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Упозорење: „X509_VERIFY_PARAM_set1_host(%p, \"%s\")“ није успело (код %#x), покушавам да наставим.\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Сервер је прерано угасио везу за време „SSL_connect()“.\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Системска грешка за време „SSL_connect()“: %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "руковање није успело на нивоу протокола или везе." -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Не могу да добијем текућег „SSL/TLS“ шифрера – да ли је успостављена нека сесија?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: користим протокол „%s“, шифрер „%s“, %d/%d тајна/обрађених битова\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Провера уверења/отиска је некако прескочена!\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Упозорење: веза није безбедна, ипак настављам. (Боље употребите „--sslcertck“!)\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Поновни покушај читања „cygwin“ прикључнице\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Поновни покушај читања „cygwin“ прикључнице није успео!\n" @@ -3409,3 +3493,6 @@ msgstr "додела меморије није успела\n" #: xmalloc.c:42 msgid "realloc failed\n" msgstr "поновна додела није успела\n" + +#~ msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" +#~ msgstr "УПОЗОРЕЊЕ: Преведено наспрам „LibreSSL“, што није подржано подешавање.\n" @@ -1,17 +1,18 @@ # Swedish translations for fetchmail package # Svenska översättningar för paket fetchmail. # Copyright © 2011, 2012, 2013 Eric S. Raymond (msgids) -# Copyright © 2019, 2021 Matthias Andree (msgids) +# Copyright © 2019, 2021, 2022 Matthias Andree (msgids) # This file is distributed under the same license as the fetchmail package. -# Göran Uddeborg <goeran@uddeborg.se>, 2011, 2012, 2013, 2019, 2020, 2021. +# Luna Jernberg <droidbittin@gmail.com>, 2021 +# Göran Uddeborg <goeran@uddeborg.se>, 2011, 2012, 2013, 2019, 2020, 2021, 2022, 2023. # -# $Revision: 1.30 $ +# $Revision: 1.45 $ msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.16-rc1\n" +"Project-Id-Version: fetchmail 6.4.35\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2021-01-30 15:12+0100\n" -"PO-Revision-Date: 2021-01-30 21:25+0100\n" +"POT-Creation-Date: 2023-01-04 12:06+0100\n" +"PO-Revision-Date: 2023-01-15 13:01+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -158,41 +159,41 @@ msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "hämtningsgränsen %d uppnådd, %d meddelande kvarlämnat på server %s konto %s\n" msgstr[1] "hämtningsgränsen %d uppnådd, %d meddelanden kvarlämnade på server %s konto %s\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "tiden gick ut efter %d sekunders väntan på att ansluta till servern %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "tiden gick ut efter %d sekunders väntan på servern %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "tiden gick ut efter %d sekunders väntan på %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "tiden gick ut efter %d sekunders väntan på att lyssnare skulle svara.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "tiden gick ut efter %d sekunder.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail ser att tiden går ut upprepade gånger" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmail såg att tiden gick ut mer än %d gånger under försök att hämta post från %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -209,73 +210,73 @@ msgstr "" "Fetchmail kommer inte kontrollera denna brevlåda igen förrän du startar om\n" "det.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "föranslutningskommandot avslutades med signalen %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "föranslutningskommandot misslyckades med status %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "kunde inte hitta någon HESIOD-pobox för %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Ledande server har inget namn.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "kunde inte hitta ett kanoniskt DNS-namn på %s (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "%s-anslutning till %s misslyckades" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "SSL-anslutning misslyckades.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Upptaget lås-fel på %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Server upptagen-fel på %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Auktoriseringsfel på %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (tidigare auktoriserad)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "För hjälp, se http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "fetchmail-autentisering misslyckades på %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail kunde inte hämta post från %s@%s.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -289,7 +290,7 @@ msgstr "" "som fetchmail inte kan särskilja eftersom servern inte skickade något\n" "användbart felmeddelande." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -308,7 +309,7 @@ msgstr "" "Fetchmail-demonen kommer fortsätta köra och försöka ansluta varje cykel.\n" "Inga fler meddelanden kommer att skickas förrän tjänsten är återställd." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -327,94 +328,99 @@ msgstr "" "Fetchmail-demonen kommer fortsätta köra och försöka ansluta varje cykel.\n" "Inga fler meddelanden kommer att skickas förrän tjänsten är återställd." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Omkontrollera omedelbart på %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Uttags- eller TLS-fel på %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Okänt inloggnings- eller autentiseringsfel på %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Auktorisationen OK på %s@%s\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "fetchmail-auktorisation OK på %s@%s" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail kunde logga in på %s@%s.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Tjänsten har återställts.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "väljer eller kontrollerar om mappen %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "väljer eller kontrollerar om standardmappen\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s hos %s (mapp %s)" -#: driver.c:1335 rcfile_y.y:390 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s hos %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Kontrollerar %s\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d meddelande (%d %s) till %s" msgstr[1] "%d meddelanden (%d %s) till %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "sett" msgstr[1] "sedda" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d meddelande till %s" msgstr[1] "%d meddelanden till %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d oktetter).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Ingen post till %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "felaktigt antal meddelanden!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "Alltför många brev överhoppade (%d > %d) på grund av transienta fel med %s\n" @@ -422,85 +428,85 @@ msgstr "Alltför många brev överhoppade (%d > %d) på grund av transienta fel # Detta och följande meddelanden fylls i %s i meddelandent # "%s error while fetching ..." nedan. Jag tar med "fel" i första delen # för att få samman- och särskrivningar rätt. -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "uttagsfel" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "saknat eller felaktigt RFC822-huvud" -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA-fel" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "klient-/serversynkroniseringsfel" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "klient-/serverprotokollfel" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "upptaget lås på servern" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "SMTP-transaktionsfel" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "DNS-uppslagningsfel" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "odefinierat fel" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "%s under hämtande från %s@%s och leverans till SMTP-värden %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "okänd" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "%s under hämtande från %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "kommando efter anslutning avslutat med signal %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "kommando efter anslutning avslutades med status %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Kerberos V4-stöd inte inlänkat.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Kerberos V5-stöd inte inlänkat.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Flaggan --flush stödjs inte med %s\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Flaggan --all stödjs inte med %s\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Flaggan --limit stödjs inte med %s\n" @@ -621,19 +627,19 @@ msgstr "ETRN-syntaxfel i parametrar\n" msgid "Unknown ETRN error %d\n" msgstr "Okänt ETRN-fel %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Flaggan --keep stödjs inte med ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Flaggan --flush stödjs inte med ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Flaggan --folder stödjs inte med ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Flaggan --check stödjs inte med ETRN\n" @@ -674,21 +680,21 @@ msgstr "fetchmail: startad med" msgid "could not get current working directory\n" msgstr "kunde inte få tag i aktuell arbetskatalog\n" -#: fetchmail.c:306 +#: fetchmail.c:310 #, c-format msgid "This is fetchmail release %s" msgstr "Detta är fetchmail utgåva %s" -#: fetchmail.c:309 +#: fetchmail.c:313 #, c-format msgid "" "Compiled with SSL library %#lx \"%s\"\n" "Run-time uses SSL library %#lx \"%s\"\n" msgstr "" "Kompilerad med SSL-bibliotek %#lx ”%s”\n" -"Körtidsanvänd SSL-bibliotek %#lx ”%s”\n" +"Körtidsanvänt SSL-bibliotek %#lx ”%s”\n" -#: fetchmail.c:313 +#: fetchmail.c:317 #, c-format msgid "" "OpenSSL: %s\n" @@ -697,939 +703,959 @@ msgstr "" "OpenSSL: %s\n" "Motorer: %s\n" -#: fetchmail.c:317 +#: fetchmail.c:321 msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" msgstr "VARNING: ditt SSL/TLS-bibliotek stödjer inte TLS v1.3.\n" -#: fetchmail.c:320 -msgid "WARNING: Compiled against LibreSSL, which is not a supported configuration.\n" -msgstr "VARNING: kompilerad mot LibreSSL, vilket inte är en konfigurations som stödjs.\n" +#: fetchmail.c:326 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "FEL: Kompilerad mot LibreSSL, vilket är ett upphovsrättsintrång i brist på något GPL paragraf 2b-undantag. Se COPYING. Avbryter.\n" -#: fetchmail.c:323 +#: fetchmail.c:330 msgid "WARNING: Compiled without SSL/TLS.\n" msgstr "VARNING: kompilerad utan SSL/TLS.\n" -#: fetchmail.c:349 +#: fetchmail.c:356 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "Flaggan nodetach är aktiv, ignorerar loggfilsflaggan.\n" -#: fetchmail.c:356 +#: fetchmail.c:363 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Kör inte i demonläge, ignorerar loggfilsflaggan.\n" -#: fetchmail.c:363 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Loggfilen ”%s” finns inte, ignorerar loggfilsflaggan.\n" -#: fetchmail.c:369 +#: fetchmail.c:376 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Loggfilen ”%s” är inte skrivbar, avbryter.\n" -#: fetchmail.c:387 +#: fetchmail.c:394 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" -msgstr "Både flaggan syslog och logfile är satta, ignorerar syslog, och loggar till %s" +msgstr "Alternativen syslog och logfile är båda inställda, ignorerar syslog och loggar till %s" -#: fetchmail.c:478 +#: fetchmail.c:485 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Hämtar flaggor från kommandoraden%s%s\n" -#: fetchmail.c:479 +#: fetchmail.c:486 msgid " and " msgstr " och " -#: fetchmail.c:484 +#: fetchmail.c:491 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Inga postservrar uppsatta — kanske %s saknas?\n" -#: fetchmail.c:505 +#: fetchmail.c:512 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: inga postservrar har angivits.\n" -#: fetchmail.c:517 +#: fetchmail.c:524 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: ingen annan fetchmail kör\n" -#: fetchmail.c:523 +#: fetchmail.c:530 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: fel när %s-fetchmail %ld dödades; ger upp.\n" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "background" msgstr "bakgrunds" -#: fetchmail.c:524 fetchmail.c:533 +#: fetchmail.c:531 fetchmail.c:540 msgid "foreground" msgstr "förgrunds" -#: fetchmail.c:532 +#: fetchmail.c:539 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s-fetchmail %ld dödad.\n" -#: fetchmail.c:555 +#: fetchmail.c:562 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: kan inte kontrollera post medan en annan fetchmail på samma värd kör.\n" -#: fetchmail.c:561 +#: fetchmail.c:568 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: kan inte kontrollera angivna värdar med en annan fetchmail som kör som %ld.\n" -#: fetchmail.c:568 +#: fetchmail.c:575 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: en annan förgrunds-fetchmail kör som %ld.\n" -#: fetchmail.c:578 +#: fetchmail.c:585 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: kan inte ta flaggor medan en bakgrunds-fetchmail kör.\n" -#: fetchmail.c:590 +#: fetchmail.c:597 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: bakgrunds-fetchmail %ld uppväckt.\n" -#: fetchmail.c:602 +#: fetchmail.c:609 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: äldre syskon %ld dog mystiskt.\n" -#: fetchmail.c:617 +#: fetchmail.c:624 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: kan inte hitta ett lösenord för %s@%s.\n" -#: fetchmail.c:621 +#: fetchmail.c:628 #, c-format msgid "Enter password for %s@%s: " msgstr "Ange lösenord för %s@%s: " -#: fetchmail.c:663 +#: fetchmail.c:670 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: Kan inte koppla ifrån till bakgrunden. Avbryter.\n" -#: fetchmail.c:667 +#: fetchmail.c:674 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "startar fetchmail %s-demon\n" -#: fetchmail.c:683 fetchmail.c:685 +#: fetchmail.c:690 fetchmail.c:692 #, c-format msgid "could not open %s to append logs to\n" msgstr "kunde inte öppna %s för att lägga till loggar till\n" -#: fetchmail.c:704 +#: fetchmail.c:711 msgid "--check mode enabled, not fetching mail\n" msgstr "--check-läge aktiverat, hämtar inte post\n" -#: fetchmail.c:726 +#: fetchmail.c:733 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "kunde inte tidskontrollera %s (fel %d)\n" -#: fetchmail.c:731 +#: fetchmail.c:738 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "startar om fetchmail (%s ändrades)\n" -#: fetchmail.c:735 +#: fetchmail.c:742 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "försök att starta om kan misslyckas eftersom aktuell katalog inte har återställts\n" -#: fetchmail.c:761 +#: fetchmail.c:768 msgid "attempt to re-exec fetchmail failed\n" msgstr "försök att göra om exec fetchmail misslyckades\n" -#: fetchmail.c:791 +#: fetchmail.c:798 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "kontroll av %s hoppas över (autentiseringen misslyckades eller så gick tiden ut för många gånger)\n" -#: fetchmail.c:803 +#: fetchmail.c:810 #, c-format msgid "interval not reached, not querying %s\n" msgstr "intervallet inte uppnått, frågar inte %s\n" -#: fetchmail.c:841 +#: fetchmail.c:848 msgid "Query status=0 (SUCCESS)\n" msgstr "Frågestatus=0 (LYCKAT)\n" -#: fetchmail.c:843 +#: fetchmail.c:850 msgid "Query status=1 (NOMAIL)\n" msgstr "Frågestatus=1 (INGEN_POST)\n" -#: fetchmail.c:845 +#: fetchmail.c:852 msgid "Query status=2 (SOCKET)\n" msgstr "Frågestatus=2 (UTTAG)\n" -#: fetchmail.c:847 +#: fetchmail.c:854 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Frågestatus=3 (AUT_MISSLYCKANDE)\n" -#: fetchmail.c:849 +#: fetchmail.c:856 msgid "Query status=4 (PROTOCOL)\n" msgstr "Frågestatus=4 (PROTOKOLL)\n" -#: fetchmail.c:851 +#: fetchmail.c:858 msgid "Query status=5 (SYNTAX)\n" msgstr "Frågestatus=5 (SYNTAX)\n" -#: fetchmail.c:853 +#: fetchmail.c:860 msgid "Query status=6 (IOERR)\n" msgstr "Frågestatus=6 (IO_FEL)\n" -#: fetchmail.c:855 +#: fetchmail.c:862 msgid "Query status=7 (ERROR)\n" msgstr "Frågestatus=7 (FEL)\n" -#: fetchmail.c:857 +#: fetchmail.c:864 msgid "Query status=8 (EXCLUDE)\n" msgstr "Frågestatus=8 (UTESLUT)\n" -#: fetchmail.c:859 +#: fetchmail.c:866 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Frågestatus=9 (LÅS_UPPTAGET)\n" -#: fetchmail.c:861 +#: fetchmail.c:868 msgid "Query status=10 (SMTP)\n" msgstr "Frågestatus=10 (SMTP)\n" -#: fetchmail.c:863 +#: fetchmail.c:870 msgid "Query status=11 (DNS)\n" msgstr "Frågestatus=11 (DNS)\n" -#: fetchmail.c:865 +#: fetchmail.c:872 msgid "Query status=12 (BSMTP)\n" msgstr "Frågestatus=12 (BSMTP)\n" -#: fetchmail.c:867 +#: fetchmail.c:874 msgid "Query status=13 (MAXFETCH)\n" msgstr "Frågestatus=13 (MAX_HÄMTA)\n" -#: fetchmail.c:869 +#: fetchmail.c:876 #, c-format msgid "Query status=%d\n" msgstr "Frågestatus=%d\n" -#: fetchmail.c:911 +#: fetchmail.c:918 msgid "All connections are wedged. Exiting.\n" msgstr "Alla anslutningar har fastnat. Avslutar.\n" -#: fetchmail.c:919 +#: fetchmail.c:926 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "sover vid %s i %d sekunder\n" -#: fetchmail.c:943 +#: fetchmail.c:950 #, c-format msgid "awakened by %s\n" msgstr "väckt av %s\n" -#: fetchmail.c:946 +#: fetchmail.c:953 #, c-format msgid "awakened by signal %d\n" msgstr "väckt av signal %d\n" -#: fetchmail.c:954 +#: fetchmail.c:961 #, c-format msgid "awakened at %s\n" msgstr "väckt vid %s\n" -#: fetchmail.c:959 +#: fetchmail.c:966 #, c-format msgid "normal termination, status %d\n" msgstr "normal avslutning, status %d\n" -#: fetchmail.c:1123 +#: fetchmail.c:1130 msgid "couldn't time-check the run-control file\n" msgstr "kunde göra tidskontroll av körstyrningsfilen\n" -#: fetchmail.c:1157 +#: fetchmail.c:1164 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Varning: värden %s nämns flera gånger i konfigurationsfilen\n" -#: fetchmail.c:1196 +#: fetchmail.c:1203 msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" msgstr "fetchmail: Fel: flera ”defaults”-poster i konfigurationsfilen, eller så är ”defaults” inte den första posten.\n" -#: fetchmail.c:1326 +#: fetchmail.c:1333 msgid "SSL support is not compiled in.\n" msgstr "SSL-stöd är inte inkompilerat.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1340 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "KERBEROS v4-stöd är konfigurerat, men inte inkompilerat.\n" -#: fetchmail.c:1339 +#: fetchmail.c:1346 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "KERBEROS v5-stöd är konfigurerat, men inte inkompilerat.\n" -#: fetchmail.c:1345 +#: fetchmail.c:1352 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "GSSAPI-stöd är konfigurerat, men inte inkompilerat.\n" -#: fetchmail.c:1375 +#: fetchmail.c:1382 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: varning: ingen DNS tillgänglig för att kontrollera flermålshämtningar från %s\n" -#: fetchmail.c:1386 +#: fetchmail.c:1393 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "varning: flera mål för %s kräver kuvertalternativ!\n" -#: fetchmail.c:1387 +#: fetchmail.c:1394 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "varning: Fråga inte om hjälp om all post går till postmaster!\n" -#: fetchmail.c:1404 +#: fetchmail.c:1411 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: %s-konfigurationen är ogiltig, ange ett positivt portnummer som tjänst eller port\n" -#: fetchmail.c:1411 +#: fetchmail.c:1418 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: %s-konfigurationen är ogiltig, RPOP kräver en privilegierad port\n" +#: fetchmail.c:1424 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "VARNING: %s-konfigurationen är ogiltig, du behöver normalt --ssl för port 995/service pop3s.\n" + +#: fetchmail.c:1425 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "VARNING: %s-konfigurationen är ogiltig, du behöver normalt port 995/service pop3s för --ssl.\n" + +#: fetchmail.c:1428 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "VARNING: %s-konfigurationen är ogiltig, du behöver normalt --ssl för port 993/service imaps.\n" + #: fetchmail.c:1429 #, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "VARNING: %s-konfigurationen är ogiltig, du behöver normalt port 993/service imaps för --ssl.\n" + +#: fetchmail.c:1447 +#, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "%s-konfigurationen är ogiltig, LMTP kan inte använda standard-SMTP-porten\n" -#: fetchmail.c:1443 +#: fetchmail.c:1461 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Både fetchall och keep på i demon- eller vilande läge är ett misstag!\n" -#: fetchmail.c:1453 +#: fetchmail.c:1471 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: Fel: idle-läget fungerar inte för flera mappar eller konton!\n" -#: fetchmail.c:1477 +#: fetchmail.c:1495 #, c-format msgid "terminated with signal %d\n" msgstr "avslutad med signal %d\n" -#: fetchmail.c:1550 +#: fetchmail.c:1568 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s frågar %s (protokoll %s) %s: kontroll startad\n" -#: fetchmail.c:1575 +#: fetchmail.c:1593 msgid "POP2 support is not configured.\n" msgstr "POP2-stöd är inte konfigurerat.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1605 msgid "POP3 support is not configured.\n" msgstr "POP3-stöd är inte konfigurerat.\n" -#: fetchmail.c:1597 +#: fetchmail.c:1615 msgid "IMAP support is not configured.\n" msgstr "IMAP-stöd är inte konfigurerat.\n" -#: fetchmail.c:1603 +#: fetchmail.c:1621 msgid "ETRN support is not configured.\n" msgstr "ETRN-stöd är inte konfigurerat.\n" -#: fetchmail.c:1611 +#: fetchmail.c:1629 msgid "ODMR support is not configured.\n" msgstr "ODMR-stöd är inte konfigurerat.\n" -#: fetchmail.c:1618 +#: fetchmail.c:1636 msgid "unsupported protocol selected.\n" msgstr "ej stött protokoll valt.\n" -#: fetchmail.c:1629 +#: fetchmail.c:1647 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s frågar %s (protokoll %s) %s: kontroll avslutad\n" -#: fetchmail.c:1654 +#: fetchmail.c:1672 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Kontrollintervall är %d sekunder\n" -#: fetchmail.c:1656 +#: fetchmail.c:1674 #, c-format msgid "Logfile is %s\n" msgstr "Loggfil är %s\n" -#: fetchmail.c:1658 +#: fetchmail.c:1676 #, c-format msgid "Idfile is %s\n" msgstr "Id-fil är %s\n" -#: fetchmail.c:1661 +#: fetchmail.c:1679 msgid "Progress messages will be logged via syslog\n" msgstr "Förloppsmeddelanden kommer loggas via syslog\n" -#: fetchmail.c:1664 +#: fetchmail.c:1682 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail kommer maskeras och kommer inte generera Received\n" -#: fetchmail.c:1666 +#: fetchmail.c:1684 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail kommer visa förloppspunkter även i loggfiler.\n" -#: fetchmail.c:1668 +#: fetchmail.c:1686 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail kommer vidarebefordra feladresserade multiadresserade meddelanden till %s.\n" -#: fetchmail.c:1672 +#: fetchmail.c:1690 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail kommer skicka felmeddelanden till postmaster.\n" -#: fetchmail.c:1674 +#: fetchmail.c:1692 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail kommer skicka felmeddelanden till avsändaren.\n" -#: fetchmail.c:1677 +#: fetchmail.c:1695 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail kommer hantera permanenta fel som permanenta (kasta meddelanden).\n" -#: fetchmail.c:1679 +#: fetchmail.c:1697 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail kommer hantera permanenta fel som tillfälliga (behålla meddelanden).\n" -#: fetchmail.c:1686 +#: fetchmail.c:1704 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Alternativ för att hämta från %s@%s:\n" -#: fetchmail.c:1690 +#: fetchmail.c:1708 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Post kommer hämtas via %s\n" -#: fetchmail.c:1693 +#: fetchmail.c:1711 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " Kontroll av denna server kommer ske varje intervall.\n" msgstr[1] " Kontroll av denna server kommer ske var %d:e intervall.\n" -#: fetchmail.c:1697 +#: fetchmail.c:1715 #, c-format msgid " True name of server is %s.\n" msgstr " Verkligt namn på servern är %s.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1718 msgid " This host will not be queried when no host is specified.\n" msgstr " Denna värd kommer inte att frågas när ingen värd anges.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1719 msgid " This host will be queried when no host is specified.\n" msgstr " Denna värd kommer att frågas när ingen värd anges.\n" -#: fetchmail.c:1705 +#: fetchmail.c:1723 msgid " Password will be prompted for.\n" msgstr " Lösenord kommer att efterfrågas.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1727 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " APOP-hemlighet = ”%s”.\n" -#: fetchmail.c:1712 +#: fetchmail.c:1730 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP-id = ”%s”.\n" -#: fetchmail.c:1715 +#: fetchmail.c:1733 #, c-format msgid " Password = \"%s\".\n" msgstr " Lösenord = ”%s”.\n" -#: fetchmail.c:1724 +#: fetchmail.c:1742 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Protokoll är KPOP med Kerberos %s-autentisering" -#: fetchmail.c:1727 +#: fetchmail.c:1745 #, c-format msgid " Protocol is %s" msgstr " Protokoll är %s" -#: fetchmail.c:1729 +#: fetchmail.c:1747 #, c-format msgid " (using service %s)" msgstr " (använder tjänst %s)" -#: fetchmail.c:1731 +#: fetchmail.c:1749 msgid " (using default port)" msgstr " (använder standardport)" -#: fetchmail.c:1733 +#: fetchmail.c:1751 msgid " (forcing UIDL use)" msgstr " (framtvingar användning av UIDL)" -#: fetchmail.c:1739 +#: fetchmail.c:1757 msgid " All available authentication methods will be tried.\n" msgstr " Alla tillgängliga autentiseringsmetoder kommer att provas.\n" -#: fetchmail.c:1742 +#: fetchmail.c:1760 msgid " Password authentication will be forced.\n" msgstr " Lösenordsautentisering kommer framtvingas.\n" -#: fetchmail.c:1745 +#: fetchmail.c:1763 msgid " MSN authentication will be forced.\n" msgstr " MSN-autentisering kommer framtvingas.\n" -#: fetchmail.c:1748 +#: fetchmail.c:1766 msgid " NTLM authentication will be forced.\n" msgstr " NTLM-autentisering kommer framtvingas.\n" -#: fetchmail.c:1751 +#: fetchmail.c:1769 msgid " OTP authentication will be forced.\n" msgstr " OTP-autentisering kommer framtvingas.\n" -#: fetchmail.c:1754 +#: fetchmail.c:1772 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " CRAM-MD5-autentisering kommer framtvingas.\n" -#: fetchmail.c:1757 +#: fetchmail.c:1775 msgid " GSSAPI authentication will be forced.\n" msgstr " GSSAPI-autentisering kommer framtvingas.\n" -#: fetchmail.c:1760 +#: fetchmail.c:1778 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Kerberos V4-autentisering kommer framtvingas.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1781 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Kerberos V5-autentisering kommer framtvingas.\n" -#: fetchmail.c:1766 +#: fetchmail.c:1784 msgid " End-to-end encryption assumed.\n" msgstr " Ände-till-ände-kryptering antas.\n" -#: fetchmail.c:1770 +#: fetchmail.c:1788 #, c-format msgid " Mail service principal is: %s\n" msgstr " Posttjänsthuvudman är %s\n" -#: fetchmail.c:1773 +#: fetchmail.c:1791 msgid " SSL encrypted sessions enabled.\n" msgstr " SSL-krypterade sessioner aktiverade.\n" -#: fetchmail.c:1775 +#: fetchmail.c:1793 #, c-format msgid " SSL protocol: %s.\n" msgstr " SSL-protokoll: %s.\n" -#: fetchmail.c:1777 +#: fetchmail.c:1795 msgid " SSL server certificate checking enabled.\n" msgstr " Kontroll av SSL-servercertifikat aktiverat.\n" -#: fetchmail.c:1779 +#: fetchmail.c:1797 msgid " SSL server certificate checking disabled.\n" msgstr " Kontroll av SSL-servercertifikat avaktiverat.\n" -#: fetchmail.c:1781 +#: fetchmail.c:1799 #, c-format msgid " SSL default trusted certificate file: %s\n" msgstr " Fil med betrott standard-SSL-certifikat: %s\n" -#: fetchmail.c:1783 +#: fetchmail.c:1801 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Fil med betrott SSL-certifikat: %s\n" -#: fetchmail.c:1784 +#: fetchmail.c:1802 #, c-format msgid " SSL default trusted certificate directory: %s\n" msgstr " Katalog för betrodda standard-SSL-certifikat: %s\n" -#: fetchmail.c:1786 +#: fetchmail.c:1804 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Katalog för betrodda SSL-certifikat: %s\n" -#: fetchmail.c:1788 +#: fetchmail.c:1806 #, c-format msgid " SSL server CommonName: %s\n" msgstr " SSL-serverns CommonName: %s\n" -#: fetchmail.c:1790 +#: fetchmail.c:1808 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " SSL-nyckelns fingeravtryck (kontrollerat mot servernyckeln): %s\n" -#: fetchmail.c:1793 +#: fetchmail.c:1811 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Serverns tidsgräns för uteblivet svar är %d sekunder" -#: fetchmail.c:1795 +#: fetchmail.c:1813 msgid " (default).\n" msgstr " (standard).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1820 msgid " Default mailbox selected.\n" msgstr " Standardbrevlåda vald.\n" -#: fetchmail.c:1807 +#: fetchmail.c:1825 msgid " Selected mailboxes are:" msgstr " Valda brevlådor är:" -#: fetchmail.c:1813 +#: fetchmail.c:1831 msgid " All messages will be retrieved (--all on).\n" msgstr " Alla meddelanden kommer att hämtas (--all på).\n" -#: fetchmail.c:1814 +#: fetchmail.c:1832 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Endast nya meddelanden kommer att hämtas (--all av).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1834 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Hämtade meddelanden kommer att sparas på servern (--keep på).\n" -#: fetchmail.c:1817 +#: fetchmail.c:1835 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Hämtade meddelanden kommer inte att sparas på servern (--keep av).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1837 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Gamla meddelanden kommer kastas före meddelanden hämtas (--flush på).\n" -#: fetchmail.c:1820 +#: fetchmail.c:1838 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Gamla meddelanden kommer inte slängas före meddelanden hämtas (--flush av).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1840 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " För stora meddelanden kommer slängas före meddelanden hämtas (--limitflush på).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1841 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " För stora meddelanden kommer inte slängas före meddelanden hämtas (--limitflush av).\n" -#: fetchmail.c:1825 +#: fetchmail.c:1843 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Omskrivning av serverlokala adresser är aktiverat (--norewrite av).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1844 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Omskrivning av serverlokala adresser är avaktiverat (--norewrite på).\n" -#: fetchmail.c:1828 +#: fetchmail.c:1846 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Rensning av vagnretur är aktiverat (stripcr på).\n" -#: fetchmail.c:1829 +#: fetchmail.c:1847 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Rensning av vagnretur är avaktiverat (stripcr av).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1849 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Framtvingade vagnreturer är aktiverat (forcecr på).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1850 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Framtvingade vagnreturer är avaktiverat (forcecr av).\n" -#: fetchmail.c:1834 +#: fetchmail.c:1852 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Tolkning av Content-Transfer-Encoding är avaktiverat (pass8bits på).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1853 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Tolkning av Content-Transfer-Encoding är aktiverat (pass8bits av).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1855 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME-avkodning är aktiverat (mimedecode på).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1856 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME-avkodning är avaktiverat (mimedecode av).\n" -#: fetchmail.c:1840 +#: fetchmail.c:1858 msgid " Idle after poll is enabled (idle on).\n" msgstr " Vila efter kontroll är aktiverat (idle på).\n" -#: fetchmail.c:1841 +#: fetchmail.c:1859 msgid " Idle after poll is disabled (idle off).\n" msgstr " Vila efter kontroll är avaktiverat (idle av).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1861 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Icke tomma Status-rader kommer att slängas (dropstatus på)\n" -#: fetchmail.c:1844 +#: fetchmail.c:1862 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Icke tomma Status-rader kommer att behållas (dropstatus av)\n" -#: fetchmail.c:1846 +#: fetchmail.c:1864 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Delivered-To-rader kommer att slängas (dropdelivered på)\n" -#: fetchmail.c:1847 +#: fetchmail.c:1865 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Delivered-To-rader kommer att behållas (dropdelivered av)\n" -#: fetchmail.c:1851 +#: fetchmail.c:1869 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Storleksgräns på meddelanden är %d oktetter (--limit %d).\n" -#: fetchmail.c:1854 +#: fetchmail.c:1872 msgid " No message size limit (--limit 0).\n" msgstr " Ingen storleksgräns på meddelanden (--limit 0).\n" -#: fetchmail.c:1856 +#: fetchmail.c:1874 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Intervall för varning för meddelandestorlek är %d sekunder (--warnings %d).\n" -#: fetchmail.c:1859 +#: fetchmail.c:1877 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Storleksvarningar vid varje kontroll (--warnings 0).\n" -#: fetchmail.c:1862 +#: fetchmail.c:1880 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Gräns för mottagna meddelanden är %d (--fetchlimit %d).\n" -#: fetchmail.c:1865 +#: fetchmail.c:1883 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Ingen gräns på mottagna meddelanden (--fetchlimit 0).\n" -#: fetchmail.c:1867 +#: fetchmail.c:1885 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " Gräns på hämtad meddelandestorlek är %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1870 +#: fetchmail.c:1888 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Ingen gräns på hämtad meddelandestorlek (--fetchsizelimit 0).\n" -#: fetchmail.c:1874 +#: fetchmail.c:1892 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Gör en binär sökning av UID:er under varje kontroll (--fastuidl 1).\n" -#: fetchmail.c:1876 +#: fetchmail.c:1894 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Gör en binär sökning av UID:er under %d av %d kontroller (--fastuidl %d).\n" -#: fetchmail.c:1879 +#: fetchmail.c:1897 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Gör en linjär sökning av UID:er under varje kontroll (--fastuidl 0).\n" -#: fetchmail.c:1881 +#: fetchmail.c:1899 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Satsgräns på SMTP-meddelanden är %d.\n" -#: fetchmail.c:1883 +#: fetchmail.c:1901 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Ingen satsgräns på SMTP-meddelanden (--batchlimit 0).\n" -#: fetchmail.c:1887 +#: fetchmail.c:1905 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Raderingsintervall mellan kastande tvingat till %d (--expunge %d).\n" -#: fetchmail.c:1889 +#: fetchmail.c:1907 msgid " No forced expunges (--expunge 0).\n" msgstr " Inget framtvingat kastande (--expunge 0).\n" -#: fetchmail.c:1896 +#: fetchmail.c:1914 msgid " Domains for which mail will be fetched are:" msgstr " Domäner för vilka post kommer hämtas är:" -#: fetchmail.c:1901 fetchmail.c:1921 +#: fetchmail.c:1919 fetchmail.c:1939 msgid " (default)" msgstr " (standard)" -#: fetchmail.c:1906 +#: fetchmail.c:1924 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Meddelanden kommer läggas till till %s som BSMTP\n" -#: fetchmail.c:1908 +#: fetchmail.c:1926 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Meddelanden kommer levereras med ”%s”.\n" -#: fetchmail.c:1915 +#: fetchmail.c:1933 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Meddelanden kommer %cMTP-vidarebefordras till:" -#: fetchmail.c:1926 +#: fetchmail.c:1944 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Värddelen av MAIL FROM-raden kommer bli %s\n" -#: fetchmail.c:1929 +#: fetchmail.c:1947 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Adress som kommer att anges i RCPT TO-rader lämnade till SMTP kommer vara %s\n" -#: fetchmail.c:1938 +#: fetchmail.c:1956 msgid " Recognized listener spam block responses are:" msgstr " Igenkända lyssnares spam-blockeringssvar är:" -#: fetchmail.c:1944 +#: fetchmail.c:1962 msgid " Spam-blocking disabled\n" msgstr " Spam-blockering avaktiverat\n" -#: fetchmail.c:1947 +#: fetchmail.c:1965 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Serveranslutning kommer att öppnas med ”%s”.\n" -#: fetchmail.c:1950 +#: fetchmail.c:1968 msgid " No pre-connection command.\n" msgstr " Inget föranslutningskommando.\n" -#: fetchmail.c:1952 +#: fetchmail.c:1970 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Serveranslutning kommer att tas ner med ”%s”.\n" -#: fetchmail.c:1955 +#: fetchmail.c:1973 msgid " No post-connection command.\n" msgstr " Inget efteranslutningskommando.\n" -#: fetchmail.c:1958 +#: fetchmail.c:1976 msgid " No localnames declared for this host.\n" msgstr " Inga lokala namn angivna för denna värd.\n" -#: fetchmail.c:1968 +#: fetchmail.c:1986 msgid " Multi-drop mode: " msgstr " Flermålsläge: " -#: fetchmail.c:1970 +#: fetchmail.c:1988 msgid " Single-drop mode: " msgstr " Enmålsläge: " -#: fetchmail.c:1972 +#: fetchmail.c:1990 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "%d lokalt namn upptäckt.\n" msgstr[1] "%d lokala namn upptäckta.\n" -#: fetchmail.c:1987 +#: fetchmail.c:2005 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " DNS-uppslagning för flermålsadresser är aktiverat.\n" -#: fetchmail.c:1988 +#: fetchmail.c:2006 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " DNS-uppslagning för flermålsadresser är avaktiverat.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2010 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Serveralias kommer att jämföras med flermålsadresser via IP-adress.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2012 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Serveralias kommer att jämföras med flermålsadresser via namn.\n" -#: fetchmail.c:1997 +#: fetchmail.c:2015 msgid " Envelope-address routing is disabled\n" msgstr " Ruttläggning av kuvertadresser är avaktiverat\n" -#: fetchmail.c:2000 +#: fetchmail.c:2018 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Kuverthuvud förmodas vara: %s\n" -#: fetchmail.c:2003 +#: fetchmail.c:2021 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Antal kuverthuvuden att hoppa över: %d\n" -#: fetchmail.c:2006 +#: fetchmail.c:2024 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Prefixet %s kommer tas bort från användar-id\n" -#: fetchmail.c:2009 +#: fetchmail.c:2027 msgid " No prefix stripping\n" msgstr " Ingen borttagning av prefix\n" -#: fetchmail.c:2014 +#: fetchmail.c:2032 msgid " Predeclared mailserver aliases:" msgstr " Fördeklarerade postserveralias:" -#: fetchmail.c:2022 +#: fetchmail.c:2040 msgid " Local domains:" msgstr " Lokala domäner:" -#: fetchmail.c:2032 +#: fetchmail.c:2050 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Anslutningen måste gå via gränssnittet %s.\n" -#: fetchmail.c:2034 +#: fetchmail.c:2052 msgid " No interface requirement specified.\n" msgstr " Inget gränssnittskrav angett.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2054 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Kontrollslingan kommer övervaka %s.\n" -#: fetchmail.c:2038 +#: fetchmail.c:2056 msgid " No monitor interface specified.\n" msgstr " Ingen kontrollslinga angiven.\n" -#: fetchmail.c:2042 +#: fetchmail.c:2060 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Serveranslutningar kommer att göras via instickskommandot %s (--plugin %s).\n" -#: fetchmail.c:2044 +#: fetchmail.c:2062 msgid " No plugin command specified.\n" msgstr " Inget instickskommando angivet.\n" -#: fetchmail.c:2046 +#: fetchmail.c:2064 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Lyssnaranslutningar kommer att göras via utstickskommando %s (--plugout %s).\n" -#: fetchmail.c:2048 +#: fetchmail.c:2066 msgid " No plugout command specified.\n" msgstr " Inget utstickskommando angivet.\n" -#: fetchmail.c:2055 +#: fetchmail.c:2073 msgid " No UIDs saved from this host.\n" msgstr " Inga UID:er sparade från denna värd.\n" -#: fetchmail.c:2058 +#: fetchmail.c:2076 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UID:er sparade.\n" -#: fetchmail.c:2064 +#: fetchmail.c:2082 msgid " Poll trace information will be added to the Received header.\n" msgstr " Kontrollspårningsinformation kommer läggas till till Received-huvudet.\n" -#: fetchmail.c:2066 +#: fetchmail.c:2084 msgid " No poll trace information will be added to the Received header.\n" msgstr " Ingen kontrollspårningsinformation kommer att läggas till till Received-huvudet.\n" -#: fetchmail.c:2071 +#: fetchmail.c:2089 msgid " Messages with bad headers will be rejected.\n" msgstr " Meddelanden med felaktiga huvuden kommer att avvisas.\n" -#: fetchmail.c:2074 +#: fetchmail.c:2092 msgid " Messages with bad headers will be passed on.\n" msgstr " Meddelanden med felaktiga huvuden kommer skickas vidare.\n" -#: fetchmail.c:2079 +#: fetchmail.c:2097 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Egenskaper för vidarebefordran ”%s”.\n" @@ -1744,127 +1770,160 @@ msgstr "Fel när kreditiv släpptes\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: tråd sover i %d s.\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Protokoll identifierat som IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Protokoll identifierat som IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Protokoll identifierat som IMAP2 eller IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "kommer vila efter kontroll\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Mottog BYE-svar från IMAP-servern: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "felaktigt meddelandeantal i ”%s”!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "felaktigt EXPUNGE-antal i ”%s”!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Protokoll identifierat som IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "hittade uppdaterad funktionslista\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Protokoll identifierat som IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "servern annonserade inte SASL-IR-tillägget men fetchmails implementering kräver det för AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Protokoll identifierat som IMAP2 eller IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: konfiguration kräver TLS, men STARTTLS är inte tillåtet på grund av autentiserat tillstånd (PREAUTH). Avbryter anslutningen. Om din insticksmodul är säker kan du motverka STARTTLS med --sslproto '' (se manualen).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "kommer vila efter kontroll\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: konfiguration kräver TLS, men STARTTLS är inte tillåtet på grund av autentiserat tillstånd (PREAUTH). Avbryter anslutningen. Om servern tillåter det, prova --ssl istället (se manualen).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: uppgradering till TLS lyckades.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: uppgradering till TLS misslyckades.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: opportunistisk uppgradering till TLS misslyckades, försöker fortsätta\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: VARNING: servern erbjöd STARTTLS men sslproto ”” gavs.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: --auth extern begäran men servern annonserar inte om det.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Nödvändig OTP-förmåga inte inkompilerad i fetchmail\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Nödvändig NTLM-förmåga inte inkompilerad i fetchmail\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: --auth lösenord begärt men servern förbjuder det (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: vi har fått slut på tillåtna autentiseringsmetoder och kan inte logga in.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "kastande av post stämmer inte (%d faktiskt ≠ %d förväntat)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu är osedda\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u är osedda\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "omkontroll misslyckades\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d meddelande väntar efter omkontroll\n" msgstr[1] "%d meddelanden väntar efter omkontroll\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "brevlådeval misslyckades\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "%d meddelande väntar efter första kontrollen\n" msgstr[1] "%d meddelanden väntar efter första kontrollen\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "kastande misslyckades\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "%d meddelande väntar efter tömning\n" msgstr[1] "%d meddelanden väntar efter tömning\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "sökning efter osedda meddelanden misslyckades\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u är det första osedda\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Varning: ignorerar felaktiga data för meddelandestorlek som returneras av servern.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Felaktigt FETCH-svar: %s.\n" @@ -1969,51 +2028,56 @@ msgstr "kunde inte avkoda BASE64-färdigt svar\n" msgid "challenge mismatch\n" msgstr "utmaningen stämmer inte\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: fel när låsfilen ”%s” lästes: %s\n" -#: lock.c:98 +#: lock.c:101 #, c-format msgid "fetchmail: removing stale lockfile \"%s\"\n" msgstr "fetchmail: tar bort förlegad låsfil ”%s”\n" -#: lock.c:102 +#: lock.c:105 #, c-format msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" msgstr "fetchmail: kan inte ta bort låsfilen ”%s” (%s), försöker skriva till den\n" -#: lock.c:116 +#: lock.c:119 #, c-format msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" msgstr "fetchmail: kan inte skriva till låsfilen ”%s” (%s), avslutar\n" -#: lock.c:126 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: fel när låsfilen ”%s” öppnades: %s\n" -#: lock.c:176 +#: lock.c:179 #, c-format msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" msgstr "fetchmail: misslyckades att skapa lås, pid-fil ”%s”: %s\n" -#: lock.c:187 +#: lock.c:190 #, c-format msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" msgstr "fetchmail: kan inte ta bort eller hugga av pid-filen ”%s”: %s\n" -#: netrc.c:220 +#: netrc.c:225 #, c-format msgid "%s:%d: warning: found \"%s\" before any host names\n" msgstr "%s:%d: varning: hittade ”%s” före några värdnamn\n" -#: netrc.c:258 +#: netrc.c:263 #, c-format msgid "%s:%d: warning: unknown token \"%s\"\n" msgstr "%s:%d: varning: okänd symbol ”%s”\n" +#: netrc.c:271 netrc.c:277 +#, c-format +msgid "%s: error reading file (%s).\n" +msgstr "%s: fel när filen lästes (%s).\n" + #: ntlmsubr.c:35 msgid "Warning: received malformed challenge to \"AUTH(ENTICATE) NTLM\"!\n" msgstr "Varning: mottog felformaterad utmaning till ”AUTH(ENTICATE) NTLM”!\n" @@ -2060,19 +2124,19 @@ msgstr "Okänt ODMR-fel ”%s”\n" msgid "receiving message data\n" msgstr "tar emot meddelandedata\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Flaggan --keep stödjs inte med ODMR\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Flaggan --flush stödjs inte med ODMR\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Flaggan --folder stödjs inte med ODMR\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Flaggan --check stödjs inte med ODMR\n" @@ -2084,7 +2148,7 @@ msgstr "server mottog ödesdigert\n" msgid "Could not decode OTP challenge\n" msgstr "Kunde inte avkoda OTP-utmaning\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Hemlig lösenfras: " @@ -2417,83 +2481,83 @@ msgstr "POP2 stödjer inte STLS. Ger upp.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 stödjer endast lösenordsautentisering. Ger upp.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Varning: ”Maillennium POP3” funnen, använder RETR-kommando istället för TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "TLS är obligatoriskt för denna session, men servern vägrade CAPA-kommandot.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "STLS är obligatoriskt för denna session, men servern vägrade CAPA-kommando.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Men CAPA-kommandot är dock nödvändigt för TLS.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Stöd för CAPA-kommando är dock nödvändigt för STLS.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: opportunistisk uppgradering till TLS misslyckades, försöker fortsätta.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: VARNING: servern erbjöd STLS, men sslproto ”” gavs.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Vi har fått slut på tillåtna autentiserare och kan inte fortsätta.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "Obligatorisk APOP-tidstämpel finns inte i hälsningen\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Syntaxfel i tidsstämpeln i hälsningen\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Ogiltig APOP-tidsstämpel.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Odefinierad protokollbegäran i POP3_auth\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "lås upptaget! Är en annan session aktiv?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Kan inte hantera UIDL-svar från uppströmsserver.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Servern svarade med UID för fel meddelande.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (nr=%u) raderades, men är fortfarande kvar!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Meddelanden infogade i listan på servern. Kan inte hantera detta.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "protokollfel\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "protokollfel när UIDL:er hämtades\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (nr=%d) raderades, men är fortfarande kvar!\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Flaggan --folder stödjs inte med POP3\n" @@ -2536,11 +2600,11 @@ msgstr "Filen %s får inte ha mer rättigheter än -rwx------ (0700).\n" msgid "File %s must be owned by you.\n" msgstr "Filen %s måste ägas av dig.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Okänt systemfel" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (loggmeddelandet ofullständigt)\n" @@ -2911,80 +2975,85 @@ msgstr "ESMTP LOGIN-autentisering …\n" msgid "smtp listener protocol error\n" msgstr "protokollfel hos smtp-lyssnaren\n" -#: socket.c:113 socket.c:142 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc misslyckades\n" -#: socket.c:174 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: plugin för värd %s tjänst %s är tom, kan inte köras!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair misslyckades\n" -#: socket.c:180 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: fork misslyckades\n" -#: socket.c:187 +#: socket.c:203 msgid "dup2 failed\n" msgstr "dup2 misslyckades\n" -#: socket.c:193 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "kör %s (värd %s tjänst %s)\n" -#: socket.c:198 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) misslyckades\n" -#: socket.c:273 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "getaddrinfo(\"%s\",\"%s\") fel: %s\n" -#: socket.c:276 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Försök att lägga till flaggan --service (se även FAQ-post R12).\n" -#: socket.c:290 socket.c:293 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "okänt (%s)" -#: socket.c:296 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Försöker ansluta till %s/%s …" -#: socket.c:305 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "kan inte skapa uttag: %s\n" -#: socket.c:307 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "namn %d: kan inte skapa uttag med familj %d typ %d: %s\n" -#: socket.c:325 +#: socket.c:338 msgid "connection failed.\n" msgstr "anslutningen misslyckades.\n" -#: socket.c:327 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "anslutningen till %s:%s [%s/%s] misslyckades: %s.\n" -#: socket.c:328 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "namn %d: anslutning till %s:%s [%s/%s] misslyckades: %s.\n" -#: socket.c:334 +#: socket.c:347 msgid "connected.\n" msgstr "ansluten.\n" -#: socket.c:347 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2993,229 +3062,244 @@ msgstr "" "Anslutningsfel för denna kontroll:\n" "%s" -#: socket.c:417 +#: socket.c:450 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL rapporterade: %s\n" -#: socket.c:652 +#: socket.c:690 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "SSL-verifieringens återanropsdjup %d: preverify_ok == %d, err = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "SSL-verifieringens återanropsdjup %d: verify_ok == %d, err = %d, %s\n" -#: socket.c:658 +#: socket.c:696 msgid "Server certificate:\n" msgstr "Servercertifikat:\n" -#: socket.c:663 +#: socket.c:701 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Certifikatskedja, från rot till motpart, med start på djup %d:\n" -#: socket.c:666 +#: socket.c:704 #, c-format msgid "Certificate at depth %d:\n" msgstr "Certifikat på djup %d:\n" -#: socket.c:672 +#: socket.c:710 #, c-format msgid "Issuer Organization: %s\n" msgstr "Utgivarorganisation: %s\n" -#: socket.c:675 +#: socket.c:713 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Varning: Utgivarorganisationens namn är för långt (möjligen avhugget).\n" -#: socket.c:677 +#: socket.c:715 msgid "Unknown Organization\n" msgstr "Okänd organisation\n" -#: socket.c:679 +#: socket.c:717 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Utgivarens vanliga namn: %s\n" -#: socket.c:682 +#: socket.c:720 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Varning: Utgivarens vanliga namn är för långt (möjligen avhugget).\n" -#: socket.c:684 +#: socket.c:722 msgid "Unknown Issuer CommonName\n" msgstr "Okänt vanligt namn på utgivaren\n" -#: socket.c:690 +#: socket.c:728 #, c-format msgid "Subject CommonName: %s\n" msgstr "Subjektets vanliga namn: %s\n" -#: socket.c:696 +#: socket.c:734 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Felaktigt certifikat: Subjektets vanliga namn är för långt!\n" -#: socket.c:702 +#: socket.c:740 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Felaktigt certifikat: Subjektets vanliga namn innehåller nolltecken, avbryter!\n" -#: socket.c:730 +#: socket.c:768 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Subjektets alternativa namn: %s\n" -#: socket.c:736 +#: socket.c:774 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Felaktigt certifikat: Subjektets alternativa namn innehåller nolltecken, avbryter!\n" -#: socket.c:753 +#: socket.c:791 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Serverns vanliga namn stämmer inte: %s ≠ %s\n" -#: socket.c:760 +#: socket.c:798 msgid "Server name not set, could not verify certificate!\n" msgstr "Serverns namn inte satt, kunde inte verifiera certifikatet!\n" -#: socket.c:765 +#: socket.c:803 msgid "Unknown Server CommonName\n" msgstr "Serverns vanliga namn okänt\n" -#: socket.c:767 +#: socket.c:805 msgid "Server name not specified in certificate!\n" msgstr "Serverns namn är inte angivet i certifikatet!\n" -#: socket.c:779 +#: socket.c:817 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() misslyckades!\n" -#: socket.c:783 +#: socket.c:821 msgid "Out of memory!\n" msgstr "Slut på minne!\n" -#: socket.c:791 +#: socket.c:829 msgid "Digest text buffer too small!\n" msgstr "Textbufferten för kontrollsumman är för liten!\n" -#: socket.c:797 +#: socket.c:835 #, c-format msgid "%s key fingerprint: %s\n" msgstr "%s nyckelfingeravtryck: %s\n" -#: socket.c:801 +#: socket.c:839 #, c-format msgid "%s fingerprints match.\n" msgstr "%s fingeravtryck stämmer.\n" -#: socket.c:803 +#: socket.c:841 #, c-format msgid "%s fingerprints do not match!\n" msgstr "%s fingeravtryck stämmer inte!\n" -#: socket.c:815 +#: socket.c:853 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Fel vid verifiering av servercertifikatet: %s\n" -#: socket.c:830 +#: socket.c:868 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Trasig certifikatskedja vid: %s\n" -#: socket.c:832 +#: socket.c:870 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "Detta kan betyda att servern inte tillhandahöll de mellanliggande CA:nas certifikat, vilket inte är något fetchmail kunde göra något åt. För detaljer, se dokumentet README.SSL-SERVER som kommer med fetchmail.\n" -#: socket.c:842 +#: socket.c:880 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Förtroendeankarcertifikat saknas: %s\n" -#: socket.c:845 +#: socket.c:883 msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" msgstr "Detta kan betyda att root-CA:ns signeringscertifikat inte finns på platserna för betrodda CA-certifikat, eller att c_rehash behöver köras på certifikatkatalogen. För detaljer, se dokumentationen av --sslcertpath och --sslcertfile i manualsidan. Se README.SSL för detaljer.\n" -#: socket.c:919 socket.c:995 +#: socket.c:957 socket.c:1033 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Din version av OpenSSL stödjer inte SSLv3.\n" -#: socket.c:937 socket.c:1013 +#: socket.c:975 socket.c:1051 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Din version av OpenSSL stödjer inte TLS v1.1.\n" -#: socket.c:948 socket.c:1024 +#: socket.c:986 socket.c:1062 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Din version av OpenSSL stödjer inte TLS v1.2.\n" -#: socket.c:959 socket.c:1035 +#: socket.c:997 socket.c:1073 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Din version av OpenSSL stödjer inte TLS v1.3.\n" -#: socket.c:968 socket.c:1045 +#: socket.c:1006 socket.c:1083 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "Ogiltigt SSL-protokoll ”%s” angivet, använder standard autoval (auto).\n" -#: socket.c:1078 +#: socket.c:1122 +#, c-format +msgid "Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n" +msgstr "Det inlästa wolfSSL-biblioteket %#lx är äldre än huvudena %#lx, vägrar att arbeta.\n" + +#: socket.c:1128 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "Det inlästa OpenSSL-biblioteket %#lx är äldre än huvudena %#lx, vägrar att arbeta.\n" -#: socket.c:1083 +#: socket.c:1133 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" -msgstr "Det inlästa OpenSSL-biblioteket %#lx är nyare än huvudena %#lx, vägrar att fortsätta.\n" +msgstr "Det inlästa OpenSSL-biblioteket %#lx är nyare än huvudena %#lx, försöker att fortsätta.\n" -#: socket.c:1103 +#: socket.c:1153 msgid "File descriptor out of range for SSL" msgstr "Filbeskrivare utanför intervallet för SSL" -#: socket.c:1124 +#: socket.c:1175 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Observera att några distributioner avaktiverar äldre protokollversioner på konstiga icke-standardsätt. Försök med en nyare protokollversion.\n" -#: socket.c:1192 +#: socket.c:1237 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Kan inte läsa in verifikationsplatser (fil=”%s”, kat=”%s”), fel %d:\n" + +#: socket.c:1272 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Varning: SSL_set_tlsext_host_name(%p, \"%s\") misslyckades (kod %#lx), försöker att fortsätta.\n" -#: socket.c:1207 +#: socket.c:1286 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: uttg %d: wolfSSL_check_domain_name(%#p, \"%s\") returnerade %d, försöker att fortsätta\n" + +#: socket.c:1302 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Varning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") misslyckades (kod %#x), försöker att fortsätta.\n" -#: socket.c:1244 +#: socket.c:1355 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Servern stängde ner förbindelsen för tidigt under SSL_connect().\n" -#: socket.c:1247 +#: socket.c:1358 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Systemfel under SSL_connect(): %s\n" -#: socket.c:1247 +#: socket.c:1358 msgid "handshake failed at protocol or connection level." msgstr "handskakningen misslyckades på protokoll- eller förbindelsenivå." -#: socket.c:1267 +#: socket.c:1378 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Kan inte hämta aktuellt SSL/TLS-chiffer — ingen förbindelse etablerad?\n" -#: socket.c:1270 +#: socket.c:1381 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: använder protokollet %s, chiffret %s, %d/%d hemliga/bearbetade bitar\n" -#: socket.c:1277 +#: socket.c:1388 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Certifikat-/fingeravtrycksverifikation hoppades på något sätt över!\n" -#: socket.c:1294 +#: socket.c:1405 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Varning: anslutningen är osäker, fortsätter ändå. (Bättre att använda --sslcertck!)\n" -#: socket.c:1336 +#: socket.c:1447 msgid "Cygwin socket read retry\n" msgstr "Gör om försök att läsa Cygwin-uttag\n" -#: socket.c:1339 +#: socket.c:1450 msgid "Cygwin socket read retry failed!\n" msgstr "Försök att göra om läsning av Cygwin-uttag misslyckades!\n" @@ -3,25 +3,23 @@ # Copyright © 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the fetchmail package. # Clytie Siddall <clytie@riverland.net.au>, 2006-2010. -# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013. +# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013, 2022. # msgid "" msgstr "" -"Project-Id-Version: fetchmail 6.4.0.rc4\n" +"Project-Id-Version: fetchmail 6.4.25.rc1\n" "Report-Msgid-Bugs-To: fetchmail-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2019-09-02 18:59+0200\n" -"PO-Revision-Date: 2019-09-03 14:38+0700\n" +"POT-Creation-Date: 2021-11-21 00:48+0100\n" +"PO-Revision-Date: 2022-03-20 14:26+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Language-Team-Website: <http://translationproject.org/team/vi.html>\n" -"X-Generator: Poedit 2.2.3\n" -"X-Poedit-SourceCharset: UTF-8\n" #: checkalias.c:174 #, c-format @@ -157,41 +155,41 @@ msgid "fetchlimit %d reached; %d message left on server %s account %s\n" msgid_plural "fetchlimit %d reached; %d messages left on server %s account %s\n" msgstr[0] "đã đạt đến giới hạn lấy %d; %d thư còn lại trên máy phục vụ %s tài khoản %s\n" -#: driver.c:899 +#: driver.c:900 #, c-format msgid "timeout after %d seconds waiting to connect to server %s.\n" msgstr "quá giờ sau %d giây đợi kết nối đến máy phục vụ %s.\n" -#: driver.c:903 +#: driver.c:904 #, c-format msgid "timeout after %d seconds waiting for server %s.\n" msgstr "quá giờ sau %d giây đợi máy phục vụ %s.\n" -#: driver.c:907 +#: driver.c:908 #, c-format msgid "timeout after %d seconds waiting for %s.\n" msgstr "quá giờ sau %d giây đợi %s.\n" -#: driver.c:912 +#: driver.c:913 #, c-format msgid "timeout after %d seconds waiting for listener to respond.\n" msgstr "quá giờ sau %d giây đợi bộ lắng nghe đáp ứng.\n" -#: driver.c:915 +#: driver.c:916 #, c-format msgid "timeout after %d seconds.\n" msgstr "quá giờ sau %d giây.\n" -#: driver.c:927 +#: driver.c:928 msgid "fetchmail sees repeated timeouts" msgstr "fetchmail thấy nhiều việc quá giờ" -#: driver.c:930 +#: driver.c:931 #, c-format msgid "Fetchmail saw more than %d timeouts while attempting to get mail from %s@%s.\n" msgstr "Fetchmail thấy hơn %d việc quá giờ trong khi cố lấy thư từ %s@%s.\n" -#: driver.c:934 +#: driver.c:935 msgid "" "This could mean that your mailserver is stuck, or that your SMTP\n" "server is wedged, or that your mailbox file on the server has been\n" @@ -204,73 +202,73 @@ msgstr "" "\n" "Fetchmail sẽ không thăm dò hộp thư này cho đến khi bạn khởi động nó.\n" -#: driver.c:960 +#: driver.c:961 #, c-format msgid "pre-connection command terminated with signal %d\n" msgstr "câu lệnh tiền kết nối đã thất bại với tín hiệu %d\n" -#: driver.c:963 +#: driver.c:964 #, c-format msgid "pre-connection command failed with status %d\n" msgstr "câu lệnh tiền kết nối đã thất bại với trạng thái %d\n" -#: driver.c:987 +#: driver.c:994 #, c-format msgid "couldn't find HESIOD pobox for %s\n" msgstr "không tìm thấy pobox HESIOD cho %s\n" -#: driver.c:1008 +#: driver.c:1015 msgid "Lead server has no name.\n" msgstr "Máy phục vụ đi trước không có tên.\n" -#: driver.c:1035 +#: driver.c:1042 #, c-format msgid "couldn't find canonical DNS name of %s (%s): %s\n" msgstr "không tìm thấy tên DNS đúng tiêu chuẩn của %s (%s): %s\n" -#: driver.c:1082 +#: driver.c:1089 #, c-format msgid "%s connection to %s failed" msgstr "kết nối %s đến %s gặp lỗi" -#: driver.c:1111 +#: driver.c:1118 msgid "SSL connection failed.\n" msgstr "Kết nối SSL đã thất bại.\n" -#: driver.c:1166 +#: driver.c:1172 #, c-format msgid "Lock-busy error on %s@%s\n" msgstr "Gặp lỗi kiểu khoá-bận trên %s@%s\n" -#: driver.c:1170 +#: driver.c:1176 #, c-format msgid "Server busy error on %s@%s\n" msgstr "Gặp lỗi kiểu máy phục vụ bận trên %s@%s\n" -#: driver.c:1175 +#: driver.c:1181 #, c-format msgid "Authorization failure on %s@%s%s\n" msgstr "Việc xác thực thất bại trên %s@%s%s\n" -#: driver.c:1178 +#: driver.c:1184 msgid " (previously authorized)" msgstr " (đã cho quyền trước này)" -#: driver.c:1181 +#: driver.c:1187 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" msgstr "Để tìm trợ giúp, xem: http://www.fetchmail.info/fetchmail-FAQ.html#R15\n" -#: driver.c:1202 +#: driver.c:1208 #, c-format msgid "fetchmail authentication failed on %s@%s" msgstr "việc xác thực fetchmail gặp lỗi trên %s@%s" -#: driver.c:1206 +#: driver.c:1212 #, c-format msgid "Fetchmail could not get mail from %s@%s.\n" msgstr "Fetchmail không thể lấy thư từ %s@%s.\n" -#: driver.c:1210 +#: driver.c:1216 msgid "" "The attempt to get authorization failed.\n" "Since we have already succeeded in getting authorization for this\n" @@ -283,7 +281,7 @@ msgstr "" "chế độ thất bại khác (v.d. máy phục vụ bận tạm) mà fetchmail\n" "không thể phân biệt vì máy phục vụ chưa gởi thông điệp lỗi hữu ích." -#: driver.c:1216 +#: driver.c:1222 msgid "" "\n" "However, if you HAVE changed your account details since starting the\n" @@ -302,7 +300,7 @@ msgstr "" "Trình nền fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n" "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi." -#: driver.c:1226 +#: driver.c:1232 msgid "" "The attempt to get authorization failed.\n" "This probably means your password is invalid, but some servers have\n" @@ -321,180 +319,185 @@ msgstr "" "Trình nền fetchmail sẽ tiếp tục chạy, và cố kết nối, trong mỗi chu kỳ.\n" "Không có thông báo sau sẽ được gởi đến khi dịch vụ được phục hồi." -#: driver.c:1242 +#: driver.c:1248 #, c-format msgid "Repoll immediately on %s@%s\n" msgstr "Thăm dò lại ngay trên %s@%s\n" -#: driver.c:1247 +#: driver.c:1254 +#, c-format +msgid "Socket or TLS error on %s@%s\n" +msgstr "Lỗi Ổ cắm mạng hoặc TLS trên %s@%s\n" + +#: driver.c:1260 #, c-format msgid "Unknown login or authentication error on %s@%s\n" msgstr "Lỗi đăng nhập hay xác thực không rõ trên %s@%s\n" -#: driver.c:1271 +#: driver.c:1285 #, c-format msgid "Authorization OK on %s@%s\n" msgstr "Đã được quyền trên %s@%s\n" -#: driver.c:1277 +#: driver.c:1291 #, c-format msgid "fetchmail authentication OK on %s@%s" msgstr "fetchmail đã được xác thực là đúng trên %s@%s" -#: driver.c:1281 +#: driver.c:1295 #, c-format msgid "Fetchmail was able to log into %s@%s.\n" msgstr "Fetchmail đã đăng nhập được vào %s@%s.\n" -#: driver.c:1285 +#: driver.c:1299 msgid "Service has been restored.\n" msgstr "Dịch vụ đã được phục hồi.\n" -#: driver.c:1318 +#: driver.c:1332 #, c-format msgid "selecting or re-polling folder %s\n" msgstr "đang chọn hoặc thăm dò thư mục %s\n" -#: driver.c:1320 +#: driver.c:1334 msgid "selecting or re-polling default folder\n" msgstr "đang chọn hoặc thăm dò thư mục mặc định\n" -#: driver.c:1332 +#: driver.c:1346 #, c-format msgid "%s at %s (folder %s)" msgstr "%s lúc %s (thư mục %s)" -#: driver.c:1335 rcfile_y.y:392 +#: driver.c:1349 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s lúc %s" -#: driver.c:1340 +#: driver.c:1354 #, c-format msgid "Polling %s\n" msgstr "Đang thăm dò %s...\n" -#: driver.c:1344 +#: driver.c:1358 #, c-format msgid "%d message (%d %s) for %s" msgid_plural "%d messages (%d %s) for %s" msgstr[0] "%d thư (%d %s) cho %s" -#: driver.c:1347 +#: driver.c:1361 msgid "seen" msgid_plural "seen" msgstr[0] "đã thấy" -#: driver.c:1350 +#: driver.c:1364 #, c-format msgid "%d message for %s" msgid_plural "%d messages for %s" msgstr[0] "%d thư cho %s" -#: driver.c:1357 +#: driver.c:1371 #, c-format msgid " (%d octets).\n" msgstr " (%d octet).\n" -#: driver.c:1363 +#: driver.c:1377 #, c-format msgid "No mail for %s\n" msgstr "Không có thư cho %s\n" -#: driver.c:1396 +#: driver.c:1410 msgid "bogus message count!" msgstr "số lượng thư giả!" -#: driver.c:1448 +#: driver.c:1462 #, c-format msgid "Too many mails skipped (%d > %d) due to transient errors for %s\n" msgstr "Quá nhiều thư bị bỏ qua (%d > %d) bởi vì các lỗi nhất thời với %s\n" -#: driver.c:1549 +#: driver.c:1568 msgid "socket" msgstr "ổ cắm" -#: driver.c:1552 +#: driver.c:1571 msgid "missing or bad RFC822 header" msgstr "dòng đầu RFC822 xấu hay còn thiếu" # Name: don't translate / Tên: đừng dịch -#: driver.c:1555 +#: driver.c:1574 msgid "MDA" msgstr "MDA" -#: driver.c:1558 +#: driver.c:1577 msgid "client/server synchronization" msgstr "đồng bộ hoá ứng dụng khách/trình phục vụ" -#: driver.c:1561 +#: driver.c:1580 msgid "client/server protocol" msgstr "giao thức ứng dụng khách/trình phục vụ" -#: driver.c:1564 +#: driver.c:1583 msgid "lock busy on server" msgstr "khoá bận trên máy phục vụ" -#: driver.c:1567 +#: driver.c:1586 msgid "SMTP transaction" msgstr "Giao dịch SMTP" -#: driver.c:1570 +#: driver.c:1589 msgid "DNS lookup" msgstr "Tra cứu DNS" -#: driver.c:1573 +#: driver.c:1592 msgid "undefined" msgstr "chưa định nghĩa" -#: driver.c:1579 +#: driver.c:1598 #, c-format msgid "%s error while fetching from %s@%s and delivering to SMTP host %s\n" msgstr "Gặp lỗi %s trong khi lấy từ %s@%s và phát cho máy SMTP %s\n" -#: driver.c:1581 +#: driver.c:1600 msgid "unknown" msgstr "không rõ" -#: driver.c:1583 +#: driver.c:1602 #, c-format msgid "%s error while fetching from %s@%s\n" msgstr "Gặp lỗi %s trong khi lấy từ %s@%s\n" -#: driver.c:1595 +#: driver.c:1614 #, c-format msgid "post-connection command terminated with signal %d\n" msgstr "câu lệnh kết nối cuối cùng đã thất bại với tín hiệu %d\n" -#: driver.c:1597 +#: driver.c:1616 #, c-format msgid "post-connection command failed with status %d\n" msgstr "câu lệnh kết nối cuối cùng đã thất bại với trạng thái %d\n" -#: driver.c:1616 +#: driver.c:1635 msgid "Kerberos V4 support not linked.\n" msgstr "Chưa liên kết cách hỗ trợ Kerberos V4.\n" -#: driver.c:1624 +#: driver.c:1643 msgid "Kerberos V5 support not linked.\n" msgstr "Chưa liên kết cách hỗ trợ Kerberos V5.\n" -#: driver.c:1635 +#: driver.c:1654 #, c-format msgid "Option --flush is not supported with %s\n" msgstr "Không hỗ trợ tùy chọn “--flush” (xoá sạch) với %s\n" -#: driver.c:1641 +#: driver.c:1660 #, c-format msgid "Option --all is not supported with %s\n" msgstr "Không hỗ trợ tùy chọn “--all” (tất cả) với %s\n" -#: driver.c:1650 +#: driver.c:1669 #, c-format msgid "Option --limit is not supported with %s\n" msgstr "Không hỗ trợ tùy chọn “--limit” (hạn chế) với %s\n" -#: env.c:61 +#: env.c:58 #, c-format msgid "" "%s: The QMAILINJECT environment variable is set.\n" @@ -510,7 +513,7 @@ msgstr "" "\"env QMAILINJECT= %s CÁC ĐỐI SỐ CỦA BẠN\".\n" "%s: Hủy bộ.\n" -#: env.c:73 +#: env.c:70 #, c-format msgid "" "%s: The NULLMAILER_FLAGS environment variable is set.\n" @@ -527,26 +530,34 @@ msgstr "" "\"env NULLMAILER_FLAGS= %s CÁC ĐỐI SỐ CỦA BẠN\".\n" "%s: Hủy bộ.\n" -#: env.c:85 +#: env.c:82 #, c-format msgid "%s: You don't exist. Go away.\n" msgstr "%s: Không nhận ra bạn. Mời ra khỏi đây.\n" -#: env.c:149 +#: env.c:143 +msgid "Cannot find absolute path for user's home directory.\n" +msgstr "Không thể tìm thấy đường dẫn tuyệt đối cho thư mục cá nhân của người dùng.\n" + +#: env.c:167 +msgid "Cannot find absolute path for fetchmail's home directory.\n" +msgstr "Không thể tìm thấy đường dẫn tuyệt đối cho thư mục cá nhân của fetchmail.\n" + +#: env.c:200 #, c-format msgid "%s: can't determine your host!" msgstr "%s: không thể phân giải tên máy của bạn!" -#: env.c:172 +#: env.c:223 #, c-format -msgid "getaddrinfo failed for %s\n" -msgstr "getaddrinfo không thành công cho %s\n" +msgid "getaddrinfo failed for \"%s\": %s\n" +msgstr "getaddrinfo gặp lỗi với \"%s\": %s \n" -#: env.c:174 +#: env.c:224 msgid "Cannot find my own host in hosts database to qualify it!\n" msgstr "Không tìm thấy máy mình trong cơ sở dữ liệu máy để thêm đủ khả năng vào nó!\n" -#: env.c:178 +#: env.c:228 msgid "" "Trying to continue with unqualified hostname.\n" "DO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\n" @@ -605,37 +616,38 @@ msgstr "Lỗi cú pháp ETRN trong các tham số\n" msgid "Unknown ETRN error %d\n" msgstr "Không biết lỗi ETRN %d\n" -#: etrn.c:154 +#: etrn.c:156 msgid "Option --keep is not supported with ETRN\n" msgstr "Không hỗ trợ tùy chọn “--keep” (giữ) đối với ETRN\n" -#: etrn.c:158 +#: etrn.c:160 msgid "Option --flush is not supported with ETRN\n" msgstr "Không hỗ trợ tùy chọn “--flush” (xoá sạch) đối với ETRN\n" -#: etrn.c:162 +#: etrn.c:164 msgid "Option --folder is not supported with ETRN\n" msgstr "Không hỗ trợ tùy chọn “--folder” (thư mục) đối với ETRN\n" -#: etrn.c:166 +#: etrn.c:168 msgid "Option --check is not supported with ETRN\n" msgstr "Không hỗ trợ tùy chọn “--check” (kiểm tra) đối với ETRN\n" -#: fetchmail.c:141 +#: fetchmail.c:144 +#, c-format msgid "" "Copyright (C) 2002, 2003 Eric S. Raymond\n" "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" " Robert M. Funk, Graham Wilson\n" "Copyright (C) 2005 - 2012 Sunil Shetye\n" -"Copyright (C) 2005 - 2019 Matthias Andree\n" +"Copyright (C) 2005 - %d Matthias Andree\n" msgstr "" "Tác quyền © năm 2002, 2003 của Eric S. Raymond\n" "Tác quyền © năm 2004 của Matthias Andree, Eric S. Raymond,\n" " Robert F. Funk, Graham Wilson\n" -"Tác quyền © năm 2005 - 2012 của Sunil Shetye\n" -"Tác quyền © năm 2005 - 2019 của Matthias Andree\n" +"Tác quyền © năm 2005-2006, 2010 - 2011 của Sunil Shetye\n" +"Tác quyền © năm 2005-%d Matthias Andree\n" -#: fetchmail.c:147 +#: fetchmail.c:150 msgid "" "Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" "are welcome to redistribute it under certain conditions. For details,\n" @@ -646,932 +658,994 @@ msgstr "" "Để tìm thấy thông tin thêm thì hãy xem tập tin có tên COPYING (sao chép)\n" "trong thư mục nguồn hay tài liệu.\n" -#: fetchmail.c:187 +#: fetchmail.c:190 msgid "WARNING: Running as root is discouraged.\n" msgstr "CẢNH BÁO: khuyên bạn không chạy với tư cách siêu người dùng (root).\n" -#: fetchmail.c:199 +#: fetchmail.c:202 msgid "fetchmail: invoked with" msgstr "fetchmail: được gọi bằng" -#: fetchmail.c:222 +#: fetchmail.c:225 msgid "could not get current working directory\n" msgstr "không thể lấy thư mục hoạt động hiện có\n" -#: fetchmail.c:296 +#: fetchmail.c:306 #, c-format msgid "This is fetchmail release %s" msgstr "Đây là fetchmail bản phát hành %s" -#: fetchmail.c:321 +#: fetchmail.c:309 +#, c-format +msgid "" +"Compiled with SSL library %#lx \"%s\"\n" +"Run-time uses SSL library %#lx \"%s\"\n" +msgstr "" +"Được biên dịch với thư viện SSL %#lx \"%s\"\n" +"Chạy thì dùng thư viện SSL %#lx \"%s\"\n" + +#: fetchmail.c:313 +#, c-format +msgid "" +"OpenSSL: %s\n" +"Engines: %s\n" +msgstr "" +"OpenSSL: %s\n" +"Bộ máy: %s\n" + +#: fetchmail.c:317 +msgid "WARNING: Your SSL/TLS library does not support TLS v1.3.\n" +msgstr "CẢNH BÁO: Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.3.\n" + +#: fetchmail.c:320 +msgid "ERROR: Compiled against LibreSSL, which is a copyright violation for lack of GPL clause 2b exception. See COPYING. Aborting.\n" +msgstr "" +"LỖI: Biên dịch dựa vào, cái mà vi phạm bản quyền do thiếu loại trừ mệnh đề 2b của giấy phép GPL. Xem SAO CHÉP.\n" +"Nên bãi bỏ.\n" + +#: fetchmail.c:324 +msgid "WARNING: Compiled without SSL/TLS.\n" +msgstr "CẢNH BÁO: Biên dịch mà không có SSL/TLS.\n" + +#: fetchmail.c:350 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "Tùy chọn nodetach chịu tác động, bỏ qua tùy chọn logfile.\n" -#: fetchmail.c:328 +#: fetchmail.c:357 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "Không chạy trong chế độ daemon (dịch vụ), bỏ qua tùy chọn logfile.\n" -#: fetchmail.c:335 +#: fetchmail.c:364 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "Tập tin nhật ký “%s” chưa có, bỏ qua tùy chọn logfile.\n" -#: fetchmail.c:341 +#: fetchmail.c:370 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "Tập tin nhật ký “%s” không có quyền ghi, bỏ qua.\n" -#: fetchmail.c:359 +#: fetchmail.c:388 #, c-format msgid "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "cả hai tùy chọn syslog và logfile đều được đặt, bỏ qua syslog, và ghi nhật ký vào %s" -#: fetchmail.c:447 +#: fetchmail.c:479 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Đang lấy các tùy chọn trên dòng lệnh%s%s\n" -#: fetchmail.c:448 +#: fetchmail.c:480 msgid " and " msgstr " và " -#: fetchmail.c:453 +#: fetchmail.c:485 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Chưa thiết lập trình phục vụ thư nào — có lẽ còn thiếu %s ?\n" -#: fetchmail.c:474 +#: fetchmail.c:506 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: chưa chỉ định trình phục vụ thư.\n" -#: fetchmail.c:486 +#: fetchmail.c:518 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: không có thẻ hiện fetchmail khác đang chạy\n" -#: fetchmail.c:492 +#: fetchmail.c:524 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: gặp lỗi khi buộc kết thúc của fetchmail %s tại %ld nên hủy bỏ.\n" -#: fetchmail.c:493 fetchmail.c:502 +#: fetchmail.c:525 fetchmail.c:534 msgid "background" msgstr "nền" -#: fetchmail.c:493 fetchmail.c:502 +#: fetchmail.c:525 fetchmail.c:534 msgid "foreground" msgstr "tiền cảnh" -#: fetchmail.c:501 +#: fetchmail.c:533 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: fetchmail %s tại %ld bị buộc kết thúc.\n" -#: fetchmail.c:524 +#: fetchmail.c:556 msgid "fetchmail: can't check mail while another fetchmail to same host is running.\n" msgstr "fetchmail: không thể kiểm tra có thư mới trong khi một thể hiện fetchmail khác đang chạy tới cùng một máy.\n" -#: fetchmail.c:530 +#: fetchmail.c:562 #, c-format msgid "fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n" msgstr "fetchmail: không thể thăm dò các máy đã chỉ định khi có thể hiện fetchmail khác chạy tại %ld\n" -#: fetchmail.c:537 +#: fetchmail.c:569 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: một thể hiện fetchmail cảnh gần khác đang chạy tại %ld.\n" -#: fetchmail.c:547 +#: fetchmail.c:579 msgid "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "fetchmail: không thể chấp nhận tùy chọn trong khi một thể hiện fetchmail nền đang chạy.\n" -#: fetchmail.c:559 +#: fetchmail.c:591 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: thực hiện fetchmail chạy trên nền hệ thống tại %ld đã được kích hoạt.\n" -#: fetchmail.c:571 +#: fetchmail.c:603 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "fetchmail: bản sao cũ cùng cấp tại %ld đã kết thúc một cách khó hiểu.\n" -#: fetchmail.c:586 +#: fetchmail.c:618 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: không tìm thấy mật khẩu cho %s@%s.\n" -#: fetchmail.c:590 +#: fetchmail.c:622 #, c-format msgid "Enter password for %s@%s: " msgstr "Hãy gõ mật khẩu cho %s@%s: " -#: fetchmail.c:632 +#: fetchmail.c:664 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "fetchmail: không thể tháo bỏ vào nền nên hủy bỏ.\n" -#: fetchmail.c:636 +#: fetchmail.c:668 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "đang khởi chạy dịch vụ chạy nền fetchmail %s\n" -#: fetchmail.c:652 fetchmail.c:654 +#: fetchmail.c:684 fetchmail.c:686 #, c-format msgid "could not open %s to append logs to\n" msgstr "không thể mở %s vào đó cần phụ thêm các sổ theo dõi\n" -#: fetchmail.c:673 +#: fetchmail.c:705 msgid "--check mode enabled, not fetching mail\n" msgstr "--check mode (chế độ kiểm tra) được bật thì không lấy thư\n" -#: fetchmail.c:695 +#: fetchmail.c:727 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "không thể kiểm tra giờ %s (lỗi %d)\n" -#: fetchmail.c:700 +#: fetchmail.c:732 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "đang khởi chạy lại fetchmail (%s đã được thay đổi)\n" -#: fetchmail.c:704 +#: fetchmail.c:736 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "việc cố thực hiện lại có thể thất bại vì thư mục chưa được phục hồi\n" -#: fetchmail.c:730 +#: fetchmail.c:762 msgid "attempt to re-exec fetchmail failed\n" msgstr "việc cố thực hiện lại fetchmail đã thất bại\n" -#: fetchmail.c:760 +#: fetchmail.c:792 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "việc thăm dò %s bị bỏ qua (xác thực đã thất bại hoặc quá giờ quá nhiều lần)\n" -#: fetchmail.c:772 +#: fetchmail.c:804 #, c-format msgid "interval not reached, not querying %s\n" msgstr "chưa tới khoảng nên không truy vấn %s\n" -#: fetchmail.c:810 +#: fetchmail.c:842 msgid "Query status=0 (SUCCESS)\n" msgstr "Trạng thái truy vấn=0 (THÀNH CÔNG)\n" -#: fetchmail.c:812 +#: fetchmail.c:844 msgid "Query status=1 (NOMAIL)\n" msgstr "Trạng thái truy vấn=1 (KHÔNG THƯ)\n" -#: fetchmail.c:814 +#: fetchmail.c:846 msgid "Query status=2 (SOCKET)\n" msgstr "Trạng thái truy vấn=2 (Ổ CẮM)\n" -#: fetchmail.c:816 +#: fetchmail.c:848 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Trạng thái truy vấn=3 (XÁC THỰC THẤT BẠI)\n" -#: fetchmail.c:818 +#: fetchmail.c:850 msgid "Query status=4 (PROTOCOL)\n" msgstr "Trạng thái truy vấn=4 (GIAO THỨC)\n" -#: fetchmail.c:820 +#: fetchmail.c:852 msgid "Query status=5 (SYNTAX)\n" msgstr "Trạng thái truy vấn=5 (CÚ PHÁP)\n" -#: fetchmail.c:822 +#: fetchmail.c:854 msgid "Query status=6 (IOERR)\n" msgstr "Trạng thái truy vấn=6 (LỖI NHẬP/XUẤT)\n" -#: fetchmail.c:824 +#: fetchmail.c:856 msgid "Query status=7 (ERROR)\n" msgstr "Trạng thái truy vấn=7 (LỖI)\n" -#: fetchmail.c:826 +#: fetchmail.c:858 msgid "Query status=8 (EXCLUDE)\n" msgstr "Trạng thái truy vấn=8 (LOẠI TRỪ)\n" -#: fetchmail.c:828 +#: fetchmail.c:860 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Trạng thái truy vấn=9 (KHOÁ BẬN)\n" -#: fetchmail.c:830 +#: fetchmail.c:862 msgid "Query status=10 (SMTP)\n" msgstr "Trạng thái truy vấn=10 (SMTP)\n" -#: fetchmail.c:832 +#: fetchmail.c:864 msgid "Query status=11 (DNS)\n" msgstr "Trạng thái truy vấn=11 (DNS)\n" -#: fetchmail.c:834 +#: fetchmail.c:866 msgid "Query status=12 (BSMTP)\n" msgstr "Trạng thái truy vấn=12 (BSMTP)\n" -#: fetchmail.c:836 +#: fetchmail.c:868 msgid "Query status=13 (MAXFETCH)\n" msgstr "Trạng thái truy vấn=13 (LẤY TỐI ĐA)\n" -#: fetchmail.c:838 +#: fetchmail.c:870 #, c-format msgid "Query status=%d\n" msgstr "Trạng thái truy vấn=%d\n" -#: fetchmail.c:880 +#: fetchmail.c:912 msgid "All connections are wedged. Exiting.\n" msgstr "Mọi sự kết nối là bế tắc nên thoát.\n" -#: fetchmail.c:888 +#: fetchmail.c:920 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "đang ngủ tại %s trong %d giây\n" -#: fetchmail.c:912 +#: fetchmail.c:944 #, c-format msgid "awakened by %s\n" msgstr "bị %s kích hoạt lại\n" -#: fetchmail.c:915 +#: fetchmail.c:947 #, c-format msgid "awakened by signal %d\n" msgstr "bị tín hiệu %d kích hoạt lại\n" -#: fetchmail.c:923 +#: fetchmail.c:955 #, c-format msgid "awakened at %s\n" msgstr "được kích hoạt lại tại %s\n" -#: fetchmail.c:928 +#: fetchmail.c:960 #, c-format msgid "normal termination, status %d\n" msgstr "đã kết thúc chuẩn, trạng thái %d\n" -#: fetchmail.c:1089 +#: fetchmail.c:1124 msgid "couldn't time-check the run-control file\n" msgstr "không thể kiểm tra giờ của tập tin điều kiển việc chạy (run-control)\n" -#: fetchmail.c:1123 +#: fetchmail.c:1158 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Cảnh báo: gặp tên máy %s nhiều lần trong tập tin cấu hình\n" -#: fetchmail.c:1162 -msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n" -msgstr "fetchmail: Lỗi: gặp nhiều mục ghi “mặc định” trong tập tin cấu hình.\n" +#: fetchmail.c:1197 +msgid "fetchmail: Error: multiple \"defaults\" records in config file, or \"defaults\" is not the first record.\n" +msgstr "fetchmail: Lỗi: gặp nhiều bản ghi trong tập tin cấu hình. hoặc là “mặc định” không phải là bản ghi đầu tiên.\n" -#: fetchmail.c:1284 +#: fetchmail.c:1327 msgid "SSL support is not compiled in.\n" msgstr "Chưa biên dịch để được hỗ trợ SSL.\n" -#: fetchmail.c:1291 +#: fetchmail.c:1334 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "Được cấu hình là có hỗ trợ KERBEROS v4, nhưng chưa được biên dịch vào.\n" -#: fetchmail.c:1297 +#: fetchmail.c:1340 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "Được cấu hình là có hỗ trợ KERBEROS v5, nhưng chưa được biên dịch vào.\n" -#: fetchmail.c:1303 +#: fetchmail.c:1346 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Được cấu hình là hỗ trợ GSSAPI, nhưng chưa được biên dịch vào.\n" -#: fetchmail.c:1333 +#: fetchmail.c:1376 #, c-format msgid "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" msgstr "fetchmail: cảnh báo: không có DNS sẵn sàng để kiểm tra việc lấy đa thả từ %s\n" -#: fetchmail.c:1344 +#: fetchmail.c:1387 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "cảnh báo: việc đa thả cho %s cần thiết tùy chọn bao bọc (envelope).\n" -#: fetchmail.c:1345 +#: fetchmail.c:1388 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "cảnh báo: đừng yêu cầu sự hỗ trợ nếu mọi thư được phát cho postmaster (giám đốc sở bưu điện).\n" -#: fetchmail.c:1362 +#: fetchmail.c:1405 #, c-format msgid "fetchmail: %s configuration invalid, specify positive port number for service or port\n" msgstr "fetchmail: cấu hình %s không hợp lệ; hãy chỉ định số hiệu cổng dương cho dịch vụ hay cổng\n" -#: fetchmail.c:1369 +#: fetchmail.c:1412 #, c-format msgid "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" msgstr "fetchmail: cấu hình %s không hợp lệ; RPOP yêu cầu một cổng đặc quyền\n" -#: fetchmail.c:1387 +#: fetchmail.c:1418 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 995/service pop3s.\n" +msgstr "CẢNH BÁO: cấu hình %s không hợp lệ; bạn thường chỉ cần --ssl cho cổng 995/service pop3s.\n" + +#: fetchmail.c:1419 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 995/service pop3s for --ssl.\n" +msgstr "CẢNH BÁO: cấu hình %s không hợp lệ; bạn thường chỉ cần cổng 995/service pop3s cho --ssl.\n" + +#: fetchmail.c:1422 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need --ssl for port 993/service imaps.\n" +msgstr "CẢNH BÁO: cấu hình %s không hợp lệ; bạn thường chỉ cần --ssl cho cổng 993/service imaps.\n" + +#: fetchmail.c:1423 +#, c-format +msgid "WARNING: %s configuration invalid, you normally need port 993/service imaps for --ssl.\n" +msgstr "CẢNH BÁO: cấu hình %s không hợp lệ; bạn thường chỉ cần cổng 993/service imaps cho --ssl.\n" + +#: fetchmail.c:1441 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "cấu hình %s không hợp lệ; LMTP không thể sử dụng cổng SMTP mặc định\n" -#: fetchmail.c:1401 +#: fetchmail.c:1455 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "Việc chạy fetchall (lấy hết) cùng với tiếp tục trong chế độ trình nền là trường hợp xấu.\n" -#: fetchmail.c:1411 +#: fetchmail.c:1465 msgid "fetchmail: Error: idle mode does not work for multiple folders or accounts!\n" msgstr "fetchmail: Lỗi: chế độ idle không làm việc với nhiều thư mục hay tài khoản!\n" -#: fetchmail.c:1435 +#: fetchmail.c:1489 #, c-format msgid "terminated with signal %d\n" msgstr "đã kết thúc với tín hiệu %d\n" -#: fetchmail.c:1508 +#: fetchmail.c:1562 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã khởi chạy\n" -#: fetchmail.c:1533 +#: fetchmail.c:1587 msgid "POP2 support is not configured.\n" msgstr "Chưa cấu hình để hỗ trợ POP2.\n" -#: fetchmail.c:1545 +#: fetchmail.c:1599 msgid "POP3 support is not configured.\n" msgstr "Chưa cấu hình để hỗ trợ POP3.\n" -#: fetchmail.c:1555 +#: fetchmail.c:1609 msgid "IMAP support is not configured.\n" msgstr "Chưa cấu hình để hỗ trợ IMAP.\n" -#: fetchmail.c:1561 +#: fetchmail.c:1615 msgid "ETRN support is not configured.\n" msgstr "Chưa cấu hình để hỗ trợ ETRN.\n" -#: fetchmail.c:1569 +#: fetchmail.c:1623 msgid "ODMR support is not configured.\n" msgstr "Chưa cấu hình để hỗ trợ ODMR.\n" -#: fetchmail.c:1576 +#: fetchmail.c:1630 msgid "unsupported protocol selected.\n" msgstr "giao thức đã chọn không được hỗ trợ.\n" -#: fetchmail.c:1587 +#: fetchmail.c:1641 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s truy vấn %s (giao thức %s) tại %s: việc thăm dò đã chạy xong\n" -#: fetchmail.c:1612 +#: fetchmail.c:1666 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Khoảng thăm dò là %d giây\n" -#: fetchmail.c:1614 +#: fetchmail.c:1668 #, c-format msgid "Logfile is %s\n" msgstr "Tập tin nhật ký là %s\n" -#: fetchmail.c:1616 +#: fetchmail.c:1670 #, c-format msgid "Idfile is %s\n" msgstr "Tập tin Id là %s\n" -#: fetchmail.c:1619 +#: fetchmail.c:1673 msgid "Progress messages will be logged via syslog\n" msgstr "Các thông điệp tiến hành sẽ được ghi lưu bằng syslog (bản ghi hệ thống)\n" -#: fetchmail.c:1622 +#: fetchmail.c:1676 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail sẽ giả trang và sẽ không tạo ra dòng đầu “Received” (đã nhận)\n" -#: fetchmail.c:1624 +#: fetchmail.c:1678 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "Fetchmail sẽ hiển thị các chấm tiến hành ngay cả trong tập tin ghi lưu.\n" -#: fetchmail.c:1626 +#: fetchmail.c:1680 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "Fetchmail sẽ chuyển tiếp các thư đa thả có địa chỉ sai tới %s\n" -#: fetchmail.c:1630 +#: fetchmail.c:1684 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail sẽ chỉ các thư lỗi tới postmaster (giám đốc sở bưu điện).\n" -#: fetchmail.c:1632 +#: fetchmail.c:1686 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail sẽ chỉ các thư lỗi tới người gởi.\n" -#: fetchmail.c:1635 +#: fetchmail.c:1689 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "Fetchmail sẽ thấy lỗi bền bỉ như lâu dài (thì bỏ thư).\n" -#: fetchmail.c:1637 +#: fetchmail.c:1691 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "Fetchmail sẽ thấy lỗi bền bỉ như tạm thời (giữ thư).\n" -#: fetchmail.c:1644 +#: fetchmail.c:1698 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Tùy chọn về việc lấy từ %s@%s:\n" -#: fetchmail.c:1648 +#: fetchmail.c:1702 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Thư sẽ được lấy bằng %s\n" -#: fetchmail.c:1651 +#: fetchmail.c:1705 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" msgstr[0] " Máy phục vụ này sẽ được thăm dò mỗi %d khoảng.\n" -#: fetchmail.c:1655 +#: fetchmail.c:1709 #, c-format msgid " True name of server is %s.\n" msgstr " Tên đúng của máy phục vụ là %s.\n" -#: fetchmail.c:1658 +#: fetchmail.c:1712 msgid " This host will not be queried when no host is specified.\n" msgstr " Máy này sẽ không được truy vấn khi chưa chỉ định máy nào.\n" -#: fetchmail.c:1659 +#: fetchmail.c:1713 msgid " This host will be queried when no host is specified.\n" msgstr " Máy này sẽ được truy vấn khi chưa chỉ định máy nào.\n" -#: fetchmail.c:1663 +#: fetchmail.c:1717 msgid " Password will be prompted for.\n" msgstr " Sẽ nhắc với mật khẩu.\n" -#: fetchmail.c:1667 +#: fetchmail.c:1721 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " Bí mật APOP = “%s”.\n" -#: fetchmail.c:1670 +#: fetchmail.c:1724 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " ID RPOP = “%s”.\n" -#: fetchmail.c:1673 +#: fetchmail.c:1727 #, c-format msgid " Password = \"%s\".\n" msgstr " Mật khẩu = “%s”.\n" -#: fetchmail.c:1682 +#: fetchmail.c:1736 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Giao thức là KPOP cùng với sự xác thực Kerberos %s" -#: fetchmail.c:1685 +#: fetchmail.c:1739 #, c-format msgid " Protocol is %s" msgstr " Giao thức là %s" -#: fetchmail.c:1687 +#: fetchmail.c:1741 #, c-format msgid " (using service %s)" msgstr " (dùng dịch vụ %s)" -#: fetchmail.c:1689 +#: fetchmail.c:1743 msgid " (using default port)" msgstr " (dùng cổng mặc định)" -#: fetchmail.c:1691 +#: fetchmail.c:1745 msgid " (forcing UIDL use)" msgstr " (buộc dùng UIDL)" -#: fetchmail.c:1697 +#: fetchmail.c:1751 msgid " All available authentication methods will be tried.\n" msgstr " Sẽ cố dùng mọi phương pháp xác thực sẵn sàng.\n" -#: fetchmail.c:1700 +#: fetchmail.c:1754 msgid " Password authentication will be forced.\n" msgstr " Sẽ buộc xác thực bằng mật khẩu.\n" -#: fetchmail.c:1703 +#: fetchmail.c:1757 msgid " MSN authentication will be forced.\n" msgstr " Sẽ buộc xác thực MSN.\n" -#: fetchmail.c:1706 +#: fetchmail.c:1760 msgid " NTLM authentication will be forced.\n" msgstr " Sẽ buộc xác thực kiểu NTLM.\n" -#: fetchmail.c:1709 +#: fetchmail.c:1763 msgid " OTP authentication will be forced.\n" msgstr " Sẽ buộc xác thực OTP.\n" -#: fetchmail.c:1712 +#: fetchmail.c:1766 msgid " CRAM-MD5 authentication will be forced.\n" msgstr " xác thực CRAM-MD5 sẽ được ép buộc.\n" -#: fetchmail.c:1715 +#: fetchmail.c:1769 msgid " GSSAPI authentication will be forced.\n" msgstr " Sẽ buộc xác thực GSSAPI.\n" -#: fetchmail.c:1718 +#: fetchmail.c:1772 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Sẽ buộc xác thực Kerberos V4.\n" -#: fetchmail.c:1721 +#: fetchmail.c:1775 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Sẽ buộc xác thực Kerberos V5.\n" -#: fetchmail.c:1724 +#: fetchmail.c:1778 msgid " End-to-end encryption assumed.\n" msgstr " Giả sử sự mật mã cuối đến cuối.\n" -#: fetchmail.c:1728 +#: fetchmail.c:1782 #, c-format msgid " Mail service principal is: %s\n" msgstr " Điều chính trong dịch vụ thư là: %s\n" -#: fetchmail.c:1731 +#: fetchmail.c:1785 msgid " SSL encrypted sessions enabled.\n" msgstr " Phiên chạy được mã hóa bằng SSL đã được bật.\n" -#: fetchmail.c:1733 +#: fetchmail.c:1787 #, c-format msgid " SSL protocol: %s.\n" msgstr " Giao thức SSL: %s\n" -#: fetchmail.c:1735 +#: fetchmail.c:1789 msgid " SSL server certificate checking enabled.\n" msgstr " Khả năng kiểm tra chứng nhận máy phục vụ SSL đã được bật.\n" -#: fetchmail.c:1737 +#: fetchmail.c:1791 msgid " SSL server certificate checking disabled.\n" msgstr " Khả năng kiểm tra chứng nhận máy phục vụ SSL đã bị tắt.\n" -#: fetchmail.c:1740 +#: fetchmail.c:1793 +#, c-format +msgid " SSL default trusted certificate file: %s\n" +msgstr " Tập tin chứng nhận đáng tin SSL mặc định: %s\n" + +#: fetchmail.c:1795 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " Tập tin chứng nhận đáng tin SSL: %s\n" -#: fetchmail.c:1742 +#: fetchmail.c:1796 +#, c-format +msgid " SSL default trusted certificate directory: %s\n" +msgstr " Thư mục chứng nhận đáng tin SSL mặc định: %s\n" + +#: fetchmail.c:1798 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Thư mục chứng nhận đáng tin SSL: %s\n" -#: fetchmail.c:1744 +#: fetchmail.c:1800 #, c-format msgid " SSL server CommonName: %s\n" msgstr " CommonName máy phục vụ SSL: %s\n" -#: fetchmail.c:1746 +#: fetchmail.c:1802 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Vân tay khoá SSL (so sánh với khoá máy phục vụ): %s\n" -#: fetchmail.c:1749 +#: fetchmail.c:1805 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Thời hạn không đáp ứng của máy phục vụ là %d giây" -#: fetchmail.c:1751 +#: fetchmail.c:1807 msgid " (default).\n" msgstr " (mặc định).\n" -#: fetchmail.c:1758 +#: fetchmail.c:1814 msgid " Default mailbox selected.\n" msgstr " Hộp thư mặc định đã được chọn.\n" -#: fetchmail.c:1763 +#: fetchmail.c:1819 msgid " Selected mailboxes are:" msgstr " Các hộp thư đã chọn là:" -#: fetchmail.c:1769 +#: fetchmail.c:1825 msgid " All messages will be retrieved (--all on).\n" msgstr " Mọi thư sẽ được lấy (“--all” bật).\n" -#: fetchmail.c:1770 +#: fetchmail.c:1826 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Chỉ thư mới sẽ được lấy (“--all” tắt).\n" -#: fetchmail.c:1772 +#: fetchmail.c:1828 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Các thư đã lấy sẽ được giữ lại trên máy phục vụ (“--keep” bật).\n" -#: fetchmail.c:1773 +#: fetchmail.c:1829 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Các thư đã lấy sẽ không được giữ lại trên máy phục vụ (“--keep” tắt).\n" -#: fetchmail.c:1775 +#: fetchmail.c:1831 msgid " Old messages will be flushed before message retrieval (--flush on).\n" msgstr " Các thư cũ sẽ được xoá sạch trước khi lấy thư (“--flush” bật).\n" -#: fetchmail.c:1776 +#: fetchmail.c:1832 msgid " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr " Các thư cũ sẽ không được xoá sạch trước khi lấy thư (“--flush” tắt).\n" -#: fetchmail.c:1778 +#: fetchmail.c:1834 msgid " Oversized messages will be flushed before message retrieval (--limitflush on).\n" msgstr " Các thư quá lớn sẽ được xoá sạch trước khi lấy thư (“--limitflush” bật).\n" -#: fetchmail.c:1779 +#: fetchmail.c:1835 msgid " Oversized messages will not be flushed before message retrieval (--limitflush off).\n" msgstr " Các thư quá lớn sẽ không được xoá sạch trước khi lấy thư (“--limitflush” tắt).\n" -#: fetchmail.c:1781 +#: fetchmail.c:1837 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được bật (“--norewrite” tắt).\n" -#: fetchmail.c:1782 +#: fetchmail.c:1838 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Khả năng ghi lại các địa chỉ cục bộ với máy phục vụ đã được tắt (“--norewrite” bật).\n" -#: fetchmail.c:1784 +#: fetchmail.c:1840 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Khả năng gỡ bỏ mọi ký tự về đầu dòng đã được bật (“stripcr” bật).\n" -#: fetchmail.c:1785 +#: fetchmail.c:1841 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Khả năng gỡ bỏ mọi ký tự về đầu dòng đã được tắt (“stripcr” tắt).\n" -#: fetchmail.c:1787 +#: fetchmail.c:1843 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Việc buộc ký tự về đầu dòng đã được bật (“forcecr” bật).\n" -#: fetchmail.c:1788 +#: fetchmail.c:1844 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Việc buộc ký tự về đầu dòng đã được tắt (“forcecr” tắt).\n" -#: fetchmail.c:1790 +#: fetchmail.c:1846 msgid " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr " Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truyền) đã được tắt (“pass8bits” bật).\n" -#: fetchmail.c:1791 +#: fetchmail.c:1847 msgid " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr " Khả năng giải thích Content-Transfer-Encoding (cách mã hoá nội dung được truyền) đã được bật (“pass8bits” tắt).\n" -#: fetchmail.c:1793 +#: fetchmail.c:1849 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " Khả năng giải mã MIME đã được bật (“mimedecode” bật).\n" -#: fetchmail.c:1794 +#: fetchmail.c:1850 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " Khả năng giải mã MIME đã được tắt (“mimedecode” tắt).\n" -#: fetchmail.c:1796 +#: fetchmail.c:1852 msgid " Idle after poll is enabled (idle on).\n" msgstr " Nghỉ sau khi việc thăm dò được bật (nghỉ bật).\n" -#: fetchmail.c:1797 +#: fetchmail.c:1853 msgid " Idle after poll is disabled (idle off).\n" msgstr " Nghỉ sau khi việc thăm dò được tắt (nghỉ tắt).\n" -#: fetchmail.c:1799 +#: fetchmail.c:1855 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Các dòng Trạng thái sẽ được hủy (“dropstatus” bật).\n" -#: fetchmail.c:1800 +#: fetchmail.c:1856 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Các dòng Status (Trạng thái) sẽ được giữ (“dropstatus” tắt).\n" -#: fetchmail.c:1802 +#: fetchmail.c:1858 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Các dòng Delivered-To (Được phát cho) sẽ được hủy (“dropdelivered” bật).\n" -#: fetchmail.c:1803 +#: fetchmail.c:1859 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Các dòng Delivered-To (Được phát cho) sẽ được giữ (“dropdelivered” tắt).\n" -#: fetchmail.c:1807 +#: fetchmail.c:1863 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Giới hạn kích cỡ thư là %d octet (“--limit” %d).\n" -#: fetchmail.c:1810 +#: fetchmail.c:1866 msgid " No message size limit (--limit 0).\n" msgstr " Không có giới hạn kích cỡ thư (“--limit” 0).\n" -#: fetchmail.c:1812 +#: fetchmail.c:1868 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr " Khoảng cảnh báo kích cỡ thư là %d giây (“--warnings” %d).\n" -#: fetchmail.c:1815 +#: fetchmail.c:1871 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Cảnh báo về kích cỡ mỗi lần thăm dò (“--warnings” 0).\n" -#: fetchmail.c:1818 +#: fetchmail.c:1874 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Giới hạn thư đã nhận là %d (“--fetchlimit” %d).\n" -#: fetchmail.c:1821 +#: fetchmail.c:1877 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Không có giới hạn thư đã nhận (“--fetchlimit” 0).\n" -#: fetchmail.c:1823 +#: fetchmail.c:1879 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr " Giới hạn kích cỡ thư lấy là %d (“--fetchsizelimit” %d).\n" -#: fetchmail.c:1826 +#: fetchmail.c:1882 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr " Không có giới hạn kích cỡ thư lấy (“(--fetchsizelimit” 0).\n" -#: fetchmail.c:1830 +#: fetchmail.c:1886 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr " Tìm kiếm nhị phân các UID trong khi mỗi việc thăm dò (“--fastuidl” 1).\n" -#: fetchmail.c:1832 +#: fetchmail.c:1888 #, c-format msgid " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" msgstr " Tìm kiếm nhị phân các UID trong khi %d trên %d việc thăm dò (“--fastuidl” %d).\n" -#: fetchmail.c:1835 +#: fetchmail.c:1891 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr " Tìm kiếm tuyến các UID trong khi mỗi việc thăm dò (“--fastuidl” 0).\n" -#: fetchmail.c:1837 +#: fetchmail.c:1893 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Giới hạn bó thư SMTP là %d.\n" -#: fetchmail.c:1839 +#: fetchmail.c:1895 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Không có giới hạn bó thư SMTP (“--batchlimit” 0).\n" -#: fetchmail.c:1843 +#: fetchmail.c:1899 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr " Khoảng xoá bỏ giữa hai lần xoá hẳn đã được buộc thành %d (“--expunge” %d).\n" -#: fetchmail.c:1845 +#: fetchmail.c:1901 msgid " No forced expunges (--expunge 0).\n" msgstr " Không có việc xoá hẳn đã buộc) (“--expunge” 0).\n" -#: fetchmail.c:1852 +#: fetchmail.c:1908 msgid " Domains for which mail will be fetched are:" msgstr " Các miền cho đó sẽ lấy thư là:" -#: fetchmail.c:1857 fetchmail.c:1877 +#: fetchmail.c:1913 fetchmail.c:1933 msgid " (default)" msgstr " (mặc định)" -#: fetchmail.c:1862 +#: fetchmail.c:1918 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Các thư sẽ được phụ thêm vào %s là BSMTP\n" -#: fetchmail.c:1864 +#: fetchmail.c:1920 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Các thư sẽ được phát bằng “%s”.\n" -#: fetchmail.c:1871 +#: fetchmail.c:1927 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Các thư sẽ được chuyển tiếp %cMTP tới:" -#: fetchmail.c:1882 +#: fetchmail.c:1938 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Phần máy của dòng MAIL FROM (thư từ) sẽ là %s\n" -#: fetchmail.c:1885 +#: fetchmail.c:1941 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr " Địa chỉ cần chèn vào dòng RCPT TO được gởi cho SMTP sẽ là %s\n" -#: fetchmail.c:1894 +#: fetchmail.c:1950 msgid " Recognized listener spam block responses are:" msgstr " Các đáp ứng chặn thư rác đã nhận diện của bộ lắng nghe là:" -#: fetchmail.c:1900 +#: fetchmail.c:1956 msgid " Spam-blocking disabled\n" msgstr " Khả năng chặn thư rác được tắt\n" -#: fetchmail.c:1903 +#: fetchmail.c:1959 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Sự kết nối đến máy phục vụ sẽ được tạo bằng “%s”.\n" -#: fetchmail.c:1906 +#: fetchmail.c:1962 msgid " No pre-connection command.\n" msgstr " Không có lệnh tiền kết nối.\n" -#: fetchmail.c:1908 +#: fetchmail.c:1964 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Sự kết nối đến máy phục vụ sẽ được đóng bằng “%s”.\n" -#: fetchmail.c:1911 +#: fetchmail.c:1967 msgid " No post-connection command.\n" msgstr " Không có lệnh hậu kết nối.\n" -#: fetchmail.c:1914 +#: fetchmail.c:1970 msgid " No localnames declared for this host.\n" msgstr " Chưa khai báo tên cục bộ (localname) cho máy này.\n" -#: fetchmail.c:1924 +#: fetchmail.c:1980 msgid " Multi-drop mode: " msgstr " Chế độ đa thả: " -#: fetchmail.c:1926 +#: fetchmail.c:1982 msgid " Single-drop mode: " msgstr " Chế độ thả đơn: " -#: fetchmail.c:1928 +#: fetchmail.c:1984 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" msgstr[0] "Chấp nhân %d tên cục bộ.\n" -#: fetchmail.c:1943 +#: fetchmail.c:1999 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " Khả năng tra tìm DNS cho địa chỉ đa thả đã được bật.\n" -#: fetchmail.c:1944 +#: fetchmail.c:2000 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " Khả năng tra tìm DNS cho địa chỉ đa thả đã được tắt.\n" -#: fetchmail.c:1948 +#: fetchmail.c:2004 msgid " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr " Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo địa chỉ IP.\n" -#: fetchmail.c:1950 +#: fetchmail.c:2006 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr " Bí danh máy phục vụ sẽ được so sánh với địa chỉ đa thả theo tên.\n" -#: fetchmail.c:1953 +#: fetchmail.c:2009 msgid " Envelope-address routing is disabled\n" msgstr " Khả năng định tuyến phong bì-địa chỉ đã được tắt\n" -#: fetchmail.c:1956 +#: fetchmail.c:2012 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Giả sử dòng đầu phong bì là: %s\n" -#: fetchmail.c:1959 +#: fetchmail.c:2015 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Số dòng đầu phong bì cần bỏ qua: %d\n" -#: fetchmail.c:1962 +#: fetchmail.c:2018 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Tiền tố %s sẽ được gỡ bỏ ra ID người dùng\n" -#: fetchmail.c:1965 +#: fetchmail.c:2021 msgid " No prefix stripping\n" msgstr " Không gỡ bỏ tiền tố\n" -#: fetchmail.c:1970 +#: fetchmail.c:2026 msgid " Predeclared mailserver aliases:" msgstr " Các bí danh trình phục vụ thư khai báo sẵn:" -#: fetchmail.c:1978 +#: fetchmail.c:2034 msgid " Local domains:" msgstr " Miền cục bộ:" -#: fetchmail.c:1988 +#: fetchmail.c:2044 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Phải kết nối qua giao diện %s.\n" -#: fetchmail.c:1990 +#: fetchmail.c:2046 msgid " No interface requirement specified.\n" msgstr " Chưa chỉ định giao diện cần thiết.\n" -#: fetchmail.c:1992 +#: fetchmail.c:2048 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Vòng lặp thăm dò sẽ theo dõi %s.\n" -#: fetchmail.c:1994 +#: fetchmail.c:2050 msgid " No monitor interface specified.\n" msgstr " Chưa chỉ định giao diện theo dõi.\n" -#: fetchmail.c:1998 +#: fetchmail.c:2054 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr " Kết nối đến máy phục vụ sẽ được thực hiện thông qua phần bổ xung %s (“--plugin” %s).\n" -#: fetchmail.c:2000 +#: fetchmail.c:2056 msgid " No plugin command specified.\n" msgstr " Chưa chỉ định lệnh bổ xung.\n" -#: fetchmail.c:2002 +#: fetchmail.c:2058 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr " Kết nối lắng nghe sẽ được thông qua phần bổ xung %s (“--plugout” %s).\n" -#: fetchmail.c:2004 +#: fetchmail.c:2060 msgid " No plugout command specified.\n" msgstr " Chưa chỉ định lệnh bổ xung.\n" -#: fetchmail.c:2011 +#: fetchmail.c:2067 msgid " No UIDs saved from this host.\n" msgstr " Không có UID được lưu từ máy này.\n" -#: fetchmail.c:2014 +#: fetchmail.c:2070 #, c-format msgid " %d UIDs saved.\n" msgstr " %d UID đã được lưu.\n" -#: fetchmail.c:2020 +#: fetchmail.c:2076 msgid " Poll trace information will be added to the Received header.\n" msgstr " Thông tin vết thăm dò sẽ được thêm vào dòng đầu “Received”.\n" -#: fetchmail.c:2022 +#: fetchmail.c:2078 msgid " No poll trace information will be added to the Received header.\n" msgstr " Không có thông tin vết thăm dò sẽ được thêm vào dòng đầu “Received” (Nhận được).\n" -#: fetchmail.c:2027 +#: fetchmail.c:2083 msgid " Messages with bad headers will be rejected.\n" msgstr " Thư nào có dòng đầu sai thì bị từ chối.\n" -#: fetchmail.c:2030 +#: fetchmail.c:2086 msgid " Messages with bad headers will be passed on.\n" msgstr " Thư nào có dòng đầu sai thì được gửi qua.\n" -#: fetchmail.c:2035 +#: fetchmail.c:2091 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Tài sản gởi qua “%s”.\n" @@ -1581,6 +1655,10 @@ msgstr " Tài sản gởi qua “%s”.\n" msgid "Cannot modify signal mask: %s" msgstr "Không thể sửa đổi mặt nạ tín hiệu: %s" +#: fm_realpath.c:35 +msgid "Your operating system neither defines PATH_MAX nor will it accept realpath(f, NULL). Aborting.\n" +msgstr "Hệ điều hành của bạn không định nghĩa PATH_MAX cũng không chấp nhận realpath(f, NULL). Nên bãi bỏ.\n" + #: getpass.c:71 msgid "ERROR: no support for getpassword() routine\n" msgstr "LỖI: không hỗ trợ thao tác getpassword() (lấy mật khẩu).\n" @@ -1682,124 +1760,157 @@ msgstr "Gặp lỗi khi phát hành thông tin xác thực\n" msgid "fetchmail: thread sleeping for %d sec.\n" msgstr "fetchmail: tuyến trình ngủ trong %d giây\n" -#: imap.c:75 +#: imap.c:91 +msgid "Protocol identified as IMAP4 rev 1\n" +msgstr "Giao thức được phát hiện là IMAP4 rev 1\n" + +#: imap.c:95 +msgid "Protocol identified as IMAP4 rev 0\n" +msgstr "Giao thức được phát hiện là IMAP4 rev 0\n" + +#: imap.c:99 +msgid "Protocol identified as IMAP2 or IMAP2BIS\n" +msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n" + +#: imap.c:111 +msgid "will idle after poll\n" +msgstr "sẽ nghỉ sau khi thăm dò\n" + +#: imap.c:138 #, c-format msgid "Received BYE response from IMAP server: %s\n" msgstr "Nhận được đáp ứng BYE (tạm biệt) từ máy phục vụ IMAP: %s\n" -#: imap.c:97 +#: imap.c:160 #, c-format msgid "bogus message count in \"%s\"!" msgstr "gặp số đếm thư giả trong “%s”!" -#: imap.c:144 +#: imap.c:207 #, c-format msgid "bogus EXPUNGE count in \"%s\"!" msgstr "gặp số đếm EXPUNGE sai trong “%s”!" -#: imap.c:355 -msgid "Protocol identified as IMAP4 rev 1\n" -msgstr "Giao thức được phát hiện là IMAP4 rev 1\n" +#: imap.c:305 +msgid "found updated capabilities list\n" +msgstr "tìm thấy danh sách các khả năng của máy chủ đã cập nhật\n" -#: imap.c:361 -msgid "Protocol identified as IMAP4 rev 0\n" -msgstr "Giao thức được phát hiện là IMAP4 rev 0\n" +#: imap.c:442 +msgid "server did not advertise SASL-IR extension but fetchmail's implementation requires it for AUTHENTICATE EXTERNAL\n" +msgstr "máy phục vụ đã không thông báo phần mở rộng SASL-IR nhưng phần thực thi của yêu cầu nó cho AUTHENTICATE EXTERNAL\n" -#: imap.c:368 -msgid "Protocol identified as IMAP2 or IMAP2BIS\n" -msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n" +#: imap.c:493 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. If your plugin is secure, you can defeat STARTTLS with --sslproto '' (see manual).\n" +msgstr "%s: cấu hình yêu cầu TLS, nhưng STARTTLS không được phép bởi vì trạng thái xác thực (PREAUTH). Bãi bỏ kết nối. Nếu trình cắm của bạn an toàn, thì bạn có thể thủ tiêu STARTTLS với --sslproto (xem hướng dẫn sử dụng).\n" -#: imap.c:385 -msgid "will idle after poll\n" -msgstr "sẽ nghỉ sau khi thăm dò\n" +#: imap.c:496 +#, c-format +msgid "%s: configuration requires TLS, but STARTTLS is not permitted because of authenticated state (PREAUTH). Aborting connection. Server permitting, try --ssl instead (see manual).\n" +msgstr "%s: cấu hình yêu cầu TLS, nhưng STARTTLS không được phép bởi vì trạng thái xác thực (PREAUTH). Bãi bỏ kết nối. Máy chủ cho phép, hãy thử --ssl để thay thế (xem hướng dẫn sử dụng).\n" -#: imap.c:476 pop3.c:474 +#: imap.c:516 pop3.c:447 #, c-format msgid "%s: upgrade to TLS succeeded.\n" msgstr "%s: việc nâng cấp lên TLS đã thành công.\n" -#: imap.c:482 pop3.c:480 +#: imap.c:541 pop3.c:458 #, c-format msgid "%s: upgrade to TLS failed.\n" msgstr "%s: việc nâng cấp lên TLS gặp lỗi.\n" -#: imap.c:487 +#: imap.c:546 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue\n" msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa gặp lỗi, nên thử tiếp tục\n" -#: imap.c:502 +#: imap.c:561 #, c-format msgid "%s: WARNING: server offered STARTTLS but sslproto '' given.\n" msgstr "%s: CẢNH BÁO: máy chủ muốn dùng STARTTLS nhưng sslproto '' đưa ra.\n" -#: imap.c:607 +#: imap.c:599 +#, c-format +msgid "%s: --auth external requested but server does not advertise it.\n" +msgstr "%s: --auth bên ngoài được yêu cầu nhưng máy phục vụ không thông báo về nó.\n" + +#: imap.c:683 msgid "Required OTP capability not compiled into fetchmail\n" msgstr "Khả năng OTP cần thiết không được biên dịch vào fetchmail\n" -#: imap.c:627 pop3.c:560 +#: imap.c:703 pop3.c:580 msgid "Required NTLM capability not compiled into fetchmail\n" msgstr "Khả năng NTLM cần thiết không được biên dịch vào fetchmail\n" -#: imap.c:691 +#: imap.c:716 +#, c-format +msgid "%s: --auth password requested but server forbids it (LOGINDISABLED).\n" +msgstr "%s: --auth mk được yêu cầu nhưng máy phục vụ ngăn cấm nó (LOGINDISABLED).\n" + +#: imap.c:745 +#, c-format +msgid "%s: we've run out of authentication methods and cannot log in.\n" +msgstr "%s: Hết cách xác thực được phép nên không thể đăng nhập.\n" + +#: imap.c:769 #, c-format msgid "mail expunge mismatch (%d actual != %d expected)\n" msgstr "không khớp được khi xoá hẳn thư (%d thật != %d ngờ)\n" -#: imap.c:818 +#: imap.c:896 #, c-format msgid "%lu is unseen\n" msgstr "%lu chưa xem\n" -#: imap.c:868 pop3.c:831 pop3.c:843 pop3.c:1088 pop3.c:1095 +#: imap.c:946 pop3.c:852 pop3.c:864 pop3.c:1109 pop3.c:1116 #, c-format msgid "%u is unseen\n" msgstr "%u chưa xem\n" -#: imap.c:903 imap.c:962 +#: imap.c:981 imap.c:1040 msgid "re-poll failed\n" msgstr "việc thăm dò lại gặp lỗi\n" -#: imap.c:911 imap.c:967 +#: imap.c:989 imap.c:1045 #, c-format msgid "%d message waiting after re-poll\n" msgid_plural "%d messages waiting after re-poll\n" msgstr[0] "%d thư đợi sau khi thăm dò lại\n" -#: imap.c:928 +#: imap.c:1006 msgid "mailbox selection failed\n" msgstr "việc chọn hộp thư gặp lỗi\n" -#: imap.c:932 +#: imap.c:1010 #, c-format msgid "%d message waiting after first poll\n" msgid_plural "%d messages waiting after first poll\n" msgstr[0] "%d thư đợi sau khi thăm dò lần thứ nhất\n" -#: imap.c:946 +#: imap.c:1024 msgid "expunge failed\n" msgstr "việc xoá hẳn gặp lỗi\n" -#: imap.c:950 +#: imap.c:1028 #, c-format msgid "%d message waiting after expunge\n" msgid_plural "%d messages waiting after expunge\n" msgstr[0] "%d thư đợi sau khi xoá hẳn\n" -#: imap.c:989 +#: imap.c:1067 msgid "search for unseen messages failed\n" msgstr "việc tìm kiếm các thư chưa xem gặp lỗi\n" -#: imap.c:994 pop3.c:852 +#: imap.c:1072 pop3.c:873 #, c-format msgid "%u is first unseen\n" msgstr "%u là thư đầu chưa xem\n" -#: imap.c:1078 +#: imap.c:1156 msgid "Warning: ignoring bogus data for message sizes returned by the server.\n" msgstr "Cảnh báo: đang bỏ qua dữ liệu giả về kích cỡ các thư bị máy phục vụ trả về.\n" -#: imap.c:1177 imap.c:1184 +#: imap.c:1255 imap.c:1262 #, c-format msgid "Incorrect FETCH response: %s.\n" msgstr "Sai đáp ứng FETCH (lấy): %s.\n" @@ -1904,23 +2015,40 @@ msgstr "không thể giải mã đáp ứng sẵn sàng BASE64\n" msgid "challenge mismatch\n" msgstr "yêu cầu không khớp\n" -#: lock.c:87 +#: lock.c:90 #, c-format msgid "fetchmail: error reading lockfile \"%s\": %s\n" msgstr "fetchmail: gặp lỗi khi đọc tập tin khoá “%s”: %s\n" -#: lock.c:98 -msgid "fetchmail: removing stale lockfile\n" -msgstr "fetchmail: đang gỡ bỏ tập tin khoá cũ...\n" +#: lock.c:101 +#, c-format +msgid "fetchmail: removing stale lockfile \"%s\"\n" +msgstr "fetchmail: đang gỡ bỏ tập tin khoá cũ \"%s\"\n" + +#: lock.c:105 +#, c-format +msgid "fetchmail: cannot unlink lockfile \"%s\" (%s), trying to write to it\n" +msgstr "fetchmail: gặp lỗi bỏ liên kết tập tin khoá “%s” (%s), đang cố ghi vào nó\n" + +#: lock.c:119 +#, c-format +msgid "fetchmail: cannot write to lockfile \"%s\" (%s), exiting\n" +msgstr "fetchmail: không thể ghi vào tập tin khoá “%s” (%s): nên thoát ra\n" -#: lock.c:122 +#: lock.c:129 #, c-format msgid "fetchmail: error opening lockfile \"%s\": %s\n" msgstr "fetchmail: gặp lỗi khi mở tập tin khoá “%s”: %s\n" -#: lock.c:169 -msgid "fetchmail: lock creation failed.\n" -msgstr "fetchmail: việc tạo khoá gặp lỗi.\n" +#: lock.c:179 +#, c-format +msgid "fetchmail: lock creation failed, pidfile \"%s\": %s\n" +msgstr "fetchmail: việc tạo khoá gặp lỗi, pidfile \"%s\": %s.\n" + +#: lock.c:190 +#, c-format +msgid "fetchmail: cannot remove or truncate pidfile \"%s\": %s\n" +msgstr "fetchmail: không thể xóa bỏ hay cắt ngắn pidfile “%s”: %s\n" #: netrc.c:220 #, c-format @@ -1978,19 +2106,19 @@ msgstr "Không rõ lỗi ODMR “%s”\n" msgid "receiving message data\n" msgstr "đang nhận dữ liệu thư\n" -#: odmr.c:245 +#: odmr.c:247 msgid "Option --keep is not supported with ODMR\n" msgstr "Không hỗ trợ tùy chọn “--keep” (giữ) với ODMR\n" -#: odmr.c:249 +#: odmr.c:251 msgid "Option --flush is not supported with ODMR\n" msgstr "Không hỗ trợ tùy chọn “--flush” (xoá sạch) với ODMR\n" -#: odmr.c:253 +#: odmr.c:255 msgid "Option --folder is not supported with ODMR\n" msgstr "Không hỗ trợ tùy chọn “--folder” (thư mục) với ODMR\n" -#: odmr.c:257 +#: odmr.c:259 msgid "Option --check is not supported with ODMR\n" msgstr "Không hỗ trợ tùy chọn “--check” (kiểm tra) với ODMR\n" @@ -2002,7 +2130,7 @@ msgstr "recv (nhận) của máy phục vụ là nghiêm trọng\n" msgid "Could not decode OTP challenge\n" msgstr "Không thể giải mã yêu cầu OTP\n" -#: opie.c:65 pop3.c:587 +#: opie.c:65 pop3.c:608 msgid "Secret pass phrase: " msgstr "Cụm từ mật khẩu bí mật: " @@ -2349,130 +2477,130 @@ msgstr "POP2 không hỗ trợ STLS. Đầu hàng.\n" msgid "POP2 only supports password authentication. Giving up.\n" msgstr "POP2 chỉ hỗ trợ xác thực mật khẩu. Cho nên đầu hàng.\n" -#: pop3.c:330 +#: pop3.c:338 msgid "Warning: \"Maillennium POP3\" found, using RETR command instead of TOP.\n" msgstr "Cảnh báo: tìm thấy “Maillennium POP3” nên dùng lệnh RETR thay cho TOP.\n" -#: pop3.c:414 -msgid "TLS is mandatory for this session, but server refused CAPA command.\n" -msgstr "Bắt buộc phải sử dụng TLS trong phiên chạy này mà trình phục vụ đã từ chối lệnh CAPA.\n" +#: pop3.c:392 +msgid "STLS is mandatory for this session, but server refused CAPA command.\n" +msgstr "Bắt buộc phải sử dụng TLS trong phiên chạy này, nhưng máy phục vụ đã từ chối lệnh CAPA.\n" -#: pop3.c:415 -msgid "The CAPA command is however necessary for TLS.\n" -msgstr "Còn lệnh CAPA cần thiết cho TLS.\n" +#: pop3.c:393 +msgid "CAPA command support is, however, necessary for STLS.\n" +msgstr "Lệnh CAPA được hỗ trợ, tuy nhiên cần thiết cho STLS.\n" -#: pop3.c:492 +#: pop3.c:470 #, c-format msgid "%s: opportunistic upgrade to TLS failed, trying to continue.\n" msgstr "%s: việc nâng cấp lên TLS một cách cơ hội chủ nghĩa gặp lỗi, nên thử tiếp tục.\n" -#: pop3.c:498 +#: pop3.c:476 #, c-format msgid "%s: WARNING: server offered STLS, but sslproto '' given.\n" msgstr "%s: CẢNH BÁO: máy chủ muốn dùng STLS, nhưng sslproto '' đưa ra.\n" -#: pop3.c:623 +#: pop3.c:644 msgid "We've run out of allowed authenticators and cannot continue.\n" msgstr "Hết các bộ xác thực được phép nên không thể tiếp tục.\n" -#: pop3.c:637 +#: pop3.c:658 msgid "Required APOP timestamp not found in greeting\n" msgstr "Không tìm thấy nhãn thời gian APOP cần thiết trong lời chào mừng\n" -#: pop3.c:646 +#: pop3.c:667 msgid "Timestamp syntax error in greeting\n" msgstr "Gặp lỗi cú pháp nhãn thời gian trong lời chào mừng\n" -#: pop3.c:662 +#: pop3.c:683 msgid "Invalid APOP timestamp.\n" msgstr "Nhãn giờ APOP không hợp lệ.\n" -#: pop3.c:686 +#: pop3.c:707 msgid "Undefined protocol request in POP3_auth\n" msgstr "Gặp yêu cầu giao thức không được chỉ định trong “POP3_auth” (xác thực)\n" -#: pop3.c:707 +#: pop3.c:728 msgid "lock busy! Is another session active?\n" msgstr "khoá bận ! Có phiên chạy khác hoạt động không?\n" -#: pop3.c:770 +#: pop3.c:791 msgid "Cannot handle UIDL response from upstream server.\n" msgstr "Không thể xử lý đáp ứng UIDL từ máy phục vụ nguồn.\n" -#: pop3.c:793 +#: pop3.c:814 msgid "Server responded with UID for wrong message.\n" msgstr "Máy phục vụ đã đáp ứng UID cho thư không đúng.\n" -#: pop3.c:822 +#: pop3.c:843 #, c-format msgid "id=%s (num=%u) was deleted, but is still present!\n" msgstr "id=%s (số=%u) đã được xoá bỏ, nhưng còn đó!\n" -#: pop3.c:934 +#: pop3.c:955 msgid "Messages inserted into list on server. Cannot handle this.\n" msgstr "Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trường hợp này.\n" -#: pop3.c:1032 +#: pop3.c:1053 msgid "protocol error\n" msgstr "lỗi giao thức\n" -#: pop3.c:1048 +#: pop3.c:1069 msgid "protocol error while fetching UIDLs\n" msgstr "gặp lỗi giao thức khi lấy các UIDL\n" -#: pop3.c:1079 +#: pop3.c:1100 #, c-format msgid "id=%s (num=%d) was deleted, but is still present!\n" msgstr "id=%s (số=%d) đã được xoá bỏ, nhưng còn có.\n" -#: pop3.c:1389 +#: pop3.c:1412 msgid "Option --folder is not supported with POP3\n" msgstr "Không hỗ trợ tùy chọn “--folder” (thư mục) với POP3\n" -#: rcfile_y.y:132 +#: rcfile_y.y:130 msgid "server option after user options" msgstr "tùy chọn máy phục vụ nằm sau các tùy chọn người dùng" -#: rcfile_y.y:175 +#: rcfile_y.y:173 msgid "SDPS not enabled." msgstr "Chưa bật SDPS." -#: rcfile_y.y:219 +#: rcfile_y.y:217 msgid "fetchmail: interface option is only supported under Linux (without IPv6) and FreeBSD\n" msgstr "fetchmail: tùy chọn giao diện chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n" -#: rcfile_y.y:227 +#: rcfile_y.y:225 msgid "fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n" msgstr "fetchmail: tùy chọn theo dõi chỉ được hỗ trợ dưới LInux (không có IPv6) và FreeBSD (kiểu UNIX)\n" -#: rcfile_y.y:341 +#: rcfile_y.y:339 msgid "SSL is not enabled" msgstr "Chưa bật SSL" -#: rcfile_y.y:393 +#: rcfile_y.y:391 msgid "end of input" msgstr "kết thúc kết nhập" -#: rcfile_y.y:431 +#: rcfile_y.y:429 #, c-format msgid "File %s must be a regular file.\n" msgstr "Tập tin %s phải là một tập tin chuẩn.\n" -#: rcfile_y.y:441 +#: rcfile_y.y:439 #, c-format msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "Không cho phép tập tin %s có quyền hạn lớn hơn “-rwx------” (0700).\n" -#: rcfile_y.y:453 +#: rcfile_y.y:451 #, c-format msgid "File %s must be owned by you.\n" msgstr "Tập tin %s phải bị bạn sở hữu.\n" -#: report.c:67 +#: report.c:69 msgid "Unknown system error" msgstr "Gặp lỗi hệ thống không rõ" -#: report.c:92 +#: report.c:94 #, c-format msgid "%s (log message incomplete)\n" msgstr "%s (thông điệp ghi lưu không hoàn toàn)\n" @@ -2814,109 +2942,114 @@ msgstr "Gặp đáp ứng không phải 503 không mong đợi với kết thúc msgid "The Fetchmail Daemon" msgstr "Dịch vụ chạy nền Fetchmail" -#: smtp.c:81 +#: smtp.c:84 msgid "ESMTP CRAM-MD5 Authentication...\n" msgstr "Xác thực CRAM-MD5 ESMTP...\n" -#: smtp.c:87 smtp.c:137 +#: smtp.c:90 smtp.c:143 msgid "Server rejected the AUTH command.\n" msgstr "Máy phục vụ đã từ chối lệnh AUTH.\n" -#: smtp.c:95 smtp.c:144 smtp.c:153 smtp.c:159 +#: smtp.c:98 smtp.c:150 smtp.c:159 smtp.c:165 msgid "Bad base64 reply from server.\n" msgstr "Nhận trả lời base64 sai từ máy phục vụ.\n" -#: smtp.c:99 +#: smtp.c:102 #, c-format msgid "Challenge decoded: %s\n" msgstr "Yêu cầu đã được giải mã: %s\n" -#: smtp.c:116 +#: smtp.c:119 msgid "ESMTP PLAIN Authentication...\n" msgstr "Xác thực PLAIN ESMTP...\n" -#: smtp.c:131 +#: smtp.c:137 msgid "ESMTP LOGIN Authentication...\n" msgstr "Xác thực LOGIN ESMTP...\n" -#: smtp.c:348 smtp.c:376 +#: smtp.c:354 smtp.c:382 msgid "smtp listener protocol error\n" msgstr "lỗi giao thực bộ lắng nghe SMTP\n" -#: socket.c:111 socket.c:140 +#: socket.c:149 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: malloc (phân chia bộ nhớ) gặp lỗi\n" -#: socket.c:172 +#: socket.c:183 +#, c-format +msgid "fetchmail: plugin for host %s service %s is empty, cannot run!\n" +msgstr "fetchmail: trình cắm cho máy chủ %s dịch vụ %s là trống rỗng, không thể chạy!\n" + +#: socket.c:188 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: socketpair (cặp ổ cắm) gặp lỗi\n" -#: socket.c:178 +#: socket.c:196 msgid "fetchmail: fork failed\n" msgstr "fetchmail: việc tạo tiến trình con gặp lỗi\n" -#: socket.c:185 +#: socket.c:203 msgid "dup2 failed\n" msgstr "việc dup2 (nhân bản) gặp lỗi\n" -#: socket.c:191 +#: socket.c:209 #, c-format msgid "running %s (host %s service %s)\n" msgstr "đang chạy %s (máy %s dịch vụ %s)\n" -#: socket.c:196 +#: socket.c:211 #, c-format msgid "execvp(%s) failed\n" msgstr "execvp(%s) gặp lỗi\n" -#: socket.c:271 +#: socket.c:286 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" -msgstr "Lỗi getaddrinfo(\"%s\",\"%s\"): %s\n" +msgstr "lỗi getaddrinfo(\"%s\",\"%s\"): %s\n" -#: socket.c:274 +#: socket.c:289 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Hãy cố thêm tùy chọn “--service” (dịch vụ) (xem cũng mục FAQ [Hỏi Đáp] R12).\n" -#: socket.c:288 socket.c:291 +#: socket.c:303 socket.c:306 #, c-format msgid "unknown (%s)" msgstr "không rõ (%s)" -#: socket.c:294 +#: socket.c:309 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Đang thử kết nối đến %s/%s..." -#: socket.c:303 +#: socket.c:318 #, c-format msgid "cannot create socket: %s\n" msgstr "không thể tạo ổ cắm: %s.\n" -#: socket.c:305 +#: socket.c:320 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "tên %d: không thể tạo nhóm ổ cắm %d kiểu %d: %s\n" -#: socket.c:323 +#: socket.c:338 msgid "connection failed.\n" msgstr "lỗi kết nối.\n" -#: socket.c:325 +#: socket.c:339 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "lỗi kết nối đến %s:%s [%s/%s]: %s.\n" -#: socket.c:326 +#: socket.c:341 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "tên %d: lỗi kết nối đến %s:%s [%s/%s]: %s.\n" -#: socket.c:332 +#: socket.c:347 msgid "connected.\n" msgstr "đã kết nối.\n" -#: socket.c:345 +#: socket.c:360 #, c-format msgid "" "Connection errors for this poll:\n" @@ -2925,229 +3058,239 @@ msgstr "" "Lỗi kết nối cho lần thăm dò này:\n" "%s" -#: socket.c:411 +#: socket.c:439 #, c-format msgid "OpenSSL reported: %s\n" msgstr "OpenSSL báo cáo: %s\n" -#: socket.c:646 +#: socket.c:675 #, c-format -msgid "SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n" -msgstr "SSL xác thực độ sau gọi ngược %d: preverify_ok == %d, lỗi = %d, %s\n" +msgid "SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n" +msgstr "Gọi ngược xác thực SSL độ sâu %d: verify_ok == %d, lỗi = %d, %s\n" -#: socket.c:652 +#: socket.c:681 msgid "Server certificate:\n" msgstr "Chứng nhận máy phục vụ:\n" -#: socket.c:657 +#: socket.c:686 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "Dãy chứng nhận, từ gốc đến đồng đẳng, bắt đầu ở độ sâu %d:\n" -#: socket.c:660 +#: socket.c:689 #, c-format msgid "Certificate at depth %d:\n" msgstr "Chứng nhận ở độ sâu %d:\n" -#: socket.c:666 +#: socket.c:695 #, c-format msgid "Issuer Organization: %s\n" msgstr "Tổ chức phát hành: %s\n" -#: socket.c:669 +#: socket.c:698 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "Cảnh báo: tên Tổ chức Phát hành quá dài (có thể bị cắt xén).\n" -#: socket.c:671 +#: socket.c:700 msgid "Unknown Organization\n" msgstr "Không biết Tổ chức\n" -#: socket.c:673 +#: socket.c:702 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Tên Chung phát hành: %s\n" -#: socket.c:676 +#: socket.c:705 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "Cảnh báo: Tên Chung nhà phát hành quá dài (có thể bị cắt xén).\n" -#: socket.c:678 +#: socket.c:707 msgid "Unknown Issuer CommonName\n" msgstr "Không biết Tên Chung nhà phát hành\n" -#: socket.c:684 +#: socket.c:713 #, c-format msgid "Subject CommonName: %s\n" msgstr "Tên Chung Chủ đề: %s\n" -#: socket.c:690 +#: socket.c:719 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Chứng nhận sai: Tên Chung Chủ đề quá dài.\n" -#: socket.c:696 +#: socket.c:725 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "Chứng nhận sai: Tên Chung Chủ đề chứa NUL (vô giá trị) nên hủy bỏ.\n" -#: socket.c:724 +#: socket.c:753 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "Tên Thay thế Chủ đề: %s\n" -#: socket.c:730 +#: socket.c:759 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "Chứng nhận sai: Tên Thay thế Chủ đề chứa NUL (vô giá trị) nên hủy bỏ.\n" -#: socket.c:747 +#: socket.c:776 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Tên Chung máy phục vụ không khớp: %s != %s\n" -#: socket.c:754 +#: socket.c:783 msgid "Server name not set, could not verify certificate!\n" msgstr "Chpa đặt tên máy phục vụ nên không thể thẩm tra chứng nhận.\n" -#: socket.c:759 +#: socket.c:788 msgid "Unknown Server CommonName\n" msgstr "Không biết Tên Chung máy phục vụ\n" -#: socket.c:761 +#: socket.c:790 msgid "Server name not specified in certificate!\n" msgstr "Không chỉ định tên máy phục vụ trong chứng nhận.\n" -#: socket.c:773 +#: socket.c:802 msgid "EVP_md5() failed!\n" msgstr "EVP_md5() gặp lỗi.\n" -#: socket.c:777 +#: socket.c:806 msgid "Out of memory!\n" msgstr "Hết bộ nhớ!\n" -#: socket.c:785 +#: socket.c:814 msgid "Digest text buffer too small!\n" msgstr "Bộ đệm digest quá nhỏ.\n" -#: socket.c:791 +#: socket.c:820 #, c-format msgid "%s key fingerprint: %s\n" msgstr "Vân tay chìa khoá %s: %s\n" -#: socket.c:795 +#: socket.c:824 #, c-format msgid "%s fingerprints match.\n" msgstr "Vân tay chìa khoá %s trùng.\n" -#: socket.c:797 +#: socket.c:826 #, c-format msgid "%s fingerprints do not match!\n" msgstr "Vân tay chìa khoá %s không trùng.\n" -#: socket.c:809 +#: socket.c:838 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Lỗi thẩm tra chứng nhận máy phục vụ: %s\n" -#: socket.c:824 +#: socket.c:853 #, c-format msgid "Broken certification chain at: %s\n" msgstr "Chuỗi chứng nhận bị ngắt giữa chừng tại: %s\n" -#: socket.c:826 +#: socket.c:855 msgid "This could mean that the server did not provide the intermediate CA's certificate(s), which is nothing fetchmail could do anything about. For details, please see the README.SSL-SERVER document that ships with fetchmail.\n" msgstr "Lỗi này bình thường xảy ra khi máy phục vụ không cung cấp chứng nhận của CA trung gian, đây là một trường hợp mà fetchmail không thể làm gì được. Để có thông tin chi tiết, xin hãy đọc tài liệu “README.SSL-SERVER” đi kèm với fetchmail.\n" -#: socket.c:836 +#: socket.c:865 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "Thiếu giấy chứng nhận neo tin cậy: %s\n" -#: socket.c:839 -msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page.\n" -msgstr "Có nghĩa là chứng nhận ký gốc không nằm ở một vị trí chứng nhận CA đáng tin, hoặc là “c_rehash” cần phải được chạy trong thư mục chứng nhận. Để biết chi tiết hơn, hãy xem thông tin về hai tuỳ chọn “--sslcertpath” và “--sslcertfile” trên trang hướng dẫn (man).\n" +#: socket.c:868 +msgid "This could mean that the root CA's signing certificate is not in the trusted CA certificate location, or that c_rehash needs to be run on the certificate directory. For details, please see the documentation of --sslcertpath and --sslcertfile in the manual page. See README.SSL for details.\n" +msgstr "Có nghĩa là chứng nhận ký gốc của CA không nằm trong một vị trí chứng nhận CA đáng tin, hoặc là “c_rehash” cần phải được chạy trong thư mục chứng nhận. Để biết chi tiết hơn, hãy xem tài liệu hai tuỳ chọn “--sslcertpath” và “--sslcertfile” trên trang hướng dẫn (man). Đọc README.SSL để biết thêm chi tiết.\n" -#: socket.c:912 socket.c:990 +#: socket.c:942 socket.c:1018 msgid "Your OpenSSL version does not support SSLv3.\n" msgstr "Phiên bản OpenSSL của bạn không hỗ trợ SSLv3.\n" -#: socket.c:930 socket.c:1008 +#: socket.c:960 socket.c:1036 msgid "Your OpenSSL version does not support TLS v1.1.\n" msgstr "Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.1.\n" -#: socket.c:941 socket.c:1019 +#: socket.c:971 socket.c:1047 msgid "Your OpenSSL version does not support TLS v1.2.\n" msgstr "Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.2.\n" -#: socket.c:952 socket.c:1030 +#: socket.c:982 socket.c:1058 msgid "Your OpenSSL version does not support TLS v1.3.\n" msgstr "Phiên bản OpenSSL của bạn không hỗ trợ TLS v1.3.\n" -#: socket.c:961 socket.c:1040 +#: socket.c:991 socket.c:1068 #, c-format msgid "Invalid SSL protocol '%s' specified, using default autoselect (auto).\n" msgstr "Chỉ định giao thức SSL không hợp lệ “%s” nên dùng mặc định là tự chọn (tự động).\n" -#: socket.c:1075 +#: socket.c:1107 #, c-format msgid "Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n" msgstr "Thư viện OpenSSL đã tải %#lx cũ hơn phần đầu %#lx, chưa rõ ràng để có thể hoạt động.\n" -#: socket.c:1080 +#: socket.c:1112 #, c-format msgid "Loaded OpenSSL library %#lx newer than headers %#lx, trying to continue.\n" msgstr "Thư viện OpenSSL đã tải %#lx mới hơn phần đầu %#lx, có thử tiếp tục.\n" -#: socket.c:1100 +#: socket.c:1132 msgid "File descriptor out of range for SSL" msgstr "Bộ mô tả tập tin ở ngoại phạm vị SSL" -#: socket.c:1121 +#: socket.c:1154 msgid "Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n" msgstr "Chú ý rằng một số bản phân phối tắt các giao thức phiên bản cũ nếu nó không còn hợp chuẩn nữa. Hãy thử dùng phiên bản mới hơn.\n" -#: socket.c:1189 +#: socket.c:1214 +#, c-format +msgid "Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n" +msgstr "Không thể tải các vị trí xác minh (tập tin=\"%s\", thư_mục=\"%s\"), lỗi %d:\n" + +#: socket.c:1249 #, c-format msgid "Warning: SSL_set_tlsext_host_name(%p, \"%s\") failed (code %#lx), trying to continue.\n" msgstr "Cảnh báo: SSL_set_tlsext_host_name(%p, \"%s\") gặp lỗi (mã %#lx), có thử tiếp tục.\n" -#: socket.c:1204 +#: socket.c:1263 +#, c-format +msgid "fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n" +msgstr "fetchmail: ổ cắm mạng %d: wolfSSL_check_domain_name(%#p, \"%s\") đã trả về %d, đang cố thử tiếp tục\n" + +#: socket.c:1279 #, c-format msgid "Warning: X509_VERIFY_PARAM_set1_host(%p, \"%s\") failed (code %#x), trying to continue.\n" msgstr "Cảnh báo: X509_VERIFY_PARAM_set1_host(%p, \"%s\") gặp lỗi (mã %#x), có thử tiếp tục.\n" -#: socket.c:1241 +#: socket.c:1332 msgid "Server shut down connection prematurely during SSL_connect().\n" msgstr "Máy chủ ngắt kết nối bất ngờ khi đang SSL_connect().\n" -#: socket.c:1244 +#: socket.c:1335 #, c-format msgid "System error during SSL_connect(): %s\n" msgstr "Hệ thống gặp lỗi trong khi SSL_connect(): %s\n" -#: socket.c:1244 +#: socket.c:1335 msgid "handshake failed at protocol or connection level." msgstr "bắt tay gặp lỗi ở mức giao thức hoặc kết nối." -#: socket.c:1264 +#: socket.c:1355 msgid "Cannot obtain current SSL/TLS cipher - no session established?\n" msgstr "Không thể lấy được kiểu mã hóa SSL/TLS hiện tại - nên không thiết lập được phiên làm việc?\n" -#: socket.c:1267 +#: socket.c:1358 #, c-format msgid "SSL/TLS: using protocol %s, cipher %s, %d/%d secret/processed bits\n" msgstr "SSL/TLS: đang dùng giao thức %s, mã hóa %s, %d/%d bí mật/xử lý bít\n" -#: socket.c:1274 +#: socket.c:1365 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Việc thẩm tra chứng nhận/vân tay bị bỏ qua vì lý do nào.\n" -#: socket.c:1291 +#: socket.c:1382 msgid "Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n" msgstr "Cảnh báo: kết nối này không bảo mật, vẫn còn tiếp tục. (Khuyên bạn sử dụng “--sslcertck” !)\n" -#: socket.c:1333 +#: socket.c:1424 msgid "Cygwin socket read retry\n" msgstr "Việc cố lại đọc ổ cắm Cygwin\n" -#: socket.c:1336 +#: socket.c:1427 msgid "Cygwin socket read retry failed!\n" msgstr "Việc cố lại đọc ổ cắm Cygwin gặp lỗi.\n" @@ -3263,64 +3406,69 @@ msgstr "Bộ đệm quá nhỏ. Đây là một lỗi trong bộ gọi của %s: #: uid.c:262 #, c-format +msgid "Open or read error while reading idfile %s: %s\n" +msgstr "Gặp lỗi mở hay đọc trong khi đọc idfile %s: %s\n" + +#: uid.c:273 +#, c-format msgid "Old UID list from %s:\n" msgstr "Danh sách UID cũ từ %s:\n" -#: uid.c:266 uid.c:275 uid.c:343 +#: uid.c:277 uid.c:286 uid.c:355 msgid " <empty>" msgstr " <trống>" -#: uid.c:273 +#: uid.c:284 msgid "Scratch list of UIDs:\n" msgstr "Danh sách linh tinh của UID:\n" -#: uid.c:357 uid.c:401 +#: uid.c:369 uid.c:413 #, c-format msgid "Merged UID list from %s:\n" msgstr "Đã hoà trộn danh sách UID từ %s:\n" -#: uid.c:360 +#: uid.c:372 #, c-format msgid "New UID list from %s:\n" msgstr "Danh sách UID mới từ %s:\n" -#: uid.c:390 +#: uid.c:402 msgid "not swapping UID lists, no UIDs seen this query\n" msgstr "không tráo đổi danh sách UID, chưa xem UID trong việc truy vấn này\n" -#: uid.c:410 +#: uid.c:422 msgid "discarding new UID list\n" msgstr "đang hủy danh sách UID mới\n" -#: uid.c:467 +#: uid.c:479 msgid "Deleting fetchids file.\n" msgstr "Đang xoá bỏ tập tin fetchids (lấy các ID).\n" -#: uid.c:470 +#: uid.c:482 #, c-format msgid "Error deleting %s: %s\n" msgstr "Gặp lỗi khi xoá bỏ %s: %s\n" -#: uid.c:477 +#: uid.c:489 msgid "Writing fetchids file.\n" msgstr "Đang ghi tập tin fetchids (lấy các ID).\n" -#: uid.c:491 uid.c:500 +#: uid.c:503 uid.c:512 #, c-format msgid "Write error on fetchids file %s: %s\n" msgstr "Lỗi ghi vào tập tin fetchids %s: %s\n" -#: uid.c:512 +#: uid.c:524 #, c-format msgid "Error writing to fetchids file %s, old file left in place.\n" msgstr "Gặp lỗi khi ghi vào tập tin fetchids (lấy các ID) %s nên để lại tập tin cũ.\n" -#: uid.c:516 +#: uid.c:528 #, c-format msgid "Cannot rename fetchids file %s to %s: %s\n" msgstr "Không thể đổi tên tập tin fetchids (lấy các ID) %s thành %s: %s\n" -#: uid.c:520 +#: uid.c:532 #, c-format msgid "Cannot open fetchids file %s for writing: %s\n" msgstr "Không thể mở tập tin fetchids (lấy các ID) %s để ghi: %s\n" @@ -171,7 +171,9 @@ static const struct method pop2 = NULL, /* how to mark a message as seen */ NULL, /* how to end mailbox processing */ pop2_logout, /* log out, we're done */ - FALSE /* no, we can't re-poll */ + FALSE, /* no, we can't re-poll */ + NULL, /* no constructor */ + NULL /* no destructor */ }; int doPOP2 (struct query *ctl) @@ -43,23 +43,29 @@ static char lastok[POPBUFSIZE+1]; #endif /* OPIE_ENABLE */ /* session variables initialized in capa_probe() or pop3_getauth() */ -flag done_capa = FALSE; -#if defined(GSSAPI) -flag has_gssapi = FALSE; -#endif /* defined(GSSAPI) */ -#if defined(KERBEROS_V4) || defined(KERBEROS_V5) -flag has_kerberos = FALSE; -#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */ +/* some of these will not be accessed depending on fetchmail's + * compile-time configuration */ +static flag done_capa = FALSE; +static flag has_gssapi = FALSE; +static flag has_kerberos = FALSE; static flag has_cram = FALSE; -#ifdef OPIE_ENABLE -flag has_otp = FALSE; -#endif /* OPIE_ENABLE */ -#ifdef NTLM_ENABLE -flag has_ntlm = FALSE; -#endif /* NTLM_ENABLE */ -#ifdef SSL_ENABLE +static flag has_otp = FALSE; +static flag has_ntlm = FALSE; static flag has_stls = FALSE; -#endif /* SSL_ENABLE */ + +static void clear_sessiondata(void) { + /* must match defaults above */ +#ifdef OPIE_ENABLE + memset(lastok, 0, sizeof(lastok)); +#endif + done_capa = FALSE; + has_gssapi = FALSE; + has_kerberos = FALSE; + has_cram = FALSE; + has_otp = FALSE; + has_ntlm = FALSE; + has_stls = FALSE; +} /* mailbox variables initialized in pop3_getrange() */ static int last; @@ -108,6 +114,20 @@ static int do_pop3_ntlm(int sock, struct query *ctl, #define DOTLINE(s) (s[0] == '.' && (s[1]=='\r'||s[1]=='\n'||s[1]=='\0')) +static int pop3_setup(struct query *ctl) +{ + (void)ctl; + clear_sessiondata(); + return PS_SUCCESS; +} + +static int pop3_cleanup(struct query *ctl) +{ + (void)ctl; + clear_sessiondata(); + return PS_SUCCESS; +} + static int pop3_ok (int sock, char *argbuf) /* parse command response */ { @@ -126,12 +146,12 @@ static int pop3_ok (int sock, char *argbuf) bufp++; if (*bufp) - *(bufp++) = '\0'; + *(bufp++) = '\0'; if (strcmp(buf,"+OK") == 0) { #ifdef OPIE_ENABLE - strcpy(lastok, bufp); + strlcpy(lastok, bufp, sizeof(lastok)); #endif /* OPIE_ENABLE */ ok = 0; } @@ -222,6 +242,7 @@ static int capa_probe(int sock) if (ok == PS_SUCCESS) { char buffer[64]; + char *cp; /* determine what authentication methods we have available */ while ((ok = gen_recv(sock, buffer, sizeof(buffer))) == 0) @@ -229,6 +250,8 @@ static int capa_probe(int sock) if (DOTLINE(buffer)) break; + for (cp = buffer; *cp; cp++) *cp = toupper((unsigned char)*cp); + #ifdef SSL_ENABLE if (strstr(buffer, "STLS")) has_stls = TRUE; @@ -286,21 +309,6 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) char *commonname; #endif /* SSL_ENABLE */ - done_capa = FALSE; -#if defined(GSSAPI) - has_gssapi = FALSE; -#endif /* defined(GSSAPI) */ -#if defined(KERBEROS_V4) || defined(KERBEROS_V5) - has_kerberos = FALSE; -#endif /* defined(KERBEROS_V4) || defined(KERBEROS_V5) */ - has_cram = FALSE; -#ifdef OPIE_ENABLE - has_otp = FALSE; -#endif /* OPIE_ENABLE */ -#ifdef SSL_ENABLE - has_stls = FALSE; -#endif /* SSL_ENABLE */ - /* Set this up before authentication quits early. */ set_peek_capable(ctl); @@ -332,9 +340,6 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) } peek_capable = 0; } - if (ctl->server.authenticate == A_SSH) { - return PS_SUCCESS; - } #ifdef SDPS_ENABLE /* @@ -348,33 +353,6 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) switch (ctl->server.protocol) { case P_POP3: -#ifdef RPA_ENABLE - /* XXX FIXME: AUTH probing (RFC1734) should become global */ - /* CompuServe POP3 Servers as of 990730 want AUTH first for RPA */ - if (strstr(ctl->remotename, "@compuserve.com")) - { - /* AUTH command should return a list of available mechanisms */ - if (gen_transact(sock, "AUTH") == 0) - { - char buffer[10]; - flag has_rpa = FALSE; - - while ((ok = gen_recv(sock, buffer, sizeof(buffer))) == 0) - { - if (DOTLINE(buffer)) - break; - if (strncasecmp(buffer, "rpa", 3) == 0) - has_rpa = TRUE; - } - if (has_rpa && !POP3_auth_rpa(ctl->remotename, - ctl->password, sock)) - return(PS_SUCCESS); - } - - return(PS_AUTHFAIL); - } -#endif /* RPA_ENABLE */ - /* * CAPA command may return a list including available * authentication mechanisms and STLS capability. @@ -411,8 +389,8 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) #ifdef SSL_ENABLE if (must_starttls(ctl)) { /* fail with mandatory STLS without repoll */ - report(stderr, GT_("TLS is mandatory for this session, but server refused CAPA command.\n")); - report(stderr, GT_("The CAPA command is however necessary for TLS.\n")); + report(stderr, GT_("STLS is mandatory for this session, but server refused CAPA command.\n")); + report(stderr, GT_("CAPA command support is, however, necessary for STLS.\n")); return ok; } else if (maybe_starttls(ctl)) { /* defeat opportunistic STLS */ @@ -464,15 +442,15 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) * guarantee a secure capability re-probe. */ set_timeout(0); - done_capa = FALSE; - ok = capa_probe(sock); - if (ok != PS_SUCCESS) { - return ok; - } if (outlevel >= O_VERBOSE) { report(stdout, GT_("%s: upgrade to TLS succeeded.\n"), commonname); } + clear_sessiondata(); + ok = capa_probe(sock); + if (ok != PS_SUCCESS) { + return ok; + } } else if (must_starttls(ctl)) { /* Config required TLS but we couldn't guarantee it, so we must * stop. */ @@ -500,6 +478,48 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) } /* maybe_starttls() */ #endif /* SSL_ENABLE */ + if (ctl->server.authenticate == A_SSH) { + return PS_SUCCESS; + } + +#ifdef RPA_ENABLE + /* XXX FIXME: AUTH probing (RFC1734) should become global */ + /* CompuServe POP3 Servers as of 990730 want AUTH first for RPA */ + if (strstr(ctl->remotename, "@compuserve.com") + && ctl->server.authenticate == A_ANY) + { + /* AUTH command should return a list of available mechanisms. */ + /* 2021 update: it is unclear which software still supports RPA these days. + This behavior (AUTH without a method argument, to query) + is not sanctioned by RFC-1734 but was/is apparently + supported by Compuserve and Microsoft for their NTLM: + https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-pop3/cb6829e1-d6f4-447b-9092-2671a257563c + */ + if (gen_transact(sock, "AUTH") == 0) + { + char buffer[10]; + flag has_rpa = FALSE; + int err; + + while ((err = gen_recv(sock, buffer, sizeof(buffer))) == 0) + { + if (DOTLINE(buffer)) + break; + if (strncasecmp(buffer, "rpa", 3) == 0) + has_rpa = TRUE; + } + if (err) { + return err; + } + if (has_rpa && !POP3_auth_rpa(ctl->remotename, + ctl->password, sock)) + return PS_SUCCESS; + } + + return PS_AUTHFAIL; + } +#endif /* RPA_ENABLE */ + /* * OK, we have an authentication type now. */ @@ -558,6 +578,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) { report(stderr, GT_("Required NTLM capability not compiled into fetchmail\n")); + return PS_AUTHFAIL; } #endif @@ -691,7 +712,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) /* this is for servers which claim to support TLS, but actually * don't! */ if (connection_may_have_tls_errors - && (ok == PS_SOCKET || ok == PS_PROTOCOL)) + && (ok == PS_SOCKET || ok == PS_PROTOCOL)) { xfree(ctl->sslproto); ctl->sslproto = xstrdup(""); @@ -1379,6 +1400,8 @@ static const struct method pop3 = NULL, /* no action at end of mailbox */ pop3_logout, /* log out, we're done */ FALSE, /* no, we can't re-poll */ + pop3_setup, /* setup method */ + pop3_cleanup /* cleanup method */ }; int doPOP3 (struct query *ctl) @@ -461,8 +461,6 @@ int prc_parse_file (const char *pathname, const flag securecheck) prc_errflag = 0; querylist = hosttail = (struct query *)NULL; - (void)yytoknum; /* work around compiler warning */ - errno = 0; /* Check that the file is secure */ @@ -268,7 +268,7 @@ report_build (FILE *errfp, message, va_alist) rep_ensuresize(n + 1); VA_START(args, message); - n = report_vbuild(message, args); + (void)report_vbuild(message, args); va_end(args); #else { @@ -286,10 +286,11 @@ report_build (FILE *errfp, message, va_alist) n = snprintf (partial_message + partial_message_size_used, partial_message_size - partial_message_size_used, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif if (n > 0) partial_message_size_used += n; +#endif + if (unbuffered && partial_message_size_used != 0) { partial_message_size_used = 0; @@ -332,7 +333,7 @@ report_complete (FILE *errfp, message, va_alist) rep_ensuresize(n + 1); VA_START(args, message); - n = report_vbuild(message, args); + (void)report_vbuild(message, args); va_end(args); #else report_build(errfp, message, a1, a2, a3, a4, a5, a6, a7, a8); @@ -1420,7 +1420,7 @@ int close_sink(struct query *ctl, struct msgblk *msg, flag forward) { report(stderr, GT_("SMTP listener refused delivery\n")); smtp_rset(ctl); /* stay on the safe side */ - return(TRUE); + return !run.softbounce; } } @@ -2,7 +2,7 @@ * socket.c -- socket library functions * * Copyright 1998 - 2004 by Eric S. Raymond. - * Copyright 2004 - 2020 by Matthias Andree. + * Copyright 2004 - 2023 by Matthias Andree. * Contributions by Alexander Bluhm, Earl Chew, John Beck. * For license terms, see the file COPYING in this directory. @@ -82,7 +82,20 @@ extern int h_errno; #endif /* ndef h_errno */ #ifdef HAVE_SOCKETPAIR -static char *const *parse_plugin(const char *plugin, const char *host, const char *service) +static void free_plugindata(char **argvec) +{ + if (argvec) { + xfree(*argvec); + xfree(argvec); + } +} + +/** parse plugin and interpolate %h and %p with single-quoted host and service. + * Returns a malloc()ed pointer to a NULL-terminated vector of pointers, of + * which the first is also malloc()ed and the 2nd and later ones (if present) + * are pointers into the same memory region - these serve as input for the + * argument vector of execvp() in handle_plugin. */ +static char **parse_plugin(const char *plugin, const char *host, const char *service) { char **argvec; const char *c, *p; @@ -106,12 +119,7 @@ static char *const *parse_plugin(const char *plugin, const char *host, const cha /* we need to discount 2 bytes for each placeholder */ plugin_copy_len = plugin_len + (host_len - 2) * host_count + (service_len - 2) * service_count; - plugin_copy = (char *)malloc(plugin_copy_len + 1); - if (!plugin_copy) - { - report(stderr, GT_("fetchmail: malloc failed\n")); - return NULL; - } + plugin_copy = (char *)xmalloc(plugin_copy_len + 1); while (plugin_offset < plugin_len && plugin_copy_offset < plugin_copy_len) { if ((plugin[plugin_offset] == '%') && (plugin[plugin_offset + 1] == 'h')) @@ -142,6 +150,7 @@ static char *const *parse_plugin(const char *plugin, const char *host, const cha return NULL; } memset(argvec, 0, vecsiz); + argvec[0] = plugin_copy; /* make sure we can free() it in every case */ for (p = cp = plugin_copy, i = 0; *cp; cp++) { if ((!isspace((unsigned char)*cp)) && (cp == p ? 1 : isspace((unsigned char)*p))) { argvec[i] = cp; @@ -161,21 +170,29 @@ static int handle_plugin(const char *host, /* get a socket mediated through a given external command */ { int fds[2]; - char *const *argvec; + char **argvec; /* * The author of this code, Felix von Leitner <felix@convergence.de>, says: * he chose socketpair() instead of pipe() because socketpair creates * bidirectional sockets while allegedly some pipe() implementations don't. */ + argvec = parse_plugin(plugin,host,service); + if (!argvec || !*argvec[0]) { + free_plugindata(argvec); + report(stderr, GT_("fetchmail: plugin for host %s service %s is empty, cannot run!\n"), host, service); + return -1; + } if (socketpair(AF_UNIX,SOCK_STREAM,0,fds)) { report(stderr, GT_("fetchmail: socketpair failed\n")); + free_plugindata(argvec); return -1; } switch (fork()) { case -1: /* error */ + free_plugindata(argvec); report(stderr, GT_("fetchmail: fork failed\n")); return -1; case 0: /* child */ @@ -190,15 +207,12 @@ static int handle_plugin(const char *host, (void) close(fds[0]); if (outlevel >= O_VERBOSE) report(stderr, GT_("running %s (host %s service %s)\n"), plugin, host, service); - argvec = parse_plugin(plugin,host,service); - if (argvec == NULL) - _exit(EXIT_FAILURE); execvp(*argvec, argvec); report(stderr, GT_("execvp(%s) failed\n"), *argvec); _exit(EXIT_FAILURE); break; default: /* parent */ - /* NOP */ + free_plugindata(argvec); break; } /* fds[0] is the child's end; close it for proper EOF detection */ @@ -386,31 +400,55 @@ va_dcl { #define OPENSSL_NO_DEPRECATED 23 #endif #include "tls-aux.h" -#include <openssl/ssl.h> #include <openssl/err.h> #include <openssl/pem.h> #include <openssl/x509v3.h> #include <openssl/rand.h> -#define fm_MIN_OPENSSL_VER 0x1000200fL - -#ifdef LIBRESSL_VERSION_NUMBER -#pragma message "WARNING - LibreSSL is unsupported. Use at your own risk." -#endif - -#if OPENSSL_VERSION_NUMBER < 0x1010100fL -#pragma message "WARNING - OpenSSL SHOULD be at least version 1.1.1." +#ifdef LIBRESSL_VERSION_NUMBER +# ifdef __OpenBSD__ +# pragma message "WARNING - Linking against LibreSSL, which is not a supported configuration." +# else +# error "FAILED - LibreSSL cannot be used legally, for lack of GPL clause 2b exception, see COPYING." +# endif #endif -#if OPENSSL_VERSION_NUMBER < fm_MIN_OPENSSL_VER -#error Your OpenSSL version must be at least 1.0.2 release. Older OpenSSL versions are unsupported. -#else +#ifdef USING_WOLFSSL +# if LIBWOLFSSL_VERSION_HEX < 0x05006002L +# error "FAILED - wolfSSL MUST be at least version 5.6.2. You have " LIBWOLFSSL_VERSION_STRING "." +# endif +# if LIBWOLFSSL_VERSION_HEX < 0x05006006L +# pragma message "WARNING - wolfSSL SHOULD be at least version 5.6.6. You have " LIBWOLFSSL_VERSION_STRING "." +# endif +#else /* !USING_WOLFSSL */ +#define fm_MIN_OPENSSL_VER 0x1000215fL /* 1.0.2u */ +# if OPENSSL_VERSION_NUMBER < 0x1010115fL +# pragma message "WARNING - OpenSSL 1.m.nx SHOULD be at least release version 1.1.1u, using " OPENSSL_VERSION_TEXT "." +# endif /* 0xMNN00PPSL */ +/* do not warn about OpenSSL 3.2.0, the 3.2.1 fix is of low priority */ +# if OPENSSL_VERSION_NUMBER >= 0x30100000L && OPENSSL_VERSION_NUMBER < 0x30200000L +# if OPENSSL_VERSION_NUMBER < 0x30100040L +# pragma message "WARNING - OpenSSL 3.1.n SHOULD be at least release version 3.1.4, using " OPENSSL_VERSION_TEXT "." +# endif +# endif /* 0xMNN00PPSL */ +# if OPENSSL_VERSION_NUMBER >= 0x30000000L && OPENSSL_VERSION_NUMBER < 0x30100000L +# if OPENSSL_VERSION_NUMBER < 0x30000090L +# pragma message "WARNING - OpenSSL 3.0.n SHOULD be at least release version 3.0.9, using " OPENSSL_VERSION_TEXT "." +# endif +# endif /* 0xMNN00PPSL */ +# if OPENSSL_VERSION_NUMBER < 0x30000000L +# pragma message "WARNING - OpenSSL before 3.0.0 is end-of-life and unsupported, using " OPENSSL_VERSION_TEXT "." +# endif +# if OPENSSL_VERSION_NUMBER < fm_MIN_OPENSSL_VER +# error Your OpenSSL version MUST be at least 1.0.2u release. Older OpenSSL versions are unsupported. +# else /* OpenSSL too old */ /* #define __fm_ossl_ver(x) #x #define _fm_ossl_ver(x) __fm_ossl_ver(x) #pragma message "Building with OpenSSL headers version " _fm_ossl_ver(OPENSSL_VERSION_NUMBER) ", " OPENSSL_VERSION_TEXT */ -#endif +# endif /* OpenSSL too old */ +#endif /* USING_WOLFSSL */ static void report_SSL_errors(FILE *stream) { @@ -483,7 +521,11 @@ int SockRead(int sock, char *buf, int len) */ #ifdef SSL_ENABLE if( NULL != ( ssl = SSLGetContext( sock ) ) ) { + int e; /* Hack alert! */ + /* XXX FIXME: once we deprecate OpenSSL before 1.1.1, we can + * use SSL_peek_ex() and SSL_read_ex() and simplify this code + * quite a bit */ /* OK... SSL_peek works a little different from MSG_PEEK Problem is that SSL_peek can return 0 if there is no data currently available. If, on the other @@ -495,15 +537,21 @@ int SockRead(int sock, char *buf, int len) loop. This should continue to work even if they later change the behavior of SSL_peek to "fix" this problem... :-( */ - if ((n = SSL_peek(ssl, bp, len)) < 0) { - (void)SSL_get_error(ssl, n); - return(-1); - } - if( 0 == n ) { + if ((n = SSL_peek(ssl, bp, len)) <= 0) { /* SSL_peek says no data... Does he mean no data or did the connection blow up? If we got an error then bail! */ - if (0 != SSL_get_error(ssl, n)) { + e = SSL_get_error(ssl, n); + if (SSL_ERROR_NONE != e +#ifdef USING_WOLFSSL + /* wolfSSL 5.0.0 may return SSL_ERROR_WANT_READ when + * receiving HANDSHAKE instead of app data on SSL_peek + * https://github.com/wolfSSL/wolfssl/issues/4593 */ + && SSL_ERROR_WANT_READ != e +#endif + ) + { + ERR_print_errors_fp(stderr); return -1; } /* We didn't get an error so read at least one @@ -519,8 +567,10 @@ int SockRead(int sock, char *buf, int len) * we must call SSL_get_error to figure if there was * an error or just a "no data" condition */ if ((n = SSL_read(ssl, bp, n)) <= 0) { - if ((n = SSL_get_error(ssl, n))) { - return(-1); + e = SSL_get_error(ssl, n); + if (SSL_ERROR_NONE != e) { + ERR_print_errors_fp(stderr); + return -1; } } /* Check for case where our single character turned out to @@ -570,20 +620,13 @@ int SockPeek(int sock) #ifdef SSL_ENABLE if( NULL != ( ssl = SSLGetContext( sock ) ) ) { n = SSL_peek(ssl, &ch, 1); - if (n < 0) { - (void)SSL_get_error(ssl, n); - return -1; - } - if( 0 == n ) { - /* This code really needs to implement a "hold back" - * to simulate a functioning SSL_peek()... sigh... - * Has to be coordinated with the read code above. - * Next on the list todo... */ - + if (n <= 0) { /* SSL_peek says 0... Does that mean no data or did the connection blow up? If we got an error then bail! */ - if(0 != SSL_get_error(ssl, n)) { + int e = SSL_get_error(ssl, n); + if (SSL_ERROR_NONE != e) { + ERR_print_errors_fp(stderr); return -1; } @@ -628,10 +671,10 @@ SSL *SSLGetContext( int sock ) return _ssl_context[sock]; } -/* ok_return (preverify_ok) is 1 if this stage of certificate verification +/* ok_return is 1 if this stage of certificate verification passed, or 0 if it failed. This callback lets us display informative errors, and perform additional validation (e.g. CN matches) */ -static int SSL_verify_callback(int ok_return, X509_STORE_CTX *ctx, int strict) +static int SSL_verify_callback(int ok_return, X509_STORE_CTX *ctx, const int strict) { #define SSLverbose (((outlevel) >= O_DEBUG) || ((outlevel) >= O_VERBOSE && (depth) == 0)) char buf[257]; @@ -653,7 +696,7 @@ static int SSL_verify_callback(int ok_return, X509_STORE_CTX *ctx, int strict) if (outlevel >= O_DEBUG) { if (SSLverbose) - report(stdout, GT_("SSL verify callback depth %d: preverify_ok == %d, err = %d, %s\n"), + report(stdout, GT_("SSL verify callback depth %d: verify_ok == %d, err = %d, %s\n"), depth, ok_return, err, X509_verify_cert_error_string(err)); } @@ -908,7 +951,7 @@ static const char *SSLCertGetCN(const char *mycert, } #if !defined(OSSL110_API) -/* ===== implementation for OpenSSL 1.0.X and LibreSSL ===== */ +/* ===== implementation for OpenSSL 1.0.X ===== */ static int OSSL10X_proto_version_logic(int sock, const char **myproto, int *avoid_ssl_versions) { if (!*myproto) { @@ -1048,8 +1091,6 @@ static int OSSL110_proto_version_logic(int sock, const char **myproto, report(stderr, GT_("Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"), *myproto); - report(stderr, "fetchmail internal error in OSSL110_proto_version_logic\n"); - abort(); } return 0; } @@ -1067,7 +1108,7 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck struct stat randstat; int i; int avoid_ssl_versions = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; - long sslopts = SSL_OP_ALL | SSL_OP_SINGLE_DH_USE; + long sslopts = SSL_OP_ALL; int ssle_connect = 0; long ver; @@ -1078,6 +1119,20 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck #endif ver = OpenSSL_version_num(); /* version switch through tls-aux.h */ +#ifdef USING_WOLFSSL + { char *tmp; + if (NULL != (tmp = getenv("FETCHMAIL_WOLFSSL_DEBUG"))) { + if (*tmp) wolfSSL_Debugging_ON(); + } + } + { + int wver = wolfSSL_lib_version_hex(); + if (wver < LIBWOLFSSL_VERSION_HEX) { + report(stderr, GT_("Loaded wolfSSL library %#lx older than headers %#lx, refusing to work.\n"), (long)wver, (long)(LIBWOLFSSL_VERSION_HEX)); + } + } +#endif + if (ver < OPENSSL_VERSION_NUMBER) { report(stderr, GT_("Loaded OpenSSL library %#lx older than headers %#lx, refusing to work.\n"), (long)ver, (long)(OPENSSL_VERSION_NUMBER)); return -1; @@ -1124,9 +1179,11 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck if(_ctx[sock] == NULL) { unsigned long ec = ERR_peek_last_error(); ERR_print_errors_fp(stderr); +#ifdef SSL_R_NULL_SSL_METHOD_PASSED /* wolfSSL does not define this error */ if (ERR_GET_REASON(ec) == SSL_R_NULL_SSL_METHOD_PASSED) { report(stderr, GT_("Note that some distributions disable older protocol versions in weird non-standard ways. Try a newer protocol version.\n")); } +#endif return(-1); } @@ -1136,7 +1193,9 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck sslopts &= ~ SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; } - SSL_CTX_set_options(_ctx[sock], sslopts | avoid_ssl_versions); + (void)SSL_CTX_set_options(_ctx[sock], sslopts | avoid_ssl_versions); + + (void)SSL_CTX_set_mode(_ctx[sock], SSL_MODE_AUTO_RETRY); if (certck) { SSL_CTX_set_verify(_ctx[sock], SSL_VERIFY_PEER, SSL_ck_verify_callback); @@ -1151,17 +1210,43 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck { char *tmp; int want_default_cacerts = 0; + int r = 1; + const char *l1 = 0, *l2 = 0; /* Load user locations if any is given */ - if (certpath || cacertfile) - SSL_CTX_load_verify_locations(_ctx[sock], + if (certpath || cacertfile) { + l1 = cacertfile; + l2 = certpath; + r = SSL_CTX_load_verify_locations(_ctx[sock], cacertfile, certpath); - else + if (1 != r) goto no_verify_load; + } else { want_default_cacerts = 1; + } tmp = getenv("FETCHMAIL_INCLUDE_DEFAULT_X509_CA_CERTS"); if (want_default_cacerts || (tmp && tmp[0])) { - SSL_CTX_set_default_verify_paths(_ctx[sock]); +#ifdef USING_WOLFSSL + /* wolfSSL 5.0.0 does not implement + * SSL_CTX_set_default_verify_paths(). Use something + * else: */ + const char *tmp = WOLFSSL_TRUST_FILE; + l1 = tmp; l2=NULL; + if (*tmp) + r = SSL_CTX_load_verify_locations(_ctx[sock], + tmp, NULL); +#else + r = SSL_CTX_set_default_verify_paths(_ctx[sock]); + if (1 != r) goto no_verify_load; +#endif + } + + if (1 != r) { +no_verify_load: + report(stderr, GT_("Cannot load verify locations (file=\"%s\", dir=\"%s\"), error %d:\n"), + l1?l1:"(null)", l2?l2:"(null)", r); + ERR_print_errors_fp(stderr); + return -1; } } @@ -1198,7 +1283,22 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck } } - /* OpenSSL >= 1.0.2: set host name for verification */ +#ifdef USING_WOLFSSL + { + /* workaround for WolfSSL 5.0.0 compatibility issue, + * which leaves errors in the X509 ctx passed to the + * SSL_verify_callback() in a preverify_ok==1 case, + * where OpenSSL will not return an error. + * https://github.com/wolfSSL/wolfssl/issues/4592 */ + int r = wolfSSL_check_domain_name(_ssl_context[sock], servercname); + if (WOLFSSL_SUCCESS != r) { + report(stderr, GT_("fetchmail: sock %d: wolfSSL_check_domain_name(%#p, \"%s\") returned %d, trying to continue\n"), + sock, _ssl_context[sock], servercname, r); + } + } +#else + /* set host name for verification, only available since OpenSSL 1.0.2 + * */ /* XXX FIXME: do we need to change the function's signature and pass the akalist to * permit the other hostnames through SSL? */ /* https://wiki.openssl.org/index.php/Hostname_validation */ @@ -1212,7 +1312,23 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck (void *)_ssl_context[sock], servercname, r); ERR_print_errors_fp(stderr); } + + /* OpenSSL 1.x.y: 0xMNNFFPPSL: major minor fix patch status + * OpenSSL 3.0.z: 0xMNN00PPSL: synthesized */ + /* 0xMNNFFPPsL 0xMNNFFPPsL */ +#if (OPENSSL_VERSION_NUMBER & 0xfffff000L) == 0x10002000L +#pragma message "enabling OpenSSL 1.0.2 X509_V_FLAG_TRUSTED_FIRST flag setter" + /* OpenSSL 1.0.2 and 1.0.2 only: + * work around Let's Encrypt Cross-Signing Certificate Expiry, + * https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/ + * Workaround #2 */ + X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_TRUSTED_FIRST); +#endif + + /* param is a pointer to internal OpenSSL data, must not be freed, + * and just goes out of scope */ } +#endif if( mycert || mykey ) { diff --git a/test-build-debian.sh b/test-build-debian.sh new file mode 100755 index 00000000..56a65af3 --- /dev/null +++ b/test-build-debian.sh @@ -0,0 +1,10 @@ +podman run --rm -it debian:testing sh -c ' + apt update -y && + apt upgrade -y && + apt install --no-install-recommends build-essential autoconf automake autopoint gettext libssl-dev m4 bison flex git ca-certificates pkg-config -y && + git clone https://gitlab.com/fetchmail/fetchmail.git && + cd fetchmail && + autoreconf -svif && + ./configure -C && + make -sj20 check && + ./fetchmail -V' diff --git a/test-build-fedora.sh b/test-build-fedora.sh new file mode 100755 index 00000000..ecb5263a --- /dev/null +++ b/test-build-fedora.sh @@ -0,0 +1,10 @@ +#!/bin/sh +exec podman run --rm -it fedora:rawhide sh -c ' + dnf upgrade -y --refresh && + dnf install automake bison flex gcc gettext-devel git openssl-devel -y && + git clone https://gitlab.com/fetchmail/fetchmail.git && + cd fetchmail && + autoreconf -svif && + ./configure -C && + make -sj20 check && + ./fetchmail -V' @@ -4,6 +4,7 @@ #ifdef SSL_ENABLE #include <stdlib.h> #include <string.h> +#include "tls-aux.h" #include <openssl/x509.h> /** return a constant copy of the default SSL certificate path, i. e. @@ -1,25 +1,37 @@ #ifndef TLS_AUX_H #define TLS_AUX_H 1 +#undef LIBWOLFSSL_VERSION_HEX + #include "config.h" #include "fetchmail.h" - #ifdef SSL_ENABLE -#include <openssl/opensslv.h> -# if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x1010000fL -# undef OSSL110_API -# else -# define OSSL110_API 1 -# endif -# if OPENSSL_VERSION_NUMBER < 0x1010000fL -# define OpenSSL_version(t) SSLeay_version((t)) -# define OpenSSL_version_num() SSLeay() -# define OPENSSL_VERSION (SSLEAY_VERSION) -# define OPENSSL_DIR (SSLEAY_DIR) -# define OPENSSL_ENGINES_DIR (-1) +# ifdef HAVE_WOLFSSL_OPTIONS_H +# include <wolfssl/options.h> # endif + +# include <openssl/ssl.h> + +# undef USING_WOLFSSL +# ifdef LIBWOLFSSL_VERSION_HEX +# define USING_WOLFSSL 1 +# define OSSL110_API 1 +# else +# if OPENSSL_VERSION_NUMBER < 0x1010000fL +# undef OSSL110_API +# else +# define OSSL110_API 1 +# endif +# if OPENSSL_VERSION_NUMBER < 0x1010000fL +# define OpenSSL_version(t) SSLeay_version((t)) +# define OpenSSL_version_num() SSLeay() +# define OPENSSL_VERSION (SSLEAY_VERSION) +# define OPENSSL_DIR (SSLEAY_DIR) +# define OPENSSL_ENGINES_DIR (-1) +# endif +# endif /* LIBWOLFSSL_VERSION_STRING */ #endif /* SSL_ENABLE */ #endif /* TLS_AUX_H */ diff --git a/website/.htaccess b/website/.htaccess new file mode 100644 index 00000000..413d6e1e --- /dev/null +++ b/website/.htaccess @@ -0,0 +1 @@ +AddCharset UTF-8 .txt diff --git a/website/fetchmail-SA-2021-01.txt b/website/fetchmail-SA-2021-01.txt index 5f2563be..edf55708 100644..120000 --- a/website/fetchmail-SA-2021-01.txt +++ b/website/fetchmail-SA-2021-01.txt @@ -1,119 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -fetchmail-SA-2021-01: DoS or information disclosure logging long messages - -Topics: fetchmail denial of service or information disclosure when logging long messages - -Author: Matthias Andree -Version: 1.1 -Announced: 2021-07-28 -Type: missing variable initialization can cause read from bad memory - locations -Impact: fetchmail logs random information, or segfaults and aborts, - stalling inbound mail -Danger: low -Acknowledgment: Christian Herdtweck, Intra2net AG, Tübingen, Germany - for analysis and report and a patch suggestion - -CVE Name: CVE-2021-36386 -URL: https://www.fetchmail.info/fetchmail-SA-2021-01.txt -Project URL: https://www.fetchmail.info/ - -Affects: - fetchmail releases up to and including 6.4.19 - -Not affected: - fetchmail releases 6.4.20 and newer - -Corrected in: c546c829 Git commit hash - - 2021-07-28 fetchmail 6.4.20 release tarball - - -0. Release history -================== - -2021-07-07 initial report to maintainer -2021-07-28 1.0 release -2021-07-28 1.1 update Git commit hash with correction - - -1. Background -============= - -fetchmail is a software package to retrieve mail from remote POP3, IMAP, -ETRN or ODMR servers and forward it to local SMTP, LMTP servers or -message delivery agents. fetchmail supports SSL and TLS security layers -through the OpenSSL library, if enabled at compile time and if also -enabled at run time, in both SSL/TLS-wrapped mode on dedicated ports as -well as in-band-negotiated "STARTTLS" and "STLS" modes through the -regular protocol ports. - - -2. Problem description and Impact -================================= - -Fetchmail has long had support to assemble log/error messages that are -generated piecemeal, and takes care to reallocate the output buffer as needed. -In the reallocation case, i. e. when long log messages are assembled that can -stem from very long headers, and on systems that have a varargs.h/stdarg.h -interface (all modern systems), fetchmail's code would fail to reinitialize -the va_list argument to vsnprintf. - -The exact effects depend on the verbose mode (how many -v are given) of -fetchmail, computer architecture, compiler, operating system and -configuration. On some systems, the code just works without ill effects, some -systems log a garbage message (potentially disclosing sensitive information), -some systems log literally "(null)", some systems trigger SIGSEGV (signal -#11), which crashes fetchmail, causing a denial of service on fetchmail's end. - - -3. Solution -=========== - -Install fetchmail 6.4.20 or newer. - -The fetchmail source code is available from -<https://sourceforge.net/projects/fetchmail/files/>. - -Distributors are encouraged to review the NEWS file and move forward to -6.4.20, rather than backport individual security fixes, because doing so -routinely misses other fixes crucial to fetchmail's proper operation, -for which no security announcements are issued, or documentation, -or translation updates. - -Fetchmail 6.4.X releases have been made with a focus on unchanged user and -program interfaces so as to avoid disruptions when upgrading from 6.3.Z or -6.4.X to 6.4.Y with Y > X. Care was taken to not change the interface -incompatibly. - - -A. Copyright, License and Non-Warranty -====================================== - -(C) Copyright 2021 by Matthias Andree, <matthias.andree@gmx.de>. -Some rights reserved. - -fetchmail-SA-2021-01 © 2021 by Matthias Andree is licensed under CC -BY-ND 4.0. To view a copy of this license, visit -http://creativecommons.org/licenses/by-nd/4.0/ - -THIS WORK IS PROVIDED FREE OF CHARGE AND WITHOUT ANY WARRANTIES. -Use the information herein at your own risk. - -END of fetchmail-SA-2021-01 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEE3EplW9mTzUhx+oIQ5BKxVu/zhVoFAmEBxbQACgkQ5BKxVu/z -hVoESA/+JKX4wAG0v1+4+7yG8SsmWfWORnUzKLTVcjAu5osdQ1DamFgDEMqSd/ft -JswQdzMJfGSngKG+VgXPEu3l9jHyVWDwTWM7aKIo6VsRtJ6yBmBBQBQF5TSUARr7 -55Wm+GqNOQj4fp4xDvcswiMAbgpDZhtJEtWZhv96Uz6F+gjZ6qdufAYQlrPcH8AK -ByJTs9Alc9LqOgP0touXz+CMkJFjizsFBiB5YzrHjVlryojvVmrF858nt1AgeUFC -h8mWd9Y7qsJ+7OeF2BN5qre10LlJnEO3rZPz5OWcOYKCCuGka9nne9LjaouKLnY9 -8Yn4CqRMNhyj+5fXzNiXohJmjn2vZ/dgd/0mwNo5zyeC4z6J9KQuDS+/StGAyvLR -fHppSu8SNctw0EiEephZcDGd/rI6MzpfTwP7b1fy/TD3YcezMPNRRTTH2AxidbXh -/rSMVKWJ0tAucoEX3pR+6CVY8Eb0VZ09+iSqCmWe6Wsb9KN71K60FGVpnEq8BNWc -aRqk0JXugPxuiJIXQLIP8AnxMW/XJoJNDs37OkfFhNkkhRDjT7pmu7l+9eIIYiTI -cxpECB53pd6xlJb08KixDa2hu2UqjmfRe0KA//HaiUJy7RyGkxRbZ1GnMJHrCHCR -/YYyOJbe6yTMnWVI6Auva8WJNuHSZvdvKasAenDAHZy96mUj8FE= -=1rxO ------END PGP SIGNATURE----- +../fetchmail-SA-2021-01.txt
\ No newline at end of file diff --git a/website/fetchmail-SA-2021-02.txt b/website/fetchmail-SA-2021-02.txt new file mode 120000 index 00000000..fa6f0b4f --- /dev/null +++ b/website/fetchmail-SA-2021-02.txt @@ -0,0 +1 @@ +../fetchmail-SA-2021-02.txt
\ No newline at end of file diff --git a/website/host-scripts/upload-website.sh b/website/host-scripts/upload-website.sh index aeee1755..56dad034 100755 --- a/website/host-scripts/upload-website.sh +++ b/website/host-scripts/upload-website.sh @@ -29,7 +29,7 @@ rsync \ --copy-links --times --checksum --verbose \ --exclude host-scripts \ --exclude .git --exclude '*~' --exclude '#*#' \ - * \ + * .htaccess \ "${SOURCEFORGE_LOGIN},fetchmail@web.sourceforge.net:htdocs/" & pids="$pids $!" diff --git a/website/index.html b/website/index.html index 8474b8f7..91c02eda 100644 --- a/website/index.html +++ b/website/index.html @@ -1,5 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> <link rel="stylesheet" href="sitestyle.css" type="text/css"> @@ -15,7 +14,7 @@ <table width="100%" cellpadding="0" summary="Canned page header"> <tr> <td>Fetchmail</td> -<td align="right"><!-- update date -->2021-08-03</td> +<td align="right"><!-- update date -->2024-01-31</td> </tr> </table> </div> @@ -43,21 +42,47 @@ <h1>Fetchmail</h1> <div style="background-color:#c0ffc0;color:#000000;"> - <h1>NEWS: FETCHMAIL 6.5.0-beta4 release</h1> - <p>On 2021-08-03, <a + <h1>NEWS: FETCHMAIL 6.4.38 RELEASE</h1> + <p>On 2024-01-31, <a + href="https://sourceforge.net/projects/fetchmail/files/branch_6.4/">fetchmail + 6.4.38 has been released.</a> It updates translations, and tightens OpenSSL/wolfSSL version requirements in order to track their security fixes and deprecations. + <p>OpenSSL 3.0.9, 3.1.4, 3.2.0 and wolfSSL 5.6.2 (or newer on the respective + compatible branches) remain supported.</p> + <p>6.4.37 updated translations.</p> + <p>6.4.36 updated translations.</p> + <p>6.4.35 updated translations and bumped SSL/TLS library version requirements.</p> + <p>6.4.34 fixed a critical softbounce bug (courtesy of Horváth Zsolt) and updates translations. + <p>6.4.33 updated translations.</p> + <p>6.4.32 updated translations and finds both rst2html5 with and without .py suffix when rebuilding the distribution.</p> + <p>6.4.31 updated the configure script for --with-ssl properly identifying the right + OpenSSL on a system with multiple OpenSSL versions installed, and updates the + manual page and its HTML conversion process, and adds some error checking to the .netrc parser.</p> + <p>6.4.30 updated the Romanian translation (courtesy of Remus-Gabriel + Chelu).</p> + <p>6.4.29 updated the Vietnamese translation (courtesy of Trần Ngọc Quân).</p> + <p>6.4.28 updated the Spanish translation (courtesy of Cristian Othón Martínez + Vera) and added a fix to the manual page (courtesy of Jeremy Petch).</p> + <p>6.4.26 added a wolfSSL compatibility workaround and updated the Serbian translation (courtesy of Miroslav Nikolić).</p> + <p>6.4.25 (released 2021-12-10) updated translations and the manual page and several other documentation + files, adds preliminary wolfSSL 5.0 support on systems that provide a C99 + compiler, fixed up a specific fix for a compatibility issue + with the end-of-life OpenSSL 1.0.2 around the expiry of the DST Root CA X3 + certificate which impairs connectivity to Let's-Encrypt-certified sites. + Supported OpenSSL versions 1.1.1 and newer are unaffected.</p> + <p>Note that you should use a supported OpenSSL version, currently 1.1.1 or + 3.0. wolfSSL 5.0 support is currently considered experimental.</p> + <p>Also note that OpenSSL's licensing changed between 1.1.1 and 3.0.0, the + latter now uses the Apache License 2.0. See the file COPYING for + details.</p> + <h1>NEWS: FETCHMAIL 6.5.0.beta9 release</h1> + <p>On 2023-01-06, <a href="https://sourceforge.net/projects/fetchmail/files/branch_6.5/">fetchmail - 6.5.0.beta4 has been released (click this link to download, or to see recent changes).</a> - It fixes the security bug CVE-2021-36386 also fixed in 6.4.20.</p> - <h1>NEWS: FETCHMAIL 6.4.20 RELEASE</h1> - <p>On 2021-07-28, <a - href="https://sourceforge.net/projects/fetchmail/files/branch_6.4/">fetchmail - 6.4.20 has been released (click this link to download, or to see recent changes).</a> - It fixes security bug CVE-2021-36386, see the link under <a href="#security-alerts">SECURITY ALERTS</a> below for details. - </p> - <p>Note that you should use OpenSSL 1.1.1 or newer to compile. - OpenSSL 1.0.2 has been in end-of-life status since Late 2019.</p> - <p>Note also that fetchmail 6.3.x versions are discontinued and no longer - supported (the youngest 6.3.26 was released in 2013).</p> + 6.5.0.beta9 has been released (click this link to download, or to see recent changes).</a> + It brings the 6.5.0 betas back in line with 6.4.35, and has a few changes + of its own, including C++17 compatibility, a new IMAP-only --moveto option + to preserve seen message in a separate folder, and fixes Received: lines for time zones + that have sub-minute offsets (usually TAI-based timezones).<br> + Note that lzip as compression is discontinued, fetchmail ships as .tar.xz.</p> </div> <div style="background-color:#ffe0c0;color:#000000;font-size:85%"> @@ -225,8 +250,8 @@ competition. <p><a href="https://sourceforge.net/projects/getlive/">GetLive</a>, a successor to the discontinued Gotmail. (Gotmail was a script to fetch mail from Hotmail, -written by Peter Hawkins, see <a -href="http://linux.cudeso.be/linuxdoc/gotmail.php">gotmail</a>.)</p> +written by Peter Hawkins, which used to live at the now defunct +http://linux.cudeso.be/linuxdoc/gotmail.php)</p> <p>There's a program called <a href="http://mailfilter.sourceforge.net/">mailfilter</a> which can be used diff --git a/website/multidrop.de.html b/website/multidrop.de.html index e132a9d7..c727c051 100644 --- a/website/multidrop.de.html +++ b/website/multidrop.de.html @@ -6,10 +6,10 @@ <meta name="generator" content= "HTML Tidy for Linux/x86 (vers 1st April 2002), see www.w3.org"> - <title>Voraussetzungen fr funktionierendes Multidrop</title> + <title>Voraussetzungen für funktionierendes Multidrop</title> <meta name="author" content="Matthias Andree"> <meta http-equiv="Content-Type" content= - "text/html;charset=iso-8859-15"> + "text/html;charset=utf-8"> <link rev="made" href="mailto:matthias.andree@gmx.de"> <style type="text/css"> <!-- @@ -23,7 +23,7 @@ <body> <a href="multidrop.html">Link to English-language version/Link zur englischen Sprachfassung</a> - <h1>Voraussetzungen fr funktionierendes Multidrop</h1> + <h1>Voraussetzungen für funktionierendes Multidrop</h1> <address> <a href="mailto:matthias.andree@gmx.de">Matthias Andree</a> 2003-10-12 @@ -32,42 +32,42 @@ <h2>Einleitung</h2> <p>Viele Provider bieten ihren Kunden ein POP3-Multidrop oder - "domain-in-a-mailbox"-Schema an, um fr mehrere Empfnger in + "domain-in-a-mailbox"-Schema an, um für mehrere Empfänger in einer Domain die Mail "in einem Rutsch" abholen zu lassen.</p> <p>Oft genug geht so ein Unterfangen dann bei der Mailabholung - schief, die Ursachen und Abhilfen dafr sollen hier nher + schief, die Ursachen und Abhilfen dafür sollen hier näher betrachtet werden.</p> <h2>Eingangsbetrachtungen</h2> - <p>POP3, das Post-Office-Protokoll Version 3, war ursprnglich - dazu gedacht, Mail fr einen einzelnen Benutzer zu - transportieren. Es erhlt den sogenannten Umschlag - ("Envelope"), der die tatschlichen Empfnger und Absender + <p>POP3, das Post-Office-Protokoll Version 3, war ursprünglich + dazu gedacht, Mail für einen einzelnen Benutzer zu + transportieren. Es erhält den sogenannten Umschlag + ("Envelope"), der die tatsächlichen Empfänger und Absender angibt, nicht.</p> <p>Nun wird oft der Absender im Header "Return-Path" - hinterlegt, bezglich des Empfngers kocht sich jeder - Programmierer eines Mailservers seine eigene Suppe. Gngig sind + hinterlegt, bezüglich des Empfängers kocht sich jeder + Programmierer eines Mailservers seine eigene Suppe. Gängig sind "gar nichts" (sendmail), "Delivered-To:" (qmail, evtl. mit - einem Prfix, Postfix), "X-Envelope-To:" (bestimmte + einem Präfix, Postfix), "X-Envelope-To:" (bestimmte procmail-Setups) und "X-Original-To:" (neuere Postfix-Versionen - zustzlich zum Delivered-To:).</p> + zusätzlich zum Delivered-To:).</p> <p><strong>Wichtige Hintergrundinformation:</strong> Die - Mail-HEADER wie To:, Cc:, Bcc: sind fr die Zustellung der Mail - NICHT RELEVANT. Die Mailzustellung erfolgt ausschlielich + Mail-HEADER wie To:, Cc:, Bcc: sind für die Zustellung der Mail + NICHT RELEVANT. Die Mailzustellung erfolgt ausschließlich anhand des UMSCHLAGS, wie bei der Sackpost auch!</p> - <p>Es ist zwar hufig so, dass der Umschlag bei der ersten + <p>Es ist zwar häufig so, dass der Umschlag bei der ersten Einlieferung der Mail aus den Headern erzeugt wird, doch NUR - DER UMSCHLAG trgt, im Gegensatz zum HEADER (Briefkopf), die - vollstndige Information:</p> + DER UMSCHLAG trägt, im Gegensatz zum HEADER (Briefkopf), die + vollständige Information:</p> <ul> <li>Bcc: wird bei erster Gelegenheit entfernt, er soll ja - beim Empfnger nicht mehr sichtbar sein</li> + beim Empfänger nicht mehr sichtbar sein</li> <li>To: und Cc: werden bei Mailweiterleitungen nicht an das Ziel angepasst</li> @@ -77,20 +77,20 @@ Liste bestellt hat</li> </ul> - <p>Der Umstand, mehrere Empfnger in einer Mailbox zu - vereinigen, erfordert nun, dass der tatschliche Empfnger der + <p>Der Umstand, mehrere Empfänger in einer Mailbox zu + vereinigen, erfordert nun, dass der tatsächliche Empfänger der Mail hinterlegt wird, damit die Mail richtig zugestellt werden - kann. POP3 trifft hierfr keine Vorkehrungen, daher mssen sie - auerhalb des Protokolls eingerichtet werden. Es bietet sich - hierfr der Mailheader an.</p> + kann. POP3 trifft hierfür keine Vorkehrungen, daher müssen sie + außerhalb des Protokolls eingerichtet werden. Es bietet sich + hierfür der Mailheader an.</p> <h2>Voraussetzungen</h2> <p>Unter bestimmten Voraussetzungen kann POP3-Multidrop dennoch - zuverlssig funktionieren. Diese sind:</p> + zuverlässig funktionieren. Diese sind:</p> <ol> - <li>Der Provider MUSS fr jeden Empfnger der eigenen Domain + <li>Der Provider MUSS für jeden Empfänger der eigenen Domain eine Kopie der Mail in die Mailbox werfen.</li> <li>Der Provider MUSS in JEDER Mail den sogenannten "Envelope @@ -101,7 +101,7 @@ <li>Der POP3-Client (Mercury/32, fetchmail, getmail, ...) MUSS den Header, in dem der "Envelope Recipient" hinterlegt - ist, zuverlssig erkennen und ausschlielich anhand seiner + ist, zuverlässig erkennen und ausschließlich anhand seiner die Mail zustellen.</li> <li><strong>Der POP3-Client DARF KEINESFALLS die To: oder @@ -112,32 +112,32 @@ vertretbar).</strong></li> </ol> - <h2>Erklrungen</h2> + <h2>Erklärungen</h2> <dl> <dt>Ad 1:</dt> - <dd>Ist diese Voraussetzung nicht erfllt, werden bei Mails, - die an mehrere Empfnger der eigenen Domain gehen, einige - Empfnger die Mail nicht bekommen.</dd> + <dd>Ist diese Voraussetzung nicht erfüllt, werden bei Mails, + die an mehrere Empfänger der eigenen Domain gehen, einige + Empfänger die Mail nicht bekommen.</dd> <dt>Ad 2:</dt> <dd> - Ist diese Voraussetzung nicht erfllt, kommt es zu + Ist diese Voraussetzung nicht erfüllt, kommt es zu Fehlzustellungen. Der Versuch, die Information aus den - Mailheadern selbst (To:, Cc:) zu entnehmen, ist gefhrlich - und unzuverlssig: + Mailheadern selbst (To:, Cc:) zu entnehmen, ist gefährlich + und unzuverlässig: <ul> - <li>Einerseits kann Mail an Mailinglisten zurckgeschickt + <li>Einerseits kann Mail an Mailinglisten zurückgeschickt werden, deren Adresse oft im To:- oder Cc:-Header steht, - was eine Mailschleife auslst, die unbedingt vermieden + was eine Mailschleife auslöst, die unbedingt vermieden werden muss (weil sie Kosten verursacht)</li> - <li>andererseits ist die Regenerierung von Empfngern, + <li>andererseits ist die Regenerierung von Empfängern, die beim Absender im "Bcc:"-Header eingetragen waren, - nicht mglich, da der Bcc:-Header beim Transport entfernt + nicht möglich, da der Bcc:-Header beim Transport entfernt werden muss, wie der Name "Blind Carbon Copy" schon andeutet.</li> </ul> diff --git a/website/multidrop.html b/website/multidrop.html index 2de3efc3..aa885ef9 100644 --- a/website/multidrop.html +++ b/website/multidrop.html @@ -9,7 +9,7 @@ <title>Requisites for working multidrop mailboxes</title> <meta name="author" content="Matthias Andree"> <meta http-equiv="Content-Type" content= - "text/html;charset=iso-8859-15"> + "text/html;charset=utf-8"> <link rev="made" href="mailto:matthias.andree@gmx.de"> <style type="text/css"> <!-- diff --git a/website/security.html b/website/security.html index 98129b07..113015b6 100644 --- a/website/security.html +++ b/website/security.html @@ -27,10 +27,10 @@ <a href="fetchmail-FAQ.html" title="Fetchmail FAQ">FAQ</a><br> <a href="fetchmail-FAQ.pdf" title="Fetchmail FAQ as PDF">FAQ (PDF)</a><br> <a href="design-notes.html">Design Notes</a><br> - <a href="http://sourceforge.net/projects/fetchmail/files/">Download</a><br> + <a href="https://sourceforge.net/projects/fetchmail/files/">Download</a><br> Security/Errata<br> <a href="https://gitlab.com/fetchmail/fetchmail/">Development</a><br> - <a href="http://sourceforge.net/projects/fetchmail/">Project Page</a><br> + <a href="https://sourceforge.net/projects/fetchmail/">Project Page</a><br> <hr> </div> @@ -49,25 +49,28 @@ <li><a name="cve-2012-3482" href="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-3482">CVE-2012-3482:</a> --> + <li><a name="cve-2021-39272" + href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-39272">CVE-2021-39272:</a> + Fetchmail would <a href="fetchmail-SA-2021-02.txt">fail to negotiate a TLS encrypted session in some circumstances, continuing a clear-text connection.</a></li> <li><a name="cve-2021-36386" - href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-36386">CVE-2021-36386:</a> + href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-36386">CVE-2021-36386:</a> Fetchmail could <a href="fetchmail-SA-2021-01.txt">log possibly sensitive data or garbage, or crash, when logging information longer than 2 kB, on some systems.</a></li> <li><a name="cve-2012-3482" - href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-3482">CVE-2012-3482:</a> + href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-3482">CVE-2012-3482:</a> Fetchmail could <a href="fetchmail-SA-2012-02.txt">crash and possibly reveal fragments of confidential data</a> during NTLM authentication.</li> <li><a name="cve-2011-3389" - href="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3389">CVE-2011-3389:</a> + href="https://nvd.nist.gov/vuln/detail/CVE-2011-3389">CVE-2011-3389:</a> <a href="fetchmail-SA-2012-01.txt">Fetchmail was vulnerable to chosen-plaintext attacks against cipher block chaining initialization vectors because it disabled an OpenSSL countermeasure against this attack.</a> </li> <li><a name="cve-2011-1947" - href="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1947">CVE-2011-1947:</a> + href="https://nvd.nist.gov/vuln/detail/CVE-2011-1947">CVE-2011-1947:</a> Fetchmail <a href="fetchmail-SA-2011-01.txt"> could hang for indefinite amounts of time during STARTTLS negotiations</a>, causing mail fetches to stall. This was a long-standing bug @@ -77,7 +80,7 @@ properly.</a> This was a long-standing bug fixed in release 6.3.18.</li> <li><a name="cve-2010-1167" - href="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-1167">CVE-2010-1167:</a> + href="https://nvd.nist.gov/vuln/detail/CVE-2010-1167">CVE-2010-1167:</a> Fetchmail <a href="fetchmail-SA-2010-02.txt">could exhaust all available memory and abort on certain computers (for instance Linux) in multibyte locales (for instance UTF-8) @@ -85,21 +88,21 @@ This bug was introduced long before 6.0.0 and has been fixed in release 6.3.17.</li> <li><a name="cve-2010-0562" - href="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-0562">CVE-2010-0562:</a> Fetchmail <a href="fetchmail-SA-2010-01.txt">would overrun the heap when displaying X.509 TLS/SSL certificates with characters with high bit set in verbose mode on platforms where char is a signed type.</a> This bug was introduced in release 6.3.11 and has been fixed in release 6.3.14.</li> - <li><a name="cve-2009-2666" href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2666">CVE-2009-2666:</a> Fetchmail <a href="fetchmail-SA-2009-01.txt">was found to validate SSL/TLS X.509 certificates improperly and allow man-in-the-middle-attacks to go undetected.</a> This bug has been fixed in release 6.3.11. For previous versions, use the <a href="fetchmail-SA-2009-01.txt">patch contained in the security announcement.</a></li> - <li><a name="cve-2008-2711" href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2711">CVE-2008-2711:</a> Fetchmail can <a href="fetchmail-SA-2008-01.txt">crash in verbose mode when logging long message headers.</a> This bug has been fixed in release 6.3.9. For 6.3.8, use the <a href="fetchmail-SA-2008-01.txt">patch contained in the security announcement.</a></li> - <li><a name="cve-2007-4565" href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4565">CVE-2007-4565:</a> Fetchmail can <a href="fetchmail-SA-2007-02.txt">crash when the SMTP server refuses a warning message generated by fetchmail.</a> This bug was introduced in fetchmail 4.6.8 and has been fixed in release 6.3.9. For 6.3.8, use the <a href="fetchmail-SA-2007-02.txt">patch contained in this security announcement.</a></li> - <li><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1558">CVE-2007-1558:</a> Fetchmail's APOP client was found to <a href="fetchmail-SA-2007-01.txt">validate APOP challenges insufficiently, making man-in-the-middle attacks on APOP secrets unnecessarily easier than need be.</a> This bug was long-standing, fetchmail 6.3.8 and newer validate the APOP challenge more strictly.</li> - <li><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-5974">CVE-2006-5974:</a> Fetchmail was found to <a href="fetchmail-SA-2006-03.txt">crash when refusing a message that was bound to be delivered by an MDA.</a> This bug was introduced into fetchmail 6.3.5 and fixed in 6.3.6.</li> - <li><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-5867">CVE-2006-5867:</a> Fetchmail was found to <a href="fetchmail-SA-2006-02.txt">omit TLS or send the password in clear text despite the configuration stating otherwise.</a> This was a long-standing bug reported by Isaac Wilcox, fixed in fetchmail 6.3.6. There will be no 6.2.X releases to fix this bug in 6.2.X.</li> - <li><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0321">CVE-2006-0321:</a> Fetchmail was found to <a href="fetchmail-SA-2006-01.txt">crash after bouncing a message with bad addresses. This bug was introduced with fetchmail 6.3.0 and fixed in fetchmail 6.3.2.</a></li> - <li><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-4348">CVE-2005-4348:</a> Fetchmail was found to contain <a href="fetchmail-SA-2005-03.txt">a bug (null pointer dereference) that can be exploited to a denial of service attack</a> when fetchmail runs in multidrop mode. 6.2.5.5 and 6.3.1 have this bug fixed.</li> - <li><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-3088">CVE-2005-3088:</a> Fetchmailconf was found to <a href="fetchmail-SA-2005-02.txt">open the configuration files world-readable, writing data to them, and only then tightening up permissions</a>, which may cause password information to be visible to other users. This bug affected fetchmail 6.2.0, 6.2.5 and 6.2.5.2. The bug is fixed in fetchmail 6.2.5.4 and 6.3.0.</li> - <li><a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-2335">CVE-2005-2335:</a> Fetchmail was found to contain a <a href="fetchmail-SA-2005-01.txt">remotely exploitable code injection vulnerability (potentially privileged code)</a> in the POP3 code, affecting both the 6.2.0 and 6.2.5 releases. 6.2.5.2, 6.2.5.4 and 6.3.0 have got this bug fixed. (Other versions have not been checked if they contain this bug.)</li> + href="https://nvd.nist.gov/vuln/detail/CVE-2010-0562">CVE-2010-0562:</a> Fetchmail <a href="fetchmail-SA-2010-01.txt">would overrun the heap when displaying X.509 TLS/SSL certificates with characters with high bit set in verbose mode on platforms where char is a signed type.</a> This bug was introduced in release 6.3.11 and has been fixed in release 6.3.14.</li> + <li><a name="cve-2009-2666" href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-2666">CVE-2009-2666:</a> Fetchmail <a href="fetchmail-SA-2009-01.txt">was found to validate SSL/TLS X.509 certificates improperly and allow man-in-the-middle-attacks to go undetected.</a> This bug has been fixed in release 6.3.11. For previous versions, use the <a href="fetchmail-SA-2009-01.txt">patch contained in the security announcement.</a></li> + <li><a name="cve-2008-2711" href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2711">CVE-2008-2711:</a> Fetchmail can <a href="fetchmail-SA-2008-01.txt">crash in verbose mode when logging long message headers.</a> This bug has been fixed in release 6.3.9. For 6.3.8, use the <a href="fetchmail-SA-2008-01.txt">patch contained in the security announcement.</a></li> + <li><a name="cve-2007-4565" href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4565">CVE-2007-4565:</a> Fetchmail can <a href="fetchmail-SA-2007-02.txt">crash when the SMTP server refuses a warning message generated by fetchmail.</a> This bug was introduced in fetchmail 4.6.8 and has been fixed in release 6.3.9. For 6.3.8, use the <a href="fetchmail-SA-2007-02.txt">patch contained in this security announcement.</a></li> + <li><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1558">CVE-2007-1558:</a> Fetchmail's APOP client was found to <a href="fetchmail-SA-2007-01.txt">validate APOP challenges insufficiently, making man-in-the-middle attacks on APOP secrets unnecessarily easier than need be.</a> This bug was long-standing, fetchmail 6.3.8 and newer validate the APOP challenge more strictly.</li> + <li><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-5974">CVE-2006-5974:</a> Fetchmail was found to <a href="fetchmail-SA-2006-03.txt">crash when refusing a message that was bound to be delivered by an MDA.</a> This bug was introduced into fetchmail 6.3.5 and fixed in 6.3.6.</li> + <li><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-5867">CVE-2006-5867:</a> Fetchmail was found to <a href="fetchmail-SA-2006-02.txt">omit TLS or send the password in clear text despite the configuration stating otherwise.</a> This was a long-standing bug reported by Isaac Wilcox, fixed in fetchmail 6.3.6. There will be no 6.2.X releases to fix this bug in 6.2.X.</li> + <li><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0321">CVE-2006-0321:</a> Fetchmail was found to <a href="fetchmail-SA-2006-01.txt">crash after bouncing a message with bad addresses. This bug was introduced with fetchmail 6.3.0 and fixed in fetchmail 6.3.2.</a></li> + <li><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-4348">CVE-2005-4348:</a> Fetchmail was found to contain <a href="fetchmail-SA-2005-03.txt">a bug (null pointer dereference) that can be exploited to a denial of service attack</a> when fetchmail runs in multidrop mode. 6.2.5.5 and 6.3.1 have this bug fixed.</li> + <li><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-3088">CVE-2005-3088:</a> Fetchmailconf was found to <a href="fetchmail-SA-2005-02.txt">open the configuration files world-readable, writing data to them, and only then tightening up permissions</a>, which may cause password information to be visible to other users. This bug affected fetchmail 6.2.0, 6.2.5 and 6.2.5.2. The bug is fixed in fetchmail 6.2.5.4 and 6.3.0.</li> + <li><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-2335">CVE-2005-2335:</a> Fetchmail was found to contain a <a href="fetchmail-SA-2005-01.txt">remotely exploitable code injection vulnerability (potentially privileged code)</a> in the POP3 code, affecting both the 6.2.0 and 6.2.5 releases. 6.2.5.2, 6.2.5.4 and 6.3.0 have got this bug fixed. (Other versions have not been checked if they contain this bug.)</li> </ul> <p style="font-size:100%"><strong>Please <a - href="http://sourceforge.net/projects/fetchmail/files/">update + href="https://sourceforge.net/projects/fetchmail/files/">update to the newest fetchmail version</a>.</strong></p> </div> </body> @@ -17,8 +17,12 @@ extern "C" { #define XMALLOCTYPE char #endif +#if !defined __GNUC__ || __GNUC__ < 2 +# define __attribute__(xyz) /* Ignore. */ +#endif + /** Allocate \a n characters of memory, abort program on failure. */ -XMALLOCTYPE *xmalloc(size_t n); +XMALLOCTYPE *xmalloc(size_t n) __attribute__((malloc)); /** Reallocate \a n characters of memory, abort program on failure. */ XMALLOCTYPE *xrealloc(/*@null@*/ void *, size_t n); |