doc/PKGBUILD: document that functions run in -e mode

Caught this noted on the forums, but it is definitely worth a note in the
manpage as well.

Signed-off-by: Dan McGee <dan@archlinux.org>

HACKING

@@ -12,10 +12,10 @@ Coding style
 1.  All code should be indented with tabs. (Ignore the use of only spaces in
     this file) By default, source files contain the following VIM modeline:
 +
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 /* vim: set ts=2 sw=2 noet: */
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 2.  When opening new blocks such as 'while', 'if', or 'for', leave the opening
     brace on the same line as the beginning of the codeblock. The closing brace
@@ -24,8 +24,8 @@ Coding style
     braces, even if it's just a one-line block. This reduces future error when
     blocks are expanded beyond one line.
 +
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 for(lp = list; lp; lp = lp->next) {
   newlist = _alpm_list_add(newlist, strdup(lp->data));
 }
@@ -40,14 +40,14 @@ while(it) {
   free(it);
   it = ptr;
 }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 3.  When declaring a new function, put the opening and closing braces on their
     own line. Also, when declaring a pointer, do not put a space between the
     asterisk and the variable name.
 +
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
 {
   alpm_list_t *ptr, *lp;
@@ -58,7 +58,7 @@ alpm_list_t *alpm_list_add(alpm_list_t *list, void *data)
   }
   ...
 }
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 4.  Comments should be ANSI-C89 compliant. That means no `// Comment` style;
     use only `/* Comment */` style.
@@ -101,37 +101,37 @@ Currently our #include usage is in messy shape, but this is no reason to
 continue down this messy path. When adding an include to a file, follow this
 general pattern, including blank lines:
 
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 #include "config.h"
 
 #include <standardheader.h>
 #include <another.h>
 #include <...>
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 Follow this with some more headers, depending on whether the file is in libalpm
 or pacman proper. For libalpm:
 
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 /* libalpm */
 #include "yourfile.h"
 #include "alpm_list.h"
 #include "anythingelse.h"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 For pacman:
 
-[code,C]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[source,C]
+-------------------------------------------
 #include <alpm.h>
 #include <alpm_list.h>
 
 /* pacman */
 #include "yourfile.h"
 #include "anythingelse.h"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------------
 
 GDB and Valgrind Usage
 ~~~~~~~~~~~~~~~~~~~~~~

NEWS

@@ -1,5 +1,25 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.4.2         - fix progress bar display with empty packages
+              - make pactest testsuite Python 2.7 compatible
+              - documentation: remove unnecessary "|| return 1"
+              - contrib/bacman: update package compression selection
+              - contrib/PKGBUILD.vim: add a few more license options
+              - translations: es, kk, sv, pt, ru updated
+3.4.1         - fix interaction of --needed and multiple repo groups (FS#20221)
+              - bash completion: small fixes to prevent alias problems
+              - rankmirrors: fix bogus/empty variable assignment (FS#19911)
+              - repo-add: ensure bare DB symlinks are relative (FS#20498)
+              - repo-add: fallback to copy if symlink not permitted (FS#19907)
+              - makepkg:
+                - use absolute path to 'du' to exclude wrapper progs (FS#19932)
+                - ensure $startdir check doesn't stall indefinitely (FS#19975)
+                - fix repackaging with multiple passed packages (FS#20272)
+              - translations:
+                - zh_CN: fix crash when using during install (FS#20188)
+                - sk: new Slovak translation
+                - pt: new European Portuguese translation
+                - other small updates to various translations
 3.4.0         - new "Architecture" option that will restrict pacman to
                 installing only packages from the given architecture. Can be
                 set to "auto" in which case the output of "uname -m" is used

autoclean.sh

@@ -18,7 +18,7 @@ rm -f scripts/{Makefile.in,Makefile}
 rm -f etc/{Makefile.in,Makefile}
 rm -f etc/pacman.d/{Makefile.in,Makefile}
 rm -f etc/abs/{Makefile.in,Makefile}
-rm -f test/pacman{,/tests}/{Makefile.in,Makefile}
+rm -f test/{pacman,util}{,/tests}/{Makefile.in,Makefile}
 rm -f contrib/{Makefile.in,Makefile}
 rm -f doc/{Makefile.in,Makefile}
 

configure.ac

@@ -42,12 +42,12 @@ AC_PREREQ(2.60)
 #     pacman_version_micro += 1
 
 m4_define([lib_current], [5])
-m4_define([lib_revision], [0])
+m4_define([lib_revision], [2])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [4])
-m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_micro], [2])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 
@@ -100,8 +100,8 @@ AC_ARG_ENABLE(internal-download,
 
 # Help line for documentation
 AC_ARG_ENABLE(doc,
-	AS_HELP_STRING([--enable-doc], [run make in doc/ dir]),
-	[wantdoc=$enableval], [wantdoc=no])
+	AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]),
+	[wantdoc=$enableval], [wantdoc=yes])
 
 # Help line for doxygen
 AC_ARG_ENABLE(doxygen,
@@ -126,7 +126,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
-AC_CHECK_PROGS([PYTHON], [python2.6 python2.5 python], [false])
+AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false])
 
 # find installed gettext
 AM_GNU_GETTEXT([external])
@@ -210,6 +210,7 @@ esac
 
 AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
 AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
+AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] )
 AC_SUBST(SIZECMD)
 AC_SUBST(SEDINPLACE)
 AC_SUBST(STRIP_BINARIES)
@@ -272,7 +273,7 @@ if test "x$wantdoc" = "xyes" ; then
 	fi
 	wantdoc=yes
 else
-	AC_MSG_RESULT([no])
+	AC_MSG_RESULT([no, disabled by configure])
 	wantdoc=no
 fi
 AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes")

contrib/PKGBUILD.vim

@@ -61,10 +61,13 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl
 
 " license
 syn keyword pb_k_license license contained
-syn keyword pbLicense  APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PHP PSF PerlArtistic RALINK RUBY ZPL contained
+" echo $(pacman -Ql licenses | grep '/usr/share/licenses/common/' | cut -d'/' -f6 | sort -u)
+syn keyword pbLicense  APACHE CCPL CDDL CPL EPL FDL FDL1.2 FDL1.3 GPL GPL2 GPL3 LGPL LGPL2.1 LGPL3 LPPL MPL PerlArtistic PHP PSF RALINK RUBY ZPL contained
+" special cases from http://wiki.archlinux.org/index.php/Arch_Packaging_Standards
+syn keyword pbLicenseSpecial  BSD MIT ZLIB Python contained
 syn match pbLicenseCustom /custom\(:[[:alnum:]]*\)*/ contained
-syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense
-syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense
+syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicenseSpecial,pbLicense
+syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicenseSpecial,pbLicense,pbIllegalLicense
 
 " backup
 syn keyword pb_k_backup backup contained

contrib/bacman

@@ -87,7 +87,6 @@ fi
 
 pkg_arch=${CARCH:-'unknown'}
 pkg_dest="${PKGDEST:-$PWD}"
-pkg_ext=${PKGEXT:-'.pkg.tar.gz'}
 pkg_pkger=${PACKAGER:-'Unknown Packager'}
 
 pkg_name="$1"
@@ -164,13 +163,6 @@ fi
 
 pkg_size=$(du -sk | awk '{print $1 * 1024}')
 
-if [ -f "$pkg_dir/install" ] ; then
-    cp "$pkg_dir/install" "$work_dir/.INSTALL"
-fi
-if  [ -f $pkg_dir/changelog ] ; then
-    cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
-fi
-
 #
 # .PKGINFO stuff
 #
@@ -254,6 +246,17 @@ while read i; do
     esac
 done
 
+comp_files=".PKGINFO"
+
+if [ -f "$pkg_dir/install" ] ; then
+    cp "$pkg_dir/install" "$work_dir/.INSTALL"
+    comp_files+=" .INSTALL"
+fi
+if  [ -f $pkg_dir/changelog ] ; then
+    cp "$pkg_dir/changelog" "$work_dir/.CHANGELOG"
+    comp_files+=" .CHANGELOG"
+fi
+
 #
 # Fixes owner:group and permissions for .PKGINFO, .CHANGELOG, .INSTALL
 #
@@ -265,8 +268,31 @@ chmod 644 "$work_dir"/{.PKGINFO,.CHANGELOG,.INSTALL} 2> /dev/null
 #
 echo "Generating the package..."
 
+case "$PKGEXT" in
+	*tar.gz)  EXT=${PKGEXT%.gz} ;;
+	*tar.bz2) EXT=${PKGEXT%.bz2} ;;
+	*tar.xz)  EXT=${PKGEXT%.xz} ;;
+	*tar)     EXT=${PKGEXT} ;;
+	*) echo "WARNING: '%s' is not a valid archive extension." \
+	"$PKGEXT" ; EXT=$PKGEXT ;;
+esac
+
+pkg_file="$pkg_dest/$pkg_namver-$pkg_arch${PKGEXT}"
 ret=0
-bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$?
+
+# when fileglobbing, we want * in an empty directory to expand to
+# the null string rather than itself
+shopt -s nullglob
+# TODO: Maybe this can be set globally for robustness
+shopt -s -o pipefail
+bsdtar -cf - $comp_files * |
+case "$PKGEXT" in
+    *tar.gz)  gzip -c -f -n ;;
+    *tar.bz2) bzip2 -c -f ;;
+    *tar.xz)  xz -c -z - ;;
+    *tar)     cat ;;
+esac > ${pkg_file} || ret=$?
+
 if [ $ret -ne 0 ]; then
     echo "ERROR: unable to write package to $pkg_dest"
     echo "       Maybe the disk is full or you do not have write access"

contrib/bash_completion

@@ -52,10 +52,6 @@ _pacman_pkg() {
   )"
 }
 
