Merge branch 'maint'

Conflicts:
	lib/libalpm/alpm_list.c

lib/libalpm/alpm_list.c

@@ -286,8 +286,11 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n,
 			lastleft = lastleft->next;
 		}
 		right = lastleft->next;
-		/* terminate first list */
+
+		/* tidy new lists */
 		lastleft->next = NULL;
+		right->prev = left->prev;
+		left->prev = lastleft;
 
 		left = alpm_list_msort(left, half, fn);
 		right = alpm_list_msort(right, n - half, fn);

lib/libalpm/po/lt.po

@@ -4,14 +4,15 @@
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
 # toofishes <dpmcgee@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2011-11-13 21:47-0600\n"
-"PO-Revision-Date: 2011-10-07 06:12+0000\n"
+"PO-Revision-Date: 2012-02-05 07:37+0000\n"
-"Last-Translator: gymka_ltu <margevicius.algimantas@gmail.com>\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/lt/)\n"
 "Language: lt\n"
@@ -103,7 +104,7 @@ msgstr "nepavyko atnaujint duomenų bazės įrašo %s-%s\n"
 
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "nepavyko pridėti '%s' podėlin\n"
+msgstr "į podėlį pridėti „%s“ nepavyko\n"
 
 #, c-format
 msgid "removing invalid database: %s\n"
@@ -111,15 +112,15 @@ msgstr "šalinama neteisinga duomenų bazė: %s\n"
 
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "neteisingas duomenų bazės įrašo pavadinimas '%s'\n"
+msgstr "neteisingas duomenų bazės įrašo pavadinimas „%s“\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "toks pavadinimas jau yra '%s'\n"
+msgstr "toks pavadinimas jau yra „%s“\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
-msgstr "duomenų bazės įrašas sugadintas '%s'\n"
+msgstr "duomenų bazės įrašas sugadintas „%s“\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
@@ -169,7 +170,7 @@ msgstr "nepavyko pašalinti užrakinto failo %s\n"
 
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr "nepavyko perskaityt paketo aprašymo failo %s iš duomenų bazės '%s'\n"
+msgstr "nepavyko perskaityt paketo aprašymo failo %s iš duomenų bazės „%s“\n"
 
 #, c-format
 msgid "database path is undefined\n"
@@ -177,7 +178,7 @@ msgstr "nenurodytas duomenų bazės kelias\n"
 
 #, c-format
 msgid "dependency cycle detected:\n"
-msgstr "rastas priklausomybių ciklas:\n"
+msgstr "aptiktas priklausomybių ciklas:\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
@@ -189,11 +190,11 @@ msgstr "%s bus įdiegta prieš jo priklausomybę %s\n"
 
 #, c-format
 msgid "ignoring package %s-%s\n"
-msgstr "ignoruojamas paketas %s-%s\n"
+msgstr "paketas nepaisomas %s-%s\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "negaliu išspręsti \"%s\", \"%s\" priklausomybė\n"
+msgstr "nepavyko išspręsti „%s“, „%s“ priklausomybė\n"
 
 #, c-format
 msgid "could not get filesystem information\n"
@@ -233,11 +234,11 @@ msgstr "nepavyko sukurti laikino failo parsiuntimui\n"
 
 #, c-format
 msgid "url '%s' is invalid\n"
-msgstr "neteisingas url '%s'\n"
+msgstr "neteisingas url „%s“\n"
 
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "nepavyko gauti failo '%s' iš %s : %s\n"
+msgstr "nepavyko gauti failo „%s“ iš %s : %s\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
@@ -361,7 +362,7 @@ msgstr "operacija nesuderinama su perdavimo tipu"
 
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr "bandoma perduoti kol duomenų bazė neužrakinta"
+msgstr "bandoma perduoti kai duomenų bazė neužrakinta"
 
 #, c-format
 msgid "could not find or read package"
@@ -437,7 +438,7 @@ msgstr "nepavyko gauti kai kurių failų"
 
 #, c-format
 msgid "invalid regular expression"
-msgstr "neteisinga regular expression"
+msgstr "netinkamos reguliariosios išraiškos"
 
 #, c-format
 msgid "libarchive error"
@@ -473,7 +474,7 @@ msgstr "šalinamas %s iš objektų sąrašo\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "nepavyko pašalinti failo '%s': %s\n"
+msgstr "nepavyko pašalinti failo „%s“: %s\n"
 
 #, c-format
 msgid "cannot remove %s (%s)\n"
@@ -485,7 +486,7 @@ msgstr "nepavyko pašalinti duomenų bazės įrašo %s-%s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "iš podėlio nepavyko pašalinti įrašo '%s'\n"
+msgstr "iš podėlio nepavyko pašalinti įrašo „%s“\n"
 
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
@@ -517,7 +518,7 @@ msgstr "aptikti neišsprendžiami paketų nesuderinamumai\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr "iš objektų sąrašo šalinamas '%s' dėl konfliktų su '%s'\n"
+msgstr "iš objektų sąrašo šalinamas „%s“ dėl konfliktų su „%s“\n"
 
 #, c-format
 msgid "failed to retrieve some files from %s\n"
@@ -525,11 +526,11 @@ msgstr "nepavyko gauti kai kurių failų iš %s\n"
 
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr "nepavyko įvykdyt šalinimo perdavimo\n"
+msgstr "nepavyko įvykdyti šalinimo perdavimo\n"
 
 #, c-format
 msgid "could not commit transaction\n"
-msgstr "nepavyko įvykdyt perdavimo\n"
+msgstr "nepavyko įvykdyti perdavimo\n"
 
 #, c-format
 msgid "could not create temp directory\n"
@@ -537,7 +538,7 @@ msgstr "nepavyko sukurti lakino aplanko\n"
 
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "negaliu nukopijuoti laikiną failą į %s (%s)\n"
+msgstr "negaliu nukopijuoti laikino failo į %s (%s)\n"
 
 #, c-format
 msgid "could not remove %s\n"

