summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-02-22 21:34:51 +0000
committerDan McGee <dan@archlinux.org>2007-02-22 21:34:51 +0000
commit332c12710988198070fbc95cd869ca639b989238 (patch)
tree2dd7b1977f297bd660b26cef168325a347953384
parentef4728903d4c5f69100a0b3923b82b6008972c6f (diff)
Big commit here, I'll try to cover all the bases.
* Updated all of the language files, as the POT file was updated. NOTE FOR TRANSLATORS, try to base your next contribution off of these, notice how some msgids and messages have been wrapped to the next line- it makes it easier to read anyway. * More Makefile.am/configure.ac updates. 'make dist' and 'make distclean' now work properly, with only one caveat- the automatic testing in distclean doesn't do so hot as it is compiled with a default configure, which includes the fakeroot-proof code (which does not cooperate with pactest). * Added a Makefile.am for the pactest directory.
-rw-r--r--Makefile.am10
-rwxr-xr-xautoclean.sh2
-rw-r--r--configure.ac112
-rw-r--r--doc/Makefile.am2
-rw-r--r--etc/Makefile.am1
-rw-r--r--etc/pacman.d/Makefile.am2
-rw-r--r--lib/libalpm/Makefile.am2
-rw-r--r--lib/libalpm/po/de.po24
-rw-r--r--lib/libalpm/po/fr.po526
-rw-r--r--lib/libalpm/po/hu.po522
-rw-r--r--lib/libalpm/po/it.po2
-rw-r--r--lib/libalpm/po/pt_BR.po477
-rw-r--r--pactest/Makefile.am15
-rw-r--r--scripts/Makefile.am6
-rw-r--r--src/pacman/pacman.c2
-rw-r--r--src/pacman/po/de.po45
-rw-r--r--src/pacman/po/fr.po173
-rw-r--r--src/pacman/po/hu.po173
-rw-r--r--src/pacman/po/it.po6
-rw-r--r--src/pacman/po/pt_BR.po178
20 files changed, 1291 insertions, 989 deletions
diff --git a/Makefile.am b/Makefile.am
index 1074525c..68f2e240 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,13 @@
-SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc
+SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest
# Some files automatically included, so they aren't specified below:
# AUTHORS, COPYING, NEWS, README
# TODO: move translation-help to ABOUT-NLS?
EXTRA_DIST = HACKING
-check: src/pacman
- cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=1
+# TODO : figure out a way to get 'make distcheck' to build with
+# --disable-fakeroot so it actually passes tests
+check-local: src/pacman
+ python $(top_srcdir)/pactest/pactest.py --test=$(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman --debug=1
+ rm -rf $(top_builddir)/root
+
diff --git a/autoclean.sh b/autoclean.sh
index 16364519..0cb089c8 100755
--- a/autoclean.sh
+++ b/autoclean.sh
@@ -38,6 +38,8 @@ rm -rf etc/pacman.d/Makefile.in
rm -rf etc/pacman.d/Makefile
rm -rf etc/abs/Makefile.in
rm -rf etc/abs/Makefile
+rm -rf pactest/Makefile.in
+rm -rf pactest/Makefile
rm -rf src/pacman/po/Makefile
rm -rf src/pacman/po/Makefile.in
diff --git a/configure.ac b/configure.ac
index b532562c..8890cd07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,30 +3,30 @@ CFLAGS=""
AC_PREREQ(2.59)
dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots
-AC_INIT([Pacman package manager], 3.0.0, [pacman-dev@archlinux.org], pacman)
-AC_LANG(C)
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_SYSTEM
+AC_INIT([Pacman package manager], 3.0.0, [pacman-dev@archlinux.org], [pacman])
+AC_LANG([C])
+AC_CONFIG_HEADERS(config.h)
+AC_CANONICAL_HOST
AM_INIT_AUTOMAKE
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION(0.13.1)
-dnl Define here the libalpm version number
-PM_MAJOR_VERSION=1
-PM_MINOR_VERSION=0
-PM_MICRO_VERSION=0
-PM_VERSION=$PM_MAJOR_VERSION.$PM_MINOR_VERSION.$PM_MICRO_VERSION
-dnl Needed for libtool to create proper shared lib version
-PM_VERSION_INFO=`expr $PM_MAJOR_VERSION + $PM_MINOR_VERSION`:$PM_MICRO_VERSION:$PM_MINOR_VERSION
+dnl Define the libalpm version number here
+LIB_MAJOR_VERSION=1
+LIB_MINOR_VERSION=0
+LIB_MICRO_VERSION=0
+LIB_VERSION=$LIB_MAJOR_VERSION.$LIB_MINOR_VERSION.$LIB_MICRO_VERSION
+dnl Needed for libtool to create proper shared lib version.
+dnl This is not completely correct- see
+dnl http://sourceware.org/autobook/autobook/autobook_91.html for details.
+LIB_VERSION_INFO=`expr $LIB_MAJOR_VERSION + $LIB_MINOR_VERSION`:$LIB_MICRO_VERSION:$LIB_MINOR_VERSION
-AC_SUBST(PM_MAJOR_VERSION)
-AC_SUBST(PM_MINOR_VERSION)
-AC_SUBST(PM_MICRO_VERSION)
-AC_SUBST(PM_VERSION)
-AC_SUBST(PM_VERSION_INFO)
+dnl Set subsitution values for version stuff in Makefiles and anywhere else
+AC_SUBST(LIB_VERSION)
+AC_SUBST(LIB_VERSION_INFO)
-dnl Put out version numbers to config.h
-AC_DEFINE_UNQUOTED([PM_VERSION], ["$PM_VERSION"], [libalpm version number])
+dnl Put version number in config.h
+AC_DEFINE_UNQUOTED([LIB_VERSION], ["$LIB_VERSION"], [libalpm version number])
dnl Configuration files
dnl AC_CONFIG_FILES([etc/makepkg.conf] [etc/pacman.conf])
@@ -38,10 +38,6 @@ AC_CHECK_FUNCS([strverscmp])
AM_PROG_LIBTOOL
AM_CONDITIONAL(LINKSTATIC, test "$enable_static" = "yes")
-dnl Humor lowers blood pressure
-AC_MSG_CHECKING(your blood pressure)
-AC_MSG_RESULT([a bit high, but we can proceed])
-
dnl Help line for man2html
AC_ARG_ENABLE(man2html,
AC_HELP_STRING([--enable-man2html], [Build html docs via man2html]),
@@ -54,7 +50,7 @@ AC_ARG_ENABLE(doxygen,
dnl Help line for config file
AC_ARG_WITH(config-file,
- AC_HELP_STRING([ --with-config-file=path], [Set the location of pacman's config file]),
+ AC_HELP_STRING([--with-config-file=path], [Set the location of pacman's config file]),
[configfile=$withval], [configfile=/etc/pacman.conf])
dnl Help line for debug
@@ -67,7 +63,7 @@ AC_ARG_ENABLE(fakeroot,
AC_HELP_STRING([--disable-fakeroot], [Disable fakeroot proof support]),
[fakeroot=$enableval], [fakeroot=yes])
-dnl Host dependant flags
+dnl Host-dependant flags
case "${host}" in
*-*-cygwin*)
ENV_CFLAGS="$ENV_CFLAGS -DCYGWIN"
@@ -113,48 +109,48 @@ esac
dnl Now do some things common to all architectures
CHOST="${host}"
-AC_DEFINE_UNQUOTED([CARCH], ["$CARCH"], [Architecture])
-AC_DEFINE_UNQUOTED([CARCHFLAGS], ["$CARCHFLAGS"], [Architecture Flags])
-AC_DEFINE_UNQUOTED([ARCHSWITCH], ["$ARCHSWITCH"], [Architecture Switch (march/mcpu)])
-AC_DEFINE_UNQUOTED([CHOST], ["$CHOST"], [Host Type])
AC_SUBST(CARCH)
AC_SUBST(CARCHFLAGS)
AC_SUBST(ARCHSWITCH)
AC_SUBST(CHOST)
+dnl Humor lowers blood pressure
+AC_MSG_CHECKING(your blood pressure)
+AC_MSG_RESULT([a bit high, but we can proceed])
+
dnl Check for man2html binary
AC_MSG_CHECKING(for man2html)
if test "x$wantman2html" = "xyes" ; then
AC_CHECK_PROGS([MAN2HTML], [man2html])
- AM_CONDITIONAL(HAS_MAN2HTML, test $MAN2HTML)
if test $MAN2HTML ; then
- AC_DEFINE([HAS_MAN2HTML], [TRUE], [Enable HTML manpages using man2html])
AC_MSG_RESULT(yes)
+ useman2html=yes
else
AC_MSG_RESULT(no, man2html missing)
+ useman2html=no
fi
else
- AM_CONDITIONAL(HAS_MAN2HTML, false)
AC_MSG_RESULT(no, disabled by configure)
+ useman2html=no
fi
+AM_CONDITIONAL(HAS_MAN2HTML, test "x$useman2html" = "xyes")
dnl Check for doxygen support
AC_MSG_CHECKING(for doxygen)
if test "x$wantdoxygen" = "xyes" ; then
AC_CHECK_PROGS([DOXYGEN], [doxygen])
- AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN)
if test $DOXYGEN ; then
- DOXYSTATUS="yes, path: `which $DOXYGEN`"
AC_MSG_RESULT(yes)
+ usedoxygen=yes
else
- DOXYSTATUS="doxygen binary not found"
AC_MSG_RESULT(no, doxygen missing)
+ usedoxygen=no
fi
else
- AM_CONDITIONAL(HAS_DOXYGEN, false)
- DOXYSTATUS="no, disabled by configure"
AC_MSG_RESULT(no, disabled by configure)
+ usedoxygen=no
fi
+AM_CONDITIONAL(HAS_DOXYGEN, test "x$usedoxygen" = "xyes")
dnl Check for math
AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])])
@@ -177,7 +173,7 @@ fi
dnl Set config location
AC_MSG_CHECKING(for configuration file name)
if test -n "$configfile"; then
- CFLAGS="$CFLAGS -D'PACCONF=\"$configfile\"'"
+ AC_DEFINE_UNQUOTED([PACCONF], "$configfile", [Location of pacman conf file])
AC_MSG_RESULT(["$configfile"])
else
AC_MSG_ERROR(["pacman config file (--with-config-file is not set"])
@@ -185,26 +181,28 @@ fi
dnl Enable or disable debug code
AC_MSG_CHECKING(for debug mode request)
-if test "$debug" = "yes" ; then
- AM_CONDITIONAL(PACMAN_DEBUG, test "x$debug" = "xyes")
- CFLAGS="$CFLAGS -g -Wall -Werror -std=c99 -DPACMAN_DEBUG"
+if test "x$debug" = "xyes" ; then
+ AC_DEFINE([PACMAN_DEBUG], , [Enable debug code])
+ CFLAGS="$CFLAGS -g -Wall -Werror -std=c99"
LDFLAGS="$LDFLAGS -lmcheck"
AC_MSG_RESULT(yes)
else
- AM_CONDITIONAL(PACMAN_DEBUG, test "x$debug" = "xno")
CFLAGS="$CFLAGS -Wall -std=c99"
AC_MSG_RESULT(no)
fi
dnl Enable or disable fakeroot code
AC_MSG_CHECKING(for fakeroot proof support)
-if test "$fakeroot" = "yes" ; then
+if test "x$fakeroot" = "xyes" ; then
AC_MSG_RESULT(yes)
else
- CFLAGS="$CFLAGS -DFAKEROOT"
+ AC_DEFINE([FAKEROOT], , [Disable fakeroot-proof code])
AC_MSG_RESULT(no)
fi
+dnl Set CFLAGS to both $CFLAGS and ones from env ($ENV_CFLAGS)
+CFLAGS="$CFLAGS $ENV_CFLAGS"
+
dnl ==========================================================================
AC_OUTPUT([
@@ -221,25 +219,29 @@ etc/pacman.conf
etc/pacman.d/Makefile
etc/pacman.d/mirrorlist
etc/abs/Makefile
+pactest/Makefile
Makefile
])
echo "
pacman-$VERSION:
- prefix : ${prefix}
- source code location : ${srcdir}
- compiler : ${CC}
- compiler flags : ${CFLAGS}
-
- libalpm version : ${PM_VERSION}
- pacman.conf location : ${configfile}
+ prefix : ${prefix}
+ source code location : ${srcdir}
+ compiler : ${CC}
+ compiler flags : ${CFLAGS}
+ defines : ${DEFS}
- Architecture CARCH : ${CARCH}
- Architecture used cflag : ${CARCHFLAGS}
- Architecture CHOST : ${CHOST}
+ Architecture : ${CARCH}
+ Architecture flags : -${ARCHSWITCH}=${CARCHFLAGS}
+ Host Type : ${CHOST}
- Doxygen support : ${DOXYSTATUS}
+ libalpm version : ${LIB_VERSION}
+ pacman version : ${PACKAGE_VERSION}
+ pacman.conf location : ${configfile}
- debug support : ${debug}
+ Doxygen support : ${usedoxygen}
+ man2html support : ${useman2html}
+ debug support : ${debug}
+ fakeroot-proof support : ${fakeroot}
"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6bb9587d..df55026a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,7 +31,7 @@ man_MANS = \
libalpm.3
if HAS_DOXYGEN
-man_MANS += *.3
+man_MANS += $(wildcard man3/*.3)
endif
EXTRA_DIST = $(man_MANS)
diff --git a/etc/Makefile.am b/etc/Makefile.am
index e53ada24..0bded95e 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,3 +1,4 @@
SUBDIRS = pacman.d abs
+
EXTRA_DIST = makepkg.conf pacman.conf
dist_sysconf_DATA = makepkg.conf pacman.conf
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index eb94f3c1..57e23cf0 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -4,6 +4,6 @@ dist_pkgsysconf_DATA = community current extra release unstable
$(dist_pkgsysconf_DATA): mirrorlist
sed "s|@@REPO@@|$@|g" <$< >$@
-clean:
+clean-local:
rm -f $(dist_pkgsysconf_DATA)
diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index fa36941d..956c08ef 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -38,7 +38,7 @@ libalpm_la_SOURCES = \
util.h util.c \
versioncmp.h versioncmp.c
-libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO)
+libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO)
libalpm_la_LIBADD = -larchive -ldownload -lm
if HAS_DOXYGEN
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 2cc00dfc..4e4f2d56 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-22 07:54+0100\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2007-02-22 08:10+0100\n"
"Last-Translator: Pierre Schmitz <pierre@archlinux.de>\n"
"Language-Team: Deutsch <archlinux.de>\n"
@@ -188,7 +188,8 @@ msgstr "Aktion: Lasse existierende Datei an ihrem Platz"
#: lib/libalpm/add.c:709
msgid "action: keeping current file and installing new one with .pacnew ending"
-msgstr "Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew"
+msgstr ""
+"Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew"
#: lib/libalpm/add.c:712
#, c-format
@@ -294,7 +295,8 @@ msgstr "Schließe Datenbank '%s'"
#: lib/libalpm/alpm.c:229
#, c-format
-msgid "adding new server to database '%s': protocol '%s', server '%s', path '%s'"
+msgid ""
+"adding new server to database '%s': protocol '%s', server '%s', path '%s'"
msgstr ""
"Füge neuen Server zur Datenbank '%s' hinzu: Protokoll '%s', Server '%s', "
"Pfad '%s'"
@@ -500,8 +502,10 @@ msgstr "Überspringe ungültigen an _alpm_db_read übergebenen Paket-Eintrag"
#: lib/libalpm/be_files.c:218
#, c-format
-msgid "request to read database info for a file-based package '%s', skipping..."
-msgstr "Überspringe das Lesen der Datenbank für ein Datei-basiertes Paket '%s'..."
+msgid ""
+"request to read database info for a file-based package '%s', skipping..."
+msgstr ""
+"Überspringe das Lesen der Datenbank für ein Datei-basiertes Paket '%s'..."
#: lib/libalpm/be_files.c:226
#, c-format
@@ -644,7 +648,8 @@ msgstr "Registriere Datenbank '%s'"
#: lib/libalpm/db.c:182
#, c-format
msgid "database directory '%s' does not exist -- try creating it"
-msgstr "Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen"
+msgstr ""
+"Datenbankverzeichnis '%s' ist nicht vorhanden - Versuche es zu erstellen"
#: lib/libalpm/db.c:193
#, c-format
@@ -695,7 +700,8 @@ msgstr "Schließe %s aus -- Ausdrücklich installiert"
#: lib/libalpm/deps.c:499
#, c-format
msgid "cannot find package \"%s\" or anything that provides it!"
-msgstr "Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!"
+msgstr ""
+"Kann Paket \"%s\" oder irgendwas, das es zur Verfügung stellt, nicht finden!"
#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
#, c-format
@@ -713,7 +719,8 @@ msgstr "%s stellt Abhängigkeit %s zur Verfügung -- Überspringe"
#: lib/libalpm/deps.c:594
#, c-format
-msgid "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
+msgid ""
+"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
msgstr ""
"Kann Abhängigkeiten für \"%s\" nicht auflösen (\"%s\" ist nicht in "
"Paketliste enthalten)"
@@ -1437,4 +1444,3 @@ msgstr "depcmp: %s-%s %s %s-%s => %s"
#, c-format
msgid "depcmp: %s-%s %s %s => %s"
msgstr "depcmp: %s-%s %s %s => %s"
-
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index 275baa7c..cef5511a 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-14 14:32-0500\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2006-06-05 22:47+0100\n"
"Last-Translator: Enda <enda@netou.com>\n"
"MIME-Version: 1.0\n"
@@ -26,38 +26,47 @@ msgstr "ne peut analyser l'élément %s"
msgid "loading target '%s'"
msgstr "charge la cible '%s'"
-#: lib/libalpm/add.c:175
+#: lib/libalpm/add.c:174
#, c-format
msgid "replacing older version %s-%s by %s in target list"
msgstr "remplace l'ancienne version %s-%s par %s dans la liste de destination"
-#: lib/libalpm/add.c:184
+#: lib/libalpm/add.c:183
#, c-format
msgid "newer version %s-%s is in the target list -- skipping"
msgstr "une version plus récente %s-%s est déjà présente -- ignorer"
-#: lib/libalpm/add.c:191
+#: lib/libalpm/add.c:190
#, c-format
msgid "reading '%s' metadata"
msgstr "lecture des métas-données '%s'"
-#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
msgid "looking for unsatisfied dependencies"
msgstr "recherche des dépendances non satisfaites"
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:473
+#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
msgid "looking for conflicts"
msgstr "recherche des conflits"
-#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:260
+msgid "replacing packages with -A and -U is not supported yet"
+msgstr ""
+
+#: lib/libalpm/add.c:261
+#, c-format
+msgid "please remove '%s' first, using -Rd"
+msgstr ""
+
+#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
msgid "sorting by dependencies"
msgstr "tri par dépendances"
-#: lib/libalpm/add.c:307
+#: lib/libalpm/add.c:314
msgid "cleaning up"
msgstr "nettoyage"
-#: lib/libalpm/add.c:324
+#: lib/libalpm/add.c:329
msgid "looking for file conflicts"
msgstr "recherche de conflits entre fichiers"
@@ -66,216 +75,202 @@ msgstr "recherche de conflits entre fichiers"
msgid "upgrading package %s-%s"
msgstr "mise a jour du paquet %s-%s"
-#: lib/libalpm/add.c:419
-#, c-format
-msgid "removing old package first (%s-%s)"
-msgstr "retirer l'ancien paquet préalablement (%s-%s)"
-
-#: lib/libalpm/add.c:449
+#: lib/libalpm/add.c:417
#, c-format
msgid "adding package %s-%s"
msgstr "ajout du paquet %s-%s"
-#: lib/libalpm/add.c:460
+#: lib/libalpm/add.c:430
+#, c-format
+msgid "removing old package first (%s-%s)"
+msgstr "retirer l'ancien paquet préalablement (%s-%s)"
+
+#: lib/libalpm/add.c:457
#, c-format
-msgid "adding new package %s-%s"
-msgstr "ajout du nouveau paquet %s-%s"
+msgid "adding %s to the NoUpgrade array temporarilly"
+msgstr ""
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:475
msgid "extracting files"
msgstr "extraction des fichiers"
-#: lib/libalpm/add.c:480 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr "impossible de déterminer le répertoire courant"
-#: lib/libalpm/add.c:538
+#: lib/libalpm/add.c:546
+#, fuzzy, c-format
+msgid "%s is in NoExtract, skipping extraction"
+msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
+
+#: lib/libalpm/add.c:547
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
-#: lib/libalpm/add.c:574 lib/libalpm/add.c:727
+#: lib/libalpm/add.c:554
+#, fuzzy, c-format
+msgid "%s is in trans->skip_add, skipping extraction"
+msgstr "note: %s est dans la liste NoExtract -- ignore l'extraction"
+
+#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
#, c-format
msgid "could not extract %s (%s)"
msgstr "n'a pas pu extraire %s (%s)"
-#: lib/libalpm/add.c:617
+#: lib/libalpm/add.c:644
#, c-format
msgid "checking md5 hashes for %s"
msgstr "vérification de la 'signature' md5 pour %s"
-#: lib/libalpm/add.c:618 lib/libalpm/add.c:625
+#: lib/libalpm/add.c:646
+#, c-format
+msgid "checking sha1 hashes for %s"
+msgstr "vérification de la 'signature' sha1 pour %s"
+
+#: lib/libalpm/add.c:648
#, c-format
msgid "current: %s"
msgstr "courant: %s"
-#: lib/libalpm/add.c:619 lib/libalpm/add.c:626
+#: lib/libalpm/add.c:649
#, c-format
msgid "new: %s"
msgstr "nouveau: %s"
-#: lib/libalpm/add.c:621 lib/libalpm/add.c:628
+#: lib/libalpm/add.c:650
#, c-format
msgid "original: %s"
msgstr "original: %s"
-#: lib/libalpm/add.c:624
-#, c-format
-msgid "checking sha1 hashes for %s"
-msgstr "vérification de la 'signature' sha1 pour %s"
-
-#: lib/libalpm/add.c:642
+#: lib/libalpm/add.c:662
#, c-format
msgid "could not rename %s (%s)"
msgstr "n'a pas pu renommer %s (%s)"
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:663
#, c-format
msgid "error: could not rename %s (%s)"
msgstr "erreur: n'a pas pu renommer %s (%s)"
-#: lib/libalpm/add.c:647 lib/libalpm/add.c:691
-#, c-format
-msgid "could not copy %s to %s (%s)"
+#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)"
msgstr "n'a pas pu copier %s vers %s (%s)"
-#: lib/libalpm/add.c:648
-#, c-format
-msgid "error: could not copy %s to %s (%s)"
+#: lib/libalpm/add.c:670
+#, fuzzy, c-format
+msgid "error: could not copy tempfile to %s (%s)"
msgstr "erreur: n'a pas pu copier %s vers %s (%s)"
-#: lib/libalpm/add.c:652
+#: lib/libalpm/add.c:674
#, c-format
msgid "%s saved as %s.pacorig"
msgstr "%s sauve en tant que %s.pacorig"
-#: lib/libalpm/add.c:653
+#: lib/libalpm/add.c:675
#, c-format
msgid "warning: %s saved as %s"
msgstr "avertissement: %s sauve en tant que %s"
-#: lib/libalpm/add.c:663 lib/libalpm/add.c:666 lib/libalpm/add.c:672
-msgid "action: installing new file"
+#: lib/libalpm/add.c:685
+#, fuzzy, c-format
+msgid "action: installing new file: %s"
msgstr "action: installation de nouveau fichier"
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
msgid "action: leaving existing file in place"
msgstr "action: quitte en préservant les fichiers existant"
-#: lib/libalpm/add.c:676
+#: lib/libalpm/add.c:709
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
"action: conserver le fichier actuel et installer le nouveau avec "
"l'extension .pacnew"
-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:712
#, c-format
msgid "could not install %s as %s: %s"
msgstr "n'a pas pu installer %s en tant que %s: %s"
-#: lib/libalpm/add.c:681
+#: lib/libalpm/add.c:713
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr "erreur: n'a pas pu installer %s en tant que %s: %s"
-#: lib/libalpm/add.c:683
+#: lib/libalpm/add.c:715
#, c-format
msgid "%s installed as %s"
msgstr "%s installé en tant que %s"
-#: lib/libalpm/add.c:684
+#: lib/libalpm/add.c:716
#, c-format
msgid "warning: %s installed as %s"
msgstr "avertissement: %s installé en tant que %s"
-#: lib/libalpm/add.c:689 lib/libalpm/add.c:709
-#, c-format
-msgid "extracting %s"
-msgstr "extrait %s"
-
-#: lib/libalpm/add.c:711
+#: lib/libalpm/add.c:730
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr "%s est marqué NoUpgrade -- ignore"
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:731
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr "extrait %s en tant que %s.pacnew"
-#: lib/libalpm/add.c:714
-#, c-format
-msgid "warning: extracting %s%s as %s"
+#: lib/libalpm/add.c:732
+#, fuzzy, c-format
+msgid "warning: extracting %s as %s.pacnew"
msgstr "avertissement: extrait %s%s en tant que %s"
-#: lib/libalpm/add.c:728
+#: lib/libalpm/add.c:735
+#, c-format
+msgid "extracting %s"
+msgstr "extrait %s"
+
+#: lib/libalpm/add.c:751
#, c-format
msgid "error: could not extract %s (%s)"
msgstr "erreur: n'a pas pu extraire %s (%s)"
-#: lib/libalpm/add.c:738
-msgid "appending backup entry"
+#: lib/libalpm/add.c:763
+#, fuzzy, c-format
+msgid "appending backup entry for %s"
msgstr "ajoute une entre pour la sauvegarde"
-#: lib/libalpm/add.c:769 lib/libalpm/add.c:771
+#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
#, c-format
msgid "errors occurred while %s %s"
msgstr "des erreurs sont survenue pendant %s %s"
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
msgid "upgrading"
msgstr "mise à jour"
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
msgid "installing"
msgstr "installation"
-#: lib/libalpm/add.c:793 lib/libalpm/add.c:849
-#, c-format
-msgid "adding '%s' in requiredby field for '%s'"
-msgstr "ajoute '%s' dans le champ 'requit par' pour '%s'"
-
-#: lib/libalpm/add.c:804 lib/libalpm/remove.c:326
+#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
msgid "updating database"
msgstr "met à jour la base de données"
-#: lib/libalpm/add.c:805
+#: lib/libalpm/add.c:813
#, c-format
msgid "adding database entry '%s'"
msgstr "ajoute l'entrée de base de données '%s'"
-#: lib/libalpm/add.c:807
+#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
#, c-format
msgid "could not update database entry %s-%s"
msgstr "n'a pas pu mettre a jour l'entrée de base de données %s-%s"
-#: lib/libalpm/add.c:809
-#, c-format
-msgid "error updating database for %s-%s!"
-msgstr "erreur lors de la mise a jour de la base de données pour %s-%s!"
-
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:824
#, c-format
msgid "could not add entry '%s' in cache"
msgstr "n'a pas pu ajouter l'entrée '%s' dans le cache"
-#: lib/libalpm/add.c:819 lib/libalpm/remove.c:336
-msgid "updating dependency packages 'requiredby' fields"
-msgstr "mise a jour des champs 'requit par' des dépendances"
-
-#: lib/libalpm/add.c:841
-#, c-format
-msgid "could not find dependency '%s'"
-msgstr "n'a pas pu trouver la dépendance '%s'"
-
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:378
-#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
-msgstr ""
-"n'a pas pu mettre à jour le champ 'requit par' de l'entrée de base de "
-"données %s-%s"
-
-#: lib/libalpm/add.c:878 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043
+#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr "execute \"ldconfig -r %s\""
@@ -442,7 +437,7 @@ msgstr "n'a pas pu extraire %s: %s\n"
msgid "config: upgradedelay: %d"
msgstr ""
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
msgid "checking for package replacements"
msgstr "vérification des remplacements pour le paquet"
@@ -461,17 +456,17 @@ msgstr "%s-%s: ignore la mise a jour du paquet (à remplacer par %s-%s)"
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr "%s-%s sélectionné pour mise à jour (à remplacer par %s-%s)"
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211
+#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr "'%s' non trouvé dans la liste de synchronisation -- ignoré"
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499
+#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr "'%s' est déjà sélectionné pour retrait -- ignoré"
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232
+#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr "%s-%s sélectionné pour mise à jour (%s => %s)"
@@ -481,50 +476,60 @@ msgstr "%s-%s sélectionné pour mise à jour (%s => %s)"
msgid "unpacking database '%s'"
msgstr "ouvre la base de données '%s'"
-#: lib/libalpm/be_files.c:182
+#: lib/libalpm/be_files.c:75
+#, fuzzy, c-format
+msgid "opening database from path '%s'"
+msgstr "ouvre la base de données '%s'"
+
+#: lib/libalpm/be_files.c:179
+#, fuzzy, c-format
+msgid "db scan could not find package: %s"
+msgstr "ne peut trouver ou lire le paquet"
+
+#: lib/libalpm/be_files.c:183
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr "nom invalide pour l'entrée de base de données '%s'"
-#: lib/libalpm/be_files.c:212
+#: lib/libalpm/be_files.c:213
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:217
+#: lib/libalpm/be_files.c:218
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:225
+#: lib/libalpm/be_files.c:226
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:233
+#: lib/libalpm/be_files.c:234
#, fuzzy, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr "ne peut trouver %s dans la base de données"
-#: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391
-#: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502
-#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618
+#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
+#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
+#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
#: lib/libalpm/package.c:197
#, fuzzy, c-format
msgid "could not open file %s: %s"
msgstr "ne peut ouvrir le fichier %s"
-#: lib/libalpm/be_files.c:499
+#: lib/libalpm/be_files.c:500
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:588
+#: lib/libalpm/be_files.c:589
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:615
+#: lib/libalpm/be_files.c:616
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -534,27 +539,42 @@ msgstr ""
msgid "loading package cache (infolevel=%#x) for repository '%s'"
msgstr "chargement du cache de paquet (infolevel=%#x) pour le dépot '%s'"
-#: lib/libalpm/cache.c:83
+#: lib/libalpm/cache.c:64
+#, fuzzy, c-format
+msgid "adding '%s' to package cache for db '%s'"
+msgstr "nettoyage du cache de paquet pour le dépot '%s'"
+
+#: lib/libalpm/cache.c:84
#, c-format
msgid "freeing package cache for repository '%s'"
msgstr "nettoyage du cache de paquet pour le dépot '%s'"
-#: lib/libalpm/cache.c:132
+#: lib/libalpm/cache.c:109
+#, c-format
+msgid "error: pkgcache is NULL for db '%s'"
+msgstr ""
+
+#: lib/libalpm/cache.c:136
#, fuzzy, c-format
msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
msgstr "chargement du cache de paquet (infolevel=%#x) pour le dépot '%s'"
-#: lib/libalpm/cache.c:152
+#: lib/libalpm/cache.c:156
#, c-format
msgid "adding entry '%s' in '%s' cache"
msgstr "ajout de l'entrée '%s' dans '%s' cache"
-#: lib/libalpm/cache.c:178
+#: lib/libalpm/cache.c:182
#, c-format
msgid "removing entry '%s' from '%s' cache"
msgstr "retrait de l'entrée '%s' depuis '%s' cache"
-#: lib/libalpm/cache.c:213
+#: lib/libalpm/cache.c:200
+#, fuzzy, c-format
+msgid "error: failed to get '%s' from NULL pkgcache"
+msgstr "ne peut retirer l'entrée '%s' du cache"
+
+#: lib/libalpm/cache.c:223
#, c-format
msgid "loading group cache for repository '%s'"
msgstr "chargement du group depuis le cache pour le dépot '%s'"
@@ -589,11 +609,11 @@ msgstr "analyse des conflits: base de donnes comparée a la cible '%s'"
msgid "db vs targs: found %s as a conflict for %s"
msgstr "comparaison base de donnée / cibles: trouve %s en conflit avec %s"
-#: lib/libalpm/conflict.c:297 lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57
-#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:604 lib/libalpm/sync.c:620 lib/libalpm/sync.c:716
-#: lib/libalpm/trans.c:49 lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
+#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
+#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
+#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
+#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
#, c-format
msgid "malloc failure: could not allocate %d bytes"
msgstr "problème malloc: n'a pas pu allouer %d bytes"
@@ -636,69 +656,60 @@ msgstr "début du tri des dépendances"
msgid "possible dependency cycle detected"
msgstr "possible cycle de dépendances détecte"
-#: lib/libalpm/deps.c:178
+#: lib/libalpm/deps.c:177
msgid "sorting dependencies finished"
msgstr "fin du tri des dépendances"
-#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
msgid "null package found in package list"
msgstr ""
-#: lib/libalpm/deps.c:224
+#: lib/libalpm/deps.c:223
#, fuzzy, c-format
msgid "cannot find package installed '%s'"
msgstr "ne peut ouvrir le fichier de paquet"
-#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
+#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
#, c-format
msgid "checkdeps: found %s as required by %s"
msgstr "analyse des dépendances: trouve %s comme besoin pour %s"
-#: lib/libalpm/deps.c:284
+#: lib/libalpm/deps.c:283
#, fuzzy, c-format
msgid "no dependencies for target '%s'"
msgstr "ne peut résoudre les dépendances pour \"%s\""
-#: lib/libalpm/deps.c:330
-#, c-format
-msgid "checkdeps: found %s as a dependency for %s"
-msgstr "analyse des dépendances: trouve %s comme dépendance pour %s"
-
-#: lib/libalpm/deps.c:478
-#, c-format
-msgid "cannot find package \"%s\" or anything that provides it!"
-msgstr "ne peut trouver le paquet \"%s\" ou quoique ce soit qui le fournisse!"
-
-#: lib/libalpm/deps.c:483
-msgid "dep is NULL!"
-msgstr "dep est NULL!"
+#: lib/libalpm/deps.c:329
+#, fuzzy, c-format
+msgid "missing dependency '%s' for package '%s'"
+msgstr "analyse du remplacement '%s' pour le paquet '%s'"
-#: lib/libalpm/deps.c:498
+#: lib/libalpm/deps.c:452
#, c-format
msgid "excluding %s -- explicitly installed"
msgstr "exclue %s -- explicitement installe"
-#: lib/libalpm/deps.c:515
+#: lib/libalpm/deps.c:499
#, c-format
-msgid "loading ALL info for '%s'"
-msgstr "chargement de TOUTES les infos pour '%s'"
+msgid "cannot find package \"%s\" or anything that provides it!"
+msgstr "ne peut trouver le paquet \"%s\" ou quoique ce soit qui le fournisse!"
-#: lib/libalpm/deps.c:518
+#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
#, c-format
msgid "adding '%s' to the targets"
msgstr "ajoute '%s' aux cibles"
-#: lib/libalpm/deps.c:546
+#: lib/libalpm/deps.c:551
#, fuzzy
msgid "started resolving dependencies"
msgstr "début du tri des dépendances"
-#: lib/libalpm/deps.c:564
+#: lib/libalpm/deps.c:569
#, c-format
msgid "%s provides dependency %s -- skipping"
msgstr "%s fourni la dépendance %s -- ignore"
-#: lib/libalpm/deps.c:589
+#: lib/libalpm/deps.c:594
#, c-format
msgid ""
"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
@@ -706,27 +717,27 @@ msgstr ""
"ne peut résoudre les dépendances pour \"%s\" (\"%s\" n'est pas dans le jeu "
"de paquet)"
-#: lib/libalpm/deps.c:606
+#: lib/libalpm/deps.c:611
#, c-format
msgid "dependency %s is already in the target list -- skipping"
msgstr "la dépendance %s est déjà dans la liste de cible -- ignorée"
-#: lib/libalpm/deps.c:626
+#: lib/libalpm/deps.c:631
#, c-format
msgid "pulling dependency %s (needed by %s)"
msgstr "récupère la dépendance %s (requise par %s)"
-#: lib/libalpm/deps.c:630
+#: lib/libalpm/deps.c:635
#, c-format
msgid "cannot resolve dependencies for \"%s\""
msgstr "ne peut résoudre les dépendances pour \"%s\""
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:651
#, c-format
msgid "dependency cycle detected: %s"
msgstr "cycle de dépendances détecte: %s"
-#: lib/libalpm/deps.c:650
+#: lib/libalpm/deps.c:655
#, fuzzy
msgid "finished resolving dependencies"
msgstr "début du tri des dépendances"
@@ -824,7 +835,7 @@ msgstr "transaction annulée"
msgid "operation not compatible with the transaction type"
msgstr "opération incompatible avec le type de transaction"
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:982
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
msgid "could not commit transaction"
msgstr "n'a pas pu appliquer la transaction"
@@ -941,27 +952,42 @@ msgstr "ne peut effacer le fichier %s"
msgid "unexpected error"
msgstr "erreur non prévue"
+#: lib/libalpm/handle.c:164
+#, c-format
+msgid "option 'root' = %s"
+msgstr ""
+
+#: lib/libalpm/handle.c:180
+#, fuzzy, c-format
+msgid "option 'dbpath' = %s"
+msgstr "n'a pas pu extraire %s: %s\n"
+
+#: lib/libalpm/handle.c:196
+#, fuzzy, c-format
+msgid "option 'cachedir' = %s"
+msgstr "n'a pas pu extraire %s: %s\n"
+
#: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
#, c-format
msgid "%s can't be opened\n"
msgstr "%s ne peut etre ouvert\n"
-#: lib/libalpm/package.c:146
+#: lib/libalpm/package.c:148
#, fuzzy, c-format
msgid "%s: forcing upgrade to version %s"
msgstr "version de paquet manquant dans %s"
-#: lib/libalpm/package.c:150
+#: lib/libalpm/package.c:152
#, fuzzy, c-format
msgid "%s: local (%s) is newer than %s (%s)"
msgstr "%s-%s: la version locale est plus récente"
-#: lib/libalpm/package.c:157
+#: lib/libalpm/package.c:159
#, c-format
msgid "%s-%s: ignoring package upgrade (%s)"
msgstr "%s-%s: ignore la mise à jour du paquet (%s)"
-#: lib/libalpm/package.c:162
+#: lib/libalpm/package.c:163
#, fuzzy, c-format
msgid "%s-%s: delaying upgrade of package (%s)"
msgstr "%s-%s: repousse la mise à jour du paquet (%s)\n"
@@ -1010,6 +1036,11 @@ msgstr "nom de paquet manquant dans %s"
msgid "missing package filelist in %s, generating one"
msgstr "fichier d'information manquant dans le paquet %s"
+#: lib/libalpm/package.c:547
+#, c-format
+msgid "adding '%s' in requiredby field for '%s'"
+msgstr "ajoute '%s' dans le champ 'requit par' pour '%s'"
+
#: lib/libalpm/remove.c:78
#, c-format
msgid "could not find %s in database"
@@ -1034,282 +1065,308 @@ msgstr "ne peut trouver %s dans la base de données -- ignoré"
msgid "finding removable dependencies"
msgstr "trouve les dépendances dispensables"
-#: lib/libalpm/remove.c:178
+#: lib/libalpm/remove.c:174
#, fuzzy, c-format
msgid "cannot remove file '%s': %s"
msgstr "ne peut effacer le fichier %s"
-#: lib/libalpm/remove.c:218
+#: lib/libalpm/remove.c:212
+#, fuzzy, c-format
+msgid "Skipping removal of '%s' due to NoUpgrade"
+msgstr "ignore l'effacement de %s car il a été déplacé dans un autre paquet"
+
+#: lib/libalpm/remove.c:219
#, c-format
msgid "file %s does not exist"
msgstr "le fichier %s n'existe pas"
-#: lib/libalpm/remove.c:224
+#: lib/libalpm/remove.c:226
#, c-format
msgid "keeping directory %s"
msgstr "conserve le répertoire %s"
-#: lib/libalpm/remove.c:226
+#: lib/libalpm/remove.c:228
#, c-format
msgid "removing directory %s"
msgstr "efface le répertoire %s"
-#: lib/libalpm/remove.c:240
+#: lib/libalpm/remove.c:235
#, c-format
-msgid "skipping removal of %s as it has moved to another package"
-msgstr "ignore l'effacement de %s car il a été déplacé dans un autre paquet"
+msgid "%s is in trans->skip_remove, skipping removal"
+msgstr ""
-#: lib/libalpm/remove.c:252
+#: lib/libalpm/remove.c:246
#, c-format
msgid "%s saved as %s"
msgstr "%s sauve en tant que %s"
-#: lib/libalpm/remove.c:256
+#: lib/libalpm/remove.c:249
+#, c-format
+msgid "transaction is set to NOSAVE, not backing up '%s'"
+msgstr ""
+
+#: lib/libalpm/remove.c:253
#, c-format
msgid "unlinking %s"
msgstr "suppression %s"
-#: lib/libalpm/remove.c:263
+#: lib/libalpm/remove.c:260
#, fuzzy, c-format
msgid "cannot remove file %s: %s"
msgstr "ne peut effacer le fichier %s"
-#: lib/libalpm/remove.c:291
+#: lib/libalpm/remove.c:286
#, c-format
msgid "removing package %s-%s"
msgstr "retrait du paquet %s-%s"
-#: lib/libalpm/remove.c:303
+#: lib/libalpm/remove.c:298
#, fuzzy, c-format
msgid "not removing package '%s', can't remove all files"
msgstr "résolution du conflit de paquet '%s'"
-#: lib/libalpm/remove.c:309
+#: lib/libalpm/remove.c:304
msgid "removing files"
msgstr "efface les fichiers"
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:322
#, c-format
msgid "removing database entry '%s'"
msgstr "ne peut effacer l'entrée de base de de données %s"
-#: lib/libalpm/remove.c:329
+#: lib/libalpm/remove.c:324
#, c-format
msgid "could not remove database entry %s-%s"
msgstr "ne peut retirer l'entrée de base de donnée %s-%s"
-#: lib/libalpm/remove.c:332
+#: lib/libalpm/remove.c:327
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr "ne peut retirer l'entrée '%s' du cache"
-#: lib/libalpm/remove.c:366
-#, fuzzy, c-format
-msgid "could not find dependency '%s' for removal"
-msgstr "n'a pas pu trouver la dépendance '%s'"
-
-#: lib/libalpm/remove.c:376
-#, c-format
-msgid "updating 'requiredby' field for package '%s'"
-msgstr "mise à jour du champ 'requit par' pour le paquet '%s'"
-
-#: lib/libalpm/sync.c:200
+#: lib/libalpm/sync.c:199
msgid "checking for package upgrades"
msgstr "vérification des mises à jour de paquets"
-#: lib/libalpm/sync.c:277
+#: lib/libalpm/sync.c:232
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (%s => %s)"
+msgstr "%s-%s: ignore la mise à jour du paquet (%s)"
+
+#: lib/libalpm/sync.c:281
#, fuzzy, c-format
msgid "searching for target in repo '%s'"
msgstr "charge la cible '%s'"
-#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
+#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr "cible '%s' non trouvée -- recherche des dispositions"
-#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
+#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr "trouvé '%s' comme disposition pour '%s'"
-#: lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:302
#, fuzzy, c-format
msgid "repository '%s' not found"
msgstr "groupe non trouvé"
-#: lib/libalpm/sync.c:332
+#: lib/libalpm/sync.c:336
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr "%s-%s est à jour -- ignoré"
-#: lib/libalpm/sync.c:352
+#: lib/libalpm/sync.c:356
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr "ajout de la cible '%s' au jeu de transaction"
-#: lib/libalpm/sync.c:398
+#: lib/libalpm/sync.c:401
#, fuzzy
msgid "resolving target's dependencies"
msgstr "résolution des dépendances pour les cibles"
-#: lib/libalpm/sync.c:418
+#: lib/libalpm/sync.c:421
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr "ajout du paquet %s-%s à la liste de transactions"
-#: lib/libalpm/sync.c:453
+#: lib/libalpm/sync.c:456
msgid "looking for unresolvable dependencies"
msgstr "recherche de dépendancea non soluble"
-#: lib/libalpm/sync.c:484
+#: lib/libalpm/sync.c:487
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr "le paquet '%s' est en conflit avec '%s'"
-#: lib/libalpm/sync.c:506
+#: lib/libalpm/sync.c:509
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr "'%s' non trouve dans le jeu de transaction -- ignoré"
-#: lib/libalpm/sync.c:517
+#: lib/libalpm/sync.c:520
#, c-format
msgid "package '%s' provides its own conflict"
msgstr "le paquet '%s' génère son propre conflit"
-#: lib/libalpm/sync.c:540 lib/libalpm/sync.c:545
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr "'%s' est dans la la liste de cibles -- conservation"
-#: lib/libalpm/sync.c:557 lib/libalpm/sync.c:594
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
#, c-format
msgid "removing '%s' from target list"
msgstr "retire '%s' de la liste de cibles"
-#: lib/libalpm/sync.c:566
+#: lib/libalpm/sync.c:569
#, c-format
msgid "resolving package '%s' conflict"
msgstr "résolution du conflit de paquet '%s'"
-#: lib/libalpm/sync.c:589
+#: lib/libalpm/sync.c:592
#, c-format
msgid "electing '%s' for removal"
msgstr "sélection de '%s' pour retrait"
-#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
msgid "unresolvable package conflicts detected"
msgstr "conflit de paquets non soluble détecté"
-#: lib/libalpm/sync.c:668
+#: lib/libalpm/sync.c:671
msgid "checking dependencies of packages designated for removal"
msgstr "analyse des dépendances pour les paquets marques à retirer"
-#: lib/libalpm/sync.c:682
+#: lib/libalpm/sync.c:685
msgid "something has gone horribly wrong"
msgstr "quelque chose s'est horriblement mal passé"
-#: lib/libalpm/sync.c:701
+#: lib/libalpm/sync.c:704
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr "trouvé '%s' comme disposition pour '%s' -- conflit annulé"
-#: lib/libalpm/sync.c:797
+#: lib/libalpm/sync.c:800
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:811
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:809
+#: lib/libalpm/sync.c:812
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:814
+#: lib/libalpm/sync.c:817
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:815
+#: lib/libalpm/sync.c:818
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:822
+#: lib/libalpm/sync.c:825
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:851 lib/libalpm/sync.c:863
+#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr "ne peut obtenir la 'signature' md5 ou sha1 pour le paquet %s\n"
-#: lib/libalpm/sync.c:882
+#: lib/libalpm/sync.c:885
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "l'archive %s était corrompue (mauvaise somme MD5 ou SHA1)\n"
-#: lib/libalpm/sync.c:884
+#: lib/libalpm/sync.c:887
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr "l'archive %s est corrompue (mauvaise somme MD5 ou SHA1)\n"
-#: lib/libalpm/sync.c:905
+#: lib/libalpm/sync.c:908
msgid "could not create removal transaction"
msgstr "n'a pas pu créer la transaction de retrait"
-#: lib/libalpm/sync.c:911
+#: lib/libalpm/sync.c:914
msgid "could not initialize the removal transaction"
msgstr "n'a pas pu initialiser la transaction de retrait"
-#: lib/libalpm/sync.c:931
+#: lib/libalpm/sync.c:934
msgid "removing conflicting and to-be-replaced packages"
msgstr "efface les paquets en conflit et ceux à remplacer"
-#: lib/libalpm/sync.c:933
+#: lib/libalpm/sync.c:936
msgid "could not prepare removal transaction"
msgstr "n'a pas pu préparer la transaction de retrait"
-#: lib/libalpm/sync.c:939
+#: lib/libalpm/sync.c:942
msgid "could not commit removal transaction"
msgstr "n'a pas pu appliquer la transaction de retrait"
-#: lib/libalpm/sync.c:946
+#: lib/libalpm/sync.c:949
msgid "installing packages"
msgstr "installe les paquets"
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:952
msgid "could not create transaction"
msgstr "n'a pas pu créer la transaction"
-#: lib/libalpm/sync.c:954
+#: lib/libalpm/sync.c:957
msgid "could not initialize transaction"
msgstr "n'a pas pu initialiser la transaction"
-#: lib/libalpm/sync.c:977
+#: lib/libalpm/sync.c:980
msgid "could not prepare transaction"
msgstr "n'a pas pu préparer la transaction"
-#: lib/libalpm/sync.c:989
+#: lib/libalpm/sync.c:992
msgid "updating database for replaced packages' dependencies"
msgstr ""
"mise a jour de la base de données concernant les dépendances de paquets "
"remplaces"
-#: lib/libalpm/sync.c:1018
+#: lib/libalpm/sync.c:1021
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr ""
"n'a pas pu mettre a jour les pré-requis pour l'entrée de base de données %s-%"
"s"
-#: lib/libalpm/sync.c:1027
+#: lib/libalpm/sync.c:1030
#, c-format
msgid "could not update new database entry %s-%s"
msgstr "n'a pu mettre a jour la nouvelle entrée de base de données %s-%s"
+#: lib/libalpm/trans.c:262
+msgid "updating dependency packages 'requiredby' fields"
+msgstr "mise a jour des champs 'requit par' des dépendances"
+
+#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#, c-format
+msgid "updating 'requiredby' field for package '%s'"
+msgstr "mise à jour du champ 'requit par' pour le paquet '%s'"
+
+#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#, c-format
+msgid "could not update 'requiredby' database entry %s-%s"
+msgstr ""
+"n'a pas pu mettre à jour le champ 'requit par' de l'entrée de base de "
+"données %s-%s"
+
+#: lib/libalpm/trans.c:315
+#, c-format
+msgid "could not find dependency '%s'"
+msgstr "n'a pas pu trouver la dépendance '%s'"
+
#: lib/libalpm/util.c:278
#, fuzzy, c-format
msgid "could not open %s: %s\n"
@@ -1394,6 +1451,25 @@ msgstr ""
msgid "depcmp: %s-%s %s %s => %s"
msgstr ""
+#~ msgid "adding new package %s-%s"
+#~ msgstr "ajout du nouveau paquet %s-%s"
+
+#~ msgid "error updating database for %s-%s!"
+#~ msgstr "erreur lors de la mise a jour de la base de données pour %s-%s!"
+
+#~ msgid "checkdeps: found %s as a dependency for %s"
+#~ msgstr "analyse des dépendances: trouve %s comme dépendance pour %s"
+
+#~ msgid "dep is NULL!"
+#~ msgstr "dep est NULL!"
+
+#~ msgid "loading ALL info for '%s'"
+#~ msgstr "chargement de TOUTES les infos pour '%s'"
+
+#, fuzzy
+#~ msgid "could not find dependency '%s' for removal"
+#~ msgstr "n'a pas pu trouver la dépendance '%s'"
+
#~ msgid "loading FILES info for '%s'"
#~ msgstr "chargement des informations de fichiers pour '%s'"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index ab77e2a7..4926b7dc 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-14 14:32-0500\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2006-09-03 13:49+0200\n"
"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
"MIME-Version: 1.0\n"
@@ -26,38 +26,47 @@ msgstr "értelmezhetetlen token %s"
msgid "loading target '%s'"
msgstr "cél betöltése '%s'"
-#: lib/libalpm/add.c:175
+#: lib/libalpm/add.c:174
#, c-format
msgid "replacing older version %s-%s by %s in target list"
msgstr "a %s-%s-t lecseréli a %s a cél listában"
-#: lib/libalpm/add.c:184
+#: lib/libalpm/add.c:183
#, c-format
msgid "newer version %s-%s is in the target list -- skipping"
msgstr "az újabb verzió (%s-%s) már elérhetõ a cél listában -- kihagyás"
-#: lib/libalpm/add.c:191
+#: lib/libalpm/add.c:190
#, c-format
msgid "reading '%s' metadata"
msgstr "'%s' metaadat olvasása"
-#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
msgid "looking for unsatisfied dependencies"
msgstr "elégtelen függõségek keresése"
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:473
+#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
msgid "looking for conflicts"
msgstr "konfliktusok keresése"
-#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:260
+msgid "replacing packages with -A and -U is not supported yet"
+msgstr ""
+
+#: lib/libalpm/add.c:261
+#, c-format
+msgid "please remove '%s' first, using -Rd"
+msgstr ""
+
+#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
msgid "sorting by dependencies"
msgstr "rendezés függõségek szerint"
-#: lib/libalpm/add.c:307
+#: lib/libalpm/add.c:314
msgid "cleaning up"
msgstr "tisztítás"
-#: lib/libalpm/add.c:324
+#: lib/libalpm/add.c:329
msgid "looking for file conflicts"
msgstr "fájl konfliktusok keresése"
@@ -66,214 +75,202 @@ msgstr "fájl konfliktusok keresése"
msgid "upgrading package %s-%s"
msgstr "csomag frissítése: %s-%s"
-#: lib/libalpm/add.c:419
-#, c-format
-msgid "removing old package first (%s-%s)"
-msgstr "elsõként a régi csomag eltávolítása (%s-%s)"
-
-#: lib/libalpm/add.c:449
+#: lib/libalpm/add.c:417
#, c-format
msgid "adding package %s-%s"
msgstr "csomag hozzáadása %s-%s"
-#: lib/libalpm/add.c:460
+#: lib/libalpm/add.c:430
+#, c-format
+msgid "removing old package first (%s-%s)"
+msgstr "elsõként a régi csomag eltávolítása (%s-%s)"
+
+#: lib/libalpm/add.c:457
#, c-format
-msgid "adding new package %s-%s"
-msgstr "új csomag hozzáadása %s-%s"
+msgid "adding %s to the NoUpgrade array temporarilly"
+msgstr ""
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:475
msgid "extracting files"
msgstr "fájlok kifejtése"
-#: lib/libalpm/add.c:480 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr "a jelenlegi munkakönyvtár nem kapható meg"
-#: lib/libalpm/add.c:538
+#: lib/libalpm/add.c:546
+#, fuzzy, c-format
+msgid "%s is in NoExtract, skipping extraction"
+msgstr "figyelmeztetés: %s a NoExtractben van -- kifejtés kihagyása"
+
+#: lib/libalpm/add.c:547
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr "figyelmeztetés: %s a NoExtractben van -- kifejtés kihagyása"
-#: lib/libalpm/add.c:574 lib/libalpm/add.c:727
+#: lib/libalpm/add.c:554
+#, fuzzy, c-format
+msgid "%s is in trans->skip_add, skipping extraction"
+msgstr "figyelmeztetés: %s a NoExtractben van -- kifejtés kihagyása"
+
+#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
#, c-format
msgid "could not extract %s (%s)"
msgstr "nem sikerült kifejteni: %s (%s)"
-#: lib/libalpm/add.c:617
+#: lib/libalpm/add.c:644
#, c-format
msgid "checking md5 hashes for %s"
msgstr "md5 összegek vizsgálata a %s számára"
-#: lib/libalpm/add.c:618 lib/libalpm/add.c:625
+#: lib/libalpm/add.c:646
+#, c-format
+msgid "checking sha1 hashes for %s"
+msgstr "sha1 összegek vizsgálata a %s számára"
+
+#: lib/libalpm/add.c:648
#, c-format
msgid "current: %s"
msgstr "jelenlegi: %s"
-#: lib/libalpm/add.c:619 lib/libalpm/add.c:626
+#: lib/libalpm/add.c:649
#, c-format
msgid "new: %s"
msgstr "új: %s"
-#: lib/libalpm/add.c:621 lib/libalpm/add.c:628
+#: lib/libalpm/add.c:650
#, c-format
msgid "original: %s"
msgstr "eredeti: %s"
-#: lib/libalpm/add.c:624
-#, c-format
-msgid "checking sha1 hashes for %s"
-msgstr "sha1 összegek vizsgálata a %s számára"
-
-#: lib/libalpm/add.c:642
+#: lib/libalpm/add.c:662
#, c-format
msgid "could not rename %s (%s)"
msgstr "nem sikerült átnevezni: %s (%s)"
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:663
#, c-format
msgid "error: could not rename %s (%s)"
msgstr "hiba: nem sikerült átnevezni: %s (%s)"
-#: lib/libalpm/add.c:647 lib/libalpm/add.c:691
-#, c-format
-msgid "could not copy %s to %s (%s)"
+#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
+#, fuzzy, c-format
+msgid "could not copy tempfile to %s (%s)"
msgstr "nem sikerült másolni: %s-t ide: %s (%s)"
-#: lib/libalpm/add.c:648
-#, c-format
-msgid "error: could not copy %s to %s (%s)"
+#: lib/libalpm/add.c:670
+#, fuzzy, c-format
+msgid "error: could not copy tempfile to %s (%s)"
msgstr "hiba: nem sikerült másolni: %s-t ide: %s (%s)"
-#: lib/libalpm/add.c:652
+#: lib/libalpm/add.c:674
#, c-format
msgid "%s saved as %s.pacorig"
msgstr "a %s elmentve %s.pacorig néven"
-#: lib/libalpm/add.c:653
+#: lib/libalpm/add.c:675
#, c-format
msgid "warning: %s saved as %s"
msgstr "figyelmeztetés: a %s elmentve %s néven"
-#: lib/libalpm/add.c:663 lib/libalpm/add.c:666 lib/libalpm/add.c:672
-msgid "action: installing new file"
+#: lib/libalpm/add.c:685
+#, fuzzy, c-format
+msgid "action: installing new file: %s"
msgstr "folyamat: az új fájl telepítése"
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
msgid "action: leaving existing file in place"
msgstr "folyamat: a jelenlegi fájl megtartása"
-#: lib/libalpm/add.c:676
+#: lib/libalpm/add.c:709
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
"folyamat: a jelenlegi fájl megtartása és az új .pacnew végzõdéssel való "
"telepítése"
-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:712
#, c-format
msgid "could not install %s as %s: %s"
msgstr "nem sikerült telepíteni a %s-t %s-ként: %s"
-#: lib/libalpm/add.c:681
+#: lib/libalpm/add.c:713
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr "hiba: nem sikerült telepíteni a %s-t %s-ként: %s"
-#: lib/libalpm/add.c:683
+#: lib/libalpm/add.c:715
#, c-format
msgid "%s installed as %s"
msgstr "a %s %s néven lett telepítve"
-#: lib/libalpm/add.c:684
+#: lib/libalpm/add.c:716
#, c-format
msgid "warning: %s installed as %s"
msgstr "figyelmeztetés: a %s néven %s lett telepítve"
-#: lib/libalpm/add.c:689 lib/libalpm/add.c:709
-#, c-format
-msgid "extracting %s"
-msgstr "a %s kifejtése"
-
-#: lib/libalpm/add.c:711
+#: lib/libalpm/add.c:730
#, c-format
msgid "%s is in NoUpgrade -- skipping"
msgstr "%s a NoUpgrade-ben van -- kihagyás"
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:731
#, c-format
msgid "extracting %s as %s.pacnew"
msgstr "%s kifejtése %s.pacnew néven"
-#: lib/libalpm/add.c:714
-#, c-format
-msgid "warning: extracting %s%s as %s"
+#: lib/libalpm/add.c:732
+#, fuzzy, c-format
+msgid "warning: extracting %s as %s.pacnew"
msgstr "figyelmeztetés: %s%s kifejtése %s.pacnew néven"
-#: lib/libalpm/add.c:728
+#: lib/libalpm/add.c:735
+#, c-format
+msgid "extracting %s"
+msgstr "a %s kifejtése"
+
+#: lib/libalpm/add.c:751
#, c-format
msgid "error: could not extract %s (%s)"
msgstr "hiba: nem sikerült kifejteni: %s (%s)"
-#: lib/libalpm/add.c:738
-msgid "appending backup entry"
+#: lib/libalpm/add.c:763
+#, fuzzy, c-format
+msgid "appending backup entry for %s"
msgstr "hozzáfûzés a biztonsági bejegyzéshez"
-#: lib/libalpm/add.c:769 lib/libalpm/add.c:771
+#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
#, c-format
msgid "errors occurred while %s %s"
msgstr "hiba %s közben: %s"
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
msgid "upgrading"
msgstr "frissítés"
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
msgid "installing"
msgstr "telepítés"
-#: lib/libalpm/add.c:793 lib/libalpm/add.c:849
-#, c-format
-msgid "adding '%s' in requiredby field for '%s'"
-msgstr "a '%s' hozzáadása \"függ tõle\" mezõként a '%s' számára"
-
-#: lib/libalpm/add.c:804 lib/libalpm/remove.c:326
+#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
msgid "updating database"
msgstr "az adatbázis frissítése"
-#: lib/libalpm/add.c:805
+#: lib/libalpm/add.c:813
#, c-format
msgid "adding database entry '%s'"
msgstr "adatbázis mezõ hozzáadása '%s'"
-#: lib/libalpm/add.c:807
+#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
#, c-format
msgid "could not update database entry %s-%s"
msgstr "sikertelen a '%s-%s' adatbázis-bejegyzés frissítése"
-#: lib/libalpm/add.c:809
-#, c-format
-msgid "error updating database for %s-%s!"
-msgstr "hiba a %s-%s adatbázis-frissítése során"
-
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:824
#, c-format
msgid "could not add entry '%s' in cache"
msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz"
-#: lib/libalpm/add.c:819 lib/libalpm/remove.c:336
-msgid "updating dependency packages 'requiredby' fields"
-msgstr "a függõ csomagok 'függ tõle' mezõjének frissítése"
-
-#: lib/libalpm/add.c:841
-#, c-format
-msgid "could not find dependency '%s'"
-msgstr "nem található a '%s' függõség"
-
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:378
-#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
-msgstr "sikertelen a %s-%s 'függ tõle' adatbázis-bejegyzésének frissítése"
-
-#: lib/libalpm/add.c:878 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043
+#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr "az \"ldconfig -r %s\" futtatása"
@@ -448,7 +445,7 @@ msgstr "beállítások: gyorsítótár könyvtára: %s\n"
msgid "config: upgradedelay: %d"
msgstr "beállítások: frissítés késleltetése: %i\n"
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
msgid "checking for package replacements"
msgstr "csomagcserék ellenõrzése"
@@ -467,17 +464,17 @@ msgstr "%s-%s: frissítés figyelmen kívül hagyása (a %s-%s fogja lecserélni)"
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr "a %s-%s kiválasztva frissítésre (a %s-%s fogja lecserélni)"
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211
+#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr "a '%s' nem található a távoli adatbázisban -- kihagyás"
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499
+#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr "a '%s' már kijelölve eltávolításra -- kihagyás"
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232
+#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr "%s-%s kiválasztva frissítésre (%s => %s)"
@@ -487,50 +484,60 @@ msgstr "%s-%s kiválasztva frissítésre (%s => %s)"
msgid "unpacking database '%s'"
msgstr "adatbázis megnyitása: '%s'"
-#: lib/libalpm/be_files.c:182
+#: lib/libalpm/be_files.c:75
+#, fuzzy, c-format
+msgid "opening database from path '%s'"
+msgstr "adatbázis megnyitása: '%s'"
+
+#: lib/libalpm/be_files.c:179
+#, fuzzy, c-format
+msgid "db scan could not find package: %s"
+msgstr "nem található vagy nem olvasható a csomag"
+
+#: lib/libalpm/be_files.c:183
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr "érvénytelen név a '%s' adatbázis-bejegyzés számára"
-#: lib/libalpm/be_files.c:212
+#: lib/libalpm/be_files.c:213
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:217
+#: lib/libalpm/be_files.c:218
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:225
+#: lib/libalpm/be_files.c:226
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:233
+#: lib/libalpm/be_files.c:234
#, fuzzy, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr "nem található a %s az adatbázisban"
-#: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391
-#: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502
-#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618
+#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
+#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
+#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
#: lib/libalpm/package.c:197
#, fuzzy, c-format
msgid "could not open file %s: %s"
msgstr "nem sikerült megnyitni a %s fájlt"
-#: lib/libalpm/be_files.c:499
+#: lib/libalpm/be_files.c:500
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:588
+#: lib/libalpm/be_files.c:589
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:615
+#: lib/libalpm/be_files.c:616
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -540,27 +547,42 @@ msgstr ""
msgid "loading package cache (infolevel=%#x) for repository '%s'"
msgstr "csomagok gyorsítótárának betöltése (infószint=%#x) a '%s' repó számára"
-#: lib/libalpm/cache.c:83
+#: lib/libalpm/cache.c:64
+#, fuzzy, c-format
+msgid "adding '%s' to package cache for db '%s'"
+msgstr "csomagok gyorsítótárának felszabadítása a '%s' repó számára"
+
+#: lib/libalpm/cache.c:84
#, c-format
msgid "freeing package cache for repository '%s'"
msgstr "csomagok gyorsítótárának felszabadítása a '%s' repó számára"
-#: lib/libalpm/cache.c:132
+#: lib/libalpm/cache.c:109
+#, c-format
+msgid "error: pkgcache is NULL for db '%s'"
+msgstr ""
+
+#: lib/libalpm/cache.c:136
#, fuzzy, c-format
msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
msgstr "csomagok gyorsítótárának betöltése (infószint=%#x) a '%s' repó számára"
-#: lib/libalpm/cache.c:152
+#: lib/libalpm/cache.c:156
#, c-format
msgid "adding entry '%s' in '%s' cache"
msgstr "a '%s' bejegyzés hozzáadása a '%s' gyorsítótárhoz"
-#: lib/libalpm/cache.c:178
+#: lib/libalpm/cache.c:182
#, c-format
msgid "removing entry '%s' from '%s' cache"
msgstr "a '%s' bejegyzés eltávolítása a '%s' gyorsítótárból"
-#: lib/libalpm/cache.c:213
+#: lib/libalpm/cache.c:200
+#, fuzzy, c-format
+msgid "error: failed to get '%s' from NULL pkgcache"
+msgstr "nem sikerült eltávolítani a '%s' bejegyzést a gyorsítótárból"
+
+#: lib/libalpm/cache.c:223
#, c-format
msgid "loading group cache for repository '%s'"
msgstr "csoportgyorsítótár betöltése a '%s' repó számára"
@@ -595,11 +617,11 @@ msgstr "checkconflicts: db vs cél '%s'"
msgid "db vs targs: found %s as a conflict for %s"
msgstr "db vs targs: a %s ütközik a következõvel: %s"
-#: lib/libalpm/conflict.c:297 lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57
-#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:604 lib/libalpm/sync.c:620 lib/libalpm/sync.c:716
-#: lib/libalpm/trans.c:49 lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
+#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
+#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
+#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
+#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
#, c-format
msgid "malloc failure: could not allocate %d bytes"
msgstr "malloc probléma: nem sikerült allokálni %d byte-ot"
@@ -641,69 +663,60 @@ msgstr "a függõségek rendezése elkezdõdött"
msgid "possible dependency cycle detected"
msgstr "lehetséges körkörös függõségi probléma észlelve"
-#: lib/libalpm/deps.c:178
+#: lib/libalpm/deps.c:177
msgid "sorting dependencies finished"
msgstr "a függõségek rendezése befejezõdött"
-#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
msgid "null package found in package list"
msgstr ""
-#: lib/libalpm/deps.c:224
+#: lib/libalpm/deps.c:223
#, fuzzy, c-format
msgid "cannot find package installed '%s'"
msgstr "nem sikerült megnyitni a csomagfájlt"
-#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
+#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
#, c-format
msgid "checkdeps: found %s as required by %s"
msgstr "checkdeps: a %s igényelt a %s által"
-#: lib/libalpm/deps.c:284
+#: lib/libalpm/deps.c:283
#, fuzzy, c-format
msgid "no dependencies for target '%s'"
msgstr "nem sikerült feloldani a függõségeket a \"%s\" számára"
-#: lib/libalpm/deps.c:330
-#, c-format
-msgid "checkdeps: found %s as a dependency for %s"
-msgstr "checkdeps: a %s egy függõség a %s számára"
-
-#: lib/libalpm/deps.c:478
-#, c-format
-msgid "cannot find package \"%s\" or anything that provides it!"
-msgstr "nem található a \"%s\" csomag és nem is szolgáltatja semmi!"
-
-#: lib/libalpm/deps.c:483
-msgid "dep is NULL!"
-msgstr "a dep NULL!"
+#: lib/libalpm/deps.c:329
+#, fuzzy, c-format
+msgid "missing dependency '%s' for package '%s'"
+msgstr "csere vizsgálata: '%s' -> '%s'"
-#: lib/libalpm/deps.c:498
+#: lib/libalpm/deps.c:452
#, c-format
msgid "excluding %s -- explicitly installed"
msgstr "a %s kihagyása -- explicit módon lett telepítve"
-#: lib/libalpm/deps.c:515
+#: lib/libalpm/deps.c:499
#, c-format
-msgid "loading ALL info for '%s'"
-msgstr "minden infó betöltése a '%s' számára"
+msgid "cannot find package \"%s\" or anything that provides it!"
+msgstr "nem található a \"%s\" csomag és nem is szolgáltatja semmi!"
-#: lib/libalpm/deps.c:518
+#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
#, c-format
msgid "adding '%s' to the targets"
msgstr "a '%s' hozzáadása a célcsomagokhoz"
-#: lib/libalpm/deps.c:546
+#: lib/libalpm/deps.c:551
#, fuzzy
msgid "started resolving dependencies"
msgstr "a függõségek rendezése elkezdõdött"
-#: lib/libalpm/deps.c:564
+#: lib/libalpm/deps.c:569
#, c-format
msgid "%s provides dependency %s -- skipping"
msgstr "a %s szolgáltatja a %s függõséget -- kihagyás"
-#: lib/libalpm/deps.c:589
+#: lib/libalpm/deps.c:594
#, c-format
msgid ""
"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
@@ -711,27 +724,27 @@ msgstr ""
"nem sikerült a függõségek feloldása a \"%s\" számára (nem található a \"%s\" "
"a csomagok között)"
-#: lib/libalpm/deps.c:606
+#: lib/libalpm/deps.c:611
#, c-format
msgid "dependency %s is already in the target list -- skipping"
msgstr "a %s függõség már a célcsomagok között szerepel -- kihagyás"
-#: lib/libalpm/deps.c:626
+#: lib/libalpm/deps.c:631
#, c-format
msgid "pulling dependency %s (needed by %s)"
msgstr "a %s függõség behozása (a %s igényli)"
-#: lib/libalpm/deps.c:630
+#: lib/libalpm/deps.c:635
#, c-format
msgid "cannot resolve dependencies for \"%s\""
msgstr "nem sikerült feloldani a függõségeket a \"%s\" számára"
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:651
#, c-format
msgid "dependency cycle detected: %s"
msgstr "körkörös függõség észlelve: %s"
-#: lib/libalpm/deps.c:650
+#: lib/libalpm/deps.c:655
#, fuzzy
msgid "finished resolving dependencies"
msgstr "a függõségek rendezése elkezdõdött"
@@ -829,7 +842,7 @@ msgstr "a tranzakció félbeszakítva"
msgid "operation not compatible with the transaction type"
msgstr "a mûvelet nem egyeztethetõ össze a jelenlegi tranzakciótípussal"
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:982
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
#, fuzzy
msgid "could not commit transaction"
msgstr "nem sikerült létrehozni az adatbázist"
@@ -950,27 +963,42 @@ msgstr "nem sikerült eltávolítani a %s fájlt"
msgid "unexpected error"
msgstr "nemvárt hiba"
+#: lib/libalpm/handle.c:164
+#, c-format
+msgid "option 'root' = %s"
+msgstr ""
+
+#: lib/libalpm/handle.c:180
+#, fuzzy, c-format
+msgid "option 'dbpath' = %s"
+msgstr "beállítások: adatbázis útvonala: %s\n"
+
+#: lib/libalpm/handle.c:196
+#, fuzzy, c-format
+msgid "option 'cachedir' = %s"
+msgstr "beállítások: gyorsítótár könyvtára: %s\n"
+
#: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
#, c-format
msgid "%s can't be opened\n"
msgstr "nem sikerült megnyitni a következõt: %s\n"
-#: lib/libalpm/package.c:146
+#: lib/libalpm/package.c:148
#, fuzzy, c-format
msgid "%s: forcing upgrade to version %s"
msgstr "hiányzó csomagverzió itt: %s"
-#: lib/libalpm/package.c:150
+#: lib/libalpm/package.c:152
#, fuzzy, c-format
msgid "%s: local (%s) is newer than %s (%s)"
msgstr "%s-%s: a helyi verzió újabb"
-#: lib/libalpm/package.c:157
+#: lib/libalpm/package.c:159
#, c-format
msgid "%s-%s: ignoring package upgrade (%s)"
msgstr "%s-%s: a csomagfrissítés figyelmen kívül hagyása (%s)"
-#: lib/libalpm/package.c:162
+#: lib/libalpm/package.c:163
#, fuzzy, c-format
msgid "%s-%s: delaying upgrade of package (%s)"
msgstr "%s-%s: a csomag frissítésének késleltetése (%s)\n"
@@ -1019,6 +1047,11 @@ msgstr "hiányzó csomagnév itt: %s"
msgid "missing package filelist in %s, generating one"
msgstr "hiányzó csomaginformáció-fájl ebben: %s"
+#: lib/libalpm/package.c:547
+#, c-format
+msgid "adding '%s' in requiredby field for '%s'"
+msgstr "a '%s' hozzáadása \"függ tõle\" mezõként a '%s' számára"
+
#: lib/libalpm/remove.c:78
#, c-format
msgid "could not find %s in database"
@@ -1043,283 +1076,307 @@ msgstr "nem található a %s az adatbázisban -- kihagyás"
msgid "finding removable dependencies"
msgstr "eltávolítható függõségek keresése"
-#: lib/libalpm/remove.c:178
+#: lib/libalpm/remove.c:174
#, fuzzy, c-format
msgid "cannot remove file '%s': %s"
msgstr "nem sikerült eltávolítani a %s fájlt"
-#: lib/libalpm/remove.c:218
+#: lib/libalpm/remove.c:212
+#, fuzzy, c-format
+msgid "Skipping removal of '%s' due to NoUpgrade"
+msgstr "a %s törlésének kihagyása, mivel az egy másik csomagba került át"
+
+#: lib/libalpm/remove.c:219
#, c-format
msgid "file %s does not exist"
msgstr "a %s fájl nemlétezik"
-#: lib/libalpm/remove.c:224
+#: lib/libalpm/remove.c:226
#, c-format
msgid "keeping directory %s"
msgstr "a %s könyvtár megtartása"
-#: lib/libalpm/remove.c:226
+#: lib/libalpm/remove.c:228
#, c-format
msgid "removing directory %s"
msgstr "a %s könyvtár törlése"
-#: lib/libalpm/remove.c:240
+#: lib/libalpm/remove.c:235
#, c-format
-msgid "skipping removal of %s as it has moved to another package"
-msgstr "a %s törlésének kihagyása, mivel az egy másik csomagba került át"
+msgid "%s is in trans->skip_remove, skipping removal"
+msgstr ""
-#: lib/libalpm/remove.c:252
+#: lib/libalpm/remove.c:246
#, c-format
msgid "%s saved as %s"
msgstr "a %s elmentve %s néven"
-#: lib/libalpm/remove.c:256
+#: lib/libalpm/remove.c:249
+#, c-format
+msgid "transaction is set to NOSAVE, not backing up '%s'"
+msgstr ""
+
+#: lib/libalpm/remove.c:253
#, c-format
msgid "unlinking %s"
msgstr "a %s törlése"
-#: lib/libalpm/remove.c:263
+#: lib/libalpm/remove.c:260
#, fuzzy, c-format
msgid "cannot remove file %s: %s"
msgstr "nem sikerült eltávolítani a %s fájlt"
-#: lib/libalpm/remove.c:291
+#: lib/libalpm/remove.c:286
#, c-format
msgid "removing package %s-%s"
msgstr "a %s-%s csomag eltávolítása"
-#: lib/libalpm/remove.c:303
+#: lib/libalpm/remove.c:298
#, fuzzy, c-format
msgid "not removing package '%s', can't remove all files"
msgstr "a %s-%s csomag eltávolítása"
-#: lib/libalpm/remove.c:309
+#: lib/libalpm/remove.c:304
msgid "removing files"
msgstr "fájlok törlése"
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:322
#, c-format
msgid "removing database entry '%s'"
msgstr "a '%s' adatbázis-bejegyzés eltávolítása"
-#: lib/libalpm/remove.c:329
+#: lib/libalpm/remove.c:324
#, c-format
msgid "could not remove database entry %s-%s"
msgstr "nem sikerült eltávolítani a %s-%s adatbázis-bejegyzést"
-#: lib/libalpm/remove.c:332
+#: lib/libalpm/remove.c:327
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr "nem sikerült eltávolítani a '%s' bejegyzést a gyorsítótárból"
-#: lib/libalpm/remove.c:366
-#, fuzzy, c-format
-msgid "could not find dependency '%s' for removal"
-msgstr "nem található a '%s' függõség"
-
-#: lib/libalpm/remove.c:376
-#, c-format
-msgid "updating 'requiredby' field for package '%s'"
-msgstr "a '%s' csomag 'függ tõle' mezõjének frissítése"
-
-#: lib/libalpm/sync.c:200
+#: lib/libalpm/sync.c:199
msgid "checking for package upgrades"
msgstr "csomagfrissítések vizsgálata"
-#: lib/libalpm/sync.c:277
+#: lib/libalpm/sync.c:232
+#, fuzzy, c-format
+msgid "%s-%s: ignoring package upgrade (%s => %s)"
+msgstr "%s-%s: a csomagfrissítés figyelmen kívül hagyása (%s)"
+
+#: lib/libalpm/sync.c:281
#, fuzzy, c-format
msgid "searching for target in repo '%s'"
msgstr "cél betöltése '%s'"
-#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
+#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr "a '%s' cél nem található -- csomagok keresése amik szolgáltatják"
-#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
+#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr "a '%s' szolgáltatja a következõt: '%s'"
-#: lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:302
#, fuzzy, c-format
msgid "repository '%s' not found"
msgstr "a csoport nem található"
-#: lib/libalpm/sync.c:332
+#: lib/libalpm/sync.c:336
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr "%s-%s naprakész -- kihagyás"
-#: lib/libalpm/sync.c:352
+#: lib/libalpm/sync.c:356
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr "a '%s' cél hozzáadása a tranzakcióhoz"
-#: lib/libalpm/sync.c:398
+#: lib/libalpm/sync.c:401
#, fuzzy
msgid "resolving target's dependencies"
msgstr "a célok függõségeinek feloldása"
-#: lib/libalpm/sync.c:418
+#: lib/libalpm/sync.c:421
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr "a %s-%s csomag hozzáadása a tranzakció céljaihoz"
-#: lib/libalpm/sync.c:453
+#: lib/libalpm/sync.c:456
msgid "looking for unresolvable dependencies"
msgstr "feloldhatatlan függõségek keresése"
-#: lib/libalpm/sync.c:484
+#: lib/libalpm/sync.c:487
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr ""
-#: lib/libalpm/sync.c:506
+#: lib/libalpm/sync.c:509
#, fuzzy, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr "a '%s' nem található a távoli adatbázisban -- kihagyás"
-#: lib/libalpm/sync.c:517
+#: lib/libalpm/sync.c:520
#, c-format
msgid "package '%s' provides its own conflict"
msgstr ""
-#: lib/libalpm/sync.c:540 lib/libalpm/sync.c:545
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
#, fuzzy, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr "az újabb verzió (%s-%s) már elérhetõ a cél listában -- kihagyás"
-#: lib/libalpm/sync.c:557 lib/libalpm/sync.c:594
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
#, fuzzy, c-format
msgid "removing '%s' from target list"
msgstr "a '%s' bejegyzés eltávolítása a '%s' gyorsítótárból"
-#: lib/libalpm/sync.c:566
+#: lib/libalpm/sync.c:569
#, fuzzy, c-format
msgid "resolving package '%s' conflict"
msgstr "a %s-%s csomag eltávolítása"
-#: lib/libalpm/sync.c:589
+#: lib/libalpm/sync.c:592
#, c-format
msgid "electing '%s' for removal"
msgstr ""
-#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
msgid "unresolvable package conflicts detected"
msgstr ""
-#: lib/libalpm/sync.c:668
+#: lib/libalpm/sync.c:671
msgid "checking dependencies of packages designated for removal"
msgstr ""
-#: lib/libalpm/sync.c:682
+#: lib/libalpm/sync.c:685
msgid "something has gone horribly wrong"
msgstr ""
-#: lib/libalpm/sync.c:701
+#: lib/libalpm/sync.c:704
#, fuzzy, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr "a '%s' szolgáltatja a következõt: '%s'"
-#: lib/libalpm/sync.c:797
+#: lib/libalpm/sync.c:800
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:811
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:809
+#: lib/libalpm/sync.c:812
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:814
+#: lib/libalpm/sync.c:817
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:815
+#: lib/libalpm/sync.c:818
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:822
+#: lib/libalpm/sync.c:825
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:851 lib/libalpm/sync.c:863
+#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
#, fuzzy, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr "sikertelen az sha1 ellenõrzõ összeg elérése a %s-%s csomag számára\n"
-#: lib/libalpm/sync.c:882
+#: lib/libalpm/sync.c:885
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:884
+#: lib/libalpm/sync.c:887
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:905
+#: lib/libalpm/sync.c:908
#, fuzzy
msgid "could not create removal transaction"
msgstr "nem sikerült létrehozni az adatbázist"
-#: lib/libalpm/sync.c:911
+#: lib/libalpm/sync.c:914
msgid "could not initialize the removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:931
+#: lib/libalpm/sync.c:934
msgid "removing conflicting and to-be-replaced packages"
msgstr ""
-#: lib/libalpm/sync.c:933
+#: lib/libalpm/sync.c:936
#, fuzzy
msgid "could not prepare removal transaction"
msgstr "nem sikerült létrehozni az adatbázist"
-#: lib/libalpm/sync.c:939
+#: lib/libalpm/sync.c:942
msgid "could not commit removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:946
+#: lib/libalpm/sync.c:949
#, fuzzy
msgid "installing packages"
msgstr "telepítés"
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:952
#, fuzzy
msgid "could not create transaction"
msgstr "nem sikerült létrehozni az adatbázist"
-#: lib/libalpm/sync.c:954
+#: lib/libalpm/sync.c:957
msgid "could not initialize transaction"
msgstr ""
-#: lib/libalpm/sync.c:977
+#: lib/libalpm/sync.c:980
#, fuzzy
msgid "could not prepare transaction"
msgstr "értelmezhetetlen token %s"
-#: lib/libalpm/sync.c:989
+#: lib/libalpm/sync.c:992
msgid "updating database for replaced packages' dependencies"
msgstr ""
-#: lib/libalpm/sync.c:1018
+#: lib/libalpm/sync.c:1021
#, fuzzy, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr "sikertelen a %s-%s 'függ tõle' adatbázis-bejegyzésének frissítése"
-#: lib/libalpm/sync.c:1027
+#: lib/libalpm/sync.c:1030
#, fuzzy, c-format
msgid "could not update new database entry %s-%s"
msgstr "sikertelen a '%s-%s' adatbázis-bejegyzés frissítése"
+#: lib/libalpm/trans.c:262
+msgid "updating dependency packages 'requiredby' fields"
+msgstr "a függõ csomagok 'függ tõle' mezõjének frissítése"
+
+#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#, c-format
+msgid "updating 'requiredby' field for package '%s'"
+msgstr "a '%s' csomag 'függ tõle' mezõjének frissítése"
+
+#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#, c-format
+msgid "could not update 'requiredby' database entry %s-%s"
+msgstr "sikertelen a %s-%s 'függ tõle' adatbázis-bejegyzésének frissítése"
+
+#: lib/libalpm/trans.c:315
+#, c-format
+msgid "could not find dependency '%s'"
+msgstr "nem található a '%s' függõség"
+
#: lib/libalpm/util.c:278
#, fuzzy, c-format
msgid "could not open %s: %s\n"
@@ -1405,6 +1462,25 @@ msgstr ""
msgid "depcmp: %s-%s %s %s => %s"
msgstr ""
+#~ msgid "adding new package %s-%s"
+#~ msgstr "új csomag hozzáadása %s-%s"
+
+#~ msgid "error updating database for %s-%s!"
+#~ msgstr "hiba a %s-%s adatbázis-frissítése során"
+
+#~ msgid "checkdeps: found %s as a dependency for %s"
+#~ msgstr "checkdeps: a %s egy függõség a %s számára"
+
+#~ msgid "dep is NULL!"
+#~ msgstr "a dep NULL!"
+
+#~ msgid "loading ALL info for '%s'"
+#~ msgstr "minden infó betöltése a '%s' számára"
+
+#, fuzzy
+#~ msgid "could not find dependency '%s' for removal"
+#~ msgstr "nem található a '%s' függõség"
+
#~ msgid "loading FILES info for '%s'"
#~ msgstr "a FILE infó betöltése a '%s' számára"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 0d18ebcf..392016ca 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libalpm VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-22 15:52+0100\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2007-02-22 16:30+0100\n"
"Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
"Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 9800c843..17499c85 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-14 14:32-0500\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2007-02-06 20:16-0500\n"
"Last-Translator: Dan McGee <pacman-dev@archlinux.org>\n"
"MIME-Version: 1.0\n"
@@ -25,38 +25,47 @@ msgstr ""
msgid "loading target '%s'"
msgstr ""
-#: lib/libalpm/add.c:175
+#: lib/libalpm/add.c:174
#, c-format
msgid "replacing older version %s-%s by %s in target list"
msgstr ""
-#: lib/libalpm/add.c:184
+#: lib/libalpm/add.c:183
#, c-format
msgid "newer version %s-%s is in the target list -- skipping"
msgstr ""
-#: lib/libalpm/add.c:191
+#: lib/libalpm/add.c:190
#, c-format
msgid "reading '%s' metadata"
msgstr ""
-#: lib/libalpm/add.c:244 lib/libalpm/remove.c:110
+#: lib/libalpm/add.c:243 lib/libalpm/remove.c:110
msgid "looking for unsatisfied dependencies"
msgstr ""
-#: lib/libalpm/add.c:256 lib/libalpm/sync.c:473
+#: lib/libalpm/add.c:255 lib/libalpm/sync.c:476
msgid "looking for conflicts"
msgstr ""
-#: lib/libalpm/add.c:295 lib/libalpm/remove.c:146
+#: lib/libalpm/add.c:260
+msgid "replacing packages with -A and -U is not supported yet"
+msgstr ""
+
+#: lib/libalpm/add.c:261
+#, c-format
+msgid "please remove '%s' first, using -Rd"
+msgstr ""
+
+#: lib/libalpm/add.c:302 lib/libalpm/remove.c:146
msgid "sorting by dependencies"
msgstr ""
-#: lib/libalpm/add.c:307
+#: lib/libalpm/add.c:314
msgid "cleaning up"
msgstr ""
-#: lib/libalpm/add.c:324
+#: lib/libalpm/add.c:329
msgid "looking for file conflicts"
msgstr ""
@@ -65,212 +74,200 @@ msgstr ""
msgid "upgrading package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:419
+#: lib/libalpm/add.c:417
#, c-format
-msgid "removing old package first (%s-%s)"
+msgid "adding package %s-%s"
msgstr ""
-#: lib/libalpm/add.c:449
+#: lib/libalpm/add.c:430
#, c-format
-msgid "adding package %s-%s"
+msgid "removing old package first (%s-%s)"
msgstr ""
-#: lib/libalpm/add.c:460
+#: lib/libalpm/add.c:457
#, c-format
-msgid "adding new package %s-%s"
+msgid "adding %s to the NoUpgrade array temporarilly"
msgstr ""
-#: lib/libalpm/add.c:464
+#: lib/libalpm/add.c:475
msgid "extracting files"
msgstr ""
-#: lib/libalpm/add.c:480 lib/libalpm/util.c:461
+#: lib/libalpm/add.c:490 lib/libalpm/util.c:461
msgid "could not get current working directory"
msgstr ""
-#: lib/libalpm/add.c:538
+#: lib/libalpm/add.c:546
+#, c-format
+msgid "%s is in NoExtract, skipping extraction"
+msgstr ""
+
+#: lib/libalpm/add.c:547
#, c-format
msgid "notice: %s is in NoExtract -- skipping extraction"
msgstr ""
-#: lib/libalpm/add.c:574 lib/libalpm/add.c:727
+#: lib/libalpm/add.c:554
+#, c-format
+msgid "%s is in trans->skip_add, skipping extraction"
+msgstr ""
+
+#: lib/libalpm/add.c:600 lib/libalpm/add.c:601 lib/libalpm/add.c:750
#, c-format
msgid "could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:617
+#: lib/libalpm/add.c:644
#, c-format
msgid "checking md5 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:618 lib/libalpm/add.c:625
+#: lib/libalpm/add.c:646
#, c-format
-msgid "current: %s"
+msgid "checking sha1 hashes for %s"
msgstr ""
-#: lib/libalpm/add.c:619 lib/libalpm/add.c:626
+#: lib/libalpm/add.c:648
#, c-format
-msgid "new: %s"
+msgid "current: %s"
msgstr ""
-#: lib/libalpm/add.c:621 lib/libalpm/add.c:628
+#: lib/libalpm/add.c:649
#, c-format
-msgid "original: %s"
+msgid "new: %s"
msgstr ""
-#: lib/libalpm/add.c:624
+#: lib/libalpm/add.c:650
#, c-format
-msgid "checking sha1 hashes for %s"
+msgid "original: %s"
msgstr ""
-#: lib/libalpm/add.c:642
+#: lib/libalpm/add.c:662
#, c-format
msgid "could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:643
+#: lib/libalpm/add.c:663
#, c-format
msgid "error: could not rename %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:647 lib/libalpm/add.c:691
+#: lib/libalpm/add.c:669 lib/libalpm/add.c:688
#, c-format
-msgid "could not copy %s to %s (%s)"
+msgid "could not copy tempfile to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:648
+#: lib/libalpm/add.c:670
#, c-format
-msgid "error: could not copy %s to %s (%s)"
+msgid "error: could not copy tempfile to %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:652
+#: lib/libalpm/add.c:674
#, c-format
msgid "%s saved as %s.pacorig"
msgstr ""
-#: lib/libalpm/add.c:653
+#: lib/libalpm/add.c:675
#, c-format
msgid "warning: %s saved as %s"
msgstr ""
-#: lib/libalpm/add.c:663 lib/libalpm/add.c:666 lib/libalpm/add.c:672
-msgid "action: installing new file"
+#: lib/libalpm/add.c:685
+#, c-format
+msgid "action: installing new file: %s"
msgstr ""
-#: lib/libalpm/add.c:670
+#: lib/libalpm/add.c:695 lib/libalpm/add.c:701 lib/libalpm/add.c:706
msgid "action: leaving existing file in place"
msgstr ""
-#: lib/libalpm/add.c:676
+#: lib/libalpm/add.c:709
msgid "action: keeping current file and installing new one with .pacnew ending"
msgstr ""
-#: lib/libalpm/add.c:680
+#: lib/libalpm/add.c:712
#, c-format
msgid "could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:681
+#: lib/libalpm/add.c:713
#, c-format
msgid "error: could not install %s as %s: %s"
msgstr ""
-#: lib/libalpm/add.c:683
+#: lib/libalpm/add.c:715
#, c-format
msgid "%s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:684
+#: lib/libalpm/add.c:716
#, c-format
msgid "warning: %s installed as %s"
msgstr ""
-#: lib/libalpm/add.c:689 lib/libalpm/add.c:709
+#: lib/libalpm/add.c:730
#, c-format
-msgid "extracting %s"
+msgid "%s is in NoUpgrade -- skipping"
msgstr ""
-#: lib/libalpm/add.c:711
+#: lib/libalpm/add.c:731
#, c-format
-msgid "%s is in NoUpgrade -- skipping"
+msgid "extracting %s as %s.pacnew"
msgstr ""
-#: lib/libalpm/add.c:713
+#: lib/libalpm/add.c:732
#, c-format
-msgid "extracting %s as %s.pacnew"
+msgid "warning: extracting %s as %s.pacnew"
msgstr ""
-#: lib/libalpm/add.c:714
+#: lib/libalpm/add.c:735
#, c-format
-msgid "warning: extracting %s%s as %s"
+msgid "extracting %s"
msgstr ""
-#: lib/libalpm/add.c:728
+#: lib/libalpm/add.c:751
#, c-format
msgid "error: could not extract %s (%s)"
msgstr ""
-#: lib/libalpm/add.c:738
-msgid "appending backup entry"
+#: lib/libalpm/add.c:763
+#, c-format
+msgid "appending backup entry for %s"
msgstr ""
-#: lib/libalpm/add.c:769 lib/libalpm/add.c:771
+#: lib/libalpm/add.c:795 lib/libalpm/add.c:797
#, c-format
msgid "errors occurred while %s %s"
msgstr ""
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
msgid "upgrading"
msgstr ""
-#: lib/libalpm/add.c:770 lib/libalpm/add.c:772
+#: lib/libalpm/add.c:796 lib/libalpm/add.c:798
msgid "installing"
msgstr ""
-#: lib/libalpm/add.c:793 lib/libalpm/add.c:849
-#, c-format
-msgid "adding '%s' in requiredby field for '%s'"
-msgstr ""
-
-#: lib/libalpm/add.c:804 lib/libalpm/remove.c:326
+#: lib/libalpm/add.c:812 lib/libalpm/remove.c:321
msgid "updating database"
msgstr ""
-#: lib/libalpm/add.c:805
+#: lib/libalpm/add.c:813
#, c-format
msgid "adding database entry '%s'"
msgstr ""
-#: lib/libalpm/add.c:807
+#: lib/libalpm/add.c:816 lib/libalpm/add.c:818
#, c-format
msgid "could not update database entry %s-%s"
msgstr ""
-#: lib/libalpm/add.c:809
-#, c-format
-msgid "error updating database for %s-%s!"
-msgstr ""
-
-#: lib/libalpm/add.c:813
+#: lib/libalpm/add.c:824
#, c-format
msgid "could not add entry '%s' in cache"
msgstr ""
-#: lib/libalpm/add.c:819 lib/libalpm/remove.c:336
-msgid "updating dependency packages 'requiredby' fields"
-msgstr ""
-
-#: lib/libalpm/add.c:841
-#, c-format
-msgid "could not find dependency '%s'"
-msgstr ""
-
-#: lib/libalpm/add.c:852 lib/libalpm/remove.c:378
-#, c-format
-msgid "could not update 'requiredby' database entry %s-%s"
-msgstr ""
-
-#: lib/libalpm/add.c:878 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043
+#: lib/libalpm/add.c:852 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1046
#, c-format
msgid "running \"ldconfig -r %s\""
msgstr ""
@@ -437,7 +434,7 @@ msgstr ""
msgid "config: upgradedelay: %d"
msgstr ""
-#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197
+#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129
msgid "checking for package replacements"
msgstr ""
@@ -456,17 +453,17 @@ msgstr ""
msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
msgstr ""
-#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211
+#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:210
#, c-format
msgid "'%s' not found in sync db -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499
+#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:224 lib/libalpm/sync.c:502
#, c-format
msgid "'%s' is already elected for removal -- skipping"
msgstr ""
-#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232
+#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:235
#, c-format
msgid "%s-%s elected for upgrade (%s => %s)"
msgstr ""
@@ -476,50 +473,60 @@ msgstr ""
msgid "unpacking database '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:182
+#: lib/libalpm/be_files.c:75
+#, c-format
+msgid "opening database from path '%s'"
+msgstr ""
+
+#: lib/libalpm/be_files.c:179
+#, c-format
+msgid "db scan could not find package: %s"
+msgstr ""
+
+#: lib/libalpm/be_files.c:183
#, c-format
msgid "invalid name for dabatase entry '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:212
+#: lib/libalpm/be_files.c:213
msgid "invalid package entry provided to _alpm_db_read, skipping"
msgstr ""
-#: lib/libalpm/be_files.c:217
+#: lib/libalpm/be_files.c:218
#, c-format
msgid ""
"request to read database info for a file-based package '%s', skipping..."
msgstr ""
-#: lib/libalpm/be_files.c:225
+#: lib/libalpm/be_files.c:226
#, c-format
msgid "loading package data for %s : level=%d"
msgstr ""
-#: lib/libalpm/be_files.c:233
+#: lib/libalpm/be_files.c:234
#, c-format
msgid "cannot find '%s-%s' in db '%s'"
msgstr ""
-#: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391
-#: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502
-#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618
+#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392
+#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503
+#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619
#: lib/libalpm/package.c:197
#, c-format
msgid "could not open file %s: %s"
msgstr ""
-#: lib/libalpm/be_files.c:499
+#: lib/libalpm/be_files.c:500
#, c-format
msgid "writing %s-%s DESC information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:588
+#: lib/libalpm/be_files.c:589
#, c-format
msgid "writing %s-%s FILES information back to db"
msgstr ""
-#: lib/libalpm/be_files.c:615
+#: lib/libalpm/be_files.c:616
#, c-format
msgid "writing %s-%s DEPENDS information back to db"
msgstr ""
@@ -529,27 +536,42 @@ msgstr ""
msgid "loading package cache (infolevel=%#x) for repository '%s'"
msgstr ""
-#: lib/libalpm/cache.c:83
+#: lib/libalpm/cache.c:64
+#, c-format
+msgid "adding '%s' to package cache for db '%s'"
+msgstr ""
+
+#: lib/libalpm/cache.c:84
#, c-format
msgid "freeing package cache for repository '%s'"
msgstr ""
-#: lib/libalpm/cache.c:132
+#: lib/libalpm/cache.c:109
+#, c-format
+msgid "error: pkgcache is NULL for db '%s'"
+msgstr ""
+
+#: lib/libalpm/cache.c:136
#, c-format
msgid "package cache reloaded (infolevel=%#x) for repository '%s'"
msgstr ""
-#: lib/libalpm/cache.c:152
+#: lib/libalpm/cache.c:156
#, c-format
msgid "adding entry '%s' in '%s' cache"
msgstr ""
-#: lib/libalpm/cache.c:178
+#: lib/libalpm/cache.c:182
#, c-format
msgid "removing entry '%s' from '%s' cache"
msgstr ""
-#: lib/libalpm/cache.c:213
+#: lib/libalpm/cache.c:200
+#, c-format
+msgid "error: failed to get '%s' from NULL pkgcache"
+msgstr ""
+
+#: lib/libalpm/cache.c:223
#, c-format
msgid "loading group cache for repository '%s'"
msgstr ""
@@ -584,11 +606,11 @@ msgstr ""
msgid "db vs targs: found %s as a conflict for %s"
msgstr ""
-#: lib/libalpm/conflict.c:297 lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57
-#: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43
-#: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65
-#: lib/libalpm/sync.c:604 lib/libalpm/sync.c:620 lib/libalpm/sync.c:716
-#: lib/libalpm/trans.c:49 lib/libalpm/util.c:607 lib/libalpm/util.c:614
+#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:598
+#: lib/libalpm/deps.c:638 lib/libalpm/group.c:43 lib/libalpm/handle.c:49
+#: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:607
+#: lib/libalpm/sync.c:623 lib/libalpm/sync.c:719 lib/libalpm/trans.c:52
+#: lib/libalpm/util.c:607 lib/libalpm/util.c:614
#, c-format
msgid "malloc failure: could not allocate %d bytes"
msgstr ""
@@ -630,94 +652,85 @@ msgstr ""
msgid "possible dependency cycle detected"
msgstr ""
-#: lib/libalpm/deps.c:178
+#: lib/libalpm/deps.c:177
msgid "sorting dependencies finished"
msgstr ""
-#: lib/libalpm/deps.c:219 lib/libalpm/deps.c:276
+#: lib/libalpm/deps.c:218 lib/libalpm/deps.c:275
msgid "null package found in package list"
msgstr ""
-#: lib/libalpm/deps.c:224
+#: lib/libalpm/deps.c:223
#, c-format
msgid "cannot find package installed '%s'"
msgstr ""
-#: lib/libalpm/deps.c:258 lib/libalpm/deps.c:379
+#: lib/libalpm/deps.c:257 lib/libalpm/deps.c:378
#, c-format
msgid "checkdeps: found %s as required by %s"
msgstr ""
-#: lib/libalpm/deps.c:284
+#: lib/libalpm/deps.c:283
#, c-format
msgid "no dependencies for target '%s'"
msgstr ""
-#: lib/libalpm/deps.c:330
-#, c-format
-msgid "checkdeps: found %s as a dependency for %s"
-msgstr ""
-
-#: lib/libalpm/deps.c:478
+#: lib/libalpm/deps.c:329
#, c-format
-msgid "cannot find package \"%s\" or anything that provides it!"
-msgstr ""
-
-#: lib/libalpm/deps.c:483
-msgid "dep is NULL!"
+msgid "missing dependency '%s' for package '%s'"
msgstr ""
-#: lib/libalpm/deps.c:498
+#: lib/libalpm/deps.c:452
#, c-format
msgid "excluding %s -- explicitly installed"
msgstr ""
-#: lib/libalpm/deps.c:515
+#: lib/libalpm/deps.c:499
#, c-format
-msgid "loading ALL info for '%s'"
+msgid "cannot find package \"%s\" or anything that provides it!"
msgstr ""
-#: lib/libalpm/deps.c:518
+#: lib/libalpm/deps.c:508 lib/libalpm/deps.c:520
#, c-format
msgid "adding '%s' to the targets"
msgstr ""
-#: lib/libalpm/deps.c:546
+#: lib/libalpm/deps.c:551
msgid "started resolving dependencies"
msgstr ""
-#: lib/libalpm/deps.c:564
+#: lib/libalpm/deps.c:569
#, c-format
msgid "%s provides dependency %s -- skipping"
msgstr ""
-#: lib/libalpm/deps.c:589
+#: lib/libalpm/deps.c:594
#, c-format
msgid ""
"cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)"
msgstr ""
-#: lib/libalpm/deps.c:606
+#: lib/libalpm/deps.c:611
#, c-format
msgid "dependency %s is already in the target list -- skipping"
msgstr ""
-#: lib/libalpm/deps.c:626
+#: lib/libalpm/deps.c:631
#, c-format
msgid "pulling dependency %s (needed by %s)"
msgstr ""
-#: lib/libalpm/deps.c:630
+#: lib/libalpm/deps.c:635
#, c-format
msgid "cannot resolve dependencies for \"%s\""
msgstr ""
-#: lib/libalpm/deps.c:646
+#: lib/libalpm/deps.c:651
#, c-format
msgid "dependency cycle detected: %s"
msgstr ""
-#: lib/libalpm/deps.c:650
+#: lib/libalpm/deps.c:655
msgid "finished resolving dependencies"
msgstr ""
@@ -813,7 +826,7 @@ msgstr ""
msgid "operation not compatible with the transaction type"
msgstr ""
-#: lib/libalpm/error.c:91 lib/libalpm/sync.c:982
+#: lib/libalpm/error.c:91 lib/libalpm/sync.c:985
msgid "could not commit transaction"
msgstr ""
@@ -925,27 +938,42 @@ msgstr ""
msgid "unexpected error"
msgstr ""
+#: lib/libalpm/handle.c:164
+#, c-format
+msgid "option 'root' = %s"
+msgstr ""
+
+#: lib/libalpm/handle.c:180
+#, c-format
+msgid "option 'dbpath' = %s"
+msgstr ""
+
+#: lib/libalpm/handle.c:196
+#, c-format
+msgid "option 'cachedir' = %s"
+msgstr ""
+
#: lib/libalpm/md5driver.c:51 lib/libalpm/sha1.c:398
#, c-format
msgid "%s can't be opened\n"
msgstr ""
-#: lib/libalpm/package.c:146
+#: lib/libalpm/package.c:148
#, c-format
msgid "%s: forcing upgrade to version %s"
msgstr ""
-#: lib/libalpm/package.c:150
+#: lib/libalpm/package.c:152
#, c-format
msgid "%s: local (%s) is newer than %s (%s)"
msgstr ""
-#: lib/libalpm/package.c:157
+#: lib/libalpm/package.c:159
#, c-format
msgid "%s-%s: ignoring package upgrade (%s)"
msgstr ""
-#: lib/libalpm/package.c:162
+#: lib/libalpm/package.c:163
#, c-format
msgid "%s-%s: delaying upgrade of package (%s)"
msgstr ""
@@ -993,6 +1021,11 @@ msgstr ""
msgid "missing package filelist in %s, generating one"
msgstr ""
+#: lib/libalpm/package.c:547
+#, c-format
+msgid "adding '%s' in requiredby field for '%s'"
+msgstr ""
+
#: lib/libalpm/remove.c:78
#, c-format
msgid "could not find %s in database"
@@ -1017,277 +1050,301 @@ msgstr ""
msgid "finding removable dependencies"
msgstr ""
-#: lib/libalpm/remove.c:178
+#: lib/libalpm/remove.c:174
#, c-format
msgid "cannot remove file '%s': %s"
msgstr ""
-#: lib/libalpm/remove.c:218
+#: lib/libalpm/remove.c:212
+#, c-format
+msgid "Skipping removal of '%s' due to NoUpgrade"
+msgstr ""
+
+#: lib/libalpm/remove.c:219
#, c-format
msgid "file %s does not exist"
msgstr ""
-#: lib/libalpm/remove.c:224
+#: lib/libalpm/remove.c:226
#, c-format
msgid "keeping directory %s"
msgstr ""
-#: lib/libalpm/remove.c:226
+#: lib/libalpm/remove.c:228
#, c-format
msgid "removing directory %s"
msgstr ""
-#: lib/libalpm/remove.c:240
+#: lib/libalpm/remove.c:235
#, c-format
-msgid "skipping removal of %s as it has moved to another package"
+msgid "%s is in trans->skip_remove, skipping removal"
msgstr ""
-#: lib/libalpm/remove.c:252
+#: lib/libalpm/remove.c:246
#, c-format
msgid "%s saved as %s"
msgstr ""
-#: lib/libalpm/remove.c:256
+#: lib/libalpm/remove.c:249
+#, c-format
+msgid "transaction is set to NOSAVE, not backing up '%s'"
+msgstr ""
+
+#: lib/libalpm/remove.c:253
#, c-format
msgid "unlinking %s"
msgstr ""
-#: lib/libalpm/remove.c:263
+#: lib/libalpm/remove.c:260
#, c-format
msgid "cannot remove file %s: %s"
msgstr ""
-#: lib/libalpm/remove.c:291
+#: lib/libalpm/remove.c:286
#, c-format
msgid "removing package %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:303
+#: lib/libalpm/remove.c:298
#, c-format
msgid "not removing package '%s', can't remove all files"
msgstr ""
-#: lib/libalpm/remove.c:309
+#: lib/libalpm/remove.c:304
msgid "removing files"
msgstr ""
-#: lib/libalpm/remove.c:327
+#: lib/libalpm/remove.c:322
#, c-format
msgid "removing database entry '%s'"
msgstr ""
-#: lib/libalpm/remove.c:329
+#: lib/libalpm/remove.c:324
#, c-format
msgid "could not remove database entry %s-%s"
msgstr ""
-#: lib/libalpm/remove.c:332
+#: lib/libalpm/remove.c:327
#, c-format
msgid "could not remove entry '%s' from cache"
msgstr ""
-#: lib/libalpm/remove.c:366
-#, c-format
-msgid "could not find dependency '%s' for removal"
+#: lib/libalpm/sync.c:199
+msgid "checking for package upgrades"
msgstr ""
-#: lib/libalpm/remove.c:376
+#: lib/libalpm/sync.c:232
#, c-format
-msgid "updating 'requiredby' field for package '%s'"
-msgstr ""
-
-#: lib/libalpm/sync.c:200
-msgid "checking for package upgrades"
+msgid "%s-%s: ignoring package upgrade (%s => %s)"
msgstr ""
-#: lib/libalpm/sync.c:277
+#: lib/libalpm/sync.c:281
#, c-format
msgid "searching for target in repo '%s'"
msgstr ""
-#: lib/libalpm/sync.c:286 lib/libalpm/sync.c:309
+#: lib/libalpm/sync.c:290 lib/libalpm/sync.c:313
#, c-format
msgid "target '%s' not found -- looking for provisions"
msgstr ""
-#: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314
+#: lib/libalpm/sync.c:295 lib/libalpm/sync.c:318
#, c-format
msgid "found '%s' as a provision for '%s'"
msgstr ""
-#: lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:302
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: lib/libalpm/sync.c:332
+#: lib/libalpm/sync.c:336
#, c-format
msgid "%s-%s is up to date -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:352
+#: lib/libalpm/sync.c:356
#, c-format
msgid "adding target '%s' to the transaction set"
msgstr ""
-#: lib/libalpm/sync.c:398
+#: lib/libalpm/sync.c:401
msgid "resolving target's dependencies"
msgstr ""
-#: lib/libalpm/sync.c:418
+#: lib/libalpm/sync.c:421
#, c-format
msgid "adding package %s-%s to the transaction targets"
msgstr ""
-#: lib/libalpm/sync.c:453
+#: lib/libalpm/sync.c:456
msgid "looking for unresolvable dependencies"
msgstr ""
-#: lib/libalpm/sync.c:484
+#: lib/libalpm/sync.c:487
#, c-format
msgid "package '%s' is conflicting with '%s'"
msgstr ""
-#: lib/libalpm/sync.c:506
+#: lib/libalpm/sync.c:509
#, c-format
msgid "'%s' not found in transaction set -- skipping"
msgstr ""
-#: lib/libalpm/sync.c:517
+#: lib/libalpm/sync.c:520
#, c-format
msgid "package '%s' provides its own conflict"
msgstr ""
-#: lib/libalpm/sync.c:540 lib/libalpm/sync.c:545
+#: lib/libalpm/sync.c:543 lib/libalpm/sync.c:548
#, c-format
msgid "'%s' is in the target list -- keeping it"
msgstr ""
-#: lib/libalpm/sync.c:557 lib/libalpm/sync.c:594
+#: lib/libalpm/sync.c:560 lib/libalpm/sync.c:597
#, c-format
msgid "removing '%s' from target list"
msgstr ""
-#: lib/libalpm/sync.c:566
+#: lib/libalpm/sync.c:569
#, c-format
msgid "resolving package '%s' conflict"
msgstr ""
-#: lib/libalpm/sync.c:589
+#: lib/libalpm/sync.c:592
#, c-format
msgid "electing '%s' for removal"
msgstr ""
-#: lib/libalpm/sync.c:600 lib/libalpm/sync.c:616
+#: lib/libalpm/sync.c:603 lib/libalpm/sync.c:619
msgid "unresolvable package conflicts detected"
msgstr ""
-#: lib/libalpm/sync.c:668
+#: lib/libalpm/sync.c:671
msgid "checking dependencies of packages designated for removal"
msgstr ""
-#: lib/libalpm/sync.c:682
+#: lib/libalpm/sync.c:685
msgid "something has gone horribly wrong"
msgstr ""
-#: lib/libalpm/sync.c:701
+#: lib/libalpm/sync.c:704
#, c-format
msgid "found '%s' as a provision for '%s' -- conflict aborted"
msgstr ""
-#: lib/libalpm/sync.c:797
+#: lib/libalpm/sync.c:800
#, c-format
msgid "%s is already in the cache\n"
msgstr ""
-#: lib/libalpm/sync.c:808
+#: lib/libalpm/sync.c:811
#, c-format
msgid "no %s cache exists. creating...\n"
msgstr ""
-#: lib/libalpm/sync.c:809
+#: lib/libalpm/sync.c:812
#, c-format
msgid "warning: no %s cache exists. creating..."
msgstr ""
-#: lib/libalpm/sync.c:814
+#: lib/libalpm/sync.c:817
msgid "couldn't create package cache, using /tmp instead\n"
msgstr ""
-#: lib/libalpm/sync.c:815
+#: lib/libalpm/sync.c:818
msgid "warning: couldn't create package cache, using /tmp instead"
msgstr ""
-#: lib/libalpm/sync.c:822
+#: lib/libalpm/sync.c:825
#, c-format
msgid "failed to retrieve some files from %s\n"
msgstr ""
-#: lib/libalpm/sync.c:851 lib/libalpm/sync.c:863
+#: lib/libalpm/sync.c:854 lib/libalpm/sync.c:866
#, c-format
msgid "can't get md5 or sha1 checksum for package %s\n"
msgstr ""
-#: lib/libalpm/sync.c:882
+#: lib/libalpm/sync.c:885
#, c-format
msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:884
+#: lib/libalpm/sync.c:887
#, c-format
msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
msgstr ""
-#: lib/libalpm/sync.c:905
+#: lib/libalpm/sync.c:908
msgid "could not create removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:911
+#: lib/libalpm/sync.c:914
msgid "could not initialize the removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:931
+#: lib/libalpm/sync.c:934
msgid "removing conflicting and to-be-replaced packages"
msgstr ""
-#: lib/libalpm/sync.c:933
+#: lib/libalpm/sync.c:936
msgid "could not prepare removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:939
+#: lib/libalpm/sync.c:942
msgid "could not commit removal transaction"
msgstr ""
-#: lib/libalpm/sync.c:946
+#: lib/libalpm/sync.c:949
msgid "installing packages"
msgstr ""
-#: lib/libalpm/sync.c:949
+#: lib/libalpm/sync.c:952
msgid "could not create transaction"
msgstr ""
-#: lib/libalpm/sync.c:954
+#: lib/libalpm/sync.c:957
msgid "could not initialize transaction"
msgstr ""
-#: lib/libalpm/sync.c:977
+#: lib/libalpm/sync.c:980
msgid "could not prepare transaction"
msgstr ""
-#: lib/libalpm/sync.c:989
+#: lib/libalpm/sync.c:992
msgid "updating database for replaced packages' dependencies"
msgstr ""
-#: lib/libalpm/sync.c:1018
+#: lib/libalpm/sync.c:1021
#, c-format
msgid "could not update requiredby for database entry %s-%s"
msgstr ""
-#: lib/libalpm/sync.c:1027
+#: lib/libalpm/sync.c:1030
#, c-format
msgid "could not update new database entry %s-%s"
msgstr ""
+#: lib/libalpm/trans.c:262
+msgid "updating dependency packages 'requiredby' fields"
+msgstr ""
+
+#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323
+#, c-format
+msgid "updating 'requiredby' field for package '%s'"
+msgstr ""
+
+#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333
+#, c-format
+msgid "could not update 'requiredby' database entry %s-%s"
+msgstr ""
+
+#: lib/libalpm/trans.c:315
+#, c-format
+msgid "could not find dependency '%s'"
+msgstr ""
+
#: lib/libalpm/util.c:278
#, c-format
msgid "could not open %s: %s\n"
diff --git a/pactest/Makefile.am b/pactest/Makefile.am
new file mode 100644
index 00000000..07c205fa
--- /dev/null
+++ b/pactest/Makefile.am
@@ -0,0 +1,15 @@
+check_SCRIPTS = \
+ pactest.py \
+ pmdb.py \
+ pmenv.py \
+ pmfile.py \
+ pmpkg.py \
+ pmrule.py \
+ pmtest.py \
+ util.py \
+ $(wildcard tests/*.py) \
+ tests/TESTS
+
+noinst_SCRIPTS = $(check_SCRIPTS)
+
+EXTRA_DIST = $(check_SCRIPTS)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 31d44cad..9592cb4f 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,4 +1,6 @@
-AUTOMAKE_OPTIONS = std-options
+# TODO: this would be nice to enable, but we need --help and --version
+# flags on all of our scripts first (this is what it checks)
+#AUTOMAKE_OPTIONS = std-options
bin_SCRIPTS = \
abs \
@@ -12,4 +14,6 @@ bin_SCRIPTS = \
re-pacman \
updatesync
+EXTRA_DIST = $(bin_SCRIPTS)
+
abs gensync makepkg makeworld pacman-optimize rankmirrors repo-add repo-remove re-pacman updatesync:
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 0b4b40c7..e347ee25 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -164,7 +164,7 @@ static void usage(int op, char *myname)
static void version()
{
printf("\n");
- printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, PM_VERSION);
+ printf(" .--. Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, LIB_VERSION);
printf("/ _.-' .-. .-. .-. Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>\n");
printf("\\ '-. '-' '-' '-' & Frugalware developers <frugalware-devel@frugalware.org>\n");
printf(" '--' \n");
diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po
index 27ae5bcf..732f16b4 100644
--- a/src/pacman/po/de.po
+++ b/src/pacman/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-22 07:54+0100\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2007-02-22 08:11+0100\n"
"Last-Translator: Pierre Schmitz <pierre@archlinux.de>\n"
"Language-Team: Deutsch <archlinux.de>\n"
@@ -399,7 +399,8 @@ msgstr " -d, --nodeps Überspringt die Abhängigkeitsprüfung\n"
#: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140
#, c-format
msgid " -f, --force force install, overwrite conflicting files\n"
-msgstr " -f, --force Installation erzwingen, Dateikonflikte überschreiben\n"
+msgstr ""
+" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n"
#: src/pacman/pacman.c:104
#, c-format
@@ -408,12 +409,15 @@ msgstr "Benutzung: %s {-R --remove} [Optionen] <Paket>\n"
#: src/pacman/pacman.c:106
#, c-format
-msgid " -c, --cascade remove packages and all packages that depend on them\n"
-msgstr " -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n"
+msgid ""
+" -c, --cascade remove packages and all packages that depend on them\n"
+msgstr ""
+" -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n"
#: src/pacman/pacman.c:108
#, c-format
-msgid " -k, --dbonly only remove database entry, do not remove files\n"
+msgid ""
+" -k, --dbonly only remove database entry, do not remove files\n"
msgstr " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien\n"
#: src/pacman/pacman.c:109
@@ -423,7 +427,8 @@ msgstr " -n, --nosave Auch Konfigurationsdateien entfernen\n"
#: src/pacman/pacman.c:110
#, c-format
-msgid " -s, --recursive remove dependencies also (that won't break packages)\n"
+msgid ""
+" -s, --recursive remove dependencies also (that won't break packages)\n"
msgstr ""
" -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine "
"Pakete)\n"
@@ -505,7 +510,8 @@ msgstr ""
msgid ""
" -s, --search search locally-installed packages for matching "
"strings\n"
-msgstr " -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n"
+msgstr ""
+" -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n"
#: src/pacman/pacman.c:133
#, c-format
@@ -542,8 +548,10 @@ msgstr ""
#: src/pacman/pacman.c:144
#, c-format
-msgid " -s, --search search remote repositories for matching strings\n"
-msgstr " -s, --search Durchsuche entfernte Repositorien nach einem Wort\n"
+msgid ""
+" -s, --search search remote repositories for matching strings\n"
+msgstr ""
+" -s, --search Durchsuche entfernte Repositorien nach einem Wort\n"
#: src/pacman/pacman.c:145
#, c-format
@@ -561,7 +569,8 @@ msgstr ""
#: src/pacman/pacman.c:147
#, c-format
-msgid " -y, --refresh download fresh package databases from the server\n"
+msgid ""
+" -y, --refresh download fresh package databases from the server\n"
msgstr " -y, --refresh Lade frische Paketdatenbank vom Server\n"
#: src/pacman/pacman.c:148
@@ -585,20 +594,25 @@ msgstr " --noconfirm Niemals nach einer Bestätigung fragen\n"
#: src/pacman/pacman.c:152
#, c-format
-msgid " --ask <number> pre-specify answers for questions (see manpage)\n"
-msgstr " --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
+msgid ""
+" --ask <number> pre-specify answers for questions (see manpage)\n"
+msgstr ""
+" --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n"
#: src/pacman/pacman.c:153
#, c-format
-msgid " --noprogressbar do not show a progress bar when downloading files\n"
+msgid ""
+" --noprogressbar do not show a progress bar when downloading files\n"
msgstr ""
" --noprogressbar Keine Fortschrittsanzeige anzeigen, wenn Dateien\n"
" heruntergeladen werden\n"
#: src/pacman/pacman.c:154
#, c-format
-msgid " --noscriptlet do not execute the install scriptlet if there is any\n"
-msgstr " --noscriptlet Installationskript nicht ausführen, falls vorhanden\n"
+msgid ""
+" --noscriptlet do not execute the install scriptlet if there is any\n"
+msgstr ""
+" --noscriptlet Installationskript nicht ausführen, falls vorhanden\n"
#: src/pacman/pacman.c:155
#, c-format
@@ -1086,4 +1100,3 @@ msgstr ""
#, c-format
msgid "Total Installed Size: %.2f MB\n"
msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n"
-
diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po
index 31514ff7..11b7d15b 100644
--- a/src/pacman/po/fr.po
+++ b/src/pacman/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-15 09:24-0500\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2006-06-05 22:46+0100\n"
"Last-Translator: Enda <enda@netou.com>\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Poedit-Country: FRANCE\n"
#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:438 src/pacman/sync.c:487
+#: src/pacman/sync.c:482 src/pacman/sync.c:531
#, fuzzy, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -36,14 +36,14 @@ msgstr "chargement des données du paquet.."
msgid "failed to add target '%s' (%s)"
msgstr "échec d'ajout de la cible '%s' (%s)\n"
-#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:70
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
#: src/pacman/trans.c:142
msgid "done.\n"
msgstr "fait.\n"
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:616
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "échec de préparation de la transaction (%s)\n"
@@ -53,22 +53,22 @@ msgstr "échec de préparation de la transaction (%s)\n"
msgid ":: %s: requires %s"
msgstr ":: %s: requiert %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:601
+#: src/pacman/add.c:118 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: conflit avec %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:665
+#: src/pacman/add.c:127 src/pacman/sync.c:709
#, fuzzy, c-format
msgid "%s%s exists in both '%s' and '%s'\n"
msgstr "%s%s existe dans \"%s\" (cible) and \"%s\" (cible)"
-#: src/pacman/add.c:134 src/pacman/sync.c:672
+#: src/pacman/add.c:134 src/pacman/sync.c:716
#, fuzzy, c-format
msgid "%s: %s%s exists in filesystem\n"
msgstr "%s: %s%s existe dans le système de fichiers"
-#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
+#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -76,18 +76,18 @@ msgstr ""
"\n"
"des erreurs se sont produites, aucun paquet n'a été mis à jour.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:608
+#: src/pacman/add.c:151 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ""
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "échec de validation de la transaction (%s)\n"
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
-#: src/pacman/sync.c:701
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:745
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "échec de libération de la transaction (%s)\n"
@@ -141,20 +141,20 @@ msgstr "avertissement"
msgid "function"
msgstr "fonction"
-#: src/pacman/log.c:201
+#: src/pacman/log.c:205
msgid "Y"
msgstr "O"
-#: src/pacman/log.c:201
+#: src/pacman/log.c:205
msgid "YES"
msgstr "OUI"
-#: src/pacman/log.h:26
+#: src/pacman/log.h:28
#, fuzzy
msgid "error: "
msgstr "erreur"
-#: src/pacman/log.h:30
+#: src/pacman/log.h:32
#, fuzzy
msgid "warning: "
msgstr "avertissement"
@@ -305,30 +305,35 @@ msgstr ""
#: src/pacman/package.c:155
#, c-format
-msgid "Backup Files :\n"
+msgid "Backup Files:\n"
msgstr ""
-#: src/pacman/package.c:175
+#: src/pacman/package.c:177
#, fuzzy, c-format
msgid "error calculating checksums for %s\n"
msgstr "erreur lors du calcul des sommes md5 ou sha1 pour %s\n"
-#: src/pacman/package.c:188
+#: src/pacman/package.c:190
#, fuzzy, c-format
msgid "MODIFIED\t%s\n"
msgstr "%sMODIFIE\t%s\n"
-#: src/pacman/package.c:190
+#: src/pacman/package.c:192
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:195
+#: src/pacman/package.c:197
#, c-format
msgid "MISSING\t\t%s\n"
msgstr "MANQUANT\t\t%s\n"
-#: src/pacman/package.c:228
+#: src/pacman/package.c:203
+#, fuzzy, c-format
+msgid "(none)\n"
+msgstr "Aucun\n"
+
+#: src/pacman/package.c:234
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Aucun changelog disponible pour '%s'.\n"
@@ -535,7 +540,7 @@ msgstr ""
#: src/pacman/pacman.c:137
#, fuzzy, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (-cc for "
"all)\n"
msgstr ""
" -c, --clean remove old packages from cache directory (use -cc for "
@@ -658,62 +663,62 @@ msgstr ""
msgid " the terms of the GNU General Public License\n"
msgstr " les termes de la GNU General Public License\n"
-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:298
#, fuzzy, c-format
msgid "'%s' is not a valid debug level"
msgstr "%s nest pas une expression régulière valide.\n"
-#: src/pacman/pacman.c:315
+#: src/pacman/pacman.c:313
#, fuzzy, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr "n'a pas pu acceder au répertoire de cache\n"
-#: src/pacman/pacman.c:341
+#: src/pacman/pacman.c:339
#, fuzzy, c-format
msgid "'%s' is not a valid db path\n"
msgstr "%s nest pas une expression régulière valide.\n"
-#: src/pacman/pacman.c:371
+#: src/pacman/pacman.c:369
#, fuzzy, c-format
msgid "'%s' is not a valid root path\n"
msgstr "%s nest pas une expression régulière valide.\n"
-#: src/pacman/pacman.c:398
+#: src/pacman/pacman.c:396
msgid "only one operation may be used at a time\n"
msgstr "une seule opération peut être effectuée à la fois\n"
-#: src/pacman/pacman.c:444
+#: src/pacman/pacman.c:442
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr ""
-#: src/pacman/pacman.c:463
+#: src/pacman/pacman.c:461
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "échec d'initialisation de la librairie alpm (%s)\n"
-#: src/pacman/pacman.c:496
+#: src/pacman/pacman.c:494
msgid "you cannot perform this operation unless you are root.\n"
msgstr "vous ne pouvez effectuer cette opération à moins d'être root.\n"
-#: src/pacman/pacman.c:512
+#: src/pacman/pacman.c:510
#, fuzzy, c-format
msgid "failed to parse config (%s)\n"
msgstr "échec de préparation de la transaction (%s)\n"
-#: src/pacman/pacman.c:522 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Cibles:"
-#: src/pacman/pacman.c:528
+#: src/pacman/pacman.c:526
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "n'a pas pu enregistrer la base de données 'locale' (%s)\n"
-#: src/pacman/pacman.c:535
+#: src/pacman/pacman.c:533
msgid "no targets specified (use -h for help)\n"
msgstr "aucune cible spécifiée (utiliser -h pour de l'aide)\n"
-#: src/pacman/pacman.c:548
+#: src/pacman/pacman.c:546
msgid "no operation specified (use -h for help)\n"
msgstr "aucune opération spécifiée (utiliser -h pour de l'aide)\n"
@@ -731,7 +736,7 @@ msgstr "%s appartient à %s %s\n"
msgid "No package owns %s\n"
msgstr "Aucun paquet ne contient %s\n"
-#: src/pacman/query.c:119 src/pacman/sync.c:409
+#: src/pacman/query.c:119 src/pacman/sync.c:453
msgid "no usable package repositories configured.\n"
msgstr "aucun dépot de paquet utilisable n'est définit.\n"
@@ -763,7 +768,7 @@ msgstr "échec de chargement du paquet '%s' (%s)\n"
msgid "package \"%s\" not found\n"
msgstr "paquet \"%s\" non trouvé\n"
-#: src/pacman/remove.c:58 src/pacman/sync.c:524
+#: src/pacman/remove.c:58 src/pacman/sync.c:568
#, c-format
msgid ":: group %s:\n"
msgstr ":: groupe %s:\n"
@@ -777,7 +782,7 @@ msgstr " Effacer tout le contenu? [O/n] "
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ":: Retirer %s du groupe %s? [O/n] "
-#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
+#: src/pacman/remove.c:77 src/pacman/sync.c:480 src/pacman/sync.c:529
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr "échec d'initialisation de la transaction (%s)\n"
@@ -800,82 +805,92 @@ msgstr ""
"\n"
"Voules vous désinstaller ces paquets? [O/n] "
-#: src/pacman/sync.c:113
+#: src/pacman/sync.c:115
msgid "Do you want to remove old packages from cache? [Y/n] "
msgstr "Voulez vous effacer les anciens paquets du cache? [Y/n] "
-#: src/pacman/sync.c:115
+#: src/pacman/sync.c:117
msgid "removing old packages from cache... "
msgstr "effacement des anciens paquets du cache..."
-#: src/pacman/sync.c:118
+#: src/pacman/sync.c:120
msgid "could not access cache directory\n"
msgstr "n'a pas pu acceder au répertoire de cache\n"
-#: src/pacman/sync.c:179
+#: src/pacman/sync.c:181
msgid "Do you want to remove all packages from cache? [Y/n] "
msgstr "Voulez vous effacer tous les paquets du cache? [O/n] "
-#: src/pacman/sync.c:181
+#: src/pacman/sync.c:183
msgid "removing all packages from cache... "
msgstr "effacement de tous les paquets du cache..."
-#: src/pacman/sync.c:184
+#: src/pacman/sync.c:186
msgid "could not remove cache directory\n"
msgstr "n'a pas pu supprimer le répertoire de cache\n"
-#: src/pacman/sync.c:189
+#: src/pacman/sync.c:191
msgid "could not create new cache directory\n"
msgstr "n'a pas pu créer le nouveau répertoire de cache\n"
-#: src/pacman/sync.c:216
+#: src/pacman/sync.c:218
#, fuzzy, c-format
msgid "failed to synchronize %s: %s\n"
msgstr "echec lors de la synchronisation %s\n"
-#: src/pacman/sync.c:218
+#: src/pacman/sync.c:220
#, c-format
msgid "failed to update %s (%s)\n"
msgstr "echec de mise à jour %s (%s)\n"
-#: src/pacman/sync.c:221
+#: src/pacman/sync.c:223
#, c-format
msgid " %s is up to date\n"
msgstr " %s est à jour\n"
-#: src/pacman/sync.c:337
-#, c-format
-msgid "package \"%s\" was not found.\n"
+#: src/pacman/sync.c:345
+#, fuzzy, c-format
+msgid "repository '%s' does not exist\n"
+msgstr "le dépot \"%s\" n'a pas été trouvé.\n"
+
+#: src/pacman/sync.c:361
+#, fuzzy, c-format
+msgid "package '%s' was not found in repository '%s'\n"
+msgstr "paquet \"%s\" non trouvé.\n"
+
+#: src/pacman/sync.c:381
+#, fuzzy, c-format
+msgid "package '%s' was not found\n"
msgstr "paquet \"%s\" non trouvé.\n"
-#: src/pacman/sync.c:374
+#: src/pacman/sync.c:418
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr "le dépot \"%s\" n'a pas été trouvé.\n"
-#: src/pacman/sync.c:446
+#: src/pacman/sync.c:490
msgid ":: Synchronizing package databases...\n"
msgstr ":: Synchronisation des bases de données de paquets...\n"
-#: src/pacman/sync.c:447
+#: src/pacman/sync.c:491
msgid "synchronizing package lists"
msgstr "synchronisation de la liste des paquets"
-#: src/pacman/sync.c:449
+#: src/pacman/sync.c:493
#, fuzzy
msgid "failed to synchronize any databases"
msgstr "echec lors de la synchronisation %s\n"
-#: src/pacman/sync.c:455
+#: src/pacman/sync.c:499
#, fuzzy
msgid ":: Starting full system upgrade...\n"
msgstr "demarrage de la mise à jour pour le système complet"
-#: src/pacman/sync.c:456
+#: src/pacman/sync.c:500
msgid "starting full system upgrade"
msgstr "demarrage de la mise à jour pour le système complet"
-#: src/pacman/sync.c:474
+#: src/pacman/sync.c:518
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -883,59 +898,59 @@ msgstr ""
"\n"
":: pacman a détecté une version plus récente du paquet \"pacman\".\n"
-#: src/pacman/sync.c:475
+#: src/pacman/sync.c:519
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ":: Il est recommandé de laisser pacman se mettre à jour\n"
-#: src/pacman/sync.c:476
+#: src/pacman/sync.c:520
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ""
":: d'abord, vous devriez re-lancer l'opération avec la nouvelle version.\n"
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:522
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ":: Mettre à jour pacman préalablement? [O/n] "
-#: src/pacman/sync.c:493
+#: src/pacman/sync.c:537
#, fuzzy, c-format
msgid "pacman: %s\n"
msgstr "Aucun paquet ne contient %s\n"
-#: src/pacman/sync.c:513
+#: src/pacman/sync.c:557
#, c-format
msgid "'%s': %s\n"
msgstr ""
-#: src/pacman/sync.c:528
+#: src/pacman/sync.c:572
msgid ":: Install whole content? [Y/n] "
msgstr ":: Installer tout le contenu? [O/n] "
-#: src/pacman/sync.c:535
+#: src/pacman/sync.c:579
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ":: Installer %s du groupe %s? [O/n] "
-#: src/pacman/sync.c:559
+#: src/pacman/sync.c:603
#, fuzzy, c-format
msgid "'%s': not found in sync db\n"
msgstr ""
"n'a pas pu ajouter la cible '%s': non trouvé dans la base de données de "
"synchronisation\n"
-#: src/pacman/sync.c:579
+#: src/pacman/sync.c:623
msgid "requires"
msgstr "requiert"
-#: src/pacman/sync.c:579
+#: src/pacman/sync.c:623
msgid "is required by"
msgstr "est requit par"
-#: src/pacman/sync.c:621
+#: src/pacman/sync.c:665
#, fuzzy
-msgid "local database is up to date\n"
+msgid " local database is up to date\n"
msgstr " %s est à jour\n"
-#: src/pacman/sync.c:630
+#: src/pacman/sync.c:674
msgid ""
"\n"
"Beginning download...\n"
@@ -943,11 +958,11 @@ msgstr ""
"\n"
"Début du téléchargement...\n"
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:678
msgid "Proceed with download? [Y/n] "
msgstr "Procéder au téléchargement? [O/n] "
-#: src/pacman/sync.c:642
+#: src/pacman/sync.c:686
msgid ""
"\n"
"Beginning upgrade process...\n"
@@ -955,7 +970,7 @@ msgstr ""
"\n"
"Début du processus de mise à jour...\n"
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:690
#, fuzzy
msgid "Proceed with installation? [Y/n] "
msgstr "Procéder au téléchargement? [O/n] "
@@ -1066,20 +1081,20 @@ msgstr ""
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: L'archive %s est corrompue. Voulez vous l'effacer? [Y/n] "
-#: src/pacman/trans.c:314
+#: src/pacman/trans.c:319
msgid "installing"
msgstr "Installation"
-#: src/pacman/trans.c:317
+#: src/pacman/trans.c:322
msgid "upgrading"
msgstr "Mise à jour"
-#: src/pacman/trans.c:320
+#: src/pacman/trans.c:325
#, fuzzy
msgid "removing"
msgstr "désinstallation de %s... "
-#: src/pacman/trans.c:323
+#: src/pacman/trans.c:328
#, fuzzy
msgid "checking for file conflicts"
msgstr "vérification des conflits de fichiers..."
diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po
index af337602..3d6f046a 100644
--- a/src/pacman/po/hu.po
+++ b/src/pacman/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-15 09:24-0500\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2006-09-03 13:52+0200\n"
"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:438 src/pacman/sync.c:487
+#: src/pacman/sync.c:482 src/pacman/sync.c:531
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -35,14 +35,14 @@ msgstr "csomag adatainak betöltése... "
msgid "failed to add target '%s' (%s)"
msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n"
-#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:70
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
#: src/pacman/trans.c:142
msgid "done.\n"
msgstr "kész.\n"
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:616
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "nem sikerült elõkészíteni a tranzakciót (%s)\n"
@@ -52,22 +52,22 @@ msgstr "nem sikerült elõkészíteni a tranzakciót (%s)\n"
msgid ":: %s: requires %s"
msgstr ":: %s: igényli a következõt: %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:601
+#: src/pacman/add.c:118 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: ütközik a következõvel: %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:665
+#: src/pacman/add.c:127 src/pacman/sync.c:709
#, fuzzy, c-format
msgid "%s%s exists in both '%s' and '%s'\n"
msgstr "%s%s: létezik ebben: \"%s\" (cél) és ebben: \"%s\" (cél)"
-#: src/pacman/add.c:134 src/pacman/sync.c:672
+#: src/pacman/add.c:134 src/pacman/sync.c:716
#, fuzzy, c-format
msgid "%s: %s%s exists in filesystem\n"
msgstr "%s: a %s%s létezik a fájlrendszerben"
-#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
+#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -75,18 +75,18 @@ msgstr ""
"\n"
"hibák léptek fel, nem frissült csomag.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:608
+#: src/pacman/add.c:151 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ":: %.1f MB szükséges, %.1f MB áll rendelkezésre"
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "nem sikerült végrehajtani a tranzakciót (%s)\n"
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
-#: src/pacman/sync.c:701
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:745
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "nem sikerült lezárni a tranzakciót (%s)\n"
@@ -140,19 +140,19 @@ msgstr "figyelmeztetés"
msgid "function"
msgstr "függvény"
-#: src/pacman/log.c:201
+#: src/pacman/log.c:205
msgid "Y"
msgstr "I"
-#: src/pacman/log.c:201
+#: src/pacman/log.c:205
msgid "YES"
msgstr "IGEN"
-#: src/pacman/log.h:26
+#: src/pacman/log.h:28
msgid "error: "
msgstr "hiba: "
-#: src/pacman/log.h:30
+#: src/pacman/log.h:32
msgid "warning: "
msgstr "figyelmeztetés"
@@ -301,30 +301,35 @@ msgstr ""
#: src/pacman/package.c:155
#, c-format
-msgid "Backup Files :\n"
+msgid "Backup Files:\n"
msgstr ""
-#: src/pacman/package.c:175
+#: src/pacman/package.c:177
#, fuzzy, c-format
msgid "error calculating checksums for %s\n"
msgstr "hiba a %s md5 vagy sha1 ellenõrzõ összegének számítása közben\n"
-#: src/pacman/package.c:188
+#: src/pacman/package.c:190
#, fuzzy, c-format
msgid "MODIFIED\t%s\n"
msgstr "%sMÓDOSÍTVA\t%s\n"
-#: src/pacman/package.c:190
+#: src/pacman/package.c:192
#, c-format
msgid "Not Modified\t%s\n"
msgstr ""
-#: src/pacman/package.c:195
+#: src/pacman/package.c:197
#, c-format
msgid "MISSING\t\t%s\n"
msgstr "HIÁNYZIK\t\t%s\n"
-#: src/pacman/package.c:228
+#: src/pacman/package.c:203
+#, fuzzy, c-format
+msgid "(none)\n"
+msgstr "Nincs\n"
+
+#: src/pacman/package.c:234
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "Nem áll rendelkezésre változási napló a '%s' csomaghoz.\n"
@@ -525,7 +530,7 @@ msgstr "használat: %s {-S --sync} [opciók] [csomag]\n"
#: src/pacman/pacman.c:137
#, fuzzy, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (-cc for "
"all)\n"
msgstr ""
" -c, --clean a régi csomagok eltávolítása a gyorsítótár "
@@ -640,62 +645,62 @@ msgstr ""
msgid " the terms of the GNU General Public License\n"
msgstr " foglaltak alapján szabadon terjesztheti\n"
-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:298
#, fuzzy, c-format
msgid "'%s' is not a valid debug level"
msgstr "%s: nem érvényes reguláris kifejezés.\n"
-#: src/pacman/pacman.c:315
+#: src/pacman/pacman.c:313
#, fuzzy, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr "nem sikerült elérni a gyorsítótár könyvtárát\n"
-#: src/pacman/pacman.c:341
+#: src/pacman/pacman.c:339
#, fuzzy, c-format
msgid "'%s' is not a valid db path\n"
msgstr "%s: nem érvényes reguláris kifejezés.\n"
-#: src/pacman/pacman.c:371
+#: src/pacman/pacman.c:369
#, fuzzy, c-format
msgid "'%s' is not a valid root path\n"
msgstr "%s: nem érvényes reguláris kifejezés.\n"
-#: src/pacman/pacman.c:398
+#: src/pacman/pacman.c:396
msgid "only one operation may be used at a time\n"
msgstr "csak egy mûvelet hajtható végre egyszerre\n"
-#: src/pacman/pacman.c:444
+#: src/pacman/pacman.c:442
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr ""
-#: src/pacman/pacman.c:463
+#: src/pacman/pacman.c:461
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "nem sikerült inicializálni az alpm könyvtárat (%s)\n"
-#: src/pacman/pacman.c:496
+#: src/pacman/pacman.c:494
msgid "you cannot perform this operation unless you are root.\n"
msgstr "nem hajtható végre ez a mûvelet hacsak nem rendszergazda.\n"
-#: src/pacman/pacman.c:512
+#: src/pacman/pacman.c:510
#, c-format
msgid "failed to parse config (%s)\n"
msgstr "nem sikerült értelmezni a beállítási fájlt (%s)\n"
-#: src/pacman/pacman.c:522 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Célok:"
-#: src/pacman/pacman.c:528
+#: src/pacman/pacman.c:526
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "nem sikerült regisztrálni a 'local' adatbázist (%s)\n"
-#: src/pacman/pacman.c:535
+#: src/pacman/pacman.c:533
msgid "no targets specified (use -h for help)\n"
msgstr "nincs megadva egyetlen cél se (használja a '-h'-t segítségért)\n"
-#: src/pacman/pacman.c:548
+#: src/pacman/pacman.c:546
msgid "no operation specified (use -h for help)\n"
msgstr "nincs megadva egyetlen mûvelet se (használja a '-h'-t segítségért)\n"
@@ -713,7 +718,7 @@ msgstr "a %s fájlt a %s %s tartalmazza\n"
msgid "No package owns %s\n"
msgstr "Egyik csomag sem tartalmazza a következõt: %s\n"
-#: src/pacman/query.c:119 src/pacman/sync.c:409
+#: src/pacman/query.c:119 src/pacman/sync.c:453
msgid "no usable package repositories configured.\n"
msgstr "egyetlen használható csomag repó sincs beállítva.\n"
@@ -745,7 +750,7 @@ msgstr "nem sikerült betölteni a '%s' csomagot (%s)\n"
msgid "package \"%s\" not found\n"
msgstr "a \"%s\" csomag nem található\n"
-#: src/pacman/remove.c:58 src/pacman/sync.c:524
+#: src/pacman/remove.c:58 src/pacman/sync.c:568
#, c-format
msgid ":: group %s:\n"
msgstr ":: %s csoport:\n"
@@ -759,7 +764,7 @@ msgstr " Eltávolítja a teljes tartalmat? [I/n] "
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ":: Eltávolítja a %s-t a %s csoportból? [I/n] "
-#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
+#: src/pacman/remove.c:77 src/pacman/sync.c:480 src/pacman/sync.c:529
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr "nem sikerült inicializálni a tranzakciót (%s)\n"
@@ -782,82 +787,92 @@ msgstr ""
"\n"
"Kívánja eltávolítani ezeket a csomagokat? [I/n] "
-#: src/pacman/sync.c:113
+#: src/pacman/sync.c:115
msgid "Do you want to remove old packages from cache? [Y/n] "
msgstr "El kívánja távolítani a régi csomagokat a gyorsítótárból? [I/n] "
-#: src/pacman/sync.c:115
+#: src/pacman/sync.c:117
msgid "removing old packages from cache... "
msgstr "a régi csomagok eltávolítása a gyorsítótárból... "
-#: src/pacman/sync.c:118
+#: src/pacman/sync.c:120
msgid "could not access cache directory\n"
msgstr "nem sikerült elérni a gyorsítótár könyvtárát\n"
-#: src/pacman/sync.c:179
+#: src/pacman/sync.c:181
msgid "Do you want to remove all packages from cache? [Y/n] "
msgstr "El kíván távolítani minden csomagot a gyorsítótárból? [I/n] "
-#: src/pacman/sync.c:181
+#: src/pacman/sync.c:183
msgid "removing all packages from cache... "
msgstr "az összes csomag eltávolítása a gyorsítótárból... "
-#: src/pacman/sync.c:184
+#: src/pacman/sync.c:186
msgid "could not remove cache directory\n"
msgstr "nem sikerült törölni a gyorsítótár könyvtárát\n"
-#: src/pacman/sync.c:189
+#: src/pacman/sync.c:191
msgid "could not create new cache directory\n"
msgstr "nem sikerült létrehozni az új gyorsítótár könyvtárát\n"
-#: src/pacman/sync.c:216
+#: src/pacman/sync.c:218
#, fuzzy, c-format
msgid "failed to synchronize %s: %s\n"
msgstr "nem sikerült szinkronizálni a következõt: %s\n"
-#: src/pacman/sync.c:218
+#: src/pacman/sync.c:220
#, c-format
msgid "failed to update %s (%s)\n"
msgstr "nem sikerült frissíteni a következõt: %s (%s)\n"
-#: src/pacman/sync.c:221
+#: src/pacman/sync.c:223
#, c-format
msgid " %s is up to date\n"
msgstr " a %s naprakész\n"
-#: src/pacman/sync.c:337
-#, c-format
-msgid "package \"%s\" was not found.\n"
+#: src/pacman/sync.c:345
+#, fuzzy, c-format
+msgid "repository '%s' does not exist\n"
+msgstr "a \"%s\" repó nem található.\n"
+
+#: src/pacman/sync.c:361
+#, fuzzy, c-format
+msgid "package '%s' was not found in repository '%s'\n"
+msgstr "a \"%s\" csomag nem található.\n"
+
+#: src/pacman/sync.c:381
+#, fuzzy, c-format
+msgid "package '%s' was not found\n"
msgstr "a \"%s\" csomag nem található.\n"
-#: src/pacman/sync.c:374
+#: src/pacman/sync.c:418
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr "a \"%s\" repó nem található.\n"
-#: src/pacman/sync.c:446
+#: src/pacman/sync.c:490
msgid ":: Synchronizing package databases...\n"
msgstr ":: A csomagadatbázisok szinkronizálása...\n"
-#: src/pacman/sync.c:447
+#: src/pacman/sync.c:491
msgid "synchronizing package lists"
msgstr "a csomaglisták szinkronizálása"
-#: src/pacman/sync.c:449
+#: src/pacman/sync.c:493
#, fuzzy
msgid "failed to synchronize any databases"
msgstr "nem sikerült szinkronizálni a következõt: %s\n"
-#: src/pacman/sync.c:455
+#: src/pacman/sync.c:499
#, fuzzy
msgid ":: Starting full system upgrade...\n"
msgstr "teljes rendszerfrissítés indítása"
-#: src/pacman/sync.c:456
+#: src/pacman/sync.c:500
msgid "starting full system upgrade"
msgstr "teljes rendszerfrissítés indítása"
-#: src/pacman/sync.c:474
+#: src/pacman/sync.c:518
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -865,57 +880,57 @@ msgstr ""
"\n"
":: a pacman egy újabb verzióját észlelte a \"pacman\" csomagnak.\n"
-#: src/pacman/sync.c:475
+#: src/pacman/sync.c:519
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ":: Ajánlott, hogy engedje, hogy a pacman elõbb saját magát\n"
-#: src/pacman/sync.c:476
+#: src/pacman/sync.c:520
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ":: frissítse, majd újra futtathatja a mûveletet az újabb verzióval.\n"
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:522
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ":: Elõször csak a pacman frissítése? [I/n] "
-#: src/pacman/sync.c:493
+#: src/pacman/sync.c:537
#, fuzzy, c-format
msgid "pacman: %s\n"
msgstr "Egyik csomag sem tartalmazza a következõt: %s\n"
-#: src/pacman/sync.c:513
+#: src/pacman/sync.c:557
#, c-format
msgid "'%s': %s\n"
msgstr ""
-#: src/pacman/sync.c:528
+#: src/pacman/sync.c:572
msgid ":: Install whole content? [Y/n] "
msgstr ":: A teljes tartalom telepítése? [I/n] "
-#: src/pacman/sync.c:535
+#: src/pacman/sync.c:579
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ":: Telepíti a %s-t a %s csoportból? [I/n] "
-#: src/pacman/sync.c:559
+#: src/pacman/sync.c:603
#, fuzzy, c-format
msgid "'%s': not found in sync db\n"
msgstr ""
"nem sikerült hozzáadni a '%s' célt: nem található a távoli adatbázisban\n"
-#: src/pacman/sync.c:579
+#: src/pacman/sync.c:623
msgid "requires"
msgstr "igényli a következõt:"
-#: src/pacman/sync.c:579
+#: src/pacman/sync.c:623
msgid "is required by"
msgstr "igényli a"
-#: src/pacman/sync.c:621
+#: src/pacman/sync.c:665
#, fuzzy
-msgid "local database is up to date\n"
+msgid " local database is up to date\n"
msgstr " a %s naprakész\n"
-#: src/pacman/sync.c:630
+#: src/pacman/sync.c:674
msgid ""
"\n"
"Beginning download...\n"
@@ -923,11 +938,11 @@ msgstr ""
"\n"
"A letöltés megkezdése...\n"
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:678
msgid "Proceed with download? [Y/n] "
msgstr "Kezdõdhet a letöltés? [I/n] "
-#: src/pacman/sync.c:642
+#: src/pacman/sync.c:686
msgid ""
"\n"
"Beginning upgrade process...\n"
@@ -935,7 +950,7 @@ msgstr ""
"\n"
"A frissítési folyamat megkezdése...\n"
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:690
#, fuzzy
msgid "Proceed with installation? [Y/n] "
msgstr "Kezdõdhet a letöltés? [I/n] "
@@ -1043,19 +1058,19 @@ msgstr ":: %s-%s: a helyi verzió naprakész. Mégis frissíti? [I/n] "
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: A %s sérült. Kívánja törölni? [I/n] "
-#: src/pacman/trans.c:314
+#: src/pacman/trans.c:319
msgid "installing"
msgstr "telepítés:"
-#: src/pacman/trans.c:317
+#: src/pacman/trans.c:322
msgid "upgrading"
msgstr "frissítés:"
-#: src/pacman/trans.c:320
+#: src/pacman/trans.c:325
msgid "removing"
msgstr "eltávolíás:"
-#: src/pacman/trans.c:323
+#: src/pacman/trans.c:328
#, fuzzy
msgid "checking for file conflicts"
msgstr "fájlütközések vizsgálata... "
diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po
index 56cbaa5a..f75679d2 100644
--- a/src/pacman/po/it.po
+++ b/src/pacman/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pacman package manager 3.0.0\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-21 19:46+0100\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2007-02-21 20:00+0100\n"
"Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
"Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
@@ -150,11 +150,11 @@ msgstr "Y"
msgid "YES"
msgstr "SI"
-#: src/pacman/log.h:26
+#: src/pacman/log.h:28
msgid "error: "
msgstr "errore: "
-#: src/pacman/log.h:30
+#: src/pacman/log.h:32
msgid "warning: "
msgstr "attenzione: "
diff --git a/src/pacman/po/pt_BR.po b/src/pacman/po/pt_BR.po
index 8bbc76a1..3a9eaef7 100644
--- a/src/pacman/po/pt_BR.po
+++ b/src/pacman/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-02-15 09:24-0500\n"
+"POT-Creation-Date: 2007-02-22 11:13-0500\n"
"PO-Revision-Date: 2007-02-15 08:55-0200\n"
"Last-Translator: Lincoln de Sousa <lincoln@archlinux-br.org>\n"
"Language-Team: Português do Brasil <pt@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79
-#: src/pacman/sync.c:438 src/pacman/sync.c:487
+#: src/pacman/sync.c:482 src/pacman/sync.c:531
#, c-format
msgid ""
" if you're sure a package manager is not already running,\n"
@@ -40,14 +40,14 @@ msgstr "carregando informações do pacote... "
msgid "failed to add target '%s' (%s)"
msgstr "falha com o parametro'%s' (%s)"
-#: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:70
+#: src/pacman/add.c:85 src/pacman/sync.c:196 src/pacman/trans.c:70
#: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91
#: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131
#: src/pacman/trans.c:142
msgid "done.\n"
msgstr "concluído.\n"
-#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572
+#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:616
#, c-format
msgid "failed to prepare transaction (%s)\n"
msgstr "falha ao preparar transação (%s)\n"
@@ -57,22 +57,22 @@ msgstr "falha ao preparar transação (%s)\n"
msgid ":: %s: requires %s"
msgstr ":: %s: requer %s"
-#: src/pacman/add.c:118 src/pacman/sync.c:601
+#: src/pacman/add.c:118 src/pacman/sync.c:645
#, c-format
msgid ":: %s: conflicts with %s"
msgstr ":: %s: conflita com %s"
-#: src/pacman/add.c:127 src/pacman/sync.c:665
+#: src/pacman/add.c:127 src/pacman/sync.c:709
#, fuzzy, c-format
msgid "%s%s exists in both '%s' and '%s'\n"
msgstr "%s%s existe em \"%s\" (pacote) e em \"%s\" (pacote)\n"
-#: src/pacman/add.c:134 src/pacman/sync.c:672
+#: src/pacman/add.c:134 src/pacman/sync.c:716
#, c-format
msgid "%s: %s%s exists in filesystem\n"
msgstr "%s: %s%s existe no sistema de arquivos\n"
-#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685
+#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729
msgid ""
"\n"
"errors occurred, no packages were upgraded.\n"
@@ -80,18 +80,18 @@ msgstr ""
"\n"
"ocorreram alguns erros, portanto, nenhum pacote foi atualizado.\n"
-#: src/pacman/add.c:151 src/pacman/sync.c:608
+#: src/pacman/add.c:151 src/pacman/sync.c:652
#, c-format
msgid ":: %.1f MB required, have %.1f MB"
msgstr ":: %.1f MB requerido, possui %.1f MB"
-#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658
+#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702
#, c-format
msgid "failed to commit transaction (%s)\n"
msgstr "falha ao terminar a transação (%s)\n"
-#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480
-#: src/pacman/sync.c:701
+#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524
+#: src/pacman/sync.c:745
#, c-format
msgid "failed to release transaction (%s)\n"
msgstr "falha ao liberar a transação (%s)\n"
@@ -145,19 +145,19 @@ msgstr "aviso"
msgid "function"
msgstr "função"
-#: src/pacman/log.c:201
+#: src/pacman/log.c:205
msgid "Y"
msgstr "S"
-#: src/pacman/log.c:201
+#: src/pacman/log.c:205
msgid "YES"
msgstr "SIM"
-#: src/pacman/log.h:26
+#: src/pacman/log.h:28
msgid "error: "
msgstr "erro: "
-#: src/pacman/log.h:30
+#: src/pacman/log.h:32
msgid "warning: "
msgstr "aviso: "
@@ -298,31 +298,36 @@ msgid "SHA1 Sum : %s"
msgstr "Soma SHA1 : %s"
#: src/pacman/package.c:155
-#, c-format
-msgid "Backup Files :\n"
+#, fuzzy, c-format
+msgid "Backup Files:\n"
msgstr "Arquivos de Backup :\n"
-#: src/pacman/package.c:175
+#: src/pacman/package.c:177
#, c-format
msgid "error calculating checksums for %s\n"
msgstr "erro ao calcular as somas de verificação para %s\n"
-#: src/pacman/package.c:188
+#: src/pacman/package.c:190
#, c-format
msgid "MODIFIED\t%s\n"
msgstr "MODIFICADO\t%s\n"
-#: src/pacman/package.c:190
+#: src/pacman/package.c:192
#, c-format
msgid "Not Modified\t%s\n"
msgstr "Não modificado\t%s\n"
-#: src/pacman/package.c:195
+#: src/pacman/package.c:197
#, c-format
msgid "MISSING\t\t%s\n"
msgstr "NÃO ENCONTRADO\t\t%s\n"
-#: src/pacman/package.c:228
+#: src/pacman/package.c:203
+#, fuzzy, c-format
+msgid "(none)\n"
+msgstr "Nenhum\n"
+
+#: src/pacman/package.c:234
#, c-format
msgid "No changelog available for '%s'.\n"
msgstr "changelog não disponível para '%s'.\n"
@@ -526,9 +531,9 @@ msgid "usage: %s {-S --sync} [options] [package]\n"
msgstr "uso: %s {-S --sync} [opções] [pacote]\n"
#: src/pacman/pacman.c:137
-#, c-format
+#, fuzzy, c-format
msgid ""
-" -c, --clean remove old packages from cache directory (use -cc for "
+" -c, --clean remove old packages from cache directory (-cc for "
"all)\n"
msgstr ""
" -c, --clean remove pacotes antigos do diretório de cache (use -"
@@ -656,62 +661,62 @@ msgid " the terms of the GNU General Public License\n"
msgstr ""
" os termos da Licença GPL - General Public License\n"
-#: src/pacman/pacman.c:299
+#: src/pacman/pacman.c:298
#, c-format
msgid "'%s' is not a valid debug level"
msgstr "'%s' não é um nível de depuração válido"
-#: src/pacman/pacman.c:315
+#: src/pacman/pacman.c:313
#, c-format
msgid "'%s' is not a valid cache directory\n"
msgstr "'%s' não é um diretório de cache válido\n"
-#: src/pacman/pacman.c:341
+#: src/pacman/pacman.c:339
#, c-format
msgid "'%s' is not a valid db path\n"
msgstr "'%s' não é um caminho de base de dados válido\n"
-#: src/pacman/pacman.c:371
+#: src/pacman/pacman.c:369
#, c-format
msgid "'%s' is not a valid root path\n"
msgstr "'%s' não é uma caminho válido\n"
-#: src/pacman/pacman.c:398
+#: src/pacman/pacman.c:396
msgid "only one operation may be used at a time\n"
msgstr "só uma operação pode ser usada de cada vez\n"
-#: src/pacman/pacman.c:444
+#: src/pacman/pacman.c:442
msgid "warning: current locale is invalid; using default \"C\" locale"
msgstr ""
-#: src/pacman/pacman.c:463
+#: src/pacman/pacman.c:461
#, c-format
msgid "failed to initilize alpm library (%s)\n"
msgstr "falha ao iniciar biblioteca alpm (%s)\n"
-#: src/pacman/pacman.c:496
+#: src/pacman/pacman.c:494
msgid "you cannot perform this operation unless you are root.\n"
msgstr "você não pode realizar esta operação a menos que você seja root\n"
-#: src/pacman/pacman.c:512
+#: src/pacman/pacman.c:510
#, c-format
msgid "failed to parse config (%s)\n"
msgstr "falha ao interpretar configuração (%s)\n"
-#: src/pacman/pacman.c:522 src/pacman/remove.c:125 src/pacman/util.c:323
+#: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323
msgid "Targets:"
msgstr "Pacotes:"
-#: src/pacman/pacman.c:528
+#: src/pacman/pacman.c:526
#, c-format
msgid "could not register 'local' database (%s)\n"
msgstr "não foi possível registar a base de dados local (%s)\n"
-#: src/pacman/pacman.c:535
+#: src/pacman/pacman.c:533
msgid "no targets specified (use -h for help)\n"
msgstr "nenhum arquivo definido (use -h para obter ajuda)\n"
-#: src/pacman/pacman.c:548
+#: src/pacman/pacman.c:546
msgid "no operation specified (use -h for help)\n"
msgstr "nenhuma operação definida (use -h para obter ajuda)\n"
@@ -729,7 +734,7 @@ msgstr "%s pertence a %s %s\n"
msgid "No package owns %s\n"
msgstr "Nenhum pacote possui %s\n"
-#: src/pacman/query.c:119 src/pacman/sync.c:409
+#: src/pacman/query.c:119 src/pacman/sync.c:453
msgid "no usable package repositories configured.\n"
msgstr "nenhum repositório de pacotes configurado.\n"
@@ -760,7 +765,7 @@ msgstr "falha ao carregar o pacote '%s' (%s)\n"
msgid "package \"%s\" not found\n"
msgstr "pacote \"%s\" não encontrado\n"
-#: src/pacman/remove.c:58 src/pacman/sync.c:524
+#: src/pacman/remove.c:58 src/pacman/sync.c:568
#, c-format
msgid ":: group %s:\n"
msgstr ":: grupo %s:\n"
@@ -774,7 +779,7 @@ msgstr " Remover todo o conteúdo? [S/n] "
msgid ":: Remove %s from group %s? [Y/n] "
msgstr ":: Remover %s do grupo %s? [S/n] "
-#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485
+#: src/pacman/remove.c:77 src/pacman/sync.c:480 src/pacman/sync.c:529
#, c-format
msgid "failed to init transaction (%s)\n"
msgstr "falha ao iniciar transação (%s)\n"
@@ -797,80 +802,90 @@ msgstr ""
"\n"
"Você deseja remover estes pacotes? [S/n] "
-#: src/pacman/sync.c:113
+#: src/pacman/sync.c:115
msgid "Do you want to remove old packages from cache? [Y/n] "
msgstr "Deseja remover os pacotes antigos do cache? [S/n] "
-#: src/pacman/sync.c:115
+#: src/pacman/sync.c:117
msgid "removing old packages from cache... "
msgstr "removendo pacotes antigos do cache... "
-#: src/pacman/sync.c:118
+#: src/pacman/sync.c:120
msgid "could not access cache directory\n"
msgstr "não foi possível acessar o diretório de cache\n"
-#: src/pacman/sync.c:179
+#: src/pacman/sync.c:181
msgid "Do you want to remove all packages from cache? [Y/n] "
msgstr "Você deseja remover todos os pacotes do diretório de cache? [S/n] "
-#: src/pacman/sync.c:181
+#: src/pacman/sync.c:183
msgid "removing all packages from cache... "
msgstr "removendo todos os pacotes do diretório de cache... "
-#: src/pacman/sync.c:184
+#: src/pacman/sync.c:186
msgid "could not remove cache directory\n"
msgstr "não foi possível remover o diretório de cache\n"
-#: src/pacman/sync.c:189
+#: src/pacman/sync.c:191
msgid "could not create new cache directory\n"
msgstr "não foi possível criar o novo diretório de cache\n"
-#: src/pacman/sync.c:216
+#: src/pacman/sync.c:218
#, c-format
msgid "failed to synchronize %s: %s\n"
msgstr "falha ao sincronizar %s: %s\n"
-#: src/pacman/sync.c:218
+#: src/pacman/sync.c:220
#, c-format
msgid "failed to update %s (%s)\n"
msgstr "falha ao atualizar %s (%s)\n"
-#: src/pacman/sync.c:221
+#: src/pacman/sync.c:223
#, c-format
msgid " %s is up to date\n"
msgstr " %s está atualizado\n"
-#: src/pacman/sync.c:337
-#, c-format
-msgid "package \"%s\" was not found.\n"
+#: src/pacman/sync.c:345
+#, fuzzy, c-format
+msgid "repository '%s' does not exist\n"
+msgstr "repositório \"%s\" não foi encontrado.\n"
+
+#: src/pacman/sync.c:361
+#, fuzzy, c-format
+msgid "package '%s' was not found in repository '%s'\n"
+msgstr "pacote \"%s\" não encontrado.\n"
+
+#: src/pacman/sync.c:381
+#, fuzzy, c-format
+msgid "package '%s' was not found\n"
msgstr "pacote \"%s\" não encontrado.\n"
-#: src/pacman/sync.c:374
+#: src/pacman/sync.c:418
#, c-format
msgid "repository \"%s\" was not found.\n"
msgstr "repositório \"%s\" não foi encontrado.\n"
-#: src/pacman/sync.c:446
+#: src/pacman/sync.c:490
msgid ":: Synchronizing package databases...\n"
msgstr ":: Sincronizando a base de dados de pacotes...\n"
-#: src/pacman/sync.c:447
+#: src/pacman/sync.c:491
msgid "synchronizing package lists"
msgstr "sincronizando as listas de pacotes"
-#: src/pacman/sync.c:449
+#: src/pacman/sync.c:493
msgid "failed to synchronize any databases"
msgstr "falha ao sincronizar algumas bases de dados"
-#: src/pacman/sync.c:455
+#: src/pacman/sync.c:499
msgid ":: Starting full system upgrade...\n"
msgstr ":: Iniciando atualização do sistema...\n"
-#: src/pacman/sync.c:456
+#: src/pacman/sync.c:500
msgid "starting full system upgrade"
msgstr "iniciando atualização de todo o sistema"
-#: src/pacman/sync.c:474
+#: src/pacman/sync.c:518
msgid ""
"\n"
":: pacman has detected a newer version of the \"pacman\" package.\n"
@@ -878,57 +893,58 @@ msgstr ""
"\n"
":: pacman detectou uma nova versão do pacote \"pacman\".\n"
-#: src/pacman/sync.c:475
+#: src/pacman/sync.c:519
msgid ":: It is recommended that you allow pacman to upgrade itself\n"
msgstr ":: É recomendado que você permita que o pacman se atualize\n"
-#: src/pacman/sync.c:476
+#: src/pacman/sync.c:520
msgid ":: first, then you can re-run the operation with the newer version.\n"
msgstr ""
":: primeiro, em seguida você pode executar a operação novamente com a nova "
"versão.\n"
-#: src/pacman/sync.c:478
+#: src/pacman/sync.c:522
msgid ":: Upgrade pacman first? [Y/n] "
msgstr ":: Atualizar o pacman primeiro? [S/n] "
-#: src/pacman/sync.c:493
+#: src/pacman/sync.c:537
#, c-format
msgid "pacman: %s\n"
msgstr "pacman: %s\n"
-#: src/pacman/sync.c:513
+#: src/pacman/sync.c:557
#, c-format
msgid "'%s': %s\n"
msgstr "'%s': %s\n"
-#: src/pacman/sync.c:528
+#: src/pacman/sync.c:572
msgid ":: Install whole content? [Y/n] "
msgstr ":: Instalar todo o conteúdo? [S/n] "
-#: src/pacman/sync.c:535
+#: src/pacman/sync.c:579
#, c-format
msgid ":: Install %s from group %s? [Y/n] "
msgstr ":: Instalar %s do grupo %s? [S/n] "
-#: src/pacman/sync.c:559
+#: src/pacman/sync.c:603
#, c-format
msgid "'%s': not found in sync db\n"
msgstr "'%s': não foi encontrado na base de dados de pacotes\n"
-#: src/pacman/sync.c:579
+#: src/pacman/sync.c:623
msgid "requires"
msgstr "requer"
-#: src/pacman/sync.c:579
+#: src/pacman/sync.c:623
msgid "is required by"
msgstr "é requerido por"
-#: src/pacman/sync.c:621
-msgid "local database is up to date\n"
+#: src/pacman/sync.c:665
+#, fuzzy
+msgid " local database is up to date\n"
msgstr "Base de dados de pacotes está atualizada.\n"
-#: src/pacman/sync.c:630
+#: src/pacman/sync.c:674
msgid ""
"\n"
"Beginning download...\n"
@@ -936,11 +952,11 @@ msgstr ""
"\n"
"Iniciando download...\n"
-#: src/pacman/sync.c:634
+#: src/pacman/sync.c:678
msgid "Proceed with download? [Y/n] "
msgstr "Continuar o download? [S/n] "
-#: src/pacman/sync.c:642
+#: src/pacman/sync.c:686
msgid ""
"\n"
"Beginning upgrade process...\n"
@@ -948,7 +964,7 @@ msgstr ""
"\n"
"Iniciando processo de atualização...\n"
-#: src/pacman/sync.c:646
+#: src/pacman/sync.c:690
msgid "Proceed with installation? [Y/n] "
msgstr "Continuar a instalação? [S/n] "
@@ -1054,19 +1070,19 @@ msgstr ""
msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] "
msgstr ":: Arquivo %s está corrompido. Você gostaria de apagá-lo? [S/n] "
-#: src/pacman/trans.c:314
+#: src/pacman/trans.c:319
msgid "installing"
msgstr "instalando"
-#: src/pacman/trans.c:317
+#: src/pacman/trans.c:322
msgid "upgrading"
msgstr "atualizando"
-#: src/pacman/trans.c:320
+#: src/pacman/trans.c:325
msgid "removing"
msgstr "removendo"
-#: src/pacman/trans.c:323
+#: src/pacman/trans.c:328
msgid "checking for file conflicts"
msgstr "verificando conflitos de arquivo"