-_pacman_file() {
-  compopt -o filenames; _filedir 'pkg.tar.*'
-}
-
 _pacman() {
   local common core cur database prev query remove sync upgrade o
   COMPREPLY=()
@@ -79,8 +75,8 @@ _pacman() {
 
   if [[ $? != 0 ]]; then
     _arch_ptr2comp core
-  elif ! [[ $prev =~ ^-\w*[Vbhr] ||
-    $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]]
+  elif [[ ! $prev =~ ^-\w*[Vbhr] &&
+    ! $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]]
   then
     [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common ||
       case ${o% *} in
@@ -102,7 +98,18 @@ _pacman() {
   true
 }
 
+if [[ $(type -t compopt) = "builtin" ]]; then
+  _pacman_file() {
+    compopt -o filenames; _filedir 'pkg.tar.*'
+  }
+  complete -F _pacman -o default pacman
+else
+  _pacman_file() {
+    _filedir 'pkg.tar.*'
+  }
+  complete -F _pacman -o filenames -o default pacman
+fi
+
 complete -F _makepkg -o default makepkg
-complete -F _pacman  -o default pacman
 
 # ex:et ts=2 sw=2 ft=sh

doc/.gitignore

@@ -10,3 +10,4 @@ repo-remove.8
 *.html
 *.xml
 man3
+website.tar.gz

doc/Makefile.am

@@ -80,6 +80,15 @@ endif
 
 html: $(HTML_DOCS)
 
+website: html
+	bsdtar czf website.tar.gz $(HTML_DOCS) \
+		-C /etc/asciidoc/stylesheets/ \
+		xhtml11.css xhtml11-manpage.css xhtml11-quirks.css \
+		-C /etc/asciidoc/javascripts/ \
+		asciidoc-xhtml11.js \
+		-C /etc/asciidoc/ \
+		images
+
 pkgdatadir = ${datadir}/${PACKAGE}
 
 ASCIIDOC_OPTS = \
@@ -100,16 +109,17 @@ $(ASCIIDOC_MANS): asciidoc.conf footer.txt
 	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
 
 %.html: %.txt
-	asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt
+	asciidoc $(ASCIIDOC_OPTS) $*.txt
 	dos2unix $@
 
 HACKING.html: ../HACKING
-	asciidoc $(ASCIIDOC_OPTS) -a linkcss -o $@ ../HACKING
+	asciidoc $(ASCIIDOC_OPTS) -o $@ ../HACKING
 	dos2unix $@
 
 # Customizations for certain HTML docs
 $(HTML_MANPAGES): asciidoc.conf footer.txt
 $(HTML_OTHER): asciidoc.conf
+%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons
 %.8.html: ASCIIDOC_OPTS += -d manpage
 %.5.html: ASCIIDOC_OPTS += -d manpage
 %.3.html: ASCIIDOC_OPTS += -d manpage

doc/PKGBUILD-example.txt

@@ -15,6 +15,6 @@ md5sums=('ee5ae84d115f051d87fcaaef3b4ae782')
 build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
-  make || return 1
+  make
   make prefix=$pkgdir/usr install
 }

doc/PKGBUILD.5.txt

@@ -38,18 +38,21 @@ This will prevent any possible name clashes with internal makepkg variables.
 For example, to store the base kernel version in a variable, use something
 similar to `$_basekernver`.
 
-*pkgname*::
+*pkgname (array)*::
 	The name of the package. This has be a unix-friendly name as it will be
-	used in the package filename.
+	used in the package filename. Members of the array are not allowed to start
+	with hyphens.
 
 *pkgver*::
 	The version of the software as released from the author (e.g. '2.7.1').
+	The variable is not allowed to contain hyphens.
 
 *pkgrel*::
 	This is the release number specific to the Arch Linux release. This
 	allows package maintainers to make updates to the package's configure
 	flags, for example. A pkgrel of 1 is typically used for each upstream
-	software release and is incremented for intermediate PKGBUILD updates.
+	software release and is incremented for intermediate PKGBUILD updates. The
+	variable is not allowed to contain hyphens.
 
 *pkgdesc*::
 	This should be a brief description of the package and its functionality.
@@ -232,9 +235,11 @@ name. The syntax is: `source=('filename::url')`.
 build() Function
 ----------------
 In addition to the above directives, the optional build() bash function usually
-comprises the remainder of the PKGBUILD. This is directly sourced and executed by
-makepkg, so anything that bash or the system has available is available for use
-here. Be sure any exotic commands used are covered by `makedepends`.
+comprises the remainder of the PKGBUILD. This is directly sourced and executed
+by makepkg, so anything that bash or the system has available is available for
+use here. The function is run in `bash -e` mode, meaning any command that exits
+with a non-zero status will cause the function to exit. Be sure any exotic
+commands used are covered by `makedepends`.
 
 All of the above variables such as `pkgname` and `pkgver` are available for use
 in the build function. In addition, makepkg defines three variables for your
@@ -258,31 +263,35 @@ the build function.
 
 package() Function
 ------------------
-An optional package() function can be specified in addition to the build() function.
-This function is run immediately after the build() function. When specified in
-combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot
-usage will be limited to running the packaging stage. An existing build() function
+An optional package() function can be specified in addition to the build()
+function. This function is run immediately after the build() function. The
+function is run in `bash -e` mode, meaning any command that exits with a
+non-zero status will cause the function to exit. When specified in combination
+with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage
+will be limited to running the packaging stage. An existing build() function
 will be run as the user calling makepkg.
 
 Package Splitting
 -----------------
-makepkg supports building multiple packages from a single PKGBUILD. This is achieved
-by assigning an array of package names to the `pkgname` directive. Each split package
-uses a corresponding packaging function with name `package_foo()`, where `foo` is the
-name of the split package.
+makepkg supports building multiple packages from a single PKGBUILD. This is
+achieved by assigning an array of package names to the `pkgname` directive.
+Each split package uses a corresponding packaging function with name
+`package_foo()`, where `foo` is the name of the split package.
 
-All options and directives for the split packages default to the global values given
-within the PKGBUILD. However, some of these can be overridden within each split
-package's packaging function. The following variables can be overridden: `pkgver`,
-`pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, `optdepends`,
-`provides`, `conflicts`, `replaces`, `backup`, `options`, `install` and `changelog`.
+All options and directives for the split packages default to the global values
+given within the PKGBUILD. However, some of these can be overridden within each
+split package's packaging function. The following variables can be overridden:
+`pkgver`, `pkgrel`, `pkgdesc`, `arch`, `license`, `groups`, `depends`,
+`optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`,
+`install` and `changelog`.
 
 An optional global directive is available when building a split package:
 
 *pkgbase*::
 	The name used to refer to the group of packages in the output of makepkg
 	and in the naming of source-only tarballs.  If not specified, the first
-	element in the `pkgname` array is used.
+	element in the `pkgname` array is used.  The variable is not allowed to
+	begin with a hyphen.
 
 Install/Upgrade/Remove Scripting
 --------------------------------

lib/libalpm/be_files.c

@@ -810,10 +810,11 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			}
 			fprintf(fp, "\n");
 		}
-		if(info->force) {
-			fprintf(fp, "%%FORCE%%\n\n");
-		}
 		if(local) {
+			if(info->force) {
+				fprintf(fp, "%%EPOCH%%\n"
+						"1\n\n");
+			}
 			if(info->url) {
 				fprintf(fp, "%%URL%%\n"
 								"%s\n\n", info->url);

lib/libalpm/be_package.c

@@ -75,6 +75,8 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
 				STRDUP(newpkg->version, ptr, RET_ERR(PM_ERR_MEMORY, -1));
 			} else if(!strcmp(key, "pkgdesc")) {
 				STRDUP(newpkg->desc, ptr, RET_ERR(PM_ERR_MEMORY, -1));
+			} else if(!strcmp(key, "force")) {
+				newpkg->force = 1;
 			} else if(!strcmp(key, "group")) {
 				newpkg->groups = alpm_list_add(newpkg->groups, strdup(ptr));
 			} else if(!strcmp(key, "url")) {

lib/libalpm/po/LINGUAS

@@ -11,9 +11,11 @@ it
 kk
 nb
 pl
+pt
 pt_BR
 ro
 ru
+sk
 sv
 tr
 uk

lib/libalpm/po/kk.po

@@ -52,7 +52,7 @@ msgstr "%s атын жаңа %s атына ауыстыру мүмкін еме
 
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s қазір %s деп сақталды\n"
+msgstr "%s қазір %s етіп сақталды\n"
 
 #, c-format
 msgid "could not install %s as %s (%s)\n"
@@ -108,7 +108,7 @@ msgstr "дерекқордағы '%s' жазбасының аты қате\n"
 
 #, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "деркқордағы '%s' жазбасы қайталанып жатыр\n"
+msgstr "деркқордағы '%s' жазбасы қайталанып тұр\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
@@ -208,7 +208,7 @@ msgstr "'%s' файлын  %s адресінен алу қатемен аяқт
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"
-msgstr "%s қысқартылады: %jd/%jd байт\n"
+msgstr "%s қысқартылған сияқты: %jd/%jd байт\n"
 
 #, c-format
 msgid "failed to download %s\n"
@@ -240,11 +240,11 @@ msgstr "аргумент қате не нөлдік болып тұр"
 
 #, c-format
 msgid "library not initialized"
-msgstr "library іске қосылмады"
+msgstr "жинақ іске қосылмады"
 
 #, c-format
 msgid "library already initialized"
-msgstr "library іске қосылған болып тұр"
+msgstr "жинақ іске қосылған болып тұр"
 
 #, c-format
 msgid "unable to lock database"
@@ -256,7 +256,7 @@ msgstr "дерекқорды ашу мүмкін емес"
 
 #, c-format
 msgid "could not create database"
-msgstr "дерекқорды құру мүмкін емес"
+msgstr "дерекқорды жасау мүмкін емес"
 
 #, c-format
 msgid "database not initialized"
@@ -396,7 +396,7 @@ msgstr "дерекқор ішінде %s табылмады --  өткізіп
 
 #, c-format
 msgid "removing %s from target list\n"
-msgstr "мақсаттар тізімінен '%s' өшіріру\n"
+msgstr "мақсаттар тізімінен '%s' өшіру\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
@@ -448,7 +448,7 @@ msgstr "дестенің нұсқасын төмендету %s (%s => %s)\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "шешілмейтін дестелер ерегісі табылды\n"
+msgstr "дестелердің шешілмейтін ерегісі табылды\n"
 
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
@@ -481,7 +481,7 @@ msgstr "уақытша файлды %s ішіне көшіру мүмкін ем
 
 #, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "tmpdir %s өшіру мүмкін емес\n"
+msgstr "%s уақытша бумасын өшіру мүмкін емес\n"
 
 #, c-format
 msgid "could not change directory to %s (%s)\n"
@@ -489,7 +489,7 @@ msgstr "%s бумасына ауысу мүмкін емес (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "жаңа үрдісті құру мүмкін емес (%s)\n"
+msgstr "жаңа үрдісті жасау мүмкін емес (%s)\n"
 
 #, c-format
 msgid "could not change the root directory (%s)\n"

lib/libalpm/po/pl.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2010-06-04 13:36-0500\n"
-"PO-Revision-Date: 2009-10-04 17:09+0200\n"
+"PO-Revision-Date: 2010-08-01 05:10+0100\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
@@ -96,9 +96,9 @@ msgstr "usuwanie niepoprawnej bazy danych: %s\n"
 msgid "could not open %s: %s\n"
 msgstr "nie udało się otworzyć %s: %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database directory %s\n"
-msgstr "nie udało się usunąć wpisu %s-%s z bazy danych\n"
+msgstr "nie udało się usunąć katalogu bazy danych %s\n"
 
 #, c-format
 msgid "could not remove database %s\n"
@@ -108,9 +108,9 @@ msgstr "nie można usunąć bazy danych %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "zepsuty wpis w bazie danych '%s'\n"
+msgstr "zduplikowany wpis '%s' w bazie danych\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
@@ -196,9 +196,9 @@ msgstr "url '%s' jest błędny\n"
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "resuming download of %s not possible; starting over\n"
-msgstr "nie można kontynuować pobieranie, zaczynanie od początku\n"
+msgstr "kontynuowanie pobieranie %s jest niemożliwe; zaczynam od nowa\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -340,13 +340,13 @@ msgstr "nie udało się usunąć wszystkich plików pakietu"
 msgid "package filename is not valid"
 msgstr "nazwa pakietu jest nieprawidłowa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "package architecture is not valid"
-msgstr "nazwa pakietu jest nieprawidłowa"
+msgstr "architektura pakietu jest nieprawidłowa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not find repository for target"
-msgstr "nie udało się znaleźć bądź odczytać pakietu"
+msgstr "nie mogę znaleźć repozytorium dla celu"
 
 #, c-format
 msgid "invalid or corrupted delta"
@@ -532,80 +532,3 @@ msgstr ""
 
 #~ msgid "replacing packages with -U is not supported yet\n"
 #~ msgstr "zastępowanie pakietów za pomocą -U nie jest już wspierane\n"
-
-# hmm
-#~ msgid "you can replace packages manually using -Rd and -U\n"
-#~ msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
-
-#~ msgid "url scheme not specified, assuming HTTP\n"
-#~ msgstr "schemat url nie został sprecyzowany, wybieranie HTTP\n"
-
-#~ msgid "cannot write to file '%s'\n"
-#~ msgstr "nie można zapisywać do pliku '%s'\n"
-
-#~ msgid "no such repository"
-#~ msgstr "nie ma takiego repozytorium"
-
-#~ msgid "repository '%s' not found\n"
-#~ msgstr "repozytorium '%s' nie zostało znalezione\n"
-
-#~ msgid "could not create removal transaction\n"
-#~ msgstr "nie udało się utworzyć tranzakcji usuwania\n"
-
-#~ msgid "could not create transaction\n"
-#~ msgstr "nie udało się stworzyć tranzakcji\n"
-
-#~ msgid "could not initialize the removal transaction\n"
-#~ msgstr "nie udało się zainicjować tranzakcji usuwania\n"
-
-#~ msgid "could not initialize transaction\n"
-#~ msgstr "nie udało się zainicjować tranzakcji\n"
-
-#~ msgid "could not prepare removal transaction\n"
-#~ msgstr "nie udało się przygotować tranzakcji usuwania\n"
-
-#~ msgid "error downloading '%s': %s\n"
-#~ msgstr "błąd podczas pobierania '%s': %s\n"
-
-#~ msgid "could not chdir to %s\n"
-#~ msgstr "nie udało się zmienić katalogu na / %s\n"
-
-#~ msgid "running XferCommand: fork failed!\n"
-#~ msgstr "uruchamianie XferCommand: klonowanie nieudane!\n"
-
-#~ msgid "could not commit transaction"
-#~ msgstr "nie udało się wykonać tranzakcji"
-
-#~ msgid "could not download all files"
-#~ msgstr "nie udało się pobrać wszystkich plików"
-
-#~ msgid "cannot load package data"
-#~ msgstr "nie udało się załadować danych pakietu"
-
-#~ msgid "package not installed or lesser version"
-#~ msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
-
-#~ msgid "group not found"
-#~ msgstr "grupa nie została odnaleziona"
-
-#~ msgid "user aborted the operation"
-#~ msgstr "użytkownik zaniechał operacji"
-
-#~ msgid "internal error"
-#~ msgstr "błąd wewnętrzny"
-
-#~ msgid "not confirmed"
-#~ msgstr "nie potwierdzono"
-
-#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-#~ msgstr ""
-#~ "%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)\n"
-
-#~ msgid "command: %s\n"
-#~ msgstr "komenda: %s\n"
-
-#~ msgid "could not prepare transaction\n"
-#~ msgstr "nie udało się przygotować tranzakcji\n"
-
-#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-#~ msgstr "Brak /bin/sh w środowisku,  przerywanie wykonywania skryptu\n"

lib/libalpm/po/pt.po

@@ -0,0 +1,615 @@
+# translation of pt_PT.po to European Portuguese
+# European Portuguese translations for Pacman package manager package.
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Gaspar Santos aka ArchGalileu <omeuviolino@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-08-31 18:25+0100\n"
+"Last-Translator: \n"
+"Language-Team: Gaspar Santos aka ArchGalileu <omeuviolino@gmail.com>\n"
+"Language: pt_PT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.1\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr ""
+"a substituir a versão antiga %s-%s por %s na lista de pacotes para "
+"actualizar\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr ""
+"a ignorar %s-%s por que uma versão mais nova %s está na lista de pacotes "
+"para actualizar\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"permissões do diretório diferem em %s\n"
+"sistema de ficheiros: %o  pacote: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "extracção: não sobrescrever diretório com o ficheiro %s\n"
+
+# ?
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "extracção: symlink %s não aponta para diretório\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "não foi possível extrair %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "não foi possível renomear %s para %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s salvo como %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "não foi possível instalar %s como %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s instalado como %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "a extrair %s como %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "não foi possível obter o diretório de trabalho actual\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "ocorreram erros durante a actualização de %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "ocorreram erros durante a instalação de %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "não foi possível actualizar a entrada na base de dados %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "não foi possível adicionar a entrada '%s' à cache\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "a remover banco de dados inválido: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "não foi possível abrir %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "não foi possível remover o diretório da base de dados %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "não foi possível remover a base de dados %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "nome inválido para a entrada na base de dados '%s'\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "entrada da base de dados duplicada '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "entrada da base de dados corrompida '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "não foi possível abrir o ficheiro %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "%s base de dados está inconsistente: nome no pacote %s não coincide\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr ""
+"%s base de dados está inconsistente: versão do pacote %s não coincide\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "não foi possível criar o diretório %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "não foi possível interpretar o ficheiro de descrição do pacote em %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "em falta o nome do pacote em %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "em falta a versão do pacote em %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "erro ao ler o pacote %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "em falta metadados do pacote em %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "localização da base de dados não definida\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "nova tentativa de registrar a base de dados 'local'\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "dependência cíclica detectada:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s será removido após a dependência %s\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s será instalado antes da dependência %s\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "a ignorar pacote %s-%s\n"
+
+# ?
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "foi selecionado o pacote que fornece (%s fornece %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disco"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url '%s' é inválida\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "falha ao obter ficheiro '%s' de %s : %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "não foi possível retomar a descarga de %s; a reiniciar a descarga\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "erro ao escrever no ficheiro '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "falha ao obter o ficheiro '%s' de %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s parece estar quebrado: %jd/%jd bytes\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "falha ao fazer a descarga de %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "memória cheia!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "erro inesperado do sistema"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "privilégios insuficientes"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "não foi possível encontrar ou ler o ficheiro"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "não foi possível encontrar ou ler o diretório"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "argumento comunicado está errado ou NULO"
+
+#, c-format
+msgid "library not initialized"
+msgstr "biblioteca não inicializada"
+
+#, c-format
+msgid "library already initialized"
+msgstr "biblioteca já inicializada"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "não foi possível bloquear a base de dados"
+
+#, c-format
+msgid "could not open database"
+msgstr "não foi possível abrir a base de dados"
+
+#, c-format
+msgid "could not create database"
+msgstr "não foi possível criar a base de dados"
+
+#, c-format
+msgid "database not initialized"
+msgstr "base de dados não inicializada"
+
+#, c-format
+msgid "database already registered"
+msgstr "base de dados já registrada"
+
+#, c-format
+msgid "could not find database"
+msgstr "não foi possível encontrar a base de dados"
+
+#, c-format
+msgid "could not update database"
+msgstr "não foi possível actualizar a base de dados"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "não foi possível remover a entrada da base de dados"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "url inválida para o servidor"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "nenhum servidor configurado para o repositório"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "operação já inicializada"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "operação não inicializada"
+
+#, c-format
+msgid "duplicate target"
+msgstr "objecto alvo duplicado"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "operação não está pronta"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "operação abortada"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "actividade não compatível com o tipo de operação"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "tentativa de aceitar a operação com a base de dados não bloqueada"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "não foi possível ler ou escrever o pacote"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operação cancelada devido a ignorepkg"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "pacote inválido ou corrompido"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "não foi possível abrir o ficheiro do pacote"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "não foi possível remover todos os ficheiros do pacote"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "o nome do pacote não é válido"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "a arquitectura do pacote não é válida"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "não foi possível encontrar o repositório para o pacote"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "delta inválido ou corrompido"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "patch do delta falhou"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "não foi possível cumprir as dependências"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "dependências em conflito"
+
+#, c-format
+msgid "conflicting files"
+msgstr "ficheiros em conflito"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "falha ao descarregar alguns ficheiros"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "expressão regular inválida"
+
+#, c-format
+msgid "libarchive error"
+msgstr "erro na libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "erro na biblioteca de descargas"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "erro ao invocar o programa de descargas externo"
+
+#, c-format
+msgid "unexpected error"
+msgstr "erro inesperado"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "não foi possível encontrar %s na base de dados - a ignorar\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "a remover \"%s\" da lista de pacotes a serem actualizados\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "não foi possível remover o ficheiro '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "não foi possível remover a entrada da base de dados %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "não foi possível remover a entrada '%s' da cache\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: a ignorar actualização do pacote (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: a ignorar downgrade do pacote (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: a voltar da versão %s para a versão %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: local (%s) é mais recente que %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "a ignorar substituição do pacote (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "não foi possível substituir %s por %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s está actualizado -- a ignorar\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s está actualizado -- a reinstalar\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "a fazer downgrade do pacote %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "detectado conflito entre pacotes sem solução\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "a remover '%s' da lista de pacotes porque entra em conflito com '%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "falha ao obter alguns ficheiros de %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "não foi possível efectuar a operação de remoção\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "não foi possível efectuar a operação\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "não foi possível remover o ficheiro bloqueado %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "não foi possível criar diretório temporário\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "não foi possível copiar ficheiro temporário para %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "não foi possível remover o diretório temporário %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "não foi possível mudar o diretório para %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "não foi possível fazer fork de um novo processo (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "não foi possível mudar o diretório raiz (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "não foi possível mudar o diretório para / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "chamada para popen falhou (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "chamada para waitpid falhou (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "comando não executado corretamente\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "cache %s não existe, a criar...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr ""
+"não foi possível criar cache de pacotes, a usar /tmp como alternativa\n"
+
+#~ msgid "conflicting packages were found in target list\n"
+#~ msgstr ""
+#~ "pacotes conflitantes foram encontrados na lista de pacotes a serem "
+#~ "atualizados\n"
+
+#~ msgid "you cannot install two conflicting packages at the same time\n"
+#~ msgstr "você não pode instalar dois pacotes conflitantes ao mesmo tempo\n"
+
+#~ msgid "replacing packages with -U is not supported yet\n"
+#~ msgstr "substituir pacotes com -U ainda não é suportado\n"
+
+#~ msgid "you can replace packages manually using -Rd and -U\n"
+#~ msgstr ""
+#~ "você pode substituir pacotes manualmente usando as opções -Rd e -U\n"
+
+#~ msgid "url scheme not specified, assuming HTTP\n"
+#~ msgstr "esquema da url não especificado, assumindo HTTP\n"
+
+#~ msgid "cannot write to file '%s'\n"
+#~ msgstr "não foi possível escrever no arquivo '%s'\n"
+
+#~ msgid "no such repository"
+#~ msgstr "repositório não existe"
+
+#~ msgid "repository '%s' not found\n"
+#~ msgstr "repositório '%s' não encontrado\n"
+
+#~ msgid "could not create removal transaction\n"
+#~ msgstr "não foi possível criar transação de remoção\n"
+
+#~ msgid "could not create transaction\n"
+#~ msgstr "não foi possível criar a transação\n"
+
+#~ msgid "could not initialize the removal transaction\n"
+#~ msgstr "não foi possível inicializar a transação de remoção\n"
+
+#~ msgid "could not initialize transaction\n"
+#~ msgstr "não foi possível inicializar a transação\n"
+
+#~ msgid "could not prepare removal transaction\n"
+#~ msgstr "não foi possível preparar a transação de remoção\n"
+
+#~ msgid "error downloading '%s': %s\n"
+#~ msgstr "erro no download de '%s': %s\n"
+
+#~ msgid "could not chdir to %s\n"
+#~ msgstr "não foi possível mudar para o diretório %s\n"
+
+#~ msgid "running XferCommand: fork failed!\n"
+#~ msgstr "rodando XferCommand: fork falhou!\n"
+
+#~ msgid "could not commit transaction"
+#~ msgstr "não foi possível realizar transação"
+
+#~ msgid "could not download all files"
+#~ msgstr "não foi possível fazer o download de todos os arquivos"
+
+#~ msgid "cannot load package data"
+#~ msgstr "não foi possível carregar dados do pacote"
+
+#~ msgid "package not installed or lesser version"
+#~ msgstr "pacote não instalado ou versão inferior"
+
+#~ msgid "group not found"
+#~ msgstr "grupo não encontrado"
+
+#~ msgid "user aborted the operation"
+#~ msgstr "usuário abortou a operação"
+
+#~ msgid "internal error"
+#~ msgstr "erro interno"
+
+#~ msgid "not confirmed"
+#~ msgstr "não confirmado"
+
+#~ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+#~ msgstr ""
+#~ "%s-%s: ignorando atualização do pacote (a ser substituido por %s-%s)\n"
+
+#~ msgid "command: %s\n"
+#~ msgstr "comando: %s\n"
+
+#~ msgid "could not prepare transaction\n"
+#~ msgstr "não foi possível preparar a transação\n"
+
+#~ msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+#~ msgstr "/bin/sh não encontrado no diretório pai, abortando scriptlet\n"

lib/libalpm/po/sk.po

@@ -0,0 +1,518 @@
+# translation of sk.po to Slovak
+# Copyright (C) 2010 Pacman Development Team <pacman-dev@archlinux.org>
+# This file is distributed under the same license as the pacman package manager package.
+# Jose Riha <jose1711 gmail com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.3.1\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2010-06-04 13:36-0500\n"
+"PO-Revision-Date: 2010-07-27 22:56+0200\n"
+"Last-Translator: Jozef Říha <jose1711@gmail.com>\n"
+"Language-Team: Slovak\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "v zozname cieľov nahradená staršia verzia %s-%s za %s\n"
+
+#, c-format
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "vynechávam %s-%s, pretože v zozname cieľov je novšia verzia %s\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"prístupové práva adresára %s sa nezhodujú\n"
+"súborový systém: %o  balíček: %o\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "rozbalenie: adresár nebol prepísaný súborom %s\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "rozbalenie: symbolický odkaz %s neodkazuje na adresár\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "nie je možné rozbaliť %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s to %s (%s)\n"
+msgstr "nie je možné premenovať %s na %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s bol uložený ako %s\n"
+
+#, c-format
+msgid "could not install %s as %s (%s)\n"
+msgstr "%s nie je možné nainštalovať ako %s (%s)\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s bol nainštalovaný ako %s\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "%s bol rozbalený ako %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "nie je možné zistiť aktuálny pracovný adresár\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "nastal problém pri aktualizácii %s\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "nastal problém pri inštalácii %s\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "nie je možné aktualizovať záznam databáze %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "nie je možné pridať položku '%s' do cache\n"
+
+#, c-format
+msgid "removing invalid database: %s\n"
+msgstr "odstraňujem neplatnú databázu: %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "nepodarilo sa otvoriť %s: %s\n"
+
+#, c-format
+msgid "could not remove database directory %s\n"
+msgstr "nie je možné odstrániť adresár databáze %s\n"
+
+#, c-format
+msgid "could not remove database %s\n"
+msgstr "nie je možné odstrániť záznam v databáze %s\n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "neplatná názov záznamu v databáze '%s'\n"
+
+#, c-format
+msgid "duplicated database entry '%s'\n"
+msgstr "duplicitný záznam v databáze '%s'\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "poškodený záznam v databáze '%s'\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "nie je možné otvoriť súbor %s: %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "databáza %s je nekonzistentná: nesúhlasí meno balíčka %s\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "databáza %s je nekonzistentná: nesúhlasí verzia balíčka %s\n"
+
+#, c-format
+msgid "could not create directory %s: %s\n"
+msgstr "nie je možné vytvoriť adresár %s: %s\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "nie je možné spracovať súbor s popisom balíčka v %s\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "chýba meno balíčka v %s\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "chýba verzia balíčka v %s\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "chyba pri čítaní balíčka %s: %s\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "chýbaju metadáta balíčka v %s\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "cesta k databáze nie je definovaná\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "pokus o opätovné zaregistrovanie databáze 'local'\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "zistená cyklická závislosť:\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s bude odstránený po %s, na ktorom závisí\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s bude nainštalovaný pred %s, na ktorom závisí\n"
+
+#, c-format
+msgid "ignoring package %s-%s\n"
+msgstr "ignorujem balíček %s-%s\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "bol vybraný nahradzujúci balíček (%s poskytuje %s)\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "nie je možné vyriešiť \"%s\", závislosť \"%s\"\n"
+
+#, c-format
+msgid "disk"
+msgstr "disk"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "URL '%s' je neplatná\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "chyba pri získavaní súboru '%s' z %s: %s\n"
+
+#, c-format
+msgid "resuming download of %s not possible; starting over\n"
+msgstr "nie je možné pokračovať v sťahovaní %s, začínam sťahovať od začiatku\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "chyba pri zápisu do súboru '%s': %s\n"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s\n"
+msgstr "zlyhalo získanie súboru '%s' z %s\n"
+
+#, c-format
+msgid "%s appears to be truncated: %jd/%jd bytes\n"
+msgstr "%s vyzerá byť skrátený:  %jd/%jd bytov\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "chyba pri sťahovaní %s\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "nedostatok pamäte!"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "neočakávaná systémová chyba"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "nedostatočné oprávnenia"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "nie je možné nájsť alebo prečítať súbor"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "nie je možné nájsť alebo prečítať adresár"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "odovzdaný chybný alebo NULL argument"
+
+#, c-format
+msgid "library not initialized"
+msgstr "knižnica nebola inicializovaná"
+
+#, c-format
+msgid "library already initialized"
+msgstr "knižnica je už inicializovaná"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "nie je možné zamknúť databázu"
+
+#, c-format
+msgid "could not open database"
+msgstr "nie je možné otvoriť databázu"
+
+#, c-format
+msgid "could not create database"
+msgstr "nie je možné vytvoriť databázu"
+
+#, c-format
+msgid "database not initialized"
+msgstr "databáza nebola inicializovaná"
+
+#, c-format
+msgid "database already registered"
+msgstr "databáza je už zaregistrovaná"
+
+#, c-format
+msgid "could not find database"
+msgstr "nemožno nájsť databázu"
+
+#, c-format
+msgid "could not update database"
+msgstr "nemožno aktualizovať databázu"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "nie je možné odstrániť záznam v databáze"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "neplatná URL pre server"
+
+#, c-format
+msgid "no servers configured for repository"
+msgstr "pre repozitár nie sú nastavené žiadne servery"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "transakcia už bola inicializovaná"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "transakcia nebola inicializovaná"
+
+#, c-format
+msgid "duplicate target"
+msgstr "duplicitný cieľ"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "transakcia nie je pripravená"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "transakcia bola zrušená"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "operácia nie je kompatibilná s typom transakcie"
+
+#, c-format
+msgid "transaction commit attempt when database is not locked"
+msgstr "pokus o uskutočnenie transakcie v čas, kedy nie je databáza uzamknutá"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "nie je možné nájsť alebo prečítať balíček"
+
+#, c-format
+msgid "operation cancelled due to ignorepkg"
+msgstr "operácia bola zrušená kvôli ignorovanému balíčku"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "neplatný alebo poškodený balíček"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "nie je možné otvoriť súbor balíčka"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "nie je možné odstrániť všetky súbory balíčka"
+
+#, c-format
+msgid "package filename is not valid"
+msgstr "méno súboru balíčka je neplatné"
+
+#, c-format
+msgid "package architecture is not valid"
+msgstr "architektúra balíčka je neplatná"
+
+#, c-format
+msgid "could not find repository for target"
+msgstr "nie je možné nájsť repozitár cieľa"
+
+#, c-format
+msgid "invalid or corrupted delta"
+msgstr "neplatný alebo poškodený delta rozdiel"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "aplikácia delta rozdielu zlyhala"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "nie je možné vyriešiť závislosti"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "konfliktné závislosti"
+
+#, c-format
+msgid "conflicting files"
+msgstr "konfliktné súbory"
+
+#, c-format
+msgid "failed to retrieve some files"
+msgstr "chyba pri získavaní niektorých súborov"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "neplatný regulárny výraz"
+
+#, c-format
+msgid "libarchive error"
+msgstr "chyba knižnice libarchive"
+
+#, c-format
+msgid "download library error"
+msgstr "chyba knižnice pre sťahovanie súborov"
+
+#, c-format
+msgid "error invoking external downloader"
+msgstr "chyba volania externého programu pre sťahovanie súborov"
+
+#, c-format
+msgid "unexpected error"
+msgstr "neočakávaná chyba"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "nie je možné nájsť %s v databáze -- preskakujem\n"
+
+#, c-format
+msgid "removing %s from target list\n"
+msgstr "'%s' odstránený zo zoznamu cieľov\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "nie je možné odstrániť súbor '%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "nie je možné odstrániť záznam databáze %s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "nie je možné odstrániť položku '%s' z cache\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s: ignorujem aktualizáciu balíčka (%s => %s)\n"
+
+#, c-format
+msgid "%s: ignoring package downgrade (%s => %s)\n"
+msgstr "%s: ignorujem downgrade balíčka (%s => %s)\n"
+
+#, c-format
+msgid "%s: downgrading from version %s to version %s\n"
+msgstr "%s: downgradujem z verzie %s na verziu %s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s: lokálna verzia (%s) je novšia ako %s (%s)\n"
+
+#, c-format
+msgid "ignoring package replacement (%s-%s => %s-%s)\n"
+msgstr "ignorujem náhradu balíčku (%s-%s => %s-%s)\n"
+
+#, c-format
+msgid "cannot replace %s by %s\n"
+msgstr "nedá sa nahradiť súbor %s súborom %s\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s je aktuálny -- preskakujem\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s je aktuálny -- preinštalovávam\n"
+
+#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr "downgradujem balíček %s (%s => %s)\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "zistený konflikt nerozlíšiteľných balíčkov\n"
+
+#, c-format
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "'%s' odstránený zo zoznamu cieľov, pretože je v konflikte s '%s'\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "chyba pri získavaní niektorých súborov z %s\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "nie je možné uskutočniť transakciu pre odstránenie\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "nie je možné uskutočniť transakciu\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "nie je možné odstrániť zamykací súbor %s\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "nie je možné vytvoriť dočasný adresár\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "nie je možné skopírovať dočasný súbor do %s (%s)\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "nie je možné odstrániť dočasný adresár %s\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "nie je možné prepnúť sa do adresára %s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "nie je možné spustiť nový proces (%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "nie je možné zmeniť koreňový adresár (%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "nie je možné prepnúť sa do adresára / (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)\n"
+msgstr "volanie popen skončilo s chybou (%s)\n"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "volanie waitpid zlyhalo (%s)\n"
+
+#, c-format
+msgid "command failed to execute correctly\n"
+msgstr "príkaz sa nepodarilo spustiť správne\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "neexistuje cache %s, vytváram...\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "nie je možné vytvoriť cache balíčkov, použijem /tmp\n"

lib/libalpm/po/sv.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2010-06-04 13:36-0500\n"
-"PO-Revision-Date: 2009-10-06 21:10+0200\n"
-"Last-Translator: Christian Larsson <congacx@gmail.com>\n"
+"PO-Revision-Date: 2010-09-03 13:00+0200\n"
+"Last-Translator: Tobias Eriksson <tobier@tobier.se>\n"
 "Language-Team: Swedish\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -92,9 +92,9 @@ msgstr "tar bort ogiltig databas: %s\n"
 msgid "could not open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database directory %s\n"
-msgstr "kunde inte ta bort databasinlägget %s-%s\n"
+msgstr "kunde inte ta bort databaskatalogen %s\n"
 
 #, c-format
 msgid "could not remove database %s\n"
@@ -104,9 +104,9 @@ msgstr "kunde inte ta bort databasen %s\n"
 msgid "invalid name for database entry '%s'\n"
 msgstr "ogiltigt namn för databasinlägget '%s'\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "duplicated database entry '%s'\n"
-msgstr "korrupt databasinlägg '%s'\n"
+msgstr "dubblerat databasinlägg '%s'\n"
 
 #, c-format
 msgid "corrupted database entry '%s'\n"
@@ -192,9 +192,9 @@ msgstr "url '%s' är ogiltigt\n"
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "misslyckades hämta filen '%s' från %s : %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "resuming download of %s not possible; starting over\n"
-msgstr "kan inte återuppta nerladdning, börjar om\n"
+msgstr "kan inte återuppta nerladdning av %s, börjar om\n"
 
 #, c-format
 msgid "error writing to file '%s': %s\n"
@@ -336,13 +336,13 @@ msgstr "kan inte ta bort alla filer för paketet"
 msgid "package filename is not valid"
 msgstr "paketnamn är inte giltigt"
 
-#, fuzzy, c-format
+#, c-format
 msgid "package architecture is not valid"
-msgstr "paketnamn är inte giltigt"
+msgstr "paketets arkitektur är inte giltigt"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not find repository for target"
-msgstr "kunde inte hitta eller förbereda paket"
+msgstr "givet förråd finns inte"
 
 #, c-format
 msgid "invalid or corrupted delta"

lib/libalpm/remove.c

@@ -414,6 +414,10 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
 			alpm_list_t *newfiles;
 			_alpm_log(PM_LOG_DEBUG, "removing %d files\n", filenum);
 
+			/* init progress bar */
+			PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 0,
+					pkg_count, (pkg_count - targcount + 1));
+
 			/* iterate through the list backwards, unlinking files */
 			newfiles = alpm_list_reverse(files);
 			for(lp = newfiles; lp; lp = alpm_list_next(lp)) {

lib/libalpm/sync.c

@@ -202,7 +202,7 @@ int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade)
 	return(0);
 }
 
-int _alpm_sync_pkg(pmpkg_t *spkg)
+static int sync_pkg(pmpkg_t *spkg, alpm_list_t *pkg_list)
 {
 	pmtrans_t *trans;
 	pmdb_t *db_local;
@@ -213,7 +213,7 @@ int _alpm_sync_pkg(pmpkg_t *spkg)
 	trans = handle->trans;
 	db_local = handle->db_local;
 
-	if(_alpm_pkg_find(trans->add, alpm_pkg_get_name(spkg))) {
+	if(_alpm_pkg_find(pkg_list, alpm_pkg_get_name(spkg))) {
 		RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
 	}
 
@@ -248,9 +248,10 @@ int _alpm_sync_pkg(pmpkg_t *spkg)
 	return(0);
 }
 
-int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
+static int sync_target(alpm_list_t *dbs_sync, char *target)
 {
 	alpm_list_t *i, *j;
+	alpm_list_t *known_pkgs = NULL;
 	pmpkg_t *spkg;
 	pmdepend_t *dep; /* provisions and dependencies are also allowed */
 	pmgrp_t *grp;
@@ -267,7 +268,7 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
 	_alpm_dep_free(dep);
 
 	if(spkg != NULL) {
-		return(_alpm_sync_pkg(spkg));
+		return(sync_pkg(spkg, handle->trans->add));
 	}
 
 	_alpm_log(PM_LOG_DEBUG, "%s package not found, searching for group...\n", target);
@@ -278,20 +279,27 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
 			found = 1;
 			for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
 				pmpkg_t *pkg = j->data;
-				if(_alpm_sync_pkg(pkg) == -1) {
+				if(sync_pkg(pkg, known_pkgs) == -1) {
 					if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) {
 						/* just skip duplicate or ignored targets */
 						continue;
 					} else {
+						alpm_list_free(known_pkgs);
 						return(-1);
 					}
 				}
+				known_pkgs = alpm_list_add(known_pkgs, pkg);
 			}
 		}
 	}
+	alpm_list_free(known_pkgs);
 
 	if(!found) {
-		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+		/* pass through any 'found but ignored' errors */
+		if(pm_errno != PM_ERR_PKG_IGNORED) {
+			pm_errno = PM_ERR_PKG_NOT_FOUND;
+		}
+		return(-1);
 	}
 
 	return(0);
@@ -325,7 +333,9 @@ int SYMEXPORT alpm_sync_dbtarget(char *dbname, char *target)
 	if(dbs == NULL) {
 		RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1);
 	}
-	return(_alpm_sync_target(dbs, target));
+	int ret = sync_target(dbs, target);
+	alpm_list_free(dbs);
+	return(ret);
 }
 
 /** Add a sync target to the transaction.
@@ -342,7 +352,7 @@ int SYMEXPORT alpm_sync_target(char *target)
 	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
 	dbs_sync = handle->dbs_sync;
 
-	return(_alpm_sync_target(dbs_sync,target));
+	return(sync_target(dbs_sync,target));
 }
 
 /** Compute the size of the files that will be downloaded to install a

lib/libalpm/trans.c

@@ -107,7 +107,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs)
 	for(i = pkgs; i; i = i->next) {
 		pmpkg_t *pkg = i->data;
 		const char *pkgarch = alpm_pkg_get_arch(pkg);
-		if(strcmp(pkgarch,arch) && strcmp(pkgarch,"any")) {
+		if(pkgarch && strcmp(pkgarch, arch) && strcmp(pkgarch, "any")) {
 			char *string;
 			const char *pkgname = alpm_pkg_get_name(pkg);
 			const char *pkgver = alpm_pkg_get_version(pkg);

po/LINGUAS

@@ -11,9 +11,11 @@ it
 kk
 nb
 pl
+pt
 pt_BR
 ro
 ru
+sk
 sv
 tr
 uk

po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-12 19:15+0200\n"
 "Last-Translator: Manuel Tortosa <manutortosa@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -880,10 +880,6 @@ msgstr "ha fallat en sincronitzar algunes bases de dades\n"
 msgid "installed"
 msgstr "instal·lat"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "el repositori «%s» no existeix\n"
@@ -1802,13 +1798,6 @@ msgstr "No queda cap paquet, s'està creant una base de dades buida."
 msgid "No packages modified, nothing to do."
 msgstr "No s'ha modificat cap paquet, res a fer."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     imprimeix URI pels paquets donats i les seves "
-#~ "dependències\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "no s'ha trobat %s, s'està cercant per grup..\n"
 

po/cs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-05 13:37+0200\n"
 "Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -851,10 +851,6 @@ msgstr "selhala synchronizace databáze\n"
 msgid "installed"
 msgstr "nainstalovaný"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "repositář '%s' neexistuje\n"
@@ -1736,12 +1732,6 @@ msgstr "Nezůstaly žádné balíčky, vytváří se prázdná databáze."
 msgid "No packages modified, nothing to do."
 msgstr "Nebyl změněn žádný balíček, není co dělat."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     vypsat URI požadovaného balíčku a jeho závislostí\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "balíček %s nebyl nalezen, hledá se skupina...\n"
 

po/de.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.4\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
-"PO-Revision-Date: 2010-06-07 21:20+0100\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
+"PO-Revision-Date: 2010-09-02 11:29+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "Language: de\n"
@@ -881,10 +881,6 @@ msgstr "Konnte keinerlei Datenbanken synchronisieren\n"
 msgid "installed"
 msgstr "Installiert"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "Das Repositorium '%s' existiert nicht.\n"
@@ -983,11 +979,11 @@ msgstr "Pakete (%d):"
 
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
-msgstr "Gesamtgröße der heruntergeladenen Pakete: %.2f MB\n"
+msgstr "Gesamtgröße des Downloads: %.2f MB\n"
 
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
-msgstr "Gesamtgröße der installierten Pakete: %.2f MB\n"
+msgstr "Gesamtgröße der zu installierenden Pakete: %.2f MB\n"
 
 #, c-format
 msgid "Remove (%d):"

po/el.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-09 23:02+0300\n"
 "Last-Translator: Χρήστος Νούσκας (Christos Nouskas) <nous@archlinux.us>\n"
 "Language-Team: Greek <>\n"
@@ -865,10 +865,6 @@ msgstr "αποτυχία συγχρονισμού βάσεων\n"
 msgid "installed"
 msgstr "εγκατεστημένο"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "ανύπαρκτη αποθήκη '%s'\n"
@@ -1763,13 +1759,6 @@ msgstr "Δεν απομένουν άλλα πακέτα, δημιουργία κ
 msgid "No packages modified, nothing to do."
 msgstr "Ουδέν πακέτο τροποποιήθηκε, πέρας εκτέλεσης."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     εμφάνιση των URIs των δοθέντων πακέτων και των "
-#~ "εξαρτήσεών τους\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "το %s δεν βρέθηκε, αναζήτηση ομάδας...\n"
 

po/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-07 20:14-0600\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -847,10 +847,6 @@ msgstr "failed to synchronise any databases\n"
 msgid "installed"
 msgstr "installed"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "repository '%s' does not exist\n"

po/es.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-13 10:51-0400\n"
 "Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
 "Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
@@ -118,7 +118,7 @@ msgstr ""
 
 #, c-format
 msgid ":: File %s is corrupted. Do you want to delete it?"
-msgstr ":: El Archivo %s está corrupto. ¿Desea borrarlo?"
+msgstr ":: El archivo %s está dañado. ¿Desea borrarlo?"
 
 #, c-format
 msgid "installing"
@@ -138,7 +138,7 @@ msgstr "verificando conflictos entre archivos"
 
 #, c-format
 msgid "downloading %s...\n"
-msgstr "Descargando %s...\n"
+msgstr "descargando %s...\n"
 
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
@@ -158,11 +158,11 @@ msgstr "Desconocido"
 
 #, c-format
 msgid "Name           :"
-msgstr "Nombre           :"
+msgstr "Nombre            :"
 
 #, c-format
 msgid "Version        :"
-msgstr "Versión        :"
+msgstr "Versión           :"
 
 #, c-format
 msgid "URL            :"
@@ -170,7 +170,7 @@ msgstr "URL               :"
 
 #, c-format
 msgid "Licenses       :"
-msgstr "Licencias      :"
+msgstr "Licencias         :"
 
 #, c-format
 msgid "Groups         :"
@@ -182,11 +182,11 @@ msgstr "Provee            :"
 
 #, c-format
 msgid "Depends On     :"
-msgstr "Depende De        :"
+msgstr "Depende de        :"
 
 #, c-format
 msgid "Optional Deps  :"
-msgstr "Dependencias Opcionales  :"
+msgstr "Dep. opcionales   :"
 
 #, c-format
 msgid "Required By    :"
@@ -198,15 +198,15 @@ msgstr "Conflictos con    :"
 
 #, c-format
 msgid "Replaces       :"
-msgstr "Reemplaza     :"
+msgstr "Reemplaza         :"
 
 #, c-format
 msgid "Download Size  : %6.2f K\n"
-msgstr "Tamaño de la descarga  : %6.2f K\n"
+msgstr "Tamaño de descarga: %6.2f K\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Tamaño Comprimido  : %6.2f K\n"
+msgstr "Tamaño comprimido : %6.2f K\n"
 
 #, c-format
 msgid "Installed Size : %6.2f K\n"
@@ -218,27 +218,27 @@ msgstr "Empaquetador      :"
 
 #, c-format
 msgid "Architecture   :"
-msgstr "Arquitectura   :"
+msgstr "Arquitectura      :"
 
 #, c-format
 msgid "Build Date     :"
-msgstr "Fecha de compilación :"
+msgstr "Fecha compilación :"
 
 #, c-format
 msgid "Install Date   :"
-msgstr "Fecha de instalación :"
+msgstr "Fecha instalación :"
 
 #, c-format
 msgid "Install Reason :"
-msgstr "Motivo de la instalación :"
+msgstr "Motivo instalación:"
 
 #, c-format
 msgid "Install Script :"
-msgstr "Script de instalación:"
+msgstr "Script instalación:"
 
 #, c-format
 msgid "Yes"
-msgstr "Si"
+msgstr "Sí"
 
 #, c-format
 msgid "No"
@@ -246,15 +246,15 @@ msgstr "No"
 
 #, c-format
 msgid "MD5 Sum        :"
-msgstr "Hash MD5     :"
+msgstr "Hash MD5          :"
 
 #, c-format
 msgid "Description    :"
-msgstr "Descripción    :"
+msgstr "Descripción       :"
 
 #, c-format
 msgid "Repository     :"
-msgstr "Repositorio    :"
+msgstr "Repositorio       :"
 
 #, c-format
 msgid "Backup Files:\n"
@@ -270,7 +270,7 @@ msgstr "MODIFICADO\t%s\n"
 
 #, c-format
 msgid "Not Modified\t%s\n"
-msgstr "No Modificado\t%s\n"
+msgstr "No modificado\t%s\n"
 
 #, c-format
 msgid "MISSING\t\t%s\n"
@@ -905,10 +905,6 @@ msgstr "falló al sincronizar cualquier base de datos\n"
 msgid "installed"
 msgstr "instalado"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "el repositorio '%s' no existe\n"
@@ -1818,13 +1814,6 @@ msgstr "No quedan paquetes, creando una base de datos vacía."
 msgid "No packages modified, nothing to do."
 msgstr "No se modificaron paquetes, nada que hacer."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     muestra las URIs (nombres de paquete) para los "
-#~ "archivos indicados y sus dependencias\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s no encontrado, buscando el grupo...\n"
 

po/fr.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-06 20:47+0200\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
@@ -336,8 +336,8 @@ msgstr "  -d, --nodeps             ne vérifie pas les dépendances\n"
 msgid ""
 "  -k, --dbonly         only remove database entries, do not remove files\n"
 msgstr ""
-"  -k, --dbonly             supprime l'entrée dans la base de données, "
-"pas les fichiers du paquet\n"
+"  -k, --dbonly             supprime l'entrée dans la base de données, pas "
+"les fichiers du paquet\n"
 
 #, c-format
 msgid "  -n, --nosave         remove configuration files as well\n"
@@ -387,15 +387,16 @@ msgstr "      --asexplicit         installe les paquets explicitement\n"
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr ""
-"  -f, --force              force l'installation, en écrasant les fichiers déjà présents\n"
+"  -f, --force              force l'installation, en écrasant les fichiers "
+"déjà présents\n"
 
 #, c-format
 msgid ""
 "  -k, --dbonly         add database entries, do not install or keep existing "
 "files\n"
 msgstr ""
-"  -k, --dbonly             ajoute uniquement les entrées dans la base de données, "
-"n'installe pas de fichiers\n"
+"  -k, --dbonly             ajoute uniquement les entrées dans la base de "
+"données, n'installe pas de fichiers\n"
 
 # pour être cohérent
 #, c-format
@@ -558,12 +559,12 @@ msgstr ""
 
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps             marque les paquets comme dépendances\n"
+msgstr "      --asdeps             marque les paquets comme dépendances\n"
 
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr "      --asexplicit         marque les paquets comme explicitement installés\n"
+msgstr ""
+"      --asexplicit         marque les paquets comme explicitement installés\n"
 
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
@@ -615,8 +616,7 @@ msgstr "      --cachedir <dir>     définit le dossier de cache\n"
 
 #, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr ""
-"      --arch <arch>        spécifie une architecture\n"
+msgstr "      --arch <arch>        spécifie une architecture\n"
 
 #, c-format
 msgid ""
@@ -660,8 +660,7 @@ msgstr "exécution de XferCommand: le fork a échoué !\n"
 
 #, c-format
 msgid "directive '%s' without value not recognized\n"
-msgstr ""
-"l'instruction '%s' sans valeur n'est pas reconnue\n"
+msgstr "l'instruction '%s' sans valeur n'est pas reconnue\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -669,15 +668,15 @@ msgstr "valeur invalide pour 'CleanMethod' : '%s'\n"
 
 #, c-format
 msgid "directive '%s' with a value not recognized\n"
-msgstr ""
-"l'instruction '%s' avec une valeur n'est pas reconnue\n"
+msgstr "l'instruction '%s' avec une valeur n'est pas reconnue\n"
 
 #, c-format
 msgid ""
 "The mirror '%s' contains the $arch variable, but no Architecture is "
 "defined.\n"
 msgstr ""
-"Le miroir '%s' contient la variable $arch, mais aucune Architecture n'est définie.\n"
+"Le miroir '%s' contient la variable $arch, mais aucune Architecture n'est "
+"définie.\n"
 
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
@@ -711,19 +710,21 @@ msgstr ""
 #, c-format
 msgid "config file %s, line %d: directive %s needs a value\n"
 msgstr ""
-"fichier de configuration %s, ligne %d: l'instruction '%s' doit avoir une valeur\n"
+"fichier de configuration %s, ligne %d: l'instruction '%s' doit avoir une "
+"valeur\n"
 
 #, c-format
 msgid "config file %s, line %d: problem in options section\n"
-msgstr "fichier de configuration %s, ligne %d: problème dans la section options.\n"
+msgstr ""
+"fichier de configuration %s, ligne %d: problème dans la section options.\n"
 
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in repository section '%s' not "
 "recognized.\n"
 msgstr ""
-"fichier de configuration %s, ligne %d: l'instruction '%s' dans la section du dépôt '%s' n'est pas "
-"reconnue\n"
+"fichier de configuration %s, ligne %d: l'instruction '%s' dans la section du "
+"dépôt '%s' n'est pas reconnue\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -902,10 +903,6 @@ msgstr "la synchronisation a échoué\n"
 msgid "installed"
 msgstr "installé"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "le dépôt '%s' n'a pas été trouvé\n"
@@ -1188,7 +1185,8 @@ msgstr "Compression des man/info pages..."
 
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr ""
-"Strip des symboles de débogage inutiles dans les binaires et les bibliothèques..."
+"Strip des symboles de débogage inutiles dans les binaires et les "
+"bibliothèques..."
 
 msgid "Removing libtool .la files..."
 msgstr "Suppression des fichiers libtool .la..."
@@ -1349,14 +1347,14 @@ msgstr "  -d, --nodeps     Ne vérifie pas les dépendances"
 
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
-"  -e, --noextract  Ne pas extraire les sources (utilisation du dossier src/ existant)"
+"  -e, --noextract  Ne pas extraire les sources (utilisation du dossier src/ "
+"existant)"
 
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      Ecrase le paquet existant"
 
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg   Générer les sommes d'intégrité des sources"
+msgstr "  -g, --geninteg   Générer les sommes d'intégrité des sources"
 
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       Cette aide"
@@ -1392,7 +1390,8 @@ msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
-"  --allsource      Génère une archive source incluant les sources téléchargées"
+"  --allsource      Génère une archive source incluant les sources "
+"téléchargées"
 
 msgid "  --asroot         Allow makepkg to run as root user"
 msgstr "  --asroot         Autorise makepkg à s'exécuter en root"
@@ -1410,7 +1409,9 @@ msgstr ""
 "PKGBUILDs de développement."
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
-msgstr "  --pkg <list>     Compile seulement les paquets listés pour un paquet splitté"
+msgstr ""
+"  --pkg <list>     Compile seulement les paquets listés pour un paquet "
+"splitté"
 
 msgid "  --skipinteg      Do not fail when integrity checks are missing"
 msgstr ""

po/hu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2009-10-04 20:38+0200\n"
 "Last-Translator: Avramucz Péter <muczyjoe@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -858,10 +858,6 @@ msgstr "nem sikerült szinkronizálni egyik adatbázist sem\n"
 msgid "installed"
 msgstr "telepítve"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "hiba: a(z) '%s' repó nem létezik\n"

po/it.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.4.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-05 18:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -880,10 +880,6 @@ msgstr "impossibile sincronizzare i database\n"
 msgid "installed"
 msgstr "installato"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "il repository '%s' non esiste\n"

po/kk.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-07 09:59+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh\n"
@@ -101,12 +101,13 @@ msgid ""
 "Do you want to skip the above package(s) for this upgrade?"
 msgstr ""
 "\n"
-"Осы жаңарту үшін жоғарыдағы дестелереді аттап өтеміз бе?"
+"Осы жаңарту үшін жоғарыдағы дестелерді аттап өтеміз бе?"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
 msgstr ""
-":: %s-%s: орнатылған нұсқасы жаңа болып тұр. Сонда да жаңартуды қалайсыз ба?"
+":: %s-%s: орнатылған нұсқасы жаңалау болып тұр. Сонда да жаңартуды қалайсыз "
+"ба?"
 
 #, c-format
 msgid ":: File %s is corrupted. Do you want to delete it?"
@@ -198,7 +199,7 @@ msgstr "Жүктелетін көлем      : %6.2f Kб\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Архив көлемі          : %6.2f Kб\n"
+msgstr "Сығылған көлемі       : %6.2f Kб\n"
 
 #, c-format
 msgid "Installed Size : %6.2f K\n"
@@ -254,7 +255,7 @@ msgstr "Резервті файлдар      :\n"
 
 #, c-format
 msgid "could not calculate checksums for %s\n"
-msgstr "%s үшін бақылау сомаларын есептеу мүмкін емес\n"
+msgstr "%s үшін тексеру сомаларын есептеу мүмкін емес\n"
 
 #, c-format
 msgid "MODIFIED\t%s\n"
@@ -419,7 +420,7 @@ msgstr "  -k, --check          дестеге қатысты файлдарды
 
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
-msgstr "  -l, --list           сұранған дестенің құрамасын тізіп шығару\n"
+msgstr "  -l, --list           сұралған дестенің құрамасын тізіп шығару\n"
 
 #, c-format
 msgid ""
@@ -443,7 +444,7 @@ msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search <regex> көрсетілген жолды жергілікті орнатылған дестелер "
+"  -s, --search <regex> көрсетілген мәтінді жергілікті орнатылған дестелер "
 "ішінен іздеу\n"
 
 #, c-format
@@ -554,7 +555,7 @@ msgstr ""
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr "      --noscriptlet    орнату скриптер бар болса, оларды орындамау\n"
+msgstr "      --noscriptlet    орнату скриптері бар болса, оларды орындамау\n"
 
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
@@ -688,7 +689,7 @@ msgstr "alpm жинағын іске қосу мүмкін емес (%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "Бір әрекетті жасай алмайсыз, өйткені сіз әкімші емессіз (root).\n"
+msgstr "Бұл әрекетті жасай алмайсыз, өйткені сіз әкімші емессіз (root).\n"
 
 #, c-format
 msgid "could not register 'local' database (%s)\n"
@@ -732,7 +733,7 @@ msgstr "\"%s\" тобы табылмады\n"
 
 #, c-format
 msgid "root path too long\n"
-msgstr "түбірлік жол тым ұзын\n"
+msgstr "түбірлік жолы тым ұзын\n"
 
 #, c-format
 msgid "file path too long\n"
@@ -740,7 +741,7 @@ msgstr "файл жолы тым ұзын\n"
 
 #, c-format
 msgid "%s: %d total files, %d missing file(s)\n"
-msgstr "%s: %d барлық файлдар, %d файл жоқ\n"
+msgstr "%s: барлығы %d файл, %d файл жоқ\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -836,7 +837,7 @@ msgstr "кэш ішінен барлық файлдар өшірілуде...\n"
 
 #, c-format
 msgid "could not access cache directory %s\n"
-msgstr "%s кэш бумасына жету мүмкін емес\n"
+msgstr "%s кэш бумасына қатынау мүмкін емес\n"
 
 #, c-format
 msgid "File %s does not seem to be a valid package, remove it?"
@@ -858,17 +859,13 @@ msgstr "бірде-бір дерекқорды синхрондау мүмкін
 msgid "installed"
 msgstr "орнатылған"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "'%s' репозиторийі жоқ болып тұр\n"
 
 #, c-format
 msgid "package '%s' was not found in repository '%s'\n"
-msgstr "'%s' дестесі '%s' репозиторий ішінен табылмады\n"
+msgstr "'%s' дестесі '%s' репозиторийден табылмады\n"
 
 #, c-format
 msgid "package '%s' was not found\n"
@@ -892,7 +889,7 @@ msgstr ":: %s және %s өзара ерегіседі\n"
 
 #, c-format
 msgid ":: %s and %s are in conflict (%s)\n"
-msgstr ":: %s and %s өзара ерегіседі (%s)\n"
+msgstr ":: %s және %s өзара ерегіседі (%s)\n"
 
 #, c-format
 msgid "Proceed with download?"
@@ -904,7 +901,7 @@ msgstr "Орнатуды бастау керек пе?"
 
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
-msgstr "%s қазір '%s' пен '%s' құрамында бар\n"
+msgstr "%s қазір '%s' және '%s' құрамында бар\n"
 
 #, c-format
 msgid "%s: %s exists in filesystem\n"
@@ -948,7 +945,7 @@ msgstr ""
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
-msgstr "әрекетті жалғастыру қатемен аяқталды (%s)\n"
+msgstr "әрекетті босату сәтсіз (%s)\n"
 
 #, c-format
 msgid "None"
@@ -1040,7 +1037,7 @@ msgid "Cleaning up..."
 msgstr "Тазарту... "
 
 msgid "Unable to find source file %s."
-msgstr "Бастапқы кодалар %s файлын табу мүмкін емес."
+msgstr "Бастапқы кодтар %s файлын табу мүмкін емес."
 
 msgid "Aborting..."
 msgstr "Үзу..."
@@ -1049,7 +1046,7 @@ msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "URL %s өңдеу үшін агент орнатылмады. %s тексеріңіз."
 
 msgid "The download program %s is not installed."
-msgstr "%s жүктемелер бағдарламасы орнатылмаған."
+msgstr "%s жүктеу бағдарламасы орнатылмаған."
 
 msgid "'%s' returned a fatal error (%i): %s"
 msgstr "'%s' қатаң қатені қайтарды (%i): %s"
@@ -1061,22 +1058,22 @@ msgid "'%s' failed to install missing dependencies."
 msgstr "'%s' керек тәуелділіктерді орната алмады."
 
 msgid "Failed to install all missing dependencies."
-msgstr "Барлық тәуелділіктерін орнату мүмкін емес."
+msgstr "Барлық тәуелділіктерді орнату қатемен аяқталды."
 
 msgid "Missing Dependencies:"
 msgstr "Керек тәуелділіктер:"
 
 msgid "Failed to remove installed dependencies."
-msgstr "Барлық орнатылған тәуелділіктерді өшіру мүмкін емес."
+msgstr "Барлық орнатылған тәуелділіктерді өшіру қатемен аяқталды."
 
 msgid "Retrieving Sources..."
-msgstr "Бастапқы кодалар файлдарын алу..."
+msgstr "Бастапқы кодтар файлдарын алу..."
 
 msgid "Found %s"
 msgstr "Табылды %s"
 
 msgid "%s was not found in the build directory and is not a URL."
-msgstr "Жасалу бумасында %s табылмады және ол URL емес."
+msgstr "Жасалу бумасында %s табылмады және ол сілтеме емес."
 
 msgid "Downloading %s..."
 msgstr "%s жүктелуде..."
@@ -1085,7 +1082,7 @@ msgid "Failure while downloading %s"
 msgstr "%s жүктелуі қатемен аяқталды"
 
 msgid "Generating checksums for source files..."
-msgstr "Бастапқы кодалар файлдарының бақылау сомалары есептелуде..."
+msgstr "Бастапқы кодтар файлдарының тексеру сомалары есептелуде..."
 
 msgid "Cannot find openssl."
 msgstr "openssl табылмады."
@@ -1094,7 +1091,7 @@ msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Қате '%s' алгоритмі көрсетілген."
 
 msgid "Validating source files with %s..."
-msgstr "%s көмегімен бастапқы кодалар файлдарын тексеру..."
+msgstr "%s көмегімен бастапқы кодтар файлдарын тексеру..."
 
 msgid "NOT FOUND"
 msgstr "ТАБЫЛМАДЫ"
@@ -1116,7 +1113,7 @@ msgid "Integrity checks are missing."
 msgstr "Бүтіндігін тексеру жоқ болып тұр."
 
 msgid "Extracting Sources..."
-msgstr "Бастапқы кодаларын тарқату..."
+msgstr "Бастапқы код файлдарын тарқату..."
 
 msgid "Extracting %s with %s"
 msgstr "%s тарқатылуда %s көмегімен"
@@ -1125,7 +1122,7 @@ msgid "Failed to extract %s"
 msgstr "%s тарқату мүмкін емес"
 
 msgid "Starting %s()..."
-msgstr "%s() қосылуда..."
+msgstr "%s() іске қосылуда..."
 
 msgid "Tidying install..."
 msgstr "Тазарту..."
@@ -1141,7 +1138,7 @@ msgstr "man мен info парақтарын сығу..."
 
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr ""
-"Орындалатын файлдардан мен жинақтардан керек емес таңбаларды алып тастау..."
+"Орындалатын файлдар мен жинақтардан керек емес таңбаларды алып тастау..."
 
 msgid "Removing libtool .la files..."
 msgstr "libtool .la файлдарын өшіру..."
@@ -1150,7 +1147,7 @@ msgid "Removing empty directories..."
 msgstr "Бос бумаларды өшіру..."
 
 msgid "Generating .PKGINFO file..."
-msgstr ".PKGINFO файлын құру..."
+msgstr ".PKGINFO файлын жасау..."
 
 msgid "Please add a license line to your %s!"
 msgstr "Өзініңіздің %s ішіне лицензия жолын қосыңыз!"
@@ -1168,7 +1165,7 @@ msgid "Missing pkg/ directory."
 msgstr "pkg/ бумасы жоқ болып тұр."
 
 msgid "Creating package..."
-msgstr "Дестені құру... "
+msgstr "Дестені жасау... "
 
 msgid "Adding install script..."
 msgstr "Орнату скрипті қосылуда..."
@@ -1180,10 +1177,10 @@ msgid "Compressing package..."
 msgstr "Десте сығылуда... "
 
 msgid "'%s' is not a valid archive extension."
-msgstr "'%s' архивтің дұрыс кеңейтуі емес."
+msgstr "'%s' - архивтің дұрыс кеңейтуі емес."
 
 msgid "Failed to create package file."
-msgstr "Десте файлын құру сәтсіз аяқталды."
+msgstr "Десте файлын жасау сәтсіз аяқталды."
 
 msgid "Failed to create symlink to package file."
 msgstr "Десте файлына сілтеме жасау сәтсіз аяқталды."
@@ -1192,7 +1189,7 @@ msgid "Skipping integrity checks."
 msgstr "Бүтіндікті тексеруді аттап кету."
 
 msgid "Creating source package..."
-msgstr "Бастапқы кодалар дестесі құрылуда..."
+msgstr "Бастапқы кодтар дестесі жасалуда..."
 
 msgid "Adding %s..."
 msgstr "%s қосылуда... "
@@ -1201,10 +1198,10 @@ msgid "Adding %s file (%s)..."
 msgstr "%s файлы қосылуда (%s)..."
 
 msgid "Compressing source package..."
-msgstr "Бастапқы кодалар дестесі сығылуда..."
+msgstr "Бастапқы кодтар дестесі сығылуда..."
 
 msgid "Failed to create source package file."
-msgstr "Бастапқы кодалар десте файлын құру сәтсіз аяқталды.."
+msgstr "Бастапқы кодтар десте файлын жасау сәтсіз аяқталды.."
 
 msgid "Installing package %s with %s -U..."
 msgstr "%s дестесі %s -U көмегімен орнатылуда..."
@@ -1289,7 +1286,7 @@ msgid "Options:"
 msgstr "Опциялар:"
 
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
-msgstr "  -А --ignorearch %s ішіндегі толық емес arch жолын елемеу"
+msgstr "  -А --ignorearch  %s ішіндегі толық емес arch жолын елемеу"
 
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Жасаудан кейін қалған керек емес файлдарды өшіру"
@@ -1314,13 +1311,13 @@ msgstr ""
 "дайындау"
 
 msgid "  -h, --help       This help"
-msgstr "  -h, --help       Осы көмек ақпараты"
+msgstr "  -h, --help       Осы көмек ақпаратын шығару"
 
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Сәтті жинаудан кейін дестені орнату"
 
 msgid "  -L, --log        Log package build process"
-msgstr "  -L, --log        Жинау үрдісін лог файлға жазу"
+msgstr "  -L, --log        Жинау үрдісін лог файлына жазу"
 
 msgid "  -m, --nocolor    Disable colorized output messages"
 msgstr "  -m, --nocolor    Түрлі-түсті хабарламаларды сөндіру"
@@ -1329,7 +1326,7 @@ msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Файлдарды тек жүктеп алу мен тарқату"
 
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr "  -p <file> Жинау үшін басқа скриптті қолдану ('%s' орнына)"
+msgstr "  -p <file>         Жинау үшін басқа скриптті қолдану ('%s' орнына)"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
@@ -1347,33 +1344,33 @@ msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
-"  --source     Бастапқы кодалар бар, жүктеліп алынған файлдармен қоса, "
-"архивті құру"
+"  --allsource         Бастапқы кодтары бар, жүктеліп алынған файлдармен "
+"қоса, архивті жасау"
 
 msgid "  --asroot         Allow makepkg to run as root user"
-msgstr "  --asroot     makepkg үшін root атынан қосылуға рұқсат беру"
+msgstr "  --asroot         makepkg үшін root атынан қосылуға рұқсат беру"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr "  --config <file> Басқа баптаулар файлын қолдану ('%s' орнына)"
+msgstr "  --config <file>  Басқа баптаулар файлын қолдану ('%s' орнына)"
 
 msgid ""
 "  --holdver        Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
-"  --holdver    Өндірістегі PKGBUILD-тар үшін автоматты нұсқалардың өзгеруін "
-"болдырмау"
+"  --holdver        Өндірістегі PKGBUILD-тар үшін автоматты нұсқалардың "
+"өзгеруін болдырмау"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <тізім>    Бөлінетін дестеден тек тізілген дестелерді жинау"
 
 msgid "  --skipinteg      Do not fail when integrity checks are missing"
-msgstr "  --skipinteg  Бүтіндікке тексеру жоқ болған кезде құлап түспеу"
+msgstr "  --skipinteg      Бүтіндікке тексеру жоқ болған кезде құлап түспеу"
 
 msgid ""
 "  --source         Generate a source-only tarball without downloaded sources"
 msgstr ""
-"  --source      Бастапқы кодалар бар, жүктеліп алынған файлдардары жоқ, "
-"архивті құру"
+"  --source         Бастапқы кодтары бар, жүктеліп алынған файлдардары жоқ, "
+"архивті жасау"
 
 msgid "These options can be passed to pacman:"
 msgstr "Келесі опциялар pacman-ға беріле алады:"
@@ -1395,10 +1392,11 @@ msgid ""
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Copyright (c) 2006-2009 Pacman-ды өндіру тобы <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nБұл еркін "
-"бағдарламалық қамтама; көшірме жасау шарттарын бастапқы кодында қараңыз."
-"\\nБірақ олар заңдарға қайшы келмейтініне КЕПІЛДЕМЕ ЖОҚ."
+"Copyright (c) 2006-2010 Pacman-ды өндіру тобы <pacman-dev@archlinux.org>."
+"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nБұл - "
+"еркін бағдарламалық қамтама; көшірме жасау шарттарын бастапқы кодында "
+"қараңыз.\\nБірақ, заңмен рұқсат етілген шектері ішінде ешқандай КЕПІЛДЕМЕ "
+"берілмейді."
 
 msgid "%s not found."
 msgstr "%s табылмады."
@@ -1422,7 +1420,7 @@ msgid "Problem removing files; you may not have correct permissions in %s"
 msgstr "Файлдарды өшіру мүмкін емес; сіздің құқығыңыз %s ішінде аз шығар"
 
 msgid "Source cache cleaned."
-msgstr "Бастапқы кодалар кэші тазартылды."
+msgstr "Бастапқы кодтар кэші тазартылды."
 
 msgid "No files have been removed."
 msgstr "Файлдар өшірілмеді."
@@ -1448,10 +1446,10 @@ msgid "The --asroot option is meant for the root user only."
 msgstr "Бұл --asroot опциясы тек root үшін қолданылады."
 
 msgid "Please rerun makepkg without the --asroot flag."
-msgstr "Қазір makepkg қайтадан --asroot опциясыз қосыңыз."
+msgstr "Қазір makepkg қайтадан --asroot опциясыз іске қосыңыз."
 
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
-msgstr "fakeroot орнатылған болу керек егер 'fakeroot' опциясы"
+msgstr "fakeroot орнатылған болу керек, егер 'fakeroot' опциясы"
 
 msgid "in the BUILDENV array in %s."
 msgstr "BUILDENV массивінде %s ішінде қолданылса."
@@ -1461,7 +1459,7 @@ msgstr "makepkg бағдарламасын әкімші емес пайдала
 
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
-"иесі root емес дестелердің құрылуына әкеледі. fakeroot ортасын қолданып "
+"иесі root емес дестелердің жасалуына әкеледі. fakeroot ортасын қолданып "
 "көріңіз,"
 
 msgid "placing 'fakeroot' in the BUILDENV array in %s."
@@ -1480,7 +1478,7 @@ msgid "%s contains CRLF characters and cannot be sourced."
 msgstr "%s құрамында CRLF таңбалары бар және оны қосуға болмайды."
 
 msgid "A package has already been built, installing existing package..."
-msgstr "Десте жиналған, бар болып тұрған десте орнатылуда..."
+msgstr "Десте жиналған болып тұр, бар болып тұрған десте орнатылуда..."
 
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "Десте жиналып тұр. (алмастыру үшін -f қолданыңыз)"
@@ -1510,10 +1508,10 @@ msgid "Making package: %s"
 msgstr "Дестені жинау: %s"
 
 msgid "A source package has already been built. (use -f to overwrite)"
-msgstr "Бастапқы кодалар дестесі жиналып тұр. (алмастыру үшін -f қолданыңыз)"
+msgstr "Бастапқы кодтар дестесі жиналып тұр. (алмастыру үшін -f қолданыңыз)"
 
 msgid "Source package created: %s"
-msgstr "Бастапқы кодалар дестесі құрылған: %s"
+msgstr "Бастапқы кодтар дестесі құрылған: %s"
 
 msgid "Skipping dependency checks."
 msgstr "Тәуелділіктерді тексеруді аттап кету."
@@ -1532,20 +1530,20 @@ msgstr "%s PATH жерінен табылмады; тәуелділіктерд
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
-"Бастапқы кода файлдарды алу орындалмайды  -- src/ ішінде барлар қолданылады"
+"Бастапқы код файлдарын алу орындалмайды  -- src/ ішінде барлары қолданылады"
 
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
-"Бастапқы кода файлдардың бүтіндігін тексеру орындалмайды  -- src/ ішінде "
-"барлар қолданылады"
+"Бастапқы код файлдардың бүтіндігін тексеру орындалмайды  -- src/ ішінде "
+"барлары қолданылады"
 
 msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr ""
-"Бастапқы кода файлдарын тарқату орындалмайдыі  -- src/ ішінде барлар "
+"Бастапқы код файлдарын тарқату орындалмайды  -- src/ ішінде барлары "
 "қолданылады"
 
 msgid "The source directory is empty, there is nothing to build!"
-msgstr "Бастапқы кодалар бумасы бос. Жинайтын ешнәрсе жоқ!"
+msgstr "Бастапқы кодтар бумасы бос. Жинайтын ешнәрсе жоқ!"
 
 msgid "The package directory is empty, there is nothing to repackage!"
 msgstr "Десте бумасы бос. Қайта сығу үшін ешнәрсе жоқ!"
@@ -1582,10 +1580,10 @@ msgid ""
 "disk as much.\\n"
 msgstr ""
 "Дестелерді бақылау үшін pacman көп кішкентай файлдарды қолданған соң,"
-"\\nуақыт өте ол файлдар диск бойында тарап, фрагментацияға әкеп соғады."
-"\\nБұл скрипт ол файлдарды дискідегі үзіліссіз орнастыруға тырысады."
-"\\nНәтижесінде қатты диск ол файлдарды тезірек оқуы керек,\\nөйткені дискіге "
-"енді аздау әрекеттер жасау керек болады.\\n"
+"\\nуақыт өте ол файлдар диск бойына тарап, фрагментацияға әкеп соғады.\\nБұл "
+"скрипт ол файлдарды дискіде үзіліссіз орналастыруға тырысады.\\nНәтижесінде "
+"қатты диск ол файлдарды тезірек оқуы керек,\\nөйткені дискіге енді аздау "
+"әрекеттер жасау керек болады.\\n"
 
 msgid "diff tool was not found, please install diffutils."
 msgstr "diff утилитасы табылмады, diffutils орнатыңыз."
@@ -1602,22 +1600,22 @@ msgstr ""
 "болмайды."
 
 msgid "ERROR: Can not create temp directory for database building."
-msgstr "ҚАТЕ: Дерекқорды құру үшін уақытша буманы жасау мүмкін емес."
+msgstr "ҚАТЕ: Дерекқорды жасау үшін уақытша буманы жасау мүмкін емес."
 
 msgid "MD5sum'ing the old database..."
 msgstr "Ескі дерекқордың MD5 сомасы есептелуде..."
 
 msgid "Tar'ing up %s..."
-msgstr "%s tar ішіне сығу ..."
+msgstr "%s tar көмегімен сығу ..."
 
 msgid "Tar'ing up %s failed."
-msgstr "%s tar ішіне сығу мүмкін емес."
+msgstr "%s tar көмегімен сығу мүмкін емес."
 
 msgid "Making and MD5sum'ing the new database..."
-msgstr "Жаңа дерекқор құрылуда мен MD5 сомасы есептелуде..."
+msgstr "Жаңа дерекқор жасалуда мен MD5 сомасы есептелуде..."
 
 msgid "Untar'ing %s failed."
-msgstr "%s tar'ын тарқату қатемен аяқталды"
+msgstr "%s tar көмегімен тарқату қатемен аяқталды."
 
 msgid "Syncing database to disk..."
 msgstr ":: Дестелер дерекқоры синхрондалуда..."
@@ -1664,10 +1662,11 @@ msgstr ""
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr ""
-"Мысалы:  repo-add /репозиторийге/дейін/жол.db.tar.gz pacman-3.0.0.pkg.tar.gz"
+"Мысалы:  repo-add /репозиторийге/дейінгі/жол.db.tar.gz pacman-3.0.0.pkg.tar."
+"gz"
 
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr "Мысалы:  repo-remove /репозиторийге/дейін/жол.db.tar.gz kernel26"
+msgstr "Мысалы:  repo-remove /репозиторийге/дейінгі/жол.db.tar.gz kernel26"
 
 msgid ""
 "Copyright (C) 2006-2008 Aaron Griffin <aaron@archlinux.org>.\\nCopyright (c) "
@@ -1676,12 +1675,12 @@ msgid ""
 "permitted by law.\\n"
 msgstr ""
 "Copyright (C) 2006-2008 Aaron Griffin <aaron@archlinux.org>.\\nCopyright (C) "
-"2007-2008 Dan McGee <dan@archlinux.org>.\\nБұл еркін бағдарламалық қамтама; "
-"көшірме жасау шарттарын бастапқы кодында қараңыз.\\nБірақ олар заңдарға "
-"қайшы келмейтініне КЕПІЛДЕМЕ ЖОҚ."
+"2007-2008 Dan McGee <dan@archlinux.org>.\\nБұл - еркін бағдарламалық "
+"қамтама; көшірме жасау шарттарын бастапқы кодында қараңыз.\\nБірақ, заңмен "
+"рұқсат етілген шектері ішінде ешқандай КЕПІЛДЕМЕ берілмейді."
 
 msgid "Creating 'deltas' db entry..."
-msgstr "ДҚ ішінде 'deltas' жазбасын құру..."
+msgstr "ДҚ ішінде 'deltas' жазбасын жасау..."
 
 msgid "An entry for '%s' already existed"
 msgstr "'%s' үшін жазба бар болып тұр"
@@ -1693,13 +1692,13 @@ msgid "Invalid package file '%s'."
 msgstr "'%s' десте файлы қате."
 
 msgid "Creating 'desc' db entry..."
-msgstr "ДҚ ішінде 'desc' жазбасын құру..."
+msgstr "ДҚ ішінде 'desc' жазбасын жасау..."
 
 msgid "Computing md5 checksums..."
-msgstr "Бақылау md5 сомаларын есептеу..."
+msgstr "md5 тексеру сомаларын есептеу..."
 
 msgid "Creating 'depends' db entry..."
-msgstr "ДҚ ішінде 'depends' жазбасын құру..."
+msgstr "ДҚ ішінде 'depends' жазбасын жасау..."
 
 msgid "Failed to acquire lockfile: %s."
 msgstr "Оқшау файлын алу мүмкін емес: %s."
@@ -1753,7 +1752,7 @@ msgid "Cannot create temp directory for database building."
 msgstr "Дерекқорды жасау үшін уақытша буманы құру мүмкін емес."
 
 msgid "Creating updated database file '%s'"
-msgstr "Жаңартылған дерекқор %s файлын құру"
+msgstr "Жаңартылған дерекқор %s файлын жасау"
 
 msgid "'%s' does not have a valid archive extension."
 msgstr "'%s' дұрыс архив кеңейтілуіне ие емес."
@@ -1764,13 +1763,6 @@ msgstr "Дестелер қалмады, бос дерекқор жасалын
 msgid "No packages modified, nothing to do."
 msgstr "Дестелер өзгермеді, істейтін ешнәрсе жоқ."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     көрсетілген дестелер мен олардың тәуелділіктерін "
-#~ "жүктеу сілтемелерін шығару\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s табылмады, топ ізделуде...\n"
 

po/nb.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2009-10-04 19:29+0200\n"
 "Last-Translator:  <maister@archlinux.us>\n"
 "Language-Team: Norwegian\n"
@@ -848,10 +848,6 @@ msgstr "klarte ikke å synkronisere noen databaser\n"
 msgid "installed"
 msgstr "installerer"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr ""
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "pakkebrønn '%s' finnes ikke\n"
@@ -1769,13 +1765,6 @@ msgstr "Ingen pakker gjenstår, oppretter tom database."
 msgid "No packages modified, nothing to do."
 msgstr "Ingen pakker modifisert, ingenting å gjøre."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris    viser URIer for gitte pakker og deres "
-#~ "avhengigheter\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s ikke funnet, leter etter gruppe ...\n"
 

po/pacman.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -802,10 +802,6 @@ msgstr ""
 msgid "installed"
 msgstr ""
 
-#, c-format
-msgid " [%s: %s]"
-msgstr ""
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr ""

po/pl.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
-"PO-Revision-Date: 2009-10-05 19:30+0200\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
+"PO-Revision-Date: 2010-08-01 05:08+0100\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polski <pl@li.org>\n"
 "Language: \n"
@@ -87,13 +87,13 @@ msgstr ":: %s jest w IgnorePkg/IgnoreGroup. Zainstalować mimo tego?"
 msgid ":: Replace %s with %s/%s?"
 msgstr ":: Zastąpić %s przez %s/%s?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: %s and %s are in conflict. Remove %s?"
 msgstr ":: %s konfliktuje z %s. Usunąć %s?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: %s and %s are in conflict (%s). Remove %s?"
-msgstr ":: %s konfliktuje z %s. Usunąć %s?"
+msgstr ":: %s i %s konfliktują ze sobą (%s). Usunąć %s?"
 
 #, c-format
 msgid ""
@@ -325,12 +325,11 @@ msgstr ""
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         pomija sprawdzanie zależności\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -k, --dbonly         only remove database entries, do not remove files\n"
 msgstr ""
-"  -k, --dbonly         usuwa jedynie wpis w bazie danych, bez zmian na "
-"plikach \n"
+"  -k, --dbonly         usuwa jedynie wpis w bazie danych, nie usuwa plików \n"
 
 #, c-format
 msgid "  -n, --nosave         remove configuration files as well\n"
@@ -357,12 +356,13 @@ msgid ""
 "      --print          only print the targets instead of performing the "
 "operation\n"
 msgstr ""
+"      --print          wypisz tylko cele, bez przeprowadzania operacji\n"
 
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
+msgstr "      --print-format <string>\n"
 
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
@@ -378,13 +378,13 @@ msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr ""
 "  -f, --force          wymusza instalację, nadpisując konfliktujące pliki\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -k, --dbonly         add database entries, do not install or keep existing "
 "files\n"
 msgstr ""
-"  -k, --dbonly         usuwa jedynie wpis w bazie danych, bez zmian na "
-"plikach \n"
+"  -k, --dbonly         dodaje wpisy do bazy danych, nie instaluj bądź zostaw "
+"istniejące pliki\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -529,14 +529,14 @@ msgstr ""
 "                       ignoruje uaktualnienie grupy (może zostać użyte "
 "więcej niż raz)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
 msgstr ""
-"      --asdeps       instaluje pakiety jako zależności (nie na życzenie)\n"
+"      --asdeps         oznacza pakiety jako zainstalowane na życzenie\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr "      --asexplicit     zainstaluj pakiet jako wyraźnie zainstalowany\n"
+msgstr "      --asexplicit     oznacza pakiet jako zainstalowany na życzenie\n"
 
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
@@ -585,9 +585,9 @@ msgstr ""
 "      --cachedir <dir> ustawia alternatywną lokalizację pliku pamięci "
 "podręcznej (cache) pakietów\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr "      --config <path>  ustawia alternatywny plik konfiguracji\n"
+msgstr "      --arch <path>    ustawia alternatywną architekturę\n"
 
 #, c-format
 msgid ""
@@ -629,23 +629,25 @@ msgstr "nie udało się zmienić katalogu na katalog pobierania %s\n"
 msgid "running XferCommand: fork failed!\n"
 msgstr "uruchamianie XferCommand: fork nieudany!\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "directive '%s' without value not recognized\n"
-msgstr "plik konfigu %s, linia %d: dyrektywa '%s' nie rozpoznana.\n"
+msgstr "dyrektywa '%s' bez wartości nie rozpoznane\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "zła wartość dla 'CleanMethod' : '%s'\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "directive '%s' with a value not recognized\n"
-msgstr "plik konfigu %s, linia %d: dyrektywa '%s' nie rozpoznana.\n"
+msgstr "dyrektywa '%s' z wartością nie rozpoznane\n"
 
 #, c-format
 msgid ""
 "The mirror '%s' contains the $arch variable, but no Architecture is "
 "defined.\n"
 msgstr ""
+"Serwer lustrzany '%s' zawiera zmienną $arch, ale brak zdefiniowanej "
+"architektury.\n"
 
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
@@ -672,19 +674,21 @@ msgstr ""
 msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr "plik %s, linia %d: Wszystkie dyrektywy muszą należeć do sekcji.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "plik konfigu %s, linia %d: dyrektywa '%s' nie rozpoznana.\n"
+msgstr "plik konfiguracyjny %s, linia %d: dyrektywa %s potrzebuje wartości\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "config file %s, line %d: problem in options section\n"
-msgstr "plik konfigu %s, linia %d: zła nazwa sekcji.\n"
+msgstr "plik konfiguracyjny %s, linia %d: problem w sekcji opcji\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in repository section '%s' not "
 "recognized.\n"
-msgstr "plik konfigu %s, linia %d: dyrektywa '%s' nie rozpoznana.\n"
+msgstr ""
+"plik konfiguracyjny %s, linia %d: dyrektywa '%s' w sekcji repozytorium '%s' "
+"nie rozpoznana.\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -706,9 +710,9 @@ msgstr "nie podano żadnej operacji (użyj -h aby otrzymać pomoc)\n"
 msgid "no file was specified for --owns\n"
 msgstr "nie podano pliku dla --owns\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "failed to find '%s' in PATH: %s\n"
-msgstr "nie udało się odczytać pliku '%s': %s\n"
+msgstr "nie udało się znaleźć '%s' w PATH: %s\n"
 
 #, c-format
 msgid "failed to read file '%s': %s\n"
@@ -762,9 +766,9 @@ msgstr "pakiet \"%s\" nie został odnaleziony\n"
 msgid "failed to prepare transaction (%s)\n"
 msgstr "nie udało się przygotować transakcji (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: package %s does not have a valid architecture\n"
-msgstr "'%s' nie ma poprawnego rozszerzenia archiwum"
+msgstr ":: pakiet %s nie posiada odpowiedniej architektury\n"
 
 #, c-format
 msgid ":: %s: requires %s\n"
@@ -778,9 +782,9 @@ msgstr "%s desygnowany jest jako HoldPkg.\n"
 msgid "HoldPkg was found in target list. Do you want to continue?"
 msgstr "HoldPkg został znaleziony na liście celów. Czy chcesz kontynuować?"
 
-#, fuzzy, c-format
+#, c-format
 msgid " there is nothing to do\n"
-msgstr "Nie zmodyfikowano żadnego pakietu, nie ma nic do zrobienia."
+msgstr "nie ma nic do zrobienia\n"
 
 #, c-format
 msgid "Do you want to remove these packages?"
@@ -838,9 +842,9 @@ msgstr "Czy chcesz usunąć WSZYSTKIE pliki z pamięci podręcznej?"
 msgid "removing all files from cache...\n"
 msgstr "usuwanie wszystkich plików z pamięci podręcznej...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not access cache directory %s\n"
-msgstr "brak dostępu do katalogu pamięci podręcznej\n"
+msgstr "brak dostępu do katalogu pamięci podręcznej %s\n"
 
 #, c-format
 msgid "File %s does not seem to be a valid package, remove it?"
@@ -858,13 +862,9 @@ msgstr " %s jest już w najnowszej wersji\n"
 msgid "failed to synchronize any databases\n"
 msgstr "nie udało się zsynchronizować żadnej bazy danych\n"
 
-#, fuzzy, c-format
-msgid "installed"
-msgstr "instalowanie"
-
 #, c-format
-msgid " [%s: %s]"
-msgstr ""
+msgid "installed"
+msgstr "zainstalowano"
 
 #, c-format
 msgid "repository '%s' does not exist\n"
@@ -892,11 +892,11 @@ msgstr ":: Rozpoczynanie pełnej aktualizacji systemu...\n"
 
 #, c-format
 msgid ":: %s and %s are in conflict\n"
-msgstr ""
+msgstr ":: %s i %s są w konflikcie\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: %s and %s are in conflict (%s)\n"
-msgstr ":: %s: konfliktuje z %s\n"
+msgstr ":: %s: konfliktuje z %s (%s)\n"
 
 #, c-format
 msgid "Proceed with download?"
@@ -1043,9 +1043,8 @@ msgstr "BŁĄD:"
 msgid "Cleaning up..."
 msgstr "Sprzątam..."
 
-#, fuzzy
 msgid "Unable to find source file %s."
-msgstr "Nie znaleziono pliku źródeł %s do rozpakowania."
+msgstr "Nie znaleziono pliku źródłowego %s"
 
 msgid "Aborting..."
 msgstr "Przerywam..."
@@ -1056,16 +1055,14 @@ msgstr "Brak agenta do obslugi URL-i %s. Sprawdź %s."
 msgid "The download program %s is not installed."
 msgstr "Program do pobierania %s nie jest zainstalowany."
 
-#, fuzzy
 msgid "'%s' returned a fatal error (%i): %s"
-msgstr "Pacman zwrócił błąd krytyczny (%i): %s"
+msgstr "'%s' zwrócił krytyczny błąd (%i): %s"
 
 msgid "Installing missing dependencies..."
 msgstr "Instaluję brakujące zależności..."
 
-#, fuzzy
 msgid "'%s' failed to install missing dependencies."
-msgstr "Pacman nie zdołał zainstalować brakujących zależności."
+msgstr "'%s' nie mógł zainstalować brakujących zależności"
 
 msgid "Failed to install all missing dependencies."
 msgstr "Nie udało się zainstalować wszystkich brakujących zależności."
@@ -1080,7 +1077,7 @@ msgid "Retrieving Sources..."
 msgstr "Pobieranie źródeł..."
 
 msgid "Found %s"
-msgstr ""
+msgstr "Znaleziono %s"
 
 msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s nie jest URL i nie znalazłem go w katalgu źródłowym."
@@ -1145,9 +1142,8 @@ msgstr "Czyszczenie innych plików..."
 msgid "Compressing man and info pages..."
 msgstr "Kompresuję strony man oraz info..."
 
-#, fuzzy
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr "Usuwam symbole odpluskwiania z binariów i bibliotek..."
+msgstr "Wyrzucam niepotrzebne symbole z binariów i bibliotek"
 
 msgid "Removing libtool .la files..."
 msgstr "Usuwam pliki libtoola .la..."
@@ -1164,12 +1160,11 @@ msgstr "Dodaj pole z licencją do %s!"
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Przykład dla programu na GPL: license=('GPL')."
 
-#, fuzzy
 msgid "Invalid backup entry : %s"
-msgstr "Błędny plik pakietu '%s'."
+msgstr "Błędny wpis kopii: %s"
 
 msgid "Package contains reference to %s"
-msgstr ""
+msgstr "Pakiet zawiera odwołanie do %s"
 
 msgid "Missing pkg/ directory."
 msgstr "Brakujący katalog pkg."
@@ -1192,13 +1187,11 @@ msgstr "'%s' nie jest poprawnym rozszerzeniem archiwum"
 msgid "Failed to create package file."
 msgstr "Nie udało się utworzyć pliku pakietu."
 
-#, fuzzy
 msgid "Failed to create symlink to package file."
-msgstr "Nie udało się stworzyć pakietu źródłowego."
+msgstr "Nie udało się stworzyć dowiązania symbolicznego do pliku pakietu."
 
-#, fuzzy
 msgid "Skipping integrity checks."
-msgstr "Pomijam sprawdzanie zależności."
+msgstr "Pomijam sprawdzanie sum kontrolnych."
 
 msgid "Creating source package..."
 msgstr "Tworzę pakiet źródłowy..."
@@ -1206,9 +1199,8 @@ msgstr "Tworzę pakiet źródłowy..."
 msgid "Adding %s..."
 msgstr "Dodaję %s..."
 
-#, fuzzy
 msgid "Adding %s file (%s)..."
-msgstr "Dodaję %s..."
+msgstr "Dodaję plik %s (%s)..."
 
 msgid "Compressing source package..."
 msgstr "Kompresuję pakiet źródłowy..."
@@ -1216,12 +1208,11 @@ msgstr "Kompresuję pakiet źródłowy..."
 msgid "Failed to create source package file."
 msgstr "Nie udało się stworzyć pakietu źródłowego."
 
-#, fuzzy
 msgid "Installing package %s with %s -U..."
-msgstr "aktualizowanie %s przez %s... "
+msgstr "Instaluję pakiet %s z %s -U"
 
 msgid "Installing %s package group with %s -U..."
-msgstr ""
+msgstr "Instalowanie grupy pakietów %s z %s -U"
 
 msgid "Failed to install built package(s)."
 msgstr "Nie udało się zainstalować zbudowanych pakietów"
@@ -1248,13 +1239,11 @@ msgid "Provides array cannot contain comparison (< or >) operators."
 msgstr ""
 "Dostarczana tablica nie może zawierać operatorów porównania ( < lub > )"
 
-#, fuzzy
 msgid "Invalid syntax for optdepend : '%s'"
-msgstr "zła wartość dla 'CleanMethod' : '%s'\n"
+msgstr "Zła składa dla optdepend : '%s'"
 
-#, fuzzy
 msgid "%s file (%s) does not exist."
-msgstr "Skrypt instalacyjny (%s) nie istnieje."
+msgstr "plik %s (%s) nie istnieje."
 
 msgid "options array contains unknown option '%s'"
 msgstr "pole options zawiera nieznaną opcję '%s'"
@@ -1263,7 +1252,7 @@ msgid "missing package function for split package '%s'"
 msgstr "brakująca funkcja pakietu do połączenia pakietu '%s'"
 
 msgid "requested package %s is not provided in %s"
-msgstr ""
+msgstr "Żądany pakiet %s nie jest dostarczony przez %s"
 
 msgid "Determining latest darcs revision..."
 msgstr "Sprawdzam ostatnią rewizję repozytorium darcs..."
@@ -1338,9 +1327,8 @@ msgstr "  -m, --nocolor    Wyłącz kolorowe komunikaty"
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Tylko pobierz i rozpakuj pliki"
 
-#, fuzzy
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr "  -p <buildscript> Użyj alternatywnego skryptu budowy (zamiast '%s')"
+msgstr "  -p <plik>       Użyj alternatywnego skryptu budowy (zamiast '%s')"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
@@ -1352,55 +1340,46 @@ msgstr "  -R, --repackage  Przepakuj zawartość pakietu bez ponownego budowania
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Zainstaluj brakujące zależności pacmanem"
 
-#, fuzzy
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
-"      --allsource  Generuje archiwum źródłowe zawierające pobrane źródła"
+"  --allsource      Generuje archiwum źródłowe zawierające pobrane źródła"
 
-#, fuzzy
 msgid "  --asroot         Allow makepkg to run as root user"
-msgstr "      --asroot     Pozwól makepkg pracować jako root"
+msgstr "  --asroot         Pozwól makepkg pracować jako root"
 
-#, fuzzy
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
-"  --config <konfiguracja> Użyj alternatywnego pliku konfiguracyjnego "
-"(zamiast '%s')"
+"  --config <plik> Użyj alternatywnego pliku konfiguracyjnego (zamiast '%s')"
 
-#, fuzzy
 msgid ""
 "  --holdver        Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
-"      --holdver    Zapobiega autopodnoszeniu wersji dla rozwojowych "
+"  --holdver        Zapobiega autopodnoszeniu wersji dla rozwojowych "
 "PKGBUILDów"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
-msgstr ""
+msgstr "  --pkg <lista>     Buduj tylko podane pakiety z rozdzielonego pakietu"
 
-#, fuzzy
 msgid "  --skipinteg      Do not fail when integrity checks are missing"
-msgstr "      --skipinteg Nie kończ jeżeli sumy kontrolne nie istnieją"
+msgstr "  --skipinteg      Nie kończ jeżeli sumy kontrolne nie istnieją"
 
-#, fuzzy
 msgid ""
 "  --source         Generate a source-only tarball without downloaded sources"
-msgstr "      --source     Generuje archiwum źródłowe bez pobranych źródeł"
+msgstr "  --source         Generuje archiwum źródłowe bez pobranych źródeł"
 
 msgid "These options can be passed to pacman:"
 msgstr "Poniższe opcje mogą być przekazane do pacmana:"
 
-#, fuzzy
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr ""
-"      --noconfirm      Nie pyta o potwierdzenie przy rozwiązywaniu zależności"
+"  --noconfirm      Nie pytaj o potwierdzenie przy rozwiązywaniu zależności"
 
-#, fuzzy
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr "      --noprogressbar  Wyłącza pasek postępu podczas pobierania plików"
+msgstr "  --noprogressbar  Nie pokazuj paska postępu przy pobieraniu plików"
 
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "Jeżeli nie użytko -p, makepkg będzie szukać '%s'"
@@ -1419,9 +1398,8 @@ msgstr ""
 msgid "%s not found."
 msgstr "%s nie znaleziony."
 
-#, fuzzy
 msgid "You do not have write permission to store packages in %s."
-msgstr "Nie masz prawa zapisu do umieszczania plików w %s."
+msgstr "Nie masz prawa zapisu do przechowywania pakietów w %s."
 
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Nie masz prawa zapisu do umieszczania plików w %s."
@@ -1486,7 +1464,7 @@ msgstr ""
 "Nie używaj opcji '-F'. Jest ona przeznaczona tylko do użytku przez makepkg."
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
-msgstr ""
+msgstr "Sudo nie może zostać znalezione. Używam su do nabycia praw roota."
 
 msgid "%s does not exist."
 msgstr "%s nie istnieje."
@@ -1512,10 +1490,10 @@ msgid "Part of the package group has already been built. (use -f to overwrite)"
 msgstr "Część grupy pakietów została już zbudowana. (użyj -f aby nadpisać)"
 
 msgid "Repackaging without the use of a package() function is deprecated."
-msgstr ""
+msgstr "Przepakowywanie bez użycia funkcji package() jest przestarzałe."
 
 msgid "File permissions may not be preserved."
-msgstr ""
+msgstr "Uprawnienia do plików nie mogą zostać zachowane."
 
 msgid "Leaving fakeroot environment."
 msgstr "Opuszczam środowisko fakeroot."
@@ -1523,9 +1501,8 @@ msgstr "Opuszczam środowisko fakeroot."
 msgid "Making package: %s"
 msgstr "Tworzę pakiet: %s"
 
-#, fuzzy
 msgid "A source package has already been built. (use -f to overwrite)"
-msgstr "Pakiet został już zbudowany. (użyj -f aby obejść)"
+msgstr "Pakiet został już zbudowany. (użyj -f aby nadpisać)"
 
 msgid "Source package created: %s"
 msgstr "Utworzono pakiet źródłowy: %s"
@@ -1542,9 +1519,8 @@ msgstr "Sprawdzanie zależności dla zbudowania..."
 msgid "Could not resolve all dependencies."
 msgstr "Nie udało się rozwiązać wszystkich zależności."
 
-#, fuzzy
 msgid "%s was not found in PATH; skipping dependency checks."
-msgstr "pacman nie został znaleziono w PATH; pomijam sprawdzanie zależności."
+msgstr "%s nie został znaleziony w PATH; pomijanie sprawdzania zależności"
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr "Pomijam pobieranie źródeł        -- używam istniejącego drzewa src/"
@@ -1774,13 +1750,6 @@ msgstr "Brak pakietów, tworzenie pustej bazy danych."
 msgid "No packages modified, nothing to do."
 msgstr "Nie zmodyfikowano żadnego pakietu, nie ma nic do zrobienia."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     wykazuje URI dla danych pakietów oraz ich "
-#~ "zależności\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s nie zostało znalezione, szukanie grupy...\n"
 

po/pt_BR.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-08 15:27-0300\n"
 "Last-Translator: Marcelo Kalib\n"
 "Language-Team: Arch Linux Brasil\n"
@@ -893,10 +893,6 @@ msgstr "falha ao sincronizar quaisquer bases de dados\n"
 msgid "installed"
 msgstr "instalado"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "repositório '%s' não existe\n"
@@ -1809,12 +1805,6 @@ msgstr "Nenhum pacote restante, criando banco de dados vazio."
 msgid "No packages modified, nothing to do."
 msgstr "Nenhum pacote modificado, nada a fazer."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris       mostra as URIs dos pacotes e suas dependências\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s não encontrado, buscando por grupo...\n"
 

po/ro.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.4\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2009-10-04 20:39+0200\n"
 "Last-Translator: volodia macovei <blog@volodia.ro>\n"
 "Language-Team: Romanian SbLUG for Arch <blog@volodia.ro>\n"
@@ -878,10 +878,6 @@ msgstr "eşec în sincronizarea oricărei baze de date\n"
 msgid "installed"
 msgstr "instalat"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "depozitul '%s' nu există\n"
@@ -1787,13 +1783,6 @@ msgstr "Nu au rămas pachete, se crează bază de date goală."
 msgid "No packages modified, nothing to do."
 msgstr "Nu sunt pachete modificate, nu e nimic de făcut."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     tipăreşte URI-uri pentru pachetele date şi "
-#~ "dependenţele lor\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s nu este găsit, se caută după grup...\n"
 

po/ru.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-06 10:02+0300\n"
 "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -60,7 +60,7 @@ msgstr "применение дельт...\n"
 
 #, c-format
 msgid "generating %s with %s... "
-msgstr "создание %s с помощью %s..."
+msgstr "создание %s из %s..."
 
 #, c-format
 msgid "success!\n"
@@ -1765,13 +1765,6 @@ msgstr "Не осталось пакетов, создание пустой ба
 msgid "No packages modified, nothing to do."
 msgstr "Пакеты не изменялись, делать нечего."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     напечатать ссылки для загрузки указанных пакетов и "
-#~ "их зависимостей\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s не найден, поиск группы...\n"
 

po/sv.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
-"PO-Revision-Date: 2009-10-06 21:11+0200\n"
-"Last-Translator: Christian Larsson <congacx@gmail.com>\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
+"PO-Revision-Date: 2010-10-20 20:26+0200\n"
+"Last-Translator: Tobias Eriksson <tobier@tobier.se>\n"
 "Language-Team: Swedish\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -80,13 +80,13 @@ msgstr ":: %s finns i IgnorePkg/IgnoreGroup. Installera ändå?"
 msgid ":: Replace %s with %s/%s?"
 msgstr ":: Ersätt %s med %s/%s?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: %s and %s are in conflict. Remove %s?"
-msgstr ":: %s strider mot %s. Ta bort %s?"
+msgstr ":: %s krockar med %s. Ta bort %s?"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: %s and %s are in conflict (%s). Remove %s?"
-msgstr ":: %s strider mot %s. Ta bort %s?"
+msgstr ":: %s krockar med %s (%s). Ta bort %s?"
 
 #, c-format
 msgid ""
@@ -318,7 +318,7 @@ msgstr ""
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         hoppa över kontroll av beroenden\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -k, --dbonly         only remove database entries, do not remove files\n"
 msgstr ""
@@ -349,13 +349,15 @@ msgstr ""
 msgid ""
 "      --print          only print the targets instead of performing the "
 "operation\n"
-msgstr ""
+msgstr "--print         skriv endast ut, utan att utföra operationen\n"
 
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
 msgstr ""
+"        --print-format <string>\n"
+"                       specificera utskriftsformatet\n"
 
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
@@ -371,13 +373,14 @@ msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr ""
 "  -f, --force          tvingfa installation, skriv över motstridiga filer\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -k, --dbonly         add database entries, do not install or keep existing "
 "files\n"
 msgstr ""
-"  -k, --dbonly         ta enbart bort databasinlägg, men ta inte bort några "
-"filer\n"
+"  -k, --dbonly         lägg till databasinlägg, men installera inte eller "
+"behåll inga befintliga filer.\n"
+"\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -517,14 +520,14 @@ msgstr ""
 "                       ignorera en gruppuppgradering (kan användas mer än en "
 "gång)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
 msgstr ""
-"      --asdeps         installera paket som icke-utryckligt installerade\n"
+"      --asdeps         markera paket som icke-utryckligt installerade\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr "      --asexplicit     installera paket som utryckligt installerade\n"
+msgstr "      --asexplicit     markera paket som utryckligt installerade\n"
 
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
@@ -572,9 +575,9 @@ msgstr "  -b, --dbpath <path>  ange en alternativ plats för databasen\n"
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr "      --cachedir <dir> ange en alternativ plats för paketcachen\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr "      --config <path>  ange en alternativ konfigurationsfil\n"
+msgstr "      --arch <arch>  ange en alternativ arkitektur\n"
 
 #, c-format
 msgid ""
@@ -616,23 +619,24 @@ msgstr "kunde inte chdir till nerladdningskatalogen% s\n"
 msgid "running XferCommand: fork failed!\n"
 msgstr "vid körning av XferCommand: delning misslyckades!\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "directive '%s' without value not recognized\n"
-msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n"
+msgstr "direktiv '%s' utan värde känns inte igen\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "ogiltigt värde för 'CleanMethod' : '%s'\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "directive '%s' with a value not recognized\n"
-msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n"
+msgstr "direktiv '%s' med ett värde känns inte igen\n"
 
 #, c-format
 msgid ""
 "The mirror '%s' contains the $arch variable, but no Architecture is "
 "defined.\n"
 msgstr ""
+"Adressen '%s' innehålle $arch-variabeln, men ingen arkitektur är definerad.\n"
 
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
@@ -661,19 +665,20 @@ msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr ""
 "konfigurationsfil %s, rad %d: Alla direktiv måste tillhöra en sektion.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "config file %s, line %d: directive %s needs a value\n"
-msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n"
+msgstr "konfigurationsfil %s, rad %d: direktiv '%s' kräver ett värde\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "config file %s, line %d: problem in options section\n"
-msgstr "konfigurationsfil %s, rad %d: ogiltigt sektionsnamn.\n"
+msgstr "konfigurationsfil %s, rad %d: problem i alternativsektionen.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in repository section '%s' not "
 "recognized.\n"
-msgstr "konfigurationsfil %s, rad %d: direktiv '%s' känns inte igen\n"
+msgstr ""
+"konfigurationsfil %s, rad %d: direktiv '%s' i sektion '%s' känns inte igen.\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -695,9 +700,9 @@ msgstr "ingen operation specifierad (använd -h för hjälp)\n"
 msgid "no file was specified for --owns\n"
 msgstr "ingen fil specifierades för --owns\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "failed to find '%s' in PATH: %s\n"
-msgstr "misslyckades att läsa fil '%s': %s\n"
+msgstr "misslyckades hitta '%s' i PATH: %s\n"
 
 #, c-format
 msgid "failed to read file '%s': %s\n"
@@ -751,9 +756,9 @@ msgstr "paketet \"%s\" hittades inte\n"
 msgid "failed to prepare transaction (%s)\n"
 msgstr "misslyckades att förbereda överföring (%s)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: package %s does not have a valid architecture\n"
-msgstr "'%s' har inte ett giltigt suffix för arkiv."
+msgstr ":: paket %s har inte en giltig arkitektur.\n"
 
 #, c-format
 msgid ":: %s: requires %s\n"
@@ -767,9 +772,9 @@ msgstr "%s är utnämnd som en HoldPkg.\n"
 msgid "HoldPkg was found in target list. Do you want to continue?"
 msgstr "HoldPkg hittades i mållistan. Vill du fortsätta?"
 
-#, fuzzy, c-format
+#, c-format
 msgid " there is nothing to do\n"
-msgstr "Inga paket modifierade, ingenting att göra."
+msgstr " det finns inget att göra\n"
 
 #, c-format
 msgid "Do you want to remove these packages?"
@@ -827,9 +832,9 @@ msgstr "Vill du ta bort ALLA filer från cacen?"
 msgid "removing all files from cache...\n"
 msgstr "tar bort alla filer från cachen...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not access cache directory %s\n"
-msgstr "kunde inte få tillgång till cachekatalogen\n"
+msgstr "kunde inte få tillgång till cachekatalogen %s\n"
 
 #, c-format
 msgid "File %s does not seem to be a valid package, remove it?"
@@ -847,13 +852,9 @@ msgstr " %s är senaste versionen\n"
 msgid "failed to synchronize any databases\n"
 msgstr "misslyckades att synkronisera någon databas\n"
 
-#, fuzzy, c-format
-msgid "installed"
-msgstr "installerar"
-
 #, c-format
-msgid " [%s: %s]"
-msgstr ""
+msgid "installed"
+msgstr "installerad"
 
 #, c-format
 msgid "repository '%s' does not exist\n"
@@ -881,11 +882,11 @@ msgstr ":: Påbörjar full systemuppgradering...\n"
 
 #, c-format
 msgid ":: %s and %s are in conflict\n"
-msgstr ""
+msgstr ":: %s och %s krockar.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ":: %s and %s are in conflict (%s)\n"
-msgstr ":: %s: strider mot %s\n"
+msgstr ":: %s krockar med %s (%s)\n"
 
 #, c-format
 msgid "Proceed with download?"
@@ -1032,9 +1033,8 @@ msgstr "FEL: "
 msgid "Cleaning up..."
 msgstr "Städar upp..."
 
-#, fuzzy
 msgid "Unable to find source file %s."
-msgstr "Kunde inte hitta källkodsfil %s att extrahera."
+msgstr "Kunde inte hitta källkodsfil %s."
 
 msgid "Aborting..."
 msgstr "Avbryter..."
@@ -1045,16 +1045,14 @@ msgstr "Det finns ingen agent angedd för att hantera %s URL. Kolla %s."
 msgid "The download program %s is not installed."
 msgstr "Nerladdningsprogramet %s är inte installerat."
 
-#, fuzzy
 msgid "'%s' returned a fatal error (%i): %s"
-msgstr "Pacman returnerade ett allvarligt fel (%i): %s"
+msgstr "'%s' returnerade ett allvarligt fel (%i): %s"
 
 msgid "Installing missing dependencies..."
 msgstr "Installerar saknade beroenden..."
 
-#, fuzzy
 msgid "'%s' failed to install missing dependencies."
-msgstr "Pacman misslyckades att installera saknade beroenden"
+msgstr "'%s' misslyckades att installera saknade beroenden"
 
 msgid "Failed to install all missing dependencies."
 msgstr "Misslyckades att installera alla saknade beroenden."
@@ -1069,7 +1067,7 @@ msgid "Retrieving Sources..."
 msgstr "Hämtar Källor..."
 
 msgid "Found %s"
-msgstr ""
+msgstr "Hittade %s"
 
 msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s hittades inte i byggkatalogen och är inte ett URL"
@@ -1134,9 +1132,8 @@ msgstr "Rensar andra filer..."
 msgid "Compressing man and info pages..."
 msgstr "Komprimerar man och info sidor..."
 
-#, fuzzy
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr "Tar bort felsökningssymboler från binärer och bibliotek..."
+msgstr "Tar bort onödiga symboler från binärer och bibliotek..."
 
 msgid "Removing libtool .la files..."
 msgstr "Tar bort libtool .la filer..."
@@ -1153,12 +1150,11 @@ msgstr "Var vänlig och lägg till en licens rad i din %s!"
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "Exempel för GPL licenserad mjukvara: license=('GPL')."
 
-#, fuzzy
 msgid "Invalid backup entry : %s"
-msgstr "Ej giltig paketfil '%s'."
+msgstr "Ej giltigt backupinlägg : %s."
 
 msgid "Package contains reference to %s"
-msgstr ""
+msgstr "Paketet innehåller referens till %s"
 
 msgid "Missing pkg/ directory."
 msgstr "Saknar pkg/ katalog"
@@ -1181,13 +1177,11 @@ msgstr "'%s' är inte ett giltig paket-suffix"
 msgid "Failed to create package file."
 msgstr "Misslyckades att skapa paketfil."
 
-#, fuzzy
 msgid "Failed to create symlink to package file."
-msgstr "Misslyckades att skapa källkodsfil."
+msgstr "Misslyckades att symbolisk länk till paketfil."
 
-#, fuzzy
 msgid "Skipping integrity checks."
-msgstr "Hoppar över kontroll av beroenden."
+msgstr "Hoppar över integritetskontroll."
 
 msgid "Creating source package..."
 msgstr "Skapar källpaket"
@@ -1195,9 +1189,8 @@ msgstr "Skapar källpaket"
 msgid "Adding %s..."
 msgstr "Lägger till %s..."
 
-#, fuzzy
 msgid "Adding %s file (%s)..."
-msgstr "Lägger till %s..."
+msgstr "Lägger till fil %s (%s)..."
 
 msgid "Compressing source package..."
 msgstr "Komprimerar källpaket..."
@@ -1205,12 +1198,11 @@ msgstr "Komprimerar källpaket..."
 msgid "Failed to create source package file."
 msgstr "Misslyckades att skapa källkodsfil."
 
-#, fuzzy
 msgid "Installing package %s with %s -U..."
-msgstr "genererar %s med %s... "
+msgstr "Installerar paket %s med %s -U... "
 
 msgid "Installing %s package group with %s -U..."
-msgstr ""
+msgstr "Installerar paketgruppen %s med %s -U..."
 
 msgid "Failed to install built package(s)."
 msgstr "Misslyckades att installera byggt/byggda paket."
@@ -1236,13 +1228,11 @@ msgstr "som arch=('%s')."
 msgid "Provides array cannot contain comparison (< or >) operators."
 msgstr "Provides raden kan inte innehålla jämförande (< eller >) tecken"
 
-#, fuzzy
 msgid "Invalid syntax for optdepend : '%s'"
-msgstr "ogiltigt värde för 'CleanMethod' : '%s'\n"
+msgstr "Fel syntax för optdepend : '%s'"
 
-#, fuzzy
 msgid "%s file (%s) does not exist."
-msgstr "Installations scriptlet (%s) existerar inte."
+msgstr "Filen %s (%s) existerar inte."
 
 msgid "options array contains unknown option '%s'"
 msgstr "options raden innehåller okända parametrar '%s'"
@@ -1251,7 +1241,7 @@ msgid "missing package function for split package '%s'"
 msgstr "saknar paketfunktion för att dela paket '%s'"
 
 msgid "requested package %s is not provided in %s"
-msgstr ""
+msgstr "efterfrågat paket %s finns ej i %s"
 
 msgid "Determining latest darcs revision..."
 msgstr "Fastställer senaste darcs revisionen..."
@@ -1326,10 +1316,8 @@ msgstr "  -m, --nocolor    Inaktivera färglagda meddelanden"
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    Ladda ner och extrahera enbart filerna"
 
-#, fuzzy
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <buildscript> Använd ett alternativt byggskript (istället för '%s')"
+msgstr "  -p <file> Använd ett alternativt byggskript (istället för '%s')"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
@@ -1341,56 +1329,48 @@ msgstr "  -R, --repackage  Packa om innehållet i paketet utan att bygga om"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   Installera saknade beroende med pacman"
 
-#, fuzzy
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr ""
-"      --allsource  Generera en tarball innehållandes enbart nerladdade källor"
+"      --allsource  Generera en tarball innehållandes enbart nerladdade "
+"källkodsfiler"
 
-#, fuzzy
 msgid "  --asroot         Allow makepkg to run as root user"
 msgstr "      --asroot     Tillåt makepkg att köras som root"
 
-#, fuzzy
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr ""
-"  --config <config> Använd en alternativ konfigurationsfil (istället för "
-"'%s')"
+"  --config <file> Använd en alternativ konfigurationsfil (istället för '%s')"
 
-#, fuzzy
 msgid ""
 "  --holdver        Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr ""
-"      --holdver    Förhindra automatisk versionsdump för "
+"      --holdver    Förhindra automatisk versionsuppdatering för "
 "utvecklingsversioner av PKGBUILDs "
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
-msgstr ""
+msgstr "    --pkg <list>        Bygg endast listade paket från ett delat paket"
 
-#, fuzzy
 msgid "  --skipinteg      Do not fail when integrity checks are missing"
 msgstr "      --skipinteg  Misslyckas inte när integritetskontroller saknas"
 
-#, fuzzy
 msgid ""
 "  --source         Generate a source-only tarball without downloaded sources"
 msgstr ""
-"      --source     Generera en tarball med enbart källkoden utan att ladda "
-"ner källor"
+"      --source     Generera en tarball med enbart källkod utan nerladdade "
+"källkodsfiler"
 
 msgid "These options can be passed to pacman:"
 msgstr "Dessa argument kan skickas till pacman:"
 
-#, fuzzy
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr ""
 "      --noconfirm      Fråga inte efter bekräftelse vid bestämmande av "
 "beroenden"
 
-#, fuzzy
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr ""
 "      --noprogressbar  Visa inte en förloppsindikator vid nerladdning av "
@@ -1413,9 +1393,8 @@ msgstr ""
 msgid "%s not found."
 msgstr "% hittades inte."
 
-#, fuzzy
 msgid "You do not have write permission to store packages in %s."
-msgstr "Du har inte skrivrättigheter för att spara nerladdningar i %s."
+msgstr "Du har inte skrivrättigheter för att spara paket i %s."
 
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Du har inte skrivrättigheter för att spara nerladdningar i %s."
@@ -1483,7 +1462,7 @@ msgstr ""
 "Använd inte flaggan '-F'. Detta argument är enbart för användning av makepkg."
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
-msgstr ""
+msgstr "Sudo kunde inte hittas, använder su för att få root-rättigheter."
 
 msgid "%s does not exist."
 msgstr "%s existerar inte."
@@ -1510,10 +1489,10 @@ msgstr ""
 "över)"
 
 msgid "Repackaging without the use of a package() function is deprecated."
-msgstr ""
+msgstr "Ompaketering utan att använda en package()-funktion är föråldrat."
 
 msgid "File permissions may not be preserved."
-msgstr ""
+msgstr "Filrättigheterna kanske inte bevaras."
 
 msgid "Leaving fakeroot environment."
 msgstr "Lämnar fakeroot miljö."
@@ -1521,9 +1500,9 @@ msgstr "Lämnar fakeroot miljö."
 msgid "Making package: %s"
 msgstr "Skapar paket: %s"
 
-#, fuzzy
 msgid "A source package has already been built. (use -f to overwrite)"
-msgstr "Ett paket har redan blivit byggt, (använd -f för att skriva över)"
+msgstr ""
+"Ett källkodspaket har redan blivit byggt, (använd -f för att skriva över)"
 
 msgid "Source package created: %s"
 msgstr "Källkodspaket skapat: %s"
@@ -1540,9 +1519,8 @@ msgstr "Kollar beroenden för bygget..."
 msgid "Could not resolve all dependencies."
 msgstr "Kan inte lösa alla beroenden."
 
-#, fuzzy
 msgid "%s was not found in PATH; skipping dependency checks."
-msgstr "pacman hittades inte i PATH; hoppar över kontroll av beroenden."
+msgstr "%s hittades inte i PATH; hoppar över kontroll av beroenden."
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
@@ -1779,13 +1757,6 @@ msgstr "Inga paket finns kvar, skapar en tom databas."
 msgid "No packages modified, nothing to do."
 msgstr "Inga paket modifierade, ingenting att göra."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     skriv ut URIn för angivna paket och dess "
-#~ "beroenden\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s hittades inte, söker efter grupp...\n"
 

po/tr.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-05 01:35+0200\n"
 "Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n"
 "Language-Team: Türkçe <archlinux@archlinux.org.tr>\n"
@@ -857,10 +857,6 @@ msgstr "veritabanı senkronizasyonu başarısız\n"
 msgid "installed"
 msgstr "kurulu"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr "[%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "'%s' deposu mevcut değil\n"
@@ -1774,13 +1770,6 @@ msgstr "Hiç paket kalmadı, boş veritabanı yaratılıyor."
 msgid "No packages modified, nothing to do."
 msgstr "Hiç bir pakette değişiklik yapılmadı, çıkılıyor."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     paketlerin ve bağımlılıklarının tam adresini "
-#~ "göster\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s bulunamadı, grup araştırılıyor...\n"
 

po/uk.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
 "PO-Revision-Date: 2010-06-13 20:07+0300\n"
 "Last-Translator: Roman Kyrylych <roman@archlinux.org>\n"
 "Language-Team: Ukrainian (archlinux.org.ua)\n"
@@ -863,10 +863,6 @@ msgstr "не вдалося синхронізувати жодну базу д
 msgid "installed"
 msgstr "встановлено"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "репозиторій '%s' не існує\n"
@@ -1764,13 +1760,6 @@ msgstr "Не залишилося жодного пакунка, створен
 msgid "No packages modified, nothing to do."
 msgstr "Жодні пакунки не були змінені, нема що робити."
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr ""
-#~ "  -p, --print-uris     видати посилання для даних пакунків та їх "
-#~ "залежності\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s не знайдено, пошук групи...\n"
 

po/zh_CN.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2010-06-04 13:33-0500\n"
-"PO-Revision-Date: 2010-06-16 19:29+0700\n"
+"POT-Creation-Date: 2010-08-23 21:30-0500\n"
+"PO-Revision-Date: 2010-06-24 21:38+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n"
 "Language: \n"
@@ -59,7 +59,7 @@ msgstr "正在应用增量包...\n"
 
 #, c-format
 msgid "generating %s with %s... "
-msgstr "正在使用 %2$s 生成 %1$s..."
+msgstr "正在生成 %s (使用 %s) ..."
 
 #, c-format
 msgid "success!\n"
@@ -80,21 +80,21 @@ msgstr ""
 
 #, c-format
 msgid ":: Replace %s with %s/%s?"
-msgstr ":: 用 %2$s/%3$s 替代 %1$s？"
+msgstr ":: 替换 %s 吗 (使用 %s/%s )？"
 
 #, c-format
 msgid ":: %s and %s are in conflict. Remove %s?"
-msgstr ":: %1$s 与 %2$s 有冲突。删除 %3$s？"
+msgstr ":: %s 与 %s 有冲突。删除 %s 吗？"
 
 #, c-format
 msgid ":: %s and %s are in conflict (%s). Remove %s?"
-msgstr ":: %1$s 与 %2$s 有冲突 (%3$s)。删除 %4$s？"
+msgstr ":: %s 与 %s 有冲突 (%s)。删除 %s 吗？"
 
 #, c-format
 msgid ""
 ":: the following package(s) cannot be upgraded due to unresolvable "
 "dependencies:\n"
-msgstr ":: 由于无法解决依赖关系，下列软件包无法更新：\n"
+msgstr ":: 由于无法解决依赖关系，下列软件包将无法更新：\n"
 
 #, c-format
 msgid ""
@@ -106,7 +106,7 @@ msgstr ""
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
-msgstr ":: %1$s-%2$s：本地版本较新。确定要更新吗？"
+msgstr ":: %s-%s：本地版本较新。确定要更新吗？"
 
 #, c-format
 msgid ":: File %s is corrupted. Do you want to delete it?"
@@ -142,7 +142,7 @@ msgstr "单独指定安装"
 
 #, c-format
 msgid "Installed as a dependency for another package"
-msgstr "已作为其他软件包的依赖关系安装"
+msgstr "作为其他软件包的依赖关系安装"
 
 #, c-format
 msgid "Unknown"
@@ -258,15 +258,15 @@ msgstr "无法计算 %s 的完整性校验值\n"
 
 #, c-format
 msgid "MODIFIED\t%s\n"
-msgstr "修改\t%s\n"
+msgstr "修改过的 \t%s\n"
 
 #, c-format
 msgid "Not Modified\t%s\n"
-msgstr "未修改过\t%s\n"
+msgstr "未修改过的 \t%s\n"
 
 #, c-format
 msgid "MISSING\t\t%s\n"
-msgstr "缺少\t\t%s\n"
+msgstr "缺少 \t\t%s\n"
 
 #, c-format
 msgid "(none)\n"
@@ -274,7 +274,7 @@ msgstr " (无) \n"
 
 #, c-format
 msgid "no changelog available for '%s'.\n"
-msgstr "'%s' 没有可获得的更新日志。\n"
+msgstr "'%s' 没有可用的更新日志。\n"
 
 #, c-format
 msgid "options"
@@ -306,12 +306,12 @@ msgid ""
 "use '%s {-h --help}' with an operation for available options\n"
 msgstr ""
 "\n"
-"使用 '%s {-h --help}' 及某个操作以查看可得的选项\n"
+"使用 '%s {-h --help}' 及某个操作以查看可用选项\n"
 
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        删除软件包及所有的依赖于此的软件包\n"
+msgstr "  -c, --cascade        删除软件包及所有依赖于此的软件包\n"
 
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
@@ -523,7 +523,7 @@ msgstr "      --noscriptlet    不执行安装小脚本\n"
 
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
-msgstr "  -v, --verbose        循环执行\n"
+msgstr "  -v, --verbose        显示详细信息\n"
 
 #, c-format
 msgid "      --debug          display debug messages\n"
@@ -555,23 +555,23 @@ msgstr ""
 
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
-msgstr "设置根目录'%1$s' (%2$s) 时出现问题 \n"
+msgstr "设置根目录'%s' (%s) 时出现问题 \n"
 
 #, c-format
 msgid "problem setting dbpath '%s' (%s)\n"
-msgstr "设置数据库路径 '%1$s' (%2$s) 时出现问题 \n"
+msgstr "设置数据库路径 '%s' (%s) 时出现问题 \n"
 
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
-msgstr "设置日志文件 '%1$s' (%2$s)时出现问题\n"
+msgstr "设定日志文件 '%s' (%s) 时出现问题\n"
 
 #, c-format
 msgid "'%s' is not a valid debug level\n"
-msgstr "'%s' 是无效的 debug 等级\n"
+msgstr "'%s' 不是有效的除错级别\n"
 
 #, c-format
 msgid "problem adding cachedir '%s' (%s)\n"
-msgstr "设置缓存目录 '%1$s' (%2$s)时出现问题 \n"
+msgstr "添加缓存目录 '%s' (%s)时出现问题 \n"
 
 #, c-format
 msgid "only one operation may be used at a time\n"
@@ -587,7 +587,7 @@ msgstr "正在运行 XferCommand：分支失败！\n"
 
 #, c-format
 msgid "directive '%s' without value not recognized\n"
-msgstr "无法识别无值指令 '%s'\n"
+msgstr "无法识别无参数值的指令 '%s'\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
@@ -595,7 +595,7 @@ msgstr "'CleanMethod' 设置的为无效值： '%s'\n"
 
 #, c-format
 msgid "directive '%s' with a value not recognized\n"
-msgstr "无法识别带值指令 '%s'\n"
+msgstr "无法识别带参数值的指令 '%s'\n"
 
 #, c-format
 msgid ""
@@ -605,15 +605,15 @@ msgstr "镜像 '%s' 包含有 $arch 参数，但没有定义架构。\n"
 
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr "无法添加服务器 URL 到数据库 '%s': %s (%s)\n"
+msgstr "无法添加服务器 URL 到数据库 '%s'：%s (%s)\n"
 
 #, c-format
 msgid "config file %s could not be read.\n"
-msgstr "配置文件 %s 无法读取。\n"
+msgstr "无法读取配置文件 %s。\n"
 
 #, c-format
 msgid "config file %s, line %d: bad section name.\n"
-msgstr "配置文件 %s，第 %d 行：坏的章节名。\n"
+msgstr "配置文件 %s，第 %d 行：坏的章节名字。\n"
 
 #, c-format
 msgid "could not register '%s' database (%s)\n"
@@ -663,11 +663,11 @@ msgstr "错误：没有为 --owns 指定文件\n"
 
 #, c-format
 msgid "failed to find '%s' in PATH: %s\n"
-msgstr "无法在 PATH：%2$s 中找到 '%1$s' \n"
+msgstr "无法找到 '%s' (在路径：%s 中)\n"
 
 #, c-format
 msgid "failed to read file '%s': %s\n"
-msgstr "无法读取文件 '%1$s': %2$s\n"
+msgstr "无法读取文件 '%s'：%s\n"
 
 #, c-format
 msgid "cannot determine ownership of a directory\n"
@@ -675,11 +675,11 @@ msgstr "无法确定目录的所有者属性\n"
 
 #, c-format
 msgid "cannot determine real path for '%s': %s\n"
-msgstr "无法确定 '%1$s' 的真实路径：%2$s\n"
+msgstr "无法确定 '%s' 的真实路径：%s\n"
 
 #, c-format
 msgid "%s is owned by %s %s\n"
-msgstr "%1$s 属于 %2$s %3$s\n"
+msgstr "%s 属于 %s %s\n"
 
 #, c-format
 msgid "No package owns %s\n"
@@ -723,7 +723,7 @@ msgstr ":: 软件包 '%s' 未包含一个有效的架构\n"
 
 #, c-format
 msgid ":: %s: requires %s\n"
-msgstr ":: %1$s: 要求 %2$s\n"
+msgstr ":: %s: 要求 %s\n"
 
 #, c-format
 msgid "%s is designated as a HoldPkg.\n"
@@ -803,7 +803,7 @@ msgstr "文件 %s 不像是个有效的软件包，删除它吗？"
 
 #, c-format
 msgid "failed to update %s (%s)\n"
-msgstr "无法升级 %1$s (%2$s)\n"
+msgstr "无法升级 %s (%s)\n"
 
 #, c-format
 msgid " %s is up to date\n"
@@ -817,17 +817,13 @@ msgstr "无法同步任何数据库\n"
 msgid "installed"
 msgstr "已安装"
 
-#, c-format
-msgid " [%s: %s]"
-msgstr " [%s: %s]"
-
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "软件库 '%s' 不存在\n"
 
 #, c-format
 msgid "package '%s' was not found in repository '%s'\n"
-msgstr "软件包 '%1$s' 没有在 '%2$s' 软件库里找到\n"
+msgstr "软件包 '%s' 没有在 '%s' 软件库里找到\n"
 
 #, c-format
 msgid "package '%s' was not found\n"
@@ -851,7 +847,7 @@ msgstr ":: %s 与 %s 有冲突\n"
 
 #, c-format
 msgid ":: %s and %s are in conflict (%s)\n"
-msgstr ":: %1$s: 与 %2$s 冲突(%3$s)\n"
+msgstr ":: %s: 与 %s 冲突 (%s)\n"
 
 #, c-format
 msgid "Proceed with download?"
@@ -863,11 +859,11 @@ msgstr "进行安装吗？"
 
 #, c-format
 msgid "%s exists in both '%s' and '%s'\n"
-msgstr "%1$s 存在于 '%2$s' 和 '%3$s'\n"
+msgstr "%s 同时存在于 '%s' 和 '%s'\n"
 
 #, c-format
 msgid "%s: %s exists in filesystem\n"
-msgstr "%1$s: 文件系统中已存在 %2$s \n"
+msgstr "%s: 文件系统中已存在 %s \n"
 
 #, c-format
 msgid "%s is invalid or corrupted\n"
@@ -1005,13 +1001,13 @@ msgid "Aborting..."
 msgstr "正在放弃..."
 
 msgid "There is no agent set up to handle %s URLs. Check %s."
-msgstr "没有设置程序来处理 %1$s URLs。请检查 %2$s。"
+msgstr "没有设置程序来处理 %s URLs。请检查 %s。"
 
 msgid "The download program %s is not installed."
 msgstr "下载程序 %s 没有安装。"
 
 msgid "'%s' returned a fatal error (%i): %s"
-msgstr "'%1$s' 返回一个致命错误 (%i)：%2$s"
+msgstr "'%s' 返回一个致命错误 (%i)：%s"
 
 msgid "Installing missing dependencies..."
 msgstr "正在安装缺少的依赖关系..."
@@ -1155,7 +1151,7 @@ msgid "Adding %s..."
 msgstr "正在添加 %s..."
 
 msgid "Adding %s file (%s)..."
-msgstr "正在添加 %1$s 文件 (%2$s) ..."
+msgstr "正在添加 %s 文件 (%s) ..."
 
 msgid "Compressing source package..."
 msgstr "正在压缩源码包..."
@@ -1164,10 +1160,10 @@ msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
 msgid "Installing package %s with %s -U..."
-msgstr "正在使用 %2$s  -U 安装软件包 %1$s..."
+msgstr "正在安装软件包 %s (使用 %s  -U )..."
 
 msgid "Installing %s package group with %s -U..."
-msgstr "正在使用 %2$s -U 安装软件包组 %1$s..."
+msgstr "正在安装软件包组 %s (使用 %s  -U )..."
 
 msgid "Failed to install built package(s)."
 msgstr "安装创建的软件包失败。"
@@ -1197,7 +1193,7 @@ msgid "Invalid syntax for optdepend : '%s'"
 msgstr "无效的 optdepend 语法： '%s'"
 
 msgid "%s file (%s) does not exist."
-msgstr "%1$s 文件 (%2$s) 不存在。"
+msgstr "%s 文件 (%s) 不存在。"
 
 msgid "options array contains unknown option '%s'"
 msgstr "选项组含有未知的选项 '%s'"
@@ -1206,7 +1202,7 @@ msgid "missing package function for split package '%s'"
 msgstr "拆分软件包 '%s' 缺少软件包功能"
 
 msgid "requested package %s is not provided in %s"
-msgstr "%2$s 里没有提供所需求的软件包 %1$s "
+msgstr "提供所需求的软件包 %s，在 %s 里没有"
 
 msgid "Determining latest darcs revision..."
 msgstr "正在确认最新的 darcs 修正..."
@@ -1686,11 +1682,6 @@ msgstr "没有包含软件包，正在创建空数据库。"
 msgid "No packages modified, nothing to do."
 msgstr "没有软件包被修改，无事可做。"
 
-#~ msgid ""
-#~ "  -p, --print-uris     print out URIs for given packages and their "
-#~ "dependencies\n"
-#~ msgstr "  -p, --print-uris     打印指定软件包及依赖关系中的URI\n"
-
 #~ msgid "%s not found, searching for group...\n"
 #~ msgstr "%s 未找到，正在搜索软件包组...\n"
 

scripts/Makefile.am

@@ -42,6 +42,7 @@ edit = sed \
 	-e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \
 	-e 's|@SIZECMD[@]|$(SIZECMD)|g' \
 	-e 's|@SEDINPLACE[@]|$(SEDINPLACE)|g' \
+	-e 's|@DUPATH[@]|$(DUPATH)|g' \
 	-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
 
 ## All the scripts depend on Makefile so that they are rebuilt when the

scripts/makepkg.sh.in

@@ -27,7 +27,7 @@
 
 # makepkg uses quite a few external programs during its execution. You
 # need to have at least the following installed for makepkg to function:
-#   bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils),
+#   bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils),
 #   gettext, grep, gzip, openssl, sed, tput (ncurses), xz
 
 # gettext initialization
@@ -73,7 +73,7 @@ HOLDVER=0
 BUILDFUNC=0
 PKGFUNC=0
 SPLITPKG=0
-PKGLIST=""
+PKGLIST=()
 
 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call
 # when dealing with svn/cvs/etc PKGBUILDs.
@@ -265,11 +265,11 @@ check_buildenv() {
 #          ? - not found
 ##
 in_opt_array() {
-	local needle="${1,,}"; shift
+	local needle=$(tr '[:upper:]' '[:lower:]' <<< $1); shift
 
 	local opt
 	for opt in "$@"; do
-		opt="${opt,,}"
+		opt=$(tr '[:upper:]' '[:lower:]' <<< $opt)
 		if [[ $opt = $needle ]]; then
 			echo 'y' # Enabled
 			return
@@ -368,25 +368,28 @@ download_file() {
 }
 
 run_pacman() {
-	local ret=0
+	local cmd
+	printf -v cmd "%q " "$PACMAN" $PACMAN_OPTS "$@"
 	if (( ! ASROOT )) && [[ $1 != "-T" && $1 != "-Qq" ]]; then
-		if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then
-			sudo $PACMAN $PACMAN_OPTS "$@" || ret=$?
+		if [ "$(type -p sudo)" ]; then
+			cmd="sudo $cmd"
 		else
-			su -c "$PACMAN $PACMAN_OPTS $*" || ret=$?
+			cmd="su -c '$cmd'"
 		fi
-	else
-		$PACMAN $PACMAN_OPTS "$@" || ret=$?
 	fi
-	return $ret
+	eval "$cmd"
 }
 
 check_deps() {
-	(( $# > 0 )) || return
+	(( $# > 0 )) || return 0
 
+	# Disable error trap in pacman subshell call as this breaks bash-3.2 compatibility
+	# Also, a non-zero return value is not unexpected and we are manually dealing them
+	set +E
 	local ret=0
-	pmout=$(run_pacman -T "$@")
-	ret=$?
+	pmout=$(run_pacman -T "$@") || ret=$?
+	set -E 
+	
 	if (( ret == 127 )); then #unresolved deps
 		echo "$pmout"
 	elif (( ret )); then
@@ -554,7 +557,7 @@ generate_checksums() {
 
 	local integ
 	for integ in ${integlist[@]}; do
-		integ="${integ,,}"
+		integ=$(tr '[:upper:]' '[:lower:]' <<< "$integ")
 		case "$integ" in
 			md5|sha1|sha256|sha384|sha512) : ;;
 			*)
@@ -617,7 +620,7 @@ check_checksums() {
 				fi
 
 				if (( $found )) ; then
-					local expectedsum="${integrity_sums[$idx],,}"
+					local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}")
 					local realsum="$(openssl dgst -${integ} "$file")"
 					realsum="${realsum##* }"
 					if [[ $expectedsum = $realsum ]]; then
@@ -864,6 +867,9 @@ tidy_install() {
 
 	if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then
 		msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")"
+		# make sure library stripping variables are defined to prevent excess stripping
+		[[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S"
+		[[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S"
 		local binary
 		find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do
 			case "$(file -bi "$binary")" in
@@ -895,7 +901,7 @@ write_pkginfo() {
 	else
 		local packager="Unknown Packager"
 	fi
-	local size="$(du -sk)"
+	local size="$(@DUPATH@ -sk)"
 	size="$(( ${size%%[^0-9]*} * 1024 ))"
 
 	msg2 "$(gettext "Generating .PKGINFO file...")"
@@ -973,7 +979,7 @@ check_package() {
 	done
 
 	# check for references to the build directory
-	if grep -R "${srcdir}" "${pkgdir}" &>/dev/null; then
+	if find "${pkgdir}" -type f -exec grep -q "${srcdir}" {} +; then
 		warning "$(gettext "Package contains reference to %s")" "\$srcdir"
 	fi
 }
@@ -1243,7 +1249,7 @@ check_sanity() {
 			# evaluate any bash variables used
 			eval file=${file}
 			if [[ ! -f $file ]]; then
-				error "$(gettext "%s file (%s) does not exist.")" "${i^}" "$file"
+				error "$(gettext "%s file (%s) does not exist.")" "$i" "$file"
 				return 1
 			fi
 		done
@@ -1579,7 +1585,7 @@ while true; do
 		-m|--nocolor)     USE_COLOR='n' ;;
 		-o|--nobuild)     NOBUILD=1 ;;
 		-p)               shift; BUILDFILE=$1 ;;
-		--pkg)            shift; PKGLIST=$1 ;;
+		--pkg)            shift; PKGLIST=($1) ;;
 		-r|--rmdeps)      RMDEPS=1 ;;
 		-R|--repackage)   REPKG=1 ;;
 		--skipinteg)      SKIPINTEG=1 ;;
@@ -1623,12 +1629,22 @@ PACMAN=${PACMAN:-pacman}
 # check if messages are to be printed using color
 unset ALL_OFF BOLD BLUE GREEN RED YELLOW
 if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then
-	ALL_OFF="$(tput sgr0)"
-	BOLD="$(tput bold)"
-	BLUE="${BOLD}$(tput setaf 4)"
-	GREEN="${BOLD}$(tput setaf 2)"
-	RED="${BOLD}$(tput setaf 1)"
-	YELLOW="${BOLD}$(tput setaf 3)"
+	# prefer terminal safe colored and bold text when tput is supported
+	if tput setaf 0 &>/dev/null; then
+		ALL_OFF="$(tput sgr0)"
+		BOLD="$(tput bold)"
+		BLUE="${BOLD}$(tput setaf 4)"
+		GREEN="${BOLD}$(tput setaf 2)"
+		RED="${BOLD}$(tput setaf 1)"
+		YELLOW="${BOLD}$(tput setaf 3)"
+	else
+		ALL_OFF="\033[1;0m"
+		BOLD="\033[1;1m"
+		BLUE="${BOLD}\033[1;34m"
+		GREEN="${BOLD}\033[1;32m"
+		RED="${BOLD}\033[1;31m"
+		YELLOW="${BOLD}\033[1;33m"
+	fi
 fi
 readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
 
@@ -1666,7 +1682,7 @@ if (( CLEANCACHE )); then
 		echo -n "$(gettext "    Are you sure you wish to do this? ")"
 		echo -n "$(gettext "[y/N]")"
 		read answer
-		answer="${answer^^}"
+		answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer")
 		if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then
 			rm "$SRCDEST"/*
 			if (( $? )); then
@@ -1794,7 +1810,7 @@ pkgbase=${pkgbase:-${pkgname[0]}}
 
 if [[ -n "${PKGLIST[@]}" ]]; then
 	unset pkgname
-	pkgname="${PKGLIST[@]}"
+	pkgname=("${PKGLIST[@]}")
 fi
 
 if (( ! SPLITPKG )); then

scripts/rankmirrors.sh.in

@@ -49,7 +49,7 @@ version() {
 }
 
 err() {
-	echo "$1"
+	echo "$1" >&2
 	exit 1
 }
 
@@ -70,15 +70,15 @@ ARCH="$(uname -m)"
 getfetchurl() {
 	local strippedurl="${1%/}"
 
-	local replacedurl="${replacedurl//'$arch'/$ARCH}"
+	local replacedurl="${strippedurl//'$arch'/$ARCH}"
 	if [[ ! $TARGETREPO ]]; then
-		replacedurl="${strippedurl//'$repo'/core}"
+		replacedurl="${replacedurl//'$repo'/core}"
 		local tmp="${replacedurl%/*}"
 		tmp="${tmp%/*}"
 
 		local reponame="${tmp##*/}"
 	else
-		replacedurl="${strippedurl//'$repo'/$TARGETREPO}"
+		replacedurl="${replacedurl//'$repo'/$TARGETREPO}"
 		local reponame="$TARGETREPO"
 	fi
 
@@ -184,9 +184,9 @@ fi
 
 timesarray=()
 for line in  "${linearray[@]}"; do
-	if [[ $line =~ ^# ]]; then
+	if [[ $line =~ ^[[:space:]]*# ]]; then
 		[[ $TIMESONLY ]] || echo $line
-	elif [[ $line =~ ^Server ]]; then
+	elif [[ $line =~ ^[[:space:]]*Server ]]; then
 
 		# Getting values and times and such
 		server="${line#*= }"

scripts/repo-add.sh.in

@@ -487,7 +487,11 @@ if (( success )); then
 
 	[[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old"
 	[[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE"
-	ln -sf "$REPO_DB_FILE" "${REPO_DB_FILE%.tar.*}"
+	dblink="${REPO_DB_FILE%.tar.*}"
+	target=${REPO_DB_FILE##*/}
+	ln -sf "$target" "$dblink" 2>/dev/null || \
+		ln -f "$target" "$dblink" 2>/dev/null || \
+		cp "$REPO_DB_FILE" "$dblink"
 else
 	msg "$(gettext "No packages modified, nothing to do.")"
 	exit 1

src/pacman/util.c

@@ -22,6 +22,7 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 
 #include <stdio.h>

test/pacman/pmpkg.py

@@ -164,14 +164,8 @@ class pmpkg:
 
         # Generate package archive
         tar = tarfile.open(self.path, "w:gz")
-
-        # package files
-        for root, dirs, files in os.walk('.'):
-            for d in dirs:
-                tar.add(os.path.join(root, d), recursive=False)
-            for f in files:
-                tar.add(os.path.join(root, f))
-
+        for i in os.listdir("."):
+            tar.add(i)
         tar.close()
 
         os.chdir(curdir)

test/pacman/pmtest.py

@@ -110,10 +110,13 @@ class pmtest:
         tmpdir = os.path.join(self.root, TMPDIR)
         logdir = os.path.join(self.root, os.path.dirname(LOGFILE))
         etcdir = os.path.join(self.root, os.path.dirname(PACCONF))
-        for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir]:
+        bindir = os.path.join(self.root, "bin")
+        for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir]:
             if not os.path.isdir(dir):
                 vprint("\t%s" % dir[len(self.root)+1:])
                 os.makedirs(dir, 0755)
+        # Only the dynamically linked binary is needed for fakechroot
+        shutil.copy("/bin/sh", bindir)
 
         # Configuration file
         vprint("    Creating configuration file")

test/pacman/tests/ignore006.py

@@ -0,0 +1,10 @@
+self.description = "Sync with target in ignore list and say no"
+
+pkg = pmpkg("package1")
+self.addpkg2db("sync", pkg)
+
+self.option["IgnorePkg"] = ["package1"]
+self.args = "--ask=1 -S %s" % pkg.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXIST=package1")

test/pacman/tests/sync022.py

@@ -0,0 +1,25 @@
+self.description = "Install a group from a sync db using --needed"
+
+lp1 = pmpkg("pkg1")
+lp2 = pmpkg("pkg2")
+lp3 = pmpkg("pkg3")
+
+sp1 = pmpkg("pkg1", "1.1-1")
+sp2 = pmpkg("pkg2")
+sp3 = pmpkg("pkg3")
+
+for p in lp1, lp2, lp3, sp1, sp2, sp3:
+	setattr(p, "groups", ["grp"])
+
+for p in lp1, lp2, lp3:
+	self.addpkg2db("local", p)
+
+for p in sp1, sp2, sp3:
+	self.addpkg2db("sync", p);
+
+self.args = "-S --needed grp"
+
+self.addrule("PACMAN_RETCODE=0")
+for p in sp1, sp2, sp3:
+	self.addrule("PKG_EXIST=%s" % p.name)
+self.addrule("PKG_VERSION=pkg1|1.1-1")

test/pacman/tests/sync023.py

@@ -0,0 +1,29 @@
+self.description = "Install a group from a sync db using --needed (testing repo)"
+
+lp1 = pmpkg("pkg1", "1.1-1")
+lp2 = pmpkg("pkg2")
+lp3 = pmpkg("pkg3")
+
+sp1 = pmpkg("pkg1")
+sp2 = pmpkg("pkg2")
+sp3 = pmpkg("pkg3")
+newp1 = pmpkg("pkg1", "1.1-1")
+
+for p in lp1, lp2, lp3, sp1, sp2, sp3, newp1:
+	setattr(p, "groups", ["grp"])
+
+for p in lp1, lp2, lp3:
+	self.addpkg2db("local", p)
+
+self.addpkg2db("testing", newp1);
+
+for p in sp1, sp2, sp3:
+	self.addpkg2db("sync", p);
+
+self.args = "-S --needed grp"
+
+self.addrule("PACMAN_RETCODE=0")
+for p in sp1, sp2, sp3:
+	self.addrule("PKG_EXIST=%s" % p.name)
+# The newer version should still be installed
+self.addrule("PKG_VERSION=pkg1|1.1-1")