scripts/makepkg.sh.in

@@ -519,7 +519,7 @@ remove_deps() {
 	local deplist
 	deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \
 			<(printf "%s\n" "${current_pkglist[@]}") || true))
-	if [[ -n deplist ]]; then
+	if [[ -z deplist ]]; then
 		return
 	fi
 
@@ -1838,7 +1838,7 @@ usage() {
 	echo
 	printf -- "$(gettext "Usage: %s [options]")\n" "$0"
 	echo
-	printf -- "$(gettext "Options:")"
+	printf -- "$(gettext "Options:")\n"
 	printf -- "$(gettext "  -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT"
 	printf -- "$(gettext "  -c, --clean      Clean up work files after build")\n"
 	printf -- "$(gettext "  -d, --nodeps     Skip all dependency checks")\n"
@@ -2058,6 +2058,11 @@ fi
 
 SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST}
 SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined
+if (( SOURCEONLY )) && [[ ! -w $SRCPKGDEST ]]; then
+	error "$(gettext "You do not have write permission to store source tarballs in %s.")" "$SRCPKGDEST"
+	plain "$(gettext "Aborting...")"
+	exit 1
+fi
 
 PKGEXT=${_PKGEXT:-$PKGEXT}
 SRCEXT=${_SRCEXT:-$SRCEXT}
@@ -2305,7 +2310,7 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then
 		warning "$(gettext "Skipping dependency checks.")"
 	fi
 elif type -p "${PACMAN%% *}" >/dev/null; then
-	if (( RMDEPS )); then
+	if (( RMDEPS && ! INSTALL )); then
 		original_pkglist=($(run_pacman -Qq))    # required by remove_dep
 	fi
 	deperr=0
@@ -2313,6 +2318,10 @@ elif type -p "${PACMAN%% *}" >/dev/null; then
 	msg "$(gettext "Checking runtime dependencies...")"
 	resolve_deps ${depends[@]} || deperr=1
 
+	if (( RMDEPS && INSTALL )); then
+		original_pkglist=($(run_pacman -Qq))    # required by remove_dep
+	fi
+
 	msg "$(gettext "Checking buildtime dependencies...")"
 	resolve_deps ${makedepends[@]} || deperr=1
 

src/pacman/callback.c

@@ -704,8 +704,8 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
 
 	}
 
-	rate_human = humanize_size((off_t)rate, '\0', &rate_label);
+	rate_human = humanize_size((off_t)rate, '\0', -1, &rate_label);
-	xfered_human = humanize_size(xfered, '\0', &xfered_label);
+	xfered_human = humanize_size(xfered, '\0', -1, &xfered_label);
 
 	printf(" %ls%-*s ", wcfname, padwid, "");
 	/* We will show 1.62M/s, 11.6M/s, but 116K/s and 1116K/s */

src/pacman/package.c

@@ -118,14 +118,14 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
 	deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg));
 	deplist_display(_("Replaces       :"), alpm_pkg_get_replaces(pkg));
 
-	size = humanize_size(alpm_pkg_get_size(pkg), 'K', &label);
+	size = humanize_size(alpm_pkg_get_size(pkg), 'K', 2, &label);
 	if(from == PKG_FROM_SYNCDB) {
 		printf(_("Download Size  : %6.2f %s\n"), size, label);
 	} else if(from == PKG_FROM_FILE) {
 		printf(_("Compressed Size: %6.2f %s\n"), size, label);
 	}
 
-	size = humanize_size(alpm_pkg_get_isize(pkg), 'K', &label);
+	size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 2, &label);
 	printf(_("Installed Size : %6.2f %s\n"), size, label);
 
 	string_display(_("Packager       :"), alpm_pkg_get_packager(pkg));

src/pacman/po/ca.po

@@ -4,15 +4,15 @@
 #
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011.
-# Hector Mtz-Seara <hseara@gmail.com>, 2011.
+# Hector Mtz-Seara <hseara@gmail.com>, 2011, 2012.
 #   <jpreales@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
-"PO-Revision-Date: 2011-11-14 04:13+0000\n"
+"PO-Revision-Date: 2012-02-02 07:52+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: Hector Mtz-Seara <hseara@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/ca/)\n"
 "Language: ca\n"
@@ -861,6 +861,10 @@ msgstr "'%s' és un arxiu, és possible que vulgueu utilitzar %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "No es pot carregar el paquet '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "objectiu que no es troba: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "ha fallat en preparar la transacció (%s)\n"
@@ -981,10 +985,6 @@ msgstr "no s'ha trobat el repositori \"%s\".\n"
 msgid "skipping target: %s\n"
 msgstr "s'ometrà l'objectiu: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "objectiu que no es troba: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Hi ha %d membres en el grup %s:\n"
@@ -1187,11 +1187,11 @@ msgstr "Programari %s\n"
 
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "el valor no és valid: %d no està entre %d i %d\n"
 
 #, c-format
 msgid "invalid number: %s\n"
-msgstr ""
+msgstr "el nombre no és vàlid: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"

src/pacman/po/cs.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 03:57+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -842,6 +842,10 @@ msgstr "'%s' je soubor, možná byste chtěli použít %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "Nelze načíst balíček '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "cíl nebyl nalezen: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "selhala příprava transakce (%s)\n"
@@ -962,10 +966,6 @@ msgstr "repozitář \"%s\" nebyl nalezen.\n"
 msgid "skipping target: %s\n"
 msgstr "přeskakuje se cíl: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "cíl nebyl nalezen: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: %d členů ve skupině %s:\n"

