Update NEWS and configure.ac for 3.1.4 release

Also fix a broken contrib/ Makefile, found with make distcheck. I also let
the little translation linebreak update slip in here as it was small enough
not to be a big deal, and this should just prevent it from happening again
later anyway.

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

ChangeLog.proto

@@ -0,0 +1,16 @@
+2007-12-01 Your Name <youremail@domain.com>
+
+	* pkgver-pkgrel :
+	new upstream release.
+	Reason we changed stuff.
+	Another reason we changed stuff.
+
+	* gcc-4.1.patch :
+	Removed, no longer needed.
+
+2007-11-01 Your Name <youremail@domain.com>
+
+	* 1.0-5 :
+	added ChangeLog.
+	the last line should end with just one newline.
+	you can cat the file to check it displays fine.

Makefile.am

@@ -9,7 +9,7 @@ EXTRA_DIST = HACKING
 
 # Sample makepkg prototype files
 pkgdatadir = ${datadir}/${PACKAGE}
-dist_pkgdata_DATA = PKGBUILD.proto proto.install
+dist_pkgdata_DATA = PKGBUILD.proto proto.install ChangeLog.proto
 
 # run the pactest test suite
 check-local:  src/pacman

NEWS

@@ -1,5 +1,33 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.1.4         - various small code cleanups and fixes
+              - small documentation updates
+              - improvements to PKGBUILD.vim
+              - translation updates - ru, zh_CN
+3.1.3         - major updates to i18n output in frontend (all UTF-8 characters
+                should now work with varying byte and char widths)
+              - new Simplified Chinese translation
+              - updates to testpkg utility
+              - updates to PKGBUILD.vim
+              - internal updates for translations - use c-format on all
+                strings, get rid of needless line numbers
+3.1.2         - updates to proto.install, add ChangeLog.proto (FS#7231)
+              - add 'force' option to packages, and have repo-add respect it
+              - mark gensync and updatesync as deprecated
+              - fix pacman -Qo behavior on symlinks (FS#9473)
+              - fix segfault on a broken symlinks in backup code (FS#9235)
+              - ensure filename is determined correctly for a pkg (FS#9547)
+              - fix conflict progress bar with UTF-8 chars (FS#6437)
+              - fix chk_fileconflicts brokenness, ensure it reads entire list
+              - ensure -Sc operation locks DB, only checks DBs (FS#9609)
+              - minor documentation and message updates
+              - moved some translations to their more generic lang codes
+              - allow scripts to be run without gettext installed
+              - makepkg:
+                - check to ensure we have non-URL sources (FS#9208)
+                - ensure we strip binaries in /opt/ dirs (FS#9342)
+                - check for VCS executable before using (FS#9230)
+                - set sane umask before source extraction (FS#9242, FS#9362)
 3.1.1         - fix versioned provisions handling- use '=' instead of ' ' which
                 differs from original spec but better in long run (FS#9171)
               - rename query --orphans to --unrequired (FS#9144)
@@ -451,7 +479,7 @@ VERSION         DESCRIPTION
 2.2           - More bugfixes
               - Added --downloadonly switch to --sync
 2.1           - Lots of bugfixes
-              - Added support for multiple respositories
+              - Added support for multiple repositories
               - Improved the config file layout
               - Improved dependency resolution and sorting
 2.0           - Added dependency functionality
@@ -479,4 +507,4 @@ VERSION         DESCRIPTION
               - Changed db_find_conflicts() to ignore directories
 1.0           - Initial Release
 
-vim: set et:
+vim: set et spell spelllang=en_us:

TRANSLATORS

@@ -10,34 +10,33 @@ If your language is not listed here and you wish it was, let the pacman mailing
 list know you are interested in making a translation. We will be happy to add
 your language to the mix.
 
-* indicates the last active translator.
-
-Czech (cs_CZ):
-	* Vojtěch Gondžala <vogo@seznam.cz>
+Czech (cs):
+	Vojtěch Gondžala <vojtech.gondzala@gmail.com>
 German (de):
-	* Matthias Gorissen <matthias@archlinux.de>
-	Pierre Schmitz <pierre@archlinux.de>
+	Matthias Gorissen <matthias@archlinux.de>
+	Benjamin Andresen <benny@in-ulm.de>
 British English (en_GB):
-	* Jeff Bailes <thepizzaking@gmail.com>
+	Jeff Bailes <thepizzaking@gmail.com>
 Spanish (es):
-	* Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
+	Fernando Lagos <fernando@zerial.org>
+	Juan Pablo Gonzalez <jotapesan@gmail.com>
 French (fr):
-	* Chantry Xavier <shiningxc@gmail.com>
-	solsTiCe d'Hiver <solstice.dhiver@laposte.net>
+	Chantry Xavier <shiningxc@gmail.com>
 Hungarian (hu):
-	* Nagy Gabor <ngaba@bibl.u-szeged.hu>
+	Nagy Gabor <ngaba@bibl.u-szeged.hu>
 Italian (it):
-	* Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
-	Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>
-Polish (pl_PL):
-	* Mateusz Jędrasik <m.jedrasik@gmail.com>
+	Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
+Polish (pl):
+	Mateusz Herych <heniekk@gmail.com>
+	Jaroslaw Swierczynski <swiergot@gmail.com>
+	Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
-	* João Felipe Santos <joao.eel@gmail.com>
-	Douglas Soares de Andrade <douglas@archlinux-br.org>
-	Hugo Doria <hugodoria@archlinux-br.org>
-	Lincoln de Sousa <lincoln@archlinux-br.org>
-	Leandro Inácio <leandro@archlinux-br.org>
-Russian (ru_RU):
+	<none>
+Russian (ru):
+	Sergey Tereschenko <serg.partizan@gmail.com>
+	Vitaly Dolgov <ferhiord@gmail.com>
+	Oleg Finkelshteyn <olegfink@gmail.com>
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
+Simplified Chinese (zh_CN):
+	甘露(Lu.Gan) <rhythm.gan@gmail.com>
 

configure.ac

@@ -46,13 +46,13 @@ AC_PREREQ(2.60)
 #     For code under development: [devel]
 #     For production releases:    []
 
-m4_define([lib_current], [3])
-m4_define([lib_revision], [0])
-m4_define([lib_age], [1])
+m4_define([lib_current], [5])
+m4_define([lib_revision], [1])
+m4_define([lib_age], [3])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [1])
+m4_define([pacman_version_micro], [4])
 m4_define([pacman_version_suffix], [])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])

contrib/Makefile.am

@@ -4,7 +4,7 @@ EXTRA_DIST = \
 	pacdiff \
 	pacsearch \
 	re-pacman \
-	vimproject \
+	vimprojects \
 	wget-xdelta.sh \
 	zsh_completion \
 	README

contrib/PKGBUILD.vim

@@ -9,7 +9,7 @@
 if version < 600
 	syntax clear
 elseif exists("b:current_syntax")
-    finish
+	finish
 endif
 
 let b:main_syntax = "sh"
@@ -57,32 +57,38 @@ syn keyword pb_k_license license contained
 syn keyword pbLicense  APACHE CDDL EPL FDL GPL LGPL MPL PHP RUBY ZLIB ISC MIT BSD contained
 syn match pbLicenseCustom /custom\(:[[:alnum:]]*\)*/ contained
 syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense
-syn match pbLicenseGroup /^license=.*/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense,shDoubleQuote,shSingleQuote
+syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense
 
 " backup
 syn keyword pb_k_backup backup contained
 syn match pbValidBackup   /\.\?[[:alpha:]]*\/[[:alnum:]\{\}+._$-]*]*/ contained
-syn match pbBackupGroup /^backup=.*/ contains=pb_k_backup,pbValidBackup,shDoubleQuote,shSingleQuote
+syn region pbBackupGroup start=/^backup=(/ end=/)/ contains=pb_k_backup,pbValidBackup,shDoubleQuote,shSingleQuote
 
 " arch
 syn keyword pb_k_arch arch contained
 syn keyword pbArch i686 x86_64 ppc contained
-syn match pbIllegalArch /[^='() ]/ contained contains=pbArch
-syn match pbArchGroup /^arch=.*/ contains=pb_k_arch,pbArch,pbIllegalArch,shDoubleQuote,shSingleQuote
+syn match pbIllegalArch /[^='"() ]/ contained contains=pbArch
+syn region pbArchGroup start=/^arch=(/ end=/)/ contains=pb_k_arch,pbArch,pbIllegalArch
 
-" makedepends
-syn keyword pb_k_makedepends makedepends contained
-syn match pbValidMakedepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
-syn region pbMakedependsGroup start=/^makedepends=(/ end=/)/ contains=pb_k_makedepends,pbValidMakedepends,shDoubleQuote,shSingleQuote
+" groups
+syn keyword pb_k_groups groups contained
+syn match pbValidGroups /\([[:alnum:]]\|+\|-\|_\)*/ contained
+syn region pbGroupsGroup start=/^groups=(/ end=/)/ contains=pb_k_groups,pbValidGroups,shDoubleQuote,shSingleQuote
 
 " depends
 syn keyword pb_k_depends depends contained
 syn match pbValidDepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
 syn region pbDependsGroup start=/^depends=(/ end=/)/ contains=pb_k_depends,pbValidDepends,shDoubleQuote,shSingleQuote
 
-" XXX little hack to color conflicts/provides/replaces keyword even without =()
-syn match  pbkw /^\(conflicts\|provides\|replaces\)/ contains=pb_k_conflicts,pb_k_provides,pb_k_replaces
-hi def link pbkw keyword
+" makedepends
+syn keyword pb_k_makedepends makedepends contained
+syn match pbValidMakedepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
+syn region pbMakedependsGroup start=/^makedepends=(/ end=/)/ contains=pb_k_makedepends,pbValidMakedepends,shDoubleQuote,shSingleQuote
+
+" optdepends
+syn keyword pb_k_optdepends optdepends contained
+syn match pbValidOptdepends /\([[:alnum:]]\|+\|-\|_\)*/ contained
+syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote
 
 " conflicts
 syn keyword pb_k_conflicts conflicts contained
@@ -100,7 +106,7 @@ syn match pbValidReplaces /\([[:alnum:]]\|+\|-\|_\)*/ contained
 syn region pbReplacesGroup start=/^replaces=(/  end=/)/ contains=pb_k_replaces,pbValidReplaces,shDoubleQuote,shSingleQuote
 
 " install
-" XXX remove install from bashStatement, fix strage bug
+" XXX remove install from bashStatement, fix strange bug
 syn clear bashStatement
 syn keyword bashStatement chmod clear complete du egrep expr fgrep find gnufind gnugrep grep less ls mkdir mv rm rmdir rpm sed sleep sort strip tail touch
 
@@ -110,7 +116,7 @@ syn match pbIllegalInstall /[^=]/ contained contains=pbValidInstall
 syn match pbInstallGroup /^install=.*/ contains=pb_k_install,pbValidInstall,pbIllegalInstall,shDeref,shDoubleQuote,shSingleQuote
 
 " source:
-" XXX remove source from shStatement, fixstrange bug
+" XXX remove source from shStatement, fix strange bug
 syn clear shStatement
 syn keyword shStatement xxx wait getopts return autoload whence printf true popd nohup enable r trap readonly fc fg kill ulimit umask disown stop pushd read history logout times local exit test pwd time eval integer suspend dirs shopt hash false newgrp bg print jobs continue functions exec help cd break unalias chdir type shift builtin let bind
 
@@ -125,7 +131,7 @@ hi def link pbDerefEmulation PreProc
 syn keyword pb_k_md5sums md5sums contained
 syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums
 syn match pbValidMd5sums /[[:alnum:]]\{32\}/ contained
-syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums
+syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums keepend
 syn match pbMd5Quotes /'.*'\|".*"/ contained contains=pbMd5Hash,pbIllegalMd5sums
 syn match pbMd5Hash /[[:alnum:]]\+/ contained contains=pbValidMd5sums
 hi def link pbMd5Quotes Keyword
@@ -136,7 +142,7 @@ hi def link pbValidMd5sums  Number
 syn keyword pb_k_sha1sums sha1sums contained
 syn match pbIllegalSha1sums /[^='"()\/ ]/ contained contains=pbValidSha1sums
 syn match pbValidSha1sums /[[:alnum:]]\{40\}/ contained
-syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums
+syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums keepend
 syn match pbSha1Quotes /'.*'\|".*"/ contained contains=pbSha1Hash,pbIllegalSha1sums
 syn match pbSha1Hash /[[:alnum:]]\+/ contained contains=pbValidSha1sums
 hi def link pbSha1Quotes Keyword
@@ -195,7 +201,9 @@ hi def link pb_k_backup pbKeywords
 hi def link pb_k_arch pbKeywords
 hi def link pbIllegalArch Error
 
+hi def link pb_k_groups pbKeywords
 hi def link pb_k_makedepends pbKeywords
+hi def link pb_k_optdepends pbKeywords
 hi def link pb_k_depends pbKeywords
 hi def link pb_k_replaces pbKeywords
 hi def link pb_k_conflicts pbKeywords

contrib/README

@@ -19,8 +19,7 @@ listed.
 re-pacman - regenerate a pacman package based on installed files and the pacman
 database entries. Useful for reuse, or possible config file extension.
 
-vimproject - a project file for the vim project plugin (some files listed
-may need to be updated).
+vimprojects - a project file for the vim project plugin.
 
 wget-xdelta.sh - A download script for pacman which allows binary deltas
 generated with makepkg to be used instead of downloading full binary packages.

contrib/vimproject

@@ -1,96 +0,0 @@
-This is a project file for the vim-project
-plugin.  I like it, so decided to contribute
-this to the main repo.
-$ pacman -S vim-project
-change the pacman= path below
-$ vim
-:Project vimproject
-
-pacman=~/devel/pacman-lib CD=. flags=S {
- Makefile.am
- configure.ac
- libalpm=lib/libalpm/ filter="*.c *.h *.am"{
-  add.c
-  alpm.c
-  alpm_list.c
-  backup.c
-  be_files.c
-  cache.c
-  conflict.c
-  db.c
-  deps.c
-  error.c
-  group.c
-  handle.c
-  log.c
-  md5.c
-  package.c
-  provide.c
-  remove.c
-  server.c
-  sync.c
-  trans.c
-  util.c
-  add.h
-  alpm.h
-  alpm_list.h
-  backup.h
-  cache.h
-  conflict.h
-  db.h
-  deps.h
-  error.h
-  group.h
-  handle.h
-  log.h
-  md5.h
-  package.h
-  provide.h
-  remove.h
-  server.h
-  sync.h
-  trans.h
-  util.h
-  Makefile.am
-  Makefile.in
- }
- pacman=src/pacman/ filter="*.c *.h *.am" {
-  add.c
-  conf.c
-  deptest.c
-  downloadprog.c
-  log.c
-  package.c
-  pacman.c
-  query.c
-  remove.c
-  sync.c
-  trans.c
-  upgrade.c
-  util.c
-  add.h
-  conf.h
-  deptest.h
-  downloadprog.h
-  log.h
-  package.h
-  query.h
-  remove.h
-  sync.h
-  trans.h
-  upgrade.h
-  util.h
-  Makefile.am
- }
- utils=src/util filter="*.c *.h *.am" {
-  testpkg.c
-  vercmp.c
-  Makefile.am
- }
- contrib=contrib CD=. {
-  bash_completion
-  pacsearch
-  vimproject
-  zsh_completion
- }
-}

contrib/vimprojects

@@ -0,0 +1,25 @@
+This is a project file
+for the vim-project plugin.
+Save it as ~/.vimprojects
+
+$ pacman -S vim-project
+change the pacman path below
+$ vim
+:Project
+
+Press \r in the project view
+on a project name to generate
+the list of files
+
+pacman=~/devel/pacman/ CD=. filter="*.ac *.am" flags=S {
+  libalpm=lib/libalpm/ filter="*.c *.h *.am" {
+  }
+  pacman=src/pacman/ filter="*.c *.h *.am" {
+  }
+  scripts=scripts/ filter="*.sh.in *.py.in *.am" {
+  }
+  utils=src/util filter="*.c *.h *.am" {
+  }
+  contrib=contrib CD=. {
+  }
+}

doc/makepkg.8.txt

@@ -28,6 +28,11 @@ build the package, install the package into a temporary root, make
 customizations, generate meta-info, and package the whole thing up for pacman
 to use.
 
+NOTE: makepkg uses your current locale by default and does not unset it when
+building packages. If you wish to share your build output with others when
+seeking help or for other purposes, you may wish to run "`LC_ALL=C makepkg`" so
+your logs and output are not localized.
+
 Options
 -------
 *\--asroot*::
@@ -73,7 +78,7 @@ Options
 	default to the current directory. This allows the built package to be
 	overwritten.
 
-*-forcever*::
+*--forcever*::
 	This is a hidden option that should *not* be used unless you really know
 	what you are doing. makepkg uses this internally when calling itself to
 	set the new development pkgver of the package.
@@ -83,7 +88,7 @@ Options
 	if required and generate integrity checks. The integrity checks
 	generated are determined by the value of the INTEGRITY_CHECK array in
 	linkman:makepkg.conf[5]. This output can be redirected into your
-	PKGBUILD for source validation (`makepkg -g >> PKGBUILD`).
+	PKGBUILD for source validation using "`makepkg -g >> PKGBUILD`".
 
 *-h, \--help*::
 	Output syntax and command line options.
@@ -97,6 +102,13 @@ Options
 	Install or upgrade the package after a successful build using
 	linkman:pacman[8].
 
+*-L, \--log*::
+	Enable makepkg build logging. This will use the *tee* program to send
+	output of the `build()` function to both the console and to a text file in
+	the build directory named `pkgname-pkgver-pkgrel-arch.log`. As mentioned
+	above, the build log will be localized so you may want to set your locale
+	accordingly if sharing the log output with others.
+
 *-m, \--nocolor*::
 	Disable color in output messages.
 

doc/pacman.conf.5.txt

@@ -104,8 +104,9 @@ Options
 
 *NoUpgrade =* file ...::
 	All files listed with a `NoUpgrade` directive will never be touched during
-	a package install/upgrade. Do not include the leading slash when specifying
-	files.
+	a package install/upgrade.
+	These files refer to files in the package archive, so do not include the
+	leading slash (the RootDir) when specifying them.
 
 *NoExtract =* file ...::
 	All files listed with a `NoExtract` directive will never be extracted from
@@ -113,6 +114,8 @@ Options
 	of a package to be installed. For example, if your httpd root uses an
 	'index.php', then you would not want the 'index.html' file to be extracted
 	from the 'apache' package.
+	These files refer to files in the package archive, so do not include the
+	leading slash (the RootDir) when specifying them.
 
 *UseSyslog*::
 	Log action messages through syslog(). This will insert log entries into
@@ -127,7 +130,7 @@ Options
 
 *TotalDownload*::
 	When downloading, display the amount downloaded, download rate, ETA,
-	and completed percentage of the entire download list list rather
+	and completed percentage of the entire download list rather
 	than the percent of each individual download target. The progress
 	bar is still based solely on the current file download.
 

etc/makepkg.conf.in

@@ -71,7 +71,7 @@ OPTIONS=(strip !docs libtool emptydirs)
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
 #-- Info and doc directories to remove (if option set correctly above)
-DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc})
+DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc})
 
 #########################################################################
 # PACKAGE OUTPUT

etc/pacman.conf.in

@@ -16,6 +16,20 @@
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#NoPassiveFtp
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
 #
 # REPOSITORIES
 #   - can be defined here or included from another file

lib/libalpm/add.c

@@ -243,6 +243,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm
 		char *backup = _alpm_backup_file(b->data);
 		/* safety check (fix the upgrade026 pactest) */
 		if(!alpm_list_find_str(filelist, backup)) {
+			FREE(backup);
 			continue;
 		}
 		_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",
@@ -289,7 +290,7 @@ static int extract_single_file(struct archive *archive,
 		struct archive_entry *entry, pmpkg_t *newpkg, pmpkg_t *oldpkg,
 		pmtrans_t *trans, pmdb_t *db)
 {
-	const char *entryname; /* the name of the file in the archive */
+	char entryname[PATH_MAX]; /* the name of the file in the archive */
 	mode_t entrymode;
 	char filename[PATH_MAX]; /* the actual file we're extracting */
 	int needbackup = 0, notouch = 0;
@@ -299,7 +300,7 @@ static int extract_single_file(struct archive *archive,
 	                          ARCHIVE_EXTRACT_TIME;
 	int errors = 0;
 
-	entryname = archive_entry_pathname(entry);
+	strncpy(entryname, archive_entry_pathname(entry), PATH_MAX);
 	entrymode = archive_entry_mode(entry);
 
 	memset(filename, 0, PATH_MAX); /* just to be sure */
@@ -361,14 +362,12 @@ static int extract_single_file(struct archive *archive,
 	 *      links, etc.
 	 *  12- skip extraction, dir already exists.
 	 */
-	struct stat lsbuf;
-	if(_alpm_lstat(filename, &lsbuf) != 0) {
+
+	/* do both a lstat and a stat, so we can see what symlinks point to */
+	struct stat lsbuf, sbuf;
+	if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) {
 		/* cases 1,2,3: couldn't stat an existing file, skip all backup checks */
 	} else {
-		/* do a stat as well, so we can see what symlinks point to */
-		struct stat sbuf;
-		stat(filename, &sbuf);
-
 		if(S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) {
 			/* case 12: existing dir, ignore it */
 			if(lsbuf.st_mode != entrymode) {

lib/libalpm/alpm.c

@@ -81,4 +81,9 @@ int SYMEXPORT alpm_release(void)
  * @brief Various libalpm functions
  */
 
+/* Get the version of library */
+const char SYMEXPORT *alpm_version(void) {
+	return(LIB_VERSION);
+}
+
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/alpm.h

@@ -60,6 +60,7 @@ typedef struct __pmgraph_t pmgraph_t;
 
 int alpm_initialize(void);
 int alpm_release(void);
+const char *alpm_version(void);
 
 /*
  * Logging facilities

lib/libalpm/backup.c

@@ -42,6 +42,9 @@ int _alpm_backup_split(const char *string, char **file, char **hash)
 	if(ptr == NULL) {
 		if(file) {
 			*file = str;
+		} else {
+			/* don't need our dup as the fname wasn't requested, so free it */
+			FREE(str);
 		}
 		return(0);
 	}

lib/libalpm/be_files.c

@@ -297,10 +297,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 			}
 			_alpm_strtrim(line);
 			if(!strcmp(line, "%FILENAME%")) {
-				/* filename is _new_ - it provides the real name of the package, on the
-				 * server, to allow for us to not tie the name of the actual file to the
-				 * data of the package
-				 */
 				if(fgets(info->filename, sizeof(info->filename), fp) == NULL) {
 					goto error;
 				}

lib/libalpm/conflict.c

@@ -251,10 +251,7 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
 	alpm_list_t *ret = NULL;
 	alpm_list_t *pA = filesA, *pB = filesB;
 
-	if(pB == NULL) {
-		return(alpm_list_strdup(pA));
-	}
-
+	/* if both filesA and filesB have entries, do this loop */
 	while(pA && pB) {
 		const char *strA = pA->data;
 		const char *strB = pB->data;
@@ -279,6 +276,15 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
 			}
 	  }
 	}
+	/* ensure we have completely emptied pA */
+	while(pA) {
+		const char *strA = pA->data;
+		/* skip directories */
+		if(strA[strlen(strA)-1] != '/') {
+			ret = alpm_list_add(ret, strdup(strA));
+		}
+		pA = pA->next;
+	}
 
 	return(ret);
 }

lib/libalpm/deps.c

@@ -345,7 +345,6 @@ int SYMEXPORT alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
 			satisfy = (dep->mod == PM_DEP_MOD_ANY
 					&& strcmp(provname, dep->name) == 0);
 		} else {
-			/* replace the space with a NULL byte, and advance ptr the version */
 			*provver = '\0';
 			provver += 1;
 			satisfy = (strcmp(provname, dep->name) == 0

lib/libalpm/handle.c

@@ -427,6 +427,7 @@ int SYMEXPORT alpm_option_set_logfile(const char *logfile)
 	}
 	if(handle->logstream) {
 		fclose(handle->logstream);
+		handle->logstream = NULL;
 	}
 	_alpm_log(PM_LOG_DEBUG, "option 'logfile' = %s\n", handle->logfile);
 	return(0);

lib/libalpm/package.c

@@ -162,11 +162,12 @@ const char SYMEXPORT *alpm_pkg_get_filename(pmpkg_t *pkg)
 	ASSERT(handle != NULL, return(NULL));
 	ASSERT(pkg != NULL, return(NULL));
 
+	if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
+		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
+	}
+
 	if(!strlen(pkg->filename)) {
 		/* construct the file name, it's not in the desc file */
-		if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) {
-			_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_DESC);
-		}
 		if(pkg->arch && strlen(pkg->arch) > 0) {
 			snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s-%s" PKGEXT,
 			         pkg->name, pkg->version, pkg->arch);
@@ -1079,7 +1080,7 @@ pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full)
 
 	if(!config) {
 		_alpm_log(PM_LOG_ERROR, _("missing package metadata in %s\n"), pkgfile);
-		goto error;
+		goto pkg_invalid;
 	}
 
   archive_read_finish(archive);

lib/libalpm/po/LINGUAS

@@ -1,11 +1,12 @@
 # Set of available languages.
-cs_CZ
+cs
 de
 en_GB
 es
 fr
 hu
 it
-pl_PL
+pl
 pt_BR
-ru_RU
+ru
+zh_CN

lib/libalpm/po/Makevars

@@ -8,9 +8,9 @@ subdir = po
 top_builddir = ../../../
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = \
-  --keyword=_ --flag=_:1:pass-c-format \
-  --keyword=N_ --flag=N_:1:pass-c-format
+XGETTEXT_OPTIONS = --no-location \
+  --keyword=_ --flag=_:1:c-format \
+  --keyword=N_ --flag=N_:1:c-format
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

lib/libalpm/po/cs.po

@@ -1,655 +1,585 @@
-# translation of cs_CZ.po to Čeština
+# translation of cs.po to Čeština
 # Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Vojtěch Gondžala <vogo@seznam.cz>, 2007, 2008.
+# Vojtěch Gondžala <vojtech.gondzala@gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: cs_CZ\n"
+"Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
-"PO-Revision-Date: 2008-01-15 21:56+0100\n"
-"Last-Translator: Vojtěch Gondžala <vogo@seznam.cz>\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-12 09:28+0100\n"
+"Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
 "Language-Team: Čeština\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "v seznamu cílů nahrazuji starší verzi %s-%s za %s\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "v seznamu cílů je novější veze %s-%s -- přeskakuji\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "v seznamu cílů byly nalezeny konfliktní balíčky\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nemůžete instalovat dva konfliktní balíčky současně\n"
+msgstr "nemůžete instalovat dva konfliktní balíčky společně\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "nahrazování balíčků pomocí -A a -U není nyní podporováno\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "balíčky můžete nahradit ručně použitím -Rd a -U\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"přístupová práva adresáře v %s se liší\n"
+"přístupová práva adresáře %s se neshodují\n"
 "souborový systém: %o  balíček: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "rozbalení: symbolický odkaz %s neodkazuje na adresář\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "rozbalení: nepřepisuji adresář souborem %s\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "%s nelze rozbalit (%s)\n"
+msgstr "nelze rozbalit %s (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "%s nelze přejmenovat (%s)\n"
+msgstr "nelze přejmenovat %s (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "nelze zkopírovat dočasný soubor do %s (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s uložen jako %s\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "%s nelze nainstalovat jako %s: %s\n"
+msgstr "nelze nainstalovat %s jako %s: %s\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s nainstalován jako %s\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "%s rozbaluji jako %s.pacnew\n"
+msgstr "rozbaluji %s jako %s.pacnew\n"
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "nelze určit aktuální pracovní adresář\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "při aktualizaci %s nastal problém\n"
+msgstr "nastal problém při aktualizaci %s\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "při instalaci %s nastal problém\n"
+msgstr "nastal problém při instalaci %s\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "nelze aktualizovat záznam databáze %s-%s\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "nelze přidat položku '%s' do keše\n"
+msgstr "nelze přidat položku '%s' do cache\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "chybný název záznamu v databázi '%s'\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "nelze otevřít soubor %s: %s\n"
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "nelze odstranit záznam v databázi %s%s\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "pokus o opětovné zaregistrování databáze 'local'\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "cesta k databázi nebyla určena\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "zjištěna cyklická závislost:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s bude odstraněn po %s, na kterém závisí\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s bude nainstalován před %s, na kterém závisí\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nemohu získat \"%s\", závislost \"%s\"\n"
+msgstr "nemohu vyřešit \"%s\", závislost \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "nedostatek paměti!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "neočekávaná systémová chyba"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "nedostatečná oprávnění"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "nelze najít nebo číst soubor"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "nelze najít nebo číst adresář"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "předán chybný nebo NULL argument"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "knihovna nebyla inicializována"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "knihovna inicializována"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "nelze zamknout databázi"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "nelze otevřít databázi"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "nelze vytvořit databázi"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "databáze nebyla inicializována"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "databáze zaregistrována"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "nelze nalézt databázi"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "nelze aktualizovat databázi"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
-msgstr "nelze odstranit položku databáze"
+msgstr "nelze odstranit záznam v databázi"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
-msgstr "nesprávná URL pro server"
+msgstr "nesprávná url pro server"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "nelze nastavit parametr"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "transakce inicializována"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "transakce neinicializována"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "duplicitní cíl"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "transakce nepřipravena"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "transakce zrušena"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operace není kompatibilní s typem transakce"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "nelze provést transakci"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "nelze stáhnout všechny soubory"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "nelze nalézt nebo přečíst balíček"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "neplatný nebo poškozený balíček"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "nelze otevřít soubor balíčku"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "nelze načíst data z balíčku"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "balíček je již nainstalován"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "balíček není nainstalovaný nebo má nižší verzi"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "nelze odstranit všechny soubory balíčku"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "jméno balíčku není platné"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "poškozený balíček"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "není žádný takový repositář"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
-msgstr "poškozený rozdíl"
+msgstr "poškozený delta rozdíl"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
-msgstr "rozdílový patch selhal"
+msgstr "aplikace delta rozdílu selhala"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "skupina nenalezena"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "nelze vyřešit závislosti"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "konfliktní závislosti"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "konfliktní soubory"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "uživatel zrušil operaci"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "interní chyba"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "chyba knihovny libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "nepotvrzeno"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "nesprávný regulární výraz"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
-msgstr "spojení ke vzdálenému hostiteli selhalo"
+msgstr "spojení se vzdáleným hostitelem selhalo"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "neočekávaná chyba"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "nelze zjistit MD5 kontrolní součet balíčku %s-%s\n"
+msgstr "nelze zjistit md5 kontrolní součet balíčku %s-%s\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "MD5 kontrolní součet balíčku %s-%s nesouhlasí\n"
+msgstr "md5 kontrolní součet balíčku %s-%s nesouhlasí\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: vynucená aktualizace na verzi %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: lokální (%s) je novější než %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "nelze získat soubor s popisem balíčku k %s\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "nelze získat soubor s popisem balíčku z %s\n"
+msgstr "nelze zpracovat soubor s popisem balíčku v %s\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "chybí jméno balíčku v %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "chybí veze balíčku v %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "chyba při čtení balíčku %s: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "chybí metadata balíčku v %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "nelze nalézt %s v databázi -- přeskakuji\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "nelze odstranit soubor '%s': %s\n"
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "nelze odstranit záznam databáze %s-%s\n"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "nelze odstranit položku '%s' z keše\n"
+msgstr "nelze odstranit položku '%s' z cache\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr "URL '%s' je chybná, ignoruji\n"
+msgstr "url '%s' je chybná, ignoruji\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
-msgstr "schéma URL nedefinováno, předpokládám http\n"
+msgstr "schéma url nedefinováno, předpokládám http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "selhalo získávání souboru '%s' z %s: %s\n"
+msgstr "selhalo získání souboru '%s' z %s: %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "nelze navázat stahování, začínám znovu\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "nelze zapisovat do souboru '%s'\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "chyba při stahování '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "chyba při zápisu do souboru '%s': %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "nelze změnit adresář na %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "spouštím XferCommand: větvení selhalo!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr "URL neobsahuje stahovaný soubor\n"
+msgstr "URL neobsahuje soubor pro stažení\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "selhalo stahování %s\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignoruji aktualizaci balíčku (bude nahrazen %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoruji aktualizaci balíčku (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repositář '%s' nenalezen\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s je aktuální -- přeskakuji\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s je aktuální -- přeinstalovávám\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "zjištěn nerozlišitelný konflikt balíčků\n"
+msgstr "zjištěn konflikt nerozlišitelných balíčků\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "selhala alokace paměti: nelze alokovat %zd bytů\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "příkaz: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "nelze zjistit MD5 kontrolní součet pro soubor %s\n"
+msgstr "nelze získat md5 kontrolní součet pro soubor %s\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "soubor %s byl poškozen (nesouhlasí MD5 kontrolní součet)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "selhalo stažení některých souborů z %s\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "nelze vytvořit transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "nelze inicializovat transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "nelze připravit transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "nelze provést transakci pro odstranění\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr "nelze vytvořit transakci\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "nelze inicializovat transakci\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "nelze připravit transakci\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "nelze provést transakci\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "nelze odstranit zamykací soubor %s\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Nenalezen /bin/sh v rodičovském prostředí, ruším provádění skriptů\n"
+msgstr "V rodičovském prostředí chybí /bin/sh, ruším provádění skriptů\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "nelze vytvořit dočasný adresář\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "nelze změnit adresář na %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "nelze spustit nový proces (%s)\n"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "nelze změnit kořenový adresář (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "nelze změnit adresář na / (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "volání popen selhalo (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "volání waitpid selhalo (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr "správné spouštění skriptu selhalo\n"
+msgstr "správné spuštění skriptu selhalo\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "nelze odstranit dočasný adresář %s\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "selhalo vytvoření cesty '%s': %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "nelze otevřít %s: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "neexistuje keš %s, vytvářím...\n"
+msgstr "neexistuje cache %s, vytvářím...\n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "nelze vytvořit keš balíčků, používám /tmp\n"
+msgstr "nelze vytvořit cache balíčků, používám /tmp\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
-msgstr "MD5: %s nemohl být otevřen\n"
+msgstr "md5: %s nemohl být otevřen\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
-msgstr "MD5: %s nemohl být přečten\n"
-
+msgstr "md5: %s nemohl být přečten\n"

lib/libalpm/po/de.po

@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
-"PO-Revision-Date: 2008-01-17 19:04+0100\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-15 09:26+0100\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -21,33 +21,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.4\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "Ersetze ältere Version %s-%s durch %s in der Ziel-Liste\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "Neuere Version %s-%s ist in der Ziel-Liste -- Überspringe\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "In Konflikt stehende Pakete wurden in Ziel-Liste gefunden\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit installieren\n"
+msgstr ""
+"Sie können nicht zwei in Konflikt stehende Pakete zur selben Zeit "
+"installieren\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "Das Ersetzen von Paketen mit -A und -U wird noch nicht unterstützt\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "Sie können Pakete manuell mit -Rd und -U ersetzen\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -56,619 +55,538 @@ msgstr ""
 "Verzeichnis-Berechtigungen unterscheiden sich für %s\n"
 "Dateisystem: %o Paket: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "Entpacken: Symlink %s zeigt nicht zum Verzeichnis\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "Entpacken: Überschreibe Verzeichnis nicht mit Datei %s\n"
 
-#: lib/libalpm/add.c:466
-#: lib/libalpm/add.c:610
-#: lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "Konnte %s nicht entpacken (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "Konnte %s nicht umbenennen (%s)\n"
 
-#: lib/libalpm/add.c:524
-#: lib/libalpm/add.c:544
-#: lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "Konnte temporäre Datei nicht nach %s kopieren (%s)\n"
 
-#: lib/libalpm/add.c:529
-#: lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gespeichert als %s\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "Konnte %s nicht als %s installieren: %s\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installiert als %s\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "Entpacke %s als %s.pacnew\n"
 
-#: lib/libalpm/add.c:723
-#: lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "Fehler traten auf, während %s aktualisiert wurde\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "Fehler traten bei der Installation von %s auf\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "Ungültiger Name für Datenbank-Eintrag '%s'\n"
 
-#: lib/libalpm/be_files.c:291
-#: lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451
-#: lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640
-#: lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "Konnte Datei %s nicht öffnen: %s\n"
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "Konnte Datenbank-Eintrag %s%s nicht entfernen\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "Versuche die lokale Datenbank neu zu registrieren\n"
 
-#: lib/libalpm/db.c:560
-#: lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "Datenbank-Pfad ist nicht definiert\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "Abhängigkeits-Zyklus entdeckt:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s wird nach seiner Abhängigkeit %s entfernt werden\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s wird vor seiner Abhängigkeit %s installiert werden\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "Kann \"%s\" nicht auflösen (eine Abhängigkeit von \"%s\")\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "Speicher ist voll!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "Unerwarteter Systemfehler"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "Unzureichende Rechte"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "Konnte Datei nicht finden oder lesen"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "Konnte Verzeichnis nicht finden oder lesen"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "Falsches oder NULL-Argument übergeben"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "Bibliothek nicht initialisiert"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "Bibliothek bereits initialisiert"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "Kann Datenbank nicht sperren"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "Konnte Datenbank nicht öffnen"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "Konnte Datenbank nicht erstellen"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "Datenbank nicht initialisiert"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "Datenbank bereits registriert"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "Konnte Datenbank nicht finden"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "Konnte Datenbank nicht aktualisieren"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "Konnte Datenbank-Eintrag nicht entfernen"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "Ungültige URL für den Server"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "Konnte Parameter nicht setzen"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "Vorgang bereits gestartet"
 
-#: lib/libalpm/error.c:88
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "Vorgang nicht gestartet"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "Doppelte Ziele"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "Vorgang nicht vorbereitet"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "Vorgang abgebrochen"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "Konnte den Vorgang nicht durchführen"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "Konnte nicht alle Dateien herunterladen"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "Konnte Paket nicht finden oder lesen"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "Ungültiges oder beschädigtes Paket"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "Kann Paketdatei nicht öffnen"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "Kann Paketdaten nicht laden"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "Paket ist bereits installiert"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "Paket ist nicht installiert oder ältere Version"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "Konnte nicht alle Dateien des Paketes entfernen"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "Paketname ist nicht gültig"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "Beschädigtes Paket"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "Kein solches Repositorium"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "Beschädigtes Delta"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "Delta-Patch versagte"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "Gruppe nicht gefunden"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "Kann Abhängigkeiten nicht erfüllen"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "In Konflikt stehende Abhängigkeiten"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "In Konflikt stehende Dateien"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "Benutzer brach die Aktion ab"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "Interner Fehler"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "libarchive-Fehler"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "Nicht bestätigt"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "Ungültiger Regulärer Ausdruck"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "Verbindung zum Server fehlgeschlagen"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "Unerwarteter Fehler"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "Konnte MD5-Prüfsumme für Paket %s-%s nicht ermitteln\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "MD5-Prüfsummen für Paket %s-%s stimmen nicht überein\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: Erzwungene Aktualisierung auf Version %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
-msgstr "Fehler beim Entpacken der  Paket-Beschreibungsdatei nach %s\n"
+msgstr "Fehler beim Entpacken der Paket-Beschreibungsdatei nach %s\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "Konnte Paket-Beschreibungsdatei in %s nicht analysieren\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "Fehlender Paketname in %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "Fehlende Paket-Version in %s\n"
 
-#: lib/libalpm/package.c:1061
-#: lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "Fehler beim Lesen des Paketes %s: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "Fehlende Paket-Metadaten in %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "Konnte %s nicht in Datenbank finden -- Überspringe\n"
 
-#: lib/libalpm/remove.c:172
-#: lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "Kann Datei '%s' nicht entfernen: %s\n"
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "Konnte Datenbank-Eintrag %s-%s nicht entfernen\n"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "Konnte Eintrag '%s' nicht aus dem Puffer entfernen\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "URL '%s' ist ungültig, wird ignoriert\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "URL-Schema nicht spezifiziert, vermute http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "Platte"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "Kann den Download nicht wieder aufnehmen, starte neu\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "Kann Datei '%s' nicht beschreiben\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "Fehler beim Download von '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "Fehler beim Beschreiben von Datei '%s': %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "Nutze XferCommand: Zweig versagte!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "Die URL enthält keine Datei zum Download\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "Konnte %s nicht herunterladen\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: Ignoriere zu aktualisierendes Paket (zu ersetzen durch %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: Ignoriere Paket-Aktualisierung (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "Repositorium '%s' nicht gefunden\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s ist aktuell -- Überspringe\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s ist aktuell -- Überspringe\n"
 
-#: lib/libalpm/sync.c:596
-#: lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "Nicht lösbare Paketkonflikte gefunden\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc-Fehler: Konnte %zd Bytes nicht zuweisen\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "Befehl: %s\n"
 
-#: lib/libalpm/sync.c:876
-#: lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "Kann MD5-Prüfsumme für Paket %s nicht ermitteln\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "Datei %s war beschädigt (falsche MD5-Prüfsumme)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "Konnte manche Dateien von %s nicht übertragen\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "Konnte den Lösch-Vorgang nicht erstellen\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "Konnte den Lösch-Vorgang nicht beginnen\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht vorbereiten\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "Konnte Lösch-Vorgang nicht durchführen\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr "Konnte den Vorgang nicht erstellen\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "Konnte den Vorgang nicht beginnen\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "Konnte den Vorgang nicht vorbereiten\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "Konnte den Vorgang nicht durchführen\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "Konnte Sperrdatei %s nicht entfernen\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr "Kein /bin/sh im übergeordneten Verzeichnis, breche Skript ab\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "Konnte temporäres Verzeichnis nicht erstellen\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis %s wechseln (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "Konnte keinen neuen Prozess starten (%s)\n"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "Konnte Root-Verzeichnis nicht wechseln (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "Konnte nicht zu Verzeichnis / (%s) wechseln\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "Aufruf von 'popen' fehlgeschlagen (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "Aufruf von 'waitpid' fehlgeschlagen (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "Skript konnte nicht korrekt ausgeführt werden\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "Konnte temporäres Verzeichnis %s nicht entfernen\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "Konnte Pfad '%s' nicht erstellen: %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "Konnte Datei %s nicht öffnen: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "Es existiert kein %s-Puffer. Erstelle... \n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "Konnte Paketpuffer nicht erstellen, benutze stattdessen /tmp\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s kann nicht geöffnet werden\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: %s kann nicht gelesen werden\n"

lib/libalpm/po/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
 "PO-Revision-Date: 2008-01-16 10:40+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -16,33 +16,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "replacing older version %s-%s by %s in target list\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "newer version %s-%s is in the target list -- skipping\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "conflicting packages were found in the target list\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "you cannot install two conflicting packages at the same time\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "replacing packages with -A and -U is not supported yet\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "you can replace packages manually using -Rd and -U\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -51,620 +48,538 @@ msgstr ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "extract: symlink %s does not point to dir\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extract: not overwriting dir with file %s\n"
 
-#: lib/libalpm/add.c:466
-#: lib/libalpm/add.c:610
-#: lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "could not extract %s (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "could not rename %s (%s)\n"
 
-#: lib/libalpm/add.c:524
-#: lib/libalpm/add.c:544
-#: lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "could not copy tempfile to %s (%s)\n"
 
-#: lib/libalpm/add.c:529
-#: lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s saved as %s\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "could not install %s as %s: %s\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installed as %s\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "extracting %s as %s.pacnew\n"
 
-#: lib/libalpm/add.c:723
-#: lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "could not get current working directory\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "problem occurred while upgrading %s\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "problem occurred while installing %s\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "could not update database entry %s-%s\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "could not add entry '%s' in cache\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "invalid name for database entry '%s'\n"
 
-#: lib/libalpm/be_files.c:291
-#: lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451
-#: lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640
-#: lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "could not open file %s: %s\n"
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "could not remove database entry %s%s\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "attempt to re-register the 'local' DB\n"
 
-#: lib/libalpm/db.c:560
-#: lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "database path is undefined\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "dependency cycle detected:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s will be removed after its %s dependency\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s will be installed before its %s dependency\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "cannot resolve \"%s\", a dependency of \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "out of memory!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "unexpected system error"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "insufficient privileges"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "could not find or read file"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "could not find or read directory"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "wrong or NULL argument passed"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "library not initialised"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "library already initialised"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "unable to lock database"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "could not open database"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "could not create database"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "database not initialised"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "database already registered"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "could not find database"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "could not update database"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "could not remove database entry"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "invalid url for server"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "could not set parameter"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "transaction already initialised"
 
-#: lib/libalpm/error.c:88
-#: lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "transaction not initialised"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "duplicate target"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "transaction not prepared"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "transaction aborted"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operation not compatible with the transaction type"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "could not commit transaction"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "could not download all files"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "could not find or read package"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "invalid or corrupted package"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "cannot open package file"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "cannot load package data"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "package already installed"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "package not installed or lesser version"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "cannot remove all files for package"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "package name is not valid"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "corrupted package"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "no such repository"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "corrupted delta"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "delta patch failed"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "group not found"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "could not satisfy dependencies"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "conflicting dependencies"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "conflicting files"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "user aborted the operation"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "internal error"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "libarchive error"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "not confirmed"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "invalid regular expression"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "connection to remote host failed"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "unexpected error"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "could not get md5sum for package %s-%s\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "md5sums do not match for package %s-%s\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: forcing upgrade to version %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: local (%s) is newer than %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "error extracting package description file to %s\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "could not parse package description file in %s\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "missing package name in %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "missing package version in %s\n"
 
-#: lib/libalpm/package.c:1061
-#: lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "error while reading package %s: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "missing package metadata in %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
 
-#: lib/libalpm/remove.c:172
-#: lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "cannot remove file '%s': %s\n"
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "could not remove database entry %s-%s\n"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "could not remove entry '%s' from cache\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "URL '%s' is invalid, ignoring\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "URL scheme not specified, assuming http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disk"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "failed retrieving file '%s' from %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "cannot resume download, starting over\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "cannot write to file '%s'\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "error downloading '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "error writing to file '%s': %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "could not chdir to %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "running XferCommand: fork failed!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "URL does not contain a file for download\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "failed to download %s\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignoring package upgrade (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repository '%s' not found\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s is up to date -- skipping\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s is up to date -- reinstalling\n"
 
-#: lib/libalpm/sync.c:596
-#: lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "unresolvable package conflicts detected\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc failure: could not allocate %zd bytes\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "command: %s\n"
 
-#: lib/libalpm/sync.c:876
-#: lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "can't get md5 checksum for file %s\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "file %s was corrupted (bad MD5 checksum)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "failed to retrieve some files from %s\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "could not create removal transaction\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "could not initialise the removal transaction\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "could not prepare removal transaction\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "could not commit removal transaction\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr "could not create transaction\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "could not initialise transaction\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "could not prepare transaction\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "could not commit transaction\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "could not remove lock file %s\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr "No /bin/sh in parent environment, aborting scriptlet\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "could not create temp directory\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "could not change directory to %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "could not fork a new process (%s)\n"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "could not change the root directory (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "could not change directory to / (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "call to popen failed (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "call to waitpid failed (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "scriptlet failed to execute correctly\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "could not remove tmpdir %s\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "failed to make path '%s' : %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "could not open %s: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "no %s cache exists, creating...\n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "couldn't create package cache, using /tmp instead\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s can't be opened\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: %s can't be read\n"
-

lib/libalpm/po/es.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
 "PO-Revision-Date: 2008-01-16 16:04-0300\n"
 "Last-Translator: Juan Pablo Gonzalez <jotapesan@gmail.com>\n"
 "Language-Team:  <es@li.org>\n"
@@ -16,35 +16,34 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "reemplazando la versión antigua  %s-%s por %s en la lista de objetivos\n"
+msgstr ""
+"reemplazando la versión antigua  %s-%s por %s en la lista de objetivos\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "una nueva versión  %s-%s esta en la lista de objetivos list -- saltándola\n"
+msgstr ""
+"una nueva versión  %s-%s esta en la lista de objetivos list -- saltándola\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "paquetes con conflictos fueron encontrados en la lista\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
 "usted no puede instalar simultáneamente dos paquetes que poseen conflictos "
 "entre si\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "el reemplazo de paquetes con -A y -U aún no esta soportado\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr "usted puede reemplazar manualmente los paquetes usando -Rd y -U\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -53,607 +52,540 @@ msgstr ""
 "los permisos de directorio difieren en %s\n"
 "sistema de archivos: %o paquete: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "extract: el link simbólico %s no apunta al directorio\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extract: no sobrescribiendo el dir. con el archivo %s\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "no se pudo extraer %s (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "no se pudo renombrar %s (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "no se pudo copiar el archivo temporal a %s (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s guardado como %s\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "no se pudo instalar %s como %s: %s\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s instalado como %s\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "descomprimiendo %s como %s.pacnew\n"
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "no se pudo obtener el directorio de trabajo actual\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "ocurrieron errores mientras actualizando %s\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "ocurrieron errores mientras  instalando %s\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "no se pudo actualizar en la base de datos la entrada %s-%s\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "no se pudo agregar '%s' en la cache\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nombre invalido para la entrada de la base de datos '%s'\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "no se pudo abrir el archivo %s: %s\n"
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "no se pudo quitar la entrada %s%s en la base de datos\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "intento para re-registrar la base de datos 'local'\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "ruta para la base de datos no es definido\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "ciclo de dependencias detectado:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s será quitado tras su dependencia %s\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s será instalado antes de su dependencia %s\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "no se pudo resolver \"%s\", una dependencia para \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "no hay memoria!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "error de sistema inesperado"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "privilegios insuficientes"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "no se pudo encontrar o leer el archivo"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "no se pudo leer el directorio"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "argumento erroneo o NULO"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "librería no inicializada"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "la librería ya fue inicializada"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "no se pudo bloquear la base de datos"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "no se pudo abrir la base de datos"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "no se pudo crear la base de datos"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "base de datos no inicializada"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "base de datos ya registrada"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "no se pudo encontrar la base de datos"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "no se pudo actualizar la base de datos"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "no se pudo quitar la entrada de la base de datos"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "dirección inválida para el servidor"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "no se pudo fijar el parámetro"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "la operación ya se inicializó"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "operación no inicializada"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "objetivo duplicado"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "operación no lista"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "operación abortada"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "la operación no es compatible con el tipo de transacción"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "no se pudo hacer la transacción"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "no se pudo descargar todos los archivos"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "no se pudo encontrar o leer el paquete"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "paquete invalido o corrupto"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "no se pudo abrir el archivo de paquetes"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "no se pudo cargar la información del paquete"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "el paquete ya está instalado"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "el paquete no está instalado o es una versión menor"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "no se pudo quitar todos los archivos del paquete"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "el nombre del paquete no es válido"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "paquete corrupto"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "no existe el repositorio"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "delta corrupto"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "parche delta fallado"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "grupo no encontrado"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "no se pudieron satisfacer las dependencias"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "dependencias en conflicto"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "archivos en conflicto"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "el usuario abortó la operación"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "error interno"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "error de libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "no confirmado"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "expresión regular inválida"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "falló la conexión con el host remoto"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "error inesperado"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "no se pudo obtener la verificación md5 para %s-%s\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "la verificación md5 para el paquete %s-%s no concuerda\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: forzando la actualización a la versión %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: local (%s) es más nuevo que %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "error descomprimiendo el paquete de descripción a %s\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "no se pudo interpretar el archivo de descripción en %s\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "nombre de paquete perdido en %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "versión de paquete perdida en %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "error mientras se leía el paquete %s: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "faltan los metadatos del paquete en %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "no se pudo encontrar %s en la base de datos -- saltando\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "no se pudo quitar el archivo '%s': %s\n"
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "no se pudo quitar de la base de datos %s-%s\n"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "no se pudo quitar la entrada '%s' de la cache\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "la url %s no es válida, ignorando\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "no fue especificado el esquema de url, asumiendo http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disco"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "fallo al obtener archivo '%s' desde %s: %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "no se puede resumir la descarga, empezando de nuevo\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "no se pudo escribir al archivo '%s'\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "error descargando %s: %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "no se pudo escribir al archivo '%s': %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "no se pudo cambiar el directorio a %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "ejecutando XferCommand: fallo en el fork\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "la URL no contiene un archivo para descargar\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "no se pudo descargar %s\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 "%s-%s: ignorando la actualización del paquete (para ser reemplazado por %s-%"
 "s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorando la actualización del paquete (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repositorio '%s' no encontrado\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s esta al día -- saltando\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s esta al día -- re-instalando\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "se han detectado paquetes con conflictos no resueltos\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "falla en malloc: no se pudo alocar %zd bytes\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "comando: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "no se pudo verificar md5 para el paquete %s\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "el archivo %s estaba corrupto (no coincidió la verificación MD5)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "fallo al descargar algunos archivos desde %s\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "no se pudo crear la operación de eliminación\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "no se pudo iniciar la operación de eliminación\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "no se pudo preparar la operación de eliminación\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "no se pudo enviar la operación de eliminación\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr "no se pudo crear la operación\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "no se pudo iniciar la operación\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "no se pudo preparar la transacción\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "no se pudo asignar la transacción\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "no se pudo eliminar el archivo de bloqueo %s\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr "No existe /bin/sh en el ambiente padre, abortando los scripts\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "no se puede crear el directorio temporal\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "no se pudo cambiar el directorio a %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "no se pudo crear un nuevo proceso (%s)\n"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "no se pudo cambiar el directorio raíz (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "no se pudo cambiar el directorio a / (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "llamada a popen fallida (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "llamada a waitpid fallida (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "scriplet falló en ejecutarse correctamente\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "no se pudo eliminar el directorio temporal %s\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "fallo al crear la ruta '%s' : %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "no se pudo abrir %s: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "no existe la cache %s, creando...\n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "no se pudo crear la cache de paquetes, usando /tmp en su lugar\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: no se puede abrir %s\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: no se puede leer %s\n"
-

lib/libalpm/po/fr.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
 "PO-Revision-Date: 2007-12-22 22:29+0100\n"
 "Last-Translator: Xavier <shiningxc@gmail.com>\n"
 "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n"
@@ -15,37 +15,34 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 "remplacement de l'ancienne version %s-%s par %s dans la liste des cibles\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr ""
 "une version plus récente %s-%s est dans la liste des cibles -- paquet "
 "ignoré\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "Des paquets en conflit ont été trouvés dans la liste des cibles\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "vous ne pouvez pas installer deux paquets en conflit en même temps\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "remplacer un paquet avec -A ou -U n'est pas encore possible\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 "vous pouvez remplacer les paquets manuellement en utilisant -Rd et -U\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -54,615 +51,540 @@ msgstr ""
 "Les permissions pour le répertoire %s sont différentes\n"
 "système de fichier: %o paquet : %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "extraction: le lien %s ne pointe pas vers un répertoire\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extraction: n'écrase pas le répertoire par le fichier %s\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "l'extraction de %s a échoué (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "renommer %s a échoué (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "la copie du fichier temporaire vers %s a échoué (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s enregistré en tant que %s\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "l'installation de %s en tant que %s a échoué:  (%s)\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installé en tant que %s\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "extraction de %s comme %s.pacnew\n"
 
 # j'ai traduit chaque fois "could not" par "a échoué"
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "déterminer le répertoire courant a échoué\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "des erreurs sont survenues pendant la mise à jour de %s\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "des erreurs sont survenues pendant l'installation de %s\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "la mise à jour l'entrée de base de données %s-%s a échoué\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "l'ajout au cache de l'entrée '%s' a échoué\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nom invalide pour l'entrée de base de données '%s'\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "l'ouverture du fichier %s a échoué: %s\n"
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "la suppression de l'entrée de base de données %s%s a échoué\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "tentative de ré-enregistrer la base de données locale\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "base de données non initialisée\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "cycle de dépendances détecté:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s sera supprimé après sa dépendance %s\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s sera installé avant sa dépendance %s\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossible de résoudre \"%s\", une dépendance de \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "dépassement de mémoire!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "erreur système non prévue"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "autorisation insuffisante"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "trouver ou lire le fichier a échoué"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "trouver ou lire le répertoire a échoué"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "un argument erroné ou nul a été fourni"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "librairie non initialisée"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "librairie déjà initialisée"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "verrouillage de la base de données impossible"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "l'ouverture de la base de données a échoué"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "la création de la base de données a échoué"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "base de données non initialisée"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "base de données déjà enregistrée"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "trouver la base de données a échoué"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "la mise à jour de la base de données a échoué"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "la suppression de l'entrée de base de données a échoué"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "URL invalide pour le serveur"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "définir le paramètre a échoué"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "transaction déjà initialisée"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "transaction non initialisée"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "cible répétée"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "transaction non préparée"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "transaction annulée"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "opération incompatible avec le type de transaction"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "appliquer la transaction a échoué"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "tous les fichiers n'ont pas pu être téléchargés"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "trouver ou de lire le paquet a échoué"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "paquet invalide ou corrompu"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "ouverture du fichier paquet impossible"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "chargement des données du paquet impossible"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "paquet déjà installé"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "paquet non installé ou version plus ancienne"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "suppression de certains fichiers du paquet impossible"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "nom de paquet invalide"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "paquet corrompu"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "ce dépôt n'existe pas"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "delta corrompu"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "l'application du delta a échoué"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "groupe non trouvé"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "la satisfaction des dépendances a échoué"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "conflit de dépendances"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "conflit de fichiers"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "opération annulée par l'utilisateur"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "erreur interne"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "erreur de libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "non confirmé"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "expression régulière incorrecte"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "échec de connexion à l'hôte distant "
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "erreur non prévue"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "l'obtention du hache md5 pour le paquet %s-%s a échoué\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "les 'haches' md5 ne correspondent pas pour le paquet %s-%s\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: force la mise à jour à la version %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: la version locale (%s) est plus récente que %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "l'extraction du fichier de description vers %s a échoué\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "l'analyse du fichier de description a échoué dans %s\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "nom de paquet manquant dans %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "version de paquet manquante dans %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "erreur lors de la lecture du paquet %s: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "méta-données du paquet manquantes dans %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "trouver %s dans la base de données a échoué -- ignoré\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "suppression du fichier '%s' impossible: %s\n"
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "la suppression de l'entrée de base de données %s-%s a échoué\n"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "la suppression du cache de l'entrée '%s' a échoué\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "l'url '%s' est invalide, ignorée\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "Le protocole n'a pas été spécifié dans l'url, assume http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disque"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "échec de récupération du fichier '%s' depuis %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "le téléchargement ne peut pas être repris, relance\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "écriture dans le fichier '%s' impossible\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "erreur lors du téléchargement de '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "écriture dans le fichier '%s' impossible: %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "changer de répertoire vers %s a échoué\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "lancement de XferCommand: le fork a échoué!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "l'URL ne contient pas un fichier à télécharger\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "le fichier %s n'a pas pu être téléchargé\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignore la mise à jour du paquet (à remplacer par %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignore la mise à jour du paquet (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "dépôt '%s' non trouvé\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s est à jour -- ignoré\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s est à jour -- réinstalle\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "erreur malloc: n'a pas pu allouer %zd bytes\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "commande: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "ne peut obtenir le 'hach' md5 pour le paquet %s\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "l'archive %s était corrompue (mauvaise somme MD5)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "échec de récupération de certains fichiers depuis %s\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "la création de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "l'initialisation de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "la préparation de la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "appliquer la transaction de suppression a échoué\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr "la création de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "l'initialisation de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "la préparation de la transaction a échoué\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "appliquer la transaction a échoué\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "la suppression du fichier de verrouillage %s a échoué\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr ""
 "Pas de /bin/sh dans l'environnement parent, interruption du scriptlet\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "la création du répertoire temporaire a échoué\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "changer de répertoire vers %s a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "la génération d'un nouveau processus a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "changer le répertoire racine a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "changer de répertoire vers / a échoué (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "call to popen failed (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "call to waitpid failed (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "le scriptlet n'a pas pu être exécuté correctement\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "la suppression du répertoire temporaire %s a échoué\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "échec de la création du chemin '%s' : %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "l'ouverture de %s: %s a échoué\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "le cache %s n'existe pas, création...\n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "n'a pas pu créer le cache de paquets, /tmp sera utilisé à la place\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: l'ouverture de %s a échoué\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: la lecture de %s a échoué\n"
-
-#~ msgid "loading package data for %s : level=%d\n"
-#~ msgstr "chargement des données du paquet %s : niveau=%d\n"
-
-#~ msgid "adding '%s' to package cache for db '%s'\n"
-#~ msgstr "ajout de '%s' au cache de paquets pour la base de données '%s'\n"
-
-#~ msgid "could not remove tempfile %s\n"
-#~ msgstr "la suppression du fichier temporaire %s a échoué\n"

lib/libalpm/po/hu.po

@@ -7,649 +7,580 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
 "PO-Revision-Date: 2007-03-14 13:45+0100\n"
 "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n"
 "Language-Team:  <hu@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "r<EFBFBD>gebbi verzi<EFBFBD> (%s-%s) lecser<EFBFBD>l<EFBFBD>se %s verzi<EFBFBD>ra a c<EFBFBD>l list<EFBFBD>ban\n"
+msgstr "régebbi verzió (%s-%s) lecserélése %s verzióra a cél listában\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "<EFBFBD>jabb verzi<EFBFBD> (%s-%s) m<EFBFBD>r megtal<EFBFBD>lhat<EFBFBD> a c<EFBFBD>l list<EFBFBD>ban -- kihagy<EFBFBD>s\n"
+msgstr "újabb verzió (%s-%s) már megtalálható a cél listában -- kihagyás\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
-msgstr "<EFBFBD>tk<EFBFBD>z<EFBFBD> csomagokat tal<EFBFBD>ltam a c<EFBFBD>l list<EFBFBD>ban\n"
+msgstr "ütköző csomagokat találtam a cél listában\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr "nem telep<EFBFBD>thet<EFBFBD> k<EFBFBD>t <EFBFBD>tk<EFBFBD>z<EFBFBD> csomag egyszerre\n"
+msgstr "nem telepíthető két ütköző csomag egyszerre\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "csomagok lecser<EFBFBD>l<EFBFBD>se m<EFBFBD>g nem t<EFBFBD>mogatott -A <EFBFBD>s -U eset<EFBFBD>n\n"
+msgstr "csomagok lecserélése még nem támogatott -A és -U esetén\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr "a -Rd <EFBFBD>s -U haszn<EFBFBD>lat<EFBFBD>val elv<EFBFBD>gezhet<EFBFBD> a csere\n"
+msgstr "a -Rd és -U használatával elvégezhető a csere\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"elt<EFBFBD>r<EFBFBD> k<EFBFBD>nyvt<EFBFBD>r-jogosults<EFBFBD>gok: %s\n"
-"f<EFBFBD>jlrendszer: %o  csomag: %o\n"
+"eltérő könyvtár-jogosultságok: %s\n"
+"fájlrendszer: %o  csomag: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr "kicsomagol<EFBFBD>s: %s szimbolikus link nem k<EFBFBD>nyvt<EFBFBD>rra mutat\n"
+msgstr "kicsomagolás: %s szimbolikus link nem könyvtárra mutat\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr "kicsomagol<EFBFBD>s: nem <EFBFBD>rok fel<EFBFBD>l k<EFBFBD>nyvt<EFBFBD>rat a %s f<EFBFBD>jllal\n"
+msgstr "kicsomagolás: nem írok felül könyvtárat a %s fájllal\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt kicsomagolni: %s (%s)\n"
+msgstr "nem sikerült kicsomagolni: %s (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt <EFBFBD>tnevezni: %s (%s)\n"
+msgstr "nem sikerült átnevezni: %s (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt az ideiglenes f<EFBFBD>jlt ide m<EFBFBD>solni: %s (%s)\n"
+msgstr "nem sikerült az ideiglenes fájlt ide másolni: %s (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
-msgstr "%s elmentve %s n<EFBFBD>ven\n"
+msgstr "%s elmentve %s néven\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "nem siker<EFBFBD>lt %s telep<EFBFBD>t<EFBFBD>se %s n<EFBFBD>ven: %s\n"
+msgstr "nem sikerült %s telepítése %s néven: %s\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
-msgstr "%s %s n<EFBFBD>ven lett telep<EFBFBD>tve\n"
+msgstr "%s %s néven lett telepítve\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "%s kicsomagol<EFBFBD>sa %s.pacnew n<EFBFBD>ven\n"
+msgstr "%s kicsomagolása %s.pacnew néven\n"
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
-msgstr "a jelenlegi munkak<EFBFBD>nyvt<EFBFBD>r nem kaphat<EFBFBD> meg\n"
+msgstr "a jelenlegi munkakönyvtár nem kapható meg\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "hiba t<EFBFBD>rt<EFBFBD>nt a(z) %s friss<EFBFBD>t<EFBFBD>se k<EFBFBD>zben\n"
+msgstr "hiba történt a(z) %s frissítése közben\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "hiba t<EFBFBD>rt<EFBFBD>nt a(z) %s telep<EFBFBD>t<EFBFBD>se k<EFBFBD>zben\n"
+msgstr "hiba történt a(z) %s telepítése közben\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "nem siker<EFBFBD>lt a(z) %s-%s adatb<EFBFBD>zisbejegyz<EFBFBD>s friss<EFBFBD>t<EFBFBD>se\n"
+msgstr "nem sikerült a(z) %s-%s adatbázisbejegyzés frissítése\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "sikertelen a '%s' bejegyz<EFBFBD>s hozz<EFBFBD>ad<EFBFBD>sa a gyors<EFBFBD>t<EFBFBD>t<EFBFBD>rhoz\n"
+msgstr "sikertelen a '%s' bejegyzés hozzáadása a gyorsítótárhoz\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "<EFBFBD>rv<EFBFBD>nytelen n<EFBFBD>v a '%s' adatb<EFBFBD>zis-bejegyz<EFBFBD>s sz<EFBFBD>m<EFBFBD>ra\n"
+msgstr "érvénytelen név a '%s' adatbázis-bejegyzés számára\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
-msgstr "nem siker<EFBFBD>lt megnyitni a %s f<EFBFBD>jlt: %s\n"
+msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
-msgstr "sikertelen a %s%s adatb<EFBFBD>zis-bejegyz<EFBFBD>s elt<EFBFBD>vol<EFBFBD>t<EFBFBD>sa\n"
+msgstr "sikertelen a %s%s adatbázis-bejegyzés eltávolítása\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
-msgstr "k<EFBFBD>s<EFBFBD>rlet a 'local' adatb<EFBFBD>zis <EFBFBD>jraregisztr<EFBFBD>l<EFBFBD>s<EFBFBD>ra\n"
+msgstr "kísérlet a 'local' adatbázis újraregisztrálására\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
-msgstr "az adatb<EFBFBD>zis-<EFBFBD>tvonal nincs megadva\n"
+msgstr "az adatbázis-útvonal nincs megadva\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
-msgstr "k<EFBFBD>rk<EFBFBD>r<EFBFBD>s f<EFBFBD>gg<EFBFBD>s<EFBFBD>get <EFBFBD>szleltem:\n"
+msgstr "körkörös függőséget észleltem:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "a(z) %s csomag saj<EFBFBD>t %s f<EFBFBD>gg<EFBFBD>s<EFBFBD>ge ut<EFBFBD>n lesz elt<EFBFBD>vol<EFBFBD>tva\n"
+msgstr "a(z) %s csomag saját %s függősége után lesz eltávolítva\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr "a(z) %s csomag saj<EFBFBD>t %s f<EFBFBD>gg<EFBFBD>s<EFBFBD>ge el<EFBFBD>tt lesz telep<EFBFBD>tve\n"
+msgstr "a(z) %s csomag saját %s függősége előtt lesz telepítve\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nem siker<EFBFBD>lt a(z) \"%s\" csomag \"%s\" f<EFBFBD>gg<EFBFBD>s<EFBFBD>g<EFBFBD>t feloldani\n"
+msgstr "nem sikerült a(z) \"%s\" csomag \"%s\" függőségét feloldani\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
-msgstr "elfogyott a mem<EFBFBD>ria!"
+msgstr "elfogyott a memória!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
-msgstr "nemv<EFBFBD>rt hiba"
+msgstr "nemvárt hiba"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
-msgstr "el<EFBFBD>gtelen jogosults<EFBFBD>gok"
+msgstr "elégtelen jogosultságok"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> vagy nem olvashat<EFBFBD> a f<EFBFBD>jl"
+msgstr "nem található vagy nem olvasható a fájl"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> vagy nem olvashat<EFBFBD> a k<EFBFBD>nyvt<EFBFBD>r"
+msgstr "nem található vagy nem olvasható a könyvtár"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
-msgstr "rossz vagy NULL argumentum <EFBFBD>rkezett"
+msgstr "rossz vagy NULL argumentum érkezett"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
-msgstr "a k<EFBFBD>nyvt<EFBFBD>r nem inicializ<EFBFBD>lt"
+msgstr "a könyvtár nem inicializált"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
-msgstr "a k<EFBFBD>nyvt<EFBFBD>r m<EFBFBD>r inicializ<EFBFBD>lt"
+msgstr "a könyvtár már inicializált"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
-msgstr "nem siker<EFBFBD>lt z<EFBFBD>rolni az adatb<EFBFBD>zist"
+msgstr "nem sikerült zárolni az adatbázist"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
-msgstr "nem siker<EFBFBD>lt megnyitni az adatb<EFBFBD>zist"
+msgstr "nem sikerült megnyitni az adatbázist"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni az adatb<EFBFBD>zist"
+msgstr "nem sikerült létrehozni az adatbázist"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
-msgstr "az adatb<EFBFBD>zis nem inicializ<EFBFBD>lt"
+msgstr "az adatbázis nem inicializált"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
-msgstr "az adatb<EFBFBD>zis m<EFBFBD>r regisztr<EFBFBD>lt"
+msgstr "az adatbázis már regisztrált"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> az adatb<EFBFBD>zis"
+msgstr "nem található az adatbázis"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
-msgstr "nem siker<EFBFBD>lt megnyitni az adatb<EFBFBD>zist"
+msgstr "nem sikerült megnyitni az adatbázist"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani az adatb<EFBFBD>zis-bejegyz<EFBFBD>st"
+msgstr "nem sikerült eltávolítani az adatbázis-bejegyzést"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
-msgstr "<EFBFBD>rv<EFBFBD>nytelen szerver-URL"
+msgstr "érvénytelen szerver-URL"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
-msgstr "nem siker<EFBFBD>lt be<EFBFBD>ll<EFBFBD>tani a param<EFBFBD>tert"
+msgstr "nem sikerült beállítani a paramétert"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
-msgstr "a tranzakci<EFBFBD> m<EFBFBD>r inicializ<EFBFBD>lt"
+msgstr "a tranzakció már inicializált"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
-msgstr "a tranzakci<EFBFBD> nem inicializ<EFBFBD>lt"
+msgstr "a tranzakció nem inicializált"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
-msgstr "k<EFBFBD>t azonos c<EFBFBD>lcsomag"
+msgstr "két azonos célcsomag"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
-msgstr "a tranzakci<EFBFBD> nincs el<EFBFBD>k<EFBFBD>sz<EFBFBD>tve"
+msgstr "a tranzakció nincs előkészítve"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
-msgstr "a tranzakci<EFBFBD> f<EFBFBD>lbeszak<EFBFBD>tva"
+msgstr "a tranzakció félbeszakítva"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
-msgstr "a m<EFBFBD>velet nem egyeztethet<EFBFBD> <20>ssze a jelenlegi tranzakci<EFBFBD>t<EFBFBD>pussal"
+msgstr "a művelet nem egyeztethető össze a jelenlegi tranzakciótípussal"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
-msgstr "nem siker<EFBFBD>lt v<EFBFBD>grahajtani a tranzakci<EFBFBD>t"
+msgstr "nem sikerült végrahajtani a tranzakciót"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
-msgstr "nem siker<EFBFBD>lt let<EFBFBD>lteni az <EFBFBD>sszes f<EFBFBD>jlt"
+msgstr "nem sikerült letölteni az összes fájlt"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> vagy nem olvashat<EFBFBD> a csomag"
+msgstr "nem található vagy nem olvasható a csomag"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
-msgstr "nem <EFBFBD>rv<EFBFBD>nyes vagy s<EFBFBD>r<EFBFBD>lt csomag"
+msgstr "nem érvényes vagy sérült csomag"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
-msgstr "nem siker<EFBFBD>lt megnyitni a csomagf<EFBFBD>jlt"
+msgstr "nem sikerült megnyitni a csomagfájlt"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
-msgstr "nem siker<EFBFBD>lt bet<EFBFBD>lteni a csomagadatokat"
+msgstr "nem sikerült betölteni a csomagadatokat"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
-msgstr "a csomag m<EFBFBD>r telep<EFBFBD>tve van"
+msgstr "a csomag már telepítve van"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
-msgstr "a csomag nincs telep<EFBFBD>tve vagy kisebb verzi<EFBFBD>j<EFBFBD>"
+msgstr "a csomag nincs telepítve vagy kisebb verziójú"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a csomag <EFBFBD>sszes f<EFBFBD>jlj<EFBFBD>t"
+msgstr "nem sikerült eltávolítani a csomag összes fájlját"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
-msgstr "nem <EFBFBD>rv<EFBFBD>nyes a csomagn<EFBFBD>v"
+msgstr "nem érvényes a csomagnév"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
-msgstr "s<EFBFBD>r<EFBFBD>lt csomag"
+msgstr "sérült csomag"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
-msgstr "nincs ilyen rep<EFBFBD>"
+msgstr "nincs ilyen repó"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
-msgstr "s<EFBFBD>r<EFBFBD>lt delta"
+msgstr "sérült delta"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
-msgstr "delta patchel<EFBFBD>s sikertelen"
+msgstr "delta patchelés sikertelen"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
-msgstr "a csoport nem tal<EFBFBD>lhat<EFBFBD>"
+msgstr "a csoport nem található"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
-msgstr "nem siker<EFBFBD>lt kiel<EFBFBD>g<EFBFBD>teni a f<EFBFBD>gg<EFBFBD>s<EFBFBD>geket"
+msgstr "nem sikerült kielégíteni a függőségeket"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
-msgstr "<EFBFBD>tk<EFBFBD>z<EFBFBD> f<EFBFBD>gg<EFBFBD>s<EFBFBD>gek"
+msgstr "ütköző függőségek"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
-msgstr "<EFBFBD>tk<EFBFBD>z<EFBFBD> f<EFBFBD>jlok"
+msgstr "ütköző fájlok"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
-msgstr "felhaszn<EFBFBD>l<EFBFBD>i megszak<EFBFBD>t<EFBFBD>s"
+msgstr "felhasználói megszakítás"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
-msgstr "bels<EFBFBD> hiba"
+msgstr "belső hiba"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "libarchive hiba"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
-msgstr "nem meger<EFBFBD>s<EFBFBD>tett"
+msgstr "nem megerősített"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
-msgstr "<EFBFBD>rv<EFBFBD>nytelen regul<EFBFBD>ris kifejez<EFBFBD>s"
+msgstr "érvénytelen reguláris kifejezés"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
-msgstr "nem siker<EFBFBD>lt csatlakozni a t<EFBFBD>voli g<EFBFBD>phez"
+msgstr "nem sikerült csatlakozni a távoli géphez"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
-msgstr "nemv<EFBFBD>rt hiba"
+msgstr "nemvárt hiba"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "nem siker<EFBFBD>lt meghat<EFBFBD>rozni a(z) %s-%s csomag md5 ellen<EFBFBD>rz<EFBFBD> <20>sszeg<EFBFBD>t\n"
+msgstr "nem sikerült meghatározni a(z) %s-%s csomag md5 ellenőrző összegét\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "a(z) %s-%s csomag md5 ellen<EFBFBD>rz<EFBFBD> <20>sszegei nem egyeznek meg\n"
+msgstr "a(z) %s-%s csomag md5 ellenőrző összegei nem egyeznek meg\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: er<EFBFBD>ltetett friss<EFBFBD>t<EFBFBD>s a %s verzi<EFBFBD>ra\n"
+msgstr "%s: erőltetett frissítés a %s verzióra\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: a helyi (%s) <EFBFBD>jabb, mint %s (%s)\n"
+msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
-msgstr "nem siker<EFBFBD>lt kicsomagolni a csomagle<EFBFBD>r<EFBFBD> f<EFBFBD>jlt %s-k<EFBFBD>nt\n"
+msgstr "nem sikerült kicsomagolni a csomagleíró fájlt %s-ként\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "nem siker<EFBFBD>lt <EFBFBD>rtelmezni a(z) %s csomagle<EFBFBD>r<EFBFBD> f<EFBFBD>jlj<EFBFBD>t\n"
+msgstr "nem sikerült értelmezni a(z) %s csomagleíró fájlját\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
-msgstr "hi<EFBFBD>nyz<EFBFBD> csomagn<EFBFBD>v itt: %s\n"
+msgstr "hiányzó csomagnév itt: %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
-msgstr "hi<EFBFBD>nyz<EFBFBD> csomagverzi<EFBFBD> itt: %s\n"
+msgstr "hiányzó csomagverzió itt: %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "hiba a(z) %s csomag olvas<EFBFBD>sa k<EFBFBD>zben: %s\n"
+msgstr "hiba a(z) %s csomag olvasása közben: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
-msgstr "hi<EFBFBD>nyz<EFBFBD> csomaginform<EFBFBD>ci<EFBFBD>s f<EFBFBD>jl itt: %s\n"
+msgstr "hiányzó csomaginformációs fájl itt: %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "nem tal<EFBFBD>lhat<EFBFBD> a(z) %s az adatb<EFBFBD>zisban -- kihagy<EFBFBD>s\n"
+msgstr "nem található a(z) %s az adatbázisban -- kihagyás\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a '%s' f<EFBFBD>jlt : %s\n"
+msgstr "nem sikerült eltávolítani a '%s' fájlt : %s\n"
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a(z) %s-%s adatb<EFBFBD>zis-bejegyz<EFBFBD>st\n"
+msgstr "nem sikerült eltávolítani a(z) %s-%s adatbázis-bejegyzést\n"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a(z) '%s' bejegyz<EFBFBD>st a gyors<EFBFBD>t<EFBFBD>t<EFBFBD>rb<EFBFBD>l\n"
+msgstr "nem sikerült eltávolítani a(z) '%s' bejegyzést a gyorsítótárból\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr "a '%s' URL <EFBFBD>rv<EFBFBD>nytelen, figyelmen k<EFBFBD>v<EFBFBD>l hagyom\n"
+msgstr "a '%s' URL érvénytelen, figyelmen kívül hagyom\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
-msgstr "az URL s<EFBFBD>ma nem defini<EFBFBD>lt, http felt<EFBFBD>telez<EFBFBD>se\n"
+msgstr "az URL séma nem definiált, http feltételezése\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "diszk"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "nem siker<EFBFBD>lt a(z) '%s' f<EFBFBD>jlt let<EFBFBD>lteni a %s helyr<EFBFBD>l : %s\n"
+msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
-msgstr "nem tudom folytatni a let<EFBFBD>lt<EFBFBD>st, <EFBFBD>jrakezdem\n"
+msgstr "nem tudom folytatni a letöltést, újrakezdem\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "nem siker<EFBFBD>lt a(z) '%s' f<EFBFBD>jlba <EFBFBD>rni\n"
+msgstr "nem sikerült a(z) '%s' fájlba írni\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "hiba '%s' let<EFBFBD>lt<EFBFBD>se k<EFBFBD>zben: %s\n"
+msgstr "hiba '%s' letöltése közben: %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr "hiba a(z) '%s' f<EFBFBD>jl <EFBFBD>r<EFBFBD>sa sor<EFBFBD>n: %s\n"
+msgstr "hiba a(z) '%s' fájl írása során: %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
-msgstr "nem siker<EFBFBD>lt a k<EFBFBD>nyvt<EFBFBD>rv<EFBFBD>lt<EFBFBD>s ide: %s\n"
+msgstr "nem sikerült a könyvtárváltás ide: %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr "XferCommand futtat<EFBFBD>sa: sikertelen fork!\n"
+msgstr "XferCommand futtatása: sikertelen fork!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr "az URL nem tartalmaz let<EFBFBD>ltend<EFBFBD> f<EFBFBD>jlt\n"
+msgstr "az URL nem tartalmaz letöltendő fájlt\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
-msgstr "nem siker<EFBFBD>lt a(z) %s let<EFBFBD>lt<EFBFBD>se\n"
+msgstr "nem sikerült a(z) %s letöltése\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: csomagfriss<EFBFBD>t<EFBFBD>s kihagy<EFBFBD>sa (a(z) %s-%s le fogja cser<EFBFBD>lni)\n"
+msgstr "%s-%s: csomagfrissítés kihagyása (a(z) %s-%s le fogja cserélni)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s: csomagfriss<EFBFBD>t<EFBFBD>s kihagy<EFBFBD>sa (%s => %s)\n"
+msgstr "%s: csomagfrissítés kihagyása (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
-msgstr "a(z) '%s' rep<EFBFBD> nem tal<EFBFBD>lhat<EFBFBD>\n"
+msgstr "a(z) '%s' repó nem található\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "a(z) %s-%s naprak<EFBFBD>sz -- kihagy<EFBFBD>s\n"
+msgstr "a(z) %s-%s naprakész -- kihagyás\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "a(z) %s-%s naprak<EFBFBD>sz -- <EFBFBD>jratelep<EFBFBD>t<EFBFBD>s\n"
+msgstr "a(z) %s-%s naprakész -- újratelepítés\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "feloldhatatlan csomag<EFBFBD>tk<EFBFBD>z<EFBFBD>seket tal<EFBFBD>ltam\n"
+msgstr "feloldhatatlan csomagütközéseket találtam\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "malloc hiba: nem siker<EFBFBD>lt lefoglalni %zd byte-ot\n"
+msgstr "malloc hiba: nem sikerült lefoglalni %zd byte-ot\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "parancs: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "nem siker<EFBFBD>lt meghat<EFBFBD>rozni a(z) %s f<EFBFBD>jl md5 ellen<EFBFBD>rz<EFBFBD> <20>sszeg<EFBFBD>t\n"
+msgstr "nem sikerült meghatározni a(z) %s fájl md5 ellenőrző összegét\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "a(z) %s f<EFBFBD>jl s<EFBFBD>r<EFBFBD>lt volt (rossz MD5 <EFBFBD>sszeg)\n"
+msgstr "a(z) %s fájl sérült volt (rossz MD5 összeg)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
-msgstr "nem siker<EFBFBD>lt n<EFBFBD>h<EFBFBD>ny f<EFBFBD>jlt let<EFBFBD>lteni innen: %s\n"
+msgstr "nem sikerült néhány fájlt letölteni innen: %s\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült létrehozni az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
-msgstr "nem siker<EFBFBD>lt inicializ<EFBFBD>lni az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült inicializálni az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
-msgstr "nem siker<EFBFBD>lt el<EFBFBD>k<EFBFBD>sz<EFBFBD>teni az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült előkészíteni az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
-msgstr "nem siker<EFBFBD>lt v<EFBFBD>grehajtani az elt<EFBFBD>vol<EFBFBD>t<EFBFBD> tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült végrehajtani az eltávolító tranzakciót\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült létrehozni a tranzakciót\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
-msgstr "nem siker<EFBFBD>lt inicializ<EFBFBD>lni a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült inicializálni a tranzakciót\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
-msgstr "nem siker<EFBFBD>lt el<EFBFBD>k<EFBFBD>sz<EFBFBD>teni a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült előkészíteni a tranzakciót\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
-msgstr "nem siker<EFBFBD>lt v<EFBFBD>grehajtani a tranzakci<EFBFBD>t\n"
+msgstr "nem sikerült végrehajtani a tranzakciót\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr "nem siker<EFBFBD>lt a z<EFBFBD>rol<EFBFBD> f<EFBFBD>jl (%s) elt<EFBFBD>vol<EFBFBD>t<EFBFBD>sa\n"
+msgstr "nem sikerült a zároló fájl (%s) eltávolítása\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "Nincs /bin/sh a sz<EFBFBD>l<EFBFBD> k<EFBFBD>rnyezetben, szkript megszak<EFBFBD>t<EFBFBD>sa\n"
+msgstr "Nincs /bin/sh a szülő környezetben, szkript megszakítása\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni az ideiglenes k<EFBFBD>nyvt<EFBFBD>rat\n"
+msgstr "nem sikerült létrehozni az ideiglenes könyvtárat\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "nem siker<EFBFBD>lt a k<EFBFBD>nyvt<EFBFBD>rv<EFBFBD>lt<EFBFBD>s ide: %s (%s)\n"
+msgstr "nem sikerült a könyvtárváltás ide: %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "nem siker<EFBFBD>lt forkolni egy <EFBFBD>j folyamatot (%s)\n"
+msgstr "nem sikerült forkolni egy új folyamatot (%s)\n"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "nem siker<EFBFBD>lt a chroot (%s)\n"
+msgstr "nem sikerült a chroot (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
-msgstr "nem siker<EFBFBD>lt a k<EFBFBD>nyvt<EFBFBD>rat a /-re v<EFBFBD>ltani (%s)\n"
+msgstr "nem sikerült a könyvtárat a /-re váltani (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
-msgstr "popen h<EFBFBD>v<EFBFBD>s sikertelen (%s)"
+msgstr "popen hívás sikertelen (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "waitpid h<EFBFBD>v<EFBFBD>s sikertelen (%s)\n"
+msgstr "waitpid hívás sikertelen (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr "a szkript hib<EFBFBD>san futott\n"
+msgstr "a szkript hibásan futott\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "nem siker<EFBFBD>lt elt<EFBFBD>vol<EFBFBD>tani a %s ideiglenes k<EFBFBD>nyvt<EFBFBD>rat\n"
+msgstr "nem sikerült eltávolítani a %s ideiglenes könyvtárat\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
-msgstr "nem siker<EFBFBD>lt a '%s' <EFBFBD>tvonal l<EFBFBD>trehoz<EFBFBD>sa: %s\n"
+msgstr "nem sikerült a '%s' útvonal létrehozása: %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
-msgstr "nem siker<EFBFBD>lt megnyitni a %s f<EFBFBD>jlt: %s\n"
+msgstr "nem sikerült megnyitni a %s fájlt: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "nem l<EFBFBD>tezik a(z) %s gyors<EFBFBD>t<EFBFBD>t<EFBFBD>r. l<EFBFBD>trehoz<EFBFBD>s...\n"
+msgstr "nem létezik a(z) %s gyorsítótár. létrehozás...\n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "nem siker<EFBFBD>lt l<EFBFBD>trehozni a csomaggyors<EFBFBD>t<EFBFBD>t<EFBFBD>rat, a /tmp haszn<EFBFBD>lata\n"
+msgstr "nem sikerült létrehozni a csomaggyorsítótárat, a /tmp használata\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
-msgstr "md5: nem siker<EFBFBD>lt megnyitni a k<EFBFBD>vetkez<EFBFBD>t: %s\n"
+msgstr "md5: nem sikerült megnyitni a következőt: %s\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
-msgstr "md5: nem siker<EFBFBD>lt olvasni a k<EFBFBD>vetkez<EFBFBD>t: %s\n"
+msgstr "md5: nem sikerült olvasni a következőt: %s\n"

lib/libalpm/po/it.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
 "PO-Revision-Date: 2007-12-18 23:30+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
@@ -17,34 +17,31 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bitPlural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "sostituzione in corso della vecchia versione di %s-%s con %s\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "la versione di %s-%s è più recente e sarà ignorata\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "sono stati individuati dei pacchetti che vanno in conflitto\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "impossibile installare due pacchetti che vanno in conflitto\n"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "la sostituzione dei pacchetti con -A e -U non è ancora supportata\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 "è possibile sostituire manualmente i pacchetti, usando le opzioni -Rd e -U\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -53,608 +50,542 @@ msgstr ""
 "i permessi delle directory differiscono su %s\n"
 "filesystem: %o pacchetto: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "estrazione: il link simbolico %s non punta alla directory\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "estrazione: non sovrascrivere la directory con il file %s\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "impossibile estrarre %s (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "impossibile rinominare %s (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "impossibile copiare il file temporaneo in %s (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s salvato come %s\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "impossibile installare %s come %s: %s\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s installato come %s\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "estrazione di %s come %s.pacnew\n"
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "impossibile ottenere la directory corrente\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "si sono verificati degli errori durante l'aggiornamento di %s\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "si sono verificati degli errori durante l'installazione di %s\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "impossibile aggiornare la voce %s-%s nel database\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "impossible includere la voce '%s' nella cache\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nome non valido per la voce del database '%s'\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "impossibile aprire il file %s: %s\n"
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr "impossibile rimuovere la voce %s%s dal database\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "tentativo in corso di registrare di nuovo il database 'locale'\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "il percorso del database non è definito\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "individuato un possibile ciclo di dipendenze:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s sarà rimosso dopo la sua dipendenza %s\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s sarà installato prima della sua dipendenza %s\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "memoria insufficiente!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "errore di sistema inaspettato"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "privilegi insufficienti"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "impossibile trovare o leggere il file"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "impossibile trovare o leggere la directory"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "è stato passato un argomento sbagliato o NULL"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "libreria non inizializzata"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "libreria già inizializzata"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "impossibile bloccare il database"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "impossibile aprire il database"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "impossibile creare il database"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "database non inizializzato"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "il database è già registrato"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "impossibile trovare il database"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "impossibile aggiornare il database"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "impossibile rimuovere la voce dal database"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "url non valido per il server"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "impossibile impostare il parametro"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "operazione già inizializzata"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "operazione non inizializzata"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "pacchetto doppio"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "operazione non preparata"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "operazione annullata"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operazione incompatibile con il tipo di transazione"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "impossibile eseguire l'operazione"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "impossibile prelevare tutti i file"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "impossibile trovare o leggere il pacchetto"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "pacchetto non valido o corrotto"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "impossibile aprire il pacchetto"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "impossibile caricare i dati del pacchetto"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "pacchetto già installato"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "pacchetto non installato o una versione precedente"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "impossibile rimuovere tutti i file del pacchetto"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "il nome del pacchetto non è valido"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "pacchetto corrotto"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "nessun repository corrispondente"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "il delta è corrotto"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "si sono verificati degli errori con la patch di delta"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "gruppo non trovato"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "impossibile soddisfare le dipendenze"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "dipendenze in conflitto"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "file in conflitto"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "operazione annullata"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "errore interno"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "errore di libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "non confermato"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "espressione regolare non valida"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "impossibile stabilire una connessione con l'host remoto"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "errore inaspettato"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "impossibile recuperare la somma md5 del pacchetto %s-%s\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "la somma md5 del pacchetto %s-%s non corrisponde\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: aggiornamento forzato alla versione %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr ""
 "%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "impossibile estrarre il file di descrizione del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "impossibile analizzare il file di descrizione del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "manca il nome del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "manca la versione del pacchetto in %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "si è verificato un errore durante la lettura del pacchetto %s: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "manca il metadata del pacchetto in %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "impossibile trovare %s nel database, sarà ignorato\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "impossibile rimuovere il file '%s': %s\n"
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr "impossibile rimuovere la voce %s-%s dal database\n"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "impossibile rimuovere la voce '%s' dalla cache\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "l'url '%s' non è corretto, sarà ignorato\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "il protocollo dell'url non è specificato, sarà usato http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disco"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "impossibile recuperare il file '%s' da %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "impossibile riprendere il download\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "impossibile scrivere nel file '%s'\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "si è verificato un errore durante il download di '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "si è verificato un errore durante la scrittura nel file '%s': %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "impossibile spostarsi nella directory %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "avvio di XferCommand: processo non riuscito!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "URL non contiene nessun file da scaricare\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "impossibile scaricare %s\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 "%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%"
 "s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: aggiornamento del pacchetto ignorato (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "impossibile trovare il repository '%s'\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s è aggiornato, sarà ignorato\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s è aggiornato, sarà reinstallato\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "sono stati rilevati dei conflitti irrisolvibili\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "malloc failure: impossibile allocare %zd byte\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "comando: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "impossibile recuperare il checksum md5 del file %s\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "il file %s è corrotto (MD5 errato)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "impossibile recuperare alcuni file da %s\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "impossibile avviare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "impossibile inizializzare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "impossibile preparare l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "impossibile eseguire l'operazione di rimozione\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr "impossibile avviare l'operazione\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "impossibile inizializzare l'operazione\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "impossibile preparare l'operazione\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "impossibile eseguire l'operazione\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "impossibile rimuovere il file di lock %s\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr "/bin/sh non è presente nell'ambiente, lo scriptlet sarà interrotto\n"
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "impossibile creare la directory temporanea\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "impossibile spostarsi nella directory %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr "impossibile effettuare il fork di un nuovo processo (%s)\n"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "impossibile cambiare la root directory (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "impossibile spostarsi nella directory / (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "chiamata a popen non riuscita (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "chiamata a waitpid non riuscita (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "L'esecuzione dello scriptlet non è riuscita correttamente\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "impossibile rimuovere la directory temporanea %s\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "impossibile seguire il percorso '%s' : %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "impossibile aprire %s: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "la cache di %s non esiste, creazione in corso...\n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 "impossibile creare la cache del pacchetto, al suo posto sarà usata /tmp\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: impossibile aprire %s\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: impossibile leggere %s\n"

lib/libalpm/po/libalpm.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: 2008-01-14 23:08-0600\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,637 +16,568 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr ""
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr ""
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
 msgstr ""
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr ""
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr ""
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr ""
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr ""
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr ""
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/db.c:283
 #, c-format
 msgid "could not remove database entry %s%s\n"
 msgstr ""
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr ""
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr ""
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr ""
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr ""
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr ""
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr ""
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr ""
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr ""
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr ""
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr ""
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr ""
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr ""
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr ""
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr ""
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr ""
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr ""
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr ""
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr ""
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr ""
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr ""
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr ""
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr ""
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr ""
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr ""
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr ""
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr ""
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr ""
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr ""
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr ""
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr ""
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr ""
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr ""
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr ""
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr ""
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr ""
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr ""
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr ""
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr ""
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr ""
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr ""
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr ""
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr ""
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr ""
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr ""
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr ""
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr ""
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:341
 #, c-format
 msgid "could not remove database entry %s-%s\n"
 msgstr ""
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr ""
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr ""
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr ""
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr ""
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr ""
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr ""
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr ""
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr ""
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr ""
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr ""
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:551
 #, c-format
 msgid "could not fork a new process (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr ""
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr ""
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr ""
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr ""
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr ""
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr ""

lib/libalpm/po/pl.po

@@ -3,14 +3,15 @@
 # Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
 # Mateusz Jędrasik <m.jedrasik@gmail.com>, 2007.
-#
+# Mateusz Herych <heniekk@gmail.com>, 2008.
+# #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
-"PO-Revision-Date: 2007-04-12 04:23+0200\n"
-"Last-Translator: Mateusz Jędrasik <m.jedrasik@gmail.com>\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-25 22:16+0100\n"
+"Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,659 +19,578 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: lib/libalpm/add.c:86
-#, fuzzy, c-format
+#, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów"
+msgstr "zastępowanie starszej wersji %s-%s na %s z listy celów\n"
 
-#: lib/libalpm/add.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "nowsza wersja %s-%s znajduje się w liście celów -- pomijam"
+msgstr "nowsza wersja %s-%s znajduje się w liście celów -- pomijam\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr ""
+"konfliktujące pakiety znalazły się na liście pakietów do zainstalowania\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
 msgstr ""
+"nie możesz mieć zainstalowanych dwóch konfliktujących ze sobą pakietów w tym "
+"samym czasie\n"
 
-#: lib/libalpm/add.c:170
-#, fuzzy
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "zastępowanie pakietów z -A i -U nie jest jeszcze wspierane"
+msgstr "zastępowanie pakietów za pomocą -A i -U nie jest jeszcze wspierane\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
+msgstr "możesz zastąpić pakiety ręcznie, używając opcji -Rd oraz -U\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
+"Różne prawa dla %s\n"
+"system plików: %o pakiet: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr ""
+msgstr "rozpakowywanie: dowiązanie symboliczne %s nie kieruje do katalogu\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr ""
+msgstr "rozpakowywanie: nie nadpisuję katalogu plikiem %s\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
-#, fuzzy, c-format
+#, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "nie udało się rozpakować %s (%s)"
+msgstr "nie udało się rozpakować %s (%s)\n"
 
-#: lib/libalpm/add.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "nie udało się zmienić nazwy %s (%s)"
+msgstr "nie udało się zmienić nazwy %s (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
-#, fuzzy, c-format
+#, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)"
+msgstr "nie udało się skopiować pliku tymczasowego do %s (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s saved as %s\n"
-msgstr "%s zachowane jako %s"
+msgstr "%s zachowane jako %s\n"
 
-#: lib/libalpm/add.c:568
-#, fuzzy, c-format
+#, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "nie udało się zainstalować %s jako %s: %s"
+msgstr "nie udało się zainstalować %s jako %s: %s\n"
 
-#: lib/libalpm/add.c:571
-#, fuzzy, c-format
+#, c-format
 msgid "%s installed as %s\n"
-msgstr "%s zainstalowano jako %s"
+msgstr "%s zainstalowano jako %s\n"
 
-#: lib/libalpm/add.c:588
-#, fuzzy, c-format
+#, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "rozpakowywanie %s jako %s.pacnew"
+msgstr "rozpakowywanie %s jako %s.pacnew\n"
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
-#, fuzzy
+#, c-format
 msgid "could not get current working directory\n"
-msgstr "nie można znaleźć obecnego katalogu"
+msgstr "nie można znaleźć obecnego katalogu\n"
 
-#: lib/libalpm/add.c:777
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "wystąpiły błędy podczas %s %s"
+msgstr "wystąpiły błędy podczas aktualizacji %s\n"
 
-#: lib/libalpm/add.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "wystąpiły błędy podczas %s %s"
+msgstr "wystąpiły błędy podczas instalacji %s\n"
 
-#: lib/libalpm/add.c:797
-#, fuzzy, c-format
+#, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s"
+msgstr "nie udało się zaktualizować pozycji bazy danych %s-%s\n"
 
-#: lib/libalpm/add.c:805
-#, fuzzy, c-format
+#, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym"
+msgstr "nie udało się dodać pozycji '%s' w pliku podręcznym\n"
 
-#: lib/libalpm/be_files.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'"
+msgstr "nieprawidłowa nazwa dla wpisu bazy danych '%s'\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
-#, fuzzy, c-format
+#, c-format
 msgid "could not open file %s: %s\n"
-msgstr "nie udało się otworzyć pliku %s: %s"
+msgstr "nie udało się otworzyć pliku %s: %s\n"
 
-#: lib/libalpm/db.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database entry %s%s\n"
-msgstr "nie udało się usunąć wpisu %s%s z bazy danych"
+msgstr "nie udało się usunąć wpisu %s%s z bazy danych\n"
 
-#: lib/libalpm/db.c:551
-#, fuzzy
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
-msgstr "próba ponownej rejestracji 'lokalnej' BD"
+msgstr "próba ponownej rejestracji 'lokalnej' BD\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
-#, fuzzy
+#, c-format
 msgid "database path is undefined\n"
-msgstr "baza danych nie została zainicjowana"
+msgstr "ścieżka bazy danych jest niezdefiniowana\n"
 
-#: lib/libalpm/deps.c:171
-#, fuzzy
+#, c-format
 msgid "dependency cycle detected:\n"
-msgstr "wykryto cykl zależności: %s"
+msgstr "wykryto cykl zależności:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr ""
+msgstr "%s zostanie usunięta po zależniościach %s\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr ""
+msgstr "%s zostanie zainstalowane przed zależnościami %s\n"
 
-#: lib/libalpm/deps.c:588
-#, fuzzy, c-format
+#, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "nie udało się rozwiązać zależności dla \"%s\""
+msgstr "nie można rozwiązać \"%s\", zależności od \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "brak pamięci!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "niespodziewany błąd systemu"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "niewystarczające przywileje"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "nie udało się znaleźć bądź odczytać pliku"
 
-#: lib/libalpm/error.c:49
-#, fuzzy
+#, c-format
 msgid "could not find or read directory"
-msgstr "nie udało się znaleźć bądź odczytać pliku"
+msgstr "nie udało się znaleźć bądź odczytać katalogu"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
-msgstr "błędny bądź ZEROWY argument dany"
+msgstr "Dany został błędny bądź ZEROWY argument"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "biblioteka nie została zainicjowana"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
-msgstr "biblioteka już zainicjowana"
+msgstr "biblioteka już została zainicjowana"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "nie udało się zablokować bazy danych"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "nie udało się otworzyć bazy danych"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "nie udało się stworzyć bazy danych"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "baza danych nie została zainicjowana"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "baza danych już zarejestrowana"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
-msgstr "nie udało się odnaleźc bazy danych"
+msgstr "nie udało się odnaleźć bazy danych"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "nie udało się zaktualizować bazy danych"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "nie udało się usunąć wpisu do bazy danych"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "nieprawidłowy url dla serwera"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "nie udało się ustawić parametru"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
-msgstr "tranzakcja już zainicjowana"
+msgstr "tranzakcja została już zainicjowana"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "tranzakcja nie została zainicjowana"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "duplikat celu"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "tranzakcja nie została przygotowana"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "tranzakcja zaniechana"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operacja niekompatybilna z typem tranzakcji"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "nie udało się wykonać tranzakcji"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "nie udało się pobrać wszystkich plików"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "nie udało się znaleźć bądź odczytać pakietu"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
-msgstr "nieprawidłowy bądź skorumpowany pakiet"
+msgstr "nieprawidłowy bądź uszkodzony pakiet"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "nie udało się otworzyć pliku pakietu"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "nie udało się załadować danych pakietu"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
-msgstr "pakiet już zainstalowany"
+msgstr "pakiet został już zainstalowany"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "pakiet nie zainstalowany lub zainstalowany w niższej wersji"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "nie udało się usunąć wszystkich plików pakietu"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "nieprawidłowa nazwa pakietu"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
-msgstr "skorumpowany pakiet"
+msgstr "uszkodzony pakiet"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "nie ma takiego repozytorium"
 
-#: lib/libalpm/error.c:126
-#, fuzzy
+#, c-format
 msgid "corrupted delta"
-msgstr "skorumpowany pakiet"
+msgstr "Pakiet przyrostowy jest uszkodzony"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
-msgstr ""
+msgstr "Łatanie pakietem przyrostowym nie powiodło się"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "grupa nie została odnaleziona"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "nie udało się usatysfakcjonować zależności"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "konfliktujące zależności"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "konfliktujące pliki"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "użytkownik zaniechał operacji"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "błąd wewnętrzny"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "błąd libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "nie potwierdzono"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "nieprawidłowe wyrażenie regularne"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "połączenie ze zdalnym hostem nieudane"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "niespodziewany błąd"
 
-#: lib/libalpm/package.c:122
-#, fuzzy, c-format
+#, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "nie udało się otrzymać sumy md5 dla pakietu %s-%s"
+msgstr "nie udało się otrzymać sumy md5 dla pakietu %s-%s\n"
 
-#: lib/libalpm/package.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "sumy kontrolne md5 dla pakietu %s-%s nie zgadzają się"
+msgstr "sumy kontrolne md5 dla pakietu %s-%s nie zgadzają się\n"
 
-#: lib/libalpm/package.c:844
-#, fuzzy, c-format
+#, c-format
 msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: wymuszanie aktualizacji do wersji %s"
+msgstr "%s: wymuszanie aktualizacji do wersji %s\n"
 
-#: lib/libalpm/package.c:849
-#, fuzzy, c-format
+#, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: local (%s) jest nowsze niż %s (%s)"
+msgstr "%s: local (%s) jest nowsze niż %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
-#, fuzzy, c-format
+#, c-format
 msgid "error extracting package description file to %s\n"
-msgstr "nie udało się przeczytać pliku opisu"
+msgstr "nie udało się przeczytać opisu do %s\n"
 
-#: lib/libalpm/package.c:1033
-#, fuzzy, c-format
+#, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "nie udało się przeczytać pliku opisu"
+msgstr "nie udało się przeczytać opisu pliku w %s\n"
 
-#: lib/libalpm/package.c:1038
-#, fuzzy, c-format
+#, c-format
 msgid "missing package name in %s\n"
-msgstr "brak nazwy pakietu w %s"
+msgstr "brak nazwy pakietu w %s\n"
 
-#: lib/libalpm/package.c:1042
-#, fuzzy, c-format
+#, c-format
 msgid "missing package version in %s\n"
-msgstr "brak wersji pakietu w %s"
+msgstr "brak wersji pakietu w %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
-#, fuzzy, c-format
+#, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "błąd odczytywania pakietu: %s"
+msgstr "błąd odczytywania pakietu: %s: %s\n"
 
-#: lib/libalpm/package.c:1081
-#, fuzzy, c-format
+#, c-format
 msgid "missing package metadata in %s\n"
-msgstr "brak metadanych pakietu"
+msgstr "brak metadanych pakietu w %s\n"
 
-#: lib/libalpm/remove.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie"
+msgstr "nie udało się odnaleźć %s w bazie danych -- pomijanie\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "nie udało się usunąć pliku '%s': %s"
+msgstr "nie udało się usunąć pliku '%s': %s\n"
 
-#: lib/libalpm/remove.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "nie udało się usunąć wpisu %s-%s z bazy danych"
+msgstr "nie udało się usunąć wpisu %s-%s z bazy danych\n"
 
-#: lib/libalpm/remove.c:346
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej"
+msgstr "nie udało się usunąć wpisu '%s' z pamięci podręcznej\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr ""
+msgstr "url '%s' jest błędny, ignoruję\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
-msgstr ""
+msgstr "schemat url nie został sprecyzowany, wybieranie http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
-msgstr ""
+msgstr "dysk"
 
-#: lib/libalpm/server.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "nie udało się pobrać niektórych plików z %s\n"
+msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
-msgstr ""
+msgstr "nie można kontynuować pobieranie, zaczynanie od początku\n"
 
-#: lib/libalpm/server.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "nie udało się usunąć pliku '%s': %s"
+msgstr "nie można zapisywać do pliku '%s'\n"
 
-#: lib/libalpm/server.c:305
-#, fuzzy, c-format
+#, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "błąd odczytywania pakietu: %s"
+msgstr "błąd podczas pobierania '%s': %s\n"
 
-#: lib/libalpm/server.c:317
-#, fuzzy, c-format
+#, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr "nie udało się usunąć pliku '%s': %s"
+msgstr "Błąd podczas zapisywania do pliku '%s': %s\n"
 
-#: lib/libalpm/server.c:385
-#, fuzzy, c-format
+#, c-format
 msgid "could not chdir to %s\n"
-msgstr "nie udało się zmienić katalogu na / (%s)"
+msgstr "nie udało się zmienić katalogu na / %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr ""
+msgstr "uruchamianie XferCommand: klonowanie nieudane!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr ""
+msgstr "URL nie wskazuje na plik do pobrania\n"
 
-#: lib/libalpm/server.c:456
-#, fuzzy, c-format
+#, c-format
 msgid "failed to download %s\n"
-msgstr "nie udało się pobrać wszystkich plików"
+msgstr "nie udało się pobrać %s\n"
 
-#: lib/libalpm/sync.c:133
-#, fuzzy, c-format
+#, c-format
 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)"
+msgstr ""
+"%s-%s: ignorowanie aktualizowania pakietu (do zastąpienia przez %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s-%s: ignorowanie aktualizacji pakietu (%s)"
+msgstr "%s: ignorowanie aktualizacji pakietu (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "repository '%s' not found\n"
-msgstr "repozytorium '%s' nie zostało znalezione"
+msgstr "repozytorium '%s' nie zostało znalezione\n"
 
-#: lib/libalpm/sync.c:336
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s jest w najnowszej wersji -- pomijanie"
+msgstr "%s-%s jest w najnowszej wersji -- pomijanie\n"
 
-#: lib/libalpm/sync.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s jest w najnowszej wersji -- pomijanie"
+msgstr "%s-%s jest w najnowszej wersji -- ponowne instalowanie\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
-#, fuzzy
+#, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "odkryto nierozwiązywalne konflikty pakietów"
+msgstr "odkryto nierozwiązywalne konflikty pakietów\n"
 
-#: lib/libalpm/sync.c:611
-#, fuzzy, c-format
+#, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "błąd malloc: nie udało się zaalokować %d bajtów"
+msgstr "błąd malloc: nie udało się zaalokować %zd bajtów\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
-msgstr ""
+msgstr "komenda: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
-#, fuzzy, c-format
+#, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "nie udało się otrzymać sum kontrolnych md5 lub sha1 dla pakietu %s\n"
+msgstr "nie udało się otrzymać sum kontrolnych md5 dla pliku %s\n"
 
-#: lib/libalpm/sync.c:902
-#, fuzzy, c-format
+#, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "archiwum %s było skorumpowane (błąd sumy kontrolnej MD5 lub SHA1)\n"
+msgstr "plik %s był uszkodzony (błąd sumy kontrolnej MD5)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "nie udało się pobrać niektórych plików z %s\n"
 
-#: lib/libalpm/sync.c:1130
-#, fuzzy
+#, c-format
 msgid "could not create removal transaction\n"
-msgstr "nie udało się utworzyć tranzakcji usuwania"
+msgstr "nie udało się utworzyć tranzakcji usuwania\n"
 
-#: lib/libalpm/sync.c:1136
-#, fuzzy
+#, c-format
 msgid "could not initialize the removal transaction\n"
-msgstr "nie udało się zainicjować tranzakcji usuwania"
+msgstr "nie udało się zainicjować tranzakcji usuwania\n"
 
-#: lib/libalpm/sync.c:1158
-#, fuzzy
+#, c-format
 msgid "could not prepare removal transaction\n"
-msgstr "nie udało się przygotować tranzakcji usuwania"
+msgstr "nie udało się przygotować tranzakcji usuwania\n"
 
-#: lib/libalpm/sync.c:1164
-#, fuzzy
+#, c-format
 msgid "could not commit removal transaction\n"
-msgstr "nie udało się wykonać tranzakcji usuwania"
+msgstr "nie udało się wykonać tranzakcji usuwania\n"
 
-#: lib/libalpm/sync.c:1175
-#, fuzzy
+#, c-format
 msgid "could not create transaction\n"
-msgstr "nie udało się stworzyć tranzakcji"
+msgstr "nie udało się stworzyć tranzakcji\n"
 
-#: lib/libalpm/sync.c:1180
-#, fuzzy
+#, c-format
 msgid "could not initialize transaction\n"
-msgstr "nie udało się zainicjować tranzakcji"
+msgstr "nie udało się zainicjować tranzakcji\n"
 
-#: lib/libalpm/sync.c:1207
-#, fuzzy
+#, c-format
 msgid "could not prepare transaction\n"
-msgstr "nie udało się przygotować tranzakcji"
+msgstr "nie udało się przygotować tranzakcji\n"
 
-#: lib/libalpm/sync.c:1212
-#, fuzzy
+#, c-format
 msgid "could not commit transaction\n"
-msgstr "nie udało się wykonać tranzakcji"
+msgstr "nie udało się wykonać tranzakcji\n"
 
-#: lib/libalpm/trans.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove lock file %s\n"
-msgstr "nie udało się usunąć pliku blokującego %s"
+msgstr "nie udało się usunąć pliku blokującego %s\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr ""
+msgstr "Brak /bin/sh w środowisku,  przerywanie wykonywania skryptu\n"
 
-#: lib/libalpm/trans.c:494
-#, fuzzy
+#, c-format
 msgid "could not create temp directory\n"
-msgstr "nie udało się stworzyć katalogu tymczasowego"
+msgstr "nie udało się stworzyć katalogu tymczasowego\n"
 
-#: lib/libalpm/trans.c:533
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "nie udało się zmienić katalogu na %s (%s)"
+msgstr "nie udało się zmienić katalogu na %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "nie udało się odwidlić nowego procesu (%s)"
+msgstr "nie udało się odwidlić nowego procesu (%s)\n"
 
-#: lib/libalpm/trans.c:561
-#, fuzzy, c-format
+#, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "nie udało się zmienić katalogu głównego (%s)"
+msgstr "nie udało się zmienić katalogu głównego (%s)\n"
 
-#: lib/libalpm/trans.c:566
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to / (%s)\n"
-msgstr "nie udało się zmienić katalogu na / (%s)"
+msgstr "nie udało się zmienić katalogu na / (%s)\n"
 
-#: lib/libalpm/trans.c:575
-#, fuzzy, c-format
+#, c-format
 msgid "call to popen failed (%s)"
-msgstr "zawołanie do waitpid nieudane (%s)"
+msgstr "zawołanie do popen nieudane (%s)"
 
-#: lib/libalpm/trans.c:594
-#, fuzzy, c-format
+#, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "zawołanie do waitpid nieudane (%s)"
+msgstr "zawołanie do waitpid nieudane (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr ""
+msgstr "skrypt nie mógł zostać poprawnie wykonany\n"
 
-#: lib/libalpm/trans.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "nie udało się usunąć katalogu tymczasowego %s"
+msgstr "nie udało się usunąć katalogu tymczasowego %s\n"
 
-#: lib/libalpm/util.c:207
-#, fuzzy, c-format
+#, c-format
 msgid "failed to make path '%s' : %s\n"
-msgstr "nie udało się stworzyć ścieżki '%s' : %s"
+msgstr "nie udało się stworzyć ścieżki '%s' : %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "nie udało się otworzyć %s: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
 
-#: lib/libalpm/util.c:595
-#, fuzzy
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr ""
-"nie udało się stworzenie pamięci podręcznej pakietu, używanie /tmp w zamian\n"
+"nie udało się stworzyć pamięci podręcznej pakietu, używanie /tmp w zamian\n"
 
-#: lib/libalpm/util.c:644
-#, fuzzy, c-format
+#, c-format
 msgid "md5: %s can't be opened\n"
-msgstr "%s nie może być otwarte\n"
+msgstr "md5: %s nie może zostać otwarte\n"
 
-#: lib/libalpm/util.c:646
-#, fuzzy, c-format
+#, c-format
 msgid "md5: %s can't be read\n"
-msgstr "%s nie może być otwarte\n"
+msgstr "md5: %s nie może zostać przeczytane\n"
 
 #, fuzzy
 #~ msgid "loading package data for %s : level=%d\n"

lib/libalpm/po/pt_BR.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
 "PO-Revision-Date: 2008-01-18 08:04-0200\n"
 "Last-Translator: João Felipe Santos <jfsantos@archlinux-br.org>\n"
 "Language-Team: Português do Brasil <contato@archlinux-br.org>\n"
@@ -21,33 +21,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "substituindo a versão antiga %s-%s por %s na lista de alvos\n"
 
-#: lib/libalpm/add.c:95
 #, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
 msgstr "versão atualizada %s-%s está na lista de alvos -- pulando\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
 msgstr "pacotes conflitantes foram encontrados na lista de alvos\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 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"
 
-#: lib/libalpm/add.c:170
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
 msgstr "substituir pacotes com -A e -U ainda não é suportado\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 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"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
@@ -56,604 +53,538 @@ msgstr ""
 "permissões de diretório diferem em %s\n"
 "sistema de arquivos: %o  pacote: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
 msgstr "extração: symlink %s não aponta para diretório\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
 msgstr "extração: não sobrescrevendo diretório com arquivo %s\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
 #, c-format
 msgid "could not extract %s (%s)\n"
 msgstr "não foi possível extrair %s (%s)\n"
 
-#: lib/libalpm/add.c:517
 #, c-format
 msgid "could not rename %s (%s)\n"
 msgstr "não foi possível renomear %s (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
 #, c-format
 msgid "could not copy tempfile to %s (%s)\n"
 msgstr "não foi possível copiar arquivo temporário para %s (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s salvo como %s\n"
 
-#: lib/libalpm/add.c:568
 #, c-format
 msgid "could not install %s as %s: %s\n"
 msgstr "não foi possível instalar %s como %s: %s\n"
 
-#: lib/libalpm/add.c:571
 #, c-format
 msgid "%s installed as %s\n"
 msgstr "%s instalado como %s\n"
 
-#: lib/libalpm/add.c:588
 #, c-format
 msgid "extracting %s as %s.pacnew\n"
 msgstr "extraindo %s como %s.pacnew\n"
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+#, c-format
 msgid "could not get current working directory\n"
 msgstr "não foi possível obter o diretório de trabalho atual\n"
 
-#: lib/libalpm/add.c:777
 #, c-format
 msgid "problem occurred while upgrading %s\n"
 msgstr "erros ocorreram durante o upgrade de %s\n"
 
-#: lib/libalpm/add.c:782
 #, c-format
 msgid "problem occurred while installing %s\n"
 msgstr "erros ocorreram durante a instalação de %s\n"
 
-#: lib/libalpm/add.c:797
 #, c-format
 msgid "could not update database entry %s-%s\n"
 msgstr "não foi possível atualizar a entrada na base de dados %s-%s\n"
 
-#: lib/libalpm/add.c:805
 #, c-format
 msgid "could not add entry '%s' in cache\n"
 msgstr "não foi possível adicionar a entrada '%s' ao cache\n"
 
-#: lib/libalpm/be_files.c:221
 #, c-format
 msgid "invalid name for database entry '%s'\n"
 msgstr "nome inválido para a entrada na base de dados '%s'\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "não foi possível abrir o arquivo %s: %s\n"
 
-#: lib/libalpm/db.c:283
 #, 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"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
 msgstr "tentativa de re-registrar a base de dados 'local'\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+#, c-format
 msgid "database path is undefined\n"
 msgstr "caminho da base de dados não definido\n"
 
-#: lib/libalpm/deps.c:171
+#, c-format
 msgid "dependency cycle detected:\n"
 msgstr "dependência cíclica detectada:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
 msgstr "%s será removido após sua dependência %s\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
 msgstr "%s será instalado antes de sua dependência %s\n"
 
-#: lib/libalpm/deps.c:588
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
 msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
 msgstr "sem memória!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
 msgstr "erro inesperado do sistema"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
 msgstr "privilégios insuficientes"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
 msgstr "não foi possível encontrar ou ler o arquivo"
 
-#: lib/libalpm/error.c:49
+#, c-format
 msgid "could not find or read directory"
 msgstr "não foi possível encontrar ou ler o diretório"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
 msgstr "argumento errado ou NULO passado"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
 msgstr "biblioteca não inicializada"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
 msgstr "biblioteca já inicializada"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "não foi possível travar a base de dados"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "não foi possível abrir a base de dados"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "não foi possível criar a base de dados"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "base de dados não inicializada"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "base de dados já registrada"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "não foi possível encontrar a base de dados"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "não foi possível atualizar a base de dados"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "não foi possível remover a entrada da base de dados"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "url inválida para servidor"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "não foi possível setar parâmetro"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
 msgstr "transação já inicializada"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
 msgstr "transação não inicializada"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
 msgstr "alvo duplicado"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
 msgstr "transação não preparada"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
 msgstr "transação abortada"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
 msgstr "operação não compatível com tipo de transação"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
 msgstr "não foi possível realizar transação"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "não foi possível fazer o download de todos os arquivos"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "não foi possível ler ou escrever o pacote"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "pacote inválido ou corrompido"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "não foi possível abrir arquivo do pacote"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "não foi possível carregar dados do pacote"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "pacote já instalado"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
 msgstr "pacote não instalado ou versão inferior"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "não foi possível remover todos os arquivos para o pacote"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "o nome do pacote não é valido"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "pacote corrompido"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "repositório não existe"
 
-#: lib/libalpm/error.c:126
+#, c-format
 msgid "corrupted delta"
 msgstr "delta corrompido"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
 msgstr "patch do delta falhou"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "grupo não encontrado"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "não foi possível satisfazer as dependências"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
 msgstr "dependências conflitantes"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
 msgstr "arquivos conflitantes"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "usuário abortou a operação"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "erro interno"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "erro da libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
 msgstr "não confirmado"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "expressão regular inválida"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "conexão ao host remoto falhou"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "erro inesperado"
 
-#: lib/libalpm/package.c:122
 #, c-format
 msgid "could not get md5sum for package %s-%s\n"
 msgstr "não foi possível obter a soma md5 para o pacote %s-%s\n"
 
-#: lib/libalpm/package.c:131
 #, c-format
 msgid "md5sums do not match for package %s-%s\n"
 msgstr "somas md5 não coincidem para o pacote %s-%s\n"
 
-#: lib/libalpm/package.c:844
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
 msgstr "%s: forçando upgrade para a versão %s\n"
 
-#: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
 msgstr "%s: local (%s) é mais novo que %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
 #, c-format
 msgid "error extracting package description file to %s\n"
 msgstr "erro ao extrair o arquivo de descrição do pacote para %s\n"
 
-#: lib/libalpm/package.c:1033
 #, c-format
 msgid "could not parse package description file in %s\n"
 msgstr "não foi possível interpretar o arquivo de descrição do pacote em %s\n"
 
-#: lib/libalpm/package.c:1038
 #, c-format
 msgid "missing package name in %s\n"
 msgstr "faltando o nome do pacote em %s\n"
 
-#: lib/libalpm/package.c:1042
 #, c-format
 msgid "missing package version in %s\n"
 msgstr "faltando a versão do pacote em %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
 #, c-format
 msgid "error while reading package %s: %s\n"
 msgstr "erro ao ler o pacote %s: %s\n"
 
-#: lib/libalpm/package.c:1081
 #, c-format
 msgid "missing package metadata in %s\n"
 msgstr "faltando metadata do pacote em %s\n"
 
-#: lib/libalpm/remove.c:119
 #, c-format
 msgid "could not find %s in database -- skipping\n"
 msgstr "não foi possível encontrar %s na base de dados - pulando\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
 #, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "não foi possível remover o arquivo '%s': %s\n"
 
-#: lib/libalpm/remove.c:341
 #, 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"
 
-#: lib/libalpm/remove.c:346
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
 msgstr "não foi possível remover a entrada '%s' da cache\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
 msgstr "url '%s' é inválida, ignorando\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
 msgstr "esquema da url não especificado, assumindo http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
 msgstr "disco"
 
-#: lib/libalpm/server.c:243
 #, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
 msgstr "falha ao obter arquivo '%s' de %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
 msgstr "não foi possível resumir o download, reiniciando\n"
 
-#: lib/libalpm/server.c:286
 #, c-format
 msgid "cannot write to file '%s'\n"
 msgstr "não foi possível escrever no arquivo '%s'\n"
 
-#: lib/libalpm/server.c:305
 #, c-format
 msgid "error downloading '%s': %s\n"
 msgstr "erro no download de '%s': %s\n"
 
-#: lib/libalpm/server.c:317
 #, c-format
 msgid "error writing to file '%s': %s\n"
 msgstr "erro ao escrever no arquivo '%s': %s\n"
 
-#: lib/libalpm/server.c:385
 #, c-format
 msgid "could not chdir to %s\n"
 msgstr "não foi possível mudar para o diretório %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
 msgstr "rodando XferCommand: fork falhou!\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
 msgstr "URL não contém um arquivo para download\n"
 
-#: lib/libalpm/server.c:456
 #, c-format
 msgid "failed to download %s\n"
 msgstr "falha ao fazer o download de %s\n"
 
-#: lib/libalpm/sync.c:133
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
 msgstr "%s-%s: ignorando upgrade do pacote (a ser substituido por %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
 msgstr "%s: ignorando upgrade do pacote (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
 #, c-format
 msgid "repository '%s' not found\n"
 msgstr "repositório '%s' não encontrado\n"
 
-#: lib/libalpm/sync.c:336
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
 msgstr "%s-%s está atualizado -- pulando\n"
 
-#: lib/libalpm/sync.c:340
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
 msgstr "%s-%s está atualizado -- reinstalando\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+#, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "conflito de pacotes não solucionável detectado\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
 msgstr "falha de malloc: não foi possível alocar %zd bytes\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
 msgstr "comando: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
 #, c-format
 msgid "can't get md5 checksum for file %s\n"
 msgstr "não foi possível obter a soma md5 para o pacote %s\n"
 
-#: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
 msgstr "arquivo %s estava corrompido (checksum MD5 inválida)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "falha ao obter alguns arquivos de %s\n"
 
-#: lib/libalpm/sync.c:1130
+#, c-format
 msgid "could not create removal transaction\n"
 msgstr "não foi possível criar transação de remoção\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
 msgstr "não foi possível inicializar a transação de remoção\n"
 
-#: lib/libalpm/sync.c:1158
+#, c-format
 msgid "could not prepare removal transaction\n"
 msgstr "não foi possível preparar a transação de remoção\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
 msgstr "não foi possível efetuar a transação de remoção\n"
 
-#: lib/libalpm/sync.c:1175
+#, c-format
 msgid "could not create transaction\n"
 msgstr "não foi possível criar a transação\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
 msgstr "não foi possível inicializar a transação\n"
 
-#: lib/libalpm/sync.c:1207
+#, c-format
 msgid "could not prepare transaction\n"
 msgstr "não foi possível preparar a transação\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
 msgstr "não foi possível efetuar a transação\n"
 
-#: lib/libalpm/trans.c:212
 #, c-format
 msgid "could not remove lock file %s\n"
 msgstr "não foi possível remover o arquivo de trava %s\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 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/trans.c:494
+#, c-format
 msgid "could not create temp directory\n"
 msgstr "não foi possível criar diretório temporário\n"
 
-#: lib/libalpm/trans.c:533
 #, c-format
 msgid "could not change directory to %s (%s)\n"
 msgstr "não foi possível mudar diretório para %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
 #, 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"
 
-#: lib/libalpm/trans.c:561
 #, c-format
 msgid "could not change the root directory (%s)\n"
 msgstr "não foi possível mudar o diretório raiz (%s)\n"
 
-#: lib/libalpm/trans.c:566
 #, c-format
 msgid "could not change directory to / (%s)\n"
 msgstr "não foi possível mudar o diretório para / (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
 msgstr "chamada para popen falhou (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
 msgstr "chamada para waitpid falhou (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
 msgstr "scriptlet falhou em executar corretamente\n"
 
-#: lib/libalpm/trans.c:612
 #, c-format
 msgid "could not remove tmpdir %s\n"
 msgstr "não foi possível remover o diretório temporário %s\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
 msgstr "falha ao criar caminho '%s' : %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
 msgstr "não foi possível abrir %s : %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "cache %s não existe, criando...\n"
 
-#: lib/libalpm/util.c:595
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
 msgstr "não foi possível criar cache de pacotes, usando /tmp\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
 msgstr "md5: %s não pôde ser aberto\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5: %s não pôde ser lido\n"

lib/libalpm/po/ru.po

@@ -1,683 +1,604 @@
 # Russian translations for Pacman package manager package.
 # Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
-#  <4rayven@gmail.com>, 2007.
+#  <4rayven@gmail.com>, 2007. <serg.partizan@gmail.com> 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-01-14 23:08-0600\n"
-"PO-Revision-Date: 2007-03-16 02:52+1000\n"
-"Last-Translator:  Vladimir Bayrakovskiy <4rayven@gmail.com>\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-18 19:46+0300\n"
+"Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
+"Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: lib/libalpm/add.c:86
 #, c-format
 msgid "replacing older version %s-%s by %s in target list\n"
-msgstr ""
+msgstr "заменяю устаревшую версию %s-%s на %s в списке целей\n"
 
-#: lib/libalpm/add.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "%s-%s не устарел --  пропускаю"
+msgstr "новая версия %s-%s в списке целей --  пропускаю\n"
 
-#: lib/libalpm/add.c:166
+#, c-format
 msgid "conflicting packages were found in the target list\n"
-msgstr ""
+msgstr "в списке целей найдены конфликтующие пакеты\n"
 
-#: lib/libalpm/add.c:167
+#, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
-msgstr ""
+msgstr "вы не можете установить два конфликтующих пакета одновременно\n"
 
-#: lib/libalpm/add.c:170
-#, fuzzy
+#, c-format
 msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "замещение пакетов с использованием опций -A и -U еще не реализовано"
+msgstr "замещение пакетов с использованием опций -A и -U еще не реализовано\n"
 
-#: lib/libalpm/add.c:171
+#, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
-msgstr ""
+msgstr "вы можете заменить пакеты вручную, используя -Rd и -U\n"
 
-#: lib/libalpm/add.c:377
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
+"права доступа различаются у директории %s\n"
+"файловая система: %o  пакет: %o\n"
 
-#: lib/libalpm/add.c:404
 #, c-format
 msgid "extract: symlink %s does not point to dir\n"
-msgstr ""
+msgstr "извлечение: символическая ссылка %s не указывает на директорию\n"
 
-#: lib/libalpm/add.c:411
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr ""
+msgstr "извлечение: не перезаписываю директорию файлом %s\n"
 
-#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
-#, fuzzy, c-format
+#, c-format
 msgid "could not extract %s (%s)\n"
-msgstr "не могу извлечь %s (%s)"
+msgstr "не могу извлечь %s (%s)\n"
 
-#: lib/libalpm/add.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "could not rename %s (%s)\n"
-msgstr "не могу переименовать %s (%s)"
+msgstr "не могу переименовать %s (%s)\n"
 
-#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
-#, fuzzy, c-format
+#, c-format
 msgid "could not copy tempfile to %s (%s)\n"
-msgstr "не могу скопировать временный файл в %s (%s)"
+msgstr "не могу скопировать временный файл в %s (%s)\n"
 
-#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s saved as %s\n"
-msgstr "%s сохранен как %s"
+msgstr "%s сохранен как %s\n"
 
-#: lib/libalpm/add.c:568
-#, fuzzy, c-format
+#, c-format
 msgid "could not install %s as %s: %s\n"
-msgstr "не могу установить %s как %s: %s"
+msgstr "не могу установить %s как %s: %s\n"
 
-#: lib/libalpm/add.c:571
-#, fuzzy, c-format
+#, c-format
 msgid "%s installed as %s\n"
-msgstr "%s установлен как %s"
+msgstr "%s установлен как %s\n"
 
-#: lib/libalpm/add.c:588
-#, fuzzy, c-format
+#, c-format
 msgid "extracting %s as %s.pacnew\n"
-msgstr "извлекаю %s как %s.pacnew"
+msgstr "извлекаю %s как %s.pacnew\n"
 
-#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
-#, fuzzy
+#, c-format
 msgid "could not get current working directory\n"
-msgstr "не могу определить текущую рабочую директорию"
+msgstr "не могу определить текущую рабочую директорию\n"
 
-#: lib/libalpm/add.c:777
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "во время %s %s произошли ошибки"
+msgstr "обнаружена проблема во время обновления %s\n"
 
-#: lib/libalpm/add.c:782
-#, fuzzy, c-format
+#, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "во время %s %s произошли ошибки"
+msgstr "обнаружена проблема во время установки %s\n"
 
-#: lib/libalpm/add.c:797
-#, fuzzy, c-format
+#, c-format
 msgid "could not update database entry %s-%s\n"
-msgstr "не могу обновить в базе данных запись %s-%s"
+msgstr "не могу обновить в базе данных запись %s-%s\n"
 
-#: lib/libalpm/add.c:805
-#, fuzzy, c-format
+#, c-format
 msgid "could not add entry '%s' in cache\n"
-msgstr "не могу добавить запись '%s' в кэш"
+msgstr "не могу добавить запись '%s' в кэш\n"
 
-#: lib/libalpm/be_files.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "не могу удалить из базы данных запись %s%s"
+msgstr "неправильное имя для записи базы данных '%s'\n"
 
-#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
-#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
-#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
-#: lib/libalpm/package.c:885
-#, fuzzy, c-format
+#, c-format
 msgid "could not open file %s: %s\n"
-msgstr "не могу скопировать временный файл в %s (%s)"
+msgstr "не могу открыть файл %s: %s\n"
 
-#: lib/libalpm/db.c:283
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database entry %s%s\n"
-msgstr "не могу удалить из базы данных запись %s%s"
+msgstr "не могу удалить из базы данных запись %s%s\n"
 
-#: lib/libalpm/db.c:551
+#, c-format
 msgid "attempt to re-register the 'local' DB\n"
-msgstr ""
+msgstr "попытка перерегистрировать локальную базу данных\n"
 
-#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
-#, fuzzy
+#, c-format
 msgid "database path is undefined\n"
-msgstr "база данных не инициализирована"
+msgstr "путь к базе данных не определён\n"
 
-#: lib/libalpm/deps.c:171
-#, fuzzy
+#, c-format
 msgid "dependency cycle detected:\n"
-msgstr "обнаружена циклическая зависимость: %s"
+msgstr "обнаружена циклическая зависимость:\n"
 
-#: lib/libalpm/deps.c:173
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr ""
+msgstr "%s будет удалён после %s, как зависимость\n"
 
-#: lib/libalpm/deps.c:175
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr ""
+msgstr "%s будет установлен перед %s, как зависимость\n"
 
-#: lib/libalpm/deps.c:588
-#, fuzzy, c-format
+#, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "не удается удовлетворить зависимости для \"%s\""
+msgstr "не удается разрешить \"%s\", зависимость \"%s\"\n"
 
-#: lib/libalpm/error.c:41
+#, c-format
 msgid "out of memory!"
-msgstr ""
+msgstr "недостаточно памяти!"
 
-#: lib/libalpm/error.c:43
+#, c-format
 msgid "unexpected system error"
-msgstr ""
+msgstr "неожиданная ошибка"
 
-#: lib/libalpm/error.c:45
+#, c-format
 msgid "insufficient privileges"
-msgstr ""
+msgstr "недостаточно привилегий"
 
-#: lib/libalpm/error.c:47
+#, c-format
 msgid "could not find or read file"
-msgstr ""
+msgstr "не могу найти или прочитать файл"
 
-#: lib/libalpm/error.c:49
-#, fuzzy
+#, c-format
 msgid "could not find or read directory"
-msgstr "не удается найти или прочитать пакет"
+msgstr "не удается найти или прочитать директорию"
 
-#: lib/libalpm/error.c:51
+#, c-format
 msgid "wrong or NULL argument passed"
-msgstr ""
+msgstr "неправильный или нулевой аргумент"
 
-#: lib/libalpm/error.c:54
+#, c-format
 msgid "library not initialized"
-msgstr ""
+msgstr "библиотека не инициализирована"
 
-#: lib/libalpm/error.c:56
+#, c-format
 msgid "library already initialized"
-msgstr ""
+msgstr "библиотека уже инициализирована"
 
-#: lib/libalpm/error.c:58
+#, c-format
 msgid "unable to lock database"
 msgstr "не удается заблокировать базу данных"
 
-#: lib/libalpm/error.c:61
+#, c-format
 msgid "could not open database"
 msgstr "не удается открыть базу данных"
 
-#: lib/libalpm/error.c:63
+#, c-format
 msgid "could not create database"
 msgstr "не удается создать базу данных"
 
-#: lib/libalpm/error.c:65
+#, c-format
 msgid "database not initialized"
 msgstr "база данных не инициализирована"
 
-#: lib/libalpm/error.c:67
+#, c-format
 msgid "database already registered"
 msgstr "база данных уже зарегистрирована"
 
-#: lib/libalpm/error.c:69
+#, c-format
 msgid "could not find database"
 msgstr "не удается найти базу данных"
 
-#: lib/libalpm/error.c:71
+#, c-format
 msgid "could not update database"
 msgstr "не удается обновить базу данных"
 
-#: lib/libalpm/error.c:73
+#, c-format
 msgid "could not remove database entry"
 msgstr "не удается удалить запись в базе данных"
 
-#: lib/libalpm/error.c:76
+#, c-format
 msgid "invalid url for server"
 msgstr "неверный url"
 
-#: lib/libalpm/error.c:83
+#, c-format
 msgid "could not set parameter"
 msgstr "ну могу установить параметр"
 
-#: lib/libalpm/error.c:86
+#, c-format
 msgid "transaction already initialized"
-msgstr ""
+msgstr "запрос уже инициализирован"
 
-#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+#, c-format
 msgid "transaction not initialized"
-msgstr ""
+msgstr "запрос не инициализирован"
 
-#: lib/libalpm/error.c:90
+#, c-format
 msgid "duplicate target"
-msgstr ""
+msgstr "повторение целей"
 
-#: lib/libalpm/error.c:94
+#, c-format
 msgid "transaction not prepared"
-msgstr ""
+msgstr "запрос не подготовлен"
 
-#: lib/libalpm/error.c:96
+#, c-format
 msgid "transaction aborted"
-msgstr ""
+msgstr "запрос отменён"
 
-#: lib/libalpm/error.c:98
+#, c-format
 msgid "operation not compatible with the transaction type"
-msgstr ""
+msgstr "операция не совместима с типом запроса"
 
-#: lib/libalpm/error.c:100
+#, c-format
 msgid "could not commit transaction"
-msgstr ""
+msgstr "не могу совершить запрос"
 
-#: lib/libalpm/error.c:102
+#, c-format
 msgid "could not download all files"
 msgstr "не могу загрузить все файлы"
 
-#: lib/libalpm/error.c:105
+#, c-format
 msgid "could not find or read package"
 msgstr "не удается найти или прочитать пакет"
 
-#: lib/libalpm/error.c:107
+#, c-format
 msgid "invalid or corrupted package"
 msgstr "пакет неправильный или поврежден"
 
-#: lib/libalpm/error.c:109
+#, c-format
 msgid "cannot open package file"
 msgstr "не удается открыть файл пакета"
 
-#: lib/libalpm/error.c:111
+#, c-format
 msgid "cannot load package data"
 msgstr "не удается загрузить данные пакета"
 
-#: lib/libalpm/error.c:113
+#, c-format
 msgid "package already installed"
 msgstr "пакет уже установлен"
 
-#: lib/libalpm/error.c:115
+#, c-format
 msgid "package not installed or lesser version"
-msgstr ""
+msgstr "пекет не установлен или ранней версии"
 
-#: lib/libalpm/error.c:117
+#, c-format
 msgid "cannot remove all files for package"
 msgstr "не могу удалить все файлы пакета"
 
-#: lib/libalpm/error.c:119
+#, c-format
 msgid "package name is not valid"
 msgstr "неверное имя пакета"
 
-#: lib/libalpm/error.c:121
+#, c-format
 msgid "corrupted package"
 msgstr "пакет поврежден"
 
-#: lib/libalpm/error.c:123
+#, c-format
 msgid "no such repository"
 msgstr "нет такого репозитория"
 
-#: lib/libalpm/error.c:126
-#, fuzzy
+#, c-format
 msgid "corrupted delta"
-msgstr "пакет поврежден"
+msgstr "дельта-патчи повреждены"
 
-#: lib/libalpm/error.c:128
+#, c-format
 msgid "delta patch failed"
-msgstr ""
+msgstr "не удалось применить дельта-патч"
 
-#: lib/libalpm/error.c:131
+#, c-format
 msgid "group not found"
 msgstr "группа не найдена"
 
-#: lib/libalpm/error.c:134
+#, c-format
 msgid "could not satisfy dependencies"
 msgstr "не удается удовлетворить зависимости"
 
-#: lib/libalpm/error.c:136
+#, c-format
 msgid "conflicting dependencies"
-msgstr ""
+msgstr "конфликтующие зависимости"
 
-#: lib/libalpm/error.c:138
+#, c-format
 msgid "conflicting files"
-msgstr ""
+msgstr "конфликрующие файлы"
 
-#: lib/libalpm/error.c:141
+#, c-format
 msgid "user aborted the operation"
 msgstr "пользователь прервал операцию"
 
-#: lib/libalpm/error.c:143
+#, c-format
 msgid "internal error"
 msgstr "внутренняя ошибка"
 
-#: lib/libalpm/error.c:145
+#, c-format
 msgid "libarchive error"
 msgstr "ошибка в libarchive"
 
-#: lib/libalpm/error.c:148
+#, c-format
 msgid "not confirmed"
-msgstr ""
+msgstr "не подтверждено"
 
-#: lib/libalpm/error.c:150
+#, c-format
 msgid "invalid regular expression"
 msgstr "неверное регулярное выражение"
 
-#: lib/libalpm/error.c:153
+#, c-format
 msgid "connection to remote host failed"
 msgstr "не удалось подключиться к удаленному хосту"
 
-#: lib/libalpm/error.c:156
+#, c-format
 msgid "unexpected error"
 msgstr "непредвиденная ошибка"
 
-#: lib/libalpm/package.c:122
-#, fuzzy, c-format
+#, c-format
 msgid "could not get md5sum for package %s-%s\n"
-msgstr "не могу получить контрольную сумму md5sum для пакета %s-%s"
+msgstr "не могу получить контрольную сумму md5 для пакета %s-%s\n"
 
-#: lib/libalpm/package.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "md5sums do not match for package %s-%s\n"
-msgstr "контрольные суммы md5sum для пакета %s-%s не совпали"
+msgstr "контрольные суммы md5 для пакета %s-%s не совпали\n"
 
-#: lib/libalpm/package.c:844
-#, fuzzy, c-format
+#, c-format
 msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s: принудительно обновляю до версии %s"
+msgstr "%s: принудительно обновляю до версии %s\n"
 
-#: lib/libalpm/package.c:849
-#, fuzzy, c-format
+#, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: установленная версия (%s) новее, чем в %s (%s)"
+msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n"
 
-#: lib/libalpm/package.c:1027
-#, fuzzy, c-format
+#, c-format
 msgid "error extracting package description file to %s\n"
-msgstr "не могу удалить временный файл %s"
+msgstr "ошибка извлечения файла описания пакета в %s\n"
 
-#: lib/libalpm/package.c:1033
-#, fuzzy, c-format
+#, c-format
 msgid "could not parse package description file in %s\n"
-msgstr "не могу удалить временный файл %s"
+msgstr "не могу проанализировать файл с описанием пакета в %s\n"
 
-#: lib/libalpm/package.c:1038
-#, fuzzy, c-format
+#, c-format
 msgid "missing package name in %s\n"
-msgstr "отсутствует список файлов пакета в %s, генерирую его"
+msgstr "пропущено имя пакета в %s\n"
 
-#: lib/libalpm/package.c:1042
-#, fuzzy, c-format
+#, c-format
 msgid "missing package version in %s\n"
-msgstr "отсутствует список файлов пакета в %s, генерирую его"
+msgstr "пропущена версия пакета в %s\n"
 
-#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
-#, fuzzy, c-format
+#, c-format
 msgid "error while reading package %s: %s\n"
-msgstr "ошибка при чтении пакета: %s"
+msgstr "ошибка при чтении пакета %s: %s\n"
 
-#: lib/libalpm/package.c:1081
-#, fuzzy, c-format
+#, c-format
 msgid "missing package metadata in %s\n"
-msgstr "отсутствует список файлов пакета в %s, генерирую его"
+msgstr "отсутствуют метаданые пакета в %s\n"
 
-#: lib/libalpm/remove.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "не могу найти %s в базе данных --  пропускаю"
+msgstr "не могу найти %s в базе данных --  пропускаю\n"
 
-#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "не могу удалить файл '%s': %s"
+msgstr "не могу удалить файл '%s': %s\n"
 
-#: lib/libalpm/remove.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "не могу удалить из базы данных запись %s%s"
+msgstr "не могу удалить из базы данных запись %s-%s\n"
 
-#: lib/libalpm/remove.c:346
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "не могу добавить запись '%s' в кэш"
+msgstr "не могу удалить запись '%s' из кеша\n"
 
-#: lib/libalpm/server.c:54
 #, c-format
 msgid "url '%s' is invalid, ignoring\n"
-msgstr ""
+msgstr "url '%s' недействительный, пропускаю\n"
 
-#: lib/libalpm/server.c:58
+#, c-format
 msgid "url scheme not specified, assuming http\n"
-msgstr ""
+msgstr "url не определён, подразумевается http\n"
 
-#: lib/libalpm/server.c:239
+#, c-format
 msgid "disk"
-msgstr ""
+msgstr "диск"
 
-#: lib/libalpm/server.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "не удалось получить некоторые файлы с %s\n"
+msgstr "не удалось получить файл '%s' из %s : %s\n"
 
-#: lib/libalpm/server.c:273
+#, c-format
 msgid "cannot resume download, starting over\n"
-msgstr ""
+msgstr "не удалось продолжить закачку, начинаю заново\n"
 
-#: lib/libalpm/server.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "cannot write to file '%s'\n"
-msgstr "не могу удалить файл '%s': %s"
+msgstr "не могу записать в файл '%s'\n"
 
-#: lib/libalpm/server.c:305
-#, fuzzy, c-format
+#, c-format
 msgid "error downloading '%s': %s\n"
-msgstr "ошибка при чтении пакета: %s"
+msgstr "ошибка загрузки '%s': %s\n"
 
-#: lib/libalpm/server.c:317
-#, fuzzy, c-format
+#, c-format
 msgid "error writing to file '%s': %s\n"
-msgstr "не могу удалить файл '%s': %s"
+msgstr "не могу записать в файл '%s': %s\n"
 
-#: lib/libalpm/server.c:385
-#, fuzzy, c-format
+#, c-format
 msgid "could not chdir to %s\n"
-msgstr "не могу извлечь %s (%s)"
+msgstr "не могу изменить директорию на %s\n"
 
-#: lib/libalpm/server.c:392
+#, c-format
 msgid "running XferCommand: fork failed!\n"
-msgstr ""
+msgstr "запуск XferCommand: неудача\n"
 
-#: lib/libalpm/server.c:443
+#, c-format
 msgid "URL does not contain a file for download\n"
-msgstr ""
+msgstr "URL не содержит имени файла для загрузки\n"
 
-#: lib/libalpm/server.c:456
-#, fuzzy, c-format
+#, c-format
 msgid "failed to download %s\n"
-msgstr "не могу загрузить все файлы"
+msgstr "не могу загрузить %s\n"
 
-#: lib/libalpm/sync.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
-msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
+msgstr "%s-%s: игнорирую обновление пакета (он будет заменен на %s-%s)\n"
 
-#: lib/libalpm/sync.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr "%s-%s: игнорирую обновление этого пакета (он будет заменен на %s-%s)"
+msgstr "%s: игнорирую обновление пакета (%s => %s)\n"
 
-#: lib/libalpm/sync.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "repository '%s' not found\n"
-msgstr "репозиторий '%s' не найден"
+msgstr "репозиторий '%s' не найден\n"
 
-#: lib/libalpm/sync.c:336
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s не устарел --  пропускаю"
+msgstr "%s-%s не устарел --  пропускаю\n"
 
-#: lib/libalpm/sync.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s не устарел --  пропускаю"
+msgstr "%s-%s не устарел --  переустанавливаю\n"
 
-#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
-#, fuzzy
+#, c-format
 msgid "unresolvable package conflicts detected\n"
-msgstr "обнаружен неразрешимый конфликт пакетов"
+msgstr "обнаружен неразрешимый конфликт пакетов\n"
 
-#: lib/libalpm/sync.c:611
 #, c-format
 msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr ""
+msgstr "сбой malloc: не удалось выделить %zd байт\n"
 
-#: lib/libalpm/sync.c:812
 #, c-format
 msgid "command: %s\n"
-msgstr ""
+msgstr "комманда: %s\n"
 
-#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
-#, fuzzy, c-format
+#, c-format
 msgid "can't get md5 checksum for file %s\n"
-msgstr "не удалось получить md5 или sha1 контрольную сумму для пакета %s\n"
+msgstr "не удалось получить md5 контрольную сумму для файла %s\n"
 
-#: lib/libalpm/sync.c:902
-#, fuzzy, c-format
+#, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "архив %s был поврежден (не сходится MD5 или SHA1 контрольная сумма)\n"
+msgstr "архив %s поврежден (не сходятся контрольные MD5-суммы)\n"
 
-#: lib/libalpm/sync.c:1049
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "не удалось получить некоторые файлы с %s\n"
 
-#: lib/libalpm/sync.c:1130
-#, fuzzy
+#, c-format
 msgid "could not create removal transaction\n"
-msgstr "не удается создать базу данных"
+msgstr "не удалось создать запрос на удаление\n"
 
-#: lib/libalpm/sync.c:1136
+#, c-format
 msgid "could not initialize the removal transaction\n"
-msgstr ""
+msgstr "не удалось инициализировать запрос на удаление\n"
 
-#: lib/libalpm/sync.c:1158
-#, fuzzy
+#, c-format
 msgid "could not prepare removal transaction\n"
-msgstr "не удается создать базу данных"
+msgstr "не удалось подготовить запрос на удаление\n"
 
-#: lib/libalpm/sync.c:1164
+#, c-format
 msgid "could not commit removal transaction\n"
-msgstr ""
+msgstr "не удалось совершить запрос на удаление\n"
 
-#: lib/libalpm/sync.c:1175
-#, fuzzy
+#, c-format
 msgid "could not create transaction\n"
-msgstr "не удается создать базу данных"
+msgstr "не удалось создать запрос\n"
 
-#: lib/libalpm/sync.c:1180
+#, c-format
 msgid "could not initialize transaction\n"
-msgstr ""
+msgstr "не удалось инициализировать запрос\n"
 
-#: lib/libalpm/sync.c:1207
-#, fuzzy
+#, c-format
 msgid "could not prepare transaction\n"
-msgstr "не удается создать базу данных"
+msgstr "не удалось подготовить запрос\n"
 
-#: lib/libalpm/sync.c:1212
+#, c-format
 msgid "could not commit transaction\n"
-msgstr ""
+msgstr "не удалось совершить запрос\n"
 
-#: lib/libalpm/trans.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove lock file %s\n"
-msgstr "не могу удалить lock-файл %s"
+msgstr "не могу удалить lock-файл %s\n"
 
-#: lib/libalpm/trans.c:483
+#, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr ""
+msgstr "Нету /bin/sh в родительском окружении, отмена скрипта\n"
 
-#: lib/libalpm/trans.c:494
-#, fuzzy
+#, c-format
 msgid "could not create temp directory\n"
-msgstr "не могу определить текущую рабочую директорию"
+msgstr "не удалось создать временную директорию\n"
 
-#: lib/libalpm/trans.c:533
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "не могу извлечь %s (%s)"
+msgstr "не удалось изменить директорию на %s (%s)\n"
 
-#: lib/libalpm/trans.c:551
-#, fuzzy, c-format
+#, c-format
 msgid "could not fork a new process (%s)\n"
-msgstr "не могу переименовать %s (%s)"
+msgstr "не не удалось создать новый процесс (%s)\n"
 
-#: lib/libalpm/trans.c:561
-#, fuzzy, c-format
+#, c-format
 msgid "could not change the root directory (%s)\n"
-msgstr "не могу определить текущую рабочую директорию"
+msgstr "не удалось изменить корневую директорию (%s)\n"
 
-#: lib/libalpm/trans.c:566
-#, fuzzy, c-format
+#, c-format
 msgid "could not change directory to / (%s)\n"
-msgstr "не могу извлечь %s (%s)"
+msgstr "не удалось изменить директорию на / (%s)\n"
 
-#: lib/libalpm/trans.c:575
 #, c-format
 msgid "call to popen failed (%s)"
-msgstr ""
+msgstr "вызов popen не удался (%s)"
 
-#: lib/libalpm/trans.c:594
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr ""
+msgstr "вызов waitpid не удался (%s)\n"
 
-#: lib/libalpm/trans.c:603
+#, c-format
 msgid "scriptlet failed to execute correctly\n"
-msgstr ""
+msgstr "не удалось корректно выполнить скрипт\n"
 
-#: lib/libalpm/trans.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "could not remove tmpdir %s\n"
-msgstr "не могу удалить временный файл %s"
+msgstr "не могу удалить tmpdir %s\n"
 
-#: lib/libalpm/util.c:207
 #, c-format
 msgid "failed to make path '%s' : %s\n"
-msgstr ""
+msgstr "не удалось создать путь '%s' : %s\n"
 
-#: lib/libalpm/util.c:392
 #, c-format
 msgid "could not open %s: %s\n"
-msgstr ""
+msgstr "не удалось откруть %s: %s\n"
 
-#: lib/libalpm/util.c:579
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "кэш %s не существует, создаю...\n"
 
-#: lib/libalpm/util.c:595
-#, fuzzy
+#, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "не могу создать кэш пакета, будет использован /tmp\n"
+msgstr "не могу создать кэш пакетов, будет использован /tmp\n"
 
-#: lib/libalpm/util.c:644
 #, c-format
 msgid "md5: %s can't be opened\n"
-msgstr ""
+msgstr "md5: %s не может быть открыт\n"
 
-#: lib/libalpm/util.c:646
 #, c-format
 msgid "md5: %s can't be read\n"
-msgstr ""
+msgstr "md5: %s не может быть прочитан\n"
 
 #, fuzzy
 #~ msgid "loading package data for %s : level=%d\n"
-#~ msgstr "загружаю данные пакета %s : уровень=%d"
+#~ msgstr "загружаю данные пакета %s : уровень=%d\n"
 
 #, fuzzy
 #~ msgid "could not remove tempfile %s\n"
-#~ msgstr "не могу удалить временный файл %s"
+#~ msgstr "не могу удалить временный файл %s\n"
 
 #, fuzzy
 #~ msgid "missing package filelist in %s, generating one\n"
-#~ msgstr "отсутствует список файлов пакета в %s, генерирую его"
+#~ msgstr "отсутствует список файлов пакета в %s, генерирую его\n"
 
 #~ msgid "please remove '%s' first, using -Rd"
-#~ msgstr "пожалуйста, уделите сначала '%s' используя -Rd"
+#~ msgstr "пожалуйста, уделите сначала '%s' используя -Rd\n"
 
 #~ msgid "could not extract %s (%s)"
 #~ msgstr "не могу извлечь %s (%s)"

lib/libalpm/po/zh_CN.po

@@ -0,0 +1,586 @@
+# Chinese/Simplified translation of Pacman package manager package.
+# Copyright (C) 2008 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
+# 甘露(Lu.Gan) <rhythm.gan@gmail.com>, 2008.
+#
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Pacman package manager 3.1.2\n"
+"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
+"POT-Creation-Date: 2008-03-03 20:03-0600\n"
+"PO-Revision-Date: 2008-02-25 20:25+0100\n"
+"Last-Translator: 甘露(Lu.Gan) <rhythm.gan@gmail.com>\n"
+"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "正在替换老版本 %s-%s 通过在目标清单中的%s\n"
+
+#, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
+msgstr "较新版本 %s-%s 在目标清单中 -- 跳过\n"
+
+#, c-format
+msgid "conflicting packages were found in the target list\n"
+msgstr "目标清单中发现有冲突的软件包\n"
+
+#, c-format
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr "你不能同时安装有冲突的两个软件包\n"
+
+#, c-format
+msgid "replacing packages with -A and -U is not supported yet\n"
+msgstr "正在使用 -A 替代软件包， -U 目前尚不支持\n"
+
+#, c-format
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr "你可以使用 -Rd 及 -U 来手动替代软件包\n"
+
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr ""
+"目录权限不一致%s\n"
+"文件系统：%o  软件包：%o\n"
+
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "解压缩：链接 %s 没有指向目录\n"
+
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "解压缩：没有用 %s 覆盖目录\n"
+
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "无法解压缩 %s (%s)\n"
+
+#, c-format
+msgid "could not rename %s (%s)\n"
+msgstr "无法重命名 %s (%s)\n"
+
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "无法复制临时文件到 %s (%s)\n"
+
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s 已另存为 %s\n"
+
+#, c-format
+msgid "could not install %s as %s: %s\n"
+msgstr "无法安装 %s 作为 %s: %s\n"
+
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s 已作为 %s 安装\n"
+
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "正在解压缩 %s 作为 %s.pacnew\n"
+
+#, c-format
+msgid "could not get current working directory\n"
+msgstr "无法得到当前的工作目录\n"
+
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "更新 %s时出现错误\n"
+
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "安装 %s时出现错误\n"
+
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "无法更新数据库记录 %s-%s\n"
+
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "无法在缓存中添加记录 '%s' \n"
+
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "数据库记录'%s'名字无效\n"
+
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "无法打开文件 %s: %s\n"
+
+#, c-format
+msgid "could not remove database entry %s%s\n"
+msgstr "无法删除数据库记录 %s%s\n"
+
+#, c-format
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "尝试重新登记“本地”数据库\n"
+
+#, c-format
+msgid "database path is undefined\n"
+msgstr "没有指定数据库路径\n"
+
+#, c-format
+msgid "dependency cycle detected:\n"
+msgstr "探测到依赖关系循环：\n"
+
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s将在它%s的依赖关系之后被删除\n"
+
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s将在它%s的依赖关系之前被安装\n"
+
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "无法解决\"%s\"，\"%s\"的依赖关系\n"
+
+#, c-format
+msgid "out of memory!"
+msgstr "没有内存可用！"
+
+#, c-format
+msgid "unexpected system error"
+msgstr "未预计的系统错误"
+
+#, c-format
+msgid "insufficient privileges"
+msgstr "权限不充分"
+
+#, c-format
+msgid "could not find or read file"
+msgstr "无法找到或读取文件"
+
+#, c-format
+msgid "could not find or read directory"
+msgstr "无法找到或读取目录"
+
+#, c-format
+msgid "wrong or NULL argument passed"
+msgstr "传递了错误的或空的参数"
+
+#, c-format
+msgid "library not initialized"
+msgstr "无法初始化函数库"
+
+#, c-format
+msgid "library already initialized"
+msgstr "函数库已初始化"
+
+#, c-format
+msgid "unable to lock database"
+msgstr "无法锁定数据库"
+
+#, c-format
+msgid "could not open database"
+msgstr "无法打开数据库"
+
+#, c-format
+msgid "could not create database"
+msgstr "无法创建数据库"
+
+#, c-format
+msgid "database not initialized"
+msgstr "数据库无法初始化"
+
+#, c-format
+msgid "database already registered"
+msgstr "数据库已登记"
+
+#, c-format
+msgid "could not find database"
+msgstr "无法找到数据库"
+
+#, c-format
+msgid "could not update database"
+msgstr "无法更新数据库"
+
+#, c-format
+msgid "could not remove database entry"
+msgstr "无法删除数据库记录"
+
+#, c-format
+msgid "invalid url for server"
+msgstr "无效的服务器url"
+
+#, c-format
+msgid "could not set parameter"
+msgstr "无法设置参数"
+
+#, c-format
+msgid "transaction already initialized"
+msgstr "处理已初始化"
+
+#, c-format
+msgid "transaction not initialized"
+msgstr "处理无法初始化"
+
+#, c-format
+msgid "duplicate target"
+msgstr "重复的目标"
+
+#, c-format
+msgid "transaction not prepared"
+msgstr "处理未准备好"
+
+#, c-format
+msgid "transaction aborted"
+msgstr "处理已放弃"
+
+#, c-format
+msgid "operation not compatible with the transaction type"
+msgstr "操作与处理类型不兼容"
+
+#, c-format
+msgid "could not commit transaction"
+msgstr "无法交付处理"
+
+#, c-format
+msgid "could not download all files"
+msgstr "无法下载全部文件"
+
+#, c-format
+msgid "could not find or read package"
+msgstr "无法找到或读取软件包"
+
+#, c-format
+msgid "invalid or corrupted package"
+msgstr "无效的或已损坏的软件包"
+
+#, c-format
+msgid "cannot open package file"
+msgstr "无法打开软件包文件"
+
+#, c-format
+msgid "cannot load package data"
+msgstr "无法加载软件包数据"
+
+#, c-format
+msgid "package already installed"
+msgstr "软件包已经安装"
+
+#, c-format
+msgid "package not installed or lesser version"
+msgstr "软件包没有安装或版本较低"
+
+#, c-format
+msgid "cannot remove all files for package"
+msgstr "无法删除软件包全部文件"
+
+#, c-format
+msgid "package name is not valid"
+msgstr "软件包名字无效"
+
+#, c-format
+msgid "corrupted package"
+msgstr "已损坏的软件包"
+
+#, c-format
+msgid "no such repository"
+msgstr "没有该软件库"
+
+#, c-format
+msgid "corrupted delta"
+msgstr "已损怀的delta"
+
+#, c-format
+msgid "delta patch failed"
+msgstr "delta补丁失败"
+
+#, c-format
+msgid "group not found"
+msgstr "没有找到软件包组"
+
+#, c-format
+msgid "could not satisfy dependencies"
+msgstr "无法满足依赖关系"
+
+#, c-format
+msgid "conflicting dependencies"
+msgstr "有冲突的依赖关系"
+
+#, c-format
+msgid "conflicting files"
+msgstr "有冲突的文件"
+
+#, c-format
+msgid "user aborted the operation"
+msgstr "用户中断操作"
+
+#, c-format
+msgid "internal error"
+msgstr "内部错误"
+
+#, c-format
+msgid "libarchive error"
+msgstr "libarchive错误"
+
+#, c-format
+msgid "not confirmed"
+msgstr "不能确认"
+
+#, c-format
+msgid "invalid regular expression"
+msgstr "无效的常规表达式"
+
+#, c-format
+msgid "connection to remote host failed"
+msgstr "连接远端主机失败"
+
+#, c-format
+msgid "unexpected error"
+msgstr "未预期的错误"
+
+#, c-format
+msgid "could not get md5sum for package %s-%s\n"
+msgstr "无法得到软件包%s-%s的md5值\n"
+
+#, c-format
+msgid "md5sums do not match for package %s-%s\n"
+msgstr "软件包%s-%s的md5值不一致\n"
+
+#, c-format
+msgid "%s: forcing upgrade to version %s\n"
+msgstr "%s：强制更新至版本%s\n"
+
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s：本地（%s）比%s版本更新(%s)\n"
+
+#, c-format
+msgid "error extracting package description file to %s\n"
+msgstr "解压缩软件包描述文件到%s时发生错误\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "无法分析%s中的软件包描述文件\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "%s中缺少软件包名字\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "%s中缺少软件包版本号\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "读取软件包%s: %s发生错误\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "%s中缺少软件包元数据\n"
+
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "无法在数据库中找到%s -- 跳过\n"
+
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "无法删除文件'%s': %s\n"
+
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "无法删除数据库记录%s-%s\n"
+
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "无法从缓存中删除记录'%s'\n"
+
+#, c-format
+msgid "url '%s' is invalid, ignoring\n"
+msgstr "url %s' 无效，忽略\n"
+
+#, c-format
+msgid "url scheme not specified, assuming http\n"
+msgstr "url scheme没有指定，假定为http\n"
+
+#, c-format
+msgid "disk"
+msgstr "硬盘"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "获取文件'%s'从%s : %s失败\n"
+
+#, c-format
+msgid "cannot resume download, starting over\n"
+msgstr "无法恢复下载，重新开始\n"
+
+#, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "无法写入文件'%s'\n"
+
+#, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "下载'%s': %s时出错\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "写入文件'%s': %s时出错\n"
+
+#, c-format
+msgid "could not chdir to %s\n"
+msgstr "无法改变目录到%s\n"
+
+#, c-format
+msgid "running XferCommand: fork failed!\n"
+msgstr "运行XferCommand:分支失败！\n"
+
+#, c-format
+msgid "URL does not contain a file for download\n"
+msgstr "URL没有包含可下载的文件\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "下载%s失败\n"
+
+#, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n"
+
+#, c-format
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s：忽略软件包更新（%s => %s）\n"
+
+#, c-format
+msgid "repository '%s' not found\n"
+msgstr "没有找到软件库'%s'\n"
+
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s已经为最新 -- 跳过\n"
+
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s已经为最新 -- 重新安装\n"
+
+#, c-format
+msgid "unresolvable package conflicts detected\n"
+msgstr "探测到无法解决的软件包冲突\n"
+
+#, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "内存分配错误：无法分配 %zd bytes\n"
+
+#, c-format
+msgid "command: %s\n"
+msgstr "命令：%s\n"
+
+#, c-format
+msgid "can't get md5 checksum for file %s\n"
+msgstr "无法得到文件%s的md5检查值\n"
+
+#, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
+msgstr "文件%s已损坏（坏的MD5检查值）\n"
+
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "某些文件无法从%s取回\n"
+
+#, c-format
+msgid "could not create removal transaction\n"
+msgstr "无法生成可删除处理\n"
+
+#, c-format
+msgid "could not initialize the removal transaction\n"
+msgstr "无法初始化可删除处理\n"
+
+#, c-format
+msgid "could not prepare removal transaction\n"
+msgstr "无法准备可删除处理\n"
+
+#, c-format
+msgid "could not commit removal transaction\n"
+msgstr "无法交付可删除处理\n"
+
+#, c-format
+msgid "could not create transaction\n"
+msgstr "无法创建处理\n"
+
+#, c-format
+msgid "could not initialize transaction\n"
+msgstr "无法初始化处理\n"
+
+#, c-format
+msgid "could not prepare transaction\n"
+msgstr "无法准备处理\n"
+
+#, c-format
+msgid "could not commit transaction\n"
+msgstr "无法交付处理\n"
+
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "无法删除锁定文件%s\n"
+
+#, c-format
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "父环境中没有/bin/sh，正在中断脚本\n"
+
+#, c-format
+msgid "could not create temp directory\n"
+msgstr "无法创建临时目录\n"
+
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "无法更改目录到%s (%s)\n"
+
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "无法分支新进程(%s)\n"
+
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "无法更改根目录(%s)\n"
+
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "无法更改目录到/ (%s)\n"
+
+#, c-format
+msgid "call to popen failed (%s)"
+msgstr "调用popen失败(%s)"
+
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "调用waitpid失败(%s)\n"
+
+#, c-format
+msgid "scriptlet failed to execute correctly\n"
+msgstr "脚本没有被正确执行\n"
+
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "无法删除临时目录%s\n"
+
+#, c-format
+msgid "failed to make path '%s' : %s\n"
+msgstr "无法创建路径'%s' : %s\n"
+
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "无法打开%s: %s\n"
+
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "没有%s缓存存在，正在创建……\n"
+
+#, c-format
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "无法创建软件包缓存，正在使用/tmp代替\n"
+
+#, c-format
+msgid "md5: %s can't be opened\n"
+msgstr "md5：%s无法打开\n"
+
+#, c-format
+msgid "md5: %s can't be read\n"
+msgstr "md5：%s无法读取\n"

lib/libalpm/remove.c

@@ -61,8 +61,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
 		RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
 	}
 
-	if((info = _alpm_db_scan(db, name)) == NULL) {
-		/* Unimportant - just ignore it if we can't find it */
+	if((info = _alpm_db_get_pkgfromcache(db, name)) == NULL) {
 		_alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", name);
 		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
 	}
@@ -78,7 +77,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name)
 	}
 
 	_alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name);
-	trans->packages = alpm_list_add(trans->packages, info);
+	trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info));
 
 	return(0);
 }
@@ -108,12 +107,12 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 					alpm_list_t *i;
 					for(i = lp; i; i = i->next) {
 						pmdepmissing_t *miss = (pmdepmissing_t *)i->data;
-						pmpkg_t *info = _alpm_db_scan(db, miss->target);
+						pmpkg_t *info = _alpm_db_get_pkgfromcache(db, miss->target);
 						if(info) {
 							if(!_alpm_pkg_find(alpm_pkg_get_name(info), trans->packages)) {
 								_alpm_log(PM_LOG_DEBUG, "pulling %s in the targets list\n",
 										alpm_pkg_get_name(info));
-								trans->packages = alpm_list_add(trans->packages, info);
+								trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info));
 							}
 						} else {
 							_alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"),

lib/libalpm/sync.c

@@ -170,7 +170,7 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 						sync->data = alpm_list_add(NULL, dummy);
 						*syncpkgs = alpm_list_add(*syncpkgs, sync);
 					}
-					_alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)\n",
+					_alpm_log(PM_LOG_DEBUG, "%s-%s elected for removal (to be replaced by %s-%s)\n",
 							alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
 							alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 				}
@@ -337,8 +337,10 @@ int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sy
 						alpm_pkg_get_name(local), alpm_pkg_get_version(local));
 				return(0);
 			} else {
-				_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
-						alpm_pkg_get_name(local), alpm_pkg_get_version(local));
+				if(!(trans->flags & PM_TRANS_FLAG_DOWNLOADONLY)) {
+					_alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- reinstalling\n"),
+							alpm_pkg_get_name(local), alpm_pkg_get_version(local));
+				}
 			}
 		}
 	}

pactest/pmdb.py

@@ -119,7 +119,10 @@ class pmdb:
 
         # desc
         filename = os.path.join(path, "desc")
-        fd = file(filename, "r")
+        if not os.path.isfile(filename):
+            print "invalid db entry found (desc missing) for pkg", pkgname
+            return None
+        fd = open(filename, "r")
         while 1:
             line = fd.readline()
             if not line:
@@ -158,7 +161,10 @@ class pmdb:
 
         # files
         filename = os.path.join(path, "files")
-        fd = file(filename, "r")
+        if not os.path.isfile(filename):
+            print "invalid db entry found (files missing) for pkg", pkgname
+            return None
+        fd = open(filename, "r")
         while 1:
             line = fd.readline()
             if not line:
@@ -177,6 +183,9 @@ class pmdb:
 
         # depends
         filename = os.path.join(path, "depends")
+        if not os.path.isfile(filename):
+            print "invalid db entry found (depends missing) for pkg", pkgname
+            return None
         fd = file(filename, "r")
         while 1:
             line = fd.readline()
@@ -252,6 +261,7 @@ class pmdb:
             if pkg.reason:
                 data.append(_mksection("REASON", pkg.reason))
         else:
+            data.append(_mksection("FILENAME", pkg.filename()))
             if pkg.replaces:
                 data.append(_mksection("REPLACES", pkg.replaces))
             if pkg.force:

pactest/tests/upgrade011.py

@@ -0,0 +1,16 @@
+self.description = "Upgrade a package with a filesystem conflict"
+
+p = pmpkg("dummy", "2.0-1")
+p.files = ["bin/dummy", "usr/share/file"]
+self.addpkg(p)
+
+lp = pmpkg("dummy", "1.0-1")
+lp.files = ["bin/dummy"]
+self.addpkg2db("local", lp)
+
+self.filesystem = ["usr/share/file"]
+
+self.args = "-U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("PKG_VERSION=dummy|1.0-1")

pactest/tests/upgrade040.py

@@ -27,4 +27,5 @@ for p in p1, p2:
 	self.addrule("PKG_EXIST=%s" % p.name)
 self.addrule("FILE_MODIFIED=bin/dummy")
 self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
 self.addrule("FILE_MODIFIED=usr/share/file")

pactest/tests/upgrade041.py

@@ -4,7 +4,7 @@ lp1 = pmpkg("dummy")
 lp1.files = ["bin/dummy"]
 
 lp2 = pmpkg("foobar")
-lp2.files = ["bin/foobar"
+lp2.files = ["bin/foobar",
              "usr/share/file"]
 
 for p in lp1, lp2:
@@ -27,4 +27,5 @@ for p in p1, p2:
 	self.addrule("PKG_EXIST=%s" % p.name)
 self.addrule("FILE_MODIFIED=bin/dummy")
 self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
 self.addrule("FILE_MODIFIED=usr/share/file")

pactest/tests/upgrade045.py

@@ -0,0 +1,16 @@
+self.description = "FS#9235"
+
+lp = pmpkg("foo")
+lp.files = ["etc/foo.cfg -> etc/foo.cfg"]
+lp.backup = ["etc/foo.cfg"]
+self.addpkg2db("local", lp)
+
+p1 = pmpkg("foo", "1.0-2")
+p1.files = ["etc/foo.cfg*"]
+p1.backup = ["etc/foo.cfg"]
+self.addpkg(p1)
+
+self.args = "-U %s" % p1.filename()
+
+self.addrule("PKG_VERSION=foo|1.0-2")
+self.addrule("FILE_EXIST=etc/foo.cfg")

pactest/tests/upgrade046.py

@@ -0,0 +1,31 @@
+self.description = "File relocation between two packages (reverse order, --force)"
+
+lp1 = pmpkg("dummy")
+lp1.files = ["bin/dummy"]
+
+lp2 = pmpkg("foobar")
+lp2.files = ["bin/foobar",
+             "usr/share/file"]
+
+for p in lp1, lp2:
+	self.addpkg2db("local", p)
+
+p1 = pmpkg("dummy")
+p1.files = ["bin/dummy",
+            "usr/share/file"]
+
+p2 = pmpkg("foobar")
+p2.files = ["bin/foobar"]
+
+for p in p1, p2:
+	self.addpkg(p)
+
+self.args = "-Uf %s" % " ".join([p.filename() for p in p1, p2])
+
+self.addrule("PACMAN_RETCODE=0")
+for p in p1, p2:
+	self.addrule("PKG_EXIST=%s" % p.name)
+self.addrule("FILE_MODIFIED=bin/dummy")
+self.addrule("FILE_MODIFIED=bin/foobar")
+self.addrule("FILE_EXIST=usr/share/file")
+self.addrule("FILE_MODIFIED=usr/share/file")

pactest/util.py

@@ -196,6 +196,9 @@ def mkcfgfile(filename, root, option, db):
 def getmd5sum(filename):
     """
     """
+    if not os.path.isfile(filename):
+        print "file %s does not exist!" % filename
+        return ""
     fd = open(filename, "rb")
     checksum = md5.new()
     while 1:
@@ -223,6 +226,9 @@ def mkmd5sum(data):
 def getmtime(filename):
     """
     """
+    if not os.path.exists(filename):
+        print "path %s does not exist!" % filename
+        return 0, 0, 0
     st = os.stat(filename)
     return st[stat.ST_ATIME], st[stat.ST_MTIME], st[stat.ST_CTIME]
 

po/LINGUAS

@@ -1,11 +1,12 @@
 # Set of available languages.
-cs_CZ
+cs
 de
 en_GB
 es
 fr
 hu
 it
-pl_PL
+pl
 pt_BR
-ru_RU
+ru
+zh_CN

po/Makevars

@@ -8,9 +8,9 @@ subdir = po
 top_builddir = ../
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = \
-  --keyword=_ --flag=_:1:pass-c-format \
-  --keyword=N_ --flag=N_:1:pass-c-format
+XGETTEXT_OPTIONS = --no-location \
+  --keyword=_ --flag=_:1:c-format \
+  --keyword=N_ --flag=N_:1:c-format
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.

proto.install

@@ -1,36 +1,37 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
+# This is a default template for a post-install scriptlet.
+# Uncomment only required functions and remove any functions
+# you don't need (and this header).
 
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
+## arg 1:  the new package version
+#pre_install() {
+  # do something here
+#}
 
-# arg 1:  the new package version
-post_install() {
-  /bin/true
-}
+## arg 1:  the new package version
+#post_install() {
+  # do something here
+#}
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
+## arg 1:  the new package version
+## arg 2:  the old package version
+#pre_upgrade() {
+  # do something here
+#}
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
+## arg 1:  the new package version
+## arg 2:  the old package version
+#post_upgrade() {
+  # do something here
+#}
 
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
+## arg 1:  the old package version
+#pre_remove() {
+  # do something here
+#}
 
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
+## arg 1:  the old package version
+#post_remove() {
+  # do something here
+#}
 
 # vim:set ts=2 sw=2 et:

scripts/gensync.sh.in

@@ -31,6 +31,9 @@ usage() {
 	printf "gensync (pacman) %s\n\n" "$myver"
 	printf "$(gettext "Usage: %s <root> <destfile> [package_directory]")\n\n" "$0"
 	printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
+	printf "$(gettext "\
 gensync will generate a sync database by reading all PKGBUILD files\n\
 from <root>. gensync builds the database in a temporary directory\n\
 and then compresses it to <destfile>.\n\n")"
@@ -77,6 +80,13 @@ check_force () {
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
 	exit 0
@@ -116,6 +126,10 @@ fi
 
 [ ! -d "$rootdir" ] && die "$(gettext "invalid root dir: %s")" $rootdir
 
+printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
+
 echo "$(gettext "gensync: building database entries, generating md5sums...")" >&2
 cd "$destdir"
 

scripts/makepkg.sh.in

@@ -464,6 +464,12 @@ download_sources() {
 			continue
 		fi
 
+		# if we get here, check to make sure it was a URL, else fail
+		if [ "$file" = "$netfile" ]; then
+			error "$(gettext "%s was not found in the build directory and is not a URL.")" "$netfile"
+			exit 1 # $E_MISSING_FILE
+		fi
+
 		# find the client we should use for this URL
 		local dlclient=$(get_downloadclient $netfile) || exit $?
 
@@ -669,9 +675,6 @@ run_build() {
 	msg "$(gettext "Starting build()...")"
 	cd "$srcdir"
 
-	# ensure we have a sane umask set
-	umask 0022
-
 	# ensure all necessary build variables are exported
 	export CFLAGS CXXFLAGS MAKEFLAGS CHOST
 
@@ -748,7 +751,7 @@ tidy_install() {
 
 	if [ "$(check_option strip)" = "y" ]; then
 		msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")"
-		for file in $(find {,usr/{,local/},opt/}{bin,lib,sbin} -type f 2>/dev/null || true); do
+		for file in $(find {,usr/{,local/},opt/*/}{bin,lib,sbin} -type f 2>/dev/null || true); do
 			case "$(file -biz "$file")" in
 				*application/x-sharedlib*)  # Libraries
 					/usr/bin/strip --strip-debug "$file";;
@@ -804,6 +807,9 @@ create_package() {
 	if [ "$CARCH" != "" ]; then
 		echo "arch = $CARCH" >>.PKGINFO
 	fi
+	if [ "$(check_option force)" = "y" ]; then
+		echo "force = true" >> .PKGINFO
+	fi
 
 	local it
 	for it in "${license[@]}"; do
@@ -933,8 +939,8 @@ create_xdelta() {
 create_srcpackage() {
 	cd "$startdir"
 	msg "$(gettext "Creating source package...")"
-	local comp_files="PKGBUILD"
-	msg2 "$(gettext "Adding %s...")" "PKGBUILD"
+	local comp_files="$BUILDSCRIPT"
+	msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT"
 
 	if [ "$install" != "" ]; then
 		if [ -f $install ]; then
@@ -989,23 +995,30 @@ devel_check() {
 		# This will only be used on the first call to makepkg; subsequent
 		# calls to makepkg via fakeroot will explicitly pass the version
 		# number to avoid having to determine the version number twice.
+		# Also do a brief check to make sure we have the VCS tool available.
 		oldpkgver=$pkgver
 		if [ ! -z ${_darcstrunk} ] && [ ! -z ${_darcsmod} ] ; then
+			[ $(type -p darcs) ] || return 0
 			msg "$(gettext "Determining latest darcs revision...")"
 			newpkgver=$(date +%Y%m%d)
 		elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then
+			[ $(type -p cvs) ] || return 0
 			msg "$(gettext "Determining latest cvs revision...")"
 			newpkgver=$(date +%Y%m%d)
 		elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then
+			[ $(type -p git) ] || return 0
 			msg "$(gettext "Determining latest git revision...")"
 			newpkgver=$(date +%Y%m%d)
 		elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then
+			[ $(type -p svn) ] || return 0
 			msg "$(gettext "Determining latest svn revision...")"
-			newpkgver=$(svn log $_svntrunk --limit 1 | sed -n 's/^r\([^ ]*\) .*$/\1/p')
+			newpkgver=$(svn log $_svntrunk --limit 1 -q | sed -n 's/^r\([0-9]*\) .*$/\1/p')
 		elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then
+			[ $(type -p bzr) ] || return 0
 			msg "$(gettext "Determining latest bzr revision...")"
 			newpkgver=$(bzr revno ${_bzrtrunk})
 		elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then
+			[ $(type -p hg) ] || return 0
 			msg "$(gettext "Determining latest hg revision...")"
 			if [ -d ./src/$_hgrepo ] ; then
 				cd ./src/$_hgrepo
@@ -1094,6 +1107,15 @@ This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
 
+# PROGRAM START
+
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 ARGLIST=$@
 
 #preserve environment variables
@@ -1181,7 +1203,7 @@ done
 if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then
 	# The extra '--' is here to prevent gettext from thinking --holdver is
 	# an option
-	error "$(gettext -- "--holdver and --forcever cannot both be specified")"
+	error "$(gettext "\\0--holdver and --forcever cannot both be specified" )"
 	exit 1
 fi
 
@@ -1262,7 +1284,7 @@ if [ "$ASROOT" = "0" -a \( "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" \
 	fi
 fi
 
-unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force
+unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums
 unset replaces depends conflicts backup source install build makedepends
 unset optdepends options noextract
 
@@ -1401,6 +1423,9 @@ else
 	warning "$(gettext "pacman was not found in PATH; skipping dependency checks.")"
 fi
 
+# ensure we have a sane umask set
+umask 0022
+
 # get back to our src directory so we can begin with sources
 mkdir -p "$srcdir"
 cd "$srcdir"

scripts/pacman-optimize.sh.in

@@ -70,6 +70,15 @@ die_r() {
 	die "$@"
 }
 
+# PROGRAM START
+
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
 	exit 0

scripts/repo-add.sh.in

@@ -136,7 +136,7 @@ db_write_entry()
 	# blank out all variables and set pkgfile
 	local pkgfile=$(readlink -f "$1")
 	local pkgname pkgver pkgdesc url builddate packager csize size \
-		group depend backup license replaces provides conflict \
+		group depend backup license replaces provides conflict force \
 		_groups _depends _backups _licenses _replaces _provides _conflicts \
 		startdir
 
@@ -209,7 +209,7 @@ db_write_entry()
 	[ -n "$builddate" ] && echo -e "%BUILDDATE%\n$builddate\n" >>desc
 	[ -n "$packager" ] && echo -e "%PACKAGER%\n$packager\n" >>desc
 	write_list_entry "REPLACES" "$_replaces" "desc"
-	[ $FORCE -eq 1 ] && echo -e "%FORCE%\n" >>desc
+	[ $FORCE -eq 1 -o -n "$force" ] && echo -e "%FORCE%\n" >>desc
 
 	# create depends entry
 	msg2 "$(gettext "Creating 'depends' db entry...")"
@@ -252,6 +252,13 @@ db_write_entry()
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 # check for help flags
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage

scripts/repo-remove.sh.in

@@ -25,7 +25,6 @@ export TEXTDOMAINDIR='@localedir@'
 myver='@PACKAGE_VERSION@'
 confdir='@sysconfdir@'
 
-FORCE=0
 REPO_DB_FILE=""
 
 msg() {
@@ -96,6 +95,13 @@ db_remove_entry() {
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 # check for help flags
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
@@ -169,6 +175,9 @@ if [ $success -eq 1 ]; then
 		esac
 
 		bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" *
+	else
+		error "$(gettext "All packages have been removed from the database. Deleting '%s'.")" "$REPO_DB_FILE"
+		rm "$REPO_DB_FILE"
 	fi
 
 	popd 2>&1 >/dev/null

scripts/updatesync.sh.in

@@ -32,6 +32,9 @@ usage() {
 	printf "updatesync (pacman) %s\n\n" "$myver"
 	printf "$(gettext "Usage: %s <action> <destfile> <option> [package_directory]")\n\n" "$0"
 	printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
+	printf "$(gettext "\
 updatesync will update a sync database by reading a PKGBUILD and\n\
 modifying the destfile. updatesync updates the database in a temporary\n\
 directory and then compresses it to <destfile>.\n\n")"
@@ -76,6 +79,13 @@ check_force () {
 
 # PROGRAM START
 
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
 	usage
 	exit 0
@@ -116,11 +126,15 @@ if [ "$4" != "" ]; then
 fi
 opt_force=""
 
-if [ ! -f "$option" ]; then
-	die "$(gettext "%s not found")" $option
-fi
+printf "$(gettext "\
+NOTE: this script is DEPRECATED. It will be removed in the next major\n\
+release of pacman, so please use repo-add and repo-remove instead.\n\n")"
 
 if [ "$action" = "upd" ]; then # INSERT / UPDATE
+	if [ ! -f "$option" ]; then
+		die "$(gettext "%s not found")" $option
+	fi
+
 	unset pkgname pkgver pkgrel options
 
 	source $option || die "$(gettext "failed to parse %s")" $option
@@ -141,10 +155,14 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
 else # DELETE
 	fname="$(basename $option)"
 	if [ "$fname" = "PKGBUILD" ]; then
+		if [ ! -f "$option" ]; then
+			die "$(gettext "%s not found")" $option
+		fi
+
 		unset pkgname pkgver pkgrel options
 		source $option
 	else
-		pkgname=$1
+		pkgname=$option
 	fi
 
 	repo-remove "$pkgdb" "$pkgname"

src/pacman/add.c

@@ -111,17 +111,16 @@ int pacman_add(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = targets; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			fprintf(stderr, _("error: failed to add target '%s' (%s)"), targ,
-			        alpm_strerrorlast());
+			fprintf(stderr, _("error: '%s': %s\n"),
+					targ, alpm_strerrorlast());
 			add_cleanup();
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: "compute" the transaction based on targets and flags */
 	/* TODO: No, compute nothing. This is stupid. */
@@ -146,7 +145,7 @@ int pacman_add(alpm_list_t *targets)
 			case PM_ERR_CONFLICTING_DEPS:
 				for(i = data; i; i = alpm_list_next(i)) {
 					pmconflict_t *conflict = alpm_list_getdata(i);
-					printf(_(":: %s: conflicts with %s"),
+					printf(_(":: %s: conflicts with %s\n"),
 						alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict));
 				}
 				break;

src/pacman/callback.c

@@ -36,7 +36,6 @@
 
 /* TODO this should not have to be defined twice- trans.c & log.c */
 #define LOG_STR_LEN 256
-#define FILENAME_TRIM_LEN 23
 
 /* download progress bar */
 static float rate_last;
@@ -285,7 +284,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
 						alpm_pkg_get_name(data2));
 				*response = yesno(str);
 			} else {
-				printf(_("Replacing %s with %s/%s\n."),
+				printf(_("Replacing %s with %s/%s\n"),
 						alpm_pkg_get_name(data1),
 						(char *)data3,
 						alpm_pkg_get_name(data2));
@@ -329,9 +328,11 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 
 	/* size of line to allocate for text printing (e.g. not progressbar) */
 	const int infolen = 50;
-	int tmp, digits, oprlen, textlen, pkglen;
+	int tmp, digits, textlen;
 	char *opr = NULL;
-	wchar_t *wcopr = NULL;
+	/* used for wide character width determination and printing */
+	int len, wclen, wcwid, padwid;
+	wchar_t *wcstr;
 
 	if(config->noprogressbar) {
 		return;
@@ -373,15 +374,6 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 			opr = _("checking for file conflicts");
 			break;
 	}
-	/* convert above strings to wide chars */
-	oprlen = strlen(opr);
-	wcopr = calloc(oprlen, sizeof(wchar_t));
-	if(!wcopr) {
-		fprintf(stderr, "malloc failure: could not allocate %zd bytes\n",
-		        strlen(opr) * sizeof(wchar_t));
-		return;
-	}
-	oprlen = mbstowcs(wcopr, opr, oprlen);
 
 	/* find # of digits in package counts to scale output */
 	digits = 1;
@@ -389,32 +381,40 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 	while((tmp /= 10)) {
 		++digits;
 	}
-
 	/* determine room left for non-digits text [not ( 1/12) part] */
 	textlen = infolen - 3 - (2 * digits);
-	/* room left for package name */
-	pkglen = textlen - oprlen - 1;
 
-	switch (event) {
-		case PM_TRANS_PROGRESS_ADD_START:
-		case PM_TRANS_PROGRESS_UPGRADE_START:
-		case PM_TRANS_PROGRESS_REMOVE_START:
-			/* old way of doing it, but ISO C does not recognize it
-			printf("(%2$*1$d/%3$*1$d) %4$s %6$-*5$.*5$s", digits, remain, howmany,
-			       opr, pkglen, pkgname);*/
-			printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany,
-			       opr, pkglen, pkglen, pkgname);
-			break;
-		case PM_TRANS_PROGRESS_CONFLICTS_START:
-			/* old way of doing it, but ISO C does not recognize it
-			printf("(%2$*1$d/%3$*1$d) %5$-*4$s", digits, remain, howmany,
-			       textlen, opr);*/
-			printf("(%*d/%*d) %-*s", digits, remain, digits, howmany,
-			       textlen, opr);
-			break;
+	/* In order to deal with characters from all locales, we have to worry
+	 * about wide characters and their column widths. A lot of stuff is
+	 * done here to figure out the actual number of screen columns used
+	 * by the output, and then pad it accordingly so we fill the terminal.
+	 */
+	/* len = opr len + pkgname len (if available) + space  + null */
+	len = strlen(opr) + ((pkgname) ? strlen(pkgname) : 0) + 2;
+	wcstr = calloc(len, sizeof(wchar_t));
+	/* print our strings to the alloc'ed memory */
+	wclen = swprintf(wcstr, len, L"%s %s", opr, pkgname);
+	wcwid = wcswidth(wcstr, wclen);
+	padwid = textlen - wcwid;
+	/* if padwid is < 0, we need to trim the string so padwid = 0 */
+	if(padwid < 0) {
+		int i = textlen - 3;
+		wchar_t *p = wcstr;
+		/* grab the max number of char columns we can fill */
+		while(i > 0 && wcwidth(*p) < i) {
+			i -= wcwidth(*p);
+			p++;
+		}
+		/* then add the ellipsis and fill out any extra padding */
+		wcscpy(p, L"...");
+		padwid = i;
+
 	}
 
-	free(wcopr);
+	printf("(%*d/%*d) %ls%-*s", digits, remain, digits, howmany,
+			wcstr, padwid, "");
+
+	free(wcstr);
 
 	/* call refactored fill progress function */
 	fill_progress(percent, percent, getcols() - infolen);
@@ -437,7 +437,11 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 		int list_xfered, int list_total)
 {
 	const int infolen = 50;
+	const int filenamelen = infolen - 27;
 	char *fname, *p;
+	/* used for wide character width determination and printing */
+	int len, wclen, wcwid, padwid;
+	wchar_t *wcfname;
 
 	float rate = 0.0, timediff = 0.0, f_xfered = 0.0;
 	unsigned int eta_h = 0, eta_m = 0, eta_s = 0;
@@ -517,8 +521,30 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 	if((p = strstr(fname, PKGEXT)) || (p = strstr(fname, DBEXT))) {
 			*p = '\0';
 	}
-	if(strlen(fname) > FILENAME_TRIM_LEN) {
-		strcpy(fname + FILENAME_TRIM_LEN -3,"...");
+	/* In order to deal with characters from all locales, we have to worry
+	 * about wide characters and their column widths. A lot of stuff is
+	 * done here to figure out the actual number of screen columns used
+	 * by the output, and then pad it accordingly so we fill the terminal.
+	 */
+	/* len = filename len + null */
+	len = strlen(filename) + 1;
+	wcfname = calloc(len, sizeof(wchar_t));
+	wclen = mbstowcs(wcfname, fname, len);
+	wcwid = wcswidth(wcfname, wclen);
+	padwid = filenamelen - wcwid;
+	/* if padwid is < 0, we need to trim the string so padwid = 0 */
+	if(padwid < 0) {
+		int i = filenamelen - 3;
+		wchar_t *p = wcfname;
+		/* grab the max number of char columns we can fill */
+		while(i > 0 && wcwidth(*p) < i) {
+			i -= wcwidth(*p);
+			p++;
+		}
+		/* then add the ellipsis and fill out any extra padding */
+		wcscpy(p, L"...");
+		padwid = i;
+
 	}
 
 	/* Awesome formatting for progress bar.  We need a mess of Kb->Mb->Gb stuff
@@ -548,10 +574,12 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 		}
 	}
 
-	printf(" %-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname,
-				 f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s);
+	printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname,
+			padwid, "", f_xfered, xfered_size,
+			rate, rate_size, eta_h, eta_m, eta_s);
 
 	free(fname);
+	free(wcfname);
 
 	/* The progress bar is based on the file percent regardless of the
 	 * TotalDownload option. */
@@ -564,7 +592,7 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 /* Callback to handle notifications from the library */
 void cb_log(pmloglevel_t level, char *fmt, va_list args)
 {
-	if(!strlen(fmt)) {
+	if(!fmt || strlen(fmt) == 0) {
 		return;
 	}
 

src/pacman/package.c

@@ -24,6 +24,7 @@
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>
+#include <wchar.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -48,6 +49,8 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	char bdatestr[50] = "", idatestr[50] = "";
 	const alpm_list_t *i;
 	alpm_list_t *requiredby = NULL, *depstrings = NULL;
+	wchar_t *wcstr;
+	int len;
 
 	if(pkg == NULL) {
 		return;
@@ -86,8 +89,6 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 		requiredby = alpm_pkg_compute_requiredby(pkg);
 	}
 
-	descheader = _("Description    : ");
-
 	/* actual output */
 	if(level == 0) {
 		string_display(_("Filename       :"), alpm_pkg_get_filename(pkg));
@@ -136,8 +137,16 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	}
 
 	/* printed using a variable to make i18n safe */
+	descheader = _("Description    : ");
+	/* len goes from # bytes -> # chars -> # cols */
+	len = strlen(descheader) + 1;
+	wcstr = calloc(len, sizeof(wchar_t));
+	len = mbstowcs(wcstr, descheader, len);
+	len = wcswidth(wcstr, len);
+	free(wcstr);
+	/* we can finally print the darn thing */
 	printf("%s", descheader);
-	indentprint(alpm_pkg_get_desc(pkg), mbstowcs(NULL, descheader, 0));
+	indentprint(alpm_pkg_get_desc(pkg), len);
 	printf("\n\n");
 
 	/* Print additional package info if info flag passed more than once */

src/pacman/pacman.c

@@ -150,7 +150,7 @@ static void usage(int op, const char * const myname)
 static void version(void)
 {
 	printf("\n");
-	printf(" .--.                  Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, LIB_VERSION);
+	printf(" .--.                  Pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version());
 	printf("/ _.-' .-.  .-.  .-.   Copyright (C) 2002-2008 Judd Vinet <jvinet@zeroflux.org>\n");
 	printf("\\  '-. '-'  '-'  '-'\n");
 	printf(" '--'\n");
@@ -183,16 +183,36 @@ static void setuseragent(void)
 	struct utsname un;
 
 	uname(&un);
-	snprintf(agent, 100, "pacman/" PACKAGE_VERSION " (%s %s) libalpm/" LIB_VERSION,
-			un.sysname, un.machine);
+	snprintf(agent, 100, "pacman/%s (%s %s) libalpm/%s",
+			PACKAGE_VERSION, un.sysname, un.machine, alpm_version());
 	setenv("HTTP_USER_AGENT", agent, 0);
 }
 
+/** Free the resources.
+ *
+ * @param ret the return value
+ */
+static void cleanup(int ret) {
+	/* free alpm library resources */
+	if(alpm_release() == -1) {
+		pm_printf(PM_LOG_ERROR, alpm_strerrorlast());
+	}
+
+	/* free memory */
+	FREELIST(pm_targets);
+	if(config) {
+		config_free(config);
+		config = NULL;
+	}
+
+	exit(ret);
+}
+
 /** Catches thrown signals. Performs necessary cleanup to ensure database is
  * in a consistant state.
  * @param signum the thrown signal
  */
-static void cleanup(int signum)
+static void handler(int signum)
 {
 	if(signum==SIGSEGV)
 	{
@@ -211,27 +231,14 @@ static void cleanup(int signum)
 		/* output a newline to be sure we clear any line we may be on */
 		printf("\n");
 	}
-
-	/* free alpm library resources */
-	if(alpm_release() == -1) {
-		pm_printf(PM_LOG_ERROR, alpm_strerrorlast());
-	}
-
-	/* free memory */
-	FREELIST(pm_targets);
-	if(config) {
-		config_free(config);
-		config = NULL;
-	}
-
-	exit(signum);
+	cleanup(signum);
 }
 
-/** Sets all libalpm required paths in one go. Called after the command line and
- * inital config file parsing. Once this is complete, we can see if any paths were
- * defined. If a rootdir was defined and nothing else, we want all of our paths to
- * live under the rootdir that was specified. Safe to call multiple times (will only
- * do anything the first time).
+/** Sets all libalpm required paths in one go. Called after the command line
+ * and inital config file parsing. Once this is complete, we can see if any
+ * paths were defined. If a rootdir was defined and nothing else, we want all
+ * of our paths to live under the rootdir that was specified. Safe to call
+ * multiple times (will only do anything the first time).
  */
 static void setlibpaths(void)
 {
@@ -240,6 +247,8 @@ static void setlibpaths(void)
 		int ret = 0;
 
 		pm_printf(PM_LOG_DEBUG, "setlibpaths() called\n");
+		/* Configure root path first. If it is set and dbpath/logfile were not
+		 * set, then set those as well to reside under the root. */
 		if(config->rootdir) {
 			char path[PATH_MAX];
 			ret = alpm_option_set_root(config->rootdir);
@@ -254,10 +263,12 @@ static void setlibpaths(void)
 			}
 			if(!config->logfile) {
 				snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), LOGFILE);
-				ret = alpm_option_set_dbpath(path);
 				config->logfile = strdup(path);
 			}
 		}
+		/* Set other paths if they were configured. Note that unless rootdir
+		 * was left undefined, these two paths (dbpath and logfile) will have
+		 * been set locally above, so the if cases below will now trigger. */
 		if(config->dbpath) {
 			ret = alpm_option_set_dbpath(config->dbpath);
 			if(ret != 0) {
@@ -741,6 +752,7 @@ static int parseconfig(const char *file)
 int main(int argc, char *argv[])
 {
 	int ret = 0;
+	struct sigaction new_action, old_action;
 #if defined(HAVE_GETEUID)
 	/* geteuid undefined in CYGWIN */
 	uid_t myuid = geteuid();
@@ -751,10 +763,24 @@ int main(int argc, char *argv[])
 	mtrace();
 #endif
 
-	/* set signal handlers */
-	signal(SIGINT, cleanup);
-	signal(SIGTERM, cleanup);
-	signal(SIGSEGV, cleanup);
+	/* Set signal handlers */
+	/* Set up the structure to specify the new action. */
+	new_action.sa_handler = handler;
+	sigemptyset(&new_action.sa_mask);
+	new_action.sa_flags = 0;
+
+	sigaction(SIGINT, NULL, &old_action);
+	if(old_action.sa_handler != SIG_IGN) {
+		sigaction(SIGINT, &new_action, NULL);
+	}
+	sigaction(SIGTERM, NULL, &old_action);
+	if(old_action.sa_handler != SIG_IGN) {
+		sigaction(SIGTERM, &new_action, NULL);
+	}
+	sigaction(SIGSEGV, NULL, &old_action);
+	if(old_action.sa_handler != SIG_IGN) {
+		sigaction(SIGSEGV, &new_action, NULL);
+	}
 
 	/* i18n init */
 #if defined(ENABLE_NLS)

src/pacman/query.c

@@ -70,6 +70,7 @@ static int query_fileowner(alpm_list_t *targets)
 		int found = 0;
 		char *filename = alpm_list_getdata(t);
 		char *bname;
+		char *dname;
 		char *rpath;
 		struct stat buf;
 		alpm_list_t *i, *j;
@@ -88,10 +89,14 @@ static int query_fileowner(alpm_list_t *targets)
 		}
 
 		bname = mbasename(filename);
+		dname = mdirname(filename);
+		rpath = resolve_path(dname);
+		free(dname);
 
-		if(!(rpath = resolve_path(filename))) {
+		if(!rpath) {
 			fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"),
 					filename, strerror(errno));
+			free(rpath);
 			ret++;
 			continue;
 		}
@@ -100,7 +105,7 @@ static int query_fileowner(alpm_list_t *targets)
 			pmpkg_t *info = alpm_list_getdata(i);
 
 			for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) {
-				char path[PATH_MAX], *ppath;
+				char path[PATH_MAX], *ppath, *pdname;
 				snprintf(path, PATH_MAX, "%s%s",
 				         alpm_option_get_root(), (const char *)alpm_list_getdata(j));
 
@@ -109,10 +114,12 @@ static int query_fileowner(alpm_list_t *targets)
 					continue;
 				}
 
-				ppath = resolve_path(path);
+				pdname = mdirname(path);
+				ppath = resolve_path(pdname);
+				free(pdname);
 
 				if(ppath && strcmp(ppath, rpath) == 0) {
-					printf(_("%s is owned by %s %s\n"), rpath,
+					printf(_("%s is owned by %s %s\n"), filename,
 					       alpm_pkg_get_name(info), alpm_pkg_get_version(info));
 					found = 1;
 				}

src/pacman/remove.c

@@ -103,19 +103,17 @@ int pacman_remove(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = finaltargs; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			printf("failed.\n");
-			fprintf(stderr, _("error: failed to add target '%s' (%s)\n"), targ,
-			        alpm_strerrorlast());
+			fprintf(stderr, _("error: '%s': %s\n"),
+					targ, alpm_strerrorlast());
 			remove_cleanup();
 			FREELIST(finaltargs);
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: prepare the transaction based on its type, targets and flags */
 	if(alpm_trans_prepare(&data) == -1) {

src/pacman/sync.c

@@ -25,6 +25,7 @@
 #include <limits.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <sys/stat.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -57,6 +58,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) {
 	/* step through the directory one file at a time */
 	while((ent = readdir(dir)) != NULL) {
 		char path[PATH_MAX];
+		struct stat buf;
 		alpm_list_t *syncdbs = NULL, *i;
 		int found = 0;
 		char *dname = ent->d_name;
@@ -68,6 +70,15 @@ static int sync_cleandb(const char *dbpath, int keep_used) {
 		if(!strcmp(dname, "sync") || !strcmp(dname, "local")) {
 			continue;
 		}
+
+		/* build the full path */
+		snprintf(path, PATH_MAX, "%s%s", dbpath, ent->d_name);
+		/* skip entries that are not dirs (lock file, etc.) */
+		stat(path, &buf);
+		if(!S_ISDIR(buf.st_mode)) {
+			continue;
+		}
+
 		if(keep_used) {
 			syncdbs = alpm_option_get_syncdbs();
 			for(i = syncdbs; i && !found; i = alpm_list_next(i)) {
@@ -78,9 +89,6 @@ static int sync_cleandb(const char *dbpath, int keep_used) {
 		/* We have a directory that doesn't match any syncdb.
 		 * Ask the user if he wants to remove it. */
 		if(!found) {
-			/* build the full path */
-			snprintf(path, PATH_MAX, "%s%s", dbpath, ent->d_name);
-
 			if(!yesno(_("Do you want to remove %s? [Y/n] "), path)) {
 				continue;
 			}
@@ -197,6 +205,28 @@ static int sync_cleancache(int level)
 	return(0);
 }
 
+static int sync_trans_init(pmtransflag_t flags) {
+	if(alpm_trans_init(PM_TRANS_TYPE_SYNC, flags, cb_trans_evt,
+				cb_trans_conv, cb_trans_progress) == -1) {
+		fprintf(stderr, _("error: failed to init transaction (%s)\n"),
+				alpm_strerrorlast());
+		if(pm_errno == PM_ERR_HANDLE_LOCK) {
+			printf(_("  if you're sure a package manager is not already\n"
+						"  running, you can remove %s.\n"), alpm_option_get_lockfile());
+		}
+		return(-1);
+	}
+	return(0);
+}
+
+static int sync_trans_release() {
+	if(alpm_trans_release() == -1) {
+		fprintf(stderr, _("error: failed to release transaction (%s)\n"),
+				alpm_strerrorlast());
+		return(-1);
+	}
+	return(0);
+}
 static int sync_synctree(int level, alpm_list_t *syncs)
 {
 	alpm_list_t *i;
@@ -476,14 +506,7 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
 	alpm_list_t *sync_dbs = alpm_option_get_syncdbs();
 
 	/* Step 1: create a new transaction... */
-	if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, cb_trans_evt,
-		 cb_trans_conv, cb_trans_progress) == -1) {
-		fprintf(stderr, _("error: failed to init transaction (%s)\n"),
-		        alpm_strerrorlast());
-		if(pm_errno == PM_ERR_HANDLE_LOCK) {
-			printf(_("  if you're sure a package manager is not already\n"
-			         "  running, you can remove %s.\n"), alpm_option_get_lockfile());
-		}
+	if(sync_trans_init(config->flags) == -1) {
 		return(1);
 	}
 
@@ -526,28 +549,18 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
 				 * an '-S pacman' operation */
 				if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) {
 					printf("\n");
-					printf(_(":: pacman has detected a newer version of itself.\n"
-					         ":: It is recommended that you upgrade pacman by itself\n"
-					         ":: using 'pacman -S pacman', and then rerun the current\n"
-					         ":: operation. If you wish to continue the operation and\n"
-					         ":: not upgrade pacman separately, answer no.\n"));
-					if(yesno(_(":: Cancel current operation? [Y/n] "))) {
-						if(alpm_trans_release() == -1) {
-							fprintf(stderr, _("error: failed to release transaction (%s)\n"),
-							    alpm_strerrorlast());
-							retval = 1;
-							goto cleanup;
+					printf(_(":: pacman has detected a newer version of itself.\n"));
+					if(yesno(_(":: Do you want to cancel the current operation\n"
+					           ":: and install the new pacman version now? [Y/n] "))) {
+						if(sync_trans_release() == -1) {
+							return(1);
 						}
-						if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags,
-						   cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) {
-							fprintf(stderr, _("error: failed to init transaction (%s)\n"),
-							    alpm_strerrorlast());
+						if(sync_trans_init(0) == -1) {
 							return(1);
 						}
 						if(alpm_trans_addtarget("pacman") == -1) {
 							fprintf(stderr, _("error: pacman: %s\n"), alpm_strerrorlast());
-							retval = 1;
-							goto cleanup;
+							return(1);
 						}
 						break;
 					}
@@ -571,7 +584,7 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
 				}
 				if(pm_errno != PM_ERR_PKG_NOT_FOUND) {
 					fprintf(stderr, _("error: '%s': %s\n"),
-					        (char *)i->data, alpm_strerrorlast());
+							targ, alpm_strerrorlast());
 					retval = 1;
 					goto cleanup;
 				}
@@ -747,9 +760,7 @@ cleanup:
 	if(data) {
 		FREELIST(data);
 	}
-	if(alpm_trans_release() == -1) {
-		fprintf(stderr, _("error: failed to release transaction (%s)\n"),
-		        alpm_strerrorlast());
+	if(sync_trans_release() == -1) {
 		retval = 1;
 	}
 
@@ -763,8 +774,19 @@ int pacman_sync(alpm_list_t *targets)
 
 	/* clean the cache */
 	if(config->op_s_clean) {
-		int ret = sync_cleancache(config->op_s_clean);
+		int ret = 0;
+
+		if(sync_trans_init(0) == -1) {
+			return(1);
+		}
+
+		ret += sync_cleancache(config->op_s_clean);
 		ret += sync_cleandb_all();
+
+		if(sync_trans_release() == -1) {
+			ret++;
+		}
+
 		return(ret);
 	}
 

src/pacman/util.c

@@ -34,6 +34,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <limits.h>
+#include <wchar.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -187,41 +188,82 @@ char *mbasename(const char *path)
 	return (char *)p;
 }
 
+/** Parse the dirname of a program from a path.
+* The path returned should be freed.
+* @param path path to parse dirname from
+*
+* @return everything preceding the final '/'
+*/
+char *mdirname(const char *path)
+{
+	char *ret, *last;
+
+	/* null or empty path */
+	if(path == NULL || path == '\0') {
+		return(strdup("."));
+	}
+
+	ret = strdup(path);
+	last = strrchr(ret, '/');
+
+	if(last != NULL) {
+		/* we found a '/', so terminate our string */
+		*last = '\0';
+		return(ret);
+	}
+	/* no slash found */
+	free(ret);
+	return(strdup("."));
+}
+
 /* output a string, but wrap words properly with a specified indentation
  */
 void indentprint(const char *str, int indent)
 {
-	const char *p = str;
-	int cidx = indent;
+	wchar_t *wcstr;
+	const wchar_t *p;
+	int len, cidx;
+
+	if(!str) {
+		return;
+	}
+
+	len = strlen(str) + 1;
+	wcstr = calloc(len, sizeof(wchar_t));
+	len = mbstowcs(wcstr, str, len);
+	p = wcstr;
+	cidx = indent;
 
 	while(*p) {
-		if(*p == ' ') {
-			const char *next = NULL;
-			int len;
+		if(*p == L' ') {
+			const wchar_t *q, *next;
 			p++;
-			if(p == NULL || *p == ' ') continue;
-			next = strchr(p, ' ');
+			if(p == NULL || *p == L' ') continue;
+			next = wcschr(p, L' ');
 			if(next == NULL) {
-				next = p + mbstowcs(NULL, p, 0);
+				next = p + wcslen(p);
+			}
+			/* len captures # cols */
+			len = 0;
+			q = p;
+			while(q < next) {
+				len += wcwidth(*q++);
 			}
-			len = next - p;
 			if(len > (getcols() - cidx - 1)) {
-				/* newline */
-				int i;
-				fprintf(stdout, "\n");
-				for(i = 0; i < indent; i++) {
-					fprintf(stdout, " ");
-				}
+				/* wrap to a newline and reindent */
+				fprintf(stdout, "\n%-*s", indent, "");
 				cidx = indent;
 			} else {
 				printf(" ");
 				cidx++;
 			}
+			continue;
 		}
-		fprintf(stdout, "%c", *p);
+		fprintf(stdout, "%lc", (wint_t)*p);
+		cidx += wcwidth(*p);
 		p++;
-		cidx++;
 	}
+	free(wcstr);
 }
 
 /* Convert a string to uppercase
@@ -342,7 +384,7 @@ alpm_list_t *strsplit(const char *str, const char splitchar)
 	if(dup == NULL) {
 		return(NULL);
 	}
-	list = alpm_list_add(list, strdup(prev));
+	list = alpm_list_add(list, dup);
 
 	return(list);
 }
@@ -361,14 +403,31 @@ void list_display(const char *title, const alpm_list_t *list)
 {
 	const alpm_list_t *i;
 	int cols, len;
+	wchar_t *wcstr;
 
-	len = mbstowcs(NULL, title, 0);
-	printf("%s ", title);
+	if(title) {
+		/* len goes from # bytes -> # chars -> # cols */
+		len = strlen(title) + 1;
+		wcstr = calloc(len, sizeof(wchar_t));
+		len = mbstowcs(wcstr, title, len);
+		len = wcswidth(wcstr, len);
+		free(wcstr);
+		printf("%s ", title);
+	} else {
+		len = 0;
+	}
 
 	if(list) {
 		for(i = list, cols = len; i; i = alpm_list_next(i)) {
 			char *str = alpm_list_getdata(i);
-			int s = mbstowcs(NULL, str, 0) + 2;
+			/* s goes from # bytes -> # chars -> # cols */
+			int s = strlen(str) + 1;
+			wcstr = calloc(s, sizeof(wchar_t));
+			s = mbstowcs(wcstr, str, s);
+			s = wcswidth(wcstr, s);
+			free(wcstr);
+			/* two additional spaces are added to the length */
+			s += 2;
 			int maxcols = getcols();
 			if(s + cols >= maxcols) {
 				int i;
@@ -540,7 +599,7 @@ int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list
 	/* print a prefix to the message */
 	switch(level) {
 		case PM_LOG_DEBUG:
-			asprintf(string, _("debug: %s"), msg);
+			asprintf(string, "debug: %s", msg);
 			break;
 		case PM_LOG_ERROR:
 			asprintf(string, _("error: %s"), msg);
@@ -587,7 +646,7 @@ int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list ar
 	/* print a prefix to the message */
 	switch(level) {
 		case PM_LOG_DEBUG:
-			fprintf(stream, _("debug: "));
+			fprintf(stream, "debug: ");
 			break;
 		case PM_LOG_ERROR:
 			fprintf(stream, _("error: "));

src/pacman/util.h

@@ -41,6 +41,7 @@ int getcols();
 int makepath(const char *path);
 int rmrf(const char *path);
 char *mbasename(const char *path);
+char *mdirname(const char *path);
 void indentprint(const char *str, int indent);
 char *strtoupper(char *str);
 char *strtrim(char *str);

src/util/testpkg.c

@@ -29,44 +29,58 @@
 
 static void output_cb(pmloglevel_t level, char *fmt, va_list args)
 {
-	if(strlen(fmt)) {
-        switch(level) {
-        case PM_LOG_ERROR: printf("error: "); break;
-        case PM_LOG_WARNING: printf("warning: "); break;
-		default: break;
-        }
-		vprintf(fmt, args);
-    }
+	if(fmt[0] == '\0') {
+		return;
+	}
+	switch(level) {
+		case PM_LOG_ERROR: printf("error: "); break;
+		case PM_LOG_WARNING: printf("warning: "); break;
+		default: return; /* skip other messages */
+	}
+	vprintf(fmt, args);
 }
 
 int main(int argc, char **argv)
 {
-    int retval = 1; /* default = false */
-    pmpkg_t *pkg = NULL;
+	int retval = 1; /* default = false */
+	pmpkg_t *pkg = NULL;
 
-    if(argc != 2) {
+	if(argc != 2) {
 		fprintf(stderr, "usage: %s <package file>\n", BASENAME);
 		return(1);
 	}
 
 	if(alpm_initialize() == -1) {
-		fprintf(stderr, "cannot initilize alpm: %s\n", alpm_strerrorlast());
-        return(1);
+		fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast());
+		return(1);
 	}
 
-    /* let us get log messages from libalpm */
+	/* let us get log messages from libalpm */
 	alpm_option_set_logcb(output_cb);
 
 	if(alpm_pkg_load(argv[1], 1, &pkg) == -1 || pkg == NULL) {
-        retval = 1;
+		switch(pm_errno) {
+			case PM_ERR_PKG_OPEN:
+				printf("Cannot open the given file.\n");
+				break;
+			case PM_ERR_LIBARCHIVE_ERROR:
+			case PM_ERR_PKG_INVALID:
+				printf("Package is invalid.\n");
+				break;
+			default:
+				printf("libalpm error: %s\n", alpm_strerrorlast());
+				break;
+		}
+		retval = 1;
 	} else {
 		alpm_pkg_free(pkg);
-        retval = 0;
+		printf("Package is valid.\n");
+		retval = 0;
 	}
 
 	if(alpm_release() == -1) {
 		fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast());
 	}
 
-    return(retval);
+	return(retval);
 }