summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Graham <joseph@xylon.me.uk>2017-06-18 16:09:40 +0100
committerJoseph Graham <joseph@xylon.me.uk>2017-06-18 16:09:40 +0100
commit1442c1443a7bc2d414d23011c30a34debcb8e916 (patch)
treeb921675c16aa2b741189c3b78111adff4c3da11c
parent05d9e1982f6dd53fe35ce8c6479a8944e2c7b503 (diff)
Made it fall back to HTTP in case download stalls endlessly.
-rw-r--r--pacman2pacman-get107
-rw-r--r--translations/eo/pacman2pacman-get.po61
-rw-r--r--translations/es/pacman2pacman-get.po74
-rw-r--r--translations/fr/pacman2pacman-get.po75
-rw-r--r--translations/pacman2pacman-get.pot37
-rw-r--r--translations/pt_BR/pacman2pacman-get.po61
-rw-r--r--translations/sv/pacman2pacman-get.po73
7 files changed, 245 insertions, 243 deletions
diff --git a/pacman2pacman-get b/pacman2pacman-get
index afe0021..c01983b 100644
--- a/pacman2pacman-get
+++ b/pacman2pacman-get
@@ -31,12 +31,16 @@ torrent_folder='/srv/pacman2pacman/torrents'
pkg_cache_location='/var/cache/pacman/pkg'
+prog_check_freq=1.4 # seconds to update downlaod progress
+
+webseed_check_freq='60' # if download is still at 0% after this much time, check webseed is alive
+
# Pacman2pacman should be called like this from /etc/pacman.conf:
# XferCommand = /usr/bin/pacman2pacman-get %u %o
# Check that the args are not empty.
[[ -z ${1} ]] && { echoerr $"The first argument should be the download url." ; exit 1 ; }
-[[ -z ${2} ]] && { echoerr $"The second argument should be the local filename, plus a “.part” extension." ; exit 1 ; }
+[[ -z ${2} ]] && { echoerr $"The second argument should be the local filename, plus a \".part\" extension." ; exit 1 ; }
url="${1}" # The download url.
filename="${2}" # This is where the downloaded file needs to be saved
@@ -200,82 +204,36 @@ then
# the right place.
progress='0.0%'
- echo -n $"Pacman2pacman p2p download: ${pname}: ${progress}"
-
- count=0
-
- declare -a last_webseed_check=(0 'working')
+ p2p_download_string=$"Pacman2pacman p2p download: %s: %s " "${pname}" "${progress}"
+ printf "${p2p_download_string}" "${pname}" "${progress}"
- webseed_check_after='100'
+ # time of check, result of check, percentage. of course we didn't check
+ # yet but we're assuming it works for now.
+ starttime=$(date +%s)
+ last_check_percentage='0.0%'
until [[ "${progress}" == '100%' ]]
do
+ timenow=$(date +%s)
+
# This finds the line with the percent done.
progress=$(transmission-remote -t "${id}" -i | grep '[[:digit:]]%$' | head -1)
progress="${progress##* }" # Remove stuff we don't want
- # If we're still at 0.0% after ${webseed_check_after} attempts
- # then we check if the webseed is actually valid.
- if (( count >= webseed_check_after )) && [[ "${progress}" == '0.0%' ]]
+ # If our percent hasn't changed after the defined time we fall back to HTTP.
+ if (( timenow > ( starttime + webseed_check_freq ) )) && [[ "${progress}" == "${last_check_percentage}" ]]
then
- # Find out if we already checked recently.
- if (( (last_webseed_check[0] + (webseed_check_after / 2)) > count ))
- then
- if [[ last_webseed_check[1] == 'broken' ]]
- then
- # Just set the message without checking.
- progress=$"0.0% Warning: Webseed dead..."
- else
- # We don't need to do anything
- true
- fi
- else
- if ! $(curl -IL "${url}" | grep '200 OK' &>/dev/null)
- then
- # The webseed seems to be invalid so we print an error
- # message.
-
- progress=$"0.0% Warning: Webseed dead..." # This
- # most
- # likely
- # means
- # the
- # user
- # needs
- # to run
- # pacman
- # -Sy, or
- # that
- # their
- # internet
- # is
- # down.
-
- # If there are no peers we remove the torrent from
- # transmission, print an error message and exit.
- if (( $(transmission-remote -t "${id}" -pi | wc -l) < 2 ))
- then
- echo $"Webseed dead and no peers, removing torrent from transmission and trying by HTTP."
- transmission-remote -t "${id}" -r > /dev/null
- gotourbaby=0
- break
- fi
-
- last_webseed_check[0]="${count}"
- last_webseed_check[1]="broken"
- else
- # The webseed is valid so we just record that we checked
- last_webseed_check[0]="${count}"
- last_webseed_check[1]="working"
- fi
- fi
- fi
-
- printf $"\rPacman2pacman p2p download: %s: %s " "${pname}" "${progress}"
-
- sleep 0.7
+ echo $"Download stalled. Removing torrent from transmission and falling back to HTTP."
+ transmission-remote -t "${id}" -r > /dev/null
+ gotourbaby=0
+ break
+ else
+ printf "\r${p2p_download_string}" "${pname}" "${progress}"
- (( count ++ ))
+ last_check_percentage="${progress}"
+ fi
+
+ sleep ${prog_check_freq}
done
echo
@@ -287,7 +245,7 @@ then
do
if (( err_count > 100 ))
then
- echo $"error moving \"${pkg_cache_location}/${url##*/}\". removing torrent from transmission and trying by HTTP."
+ printf $"error moving \"%s\". removing torrent from transmission and trying by HTTP." "${pkg_cache_location}/${url##*/}"
transmission-remote -t "${id}" -r > /dev/null
gotourbaby=0
break
@@ -318,7 +276,9 @@ then
progress='0.0%'
- echo -n $"Pacman2pacman http download: ${pname}: ${progress}"
+ http_download_string=$"Pacman2pacman http download: %s: %s "
+
+ printf "${http_download_string}" "${pname}" "${progress}"
# The first loop gets rid of all the backspace and '#'es and
# stuff. The second loop isolates the percent done number.
@@ -349,14 +309,14 @@ then
# start of the download. This should fix it.
[[ "${progress}" == '100.0%' ]] && continue
- printf $"\rPacman2pacman http download: %s: %s " "${pname}" "${progress}"
+ printf "\r${http_download_string}" "${pname}" "${progress}"
done
# It's the end of the download so we can now display 100%
if [[ "${progress}" == '100.0%' ]]
then
progress='100%'
- printf $"\rPacman2pacman http download: %s: %s " "${pname}" "${progress}"
+ printf "\r${http_download_string}" "${pname}" "${progress}"
fi
}
@@ -368,22 +328,21 @@ then
if ! new_mod_time=$(stat -c %Y "/srv/pacman2pacman/dbcache/${filename##*/}" 2>/dev/null)
then
progress='failed'
- printf $"\rPacman2pacman http download: %s: %s " "${pname}" "${progress}"
# If the file was not modified we display such
elif [[ "${new_mod_time}" == "${mod_time}" ]]
then
progress='file not modified'
- printf $"\rPacman2pacman http download: %s: %s " "${pname}" "${progress}"
fi
else
# It's not a dbfile. Just check the output file exists.
if ! [[ -f "${filename}" ]]
then
progress='failed'
- printf $"\rPacman2pacman http download: %s: %s " "${pname}" "${progress}"
fi
fi
+
+ printf "\r${http_download_string}" "${pname}" "${progress}"
echo
diff --git a/translations/eo/pacman2pacman-get.po b/translations/eo/pacman2pacman-get.po
index 70d7104..768a56b 100644
--- a/translations/eo/pacman2pacman-get.po
+++ b/translations/eo/pacman2pacman-get.po
@@ -1,36 +1,43 @@
-#: pacman2pacman-get:38
+#: pacman2pacman-get:42
msgid "The first argument should be the download url."
-msgstr "La unua argumento devas esti la URL de la elŝuto."
-#: pacman2pacman-get:39
-msgid "The second argument should be the local filename, plus a “.part” extension."
-msgstr "La dua argumento devas esti la nomo de la loka dosiero, kun la afikso “.part”."
-#: pacman2pacman-get:48
+msgstr "La unua argumento devas esti la URL de la eluto."
+
+#: pacman2pacman-get:43
+msgid ""
+"The second argument should be the local filename, plus a \\\".part\\\" "
+"extension."
+msgstr ""
+"La dua argumento devas esti la nomo de la loka dosiero, kun la afikso \\\"."
+"part.\\\""
+
+#: pacman2pacman-get:52
msgid "Error: The transmission daemon is not running."
msgstr "Eraro: La demono de transmission ne rulas."
-#: pacman2pacman-get:124
+
+#: pacman2pacman-get:128
msgid "Can't find a torrent file for this package :S"
msgstr ""
-#: pacman2pacman-get:167
+
+#: pacman2pacman-get:171
msgid "Transmission didn't accept our torrent file - falling back to HTTP"
msgstr ""
-#: pacman2pacman-get:203
-msgid "Pacman2pacman p2p download: ${pname}: ${progress}"
-msgstr "Pacman2pacman elŝutas samtavole: ${pname}: ${progress}"
-#: pacman2pacman-get:227
-msgid "0.0% Warning: Webseed dead..."
-msgstr "0.0% Averto: la retfontsendo mortas..."
-#: pacman2pacman-get:258
-msgid "Webseed dead and no peers, removing torrent from transmission and trying by HTTP."
+
+#: pacman2pacman-get:207
+msgid "Pacman2pacman p2p download: %s: %s "
+msgstr "Pacman2pacman elutas samtavole: %s: %s "
+
+#: pacman2pacman-get:226
+msgid ""
+"Download stalled. Removing torrent from transmission and falling back to "
+"HTTP."
msgstr ""
-#: pacman2pacman-get:274
-msgid "\\rPacman2pacman p2p download: %s: %s "
-msgstr "\\rPacman2pacman elŝutas samtavole: %s: %s "
-#: pacman2pacman-get:290
-msgid "error moving \\\"${pkg_cache_location}/${url##*/}\\\". removing torrent from transmission and trying by HTTP."
+
+#: pacman2pacman-get:248
+msgid ""
+"error moving \\\"%s\\\". removing torrent from transmission and trying by "
+"HTTP."
msgstr ""
-#: pacman2pacman-get:320
-msgid "Pacman2pacman http download: ${pname}: ${progress}"
-msgstr "Pacman2pacman elŝutas per HTTP: ${pname}: ${progress}"
-#: pacman2pacman-get:351
-msgid "\\rPacman2pacman http download: %s: %s "
-msgstr "\\rPacman2pacman elŝutas per HTTP: %s: %s "
+
+#: pacman2pacman-get:279
+msgid "Pacman2pacman http download: %s: %s "
+msgstr "Pacman2pacman elutas per HTTP: %s: %s "
diff --git a/translations/es/pacman2pacman-get.po b/translations/es/pacman2pacman-get.po
index 6fef2eb..e400181 100644
--- a/translations/es/pacman2pacman-get.po
+++ b/translations/es/pacman2pacman-get.po
@@ -1,36 +1,50 @@
-#: pacman2pacman-get:38
+#: pacman2pacman-get:42
msgid "The first argument should be the download url."
msgstr "El primer argumento debiera ser la url de descarga"
-#: pacman2pacman-get:39
-msgid "The second argument should be the local filename, plus a “.part” extension."
-msgstr "El segundo argumento debiera ser el nombre del archivo local, más una extensión “.part”"
-#: pacman2pacman-get:48
+
+#: pacman2pacman-get:43
+#, fuzzy
+msgid ""
+"The second argument should be the local filename, plus a \\\".part\\\" "
+"extension."
+msgstr ""
+"El segundo argumento debiera ser el nombre del archivo local, ms una "
+"extensin \\\".part\\\""
+
+#: pacman2pacman-get:52
msgid "Error: The transmission daemon is not running."
-msgstr "Error: El demonio transmission no se está ejecutando"
-#: pacman2pacman-get:124
+msgstr "Error: El demonio transmission no se est ejecutando"
+
+#: pacman2pacman-get:128
msgid "Can't find a torrent file for this package :S"
msgstr "No se puede encontrar un archivo torrent para este paquete :S"
-#: pacman2pacman-get:167
+
+#: pacman2pacman-get:171
msgid "Transmission didn't accept our torrent file - falling back to HTTP"
-msgstr "Transmission no aceptó nuestro archivo torrent - volviendo a HTTP"
-#: pacman2pacman-get:203
-msgid "Pacman2pacman p2p download: ${pname}: ${progress}"
-msgstr "Descarga de Pacman2pacman p2p: ${pname}: ${progress}"
-#: pacman2pacman-get:227
-msgid "0.0% Warning: Webseed dead..."
-msgstr "0.0% Advertencia: Webseed muerta..."
-#: pacman2pacman-get:258
-msgid "Webseed dead and no peers, removing torrent from transmission and trying by HTTP."
-msgstr "Webseed muerta y sin pares, removiendo torrent de transmission y tratando por HTTP"
-#: pacman2pacman-get:274
-msgid "\\rPacman2pacman p2p download: %s: %s "
-msgstr "\\rDescarga de Pacman2pacman p2p: %s: %s "
-#: pacman2pacman-get:290
-msgid "error moving \\\"${pkg_cache_location}/${url##*/}\\\". removing torrent from transmission and trying by HTTP."
-msgstr "error al mover \\\"${pkg_cache_location}/${url##*/}\\\". eliminando torrent de transmission y tratando con HTTP"
-#: pacman2pacman-get:320
-msgid "Pacman2pacman http download: ${pname}: ${progress}"
-msgstr "Descarga de Pacman2pacman http: ${pname}: ${progress}"
-#: pacman2pacman-get:351
-msgid "\\rPacman2pacman http download: %s: %s "
-msgstr "\\rDescarga de Pacman2pacman http: %s: %s "
+msgstr "Transmission no acept nuestro archivo torrent - volviendo a HTTP"
+
+#: pacman2pacman-get:207
+msgid "Pacman2pacman p2p download: %s: %s "
+msgstr "Descarga de Pacman2pacman p2p: %s: %s "
+
+#: pacman2pacman-get:226
+#, fuzzy
+msgid ""
+"Download stalled. Removing torrent from transmission and falling back to "
+"HTTP."
+msgstr ""
+"Webseed muerta y sin pares, removiendo torrent de transmission y tratando "
+"por HTTP"
+
+#: pacman2pacman-get:248
+#, fuzzy
+msgid ""
+"error moving \\\"%s\\\". removing torrent from transmission and trying by "
+"HTTP."
+msgstr ""
+"error al mover \\\"%s\\\". eliminando torrent "
+"de transmission y tratando con HTTP"
+
+#: pacman2pacman-get:279
+msgid "Pacman2pacman http download: %s: %s "
+msgstr "Descarga de Pacman2pacman http: %s: %s "
diff --git a/translations/fr/pacman2pacman-get.po b/translations/fr/pacman2pacman-get.po
index db6e81a..a064a16 100644
--- a/translations/fr/pacman2pacman-get.po
+++ b/translations/fr/pacman2pacman-get.po
@@ -1,36 +1,49 @@
-#: pacman2pacman-get:38
+#: pacman2pacman-get:42
msgid "The first argument should be the download url."
-msgstr "Le premier argument doit être l'url de téléchargement."
-#: pacman2pacman-get:39
-msgid "The second argument should be the local filename, plus a “.part” extension."
-msgstr "Le second argument doit être le nom du fichier local suivi de l'extension « .part »."
-#: pacman2pacman-get:48
+msgstr "Le premier argument doit tre l'url de tlchargement."
+
+#: pacman2pacman-get:43
+#, fuzzy
+msgid ""
+"The second argument should be the local filename, plus a \\\".part\\\" "
+"extension."
+msgstr ""
+"Le second argument doit tre le nom du fichier local suivi de l'extension \\"
+"\".part\\\"."
+
+#: pacman2pacman-get:52
msgid "Error: The transmission daemon is not running."
-msgstr "Le démon transmission n'est pas actif."
-#: pacman2pacman-get:124
+msgstr "Le dmon transmission n'est pas actif."
+
+#: pacman2pacman-get:128
msgid "Can't find a torrent file for this package :S"
msgstr "Impossible de trouver un fichier torrent pour ce paquet :S"
-#: pacman2pacman-get:167
+
+#: pacman2pacman-get:171
msgid "Transmission didn't accept our torrent file - falling back to HTTP"
-msgstr "Transmission n'a pas accepté notre fichier torrent - retour à HTTP"
-#: pacman2pacman-get:203
-msgid "Pacman2pacman p2p download: ${pname}: ${progress}"
-msgstr "Pacman2pacman - téléchargement p2p : ${pname} : ${progress}"
-#: pacman2pacman-get:227
-msgid "0.0% Warning: Webseed dead..."
-msgstr "0.0% Attention : Webseed mort..."
-#: pacman2pacman-get:258
-msgid "Webseed dead and no peers, removing torrent from transmission and trying by HTTP."
-msgstr "Webseed mort et aucun pair, suppression du torrent de transmission et essai par HTTP."
-#: pacman2pacman-get:274
-msgid "\\rPacman2pacman p2p download: %s: %s "
-msgstr "\\rPacman2pacman - téléchargement p2p : %s : %s "
-#: pacman2pacman-get:290
-msgid "error moving \\\"${pkg_cache_location}/${url##*/}\\\". removing torrent from transmission and trying by HTTP."
-msgstr "erreur en déplaçant \\\"${pkg_cache_location}/${url##*/}\\\". Suppression du torrent de transmission et essai par HTTP."
-#: pacman2pacman-get:320
-msgid "Pacman2pacman http download: ${pname}: ${progress}"
-msgstr "Pacman2pacman - téléchargement http : ${pname} : ${progress}"
-#: pacman2pacman-get:351
-msgid "\\rPacman2pacman http download: %s: %s "
-msgstr "\\rPacman2pacman - téléchargement http : %s : %s "
+msgstr "Transmission n'a pas accept notre fichier torrent - retour HTTP"
+
+#: pacman2pacman-get:207
+msgid "Pacman2pacman p2p download: %s: %s "
+msgstr "Pacman2pacman - tlchargement p2p: %s: %s "
+
+#: pacman2pacman-get:226
+msgid ""
+"Download stalled. Removing torrent from transmission and falling back to "
+"HTTP."
+msgstr ""
+"Webseed mort et aucun pair, suppression du torrent de transmission et essai "
+"par HTTP."
+
+#: pacman2pacman-get:248
+#, fuzzy
+msgid ""
+"error moving \\\"%s\\\". removing torrent from transmission and trying by "
+"HTTP."
+msgstr ""
+"erreur en dplaant \\\"%s\\\". Suppression du "
+"torrent de transmission et essai par HTTP."
+
+#: pacman2pacman-get:279
+msgid "Pacman2pacman http download: %s: %s "
+msgstr "Pacman2pacman - tlchargement http: %s: %s "
diff --git a/translations/pacman2pacman-get.pot b/translations/pacman2pacman-get.pot
index bed5d7e..850f119 100644
--- a/translations/pacman2pacman-get.pot
+++ b/translations/pacman2pacman-get.pot
@@ -1,36 +1,27 @@
-#: pacman2pacman-get:38
+#: pacman2pacman-get:42
msgid "The first argument should be the download url."
msgstr ""
-#: pacman2pacman-get:39
-msgid "The second argument should be the local filename, plus a “.part” extension."
+#: pacman2pacman-get:43
+msgid "The second argument should be the local filename, plus a \\\".part\\\" extension."
msgstr ""
-#: pacman2pacman-get:48
+#: pacman2pacman-get:52
msgid "Error: The transmission daemon is not running."
msgstr ""
-#: pacman2pacman-get:124
+#: pacman2pacman-get:128
msgid "Can't find a torrent file for this package :S"
msgstr ""
-#: pacman2pacman-get:167
+#: pacman2pacman-get:171
msgid "Transmission didn't accept our torrent file - falling back to HTTP"
msgstr ""
-#: pacman2pacman-get:203
-msgid "Pacman2pacman p2p download: ${pname}: ${progress}"
+#: pacman2pacman-get:207
+msgid "Pacman2pacman p2p download: %s: %s "
msgstr ""
-#: pacman2pacman-get:227
-msgid "0.0% Warning: Webseed dead..."
+#: pacman2pacman-get:226
+msgid "Download stalled. Removing torrent from transmission and falling back to HTTP."
msgstr ""
-#: pacman2pacman-get:258
-msgid "Webseed dead and no peers, removing torrent from transmission and trying by HTTP."
+#: pacman2pacman-get:248
+msgid "error moving \\\"%s\\\". removing torrent from transmission and trying by HTTP."
msgstr ""
-#: pacman2pacman-get:274
-msgid "\\rPacman2pacman p2p download: %s: %s "
-msgstr ""
-#: pacman2pacman-get:290
-msgid "error moving \\\"${pkg_cache_location}/${url##*/}\\\". removing torrent from transmission and trying by HTTP."
-msgstr ""
-#: pacman2pacman-get:320
-msgid "Pacman2pacman http download: ${pname}: ${progress}"
-msgstr ""
-#: pacman2pacman-get:351
-msgid "\\rPacman2pacman http download: %s: %s "
+#: pacman2pacman-get:279
+msgid "Pacman2pacman http download: %s: %s "
msgstr ""
diff --git a/translations/pt_BR/pacman2pacman-get.po b/translations/pt_BR/pacman2pacman-get.po
index 2f5f6e0..5dd7a3d 100644
--- a/translations/pt_BR/pacman2pacman-get.po
+++ b/translations/pt_BR/pacman2pacman-get.po
@@ -1,36 +1,43 @@
-#: pacman2pacman-get:38
+#: pacman2pacman-get:42
msgid "The first argument should be the download url."
msgstr "O primeiro argumento deve ser o URL de download."
-#: pacman2pacman-get:39
-msgid "The second argument should be the local filename, plus a “.part” extension."
-msgstr "O segundo argumento deve ser o nome do arquivo local, com uma extensão “.part”."
-#: pacman2pacman-get:48
+
+#: pacman2pacman-get:43
+msgid ""
+"The second argument should be the local filename, plus a \\\".part\\\" "
+"extension."
+msgstr ""
+"O segundo argumento deve ser o nome do arquivo local, com uma extenso \\\"."
+"part.\\\""
+
+#: pacman2pacman-get:52
msgid "Error: The transmission daemon is not running."
-msgstr "Erro: O daemon do transmission não está rodando."
-#: pacman2pacman-get:124
+msgstr "Erro: O daemon do transmission no est rodando."
+
+#: pacman2pacman-get:128
msgid "Can't find a torrent file for this package :S"
msgstr ""
-#: pacman2pacman-get:167
+
+#: pacman2pacman-get:171
msgid "Transmission didn't accept our torrent file - falling back to HTTP"
msgstr ""
-#: pacman2pacman-get:203
-msgid "Pacman2pacman p2p download: ${pname}: ${progress}"
-msgstr "Pacman2pacman está baixando por p2p: ${pname}: ${progress}"
-#: pacman2pacman-get:227
-msgid "0.0% Warning: Webseed dead..."
-msgstr "0.0% Aviso: a webseed está morta..."
-#: pacman2pacman-get:258
-msgid "Webseed dead and no peers, removing torrent from transmission and trying by HTTP."
+
+#: pacman2pacman-get:207
+msgid "Pacman2pacman p2p download: %s: %s "
+msgstr "Pacman2pacman est baixando por p2p: %s: %s "
+
+#: pacman2pacman-get:226
+msgid ""
+"Download stalled. Removing torrent from transmission and falling back to "
+"HTTP."
msgstr ""
-#: pacman2pacman-get:274
-msgid "\\rPacman2pacman p2p download: %s: %s "
-msgstr "\\rPacman2pacman está baixando por p2p: %s: %s "
-#: pacman2pacman-get:290
-msgid "error moving \\\"${pkg_cache_location}/${url##*/}\\\". removing torrent from transmission and trying by HTTP."
+
+#: pacman2pacman-get:248
+msgid ""
+"error moving \\\"%s\\\". removing torrent from transmission and trying by "
+"HTTP."
msgstr ""
-#: pacman2pacman-get:320
-msgid "Pacman2pacman http download: ${pname}: ${progress}"
-msgstr "Pacman2pacman está baixando por http: ${pname}: ${progress}"
-#: pacman2pacman-get:351
-msgid "\\rPacman2pacman http download: %s: %s "
-msgstr "\\rPacman2pacman está baixando por http: %s: %s "
+
+#: pacman2pacman-get:279
+msgid "Pacman2pacman http download: %s: %s "
+msgstr "Pacman2pacman est baixando por http: %s: %s "
diff --git a/translations/sv/pacman2pacman-get.po b/translations/sv/pacman2pacman-get.po
index da5b9db..96a2303 100644
--- a/translations/sv/pacman2pacman-get.po
+++ b/translations/sv/pacman2pacman-get.po
@@ -1,36 +1,47 @@
-#: pacman2pacman-get:38
+#: pacman2pacman-get:42
msgid "The first argument should be the download url."
-msgstr "Det första argumentet ska vara URL:en."
-#: pacman2pacman-get:39
-msgid "The second argument should be the local filename, plus a “.part” extension."
-msgstr "Det andra argumentet ska vara det lokala filnamnet, följd av “.part”."
-#: pacman2pacman-get:48
+msgstr "Det frsta argumentet ska vara URL:en."
+
+#: pacman2pacman-get:43
+msgid ""
+"The second argument should be the local filename, plus a \\\".part\\\" "
+"extension."
+msgstr ""
+"Det andra argumentet ska vara det lokala filnamnet, fljd av \\\".part\\\"."
+
+#: pacman2pacman-get:52
msgid "Error: The transmission daemon is not running."
-msgstr "Fel: transmission körs inte."
-#: pacman2pacman-get:124
+msgstr "Fel: transmission krs inte."
+
+#: pacman2pacman-get:128
msgid "Can't find a torrent file for this package :S"
-msgstr "Kan inte hitta en torrentfil till det här paketet."
-#: pacman2pacman-get:167
+msgstr "Kan inte hitta en torrentfil till det hr paketet."
+
+#: pacman2pacman-get:171
msgid "Transmission didn't accept our torrent file - falling back to HTTP"
msgstr "Transmission accepterade inte torrentfilen - faller tillbaka till HTTP"
-#: pacman2pacman-get:203
-msgid "Pacman2pacman p2p download: ${pname}: ${progress}"
-msgstr "Pacman2pacman p2p nedladdning: ${pname}: ${progress}"
-#: pacman2pacman-get:227
-msgid "0.0% Warning: Webseed dead..."
-msgstr "0.0% varning: död distributör..."
-#: pacman2pacman-get:258
-msgid "Webseed dead and no peers, removing torrent from transmission and trying by HTTP."
-msgstr "Död distributör och inga jämlikar, tar bort torrent från transmission och försöker med HTTP."
-#: pacman2pacman-get:274
-msgid "\\rPacman2pacman p2p download: %s: %s "
-msgstr "\\rPacman2pacman p2p nedladdning: %s: %s "
-#: pacman2pacman-get:290
-msgid "error moving \\\"${pkg_cache_location}/${url##*/}\\\". removing torrent from transmission and trying by HTTP."
-msgstr "fel vid flytten av \\\"${pkg_cache_location}/${url##*/}\\\". tar bort torrent från transmission och försöker med HTTP."
-#: pacman2pacman-get:320
-msgid "Pacman2pacman http download: ${pname}: ${progress}"
-msgstr "Pacman2pacman http nedladdning: ${pname}: ${progress}"
-#: pacman2pacman-get:351
-msgid "\\rPacman2pacman http download: %s: %s "
-msgstr "\\rPacman2pacman http nedladdning: %s: %s "
+
+#: pacman2pacman-get:207
+msgid "Pacman2pacman p2p download: %s: %s "
+msgstr "Pacman2pacman p2p nedladdning: %s: %s "
+
+#: pacman2pacman-get:226
+msgid ""
+"Download stalled. Removing torrent from transmission and falling back to "
+"HTTP."
+msgstr ""
+"Dd distributr och inga jmlikar, tar bort torrent frn transmission och frsker "
+"med HTTP."
+
+#: pacman2pacman-get:248
+#, fuzzy
+msgid ""
+"error moving \\\"%s\\\". removing torrent from transmission and trying by "
+"HTTP."
+msgstr ""
+"fel vid flytten av \\\"%s\\\". tar bort "
+"torrent frn transmission och frsker med HTTP."
+
+#: pacman2pacman-get:279
+msgid "Pacman2pacman http download: %s: %s "
+msgstr "Pacman2pacman http nedladdning: %s: %s "