src/pacman/po/da.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 03:57+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -820,6 +820,10 @@ msgstr ""
 msgid "could not load package '%s': %s\n"
 msgstr ""
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr ""
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "kunne ikke forberede transaktion (%s)\n"
@@ -940,10 +944,6 @@ msgstr "arkiv »%s« blev ikke fundet.\n"
 msgid "skipping target: %s\n"
 msgstr "springer mål over: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr ""
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Der er %d medlemmer i gruppen %s:\n"

src/pacman/po/de.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-15 23:28+0000\n"
 "Last-Translator: pierres <pierre@archlinux.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -863,6 +863,10 @@ msgstr "'%s' ist eine Datei, Sie möchten vielleicht %s benutzen.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "Konnte das Paket '%s' nicht laden: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "Ziel nicht gefunden: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "Konnte den Vorgang nicht vorbereiten (%s)\n"
@@ -985,10 +989,6 @@ msgstr "Repositorium \"%s\" wurde nicht gefunden.\n"
 msgid "skipping target: %s\n"
 msgstr "Überspringe das Ziel: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "Ziel nicht gefunden: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Es sind %d Mitglieder in der Gruppe %s:\n"

src/pacman/po/el.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 14:55+0000\n"
 "Last-Translator: nous <nous@archlinux.us>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -830,6 +830,10 @@ msgstr "το '%s' είναι αρχείο, ίσως θες να χρησιμοπ
 msgid "could not load package '%s': %s\n"
 msgstr "αδυναμία φόρτωσης πακέτου '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "στόχος δεν βρέθηκε: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "αποτυχία προετοιμασίας διεκπεραίωσης (%s)\n"
@@ -950,10 +954,6 @@ msgstr "η αποθήκη '%s' δεν βρέθηκε.\n"
 msgid "skipping target: %s\n"
 msgstr "παράλειψη στόχου: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "στόχος δεν βρέθηκε: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Υπάρχουν %d μέλη στην ομάδα %s:\n"

src/pacman/po/en_GB.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 03:59+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -821,6 +821,10 @@ msgstr "'%s' is a file, you might want to use %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "could not load package '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "target not found: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "failed to prepare transaction (%s)\n"
@@ -941,10 +945,6 @@ msgstr "repository \"%s\" was not found.\n"
 msgid "skipping target: %s\n"
 msgstr "skipping target: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "target not found: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: There are %d members in group %s:\n"

src/pacman/po/es.po

@@ -5,6 +5,7 @@
 # Translators:
 # Angel Velasquez <angvp@archlinux.org>, 2011.
 # j3nnn1 <jcmm986@gmail.com>, 2011.
+#   <jcmm986@gmail.com>, 2012.
 # Juan Antonio Cánovas Pérez <traumness@gmail.com>, 2011.
 #   <juantascon@gmail.com>, 2011.
 # neiko <neikokz+tsfx@gmail.com>, 2011.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
-"PO-Revision-Date: 2011-11-14 03:57+0000\n"
+"PO-Revision-Date: 2012-01-31 05:58+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: j3nnn1 <jcmm986@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/es/)\n"
 "Language: es\n"
@@ -886,6 +887,10 @@ msgstr "'%s' es un archivo, quizá quiera usar %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "No se puede cargar el paquete '%s': '%s'\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "destino no encontrado: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "error al preparar la transacción (%s)\n"
@@ -1006,10 +1011,6 @@ msgstr "el repositorio \"%s\" no fue encontrado.\n"
 msgid "skipping target: %s\n"
 msgstr "saltando el objetivo: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "destino no encontrado: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Hay %d miembros en el grupo %s:\n"
@@ -1212,11 +1213,11 @@ msgstr "Repositorio %s\n"
 
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
+msgstr "Valor inválido:  %d no se encuentra entre %d y %d\n"
 
 #, c-format
 msgid "invalid number: %s\n"
-msgstr ""
+msgstr "Número inválido: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"

src/pacman/po/fi.po

@@ -6,15 +6,15 @@
 # apuasi <kaannokset.hellberg@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
 # Jesse Jaara <jesse.jaara@gmail.com>, 2011.
-#   <larso@gmx.com>, 2011.
+#   <larso@gmx.com>, 2011, 2012.
 # Larso <larso@gmx.com>, 2011.
 # Lasse Liehu <lasse.liehu@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
-"PO-Revision-Date: 2011-12-06 17:08+0000\n"
+"PO-Revision-Date: 2012-02-06 01:41+0000\n"
 "Last-Translator: Larso <larso@gmx.com>\n"
 "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/fi/)\n"
@@ -30,7 +30,7 @@ msgstr "tarkistetaan riippuvuuksia...\n"
 
 #, c-format
 msgid "checking for file conflicts...\n"
-msgstr "tarkistetaan tiedostojen ristiriitaisuutta...\n"
+msgstr "Tietokantakansio siivottu\n"
 
 #, c-format
 msgid "resolving dependencies...\n"
@@ -848,6 +848,10 @@ msgstr "'%s' on tiedosto. Haluat ehkä käyttää komentoa %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "pakettia '%s' ei voitu ladata: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "kohdetta %s ei löydy\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "latauksen valmistelu epäonnistui (%s)\n"
@@ -874,7 +878,7 @@ msgstr " ei mitään tehtävää\n"
 
 #, c-format
 msgid "Do you want to remove these packages?"
-msgstr "tahdotko poistaa nämä paketit?"
+msgstr "Haluatko poistaa nämä paketit?"
 
 #, c-format
 msgid "failed to commit transaction (%s)\n"
@@ -890,7 +894,7 @@ msgstr "kohdetta %s ei voida poistaa\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
-msgstr "tahdotko poistaa paketin %s?"
+msgstr "Haluatko poistaa tietokannan %s?"
 
 #, c-format
 msgid "Database directory: %s\n"
@@ -968,10 +972,6 @@ msgstr "pakettivarastoa '%s' ei löydy.\n"
 msgid "skipping target: %s\n"
 msgstr "ohitetaan kohde: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "kohdetta %s ei löydy\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: %d jäsentä ryhmässä %s:\n"
