Import Upstream version 2.10

parent 39c177c8
This diff is collapsed.
2.7 version:
2.10 version:
- Denis Denisov <denji0k@gmail.com>
Implemented the reactivation of connections from state file, similar to
'dynamic segmentation', as explained at
http://www.internetdownloadmanager.com/support/segmentation.html
- Osamu Aoki <osamu@debian.org>
Clarifyed the usage of multiple URLs in manpage.
From Debian bug #621728.
- Sjjad Hashemian <wolaws@gmail.com>
Specify filename from http header Content-Disposition, according to
https://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html#sec19.5.1
- Stephen Thirlwall <sdt@dr.com>
Removed generated files from source control.
HTTPS/FTPS! A great work!
2.7 version:
- Mridul Malpotra <mridul.malpotra@gmail.com>
Fixed num_connections error when invalid values are given.
- Stephen Thirlwall <sdt@dr.com>
Removed generated files from source control.
2.6 version:
- Ivan Gimenez <ivan.gimenez@gmail.com>
......
Version 2.10, 2016-06-04
[ Joao Eriberto Mota Filho ]
* Stephen implemented SSL/TLS. Consequently, the licensing for Axel from now on
will be GPL-2+ with OpenSSL exception. All previous authors agree with that.
For details, see https://github.com/eribertomota/axel/issues/15.
* Downgraded gettext minimum version to 0.18 in configure.ac. It will produce a
message 'AM_PROG_MKDIR_P macro is deprecated' when building, but that is
normal.
* Fixed some fuzzy translations.
* New code for autogen.sh, now with clean to vanish the source code.
* Updated manpage.
[ Denis Denisov ]
* Implemented the reactivation of connections from state file, similar to
dynamic segmentation.
[ Osamu Aoki ]
* Clarified the usage of multiple URLs in manpage.
[ Sjjad Hashemian ]
* Specify filename from http header Content-Disposition (RFC 2616, Sec. 19.5.1).
[ Stephen Thirlwall ]
* HTTPS/FTPS support using OpenSSL. \o/
* Implemented the --without-openssl option to build without SSL/TLS.
* Updated the manpage.
Version 2.7, 2016-05-01
[ Joao Eriberto Mota Filho ]
......@@ -15,6 +50,8 @@ Version 2.7, 2016-05-01
* Added the autogen.sh script.
* Cleaned the source code, removing auto generated files.
Version 2.6, 2016-03-20
[ Joao Eriberto Mota Filho ]
......@@ -35,6 +72,8 @@ Version 2.6, 2016-03-20
* Alterate display expands to terminal width.
Version 2.5, 2015-11-01
[ Joao Eriberto Mota Filho ] 2015-11-01
......@@ -102,6 +141,8 @@ Version 2.5, 2015-11-01
- Fix Solaris support (Closes: #312092), thanks Sebastian Kayser
- Add PO-Revision-Date header to ru.po
Version 2.4
- Fix a buffer overflow caused by wrong size limits when copying strings (Closes: #311569), thanks Michael Schwendt and the Fedora project members
......@@ -112,6 +153,8 @@ Version 2.4
- Allow special characters in arguments to configure.
- Add MimeType and fix Categories in the desktop file.
Version 2.3
- Wait for thread termination in axel.c:axel_do (Closes: #311255), thanks John Ripa
......@@ -119,26 +162,34 @@ Version 2.3
- Fix LFS support for FTP (Closes: #311320)
- Fix LFS support (Closes: #311324), thanks Rodrigue Le Bayon
Version 2.2:
- Fix a buffer overflow in http.c:http_encode.
Version 2.1:
- Fix version string. 2.0 still reported 1.1, thanks Ajay R Ramjatan
- Fix new MB/s display (was showing B/s). Thanks Philipp Hagemeister
Version 2.0:
- Large file support thanks thanks David Turnbull
- Custom Header Support thanks Eli Yukelzon
- New russian translation thanks newhren
- New Russian translation thanks newhren
- Fix segfault in -H option thanks Philipp Hagemeister
- Honour http_proxy and prefer it over HTTP_PROXY
- Add new RPM spec file thanks bbbush
Finished Sep 12 2008
Version 1.1:
- Compilation for GNU/kFreeBSD, thanks to Cyril Brulebois
......@@ -153,6 +204,8 @@ Version 1.1:
Finished Jan 18 2008
Version 1.0b:
- Removed spaces between -S[x] in man-pages, etc. They mess things up.
- Fixed configure for OpenBSD.
......
......@@ -6,7 +6,8 @@ clean-local:
-rm -rf autom4te.cache/ \
m4/
-rm -f aclocal.m4 \
-rm -f *~ \
aclocal.m4 \
compile \
config.* \
configure \
......
Since 2.10 version, Axel supports HTTPS/FTPS downloads.
Enjoy!
......@@ -7,6 +7,7 @@
**2. WHAT IS AXEL?**<br>
**3. BUILDING FROM SOURCE**<br>
**4. BUILDING ON OS/X WITH HOMEBREW**<br>
**5. LICENSE**<br>
......@@ -24,11 +25,10 @@ and other places for this program. All my initial work was registered in
ChangeLog file (version 2.5 and later releases). I also maintain Axel
packaged in Debian[2].
If you are interested to help Axel, read the CONTRIBUTING.md[3] file.
If you are interested to help Axel, read the [CONTRIBUTING.md](CONTRIBUTING.md) file.
[1] https://alioth.debian.org/projects/axel<br>
[2] https://packages.qa.debian.org/a/axel.html<br>
[3] https://github.com/eribertomota/axel/blob/master/CONTRIBUTING.md
----------------
......@@ -45,6 +45,8 @@ speed up a download up to 60% (approximately, according to some tests).
Axel tries to be as light as possible, so it might be useful as a
wget clone (and other console based programs) on byte-critical systems.
Axel supports HTTP, HTTPS, FTP and FTPS protocols.
Axel was originally developed by Wilmer van der Gaast. Thanks for your
efforts. Over time, Axel got several contributions from people. Please,
see the files AUTHORS and CREDITS.
......@@ -58,6 +60,8 @@ Run `./autogen.sh` to create the configure script, then proceed with the
instructions in [INSTALL](INSTALL). The basic actions for most users,
after ./autogen.sh, is running ./configure, make and make install.
To build without SSL/TLS support, use ./configure --without-openssl
---------------------------------
4. BUILDING ON OS/X WITH HOMEBREW
......@@ -65,14 +69,24 @@ after ./autogen.sh, is running ./configure, make and make install.
Install the following homebrew packages:
`homebrew install automake gettext`
`homebrew install automake gettext openssl`
You'll need to provide some extra options to `autogen.sh` and `configure`
so they can find gettext.
so they can find gettext and openssl.
```shell
GETTEXT=/usr/local/opt/gettext
OPENSSL=/usr/local/opt/openssl
PATH="$GETTEXT/bin:$PATH"
./autogen.sh -I$GETTEXT/share/aclocal/
CFLAGS=-I$GETTEXT/include LDFLAGS=-L$GETTEXT/lib ./configure
CFLAGS="-I$GETTEXT/include -I$OPENSSL/include" LDFLAGS=-L$GETTEXT/lib ./configure
```
You can just run `make` as usual after these steps.
----------
5. LICENSE
----------
Axel is under GPL-2+ with OpenSSL exception.
#!/bin/sh
# Copyright 2016 Stephen Thirlwall
autoreconf --install "$@" || exit 1
# autogen.sh with clean option, v0.2
# Copyright 2016 Joao Eriberto Mota Filho <eriberto@eriberto.pro.br>
#
# This file is under BSD-3-Clause license.
#
# 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 authors 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.
echo "Now run ./configure, make, and make install."
# Use clean option
if [ "$1" = "clean" -a ! -e Makefile ]
then
echo "Vanishing the code"
rm -rf aclocal.m4 autom4te.cache compile config.guess config.h.in \
config.rpath config.sub configure depcomp install-sh m4/ \
Makefile.in missing man/Makefile.in src/Makefile.in
exit 0
fi
# Do not use clean option
if [ "$1" = "clean" -a -e Makefile ]
then
echo "I can not clean. Use '$ make distclean'."
exit 0
fi
# Do autoreconf
autoreconf -i \
&& { echo " "; \
echo "Done. You can use the 'clean' option to vanish the source code."; \
echo "Example of use: $ ./autogen.sh clean"; \
echo " "; \
echo "Now run ./configure, make, and make install."; \
} \
|| { echo "We have a problem..."; exit 1; }
# Autoconf for axel
# Copyright 2016 Joao Eriberto Mota Filho
# Copyright 2016 Stephen Thirlwall
# This file is under same license of axel (GPLv2+)
# This file is under same license of Axel
AC_PREREQ([2.69])
AC_INIT([axel], [2.7], [https://github.com/eribertomota/axel/issues])
AC_INIT([axel], [2.10], [https://github.com/eribertomota/axel/issues])
AC_CONFIG_SRCDIR([src/conf.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
......@@ -30,9 +30,23 @@ AC_FUNC_MALLOC
AC_FUNC_REALLOC
AC_CHECK_FUNCS([gettimeofday inet_ntoa memset select setlocale socket strcasecmp strchr strrchr strstr])
# Optional (but included-by-default) openssl support
AC_ARG_WITH([openssl],
AC_HELP_STRING([--without-openssl],[disable TLS support]), [with_openssl=no], [with_openssl=yes])
AS_IF([test "x$with_openssl" != xno], [
AC_DEFINE([HAVE_OPENSSL], [1], [OpenSSL])
AC_SEARCH_LIBS([SSL_library_init], [ssl], [], [
AC_MSG_ERROR([libssl not found])
])
AC_SEARCH_LIBS([ERR_get_error], [crypto], [], [
AC_MSG_ERROR([libcrypto not found])
])
], AC_MSG_NOTICE([OpenSSL support disabled]))
# Add Gettext
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.3])
AM_GNU_GETTEXT_VERSION([0.18])
#### Definitions ####
......
When updating, change these files (if needed):
- AUTHORS
- ChangLog
- ChangeLog
- CREDITS
- configure.ac (VERSION)
- src/axel.h (AXEL_VERSION_STRING)
- manpage version and date
- src/axel.h (AXEL_VERSION_STRING) (check copyright years in header)
- src/text.c (years in Copyright lines near EOF)
-> run 'make update-po' in po/ to update the .po files.
.TH axel "1" "Mar 2016" "AXEL 2.6" "light command line download accelerator"
.\" Text automatically generated by txt2man
.\"Text automatically generated by txt2man
.TH axel 1 "04 June 2016" "axel-2.10" "light command line download accelerator"
.SH NAME
\fBaxel \fP- light command line download accelerator
\fB
......@@ -19,11 +19,15 @@ Each connection downloads its own part of the file.
Unlike most other programs, Axel downloads all the data directly to the destination file, using
one single thread. It just saves some time at the end because the program does not have to
concatenate all the downloaded parts.
.PP
Axel supports HTTP, HTTPS, FTP and FTPS protocols.
.SH OPTIONS
One argument is required, the URL to the file you want to download. When downloading from FTP,
the filename may contain wildcards and the program will try to resolve the full filename. Multiple
URL's can be specified as well and the program will use all those URL's for the download. Please
note that the program does not check whether the files are equal.
mirror URLs to an identical file can be specified as well and the program will use all those URLs
for the download.
.PP
Please note that the program does not check whether the files are equal.
.PP
Other options:
.TP
......@@ -57,6 +61,11 @@ Do not use any proxy server to download the file. Not possible when a transparen
is active somewhere, of course.
.TP
.B
\fB--insecure\fP, \fB-k\fP
Do not verify the SSL certificate. Only use this if you are getting certificate errors
and you are sure of the sites authenticity.
.TP
.B
\fB--verbose\fP, \fB-v\fP
Show more status messages. Use it more than once to see more details.
.TP
......@@ -98,6 +107,8 @@ The trivial usage to download a file is similar to:
.PP
.nf
.fam C
$ axel http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-cd/debian-8.4.0-amd64-netinst.iso
$ axel ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.2/linux-2.2.20.tar.bz2
.fam T
......
.TH axel "1" "Mar 2016" "AXEL 2.6" "light command line download accelerator"
......@@ -12,13 +12,18 @@ DESCRIPTION
one single thread. It just saves some time at the end because the program does not have to
concatenate all the downloaded parts.
Axel supports HTTP, HTTPS, FTP and FTPS protocols.
OPTIONS
One argument is required, the URL to the file you want to download. When downloading from FTP,
the filename may contain wildcards and the program will try to resolve the full filename. Multiple
URL's can be specified as well and the program will use all those URL's for the download. Please
note that the program does not check whether the files are equal.
mirror URLs to an identical file can be specified as well and the program will use all those URLs
for the download.
Please note that the program does not check whether the files are equal.
Other options:
--max-speed=x, -s x Specify a speed (bytes per second) to try to keep the average speed around this
speed. This is useful if you do not want the program to suck up all of your
bandwidth.
......@@ -38,6 +43,9 @@ OPTIONS
--no-proxy, -N Do not use any proxy server to download the file. Not possible when a transparent proxy
is active somewhere, of course.
--insecure, -k Do not verify the SSL certificate. Only use this if you are getting certificate errors
and you are sure of the sites authenticity.
--verbose, -v Show more status messages. Use it more than once to see more details.
--quiet, -q No output to stdout.
......@@ -67,6 +75,8 @@ RETURN VALUE
EXAMPLES
The trivial usage to download a file is similar to:
$ axel http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-cd/debian-8.4.0-amd64-netinst.iso
$ axel ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.2/linux-2.2.20.tar.bz2
This will use the Belgian, Dutch, English and German kernel.org mirrors to download a Linux 2.4.17
......
#!/bin/bash
# Generate several manpages at the same time.
# Copyright (C) 2015 Joao Eriberto Mota Filho <eriberto@eriberto.pro.br>
# v0.3, available at https://github.com/eribertomota/genallman
#
# Inside the Axel, this file is under GPL-2+ license.
[ -f /usr/bin/txt2man ] || { echo "ERROR: txt2man not found."; exit; }
for NAME in $(ls | grep header | cut -d'.' -f1)
do
LEVEL=$(cat $NAME.header | cut -d" " -f3 | tr -d '"')
cat $NAME.header > $NAME.$LEVEL
txt2man $NAME.txt | grep -v '^.TH ' >> $NAME.$LEVEL
echo "Generated $NAME.$LEVEL."
done
#!/bin/bash
# Generate the manpage
# Copyright 2016 Joao Eriberto Mota Filho <eriberto@eriberto.pro.br>
# This file is under BSD-3-Clause
P_DATA="04 June 2016"
P_NAME=axel
P_VERSION=2.10
P_MANLEVEL=1
P_DESCRIPT="light command line download accelerator"
TEST=$(txt2man -h 2> /dev/null)
[ ! "$TEST" ] && { echo "ERROR: You need install txt2man program."; exit 1; }
[ -e $P_NAME.txt ] || { echo "ERROR: $P_NAME.txt not found."; exit 1; }
txt2man -d "$P_DATA" -t $P_NAME -r $P_NAME-$P_VERSION -s $P_MANLEVEL -v "$P_DESCRIPT" $P_NAME.txt > $P_NAME.$P_MANLEVEL
......@@ -4,3 +4,5 @@ src/conn.c
src/ftp.c
src/http.c
src/text.c
src/ssl.c
src/tcp.c
......@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Axel\n"
"Report-Msgid-Bugs-To: https://github.com/eribertomota/axel/issues\n"
"POT-Creation-Date: 2016-05-01 00:35-0300\n"
"POT-Creation-Date: 2016-06-04 20:03-0300\n"
"PO-Revision-Date: 2008-09-15 22:08+0200\n"
"Last-Translator: Hermann J. Beckers <hj.beckers@onlinehome.de>\n"
"Language-Team: deutsch <de@li.org>\n"
......@@ -12,199 +12,194 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
#: src/axel.c:57
#: src/axel.c:74
msgid "Buffer resized for this speed."
msgstr "Buffer fr diese Geschwindigkeit angepasst."
#: src/axel.c:93
#: src/axel.c:110
msgid "Could not parse URL.\n"
msgstr "Kann URL nicht parsen.\n"
#: src/axel.c:128
#: src/axel.c:145
#, c-format
msgid "File size: %lld bytes"
msgstr "Dateigre: %lld bytes"
#: src/axel.c:147
#: src/axel.c:168
#, c-format
msgid "Opening output file %s"
msgstr "ffne Ausgabedatei: %s"
#: src/axel.c:156
#: src/axel.c:177
msgid "Server unsupported, starting from scratch with one connection."
msgstr "Server versteht REST nicht, Neustart mit einer Verbindung."
#: src/axel.c:179
#: src/axel.c:218
#, c-format
msgid "State file found: %lld bytes downloaded, %lld to go."
msgstr "Status-Datei gefunden: %lld bytes bertragen, %lld verbleiben."
#: src/axel.c:186 src/axel.c:198
#: src/axel.c:225 src/axel.c:237
msgid "Error opening local file"
msgstr "Fehler beim ffnen der lokalen Datei"
#: src/axel.c:210
#: src/axel.c:249
msgid "Crappy filesystem/OS.. Working around. :-("
msgstr "Schlechtes Datei-/Betriebssystem, Umgehung.."
#: src/axel.c:217
#: src/axel.c:256
#, fuzzy
msgid "Error creating local file"
msgstr "Fehler beim ffnen der lokalen Datei"
#: src/axel.c:246
#: src/axel.c:314
msgid "Starting download"
msgstr "Starte Abruf"
#: src/axel.c:253 src/axel.c:412
#: src/axel.c:327 src/axel.c:490
#, c-format
msgid "Connection %i downloading from %s:%i using interface %s"
msgstr "Verbindung %i: Abruf von %s:%i ber Schnittstelle %s"
#: src/axel.c:260 src/axel.c:422
#: src/axel.c:334 src/axel.c:500
msgid "pthread error!!!"
msgstr "pthread Fehler!!!"
#: src/axel.c:328
#: src/axel.c:403
#, c-format
msgid "Error on connection %i! Connection closed"
msgstr "Fehler bei Verbindung %i! Verbindung getrennt"
#: src/axel.c:342
#: src/axel.c:417
#, c-format
msgid "Connection %i unexpectedly closed"
msgstr "Verbindung %i unerwartet getrennt"
#: src/axel.c:346 src/axel.c:363
#: src/axel.c:421 src/axel.c:439
#, c-format
msgid "Connection %i finished"
msgstr "Verbindung %i beendet"
#: src/axel.c:375
#: src/axel.c:451
msgid "Write error!"
msgstr "Schreibfehler!"
#: src/axel.c:387
#: src/axel.c:465
#, c-format
msgid "Connection %i timed out"
msgstr "Time-out bei Verbindung %i"
#: src/conf.c:107
#: src/conf.c:123
#, c-format
msgid "Error in %s line %i.\n"
msgstr "Fehler in %s Zeile %i.\n"
#: src/conn.c:349 src/ftp.c:122
#: src/conn.c:371 src/ftp.c:133
#, c-format
msgid "Too many redirects.\n"
msgstr "Zu viele Weiterleitungen (redirects).\n"
#: src/conn.c:368
#: src/conn.c:390
#, c-format
msgid "Unknown HTTP error.\n"
msgstr "Unbekannter HTTP-Fehler.\n"
#: src/ftp.c:33 src/http.c:61
#, c-format
msgid "Unable to connect to server %s:%i\n"
msgstr "Keine Verbindung mit %s:%i mglich\n"
#: src/ftp.c:89
#: src/ftp.c:100
#, c-format
msgid "Can't change directory to %s\n"
msgstr "Kann nicht in Verzeichnis %s wechseln\n"
#: src/ftp.c:115 src/ftp.c:175
#: src/ftp.c:126 src/ftp.c:185
#, c-format
msgid "File not found.\n"
msgstr "Datei nicht gefunden.\n"
#: src/ftp.c:177
#: src/ftp.c:187
#, c-format
msgid "Multiple matches for this URL.\n"
msgstr "Mehrere Treffer fr diese URL.\n"
#: src/ftp.c:248 src/ftp.c:254
#: src/ftp.c:258
#, c-format
msgid "Error opening passive data connection.\n"
msgstr "Fehler beim ffnen der Passiv-Verbindung.\n"
#: src/ftp.c:284
#: src/ftp.c:292
#, c-format
msgid "Error writing command %s\n"
msgstr "Fehler beim Schreiben des Befehls %s\n"
#: src/ftp.c:309 src/http.c:161
#: src/ftp.c:317 src/http.c:188
#, c-format
msgid "Connection gone.\n"
msgstr "Verbindung geschlossen.\n"
#: src/http.c:46
#: src/http.c:62
#, c-format
msgid "Invalid proxy string: %s\n"
msgstr "Ungltige Proxy-Angabe: %s\n"
#: src/http.c:147
#: src/http.c:174
#, fuzzy, c-format
msgid "Connection gone while writing.\n"
msgstr "Verbindung geschlossen.\n"
#: src/text.c:156
#: src/text.c:175
#, c-format
msgid "Can't redirect stdout to /dev/null.\n"
msgstr "Kann Standardausgabe nicht nach /dev/null umleiten.\n"
#: src/text.c:184
#: src/text.c:207
#, c-format
msgid "Error when trying to read URL (Too long?).\n"
msgstr "Fehler beim Lesen der URL (Zu lang?).\n"
#: src/text.c:193
#: src/text.c:216
#, c-format
msgid "Can't handle URLs of length over %d\n"
msgstr "Kann URLs mit mehr als %d Zeichen nicht nutzen\n"
#: src/text.c:198
#: src/text.c:221
#, c-format
msgid "Initializing download: %s\n"
msgstr "Starte Abruf: %s\n"
#: src/text.c:205
#: src/text.c:228
#, c-format
msgid "Doing search...\n"
msgstr "Suche gestartet...\n"
#: src/text.c:209
#: src/text.c:232
#, c-format
msgid "File not found\n"
msgstr "Datei nicht gefunden\n"
#: src/text.c:213
#: src/text.c:236
#, c-format
msgid "Testing speeds, this can take a while...\n"
msgstr "Teste Geschwindigkeiten, das kann etwas dauern...\n"
#: src/text.c:218
#: src/text.c:241
#, c-format
msgid "%i usable servers found, will use these URLs:\n"
msgstr "%i benutzbare Server gefunden, werde diese URLs benutzen:\n"
#: src/text.c:277
#: src/text.c:300
#, c-format
msgid "Filename too long!\n"
msgstr "Dateiname zu lang!\n"
#: src/text.c:289
#: src/text.c:312
#, c-format
msgid "No state file, cannot resume!\n"
msgstr "Keine Status-Datei, Fortsetzung nicht mglich!\n"
#: src/text.c:294
#: src/text.c:317
#, c-format
msgid "State file found, but no downloaded data. Starting from scratch.\n"
msgstr "Status-Datei gefunden, aber noch nichts bertragen. Neustart.\n"
#: src/text.c:425
#: src/text.c:448
#, c-format
msgid ""
"\n"
......@@ -213,47 +208,47 @@ msgstr ""
"\n"
"%s abgerufen in %s. (%.2f KB/s)\n"
#: src/text.c:447
#: src/text.c:470
#, c-format
msgid "%lld byte"
msgstr "%lld byte"
#: src/text.c:449
#: src/text.c:472
#, c-format
msgid "%.1f Kilobyte"
msgstr "%.1f Kilobytes"
#: src/text.c:451
#: src/text.c:474
#, c-format
msgid "%.1f Megabyte"
msgstr "%.1f Megabytes"
#: src/text.c:453
#: src/text.c:476
#, c-format
msgid "%.1f Gigabyte"
msgstr "%.1f Gigabytes"
#: src/text.c:462
#: src/text.c:485
#, c-format
msgid "%i second"
msgstr "%i Sekunde"
#: src/text.c:464
#: src/text.c:487
#, c-format
msgid "%i seconds"
msgstr "%i Sekunden"
#: src/text.c:466
#: src/text.c:489
#, fuzzy, c-format
msgid "%i:%02i minute(s)"
msgstr "%i:%02i Sekunden"
#: src/text.c:468
#: src/text.c:491
#, fuzzy, c-format
msgid "%i:%02i:%02i hour(s)"
msgstr "%i:%02i:%02i Sekunden"
#: src/text.c:557
#: src/text.c:581
#, fuzzy, c-format
msgid ""
"Usage: axel [options] url1 [url2] [url...]\n"
......@@ -265,6 +260,7 @@ msgid ""
"-H x\tAdd header string\n"
"-U x\tSet user agent\n"
"-N\tJust don't use any proxy server\n"
"-k\tDon't verify the SSL certificate\n"
"-q\tLeave stdout alone\n"
"-v\tMore status information\n"
"-a\tAlternate progress indicator\n"
......@@ -289,8 +285,8 @@ msgstr ""
"\n"
"Fehler an lintux@lintux.cx melden.\n"
#: src/text.c:574
#, c-format
#: src/text.c:599