Bumps for pacman 3.0.3

Fixes bug #7005 as reported and patched by
Marcus Habernehl <bmh1980de@yahoo.de>

NEWS

@@ -1,5 +1,17 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.0.3         - Updated translations
+              - repo-add: fixed a desc file clobbering issue
+3.0.2         - fix a bug where pre/post_remove scriptlets were not ran
+              - ensure ldconfig is ran in all operations
+              - added a few new translations, updated existing ones
+              - updated mirror lists
+              - makepkg: ensure CFLAGS are exported to build function
+3.0.1         - fix a locale issue with tr_TR upper/lower-case conversion
+              - allow removal when listing the same package multiple times
+              - fix a repo-add bug that left a .PKGINFO file in the current
+                directory
+              - proper error messages when we cannot read mtab for freespace
 3.0.0         - first release based on libalpm backend
               - added internationalization (gettext) support:
                 - de, fr, hu, it, pt_BR, en_GB, ru_RU translations
@@ -47,7 +59,7 @@ VERSION         DESCRIPTION
                 - repo-add - adds a package to a repo database file
                 - repo-remove - removes a package from a repo database file
               - added pactest testing suite
-              - MANY fixes and small inprovements everywhere
+              - MANY fixes and small improvements everywhere
 2.9.8         - Changed behaviour with original=X,current=Y,new=Z scenario
                 - keep old in place, install new as .pacnew
               - Search package provides when finding matching targets with -S

configure.ac

@@ -3,7 +3,7 @@ CFLAGS=""
 
 AC_PREREQ(2.59)
 dnl Update it right before the release since $pkgver_foo are all _post_ release snapshots
-AC_INIT([Pacman package manager], 3.0.0, [pacman-dev@archlinux.org], [pacman])
+AC_INIT([Pacman package manager], 3.0.3, [pacman-dev@archlinux.org], [pacman])
 AC_LANG([C])
 AC_CONFIG_HEADERS(config.h)
 AC_CANONICAL_HOST

doc/pacman.conf.5

@@ -54,9 +54,6 @@ Instructs \fBpacman\fP to ignore any upgrades for this package when performing a
 Include another config file. This file can include repositories or general
 configuration options.
 .TP
-.B ProxyServer = <\fIhost\fP|\fIip\fP>[:\fIport\fP]
-If set, \fBpacman\fP will use this proxy server for all ftp/http transfers.
-.TP
 .B XferCommand = \fI/path/to/command %u\fP
 If set, an external program will be used to download all remote files.  All
 instances of \fB%u\fP will be replaced with the download URL. If present,

etc/pacman.d/mirrorlist.in

@@ -5,8 +5,10 @@
 # United States
 Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@
+Server = ftp://locke.suu.edu/linux/dist/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@
+Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
 
 # Europe
@@ -28,6 +30,7 @@ Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@@REPO@@/os/@C
 # - Germany
 Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@@REPO@@/os/@CARCH@
+Server = ftp://ftp.archlinuxppc.org/i686/@@REPO@@/os/@CARCH@
 # - Great Britain
 Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@@REPO@@/os/@CARCH@
 # - Greece
@@ -52,6 +55,8 @@ Server = ftp://cesium.di.uminho.pt/pub/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@@REPO@@/os/@CARCH@
 # - Romania
 Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@@REPO@@/os/@CARCH@
+# - Russia
+Server = http://archlinux.freeside.ru/@@REPO@@/os/@CARCH@
 # - Sweden
 Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@@REPO@@/os/@CARCH@
 Server = ftp://ftp.gigabit.nu/@@REPO@@/os/@CARCH@

lib/libalpm/add.c

@@ -837,7 +837,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
 	}
 
 	/* run ldconfig if it exists */
-	if((trans->type != PM_TRANS_TYPE_UPGRADE) && (handle->trans->state != STATE_INTERRUPTED)) {
+	if(handle->trans->state != STATE_INTERRUPTED) {
 		_alpm_log(PM_LOG_DEBUG, _("running \"ldconfig -r %s\""), handle->root);
 		_alpm_ldconfig(handle->root);
 	}

lib/libalpm/alpm.c

@@ -884,6 +884,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 	char *ptr = NULL;
 	char *key = NULL;
 	int linenum = 0;
+	char origkey[256];
 	char section[256] = "";
 	pmdb_t *db = NULL;
 
@@ -938,21 +939,22 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 				RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1);
 			}
 			_alpm_strtrim(key);