@@ -1022,7 +1022,7 @@ msgstr "Yhtään pakettia ei päivitetty tapahtuneiden virheiden vuoksi.\n"
 
 #, c-format
 msgid ":: Synchronizing package databases...\n"
-msgstr ":: Päivitetään pakettitietokantaa..\n"
+msgstr ":: Päivitetään pakettitietokantoja...\n"
 
 #, c-format
 msgid ":: The following packages should be upgraded first :\n"

src/pacman/po/fr.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 18:30+0000\n"
 "Last-Translator: jiehong <ma.jiehong@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -872,6 +872,10 @@ msgstr "« %s » est un fichier, vous pouvez utiliser %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "Le paquet « %s » n'a pas pu être chargé : %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "impossible de trouver la cible : %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "la préparation de la transaction a échoué (%s)\n"
@@ -993,10 +997,6 @@ msgstr "le dépôt \"%s\" n'a pas été trouvé.\n"
 msgid "skipping target: %s\n"
 msgstr "omission de la cible : %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "impossible de trouver la cible : %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Il y a %d membres dans le groupe %s\n"

src/pacman/po/hu.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2012-01-17 03:36+0000\n"
 "Last-Translator: György Balló <ballogy@freestart.hu>\n"
 "Language-Team: Hungarian (http://www.transifex.net/projects/p/archlinux-"
@@ -848,6 +848,10 @@ msgstr "'%s' egy fájl, valószínűleg a %s opciót szeretné használni.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "a(z) '%s' csomag nem tölthető be: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "cél nem található: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "nem sikerült előkészíteni a tranzakciót (%s)\n"
@@ -968,10 +972,6 @@ msgstr "a(z) \"%s\" tároló nem található.\n"
 msgid "skipping target: %s\n"
 msgstr "cél kihagyása: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "cél nem található: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: A(z) %2$s csoportnak %1$d tagja van:\n"

src/pacman/po/it.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 09:32+0000\n"
 "Last-Translator: giovanni <giovanni@archlinux.org>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -860,6 +860,10 @@ msgstr "'%s' è un file, potresti usare %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "impossibile caricare il pacchetto '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "il seguente pacchetto non è stato trovato: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "impossibile eseguire l'operazione richiesta (%s)\n"
@@ -980,10 +984,6 @@ msgstr "impossibile trovare il repository \"%s\".\n"
 msgid "skipping target: %s\n"
 msgstr "sto ignorando il pacchetto: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "il seguente pacchetto non è stato trovato: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Ci sono %d membri nel gruppo %s:\n"

src/pacman/po/kk.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 03:57+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -817,6 +817,10 @@ msgstr ""
 msgid "could not load package '%s': %s\n"
 msgstr ""
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "мақсаты табылмады: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "әрекетті дайындау қатемен аяқталды (%s)\n"
@@ -937,10 +941,6 @@ msgstr "\"%s\" репозиторийі табылмады.\n"
 msgid "skipping target: %s\n"
 msgstr "мақсатты аттап өту: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "мақсаты табылмады: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: %d мүше бар, %s тобында:\n"

src/pacman/po/lt.po

@@ -4,14 +4,14 @@
 #
 # Translators:
 # Algimantas Margevičius <gymka@mail.ru>, 2011.
-# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011, 2012.
 # toofishes <dpmcgee@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
-"PO-Revision-Date: 2011-12-20 11:36+0000\n"
+"PO-Revision-Date: 2012-02-05 07:49+0000\n"
 "Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
 "Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-"
 "pacman/team/lt/)\n"
@@ -137,7 +137,7 @@ msgid ""
 "Do you want to delete it?"
 msgstr ""
 ":: Failas %s yra sugadintas (%s).\n"
-"Ar nori jį ištrinti?"
+"Ar norite jį ištrinti?"
 
 #, c-format
 msgid ":: Import PGP key %s, \"%s\", created %s?"
@@ -181,7 +181,7 @@ msgstr "malloc klaida: negaliu priskirti %zd bitų\n"
 
 #, c-format
 msgid "could not get current working directory\n"
-msgstr "negaliu pasiekt dabartinio katalogo\n"
+msgstr "negaliu pasiekti dabartinio katalogo\n"
 
 #, c-format
 msgid "could not chdir to download directory %s\n"
@@ -230,7 +230,7 @@ msgstr "nepavyko inicijuoti alpm bibliotekos (%s)\n"
 
 #, c-format
 msgid "  try running pacman-db-upgrade\n"
-msgstr "  bandyk paleist pacman-db-upgrade\n"
+msgstr "  bandykite paleisti pacman-db-upgrade\n"
 
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
@@ -283,11 +283,11 @@ msgstr ""
 
 #, c-format
 msgid "no targets specified (use -h for help)\n"
-msgstr "nenurodytas joks objektas (bandyk -h pagalbai)\n"
+msgstr "nenurodytas joks objektas (bandykite -h pagalbai)\n"
 
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr "nenurodyta įdiegimo priežastis (bandyk -h pagalbai)\n"
+msgstr "nenurodyta įdiegimo priežastis (bandykite -h pagalbai)\n"
 
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
@@ -471,7 +471,7 @@ msgid ""
 "use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"naudok komandą „%s {-h --help}“ galimom pasirinktim pamatyt\n"
+"naudokite komandą „%s {-h --help}“ galimom pasirinktim pamatyt\n"
 
 #, c-format
 msgid ""
@@ -770,11 +770,11 @@ msgstr "nepavyko pakartotinai atidaryti skaitymui stdin: (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "tu negali įvykdyt šios komandos nebent esi root naudotojas.\n"
+msgstr "jūs negalite įvykdyt šios komandos nebent esate root naudotojas.\n"
 
 #, c-format
 msgid "no operation specified (use -h for help)\n"
