diff -Nru apt-fast-1.7.5/README.md apt-fast-1.8.1/README.md --- apt-fast-1.7.5/README.md 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/README.md 2012-12-12 15:28:07.000000000 +0000 @@ -1,5 +1,5 @@ -apt-fast 1.7 +apt-fast 1.8 ============ apt-fast is a shellscript wrapper for apt-get and aptitude that can drastically improve apt download times by downloading packages in parallel, with multiple @@ -35,31 +35,41 @@ chmod +x /usr/bin/apt-fast cp apt-fast.conf /etc -You need to have a console download manager installed - [aria2c](http://aria2.sourceforge.net/) -and [axel](http://axel.alioth.debian.org/) are known to work for this script. -aria2c is recommended. Before first run open /etc/apt-fast.conf in a text -editor and uncomment the line for your download manager before using it and -configure the other options as well. +You need to have [aria2c](http://aria2.sourceforge.net/) installed: apt-get install aria2 -*OR* - - apt-get install axel Then, you should be ready to use it - simply run apt-fast instead of apt-get or aptitude any time you find yourself needing to manage packages! +### Multiple mirrors ### +It is recommended to add some local mirrors to share bandwidth with multiple +mirrors and don't heavily pull from a single server. This will also speedup +download. +Look at your distribution's archive mirror list and select some mirrors. + * Debian: http://www.debian.org/mirror/list + * Ubuntu: https://launchpad.net/ubuntu/+archivemirrors +Then add them to whitespace and comma separated list in config file, e.g.: + MIRRORS=( 'http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' + 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) + +*NOTE:* Write also your mirrors listed in your sources.list into that list to +make sure associated mirrors are handled properly. Remember: Commas separate +mirrors for same archive, whitespaces separate different archives (e.g. +official archive and PPA are different archives). + + ### Autocompletion ### #### Bash #### - cp completion/bash/apt-fast /etc/bash_completion.d/ + cp completions/bash/apt-fast /etc/bash_completion.d/ chown root:root /etc/bash_completion.d/apt-fast . /etc/bash_completion #### Zsh #### - cp completion/zsh/_apt-fast /usr/share/zsh/functions/Completion/Debian/ + cp completions/zsh/_apt-fast /usr/share/zsh/functions/Completion/Debian/ chown root:root /usr/share/zsh/functions/Completion/Debian/_apt-fast - rehash + source /usr/share/zsh/functions/Completion/Debian/_apt-fast ### Manual page installation ### @@ -73,6 +83,9 @@ ------- Consider apt-fast and all of it's derivatives licensed under the GNU GPLv3+. +Copyright: 2008-2012 Matt Parnell, http://www.mattparnell.com +Improvements, maintenance, revisions - 2012 Dominique Lasserre + Special thanks -------------- diff -Nru apt-fast-1.7.5/apt-fast apt-fast-1.8.1/apt-fast --- apt-fast-1.7.5/apt-fast 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/apt-fast 2012-12-12 15:28:07.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# apt-fast v1.7 +# apt-fast v1.8 # Use this just like aptitude or apt-get for faster package downloading. # # Copyright: 2008-2012 Matt Parnell, http://www.mattparnell.com @@ -58,71 +58,97 @@ fi done +# To handle priority of options correctly (environment over config file vars) +# we need to preserve all interesting env variables. As this wouldn't be +# difficult enough we have to preserve complete env vars (especially if value +# ist set (even empty) or not) when changing context (sudo)... +# Set a 'random' string to all unset variables. +TMP_RANDOM="13979853562951413" +TMP_LCK_FILE="${LCK_FILE-${TMP_RANDOM}}" +TMP_DOWNLOADBEFORE="${DOWNLOADBEFORE-${TMP_RANDOM}}" +TMP__APTMGR="${_APTMGR-${TMP_RANDOM}}" +TMP_APTCACHE="${APTCACHE-${TMP_RANDOM}}" +TMP_DLDIR="${DLDIR-${TMP_RANDOM}}" +TMP_DLLIST="${DLLIST-${TMP_RANDOM}}" +TMP_LISTDIR="${LISTDIR-${TMP_RANDOM}}" +TMP__MAXNUM="${MAXNUM-${TMP_RANDOM}}" +TMP_aptfast_prefix="${aptfast_prefix-${TMP_RANDOM}}" +TMP_APT_FAST_TIMEOUT="${APT_FAST_TIMEOUT-${TMP_RANDOM}}" + # Check for proper privileges. # Call explicitly with environment variables to get them into root conext. -#FIXME: Variables passed by command line should overwrite -# config file variables. -if ((root)); then - [ "$UID" = 0 ] || exec sudo LCK_FILE="$LCK_FILE" \ - DOWNLOADBEFORE="$DOWNLOADBEFORE" \ - _APTMGR="$_APTMGR" \ - APTCACHE="$APTCACHE" \ - DLDIR="$DLDIR" \ - DLLIST="$DLLIST" \ - LISTDIR="$LISTDIR" \ - _MAXIMUM="$MAXIMUM" \ - aptfast_prefix="$aptfast_prefix" \ - APT_FAST_TIMEOUT="$APT_FAST_TIMEOUT" "$0" "$@" +if [ "$root" = 1 -a "$UID" != 0 ]; then + exec sudo DEBUG="$DEBUG" \ + LCK_FILE="$TMP_LCK_FILE" \ + DOWNLOADBEFORE="$TMP_DOWNLOADBEFORE" \ + _APTMGR="$TMP__APTMGR" \ + APTCACHE="$TMP_APTCACHE" \ + DLDIR="$TMP_DLDIR" \ + DLLIST="$TMP_DLLIST" \ + LISTDIR="$TMP_LISTDIR" \ + _MAXNUM="$TMP_MAXNUM" \ + aptfast_prefix="$TMP_aptfast_prefix" \ + APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT" "$0" "$@" fi -# Set variable only if not already set. -#NOTE: Disadvantage of this function is: Quoted variables are not longer -# quoted when passed to function (see color variables). Therefore we -# quote values explicitly. -setvar(){ - [ "$(eval echo \$${1%%=*})" ] || eval "${1%%=*}=\"${1#*=}\"" -} # Define lockfile. # Use /tmp as directory because everybody (not only root) has to have write # permissions. # We need lock for non-root commands too, because we only have one download # list file. -setvar LCK_FILE="/tmp/apt-fast" +LCK_FILE="/tmp/apt-fast" # Set default package manager, APT cache, temporary download dir, # temporary download list file, and maximal parallel downloads -setvar _APTMGR=apt-get -eval $(apt-config shell rootdir Dir) -eval $(apt-config shell cachedir Dir::Cache) -eval $(apt-config shell archivesdir Dir::Cache::archives) -eval $(apt-config shell statedir Dir::State) -eval $(apt-config shell listsdir Dir::State::lists) -setvar APTCACHE="${rootdir}${cachedir}${archivesdir}" -setvar DLDIR="$APTCACHE/apt-fast" -setvar DLLIST="/tmp/apt-fast.list" -setvar LISTDIR="${rootdir}${statedir}${listsdir}" -setvar _MAXNUM=5 +_APTMGR=apt-get +eval $(apt-config shell APTCACHE Dir::Cache::archives/d) +# Check if APT config option Dir::Cache::archives::apt-fast-partial is set. +eval $(apt-config shell apt_fast_partial Dir::Cache::archives::apt-fast-partial/d) +if [ -z "$apt_fast_partial" ]; then + eval $(apt-config -o Dir::Cache::archives::apt-fast-partial=apt-fast shell DLDIR Dir::Cache::archives::apt-fast-partial/d) +else + eval $(apt-config shell DLDIR Dir::Cache::archives::apt-fast-partial/d) +fi +# Currently not needed. +eval $(apt-config shell LISTDIR Dir::State::lists/d) +DLLIST="/tmp/apt-fast.list" +_MAXNUM=5 # Prefix in front of apt-fast output: -setvar aptfast_prefix= - +aptfast_prefix= # Set color variables. -setvar cGreen='\e[0;32m' -setvar cRed='\e[0;31m' -setvar cBlue='\e[0;34m' -setvar endColor='\e[0m' +cGreen='\e[0;32m' +cRed='\e[0;31m' +cBlue='\e[0;34m' +endColor='\e[0m' # Set timout value for apt-fast download confirmation dialog. # Value is in seconds. -setvar APT_FAST_TIMEOUT=60 +APT_FAST_TIMEOUT=60 +# Download command. +_DOWNLOADER='aria2c -c -j ${_MAXNUM} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' # Load config file. -setvar CONFFILE="/etc/apt-fast.conf" +CONFFILE="/etc/apt-fast.conf" source "$CONFFILE" +# Now overwrite with preserved values if values were set before (compare with +# 'random' string). +[ "$TMP_LCK_FILE" = "$TMP_RANDOM" ] || LCK_FILE="$TMP_LCK_FILE" +[ "$TMP_DOWNLOADBEFORE" = "$TMP_RANDOM" ] || DOWNLOADBEFORE="$TMP_DOWNLOADBEFORE" +[ "$TMP__APTMGR" = "$TMP_RANDOM" ] || _APTMGR="$TMP__APTMGR" +[ "$TMP_APTCACHE" = "$TMP_RANDOM" ] || APTCACHE="$TMP_APTCACHE" +[ "$TMP_DLDIR" = "$TMP_RANDOM" ] || DLDIR="$TMP_DLDIR" +[ "$TMP_DLLIST" = "$TMP_RANDOM" ] || DLLIST="$TMP_DLLIST" +[ "$TMP_LISTDIR" = "$TMP_RANDOM" ] || LISTDIR="$TMP_LISTDIR" +[ "$TMP__MAXNUM" = "$TMP_RANDOM" ] || _MAXNUM="$TMP__MAXNUM" +[ "$TMP_aptfast_prefix" = "$TMP_RANDOM" ] || aptfast_prefix="$TMP_aptfast_prefix" +[ "$TMP_APT_FAST_TIMEOUT" = "$TMP_RANDOM" ] || APT_FAST_TIMEOUT="$TMP_APT_FAST_TIMEOUT" + + # Disable colors if not executed in terminal. if [ ! -t 1 ]; then cGreen= @@ -158,11 +184,52 @@ trap "LCK_RM_1" 2 9 15 +# Check if mirrors are available. And if so add all mirrors to download list. +get_mirrors(){ + # Check all mirror lists. + for mirrorstr in ${MIRRORS[@]}; do + # Build mirrors array from comma separated string. + mirrors=( $(echo "$mirrorstr" | sed "s/\([^,]\+\)\s*,\s*/\1 /g") ) + # This does not the \s*,\s* trick, so we use sed instead to make it more + # robust. + #mirrors=( ${mirrorstr//,/ } ) + # Check for all mirrors if URI of $1 is from mirror. If so add all other + # mirrors to (resmirror) list and break all loops. + for mirror in ${mirrors[@]}; do + # Real expension. + if [[ "$1" == "$mirror"* ]]; then + filepath=${1#${mirror}} + # Build list for aria download list. + list="${mirrors[@]}" + echo -e "${list// /${filepath}\t}$filepath\n" + return 0 + fi + done + done + # No other mirrors found. + echo "$1" +} + # Get the package URLs. get_uris(){ + # Add header to overwrite file. + echo "# apt-fast mirror list: $(date)" > "$DLLIST" #NOTE: aptitude doesn't have this functionality, so we use apt-get to get # package URIs. - apt-get -y --print-uris $@ | egrep -o -e "(ht|f)tp://[^\']+" > "$DLLIST" + for urimd5 in $(apt-get -y --print-uris $@ | egrep "^'(http(s|)|(s|)ftp)://[^']+'.+ MD5Sum:\S+\s*$" | + sed "s/^'\(.\+\)'.*MD5Sum:\(\S\+\)\s*$/\1::MD5Sum:\2/"); do + #for urimd5 in $(cat foo | egrep "^'(http(s|)|(s|)ftp)://[^']+'.+ MD5Sum:\S+\s*$" | + # sed "s/^'\(.\+\)'.*MD5Sum:\(\S\+\)\s*$/\1::MD5Sum:\2/"); do + uri="${urimd5%::MD5Sum:*}" + checksum="${urimd5#*::MD5Sum:}" + echo "$(get_mirrors "$uri")" >> "$DLLIST" + #echo " dir=$DLDIR" >> "$DLLIST" + echo " checksum=md5=$checksum" >> "$DLLIST" + echo " out=$(basename $uri)" >> "$DLLIST" + done + #cat "$DLLIST" + #LCK_RM + #exit } # Create and insert a PID number to lockfile. @@ -172,9 +239,11 @@ # job running in background (lockfile-touch process): export LOCKPID="$!" -# Make sure one of the download managers is enabled -if [ -z "$_DOWNLOADER" ]; then - msg "You must configure $CONFFILE to use axel or aria2c." "normal" "err" +# Make sure aria2c (in general first parameter from _DOWNLOADER) is available. +CMD="$(echo "$_DOWNLOADER" | sed 's/^\s*\([^ ]\+\).*$/\1/')" +if [ ! $(command -v "$CMD") ]; then + msg "Command not found: $CMD" "normal" "err" + msg "You must configure $CONFFILE to use aria2c or another supported download manager" "normal" "err" LCK_RM_1 fi @@ -239,8 +308,6 @@ cd "$DLDIR" &>/dev/null || LCK_RM_1 - #FIXME: Better handling of finished downloads but canceled apt-fast - # axel redownloads deb again (with [0-9] suffix). eval "${_DOWNLOADER}" # execute downloadhelper command if [ $(find "$DLDIR" -printf . | wc -c) -gt 1 ]; then # Move all packages to the apt install directory by force to ensure @@ -265,7 +332,6 @@ } elif [ "$option" == "download" ]; then - #NOTE: axel does not recognize already downloaded packages. get_uris $@ eval "${_DOWNLOADER}" diff -Nru apt-fast-1.7.5/apt-fast.conf apt-fast-1.8.1/apt-fast.conf --- apt-fast-1.7.5/apt-fast.conf 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/apt-fast.conf 2012-12-12 15:28:07.000000000 +0000 @@ -1,7 +1,7 @@ ################################################################### # CONFIGURATION OPTIONS ################################################################### -# Every item has a default value besides _DOWNLOADER . +# Every item has a default value besides MIRRORS (which is unset). # Use aptitude or apt-get? # Note that for outputting the package URI list, we always use apt-get @@ -22,6 +22,23 @@ #DOWNLOADBEFORE=true +# Choose mirror list to speed up downloads from same archive. To select some +# mirrors take a look at your distribution's archive mirror lists. +# Debian: http://www.debian.org/mirror/list +# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors +# +# Examples: +# To use some German mirrors and official Debian and Ubuntu archives you can use: +# MIRRORS=( 'http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' +# 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) +# To use French Ubuntu mirrors you can use: +# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' ) +# +# Default: disabled +# +#MIRRORS=( 'none' ) + + # Maximum number of connections # You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM} # @@ -38,23 +55,24 @@ #DLLIST=/tmp/apt-fast.list -# Note that the manager you choose has other options - feel free -# to setup your own _DOWNLOADER or customize one of the ones below -# they're simply here as examples, and to provide sane defaults +# Download command to use. Temporary download list is designed for aria2. But +# you can choose another download command or download manager. It has to +# support following input file syntax (\t is tab character): +# +# # Comment +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME1 +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME2 +# ... # -# Default: no download helper enabled +# Examples: +# aria2c with a proxy (set username, proxy, ip and password!) +# _DOWNLOADER='aria2c -c 20 -j ${_MAXNUM} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}' # -# Download manager selection -# (choose one by uncommenting one #_DOWNLOADER line) +# Default: _DOWNLOADER='aria2c -c -j ${_MAXNUM} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' # -# aria2c: #_DOWNLOADER='aria2c -c -j ${_MAXNUM} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' -# -# aria2c with a proxy (set username, proxy, ip and password!) -#_DOWNLOADER='aria2c -c 20 -j ${_MAXNUM} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}' -# -# axel: -#_DOWNLOADER='cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' # Download temp folder for Downloadmanager diff -Nru apt-fast-1.7.5/debian/bzr-builder.manifest apt-fast-1.8.1/debian/bzr-builder.manifest --- apt-fast-1.7.5/debian/bzr-builder.manifest 2012-10-09 21:36:50.000000000 +0000 +++ apt-fast-1.8.1/debian/bzr-builder.manifest 2012-12-12 15:28:07.000000000 +0000 @@ -1,2 +1,2 @@ # bzr-builder format 0.3 deb-version {debversion} -lp:apt-fast revid:lasserre.d@gmail.com-20121009212236-dm7i2cxvea60shja +lp:apt-fast revid:lasserre.d@gmail.com-20121212151345-ih2jgo72wqbq9byk diff -Nru apt-fast-1.7.5/debian/changelog apt-fast-1.8.1/debian/changelog --- apt-fast-1.7.5/debian/changelog 2012-10-10 20:15:17.000000000 +0000 +++ apt-fast-1.8.1/debian/changelog 2012-12-12 15:28:07.000000000 +0000 @@ -1,10 +1,29 @@ -apt-fast (1.7.5-2~precise2) precise; urgency=high +apt-fast (1.8.1-1~precise1) precise; urgency=low * Auto build. - -- Goran Vidovic (gogo) Fri, 10 Oct 2012 10:48:51 +0200 + -- Dominique Lasserre Wed, 12 Dec 2012 15:28:07 +0000 -apt-fast (1.7.5-2) unstable; urgency=high +apt-fast (1.8.1-1) unstable; urgency=low + + * New upstream build. + - Proper default / config file / environment variables handling. + - New MIRRORS option (see manpage). + - APT path buildings hardened. + - Checksum checks. + * axel support dropped. + * New debconf translation: + - Croatian (hr) (gogo) + - French (fr) (Kcchouette) + - Malay (ms) (abuyop) + * Fix pre-depends issue if no downloader already installed (-> debconf loop). + Thanks to Eric Morgan! LP: #1081710 + * Fix apt-config path buildings. + * Fix debconf question priority (don't set it always to 'high'). + + -- Dominique Lasserre Wed, 12 Dec 2012 16:08:39 +0100 + +apt-fast (1.7.5-2) unstable; urgency=low * Fix endless debconf loop of apt-fast/downloadcmd with priority critical or noninteractive frontend. LP: #1064656 diff -Nru apt-fast-1.7.5/debian/config apt-fast-1.8.1/debian/config --- apt-fast-1.7.5/debian/config 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/config 2012-12-12 15:28:07.000000000 +0000 @@ -11,29 +11,25 @@ use Debconf::Client::ConfModule ':all'; my $conffile="/etc/apt-fast.conf"; -my ($downloader, $downloadcmd, $maxdownloads, $aptmanager, $tmpdownloaddir, - $tmpdownloadlist, $aptcache, $dlflag) = ''; +$_ = '' for my ($aptmanager, $downloader, $downloadcmd, $maxdownloads, + $tmpdownloaddir, $tmpdownloadlist, $aptcache, $dlflag); my $ok; my $priority; -my $customcmd = 0; +my ($customcmd, $dl_list) = (0, 0); -# download helper commands my $ariacmd = 'aria2c -c -j ${_MAXNUM} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0'; -my $axelcmd = 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a'; version('2.0') or die "Failed to start debconf.\n"; -# check if downloader is available on system -sub checkdownloader{ - if (`which aria2c`){ # due to package dependencies one of them is installed - return ($ariacmd, "aria2c"); - } - else { - return ($axelcmd, "axel"); - } +# Check if aptitude is installed. If not set low priority to package manager +# question. +sub checkaptitude{ + return 1 if (`which aptitude`); + return 0; } # default debconf question loop +#NOTE: Keep this in sync with same method in postinst script. sub debconfloop{ my $ok = 0; my $type = shift; @@ -55,7 +51,7 @@ } } else { - $priority = "high" unless ($priority eq "critical"); + $priority = "high" unless (($priority eq "critical") or not $ok); if (input($priority, "apt-fast/$type") eq "question will be asked"){ reset("apt-fast/$type"); } @@ -113,31 +109,35 @@ # analyse parsed values and set questions with debconf # _APTMGR -&debconfloop("aptmanager", "high", $aptmanager, "cmd"); +if (&checkaptitude) { + $priority = "high"; +} +else { + $priority = "low"; +} +&debconfloop("aptmanager", $priority, $aptmanager, "cmd"); # _DOWNLOADER # downloader $ok = 0; -$priority = "medium"; +# Compatibility check for upgrades from < 1.8. +if (get("apt-fast/downloader") eq "axel") { + fset("apt-fast/downloader", "seen", "false"); + fset("apt-fast/downloadcmd", "seen", "false"); + $downloadcmd = ""; + $priority = "high"; +} +else { + $priority = "medium"; +} while (1){ if (length ($downloadcmd // '')){ - if ($ok){ - last if (($downloader eq "custom") || (`which $downloader`)); - ($downloadcmd, $downloader) = &checkdownloader; - } + last if $ok; if ($downloadcmd eq $ariacmd){ # just a very simple comparison if (input($priority, "apt-fast/downloader") eq "question will be asked"){ set("apt-fast/downloader", "aria2c"); } - $downloader = "aria2c"; - $downloadcmd = $ariacmd; - } - elsif ($downloadcmd eq $axelcmd){ - if (input($priority, "apt-fast/downloader") eq "question will be asked"){ - set("apt-fast/downloader", "axel"); - } - $downloader = "axel"; - $downloadcmd = $axelcmd; + ($downloadcmd, $downloader) = ($ariacmd, "aria2c"); } else { if (input($priority, "apt-fast/downloader") eq "question will be asked"){ @@ -147,8 +147,8 @@ } } else { - ($downloadcmd, $downloader) = &checkdownloader; - $priority = "high"; + ($downloadcmd, $downloader) = ($ariacmd, "aria2c"); + $priority = "high" if $ok; if (input($priority, "apt-fast/downloader") eq "question will be asked"){ set("apt-fast/downloader", $downloader); } @@ -157,18 +157,17 @@ $downloader = get("apt-fast/downloader"); $ok = 1; } +set("apt-fast/downloadcmd", $downloadcmd) unless ($downloader eq "custom"); + # downloadcmd $ok = 0; if ($downloader eq "aria2c"){ $downloadcmd = $ariacmd; } -elsif ($downloader eq "axel"){ - $downloadcmd = $axelcmd; -} -elsif ($downloader eq "custom"){ - $customcmd = 1 if ($downloader eq "custom"); # remember if custom command is used +else { + $customcmd = 1; # remember if custom command is used } -$priority = ($customcmd) ? "critical" : "low"; +$priority = $customcmd ? "critical" : "low"; while (1){ if (length ($downloadcmd // '')){ last if $ok; @@ -180,13 +179,10 @@ if ($downloader eq "aria2c"){ $downloadcmd = $ariacmd; } - elsif ($downloader eq "axel"){ - $downloadcmd = $axelcmd; - } else { - ($downloadcmd, $downloader) = &checkdownloader; + ($downloadcmd, $downloader) = ($ariacmd, "aria2c"); } - $priority = "high" unless ($priority eq "critical"); + $priority = "high" unless (($priority eq "critical") or not $ok); if ((input($priority, "apt-fast/downloadcmd") eq "question will be asked") # This is needed to fix LP #1064656 (endless loop if DEBIAN_PRIORITY is # critical or frontend noninteractive). @@ -203,30 +199,27 @@ # _MAXNUM # skip if it is not used in _DOWNLOADER if ($downloadcmd =~ /\${_MAXNUM}/){ - &debconfloop("maxdownloads", ($customcmd) ? "critical" : "medium", $maxdownloads, "num"); + &debconfloop("maxdownloads", $customcmd ? "critical" : "high", $maxdownloads, "num"); } else { set("apt-fast/maxdownloads", ""); } -# DOWNLOADBEFORE -&debconfloop("dlflag", "medium", $dlflag); - # DLLIST -&debconfloop("tmpdownloadlist", ($customcmd) ? "critical" : "low", $tmpdownloadlist); +$dl_list = 1 if ($downloadcmd ne $ariacmd); +&debconfloop("tmpdownloadlist", ($customcmd or $dl_list) ? "critical" : "low", $tmpdownloadlist); + +# DOWNLOADBEFORE +&debconfloop("dlflag", "high", $dlflag); # DLDIR &debconfloop("tmpdownloaddir", "low", $tmpdownloaddir); # APTCACHE # Set archive directory: -my @aptdirs = qw(Dir Dir::Cache Dir::Cache::archives); -my $archivedir = ''; -for (@aptdirs){ - my $tmpdir = `apt-config shell var $_`; - $tmpdir =~ s/^var='(.+)'\n/$1/; - $archivedir .= $tmpdir; -} +my $archivedir = `apt-config shell var Dir::Cache::archives/d`; +$archivedir =~ s/^var='(.+)'\n/$1/; + $ok = 0; $priority = "low"; while (1){ @@ -237,7 +230,7 @@ } } else { - $priority = "high"; + $priority = "high" if $ok; if (input($priority, "apt-fast/aptcache") eq "question will be asked"){ set("apt-fast/aptcache", $archivedir); } diff -Nru apt-fast-1.7.5/debian/control apt-fast-1.8.1/debian/control --- apt-fast-1.7.5/debian/control 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/control 2012-12-12 15:28:07.000000000 +0000 @@ -10,8 +10,7 @@ Package: apt-fast Architecture: any -Depends: ${misc:Depends}, lockfile-progs -Pre-Depends: aria2 | axel +Depends: ${misc:Depends}, lockfile-progs, aria2 Suggests: aptitude Description: shellscript wrapper for apt-get or aptitude apt-fast is a shellscript wrapper for apt-get that can drastically improve apt diff -Nru apt-fast-1.7.5/debian/po/af.po apt-fast-1.8.1/debian/po/af.po --- apt-fast-1.7.5/debian/po/af.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/af.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-19 08:49+0000\n" "Last-Translator: Dawid de Jager \n" "Language-Team: Afrikaans \n" +"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-20 05:02+0000\n" "X-Generator: Launchpad (build 15985)\n" -"Language: af\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Aflaai-helper bevellyn" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/ar.po apt-fast-1.8.1/debian/po/ar.po --- apt-fast-1.7.5/debian/po/ar.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ar.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-09 02:10+0000\n" "Last-Translator: nofallyaqoo \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-10 05:01+0000\n" "X-Generator: Launchpad (build 15924)\n" -"Language: ar\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "الأمر الخاص بمساعد التنزيل:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " @@ -138,5 +129,5 @@ "This does not affect package manager dialog but download installable " "packages before package manager confirmation." msgstr "" -"هذا لا يُؤَثر في مُديرَ الحُزمِ ولكن تَنْزّيل حُزم قابِلَة للتَثبِيت قَبلَ " -"تأكيّد مُدير الحُزم قد يَفعَل." +"هذا لا يُؤَثر في مُديرَ الحُزمِ ولكن تَنْزّيل حُزم قابِلَة للتَثبِيت قَبلَ تأكيّد مُدير الحُزم " +"قد يَفعَل." diff -Nru apt-fast-1.7.5/debian/po/ast.po apt-fast-1.8.1/debian/po/ast.po --- apt-fast-1.7.5/debian/po/ast.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ast.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 13:01+0000\n" "Last-Translator: Xuacu Saturio \n" "Language-Team: Asturian \n" +"Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: ast\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Llinia de comandu del ayudante de descargues:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/bg.po apt-fast-1.8.1/debian/po/bg.po --- apt-fast-1.7.5/debian/po/bg.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/bg.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 00:01+0000\n" "Last-Translator: Dominique Lasserre \n" "Language-Team: Bulgarian \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: bg\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Помощник за сваляне, команден ред:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/bn.po apt-fast-1.8.1/debian/po/bn.po --- apt-fast-1.7.5/debian/po/bn.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/bn.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-22 19:04+0000\n" "Last-Translator: Mahay Alam Khan \n" "Language-Team: Bengali \n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: bn\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "এক্সেল" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "ডাউনলোড সহায়ক কমান্ড লাইন:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/bs.po apt-fast-1.8.1/debian/po/bs.po --- apt-fast-1.7.5/debian/po/bs.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/bs.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 00:01+0000\n" "Last-Translator: Kenan Dervišević \n" "Language-Team: Bosnian \n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: bs\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Komnadna linija odabira pomoći za preuzimanje:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/ca.po apt-fast-1.8.1/debian/po/ca.po --- apt-fast-1.7.5/debian/po/ca.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ca.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 12:11+0000\n" "Last-Translator: Alfredo Hernández \n" "Language-Team: Catalan \n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: ca\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Línia d'ordres de l'assistent de baixada:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/de.po apt-fast-1.8.1/debian/po/de.po --- apt-fast-1.7.5/debian/po/de.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/de.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 03:13+0000\n" "Last-Translator: Dominique Lasserre \n" "Language-Team: German\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: de\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Downloadhelferkommando:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/el.po apt-fast-1.8.1/debian/po/el.po --- apt-fast-1.7.5/debian/po/el.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/el.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-22 15:38+0000\n" "Last-Translator: tzem \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: el\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " @@ -89,8 +80,7 @@ #. Description #: ../templates:4001 msgid "Package manager to install and remove software:" -msgstr "" -"Πακέτο διαχείρισης για να εγκαταστήσετε και να καταργήσετε λογισμικό:" +msgstr "Πακέτο διαχείρισης για να εγκαταστήσετε και να καταργήσετε λογισμικό:" #. Type: string #. Description diff -Nru apt-fast-1.7.5/debian/po/en_AU.po apt-fast-1.8.1/debian/po/en_AU.po --- apt-fast-1.7.5/debian/po/en_AU.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/en_AU.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 15:17+0000\n" "Last-Translator: Anthony Harrington \n" "Language-Team: English (Australia) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: \n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Download helper command line:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/en_CA.po apt-fast-1.8.1/debian/po/en_CA.po --- apt-fast-1.7.5/debian/po/en_CA.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/en_CA.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 00:01+0000\n" "Last-Translator: Dominique Lasserre \n" "Language-Team: English (Canada) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: \n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Download helper command line:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/en_GB.po apt-fast-1.8.1/debian/po/en_GB.po --- apt-fast-1.7.5/debian/po/en_GB.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/en_GB.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 11:32+0000\n" "Last-Translator: Alfredo Hernández \n" "Language-Team: English (United Kingdom) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: \n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Download helper command line:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/eo.po apt-fast-1.8.1/debian/po/eo.po --- apt-fast-1.7.5/debian/po/eo.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/eo.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-22 14:44+0000\n" "Last-Translator: Michael Moroni \n" "Language-Team: Esperanto \n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: eo\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Komandlinio de elŝuthelpilo:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/es.po apt-fast-1.8.1/debian/po/es.po --- apt-fast-1.7.5/debian/po/es.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/es.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 12:03+0000\n" "Last-Translator: Alfredo Hernández \n" "Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: es\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Línea de órdenes del ayudante de descarga:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/fi.po apt-fast-1.8.1/debian/po/fi.po --- apt-fast-1.7.5/debian/po/fi.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/fi.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-23 10:22+0000\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: fi\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/fr.po apt-fast-1.8.1/debian/po/fr.po --- apt-fast-1.7.5/debian/po/fr.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/fr.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" -"PO-Revision-Date: 2012-10-02 21:19+0000\n" -"Last-Translator: Nicolas Delvaux \n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" +"PO-Revision-Date: 2012-11-21 22:15+0000\n" +"Last-Translator: Kcchouette \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-03 05:43+0000\n" -"X-Generator: Launchpad (build 16061)\n" -"Language: fr\n" +"X-Launchpad-Export-Date: 2012-11-22 05:29+0000\n" +"X-Generator: Launchpad (build 16293)\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Ligne de commande de l'aide au téléchargement :" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " @@ -140,3 +131,6 @@ "This does not affect package manager dialog but download installable " "packages before package manager confirmation." msgstr "" +"Ceci n'affecte pas la boîte de dialogue du gestionnaire de paquets, mais " +"télécharge des paquets installables avant la confirmation du gestionnaire de " +"paquets." diff -Nru apt-fast-1.7.5/debian/po/gl.po apt-fast-1.8.1/debian/po/gl.po --- apt-fast-1.7.5/debian/po/gl.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/gl.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 12:36+0000\n" "Last-Translator: Miguel Anxo Bouzada \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: gl\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Liña de ordes do axudante de descargas:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/hr.po apt-fast-1.8.1/debian/po/hr.po --- apt-fast-1.7.5/debian/po/hr.po 2012-10-10 19:59:58.000000000 +0000 +++ apt-fast-1.8.1/debian/po/hr.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-10-10 19:55+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-10 19:56+0000\n" +"X-Launchpad-Export-Date: 2012-10-11 05:42+0000\n" "X-Generator: Launchpad (build 16118)\n" -"Language: hr\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Naredbeni redak pomagača preuzimanja:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/id.po apt-fast-1.8.1/debian/po/id.po --- apt-fast-1.7.5/debian/po/id.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/id.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-28 15:22+0000\n" "Last-Translator: Hertatijanto Hartono \n" "Language-Team: Indonesian \n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: id\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Unduh perintah baris penolong:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/it.po apt-fast-1.8.1/debian/po/it.po --- apt-fast-1.7.5/debian/po/it.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/it.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-09 10:12+0000\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-10 05:01+0000\n" "X-Generator: Launchpad (build 15924)\n" -"Language: it\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Riga di comando del gestore scaricamenti:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/ja.po apt-fast-1.8.1/debian/po/ja.po --- apt-fast-1.7.5/debian/po/ja.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ja.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-09 03:39+0000\n" "Last-Translator: Shushi Kurose \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-10 05:01+0000\n" "X-Generator: Launchpad (build 15924)\n" -"Language: ja\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "ダウンロードヘルパーのコマンドライン:" @@ -66,13 +57,14 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " "temporary download list file may given by configuration file." msgstr "" -"設定ファイルで指定されたパラレル接続の最大数は \\${_MAXNUM} で、一時ダウンロードリストファイル数は \\${DLLIST} です。" +"設定ファイルで指定されたパラレル接続の最大数は \\${_MAXNUM} で、一時ダウン" +"ロードリストファイル数は \\${DLLIST} です。" #. Type: string #. Description @@ -137,5 +129,6 @@ "This does not affect package manager dialog but download installable " "packages before package manager confirmation." msgstr "" -"これによってパッケージマネージャーのダイアログに影響することはありませんが、パッケージマネージャーで確認する前にインストール可能なパッケージをダウンロード" -"します。" +"これによってパッケージマネージャーのダイアログに影響することはありませんが、" +"パッケージマネージャーで確認する前にインストール可能なパッケージをダウンロー" +"ドします。" diff -Nru apt-fast-1.7.5/debian/po/ko.po apt-fast-1.8.1/debian/po/ko.po --- apt-fast-1.7.5/debian/po/ko.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ko.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 00:06+0000\n" "Last-Translator: Dominique Lasserre \n" "Language-Team: Korean \n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: ko\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "도움말 명령줄을 내려받기" @@ -66,14 +57,14 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " "temporary download list file may given by configuration file." msgstr "" -"\\$(_MAXNUM) 은 동시에 수립할 수 있는 최다 연결량이고, \\$(DLLIST) 은 설정 파일로부터 얻은 임시 다운로드 " -"정보입니다." +"\\$(_MAXNUM) 은 동시에 수립할 수 있는 최다 연결량이고, \\$(DLLIST) 은 설정 파" +"일로부터 얻은 임시 다운로드 정보입니다." #. Type: string #. Description diff -Nru apt-fast-1.7.5/debian/po/mr.po apt-fast-1.8.1/debian/po/mr.po --- apt-fast-1.7.5/debian/po/mr.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/mr.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-28 14:58+0000\n" "Last-Translator: प्रसाद पाटील \n" "Language-Team: Marathi \n" +"Language: mr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: mr\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "एक्सेल" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "डाउनलोड सहायक command line:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/ms.po apt-fast-1.8.1/debian/po/ms.po --- apt-fast-1.7.5/debian/po/ms.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ms.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" -"PO-Revision-Date: 2012-06-25 00:01+0000\n" -"Last-Translator: Dominique Lasserre \n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" +"PO-Revision-Date: 2012-10-09 22:08+0000\n" +"Last-Translator: abuyop \n" "Language-Team: Malay \n" +"Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" -"X-Generator: Launchpad (build 15914)\n" -"Language: ms\n" +"X-Launchpad-Export-Date: 2012-10-10 05:36+0000\n" +"X-Generator: Launchpad (build 16112)\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Muat turun" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " @@ -130,7 +121,7 @@ #. Description #: ../templates:8001 msgid "Suppress apt-fast confirmation dialog?" -msgstr "" +msgstr "Paksa dialog pengesahan apt-fast?" #. Type: boolean #. Description @@ -139,3 +130,5 @@ "This does not affect package manager dialog but download installable " "packages before package manager confirmation." msgstr "" +"Ia tidak mempengaruhi dialog pengurus pakej tetapi muat turun pakej boleh " +"pasang sebelum pengesahan pengurus pakej." diff -Nru apt-fast-1.7.5/debian/po/my.po apt-fast-1.8.1/debian/po/my.po --- apt-fast-1.7.5/debian/po/my.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/my.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-22 07:18+0000\n" "Last-Translator: Pyae Sone \n" "Language-Team: Burmese \n" +"Language: my\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: my\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/nl.po apt-fast-1.8.1/debian/po/nl.po --- apt-fast-1.7.5/debian/po/nl.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/nl.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 00:01+0000\n" "Last-Translator: Heber Dijks \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: nl\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Download helper command line:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/pl.po apt-fast-1.8.1/debian/po/pl.po --- apt-fast-1.7.5/debian/po/pl.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/pl.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 19:28+0000\n" "Last-Translator: Łukasz Wiśniewski \n" "Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: pl\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Linia komend akceleratora pobierania:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/pt.po apt-fast-1.8.1/debian/po/pt.po --- apt-fast-1.7.5/debian/po/pt.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/pt.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 00:01+0000\n" "Last-Translator: Dominique Lasserre \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: pt\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Linha de comando de auxiliar de download:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/pt_BR.po apt-fast-1.8.1/debian/po/pt_BR.po --- apt-fast-1.7.5/debian/po/pt_BR.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/pt_BR.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 00:01+0000\n" "Last-Translator: Dominique Lasserre \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: pt_BR\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Linha de comando de auxiliar de download:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/ru.po apt-fast-1.8.1/debian/po/ru.po --- apt-fast-1.7.5/debian/po/ru.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ru.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-25 04:46+0000\n" "Last-Translator: Oleg Koptev \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: ru\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Консоль помощника загрузки:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/te.po apt-fast-1.8.1/debian/po/te.po --- apt-fast-1.7.5/debian/po/te.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/te.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-22 17:21+0000\n" "Last-Translator: Praveen Illa \n" "Language-Team: Telugu \n" +"Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: te\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "దింపుకోలు సహాయకం ఆదేశ వరుస:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/templates.pot apt-fast-1.8.1/debian/po/templates.pot --- apt-fast-1.7.5/debian/po/templates.pot 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/templates.pot 2012-12-12 15:28:07.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: apt-fast\n" "Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,8 +19,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -28,17 +28,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -55,7 +46,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "" @@ -65,7 +56,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/tr.po apt-fast-1.8.1/debian/po/tr.po --- apt-fast-1.7.5/debian/po/tr.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/tr.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 12:35+0000\n" "Last-Translator: Şâkir Aşçı \n" "Language-Team: Turkish \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: tr\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "İndirme yardımcısı komur satırı:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/ug.po apt-fast-1.8.1/debian/po/ug.po --- apt-fast-1.7.5/debian/po/ug.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/ug.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 17:06+0000\n" "Last-Translator: Sahran \n" "Language-Team: Uyghur \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: \n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "چۈشۈرۈش ياردەمچىسى بۇيرۇق قۇرى:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/uk.po apt-fast-1.8.1/debian/po/uk.po --- apt-fast-1.7.5/debian/po/uk.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/uk.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-09 13:34+0000\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-10 05:01+0000\n" "X-Generator: Launchpad (build 15924)\n" -"Language: uk\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Рядок команди засобу отримання даних:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/uz.po apt-fast-1.8.1/debian/po/uz.po --- apt-fast-1.7.5/debian/po/uz.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/uz.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-06-22 16:31+0000\n" "Last-Translator: Akmal Xushvaqov \n" "Language-Team: Uzbek \n" +"Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: uz\n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "Yordamchi buyruqlar satrini yuklab olish:" @@ -66,7 +57,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " diff -Nru apt-fast-1.7.5/debian/po/zh_CN.po apt-fast-1.8.1/debian/po/zh_CN.po --- apt-fast-1.7.5/debian/po/zh_CN.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/zh_CN.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-08 13:20+0000\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (Simplified) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-09 05:09+0000\n" "X-Generator: Launchpad (build 15914)\n" -"Language: \n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "下载助手命令行：" @@ -66,12 +57,14 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " "temporary download list file may given by configuration file." -msgstr "\\${_MAXNUM} 是并行连接的最大值，\\${DLLIST} 是由配置文件生成的临时下载列表文件。" +msgstr "" +"\\${_MAXNUM} 是并行连接的最大值，\\${DLLIST} 是由配置文件生成的临时下载列表文" +"件。" #. Type: string #. Description diff -Nru apt-fast-1.7.5/debian/po/zh_TW.po apt-fast-1.8.1/debian/po/zh_TW.po --- apt-fast-1.7.5/debian/po/zh_TW.po 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/po/zh_TW.po 2012-12-12 15:28:07.000000000 +0000 @@ -6,22 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: apt-fast\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-08 02:48+0200\n" +"Report-Msgid-Bugs-To: apt-fast@packages.debian.org\n" +"POT-Creation-Date: 2012-12-12 15:34+0100\n" "PO-Revision-Date: 2012-09-17 01:03+0000\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (Traditional) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2012-09-18 05:34+0000\n" "X-Generator: Launchpad (build 15966)\n" -"Language: \n" #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "aria2c" @@ -29,17 +29,8 @@ #. Type: select #. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download -#. helper command. -#: ../templates:1001 -msgid "axel" -msgstr "axel" - -#. Type: select -#. Choices -#. Translators: aria2c and axel are both download accelerators and do not have -#. to be translated. 'custom' is a choice where users can manually add download +#. Translators: aria2c is a download accelerator and does not have to be +#. translated. 'custom' is a choice where users can manually add a download #. helper command. #: ../templates:1001 msgid "custom" @@ -56,7 +47,7 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "Download helper command line:" msgstr "下載小幫手命令列：" @@ -66,12 +57,14 @@ #. Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) #. and ${DLLIST} (file with package URIs) (mandatory) are variables in config #. file which may be used for download helper command, -#. e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +#. e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' #: ../templates:2001 msgid "" "\\${_MAXNUM} as maximum number of parallel connections and \\${DLLIST} as " "temporary download list file may given by configuration file." -msgstr "\\${_MAXNUM} 為平行連線的最大數，而 \\${DLLIST} 為可由組態檔給定的暫時下載清單檔案。" +msgstr "" +"\\${_MAXNUM} 為平行連線的最大數，而 \\${DLLIST} 為可由組態檔給定的暫時下載清" +"單檔案。" #. Type: string #. Description diff -Nru apt-fast-1.7.5/debian/postinst apt-fast-1.8.1/debian/postinst --- apt-fast-1.7.5/debian/postinst 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/postinst 2012-12-12 15:28:07.000000000 +0000 @@ -64,7 +64,7 @@ # preserve comments beside values my ($prespace, $comment) = ''; ($prespace, $comment) = ($1, $3) if $lines[$_] =~ /^([\s]*)[^=\s]+=([^\s][^#]*[^#\s]+|[^#\s]+|)(.*)$/; - print "->||$_||$prespace$key=$valhash{$key}{-1}||$comment\n"; + #print "->||$_||$prespace$key=$valhash{$key}{-1}||$comment\n"; $lines[$_] = "$prespace$key=$valhash{$key}{-1}$comment\n"; $isset = 1; } diff -Nru apt-fast-1.7.5/debian/templates apt-fast-1.8.1/debian/templates --- apt-fast-1.7.5/debian/templates 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/debian/templates 2012-12-12 15:28:07.000000000 +0000 @@ -1,17 +1,19 @@ Template: apt-fast/downloader Type: select -# Translators: aria2c and axel are both download accelerators and do not have -# to be translated. 'custom' is a choice where users can manually add download +# Translators: aria2c is a download accelerator and does not have to be +# translated. 'custom' is a choice where users can manually add a download # helper command. -__Choices: aria2c, axel, custom +__Choices: aria2c, custom +Default: aria2c _Description: Download helper selection: Template: apt-fast/downloadcmd Type: string +Default: aria2c -c -j ${_MAXNUM} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 # Translators: ${_MAXNUM} (maximum number of parallel connections) (optional) # and ${DLLIST} (file with package URIs) (mandatory) are variables in config # file which may be used for download helper command, -# e.g. 'cat ${DLLIST} | xargs -l1 axel -n ${_MAXNUM} -a' +# e.g. 'aria2c -c -j ${_MAXNUM} -i ${DLLIST}' _Description: Download helper command line: \${_MAXNUM} as maximum number of parallel connections and \${DLLIST} as temporary download list file may given by configuration file. diff -Nru apt-fast-1.7.5/man/apt-fast.8 apt-fast-1.8.1/man/apt-fast.8 --- apt-fast-1.7.5/man/apt-fast.8 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/man/apt-fast.8 2012-12-12 15:28:07.000000000 +0000 @@ -7,7 +7,7 @@ .\" Public License as published by the Free Software Foundation; either .\" version 3 of the License, or (at your option) any later version. .\" -.TH "APT\-FAST" "8" "2012-06-01" "apt\-fast 1.7" "apt\-fast Manual" +.TH "APT\-FAST" "8" "2012-10-11" "apt\-fast 1.8" "apt\-fast Manual" .SH "NAME" .LP apt\-fast \- shellscript wrapper for apt\-get or aptitude to speed up downloads @@ -27,7 +27,7 @@ drastically improve APT download times by downloading packages in parallel, with multiple connections per package. .br -It uses \fBaria2c\fR(1) or \fBaxel\fR(1) as default download accelerator. +It uses \fBaria2c\fR(1) as default download accelerator. .LP For every command or option you can use either \fBapt\-get\fR(8) or \fBaptitude\fR(1) syntax, depending which package manager you have selected @@ -109,4 +109,3 @@ \fBapt\-get\fR(8), \fBaptitude\fR(8), \fBaria2c\fR(1), -\fBaxel\fR(1) diff -Nru apt-fast-1.7.5/man/apt-fast.conf.5 apt-fast-1.8.1/man/apt-fast.conf.5 --- apt-fast-1.7.5/man/apt-fast.conf.5 2012-10-09 21:36:49.000000000 +0000 +++ apt-fast-1.8.1/man/apt-fast.conf.5 2012-12-12 15:28:07.000000000 +0000 @@ -7,7 +7,7 @@ .\" Public License as published by the Free Software Foundation; either .\" version 3 of the License, or (at your option) any later version. .\" -.TH "APT\-FAST.CONF" "5" "2012-06-01" "apt\-fast 1.7" "apt\-fast Manual" +.TH "APT\-FAST.CONF" "5" "2012-10-11" "apt\-fast 1.8" "apt\-fast Manual" .SH "NAME" .LP apt\-fast.conf \- configuration file for \fBapt\-fast\fR(5) @@ -33,6 +33,35 @@ .br Default: disabled .TP +\fBMIRRORS\fR +Choose mirror list to speed up downloads from same archive. To select some +mirrors take a look at your distribution's archive mirror lists. +.br +Debian: http://www.debian.org/mirror/list +.br +Ubuntu: https://launchpad.net/ubuntu/+archivemirrors + +Include standard mirror in list to associate it with alternative mirrors. List +of different archives is whitespace separated. List of alternative mirrors is +comma separated. +.br +If you use multiple archives make sure to add a whitespace after opening +bracket and before closing bracket. + +Examples: +To use some German mirrors and official Debian and Ubuntu archives you can use: +.br +MIRRORS=( 'http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' +.br + 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) +.br +To use French Ubuntu mirrors you can use: +.br +MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' ) + +.br +Default: disabled +.TP \fB_MAXNUM\fR This item is optional but is used in proposed download helper command (configuration item \fB_DOWNLOADER\fR). You can use it as count of maximum @@ -48,11 +77,23 @@ .TP \fB_DOWNLOADER\fR Download helper command how to download package URIs stored in \fBDLLIST\fR -file. +file. This command has to support following input file syntax (\\t is a tab +character): +.br +# Comment +.br +MIRROR1\\tMIRROR2\\tMIRROR3... +.br + out=FILENAME1 +.br +MIRROR1\\tMIRROR2\\tMIRROR3... +.br + out=FILENAME2 .br -aria2: 'aria2c \-c \-j ${_MAXNUM} \-i ${DLLIST} \-\-connect\-timeout=600 \-\-timeout=600 \-m0' +etc. + .br -axel: 'cat ${DLLIST} | xargs \-l1 axel \-n ${_MAXNUM} \-a' +Default: 'aria2c \-c \-j ${_MAXNUM} \-i ${DLLIST} \-\-connect\-timeout=600 \-\-timeout=600 \-m0' .TP \fBDLDIR\fR Directory where to download packages with download helper to. @@ -109,4 +150,3 @@ \fBapt\-get\fR(8), \fBaptitude\fR(8), \fBaria2c\fR(1), -\fBaxel\fR(1)