+			strncpy(origkey, key, min(255, strlen(key)));
 			key = _alpm_strtoupper(key);
 			if(!strlen(section) && strcmp(key, "INCLUDE")) {
 				RET_ERR(PM_ERR_CONF_DIRECTIVE_OUTSIDE_SECTION, -1);
 			}
 			if(ptr == NULL) {
-				if(!strcmp(key, "NOPASSIVEFTP")) {
+				if(strcmp(origkey, "NoPassiveFTP") == 0 || strcmp(key, "NOPASSIVEFTP") == 0) {
 					alpm_option_set_nopassiveftp(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: nopassiveftp"));
-				} else if(!strcmp(key, "USESYSLOG")) {
+				} else if(strcmp(origkey, "UseSyslog") == 0 || strcmp(key, "USESYSLOG") == 0) {
 					alpm_option_set_usesyslog(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: usesyslog"));
-				} else if(!strcmp(key, "ILOVECANDY")) {
+				} else if(strcmp(origkey, "ILoveCandy") == 0 || strcmp(key, "ILOVECANDY") == 0) {
 					alpm_option_set_chomp(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: chomp"));
-				} else if(!strcmp(key, "USECOLOR")) {
+				} else if(strcmp(origkey, "UseColor") == 0 || strcmp(key, "USECOLOR") == 0) {
 					alpm_option_set_usecolor(1);
 					_alpm_log(PM_LOG_DEBUG, _("config: usecolor"));
 				} else {
@@ -960,13 +962,13 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 				}
 			} else {
 				_alpm_strtrim(ptr);
-				if(!strcmp(key, "INCLUDE")) {
+				if(strcmp(origkey, "Include") == 0 || strcmp(key, "INCLUDE") == 0) {
 					char conf[PATH_MAX];
 					strncpy(conf, ptr, PATH_MAX);
 					_alpm_log(PM_LOG_DEBUG, _("config: including %s"), conf);
 					alpm_parse_config(conf, callback, section);
-				} else if(!strcmp(section, "options")) {
-					if(!strcmp(key, "NOUPGRADE")) {
+				} else if(strcmp(section, "options") == 0) {
+					if(strcmp(origkey, "NoUpgrade") == 0 || strcmp(key, "NOUPGRADE") == 0) {
 						char *p = ptr;
 						char *q;
 
@@ -979,7 +981,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_noupgrade(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: noupgrade: %s"), p);
-					} else if(!strcmp(key, "NOEXTRACT")) {
+					} else if(strcmp(origkey, "NoExtract") == 0 || strcmp(key, "NOEXTRACT") == 0) {
 						char *p = ptr;
 						char *q;
 
@@ -992,7 +994,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_noextract(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: noextract: %s"), p);
-					} else if(!strcmp(key, "IGNOREPKG")) {
+					} else if(strcmp(origkey, "IgnorePkg") == 0 || strcmp(key, "IGNOREPKG") == 0) {
 						char *p = ptr;
 						char *q;
 
@@ -1005,7 +1007,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_ignorepkg(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: ignorepkg: %s"), p);
-					} else if(!strcmp(key, "HOLDPKG")) {
+					} else if(strcmp(origkey, "HoldPkg") == 0 || strcmp(key, "HOLDPKG") == 0) {
 						char *p = ptr;
 						char *q;
 
@@ -1018,27 +1020,34 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						}
 						alpm_option_add_holdpkg(p);
 						_alpm_log(PM_LOG_DEBUG, _("config: holdpkg: %s"), p);
-					} else if(!strcmp(key, "DBPATH")) {
+					} else if(strcmp(origkey, "DBPath") == 0 || strcmp(key, "DBPATH") == 0) {
 						/* shave off the leading slash, if there is one */
 						if(*ptr == '/') {
 							ptr++;
 						}
 						alpm_option_set_dbpath(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: dbpath: %s"), ptr);
-					} else if(!strcmp(key, "CACHEDIR")) {
+					} else if(strcmp(origkey, "CacheDir") == 0 || strcmp(key, "CACHEDIR") == 0) {
 						/* shave off the leading slash, if there is one */
 						if(*ptr == '/') {
 							ptr++;
 						}
 						alpm_option_set_cachedir(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: cachedir: %s"), ptr);
-					} else if (!strcmp(key, "LOGFILE")) {
+					} else if(strcmp(origkey, "RootDir") == 0 || strcmp(key, "ROOTDIR") == 0) {
+						/* shave off the leading slash, if there is one */
+						if(*ptr == '/') {
+							ptr++;
+						}
+						alpm_option_set_root(ptr);
+						_alpm_log(PM_LOG_DEBUG, _("config: rootdir: %s"), ptr);
+					} else if (strcmp(origkey, "LogFile") == 0 || strcmp(key, "LOGFILE") == 0) {
 						alpm_option_set_logfile(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: logfile: %s"), ptr);
-					} else if (!strcmp(key, "XFERCOMMAND")) {
+					} else if (strcmp(origkey, "XferCommand") == 0 || strcmp(key, "XFERCOMMAND") == 0) {
 						alpm_option_set_xfercommand(ptr);
 						_alpm_log(PM_LOG_DEBUG, _("config: xfercommand: %s"), ptr);
-					} else if (!strcmp(key, "UPGRADEDELAY")) {
+					} else if (strcmp(origkey, "UpgradeDelay") == 0 || strcmp(key, "UPGRADEDELAY") == 0) {
 						/* The config value is in days, we use seconds */
 						time_t ud = atol(ptr) * 60 * 60 *24;
 						alpm_option_set_upgradedelay(ud);
@@ -1047,7 +1056,7 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const
 						RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1);
 					}
 				} else {
-					if(!strcmp(key, "SERVER")) {
+					if(strcmp(origkey, "Server") == 0 || strcmp(key, "SERVER") == 0) {
 						/* add to the list */
 						if(alpm_db_setserver(db, ptr) != 0) {
 							/* pm_errno is set by alpm_db_setserver */

lib/libalpm/deps.c

@@ -163,7 +163,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
 					for(l = alpm_pkg_get_provides(q); l; l = l->next) {
 						const char *provname = l->data;
 						if(!strcmp(depend->name, provname)) {
-							if(!_alpm_pkg_find(provname, tmptargs)) {
+							if(!_alpm_pkg_find(qname, tmptargs)) {
 								change = 1;
 								tmptargs = alpm_list_add(tmptargs, q);
 							}

lib/libalpm/package.c

@@ -142,6 +142,14 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
 		_alpm_db_read(pkg->data, pkg, INFRQ_DESC);
 	}
 
+	if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) {
+		/* package should be ignored (IgnorePkg) */
+		_alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
+							alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
+							alpm_pkg_get_version(pkg));
+		return(0);
+	}
+
 	/* compare versions and see if we need to upgrade */
 	cmp = _alpm_versioncmp(alpm_pkg_get_version(pkg), alpm_pkg_get_version(local_pkg));
 
@@ -158,13 +166,7 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg)
 		cmp = 0;
 	} else if(cmp > 0) {
 		/* we have an upgrade, make sure we should actually do it */
-		if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(pkg))) {
-			/* package should be ignored (IgnorePkg) */
-			_alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"),
-								alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),
-								alpm_pkg_get_version(pkg));
-			cmp = 0;
-		} else if(_alpm_pkg_istoonew(pkg)) {
+		if(_alpm_pkg_istoonew(pkg)) {
 			/* package too new (UpgradeDelay) */
 			_alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)"),
 								alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg),

lib/libalpm/po/LINGUAS

@@ -1,8 +1,10 @@
 # Set of available languages.
 de
+en_GB
+es
 fr
 hu
 it
+pl_PL
 pt_BR
-en_GB
 ru_RU

lib/libalpm/po/it.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libalpm VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-23 20:46-0500\n"
-"PO-Revision-Date: 2007-03-22 12:30+0100\n"
+"POT-Creation-Date: 2007-04-17 21:34+0200\n"
+"PO-Revision-Date: 2007-04-17 22:00+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgstr "lettura dei metadata di '%s' in corso"
 msgid "looking for unsatisfied dependencies"
 msgstr "ricerca delle dipendenze non soddisfatte"
 
-#: lib/libalpm/add.c:203 lib/libalpm/sync.c:475
+#: lib/libalpm/add.c:203 lib/libalpm/sync.c:483
 msgid "looking for conflicts"
 msgstr "ricerca dei conflitti in corso"
 
@@ -276,7 +276,7 @@ msgstr "impossibile aggiornare la voce %s-%s nel database"
 msgid "could not add entry '%s' in cache"
 msgstr "impossible includere la voce '%s' nella cache"
 
-#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1047
+#: lib/libalpm/add.c:841 lib/libalpm/remove.c:363 lib/libalpm/sync.c:1055
 #, c-format
 msgid "running \"ldconfig -r %s\""
 msgstr "esecuzione in corso di \"ldconfig -r %s\""
@@ -376,109 +376,114 @@ msgstr "impossibile rimuovere il file di lock %s"
 msgid "warning: could not remove lock file %s"
 msgstr "attenzione: impossibile rimuovere il file di lock %s"
 
-#: lib/libalpm/alpm.c:919
+#: lib/libalpm/alpm.c:920
 #, c-format
 msgid "config: new section '%s'"
 msgstr "config: nuova sezione '%s'"
 
-#: lib/libalpm/alpm.c:948
+#: lib/libalpm/alpm.c:950
 msgid "config: nopassiveftp"
 msgstr "config: nopassiveftp"
 
-#: lib/libalpm/alpm.c:951
+#: lib/libalpm/alpm.c:953
 msgid "config: usesyslog"
 msgstr "config: usesyslog"
 
-#: lib/libalpm/alpm.c:954
+#: lib/libalpm/alpm.c:956
 msgid "config: chomp"
 msgstr "config: chomp"
 
-#: lib/libalpm/alpm.c:957
+#: lib/libalpm/alpm.c:959
 msgid "config: usecolor"
 msgstr "config: usecolor"
 
-#: lib/libalpm/alpm.c:966
+#: lib/libalpm/alpm.c:968
 #, c-format
 msgid "config: including %s"
 msgstr "config: including %s"
 
-#: lib/libalpm/alpm.c:976 lib/libalpm/alpm.c:981
+#: lib/libalpm/alpm.c:978 lib/libalpm/alpm.c:983
 #, c-format
 msgid "config: noupgrade: %s"
 msgstr "config: noupgrade: %s"
 
-#: lib/libalpm/alpm.c:989 lib/libalpm/alpm.c:994
+#: lib/libalpm/alpm.c:991 lib/libalpm/alpm.c:996
 #, c-format
 msgid "config: noextract: %s"
 msgstr "config: noextract:·%s"
 
-#: lib/libalpm/alpm.c:1002 lib/libalpm/alpm.c:1007
+#: lib/libalpm/alpm.c:1004 lib/libalpm/alpm.c:1009
 #, c-format
 msgid "config: ignorepkg: %s"
 msgstr "config: ignorepkg: %s"
 
-#: lib/libalpm/alpm.c:1015 lib/libalpm/alpm.c:1020
+#: lib/libalpm/alpm.c:1017 lib/libalpm/alpm.c:1022
 #, c-format
 msgid "config: holdpkg: %s"
 msgstr "config: holdpkg: %s"
 
-#: lib/libalpm/alpm.c:1027
+#: lib/libalpm/alpm.c:1029
 #, c-format
 msgid "config: dbpath: %s"
 msgstr "config: dbpath: %s"
 
-#: lib/libalpm/alpm.c:1034
+#: lib/libalpm/alpm.c:1036
 #, c-format
 msgid "config: cachedir: %s"
 msgstr "config: cachedir: %s"
 
-#: lib/libalpm/alpm.c:1037
+#: lib/libalpm/alpm.c:1043
+#, c-format
+msgid "config: rootdir: %s"
+msgstr "config: rootdir: %s"
+
+#: lib/libalpm/alpm.c:1046
 #, c-format
 msgid "config: logfile: %s"
 msgstr "config: logfile: %s"
 
-#: lib/libalpm/alpm.c:1040
+#: lib/libalpm/alpm.c:1049
 #, c-format
 msgid "config: xfercommand: %s"
 msgstr "config: xfercommand: %s"
 
-#: lib/libalpm/alpm.c:1045
+#: lib/libalpm/alpm.c:1054
 #, c-format
 msgid "config: upgradedelay: %d"
 msgstr "config: upgradedelay: %d"
 
-#: lib/libalpm/alpm.c:1083 lib/libalpm/sync.c:107
+#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:107
 msgid "checking for package replacements"
 msgstr "controllo della sostituzione dei pacchetti in corso"
 
-#: lib/libalpm/alpm.c:1094 lib/libalpm/sync.c:123
+#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:123
 #, c-format
 msgid "checking replacement '%s' for package '%s'"
 msgstr "controllo in corso della sostituzione di '%s' con il pacchetto '%s'"
 
-#: lib/libalpm/alpm.c:1097 lib/libalpm/sync.c:125
+#: lib/libalpm/alpm.c:1106 lib/libalpm/sync.c:125
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)"
 msgstr ""
 "%s-%s: aggiornamento del pacchetto ignorato (per essere sostituito con %s-%s)"
 
-#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:160
+#: lib/libalpm/alpm.c:1136 lib/libalpm/sync.c:160
 #, c-format
 msgid "%s-%s elected for upgrade (to be replaced by %s-%s)"
 msgstr ""
 "%s-%s selezionato per l'aggiornamento (per essere sostituito con %s-%s)"
 
-#: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194
+#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:194
 #, c-format
 msgid "'%s' not found in sync db -- skipping"
 msgstr "impossibile trovare '%s' nel database, sarà ignorato"
 
-#: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:501
+#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:208 lib/libalpm/sync.c:509
 #, c-format
 msgid "'%s' is already elected for removal -- skipping"
 msgstr "'%s' è già selezionato per la rimozione, sarà ignorato"
 
-#: lib/libalpm/alpm.c:1169
+#: lib/libalpm/alpm.c:1178
 #, c-format
 msgid "%s elected for upgrade (%s => %s)"
 msgstr "%s selezionato per l'aggiornamento (%s => %s)"
@@ -638,8 +643,8 @@ msgstr "\tCONFLITTI:: %s va in conflitto con %s"
 #: lib/libalpm/conflict.c:349 lib/libalpm/deps.c:60 lib/libalpm/deps.c:438
 #: lib/libalpm/deps.c:634 lib/libalpm/deps.c:674 lib/libalpm/group.c:45
 #: lib/libalpm/handle.c:51 lib/libalpm/package.c:82 lib/libalpm/sync.c:67
-#: lib/libalpm/sync.c:606 lib/libalpm/sync.c:622 lib/libalpm/sync.c:719
-#: lib/libalpm/trans.c:55 lib/libalpm/util.c:612 lib/libalpm/util.c:619
+#: lib/libalpm/sync.c:614 lib/libalpm/sync.c:630 lib/libalpm/sync.c:727
+#: lib/libalpm/trans.c:55 lib/libalpm/util.c:614 lib/libalpm/util.c:621
 #, c-format
 msgid "malloc failure: could not allocate %d bytes"
 msgstr "malloc failure: impossibile allocare %d byte"
@@ -872,7 +877,7 @@ msgstr "operazione annullata"
 msgid "operation not compatible with the transaction type"
 msgstr "operazione incompatibile con il tipo di transazione"
 
-#: lib/libalpm/error.c:97 lib/libalpm/sync.c:986
+#: lib/libalpm/error.c:97 lib/libalpm/sync.c:994
 msgid "could not commit transaction"
 msgstr "impossibile eseguire l'operazione"
 
@@ -1200,231 +1205,231 @@ msgstr "ricerca dei pacchetti da aggiornare in corso"
 msgid "%s-%s elected for upgrade (%s => %s)"
 msgstr "%s-%s selezionato per l'aggiornamento (%s => %s)"
 
-#: lib/libalpm/sync.c:262
+#: lib/libalpm/sync.c:270
 #, c-format
 msgid "searching for target in repo '%s'"
 msgstr "ricerca in corso del pacchetto nel repository '%s'"
 
-#: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293
+#: lib/libalpm/sync.c:278 lib/libalpm/sync.c:301
 #, c-format
 msgid "target '%s' not found -- looking for provisions"
 msgstr "pacchetto '%s' non trovato, ricerca delle alternative in corso"
 
-#: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298
+#: lib/libalpm/sync.c:283 lib/libalpm/sync.c:306
 #, c-format
 msgid "found '%s' as a provision for '%s'"
 msgstr "trovato '%s' come alternativa a '%s'"
 
-#: lib/libalpm/sync.c:282
+#: lib/libalpm/sync.c:290
 #, c-format
 msgid "repository '%s' not found"
 msgstr "impossibile trovare il repository '%s'"
 
-#: lib/libalpm/sync.c:323
+#: lib/libalpm/sync.c:331
 #, c-format
 msgid "%s-%s is up to date -- skipping"
 msgstr "%s-%s è aggiornato, sarà ignorato"
 
-#: lib/libalpm/sync.c:346
+#: lib/libalpm/sync.c:354
 #, c-format
 msgid "adding target '%s' to the transaction set"
 msgstr "aggiunta in corso del pacchetto '%s'"
 
-#: lib/libalpm/sync.c:394
+#: lib/libalpm/sync.c:402
 msgid "resolving target's dependencies"
 msgstr "risoluzione in corso delle dipendenze dei pacchetti"
 
-#: lib/libalpm/sync.c:414
+#: lib/libalpm/sync.c:422
 #, c-format
 msgid "adding package %s-%s to the transaction targets"
 msgstr "aggiunta in corso del pacchetto %s-%s"
 
-#: lib/libalpm/sync.c:455
+#: lib/libalpm/sync.c:463
 msgid "looking for unresolvable dependencies"
 msgstr "ricerca in corso delle dipendenze irrisolvibili"
 
-#: lib/libalpm/sync.c:486
+#: lib/libalpm/sync.c:494
 #, c-format
 msgid "package '%s' conflicts with '%s'"
 msgstr "il pacchetto '%s' va in conflitto con '%s'"
 
-#: lib/libalpm/sync.c:508
+#: lib/libalpm/sync.c:516
 #, c-format
 msgid "'%s' not found in transaction set -- skipping"
 msgstr "impossibile trovare '%s', sarà ignorato"
 
-#: lib/libalpm/sync.c:519
+#: lib/libalpm/sync.c:527
 #, c-format
 msgid "package '%s' provides its own conflict"
 msgstr "il pacchetto '%s' fornisce il suo stesso conflitto"
 
-#: lib/libalpm/sync.c:542 lib/libalpm/sync.c:547
+#: lib/libalpm/sync.c:550 lib/libalpm/sync.c:555
 #, c-format
 msgid "'%s' is in the target list -- keeping it"
 msgstr "'%s' è nella lista dei pacchetti e sarà conservato"
 
-#: lib/libalpm/sync.c:559 lib/libalpm/sync.c:596
+#: lib/libalpm/sync.c:567 lib/libalpm/sync.c:604
 #, c-format
 msgid "removing '%s' from target list"
 msgstr "rimozione in corso di '%s' dalla lista dei pacchetti"
 
-#: lib/libalpm/sync.c:568
+#: lib/libalpm/sync.c:576
 #, c-format
 msgid "resolving package '%s' conflict"
 msgstr "risoluzione in corso del conflitto del pacchetto '%s'"
 
-#: lib/libalpm/sync.c:591
+#: lib/libalpm/sync.c:599
 #, c-format
 msgid "electing '%s' for removal"
 msgstr "selezionato '%s' per la rimozione"
 
-#: lib/libalpm/sync.c:602 lib/libalpm/sync.c:618
+#: lib/libalpm/sync.c:610 lib/libalpm/sync.c:626
 msgid "unresolvable package conflicts detected"
 msgstr "sono stati rilevati dei conflitti irrisolvibili"
 
-#: lib/libalpm/sync.c:670
+#: lib/libalpm/sync.c:678
 msgid "checking dependencies of packages designated for removal"
 msgstr ""
 "controllo in corso delle dipendenze dei pacchetti designati per la rimozione"
 
-#: lib/libalpm/sync.c:684
+#: lib/libalpm/sync.c:692
 msgid "something has gone horribly wrong"
 msgstr "qualcosa è andato orribilmente storto"
 
-#: lib/libalpm/sync.c:704
+#: lib/libalpm/sync.c:712
 #, c-format
 msgid "found '%s' as a provision for '%s' -- conflict aborted"
 msgstr "trovato '%s' come alternativa a '%s', conflitto annullato"
 
-#: lib/libalpm/sync.c:800
+#: lib/libalpm/sync.c:808
 #, c-format
 msgid "%s is already in the cache\n"
 msgstr "%s è già presente nella cache\n"
 
-#: lib/libalpm/sync.c:811
+#: lib/libalpm/sync.c:819
 #, c-format
 msgid "no %s cache exists, creating...\n"
 msgstr "la cache di %s non esiste, creazione in corso...\n"
 
-#: lib/libalpm/sync.c:812
+#: lib/libalpm/sync.c:820
 #, c-format
 msgid "warning: no %s cache exists, creating..."
 msgstr "attenzione: la cache di %s non esiste, creazione in corso..."
 
-#: lib/libalpm/sync.c:817
+#: lib/libalpm/sync.c:825
 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/sync.c:818
+#: lib/libalpm/sync.c:826
 msgid "warning: couldn't create package cache, using /tmp instead"
 msgstr ""
 "attenzione: impossibile creare la cache del pacchetto, al suo posto sarà "
 "usata /tmp"
 
-#: lib/libalpm/sync.c:825
+#: lib/libalpm/sync.c:833
 #, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "impossibile recuperare alcuni file da %s\n"
 
-#: lib/libalpm/sync.c:855 lib/libalpm/sync.c:867
+#: lib/libalpm/sync.c:863 lib/libalpm/sync.c:875
 #, c-format
 msgid "can't get md5 or sha1 checksum for package %s\n"
 msgstr "impossibile recuperare il checksum md5 o sha1 del pacchetto %s\n"
 
-#: lib/libalpm/sync.c:886
+#: lib/libalpm/sync.c:894
 #, c-format
 msgid "archive %s was corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "archivio %s era corrotto (MD5 o SHA1 checksum errato)\n"
 
-#: lib/libalpm/sync.c:888
+#: lib/libalpm/sync.c:896
 #, c-format
 msgid "archive %s is corrupted (bad MD5 or SHA1 checksum)\n"
 msgstr "archivio %s è corrotto (MD5 o SHA1 checksum errato)\n"
 
-#: lib/libalpm/sync.c:909
+#: lib/libalpm/sync.c:917
 msgid "could not create removal transaction"
 msgstr "impossibile avviare l'operazione di rimozione"
 
-#: lib/libalpm/sync.c:915
+#: lib/libalpm/sync.c:923
 msgid "could not initialize the removal transaction"
 msgstr "impossibile inizializzare l'operazione di rimozione"
 
-#: lib/libalpm/sync.c:935
+#: lib/libalpm/sync.c:943
 msgid "removing conflicting and to-be-replaced packages"
 msgstr "rimozione in corso dei pacchetti in conflitto e da sostituire"
 
-#: lib/libalpm/sync.c:937
+#: lib/libalpm/sync.c:945
 msgid "could not prepare removal transaction"
 msgstr "impossibile preparare l'operazione di rimozione"
 
-#: lib/libalpm/sync.c:943
+#: lib/libalpm/sync.c:951
 msgid "could not commit removal transaction"
 msgstr "impossibile eseguire l'operazione di rimozione"
 
-#: lib/libalpm/sync.c:950
+#: lib/libalpm/sync.c:958
 msgid "installing packages"
 msgstr "installazione dei pacchetti in corso"
 
-#: lib/libalpm/sync.c:953
+#: lib/libalpm/sync.c:961
 msgid "could not create transaction"
 msgstr "impossibile avviare l'operazione"
 
-#: lib/libalpm/sync.c:958
+#: lib/libalpm/sync.c:966
 msgid "could not initialize transaction"
 msgstr "impossibile inizializzare l'operazione"
 
-#: lib/libalpm/sync.c:981
+#: lib/libalpm/sync.c:989
 msgid "could not prepare transaction"
 msgstr "impossibile preparare l'operazione"
 
-#: lib/libalpm/sync.c:993
+#: lib/libalpm/sync.c:1001
 msgid "updating database for replaced packages' dependencies"
 msgstr ""
 "aggiornamento in corso del database per le dipendenze dei pacchetti "
 "sostituiti"
 
-#: lib/libalpm/sync.c:1022
+#: lib/libalpm/sync.c:1030
 #, c-format
 msgid "could not update requiredby for database entry %s-%s"
 msgstr ""
 "impossibile aggiornare il campo 'richiesto da' per la voce del database %s-%s"
 
-#: lib/libalpm/sync.c:1031
+#: lib/libalpm/sync.c:1039
 #, c-format
 msgid "could not update new database entry %s-%s"
 msgstr "impossibile aggiornare la nuova voce del database %s-%s"
 
-#: lib/libalpm/sync.c:1071
+#: lib/libalpm/sync.c:1079
 #, c-format
 msgid "found package '%s-%s' in sync"
 msgstr "trovato il pacchetto '%s-%s' nel database"
 
-#: lib/libalpm/sync.c:1077
+#: lib/libalpm/sync.c:1085
 #, c-format
 msgid "package '%s' not found in sync"
 msgstr "impossibile trovare il pacchetto '%s'"
 
-#: lib/libalpm/trans.c:270
+#: lib/libalpm/trans.c:271
 #, c-format
 msgid "updating dependency packages 'requiredby' fields for %s-%s"
 msgstr "aggiornamento delle dipendenze nei campi 'richiesto da' di %s-%s"
 
-#: lib/libalpm/trans.c:273
+#: lib/libalpm/trans.c:274
 msgid "package has no dependencies, no other packages to update"
 msgstr "il pacchetto non ha dipendenze, nessun altro pacchetto da aggiornare"
 
-#: lib/libalpm/trans.c:310 lib/libalpm/trans.c:340
+#: lib/libalpm/trans.c:311 lib/libalpm/trans.c:341
 #, c-format
 msgid "updating 'requiredby' field for package '%s'"
 msgstr "aggiornamento in corso del campo 'richiesto da' del pacchetto '%s'"
 
-#: lib/libalpm/trans.c:325 lib/libalpm/trans.c:355
+#: lib/libalpm/trans.c:326 lib/libalpm/trans.c:356
 #, c-format
 msgid "could not update 'requiredby' database entry %s-%s"
 msgstr "impossibile aggiornare la voce 'richiesto da' del database %s-%s"
 
-#: lib/libalpm/trans.c:332
+#: lib/libalpm/trans.c:333
 #, c-format
 msgid "could not find dependency '%s'"
 msgstr "impossibile trovare la dipendenza '%s'"
@@ -1503,7 +1508,12 @@ msgstr "chiamata a waitpid non riuscita (%s)"
 msgid "could not remove tmpdir %s"
 msgstr "impossibile rimuovere la directory temporanea %s"
 
-#: lib/libalpm/util.c:607
+#: lib/libalpm/util.c:568
+#, c-format
+msgid "cannot read disk space information from %s: %s"
+msgstr "impossibile leggere le informazioni dello spazio del disco da %s: %s"
+
+#: lib/libalpm/util.c:609
 #, c-format
 msgid "check_freespace: total pkg size: %lld, disk space: %lld"
 msgstr ""

lib/libalpm/remove.c

@@ -284,10 +284,10 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
 			break;
 		}
 
-		snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
-						 pkgname, alpm_pkg_get_version(info));
 		/* get the name now so we can use it after package is removed */
 		pkgname = alpm_pkg_get_name(info);
+		snprintf(scriptlet, PATH_MAX, "%s%s-%s/install", db->path,
+						 pkgname, alpm_pkg_get_version(info));
 
 		if(trans->type != PM_TRANS_TYPE_UPGRADE) {
 			EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL);

lib/libalpm/sync.c

@@ -216,14 +216,22 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 									alpm_pkg_get_name(local), alpm_pkg_get_version(local),
 									alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 				if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) {
-					pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local),
-																				 alpm_pkg_get_version(local));
-					if(dummy == NULL) {
+					/* If package is in the ignorepkg list, ask before we add it to
+					 * the transaction */
+					if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) {
+						int resp = 0;
+						QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp);
+						if(!resp) {
+							continue;
+						}
+					}
+					pmpkg_t *tmp = _alpm_pkg_dup(local);
+					if(tmp == NULL) {
 						goto error;
 					}
-					sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy);
+					sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp);
 					if(sync == NULL) {
-						FREEPKG(dummy);
+						FREEPKG(tmp);
 						goto error;
 					}
 					trans->packages = alpm_list_add(trans->packages, sync);

lib/libalpm/trans.c

@@ -135,7 +135,8 @@ int _alpm_trans_addtarget(pmtrans_t *trans, char *target)
 	ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
 
 	if(alpm_list_find_str(trans->targets, target)) {
-		RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
+		return(0);
+		//RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1);
 	}
 
 	switch(trans->type) {

lib/libalpm/util.c

@@ -560,11 +560,13 @@ cleanup:
 static long long get_freespace()
 {
 	struct mntent *mnt;
-	char *table = MOUNTED;
+	const char *table = MOUNTED;
 	FILE *fp;
 	long long ret=0;
 
 	if((fp = setmntent(table, "r")) == NULL) {
+		_alpm_log(PM_LOG_ERROR, _("cannot read disk space information from %s: %s"),
+							table, strerror(errno));
 		return(-1);
 	}
 

pactest/tests/ldconfig001.py

@@ -0,0 +1,12 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on an add operation"
+
+p = pmpkg("dummy")
+self.addpkg(p)
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -A %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=ldconfig")

pactest/tests/ldconfig002.py

@@ -0,0 +1,16 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on an upgrade operation"
+
+lp = pmpkg("dummy")
+self.addpkg2db("local", lp)
+
+p = pmpkg("dummy", "1.0-2")
+self.addpkg(p)
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -U %s" % p.filename()
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-2")
+self.addrule("PACMAN_OUTPUT=ldconfig")

pactest/tests/ldconfig003.py

@@ -0,0 +1,14 @@
+# quick note here - chroot() is expected to fail.  We're not checking the
+# validity of the scripts, only that they fire (or try to)
+self.description = "Make sure ldconfig runs on a sync operation"
+
+sp = pmpkg("dummy")
+self.addpkg2db("sync", sp)
+
+self.args = "-S %s" % sp.name
+
+# --debug is necessary to check PACMAN_OUTPUT
+self.args = "--debug -S %s" % sp.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_OUTPUT=ldconfig")

pactest/tests/remove001.py

@@ -0,0 +1,10 @@
+# If someone else can come up with a better name, please do so
+self.description = "Remove a package listed 5 times"
+
+p = pmpkg("foo")
+self.addpkg2db("local", p)
+
+self.args = "-R " + "foo "*5
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("!PKG_EXISTS=foo")

pactest/tests/sync136.py

@@ -0,0 +1,15 @@
+self.description = "Sysupgrade with a sync package forcing a downgrade"
+
+sp = pmpkg("dummy", "1.0-1")
+sp.force = 1
+
+self.addpkg2db("sync", sp)
+
+lp = pmpkg("dummy", "1.0-2")
+
+self.addpkg2db("local", lp)
+
+self.args = "-Su"
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-1")

pactest/tests/sync137.py

@@ -0,0 +1,14 @@
+self.description = "Sysupgrade with a force and ignore on same package"
+
+lp = pmpkg("dummy", "1.0-1")
+
+self.addpkg2db("local", lp)
+
+sp = pmpkg("dummy", "1.0-2")
+sp.force = 1
+self.addpkg2db("sync", sp)
+
+self.args = "-Su --ignore %s" % lp.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_VERSION=dummy|1.0-1")

scripts/makepkg

@@ -25,7 +25,7 @@
 #   USA.
 #
 
-myver='3.0.0'
+myver='3.0.3'
 startdir=$(pwd)
 
 BUILDSCRIPT="PKGBUILD"
@@ -182,8 +182,7 @@ checkdeps() {
 	pmout=$(pacman $PACMAN_OPTS -T $*)
 	ret=$?
 	if [ $ret -eq 1 ]; then #unresolved deps
-		#strip out the pacman prefix from "requires: xyz"
-		echo $pmout | sed 's|requires:||g'
+		echo $pmout
 	elif [ $ret -ne 0 ]; then
 		error "pacman returned a fatal error ($ret): $pmout"
 		exit 1
@@ -746,7 +745,11 @@ else
 				if [ $ct -eq 0 ]; then
 					echo -n "${integrity_name}s=("
 				else
-					echo -ne "\t  "
+					indent=0
+					while [ $indent -lt $((${#integrity_name}+3)) ]; do
+						echo -n " "
+						indent=$(($indent+1))
+					done
 				fi
 				echo -n "'$sum'"
 				ct=$(($ct+1))
@@ -809,6 +812,8 @@ else
 		file_type=$(file -biz "$file")
 		unset cmd
 		case "$file_type" in
+			*application/x-tar*application/x-compress*)
+				cmd="tar -xzf $file" ;;
 			*application/x-tar*)
 				cmd="tar -xf $file" ;;
 			*application/x-zip*)
@@ -817,7 +822,7 @@ else
 			*application/x-cpio*)
 				cmd="bsdtar -x -f $file" ;;
 			*application/x-gzip*)
-				cmd="gunzip -f $file" ;;
+				cmd="gunzip -d -f $file" ;;
 			*application/x-bzip*)
 				cmd="bunzip2 -f $file" ;;
 		esac
@@ -876,9 +881,13 @@ else
 	msg "Starting build()..."
 
 	# some applications (eg, blackbox) will not build with some languages
-	unset LC_ALL LANG
+	unset LC_ALL LC_MESSAGES LANG
 	umask 0022
 
+	# ensure CFLAGS and CXXFLAGS are used
+	export CFLAGS
+	export CXXFLAGS
+
 	#check for "exit on syntax error" shell option
 	echo $SHELLOPTS | grep errexit 2>&1 >/dev/null
 	set_e=$?

scripts/rankmirrors

@@ -55,7 +55,8 @@ def timeCmd(cmd):
 
 def talkToServer(serverUrl):
     opener = urllib2.build_opener()
-    tmp = opener.open(serverUrl).read()
+    # retrieve first 50,000 bytes only
+    tmp = opener.open(serverUrl).read(50000)
 
 def getFuncToTime(serverUrl):
     return lambda : talkToServer(serverUrl)
@@ -139,8 +140,23 @@ if __name__ == "__main__":
         elif options.times:
             print ' * ',
         sys.stdout.flush()
+
+        # add *.db.tar.gz to server name. the repo name is parsed
+        # from the mirror url; it is the third (or fourth) dir
+        # from the end, where the url is http://foo/bar/REPO/os/arch
         try:
-            serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl))
+            splitted2 = serverUrl.split('/')
+            if serverUrl[-1] != '/':
+                repoName = splitted2[-3]
+                dbFileName = '/' + repoName + '.db.tar.gz'
+            else:
+                repoName = splitted2[-4]
+                dbFileName = repoName + '.db.tar.gz'
+        except:
+            dbFileName = ''
+
+        try:
+            serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl + dbFileName))
             if options.verbose:
                 try:
                     print "%.2f" % serverToTime[serverUrl]