-msgstr "nenurodyta jokia komanda (naudok -h pagalbai)\n"
+msgstr "nenurodyta jokia komanda (naudokite -h pagalbai)\n"
 
 #, c-format
 msgid "%s is owned by %s %s\n"
@@ -832,12 +832,16 @@ msgstr "paketas „%s“ nerastas\n"
 
 #, c-format
 msgid "'%s' is a file, you might want to use %s.\n"
-msgstr "„%s“ yra failas, turbūt norėsi naudot %s.\n"
+msgstr "„%s“ yra failas, turbūt norėsite naudoti %s.\n"
 
 #, c-format
 msgid "could not load package '%s': %s\n"
 msgstr "nepavyko įkrauti paketo „%s“: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "objektas nerastas: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "nepavyko paruošti perdavimo (%s)\n"
@@ -864,7 +868,7 @@ msgstr "nėra ką daryti\n"
 
 #, c-format
 msgid "Do you want to remove these packages?"
-msgstr "Ar nori pašalinti šiuos paketus?"
+msgstr "Ar norite pašalinti šiuos paketus?"
 
 #, c-format
 msgid "failed to commit transaction (%s)\n"
@@ -880,7 +884,7 @@ msgstr "nepavyko pašalinti %s\n"
 
 #, c-format
 msgid "Do you want to remove %s?"
-msgstr "Ar nori pašalinti %s?"
+msgstr "Ar norite pašalinti %s?"
 
 #, c-format
 msgid "Database directory: %s\n"
@@ -888,7 +892,7 @@ msgstr "Duomenų bazės aplankas: %s\n"
 
 #, c-format
 msgid "Do you want to remove unused repositories?"
-msgstr "Ar nori pašalinti nenaudojamas saugyklas?"
+msgstr "Ar norite pašalinti nenaudojamas saugyklas?"
 
 #, c-format
 msgid "Database directory cleaned up\n"
@@ -912,7 +916,7 @@ msgstr "  Visi dabar sinchronizuoti paketai\n"
 
 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr "Ar nori pašalinti visus likusius paketus iš podėlio?"
+msgstr "Ar norite pašalinti visus likusius paketus iš podėlio?"
 
 #, c-format
 msgid "removing old packages from cache...\n"
@@ -920,7 +924,7 @@ msgstr "šalinami seni paketai iš podėlio...\n"
 
 #, c-format
 msgid "Do you want to remove ALL files from cache?"
-msgstr "Ar nori pašalinti VISUS failus iš podėlio?"
+msgstr "Ar norite pašalinti VISUS failus iš podėlio?"
 
 #, c-format
 msgid "removing all files from cache...\n"
@@ -958,10 +962,6 @@ msgstr "saugykla „%s“ nerasta.\n"
 msgid "skipping target: %s\n"
 msgstr "objektas praleidžiamas: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "objektas nerastas: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Grupėje %d yra %s narių:\n"
@@ -972,7 +972,7 @@ msgstr "duomenų bazė nerasta: %s\n"
 
 #, c-format
 msgid "'%s' is a file, did you mean %s instead of %s?\n"
-msgstr "„%s“ yra failas, gal turėjai omeny %s, o ne %s?\n"
+msgstr "„%s“ yra failas, gal omeny turėjote %s, o ne %s?\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
@@ -1028,7 +1028,7 @@ msgstr ""
 
 #, c-format
 msgid "loading packages...\n"
-msgstr "kraunami paketai...\n"
+msgstr "įkraunami paketai...\n"
 
 #, c-format
 msgid "failed to init transaction (%s)\n"
@@ -1039,7 +1039,7 @@ msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
 msgstr ""
-"  jei tu tikras jog paketų tvarkytojas \n"
+"  jei jūs tikras jog paketų tvarkytojas \n"
 "  nėra paleistas, gali ištrinti %s\n"
 
 #, c-format
@@ -1172,11 +1172,11 @@ msgstr "netinkamas skaičius: %s\n"
 
 #, c-format
 msgid "Enter a selection (default=all)"
-msgstr "Įvesk pasirinkimą (numatytasis=visi)"
+msgstr "Įveskite pasirinkimą (numatytasis=visi)"
 
 #, c-format
 msgid "Enter a number (default=%d)"
-msgstr "Įvesk skaičių (numatytasis=%d)"
+msgstr "Įveskite skaičių (numatytasis=%d)"
 
 #, c-format
 msgid "[Y/n]"

src/pacman/po/nb.po

@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Alexander Rødseth <rodseth@gmail.com>, 2011.
+# Alexander Rødseth <rodseth@gmail.com>, 2011, 2012.
 # Jon Gjengset <jon@thesquareplanet.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
-"PO-Revision-Date: 2011-11-14 07:34+0000\n"
+"PO-Revision-Date: 2012-02-03 09:20+0000\n"
-"Last-Translator: Jonhoo <jon@thesquareplanet.com>\n"
+"Last-Translator: Alexander Rødseth <rodseth@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/nb/)\n"
 "Language: nb\n"
@@ -203,7 +203,7 @@ msgstr "konfigurasjonsfil %s, linje %d: ugyldig verdi for '%s': '%s'\n"
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
 msgstr ""
-"konfigurasjonsfil %s, linje %d: alternativ '%s' er ugyldig, ingen "
+"konfigurasjonsfil %s, linje %d: valget '%s' er ugyldig, ingen "
 "signaturstøtte\n"
 
 #, c-format
@@ -439,7 +439,7 @@ msgstr "ingen endringslogg tilgjengelig for '%s'.\n"
 
 #, c-format
 msgid "options"
-msgstr "alternativer"
+msgstr "valg"
 
 #, c-format
 msgid "file(s)"
@@ -467,8 +467,7 @@ msgid ""
 "use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"bruk '%s {-h --help}' sammen med en handling, for tilgjengelige "
+"bruk '%s {-h --help}' sammen med en handling, for tilgjengelige valg\n"
-"alternativer\n"
 
 #, c-format
 msgid ""
@@ -508,7 +507,7 @@ msgstr "  -c, --changelog      vis endringsloggen for en pakke\n"
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
 msgstr ""
-"   -d, --deps     list alle pakker som er installert som avhengigheter "
+"  -d, --deps     list alle pakker som er installert som avhengigheter "
 "[filter]\n"
 
 #, c-format
@@ -524,14 +523,14 @@ msgstr "  -g, --groups          list opp alle medlemmer i en pakkegruppe\n"
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for backup files)\n"
-msgstr "   -i, --info       vis pakkeinformasjon (-ii for backup-filer)\n"
+msgstr "  -i, --info       vis pakkeinformasjon (-ii for backup-filer)\n"
 
 #, c-format
 msgid ""
 "  -k, --check          check that the files owned by the package(s) are "
 "present\n"
 msgstr ""
-"   -k, --check     sjekk om filene som er eid av pakken(e) er tilstede\n"
+"  -k, --check     sjekk om filene som er eid av pakken(e) er tilstede\n"
 
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
@@ -547,7 +546,7 @@ msgstr ""
 
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr "   -o --owns <fil>    finn pakken som eier <fil>\n"
+msgstr "  -o, --owns <fil>    finn pakken som eier <fil>\n"
 
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
@@ -659,7 +658,7 @@ msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
 msgstr ""
-"     --ignoregroup    ignorer en gruppeoppgradering (kan brukes mer enn én "
+"      --ignoregroup    ignorer en gruppeoppgradering (kan brukes mer enn én "
 "gang)\n"
 
 #, c-format
@@ -679,13 +678,13 @@ msgstr ""
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr "     --noprogressbar   ikke vis framdrift ved nedlasting av filer\n"
+msgstr "      --noprogressbar   ikke vis framdrift ved nedlasting av filer\n"
 
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
 msgstr ""
-"    --noscriptlet     ikke kjør installasjons-scriptet, om det finnes\n"
+"      --noscriptlet     ikke kjør installasjons-scriptet, om det finnes\n"
 
 #, c-format
 msgid ""
@@ -841,6 +840,10 @@ msgstr "'%s' er en fil, du vil nok heller bruke %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "kunne ikke laste pakke '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "valget ble ikke funnet: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "kunne ikke forberede transaksjon (%s)\n"
@@ -961,10 +964,6 @@ msgstr "fant ikke pakkebrønnen \"%s\".\n"
 msgid "skipping target: %s\n"
 msgstr "hopper over valg: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "valget ble ikke funnet: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Det er %d elementer i gruppen %s:\n"

src/pacman/po/pacman.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman 4.0.1\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -777,6 +777,10 @@ msgstr ""
 msgid "could not load package '%s': %s\n"
 msgstr ""
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr ""
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr ""
@@ -897,10 +901,6 @@ msgstr ""
 msgid "skipping target: %s\n"
 msgstr ""
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr ""
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ""

src/pacman/po/pl.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 16:10+0000\n"
 "Last-Translator: Kwpolska <kwpolska@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -847,6 +847,10 @@ msgstr "'%s' jest plikiem, możesz chcieć użyć %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "nie można załadować pakietu '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "nie znaleziono celu: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "nie udało się przygotować transakcji (%s)\n"
@@ -967,10 +971,6 @@ msgstr "repozytorium \"%s\" nie zostało znalezione.\n"
 msgid "skipping target: %s\n"
 msgstr "Pomijam cel: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "nie znaleziono celu: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Jest %d pakietów w grupie %s:\n"

src/pacman/po/pt.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 14:26+0000\n"
 "Last-Translator: R00KIE <registosites@hotmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/archlinux-"
@@ -891,6 +891,10 @@ msgstr "'%s' é um ficheiro, talvez pondere usar %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "Não é possível carregar o pacote '%s':%s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "alvo não encontrado: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "falhou ao preparar a transação (%s)\n"
@@ -1011,10 +1015,6 @@ msgstr "repositório \"%s\" não foi encontrado.\n"
 msgid "skipping target: %s\n"
 msgstr "ignorar alvo: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "alvo não encontrado: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Há %d membros no grupo %s:\n"

src/pacman/po/pt_BR.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 04:14+0000\n"
 "Last-Translator: rafaelff1 <rafael.f.f1@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
@@ -878,6 +878,10 @@ msgstr "\"%s\" é um arquivo, você pode querer usar %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "Falha em carregar pacote \"%s\": %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "alvo não encontrado: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "falha ao preparar a transação (%s)\n"
@@ -998,10 +1002,6 @@ msgstr "repositório \"%s\" não foi encontrado.\n"
 msgid "skipping target: %s\n"
 msgstr "ignorando alvo: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "alvo não encontrado: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Existem %d membros no grupo %s:\n"

src/pacman/po/ro.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-15 19:51+0000\n"
 "Last-Translator: wonder <ibiru@archlinux.org>\n"
 "Language-Team: Romanian (http://www.transifex.net/projects/p/archlinux-"
@@ -869,6 +869,10 @@ msgstr "'%s' e un fișier, probabil vrei să folosești %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "nu s-a putut încărca pachetul '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "nu s-a găsit ținta: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "eșec la pregătirea tranzacției (%s)\n"
@@ -991,10 +995,6 @@ msgstr "depozitul \"%s\" nu a fost găsit.\n"
 msgid "skipping target: %s\n"
 msgstr "se omite ținta: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "nu s-a găsit ținta: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Există %d membri în grupul %s:\n"

src/pacman/po/ru.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2012-01-17 18:38+0000\n"
 "Last-Translator: partizan <serg.partizan@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -845,6 +845,10 @@ msgstr "'%s' это файл, вы можете использовать %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "не удалось загрузить пакет '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "цель не найдена: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "не удалось подготовить запрос (%s)\n"