scripts/repo-add

@@ -19,7 +19,7 @@
 #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
 #   USA.
 
-myver='3.0.0'
+myver='3.0.3'
 
 FORCE=0
 REPO_DB_FILE=""
@@ -148,7 +148,7 @@ db_write_entry()
 
 	# create desc entry
 	echo ":: creating 'desc' db entry"
-	echo -e "%FILENAME%\n$(basename $1)\n" >> desc
+	echo -e "%FILENAME%\n$(basename $1)\n" >>desc
 	echo -e "%NAME%\n$pkgname\n" >>desc
 	echo -e "%VERSION%\n$pkgver\n" >>desc
 	if [ -n "$pkgdesc" ]; then
@@ -157,7 +157,7 @@ db_write_entry()
 	if [ -n "$_groups" ]; then
 		echo "%GROUPS%" >>desc
 		echo $_groups | tr -s ' ' '\n' >>desc
-		echo "" >desc
+		echo "" >>desc
 	fi
 	[ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc
 	[ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc
@@ -246,7 +246,7 @@ if [ $# -gt 1 ]; then
 			fi
 		else
 			if [ -f "$arg" ]; then
-				if ! tar xf "$arg" .PKGINFO 2>&1 >/dev/null; then
+				if ! tar tf "$arg" .PKGINFO 2>&1 >/dev/null; then
 					echo "error: '$arg' is not a package file, skipping"
 				else
 					echo ":: adding package '$arg'"

src/pacman/deptest.c

@@ -81,7 +81,7 @@ int pacman_deptest(alpm_list_t *targets)
 		}
 
 		if(!found) {
-			MSG(NL, _("requires: %s"), saved_target);
+			MSG(NL, "%s", saved_target);
 			retval = 1;
 		}
 		free(saved_target);

src/pacman/po/LINGUAS

@@ -1,8 +1,10 @@
 # Set of available languages.
 de
+en_GB
+es
 fr
 hu
 it
+pl_PL
 pt_BR
-en_GB
 ru_RU

src/pacman/po/de.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-23 20:46-0500\n"
-"PO-Revision-Date: 2007-03-23 18:08+0100\n"
+"POT-Creation-Date: 2007-04-17 20:23+0200\n"
+"PO-Revision-Date: 2007-04-17 20:18+0200\n"
 "Last-Translator: Pierre Schmitz <pierre@archlinux.de>\n"
 "Language-Team: German <archlinux.de>\n"
 "MIME-Version: 1.0\n"
@@ -42,12 +42,12 @@ msgstr "Konnte Paket '%s' nicht hinzufügen (%s)"
 #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
 #: src/pacman/trans.c:119 src/pacman/trans.c:131 src/pacman/trans.c:142
 msgid "done.\n"
-msgstr "fertig.\n"
+msgstr "Fertig.\n"
 
 #: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616
 #, c-format
 msgid "failed to prepare transaction (%s)\n"
-msgstr "Konnte Aktion nicht vorbereiten (%s)\n"
+msgstr "Konnte Vorgang nicht vorbereiten (%s)\n"
 
 #: src/pacman/add.c:104
 #, c-format
@@ -93,11 +93,6 @@ msgstr "Konnte den Vorgang (%s) nicht durchführen\n"
 msgid "failed to release transaction (%s)\n"
 msgstr "Konnte den Vorgang (%s) nicht freigeben\n"
 
-#: src/pacman/deptest.c:84
-#, c-format
-msgid "requires: %s"
-msgstr "Erfordert: %s"
-
 #: src/pacman/log.c:63
 #, c-format
 msgid "debug"
@@ -293,7 +288,7 @@ msgstr "FEHLEND\t\t%s\n"
 #: src/pacman/package.c:206
 #, c-format
 msgid "(none)\n"
-msgstr "(nichts)\n"
+msgstr "(Nichts)\n"
 
 #: src/pacman/package.c:246
 #, c-format
@@ -352,7 +347,7 @@ msgstr ""
 #: src/pacman/pacman.c:101
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
-msgstr "Benutzung:  %s {-A -add} [Optionen] <Datei>\n"
+msgstr "Verwendung:  %s {-A -add} [Optionen] <Datei>\n"
 
 #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119
 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138
@@ -375,7 +370,7 @@ msgstr ""
 #: src/pacman/pacman.c:106
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
-msgstr "Benutzung:  %s {-R --remove} [Optionen] <Paket>\n"
+msgstr "Verwendung:  %s {-R --remove} [Optionen] <Paket>\n"
 
 #: src/pacman/pacman.c:108
 #, c-format
@@ -388,7 +383,9 @@ msgstr ""
 #, c-format
 msgid ""
 "  -k, --dbonly         only remove database entry, do not remove files\n"
-msgstr "  -k, --dbonly         Nur Datenbankeintrag entfernen, keine Dateien\n"
+msgstr ""
+"  -k, --dbonly         Nur Datenbankeintrag entfernen, keine Dateien "
+"entfernen\n"
 
 #: src/pacman/pacman.c:111
 #, c-format
@@ -406,17 +403,17 @@ msgstr ""
 #: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
-msgstr "Benutzung:  %s {-F --freshen} [Optionen] <Datei>\n"
+msgstr "Verwendung:  %s {-F --freshen} [Optionen] <Datei>\n"
 
 #: src/pacman/pacman.c:117
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
-msgstr "Benutzung:  %s {-U --upgrade} [Optionen] <Datei>\n"
+msgstr "Verwendung:  %s {-U --upgrade} [Optionen] <Datei>\n"
 
 #: src/pacman/pacman.c:123
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
-msgstr "Benutzung:  %s {-Q --query} [Optionen] [Pakete]\n"
+msgstr "Verwendung:  %s {-Q --query} [Optionen] [Pakete]\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
@@ -440,12 +437,12 @@ msgstr "                       wurden, aber nicht mehr benötigt werden\n"
 #: src/pacman/pacman.c:128 src/pacman/pacman.c:143
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr "  -g, --groups         Zeige alle Mitglieder einer Paket-Gruppe an\n"
+msgstr "  -g, --groups         Zeigt alle Mitglieder einer Paket-Gruppe an\n"
 
 #: src/pacman/pacman.c:129 src/pacman/pacman.c:144
 #, c-format
 msgid "  -i, --info           view package information\n"
-msgstr "  -i, --info           Zeige Paketinformationen an\n"
+msgstr "  -i, --info           Zeigt Paketinformationen an\n"
 
 #: src/pacman/pacman.c:130
 #, c-format
@@ -457,7 +454,7 @@ msgstr "  -l, --list           Zeigt den Inhalt des abgefragten Paketes an\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
-"  -m, --foreign        Zeigt alle Pakete an, die nicht in den Sync db(s)\n"
+"  -m, --foreign        Zeigt alle Pakete an, die nicht in den Sync-db(s)\n"
 "                       gefunden wurden\n"
 
 #: src/pacman/pacman.c:132
@@ -478,12 +475,12 @@ msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
 msgstr ""
-"  -s, --search <regex> Durchsuche lokal installierte Pakete nach einem Wort\n"
+"  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"
 
 #: src/pacman/pacman.c:135
 #, c-format
 msgid "  -u, --upgrades       list all packages that can be upgraded\n"
-msgstr "  -u, --upgrades       Zeige alle aktualisierbaren Pakete an\n"
+msgstr "  -u, --upgrades       Zeigt alle aktualisierbaren Pakete an\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
@@ -507,7 +504,8 @@ msgstr "  -e, --dependsonly    Nur Abhängigkeiten installieren\n"
 #: src/pacman/pacman.c:145
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr "  -l, --list <repo>    Liste aller Pakete eines Repositoriums\n"
+msgstr ""
+"  -l, --list <repo>    Zeigt eine Liste aller Pakete eines Repositoriums an\n"
 
 #: src/pacman/pacman.c:146
 #, c-format
@@ -523,12 +521,12 @@ msgstr ""
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
-"  -s, --search <regex> Durchsuche entfernte Repositorien nach einem Wort\n"
+"  -s, --search <regex> Durchsucht entfernte Repositorien nach einem Wort\n"
 
 #: src/pacman/pacman.c:148
 #, c-format
 msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
-msgstr "  -u, --sysupgrade     Alle veralteten Pakete aktualisieren\n"
+msgstr "  -u, --sysupgrade     Aktualisiert alle veralteten Pakete\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
@@ -536,14 +534,15 @@ msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
 msgstr ""
-"  -w, --downloadonly   Lade Pakete herunter, aber nichts installieren oder\n"
+"  -w, --downloadonly   Lädt Pakete herunter, ohne etwas zu installieren "
+"oder\n"
 "                       aktualisieren\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
-msgstr "  -y, --refresh        Lade frische Paketdatenbank vom Server\n"
+msgstr "  -y, --refresh        Lädt frische Paketdatenbank vom Server\n"
 
 #: src/pacman/pacman.c:151
 #, c-format
@@ -551,7 +550,7 @@ msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
-"      --ignore <pkg>   Ignoriere ein neues Paket (kann mehrfach genutzt\n"
+"      --ignore <pkg>   Ignoriert ein neues Paket (kann mehrfach genutzt\n"
 "                       werden)\n"
 
 #: src/pacman/pacman.c:153
@@ -595,7 +594,7 @@ msgstr "  -v, --verbose        Sei gesprächig\n"
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
-"  -r, --root <Pfad>    Benutze ein alternatives Wurzelverzeichnis zur\n"
+"  -r, --root <Pfad>    Setzt ein alternatives Wurzelverzeichnis zur\n"
 "                       Installation\n"
 
 #: src/pacman/pacman.c:160
@@ -616,7 +615,7 @@ msgstr "                       Dieses Programm ist frei verfügbar unter\n"
 #: src/pacman/pacman.c:175
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
-msgstr "                       der GNU General Public License\n"
+msgstr "                      den Bedingungen der GNU General Public License\n"
 
 #: src/pacman/pacman.c:300
 #, c-format
@@ -631,7 +630,7 @@ msgstr "'%s' ist kein gültiges Paketpuffer-Verzeichnis\n"
 #: src/pacman/pacman.c:333
 #, c-format
 msgid "'%s' is not a valid db path\n"
-msgstr "'%s' ist kein gültiger Db-Pfad\n"
+msgstr "'%s' ist kein gültiger db-Pfad\n"
 
 #: src/pacman/pacman.c:363
 #, c-format
@@ -660,7 +659,7 @@ msgstr "Sie benötigen root-Rechte, um diese Operation ausführen zu können\n"
 #: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
-msgstr "Konnte Konfiguration nicht lesen (%s)\n"
+msgstr "Konnte Konfiguration (%s) nicht lesen\n"
 
 #: src/pacman/pacman.c:516
 msgid "Targets  :"
@@ -669,7 +668,7 @@ msgstr "Pakete   :"
 #: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
-msgstr "Kein auf die lokale Datenbank (%s)\n"
+msgstr "Kein Zugriff auf die lokale Datenbank (%s)\n"
 
 #: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
@@ -690,12 +689,12 @@ msgstr "Fehler beim Lesen der Datei '%s': %s"
 
 #: src/pacman/query.c:100
 msgid "cannot determine ownership of a directory"
-msgstr "konnte den Besitzer eines Verzeichnisses nicht ermitteln"
+msgstr "Konnte den Besitzer eines Verzeichnisses nicht ermitteln"
 
 #: src/pacman/query.c:105
 #, c-format
 msgid "cannot determine real path for '%s': %s"
-msgstr "konnte den wahren Pfad für '%s' nicht ermitteln: %s"
+msgstr "Konnte den wahren Pfad für '%s' nicht ermitteln: %s"
 
 #: src/pacman/query.c:119
 #, c-format
@@ -745,7 +744,7 @@ msgstr ":: Gruppe %s:\n"
 
 #: src/pacman/remove.c:63
 msgid "    Remove whole content? [Y/n] "
-msgstr "    Den gesamten Inhalt entfernen? [J/n] "
+msgstr "    Gesamten Inhalt entfernen? [J/n] "
 
 #: src/pacman/remove.c:67
 #, c-format
@@ -781,31 +780,31 @@ msgstr ""
 
 #: src/pacman/sync.c:115
 msgid "Do you want to remove old packages from cache? [Y/n] "
-msgstr "Möchten Sie alte Pakete aus dem Cache entfernen? [J/n] "
+msgstr "Möchten Sie alte Pakete aus dem Puffer entfernen? [J/n] "
 
 #: src/pacman/sync.c:117
 msgid "removing old packages from cache... "
-msgstr "Entferne alte Pakete aus dem Cache... "
+msgstr "Entferne alte Pakete aus dem Puffer... "
 
 #: src/pacman/sync.c:120
 msgid "could not access cache directory\n"
-msgstr "Konnte nicht auf Cache-Verzeichnis zugreifen\n"
+msgstr "Konnte nicht auf Puffer-Verzeichnis zugreifen\n"
 
 #: src/pacman/sync.c:181
 msgid "Do you want to remove all packages from cache? [Y/n] "
-msgstr "Wollen Sie alle Pakete aus dem Cache entfernen? [J/n] "
+msgstr "Wollen Sie alle Pakete aus dem Puffer entfernen? [J/n] "
 
 #: src/pacman/sync.c:183
 msgid "removing all packages from cache... "
-msgstr "Entferne alle Pakete aus dem Cache... "
+msgstr "Entferne alle Pakete aus dem Puffer... "
 
 #: src/pacman/sync.c:186
 msgid "could not remove cache directory\n"
-msgstr "Konnte Cache-Verzeichnis nicht entfernen\n"
+msgstr "Konnte Puffer-Verzeichnis nicht entfernen\n"
 
 #: src/pacman/sync.c:191
 msgid "could not create new cache directory\n"
-msgstr "Konnte neues Cache-Verzeichnis nicht erstellen\n"
+msgstr "Konnte neues Puffer-Verzeichnis nicht erstellen\n"
 
 #: src/pacman/sync.c:218
 #, c-format
@@ -887,11 +886,6 @@ msgstr ":: Zuerst pacman aktualisieren? [J/n] "
 msgid "pacman: %s\n"
 msgstr "pacman: %s\n"
 
-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr "'%s':%s\n"
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Gesamten Inhalt installieren? [J/n] "
@@ -908,11 +902,11 @@ msgstr "'%s': nicht in Synchronisations-Datenbank gefunden\n"
 
 #: src/pacman/sync.c:621
 msgid "requires"
-msgstr "benötigt"
+msgstr "Benötigt"
 
 #: src/pacman/sync.c:663
 msgid " local database is up to date\n"
-msgstr " lokale Datenbank ist aktuell\n"
+msgstr " Lokale Datenbank ist aktuell\n"
 
 #: src/pacman/sync.c:672
 msgid ""
@@ -1019,7 +1013,7 @@ msgstr ":: %s ist als ein HoldPkg gekennzeichnet. Trotzdem entfernen? [J/n] "
 #: src/pacman/trans.c:203
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: %s mit %s/%s ersetzen? [J/n] "
+msgstr ":: %s durch %s/%s ersetzen? [J/n] "
 
 #: src/pacman/trans.c:218
 #, c-format
@@ -1051,7 +1045,7 @@ msgstr "Aktualisiere"
 
 #: src/pacman/trans.c:332
 msgid "removing"
-msgstr "entferne"
+msgstr "Entferne"
 
 #: src/pacman/trans.c:335
 msgid "checking for file conflicts"
@@ -1088,3 +1082,9 @@ msgstr ""
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Gesamtgröße der installierten Pakete   : %.2f MB\n"
+
+#~ msgid "requires: %s"
+#~ msgstr "Erfordert: %s"
+
+#~ msgid "'%s': %s\n"
+#~ msgstr "'%s':%s\n"

src/pacman/po/hu.po

@@ -129,7 +129,7 @@ msgstr "hiba: "
 
 #: src/pacman/log.h:34
 msgid "warning: "
-msgstr "figyelmeztet<65>s"
+msgstr "figyelmeztet<65>s: "
 
 #: src/pacman/package.c:60
 msgid "Explicitly installed"
@@ -270,7 +270,7 @@ msgstr "Backup f
 #: src/pacman/package.c:180
 #, c-format
 msgid "error calculating checksums for %s\n"
-msgstr "hiba a %s ellen<65>rz<72> <20>sszeg<65>nek sz<73>m<EFBFBD>t<EFBFBD>sa k<>zben\n"
+msgstr "hiba a(z) %s ellen<65>rz<72> <20>sszeg<65>nek sz<73>m<EFBFBD>t<EFBFBD>sa k<>zben\n"
 
 #: src/pacman/package.c:193
 #, c-format
@@ -615,7 +615,7 @@ msgstr "                       foglaltak alapj
 #: src/pacman/pacman.c:300
 #, c-format
 msgid "'%s' is not a valid debug level"
-msgstr "a '%s' nem <20>rv<72>nyes hibakeres<65>si szint"
+msgstr "a(z) '%s' nem <20>rv<72>nyes hibakeres<65>si szint"
 
 #: src/pacman/pacman.c:315
 #, c-format
@@ -687,7 +687,7 @@ msgstr "nem siker
 #: src/pacman/query.c:105
 #, c-format
 msgid "cannot determine real path for '%s': %s"
-msgstr "nem <20>llap<61>that<61> meg a val<61>di <20>tvonal a '%s' sz<73>m<EFBFBD>ra: %s"
+msgstr "nem <20>llap<61>that<61> meg a val<61>di <20>tvonal a(z) '%s' sz<73>m<EFBFBD>ra: %s"
 
 #: src/pacman/query.c:119
 #, c-format
@@ -714,7 +714,7 @@ msgstr "nem tal
 #: src/pacman/query.c:221
 #, c-format
 msgid "group \"%s\" was not found\n"
-msgstr "a \"%s\" csoport nem tal<61>lhat<61>\n"
+msgstr "a(z) \"%s\" csoport nem tal<61>lhat<61>\n"
 
 #: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
@@ -752,7 +752,7 @@ msgstr "nem siker
 #: src/pacman/remove.c:92
 #, c-format
 msgid "failed to add target '%s' (%s)\n"
-msgstr "nem siker<65>lt a '%s' c<>lt hozz<7A>adni a tranzakci<63>hoz (%s)\n"
+msgstr "nem siker<65>lt a(z) '%s' c<>lt hozz<7A>adni a tranzakci<63>hoz (%s)\n"
 
 #: src/pacman/remove.c:106
 #, c-format
@@ -812,7 +812,7 @@ msgstr "nem siker
 #: src/pacman/sync.c:223
 #, c-format
 msgid " %s is up to date\n"
-msgstr " a %s naprak<61>sz\n"
+msgstr " a(z) %s naprak<61>sz\n"
 
 #: src/pacman/sync.c:345
 #, c-format

src/pacman/po/it.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-23 20:46-0500\n"
-"PO-Revision-Date: 2007-03-22 12:40+0100\n"
+"POT-Creation-Date: 2007-03-31 03:37+0200\n"
+"PO-Revision-Date: 2007-03-31 04:00+0100\n"
 "Last-Translator: Giovanni Scafora <linuxmania@gmail.com>\n"
 "Language-Team: Arch Linux Italian Team <linuxmania@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -434,7 +434,7 @@ msgstr ""
 #: src/pacman/pacman.c:127
 #, c-format
 msgid "                       required by any package\n"
-msgstr "                       più richiesti da nessun pacchetto\n"
+msgstr "                       ma non più richiesti da alcun pacchetto\n"
 
 #: src/pacman/pacman.c:128 src/pacman/pacman.c:143
 #, c-format
@@ -887,11 +887,6 @@ msgstr ":: Aggiornare pacman adesso? [Y/n] "
 msgid "pacman: %s\n"
 msgstr "pacman: %s\n"
 
-#: src/pacman/sync.c:557
-#, c-format
-msgid "'%s': %s\n"
-msgstr "'%s': %s\n"
-
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
 msgstr ":: Installare l'intero contenuto? [Y/n] "
@@ -1091,6 +1086,9 @@ msgstr ""
 msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Dimensione totale dei pacchetti installati:   %.2f MB\n"
 
+#~ msgid "'%s': %s\n"
+#~ msgstr "'%s': %s\n"
+
 #~ msgid "is required by"
 #~ msgstr "è richiesto da"
 

src/pacman/po/ru_RU.po

@@ -1,5 +1,5 @@
 # Pacman Russian Translation
-# Copyright (C) YEAR Judd Vinet <jvinet@zeroflux.org>
+# Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package.
 # Vladimir Bayrakovskiy <4rayven@gmail.com>, 2007
 #
@@ -7,12 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2007-03-23 20:46-0500\n"
+"POT-Creation-Date: 2007-03-25 17:41+0600\n"
 "PO-Revision-Date: 2007-03-07 11:45-0500\n"
 "Last-Translator: Vladimir Bayrakovskiy <4rayven@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"
 
 #: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482
 #: src/pacman/sync.c:531
@@ -31,7 +34,7 @@ msgstr "чтение информации о пакете... "
 #: src/pacman/add.c:83
 #, c-format
 msgid "failed to add target '%s' (%s)"
-msgstr ""
+msgstr "не удалось добавить цель '%s' (%s)"
 
 #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73
 #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105
@@ -115,11 +118,11 @@ msgstr "функция"
 
 #: src/pacman/log.c:194
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: src/pacman/log.c:194
 msgid "YES"
-msgstr ""
+msgstr "YES"
 
 #: src/pacman/log.h:30
 msgid "error: "
@@ -131,7 +134,7 @@ msgstr "предупреждение: "
 
 #: src/pacman/package.c:60
 msgid "Explicitly installed"
-msgstr "Неявно установлен"
+msgstr "Явно установлен"
 
 #: src/pacman/package.c:63
 msgid "Installed as a dependency for another package"
@@ -170,7 +173,7 @@ msgstr "Группы                  :"
 
 #: src/pacman/package.c:78 src/pacman/package.c:130
 msgid "Provides       :"
-msgstr "Обеспечивает            :"
+msgstr "Предоставляет           :"
 
 #: src/pacman/package.c:79 src/pacman/package.c:131
 msgid "Depends On     :"
@@ -230,11 +233,11 @@ msgstr "Скрипт при установке    : %s\n"
 
 #: src/pacman/package.c:96
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
 #: src/pacman/package.c:96
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: src/pacman/package.c:126
 #, c-format
@@ -303,37 +306,37 @@ msgstr "использование:  %s {-h --help}\n"
 #: src/pacman/pacman.c:91
 #, c-format
 msgid "        %s {-V --version}\n"
-msgstr ""
+msgstr "        %s {-V --version}\n"
 
 #: src/pacman/pacman.c:92
 #, c-format
 msgid "        %s {-A --add}     [options] <file>\n"
-msgstr "        %s {-A --add}     [опции] <файл>\n"
+msgstr "        %s {-A --add}     [параметры] <файл>\n"
 
 #: src/pacman/pacman.c:93
 #, c-format
 msgid "        %s {-F --freshen} [options] <file>\n"
-msgstr "        %s {-F --freshen} [опции] <файл>\n"
+msgstr "        %s {-F --freshen} [параметры] <файл>\n"
 
 #: src/pacman/pacman.c:94
 #, c-format
 msgid "        %s {-Q --query}   [options] [package]\n"
-msgstr "        %s {-Q --query}   [опции] [пакет]\n"
+msgstr "        %s {-Q --query}   [параметры] [пакет]\n"
 
 #: src/pacman/pacman.c:95
 #, c-format
 msgid "        %s {-R --remove}  [options] <package>\n"
-msgstr "        %s {-R --remove}  [опции] <пакет>\n"
+msgstr "        %s {-R --remove}  [параметры] <пакет>\n"
 
 #: src/pacman/pacman.c:96
 #, c-format
 msgid "        %s {-S --sync}    [options] [package]\n"
-msgstr "        %s {-S --sync}    [опции] [пакет]\n"
+msgstr "        %s {-S --sync}    [параметры] [пакет]\n"
 
 #: src/pacman/pacman.c:97
 #, c-format
 msgid "        %s {-U --upgrade} [options] <file>\n"
-msgstr "        %s {-U --upgrade} [опции] <файл>\n"
+msgstr "        %s {-U --upgrade} [параметры] <файл>\n"
 
 #: src/pacman/pacman.c:98
 #, c-format
@@ -348,13 +351,13 @@ msgstr ""
 #: src/pacman/pacman.c:101
 #, c-format
 msgid "usage:  %s {-A --add} [options] <file>\n"
-msgstr "использование:  %s {-A --add} [опции] <файл>\n"
+msgstr "использование:  %s {-A --add} [параметры] <файл>\n"
 
 #: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119
 #: src/pacman/pacman.c:124 src/pacman/pacman.c:138
 #, c-format
 msgid "options:\n"
-msgstr "опции:\n"
+msgstr "параметры:\n"
 
 #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120
 #: src/pacman/pacman.c:140
@@ -372,7 +375,7 @@ msgstr ""
 #: src/pacman/pacman.c:106
 #, c-format
 msgid "usage:  %s {-R --remove} [options] <package>\n"
-msgstr "использование:  %s {-R --remove} [опции] <пакет>\n"
+msgstr "использование:  %s {-R --remove} [параметры] <пакет>\n"
 
 #: src/pacman/pacman.c:108
 #, c-format
@@ -404,17 +407,17 @@ msgstr ""
 #: src/pacman/pacman.c:115
 #, c-format
 msgid "usage:  %s {-F --freshen} [options] <file>\n"
-msgstr "использование:  %s {-F --freshen} [опции] <файл>\n"
+msgstr "использование:  %s {-F --freshen} [параметры] <файл>\n"
 
 #: src/pacman/pacman.c:117
 #, c-format
 msgid "usage:  %s {-U --upgrade} [options] <file>\n"
-msgstr "использование:  %s {-U --upgrade} [опции] <файл>\n"
+msgstr "использование:  %s {-U --upgrade} [параметры] <файл>\n"
 
 #: src/pacman/pacman.c:123
 #, c-format
 msgid "usage:  %s {-Q --query} [options] [package]\n"
-msgstr "использование:  %s {-Q --query} [опции] [пакет]\n"
+msgstr "использование:  %s {-Q --query} [параметры] [пакет]\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
@@ -454,7 +457,7 @@ msgstr "  -l, --list           показать содержимое запра
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr ""
-"  -m, --foreign        показать все пакеты не найденные в базе данных(s)\n"
+"  -m, --foreign        показать все пакеты не найденные в базе(ах) данных\n"
 
 #: src/pacman/pacman.c:132
 #, c-format
@@ -487,7 +490,7 @@ msgstr ""
 #: src/pacman/pacman.c:137
 #, c-format
 msgid "usage:  %s {-S --sync} [options] [package]\n"
-msgstr "использование:  %s {-S --sync} [опции] [пакет]\n"
+msgstr "использование:  %s {-S --sync} [параметры] [пакет]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
@@ -506,8 +509,7 @@ msgstr "  -e, --dependsonly    установить только зависим
 #: src/pacman/pacman.c:145
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    показать список всех пакетов в репозитории repo\n"
+msgstr "  -l, --list <repo>    показать все пакеты данного репозитория\n"
 
 #: src/pacman/pacman.c:146
 #, c-format
@@ -537,8 +539,7 @@ msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
 msgstr ""
-"  -w, --downloadonly   загрузить пакеты с сервера, но ничего не "
-"устанавливать и не обновлять\n"
+"  -w, --downloadonly   загрузить пакеты с сервера, но не устанавливать\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
@@ -553,14 +554,14 @@ msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
 msgstr ""
-"      --ignore <pkg>   игнорировать пакет при обновлении (может быть "
+"      --ignore <пакет> игнорировать пакет при обновлении (может быть "
 "использовано неоднократно)\n"
 
 #: src/pacman/pacman.c:153
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr ""
-"      --config <path>  использовать альтернативный конфигурационный файл\n"
+"      --config <путь>  использовать альтернативный конфигурационный файл\n"
 
 #: src/pacman/pacman.c:154
 #, c-format
@@ -572,7 +573,7 @@ msgstr "      --noconfirm      не спрашивать подтвержден
 msgid ""
 "      --ask <number>   pre-specify answers for questions (see manpage)\n"
 msgstr ""
-"      --ask <number>   заранее подготовленные ответы на вопросы (смотрите "
+"      --ask <число>    заранее подготовленные ответы на вопросы (смотрите "
 "man-страницу)\n"
 
 #: src/pacman/pacman.c:156
@@ -597,30 +598,30 @@ msgstr "  -v, --verbose        выводить больше информаци
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
 msgstr ""
-"  -r, --root <path>    указать алтернативную корневую директорию для "
+"  -r, --root <путь>    указать альтернативную корневую директорию для "
 "установки\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
 msgstr ""
-"  -b, --dbpath <path>  указать альтернативное расположение базы данных\n"
+"  -b, --dbpath <путь>  указать альтернативное расположение базы данных\n"
 
 #: src/pacman/pacman.c:161
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <директория> указать альтернативное расположение кэша\n"
+msgstr "      --cachedir <dir> указать альтернативное расположение кэша\n"
 
 #: src/pacman/pacman.c:174
 #, c-format
 msgid "                       This program may be freely redistributed under\n"
 msgstr ""
+"                       This program may be freely redistributed under\n"
 
 #: src/pacman/pacman.c:175
 #, c-format
 msgid "                       the terms of the GNU General Public License\n"
-msgstr ""
+msgstr "                       the terms of the GNU General Public License\n"
 
 #: src/pacman/pacman.c:300
 #, c-format
@@ -640,7 +641,7 @@ msgstr "'%s' неправильно указан путь к базе данны
 #: src/pacman/pacman.c:363
 #, c-format
 msgid "'%s' is not a valid root path\n"
-msgstr "'%s' не является верным корневым каталогом\n"
+msgstr "некорректный корневой каталог: '%s'\n"
 
 #: src/pacman/pacman.c:390
 msgid "only one operation may be used at a time\n"
@@ -648,7 +649,7 @@ msgstr "одновременно может выполняться только
 
 #: src/pacman/pacman.c:436
 msgid "warning: current locale is invalid; using default \"C\" locale"
-msgstr ""
+msgstr "warning: current locale is invalid; using default \"C\" locale"
 
 #: src/pacman/pacman.c:456
 #, c-format
@@ -657,12 +658,13 @@ msgstr "не удалось инициализировать библиотек
 
 #: src/pacman/pacman.c:489
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "Вы не можете выполнить эту операцию если вы не root.\n"
+msgstr ""
+"Вы не можете выполнить эту операцию не являясь суперпользователем (root).\n"
 
 #: src/pacman/pacman.c:505
 #, c-format
 msgid "failed to parse config (%s)\n"
-msgstr "не удалось разобрать конфигурационный файл (%s)\n"
+msgstr "не удалось обработать конфигурационный файл (%s)\n"
 
 #: src/pacman/pacman.c:516
 msgid "Targets  :"
@@ -671,15 +673,15 @@ msgstr "Цели     :"
 #: src/pacman/pacman.c:522
 #, c-format
 msgid "could not register 'local' database (%s)\n"
-msgstr "не могу зарегистрировать 'локальную' базу данных (%s)\n"
+msgstr "не могу зарегистрировать локальную базу данных (%s)\n"
 
 #: src/pacman/pacman.c:529
 msgid "no targets specified (use -h for help)\n"
-msgstr "не задано целей (для помощи используйте -h)\n"
+msgstr "не задано целей (для справки используйте -h)\n"
 
 #: src/pacman/pacman.c:542
 msgid "no operation specified (use -h for help)\n"
-msgstr "не указаны конкретные операции (для помощи используйте -h)\n"
+msgstr "не задана операция (для справки используйте -h)\n"
 
 #: src/pacman/query.c:90
 msgid "no file was specified for --owns\n"
@@ -692,12 +694,12 @@ msgstr "не удалось прочитать файл '%s': %s"
 
 #: src/pacman/query.c:100
 msgid "cannot determine ownership of a directory"
-msgstr "не удается определить владельца директории"
+msgstr "не удалось определить владельца каталога"
 
 #: src/pacman/query.c:105
 #, c-format
 msgid "cannot determine real path for '%s': %s"
-msgstr ""
+msgstr "не удалось определить настоящий путь для '%s': %s"
 
 #: src/pacman/query.c:119
 #, c-format
@@ -728,7 +730,7 @@ msgstr "группа \"%s\" не найдена\n"
 
 #: src/pacman/query.c:232
 msgid "no package file was specified for --file\n"
-msgstr "не указан файл пакета для опции --file\n"
+msgstr "не указан файл пакета для параметра --file\n"
 
 #: src/pacman/query.c:236
 #, c-format
@@ -850,7 +852,7 @@ msgstr ":: Синхронизирую базу данных пакетов...\n"
 
 #: src/pacman/sync.c:491
 msgid "synchronizing package lists"
-msgstr "синхронизирую список пакетов"
+msgstr "синхронизирую списки пакетов"
 
 #: src/pacman/sync.c:493
 msgid "failed to synchronize any databases"
@@ -882,17 +884,17 @@ msgstr ":: после чего перезапустить операцию с и
 
 #: src/pacman/sync.c:522
 msgid ":: Upgrade pacman first? [Y/n] "
-msgstr ":: Сначала обновить pacman? [Y/n] "
+msgstr ":: Обновить pacman в первую очередь? [Y/n] "
 
 #: src/pacman/sync.c:537
 #, c-format
 msgid "pacman: %s\n"
-msgstr ""
+msgstr "pacman: %s\n"
 
 #: src/pacman/sync.c:557
 #, c-format
 msgid "'%s': %s\n"
-msgstr ""
+msgstr "'%s': %s\n"
 
 #: src/pacman/sync.c:572
 msgid ":: Install whole content? [Y/n] "
@@ -906,7 +908,7 @@ msgstr ":: Установить %s из группы %s? [Y/n] "
 #: src/pacman/sync.c:603
 #, c-format
 msgid "'%s': not found in sync db\n"
-msgstr "'%s': не найдено в базе данных\n"
+msgstr "'%s': не найдено в базе пакетов\n"
 
 #: src/pacman/sync.c:621
 msgid "requires"

src/pacman/sync.c

@@ -554,7 +554,7 @@ int pacman_sync(alpm_list_t *targets)
 					continue;
 				}
 				if(pm_errno != PM_ERR_PKG_NOT_FOUND) {
-					ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno));
+					ERR(NL, "'%s': %s\n", (char *)i->data, alpm_strerror(pm_errno));
 					retval = 1;
 					goto cleanup;
 				}