@@ -965,10 +969,6 @@ msgstr "репозиторий \"%s\" не найден.\n"
 msgid "skipping target: %s\n"
 msgstr "пропуск цели: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "цель не найдена: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ""

src/pacman/po/sk.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-25 15:12+0000\n"
 "Last-Translator: archetyp <archetyp@linuxmail.org>\n"
 "Language-Team: Slovak (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -847,6 +847,10 @@ msgstr "'%s' je súbor, môžno budete chcieť použiť %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "nie je možné načítať balíček '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "cieľ nebol nájdený: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "zlyhala príprava transakcie (%s)\n"
@@ -968,10 +972,6 @@ msgstr "repozitár \"%s\" nebol nájdený.\n"
 msgid "skipping target: %s\n"
 msgstr "preskakujem cieľ: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "cieľ nebol nájdený: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: V skupine %2$s je %1$d členov:\n"

src/pacman/po/sr.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 11:06+0000\n"
 "Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -835,6 +835,10 @@ msgstr "„%s“ је фајл, можда вам треба %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "не могу да учитам пакет „%s“: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "циљ није нађен: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "неуспело припремање преноса (%s)\n"
@@ -955,10 +959,6 @@ msgstr "није нађена ризница „%s“.\n"
 msgid "skipping target: %s\n"
 msgstr "прескачем циљ: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "циљ није нађен: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Има %d чланова у групи %s:\n"

src/pacman/po/sr@latin.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 11:07+0000\n"
 "Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/"
@@ -837,6 +837,10 @@ msgstr "„%s“ je fajl, možda vam treba %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "ne mogu da učitam paket „%s“: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "cilj nije nađen: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "neuspelo pripremanje prenosa (%s)\n"
@@ -957,10 +961,6 @@ msgstr "nije nađena riznica „%s“.\n"
 msgid "skipping target: %s\n"
 msgstr "preskačem cilj: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "cilj nije nađen: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Ima %d članova u grupi %s:\n"

src/pacman/po/sv.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-15 15:43+0000\n"
 "Last-Translator: Gazpachian <f.halldal@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -832,6 +832,10 @@ msgstr "'%s' är en fil, du vill nog använda %s.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "kunde ej ladda paket '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "mål ej funnet: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "misslyckades att förbereda överföring (%s)\n"
@@ -952,10 +956,6 @@ msgstr "förrådet \"%s\" hittades inte.\n"
 msgid "skipping target: %s\n"
 msgstr "hoppar över målet: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "mål ej funnet: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: Det finns %d medlemmar i grupp %s:\n"

src/pacman/po/tr.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2012-01-17 22:07+0000\n"
 "Last-Translator: Atilla Öntaş <tarakbumba@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -832,6 +832,10 @@ msgstr "'%s' bir dosya, %s kullanmak isteyebilirsiniz.\n"
 msgid "could not load package '%s': %s\n"
 msgstr "'%s' paketi yüklenemedi: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "hedef bulunamadı: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "işlem hazırlığı başarısız oldu (%s)\n"
@@ -952,10 +956,6 @@ msgstr "\"%s\" deposu bulunamadı.\n"
 msgid "skipping target: %s\n"
 msgstr "hedef atlanıyor: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "hedef bulunamadı: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: %d adet üye %s grubunda yer alıyor:\n"

src/pacman/po/uk.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2012-01-29 10:04+0000\n"
 "Last-Translator: Данило Коростіль <ted.korostiled@gmail.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.net/projects/p/archlinux-"
@@ -851,6 +851,10 @@ msgstr "«%s» — файл, можливо, ви хотіли скориста
 msgid "could not load package '%s': %s\n"
 msgstr "неможливо завантажити пакунок «%s»: %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "цілі не знайдено: %s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "не вдалось підготувати операцію (%s)\n"
@@ -973,10 +977,6 @@ msgstr "сховище «%s» не знайдено.\n"
 msgid "skipping target: %s\n"
 msgstr "пропущення пакунка: %s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "цілі не знайдено: %s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: %d учасників у групі %s:\n"

src/pacman/po/zh_CN.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-14 11:42+0000\n"
 "Last-Translator: ganlu <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/"
@@ -791,6 +791,10 @@ msgstr "'%s' 是一个文件，您可能打算使用 %s。\n"
 msgid "could not load package '%s': %s\n"
 msgstr "无法加载软件包 '%s': %s\n"
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "未找到目标：%s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "无法准备事务处理 (%s)\n"
@@ -911,10 +915,6 @@ msgstr "软件库 \"%s\" 未找到\n"
 msgid "skipping target: %s\n"
 msgstr "正在跳过软件包：%s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "未找到目标：%s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: 共有 %d 组员在组 %s 中：\n"

src/pacman/po/zh_TW.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-23 18:47-0600\n"
+"POT-Creation-Date: 2012-02-06 05:42-0600\n"
 "PO-Revision-Date: 2011-11-16 05:14+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/"
@@ -797,6 +797,10 @@ msgstr ""
 msgid "could not load package '%s': %s\n"
 msgstr ""
 
+#, c-format
+msgid "target not found: %s\n"
+msgstr "未找到目標：%s\n"
+
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "無法準備事務處理 (%s)\n"
@@ -917,10 +921,6 @@ msgstr "軟件庫 \"%s\" 未找到\n"
 msgid "skipping target: %s\n"
 msgstr "正在跳過軟件包：%s\n"
 
-#, c-format
-msgid "target not found: %s\n"
-msgstr "未找到目標：%s\n"
-
 #, c-format
 msgid ":: There are %d members in group %s:\n"
 msgstr ":: 共有 %d 組員在組 %s 中：\n"

src/pacman/remove.c

@@ -54,7 +54,7 @@ static int remove_target(const char *target)
 		/* fallback to group */
 	alpm_group_t *grp = alpm_db_get_group(db_local, target);
 	if(grp == NULL) {
-		pm_printf(ALPM_LOG_ERROR, "'%s': target not found\n", target);
+		pm_printf(ALPM_LOG_ERROR, _("target not found: %s\n"), target);
 		return -1;
 	}
 	for(p = grp->packages; p; p = alpm_list_next(p)) {

src/pacman/util.c

@@ -841,13 +841,13 @@ static alpm_list_t *create_verbose_row(pm_target_t *target, int dl_size)
 	/* and size */
 	size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0;
 	size += target->install ? alpm_pkg_get_isize(target->install) : 0;
-	human_size = humanize_size(size, 'M', &label);
+	human_size = humanize_size(size, 'M', 2, &label);
 	pm_asprintf(&str, "%.2f %s", human_size, label);
 	ret = alpm_list_add(ret, str);
 
 	if(dl_size) {
 		size = target->install ? alpm_pkg_download_size(target->install) : 0;
-		human_size = humanize_size(size, 'M', &label);
+		human_size = humanize_size(size, 'M', 2, &label);
 		if(size != 0) {
 			pm_asprintf(&str, "%.2f %s", human_size, label);
 		} else {
@@ -931,21 +931,21 @@ static void _display_targets(alpm_list_t *targets, int verbose)
 	free(str);
 
 	if(dlsize > 0 || config->op_s_downloadonly) {
-		size = humanize_size(dlsize, 'M', &label);
+		size = humanize_size(dlsize, 'M', 2, &label);
 		printf(_("Total Download Size:    %.2f %s\n"), size, label);
 	}
 	if(!config->op_s_downloadonly) {
 		if(isize > 0) {
-			size = humanize_size(isize, 'M', &label);
+			size = humanize_size(isize, 'M', 2, &label);
 			printf(_("Total Installed Size:   %.2f %s\n"), size, label);
 		}
 		if(rsize > 0 && isize == 0) {
-			size = humanize_size(rsize, 'M', &label);
+			size = humanize_size(rsize, 'M', 2, &label);
 			printf(_("Total Removed Size:     %.2f %s\n"), size, label);
 		}
 		/* only show this net value if different from raw installed size */
 		if(isize > 0 && rsize > 0) {
-			size = humanize_size(isize - rsize, 'M', &label);
+			size = humanize_size(isize - rsize, 'M', 2, &label);
 			printf(_("Net Upgrade Size:       %.2f %s\n"), size, label);
 		}
 	}
@@ -1038,18 +1038,31 @@ static char *pkg_get_location(alpm_pkg_t *pkg)
 	}
 }
 
+/* a pow() implementation that is specialized for an integer base and small,
+ * positive-only integer exponents. */
+static double simple_pow(int base, int exp)
+{
+	double result = 1.0;
+	for(; exp > 0; exp--) {
+		result *= base;
+	}
+	return result;
+}
+
 /** Converts sizes in bytes into human readable units.
  *
  * @param bytes the size in bytes
  * @param target_unit '\0' or a short label. If equal to one of the short unit
  * labels ('B', 'K', ...) bytes is converted to target_unit; if '\0', the first
  * unit which will bring the value to below a threshold of 2048 will be chosen.
- * @param long_labels whether to use short ("K") or long ("KiB") unit labels
+ * @param precision number of decimal places, ensures -0.0.0 gets rounded to
+ * 0.00; -1 if no rounding desired
  * @param label will be set to the appropriate unit label
  *
  * @return the size in the appropriate unit
  */
-double humanize_size(off_t bytes, const char target_unit, const char **label)
+double humanize_size(off_t bytes, const char target_unit, int precision,
+		const char **label)
 {
 	static const char *labels[] = {"B", "KiB", "MiB", "GiB",
 		"TiB", "PiB", "EiB", "ZiB", "YiB"};
@@ -1071,6 +1084,12 @@ double humanize_size(off_t bytes, const char target_unit, const char **label)
 		*label = labels[index];
 	}
 
+	/* fix FS#27924 so that it doesn't display negative zeroes */
+	if(precision >= 0 && val < 0.0 &&
+			val > (-0.5 / simple_pow(10, precision))) {
+		val = 0.0;
+	}
+
 	return val;
 }
 

src/pacman/util.h

@@ -56,7 +56,8 @@ size_t strtrim(char *str);
 char *strreplace(const char *str, const char *needle, const char *replace);
 alpm_list_t *strsplit(const char *str, const char splitchar);
 void string_display(const char *title, const char *string);
-double humanize_size(off_t bytes, const char target_unit, const char **label);
+double humanize_size(off_t bytes, const char target_unit, int precision,
+		const char **label);
 int table_display(const char *title, const alpm_list_t *header, const alpm_list_t *rows);
 void list_display(const char *title, const alpm_list_t *list);
 void list_display_linebreak(const char *title, const alpm_list_t *list);

test/pacman/tests/upgrade001.py

@@ -12,6 +12,7 @@
 
 self.args = "-U %s" % p.filename()
 
+self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=dummy|1.0-2")
 for f in lp.files:
 	self.addrule("FILE_MODIFIED=%s" % f)

test/pacman/tests/upgrade002.py

@@ -12,6 +12,7 @@
 
 self.args = "-U %s" % p.filename()
 
+self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=dummy|1.0-1")
 for f in lp.files:
 	self.addrule("FILE_MODIFIED=%s" % f)

test/pacman/tests/upgrade003.py

@@ -12,6 +12,7 @@
 
 self.args = "-U %s" % p.filename()
 
+self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=dummy|1.0-1")
 for f in lp.files:
 	self.addrule("FILE_MODIFIED=%s" % f)

test/pacman/tests/upgrade004.py

@@ -7,6 +7,7 @@
 
 self.args = "-U %s" % p.filename()
 
+self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=dummy")
 for f in p.files:
 	self.addrule("FILE_EXIST=%s" % f)