summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-04-07 11:23:55 -0500
committerDan McGee <dan@archlinux.org>2012-04-07 11:23:55 -0500
commit4ca6590af58177964910588a6d0406f0d009bd0e (patch)
tree3ff2d0d07aa5bd38f13e9456c5f831bdef06b8e2 /lib
parent3f1ea8b62f46a915c94a5b46e21ad39ea2628f65 (diff)
parentb752561a52a88f8e9cc3bcc9c2079eb685245110 (diff)
downloadpacman-4ca6590af58177964910588a6d0406f0d009bd0e.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/signing.c lib/libalpm/sync.c
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/po/ca.po6
-rw-r--r--lib/libalpm/po/cs.po6
-rw-r--r--lib/libalpm/po/da.po93
-rw-r--r--lib/libalpm/po/de.po6
-rw-r--r--lib/libalpm/po/el.po6
-rw-r--r--lib/libalpm/po/en_GB.po4
-rw-r--r--lib/libalpm/po/es.po4
-rw-r--r--lib/libalpm/po/fi.po6
-rw-r--r--lib/libalpm/po/fr.po4
-rw-r--r--lib/libalpm/po/hu.po6
-rw-r--r--lib/libalpm/po/it.po2
-rw-r--r--lib/libalpm/po/kk.po6
-rw-r--r--lib/libalpm/po/libalpm.pot4
-rw-r--r--lib/libalpm/po/lt.po4
-rw-r--r--lib/libalpm/po/nb.po6
-rw-r--r--lib/libalpm/po/pl.po6
-rw-r--r--lib/libalpm/po/pt.po6
-rw-r--r--lib/libalpm/po/pt_BR.po11
-rw-r--r--lib/libalpm/po/ro.po6
-rw-r--r--lib/libalpm/po/ru.po4
-rw-r--r--lib/libalpm/po/sk.po4
-rw-r--r--lib/libalpm/po/sr.po6
-rw-r--r--lib/libalpm/po/sr@latin.po6
-rw-r--r--lib/libalpm/po/sv.po6
-rw-r--r--lib/libalpm/po/tr.po6
-rw-r--r--lib/libalpm/po/uk.po6
-rw-r--r--lib/libalpm/po/zh_CN.po6
-rw-r--r--lib/libalpm/po/zh_TW.po6
-rw-r--r--lib/libalpm/signing.c15
-rw-r--r--lib/libalpm/sync.c2
30 files changed, 135 insertions, 124 deletions
diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po
index b56bd5d5..0fdb1b12 100644
--- a/lib/libalpm/po/ca.po
+++ b/lib/libalpm/po/ca.po
@@ -10,11 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-11 14:03+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/ca/)\n"
+"language/ca/)\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po
index c8e22b73..5bd9e69e 100644
--- a/lib/libalpm/po/cs.po
+++ b/lib/libalpm/po/cs.po
@@ -11,11 +11,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-15 08:43+0000\n"
-"Last-Translator: vogo <vojtech.gondzala@gmail.com>\n"
+"Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/cs/)\n"
+"language/cs/)\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/da.po b/lib/libalpm/po/da.po
index 5e899b8f..72bdb43e 100644
--- a/lib/libalpm/po/da.po
+++ b/lib/libalpm/po/da.po
@@ -3,16 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <jakob.wadsager@gmail.com>, 2012.
# Joe Hansen <joedalton2@yahoo.dk>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
-"PO-Revision-Date: 2011-10-06 03:39+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"PO-Revision-Date: 2012-04-01 12:21+0000\n"
+"Last-Translator: jakobw <jakob.wadsager@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/da/)\n"
+"language/da/)\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -33,11 +34,11 @@ msgstr "nedgraderer pakke %s (%s => %s)\n"
#, c-format
msgid "warning given when extracting %s (%s)\n"
-msgstr ""
+msgstr "advarsel givet under udpakning %s (%s)\n"
#, c-format
msgid "could not extract %s (%s)\n"
-msgstr "kunne ikke udtrække %s (%s)\n"
+msgstr "kunne ikke udpakke %s (%s)\n"
#, c-format
msgid ""
@@ -53,7 +54,7 @@ msgstr "udtræk: overskriver ikke mappe med fil %s\n"
#, c-format
msgid "extract: symlink %s does not point to dir\n"
-msgstr "udtræk: symbolsk henvisning %s peger ikke på mappe\n"
+msgstr "udtræk: symlink %s peger ikke på mappe\n"
#, c-format
msgid "could not rename %s to %s (%s)\n"
@@ -73,11 +74,11 @@ msgstr "%s installeret som %s\n"
#, c-format
msgid "extracting %s as %s.pacnew\n"
-msgstr "udtrækker %s som %s.pacnew\n"
+msgstr "udpakker %s som %s.pacnew\n"
#, c-format
msgid "could not get current working directory\n"
-msgstr "kunne ikke hente aktuelt arbejdsmappe\n"
+msgstr "kunne ikke hente nuværende arbejdsmappe\n"
#, c-format
msgid "could not change directory to %s (%s)\n"
@@ -85,7 +86,7 @@ msgstr "kunne ikke ændre mappe til %s (%s)\n"
#, c-format
msgid "could not restore working directory (%s)\n"
-msgstr ""
+msgstr "kunne ikke genskabe arbejdsmappe (%s)\n"
#, c-format
msgid "problem occurred while upgrading %s\n"
@@ -101,7 +102,7 @@ msgstr "kunne ikke opdatere databasepunkt %s-%s\n"
#, c-format
msgid "could not add entry '%s' in cache\n"
-msgstr "kunne ikke tilføje punkt »%s« i mellemlager\n"
+msgstr "kunne ikke tilføje punkt '%s' i cache\n"
#, c-format
msgid "removing invalid database: %s\n"
@@ -109,15 +110,15 @@ msgstr "fjerner ugyldig database: %s\n"
#, c-format
msgid "invalid name for database entry '%s'\n"
-msgstr "ugyldigt navn for databasepunkt »%s«\n"
+msgstr "ugyldigt navn for databasepunkt '%s'\n"
#, c-format
msgid "duplicated database entry '%s'\n"
-msgstr "duplikeret databasepunkt »%s«\n"
+msgstr "duplikeret databasepunkt '%s'\n"
#, c-format
msgid "corrupted database entry '%s'\n"
-msgstr "ødelagt databasepunkt »%s«\n"
+msgstr "beskadiget databasepunkt '%s'\n"
#, c-format
msgid "could not open file %s: %s\n"
@@ -157,7 +158,7 @@ msgstr "manglende pakkemetadata i %s\n"
#, c-format
msgid "removing invalid file: %s\n"
-msgstr ""
+msgstr "fjerner ugyldig fil: %s\n"
#, c-format
msgid "could not remove lock file %s\n"
@@ -165,7 +166,7 @@ msgstr "kunne ikke fjerne låsningsfil %s\n"
#, c-format
msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
+msgstr "kunne ikke fortolke pakkebeskrivelsesfil '%s' fra db '%s'\n"
#, c-format
msgid "database path is undefined\n"
@@ -189,35 +190,35 @@ msgstr "ignorerer pakke %s-%s\n"
#, c-format
msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "kan ikke læse »%s«, en afhængighed af »%s«\n"
+msgstr "kan ikke læse '%s', en afhængighed af '%s'\n"
#, c-format
msgid "could not get filesystem information\n"
-msgstr ""
+msgstr "kunne ikke hente filsysteminformation\n"
#, c-format
msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
+msgstr "kunne ikke hente filsysteminformation for %s: %s\n"
#, c-format
msgid "could not determine mount point for file %s\n"
-msgstr ""
+msgstr "kunne ikke bestemme monteringspunkt for fil %s\n"
#, c-format
msgid "could not determine filesystem mount points\n"
-msgstr ""
+msgstr "kunne ikke bestemme monteringspunkter for filsystem\n"
#, c-format
msgid "could not determine root mount point %s\n"
-msgstr ""
+msgstr "kunne ikke bestemme rodmonteringspunkt %s\n"
#, c-format
msgid "Partition %s is mounted read only\n"
-msgstr ""
+msgstr "Partition %s er monteret som læs-kun\n"
#, c-format
msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n"
-msgstr ""
+msgstr "Partition %s for fuld: %jd blokke nødvendig(e), %jd blokke fri(e)\n"
#, c-format
msgid "disk"
@@ -225,15 +226,15 @@ msgstr "disk"
#, c-format
msgid "failed to create temporary file for download\n"
-msgstr ""
+msgstr "kunne ikke oprette midlertidig fil til hentning\n"
#, c-format
msgid "url '%s' is invalid\n"
-msgstr "adressen »%s« er ugyldig\n"
+msgstr "adressen '%s' er ugyldig\n"
#, c-format
msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "fejlede i indhentning af fil »%s« fra %s: %s\n"
+msgstr "fejlede i indhentning af fil '%s' fra %s: %s\n"
#, c-format
msgid "%s appears to be truncated: %jd/%jd bytes\n"
@@ -269,7 +270,7 @@ msgstr "forkert eller NULL-argument vidersendt"
#, c-format
msgid "not enough free disk space"
-msgstr ""
+msgstr "ikke nok fri diskplads"
#, c-format
msgid "library not initialized"
@@ -305,15 +306,15 @@ msgstr "kunne ikke finde database"
#, c-format
msgid "invalid or corrupted database"
-msgstr ""
+msgstr "ugyldig eller beskadiget database"
#, c-format
msgid "invalid or corrupted database (PGP signature)"
-msgstr ""
+msgstr "ugyldig eller beskadiget database (PGP-signatur)"
#, c-format
msgid "database is incorrect version"
-msgstr ""
+msgstr "version af database er ukorrekt"
#, c-format
msgid "could not update database"
@@ -369,15 +370,15 @@ msgstr "handling afbrudt på grund af igonrepkg"
#, c-format
msgid "invalid or corrupted package"
-msgstr ""
+msgstr "ugyldig eller beskadiget pakke"
#, c-format
msgid "invalid or corrupted package (checksum)"
-msgstr ""
+msgstr "ugyldig eller beskadiget database (kontrolsum)"
#, c-format
msgid "invalid or corrupted package (PGP signature)"
-msgstr ""
+msgstr "ugyldig eller beskadiget pakke (PGP-signatur)"
#, c-format
msgid "cannot open package file"
@@ -401,11 +402,11 @@ msgstr "kunne ikke finde arkiv for mål"
#, c-format
msgid "missing PGP signature"
-msgstr ""
+msgstr "manglende PGP-signatur"
#, c-format
msgid "invalid PGP signature"
-msgstr ""
+msgstr "ugyldig PGP-signatur"
#, c-format
msgid "invalid or corrupted delta"
@@ -445,7 +446,7 @@ msgstr "hent biblioteksfejl"
#, c-format
msgid "gpgme error"
-msgstr ""
+msgstr "gpgme fejl"
#, c-format
msgid "error invoking external downloader"
@@ -457,7 +458,7 @@ msgstr "uventet fejl"
#, c-format
msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
+msgstr "kunne ikke fuldt indlæse metadata for pakke %s-%s\n"
#, c-format
msgid "could not find %s in database -- skipping\n"
@@ -473,7 +474,7 @@ msgstr "kan ikke fjerne fil »%s«:%s\n"
#, c-format
msgid "cannot remove %s (%s)\n"
-msgstr ""
+msgstr "kan ikke fjerne %s (%s)\n"
#, c-format
msgid "could not remove database entry %s-%s\n"
@@ -481,7 +482,7 @@ msgstr "kunne ikke fjerne databasepunkt %s-%s\n"
#, c-format
msgid "could not remove entry '%s' from cache\n"
-msgstr "kunne ikke fjerne punkt '%s' fra mellemlager\n"
+msgstr "kunne ikke fjerne punkt '%s' fra cache\n"
#, c-format
msgid "%s: ignoring package upgrade (%s => %s)\n"
@@ -537,7 +538,7 @@ msgstr "kunne ikke kopier midlertidig fil til %s (%s)\n"
#, c-format
msgid "could not remove %s\n"
-msgstr ""
+msgstr "kunne ikke slette %s\n"
#, c-format
msgid "could not remove tmpdir %s\n"
@@ -545,7 +546,7 @@ msgstr "kunne ikke fjerne tmpdir %s\n"
#, c-format
msgid "could not create pipe (%s)\n"
-msgstr ""
+msgstr "kunne ikke oprette pipe (%s)\n"
#, c-format
msgid "could not fork a new process (%s)\n"
@@ -557,7 +558,7 @@ msgstr "kunne ikke ændre rodmappen (%s)\n"
#, c-format
msgid "call to execv failed (%s)\n"
-msgstr ""
+msgstr "kald til execv fejlede (%s)\n"
#, c-format
msgid "call to waitpid failed (%s)\n"
@@ -565,7 +566,7 @@ msgstr "kald til waitpid fejlede (%s)\n"
#, c-format
msgid "could not open pipe (%s)\n"
-msgstr ""
+msgstr "kunne ikke åbne pipe (%s)\n"
#, c-format
msgid "command failed to execute correctly\n"
@@ -573,8 +574,8 @@ msgstr "kommando kunne ikke udføres korrekt\n"
#, c-format
msgid "no %s cache exists, creating...\n"
-msgstr "intet %s-mellemlager findes, opretter...\n"
+msgstr "ingen %s-cache findes, opretter...\n"
#, c-format
msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
+msgstr "kunne ikke finde eller oprette pakke-cache, bruger i stedet %s\n"
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 8673dab4..075f5235 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -9,11 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-07 09:26+0000\n"
-"Last-Translator: tlaloc <matthias@archlinux.de>\n"
+"Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
"Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/de/)\n"
+"language/de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po
index 87fba486..aaf16937 100644
--- a/lib/libalpm/po/el.po
+++ b/lib/libalpm/po/el.po
@@ -10,11 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-06 10:43+0000\n"
-"Last-Translator: nous <nous@archlinux.us>\n"
+"Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
"Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/el/)\n"
+"language/el/)\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index ec7c8bb8..8fca5af2 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-06 03:57+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: en_GB\n"
"MIME-Version: 1.0\n"
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index c19a6c24..e5ee820a 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -12,11 +12,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-06 16:10+0000\n"
"Last-Translator: juantascon <juantascon@gmail.com>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/es/)\n"
+"archlinux-pacman/language/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po
index 4bf99919..c5c1f7ba 100644
--- a/lib/libalpm/po/fi.po
+++ b/lib/libalpm/po/fi.po
@@ -13,11 +13,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-07 18:48+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
"Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/fi/)\n"
+"language/fi/)\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index c8163366..14405143 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -11,11 +11,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2012-02-06 20:08+0000\n"
"Last-Translator: jiehong <ma.jiehong@gmail.com>\n"
"Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/fr/)\n"
+"language/fr/)\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index eb3ac989..f67e8ac4 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -9,11 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-08 10:04+0000\n"
-"Last-Translator: Citybusz <ballogy@freestart.hu>\n"
+"Last-Translator: György Balló <ballogy@freestart.hu>\n"
"Language-Team: Hungarian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/team/hu/)\n"
+"pacman/language/hu/)\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index b3d0c06c..9673169b 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-02-23 10:28-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2012-02-16 15:25+0000\n"
"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/archlinux-pacman/"
diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po
index 43303702..a238e532 100644
--- a/lib/libalpm/po/kk.po
+++ b/lib/libalpm/po/kk.po
@@ -9,11 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-06 03:39+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
"Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/kk/)\n"
+"language/kk/)\n"
"Language: kk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index f9de07e9..2df42cb5 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: pacman 4.0.1\n"
+"Project-Id-Version: pacman 4.0.2\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/libalpm/po/lt.po b/lib/libalpm/po/lt.po
index 7bbbd14c..0dcf6f9c 100644
--- a/lib/libalpm/po/lt.po
+++ b/lib/libalpm/po/lt.po
@@ -10,11 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2012-02-05 07:37+0000\n"
"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
"Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/team/lt/)\n"
+"pacman/language/lt/)\n"
"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po
index 34784764..f600acec 100644
--- a/lib/libalpm/po/nb.po
+++ b/lib/libalpm/po/nb.po
@@ -9,11 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-14 16:36+0000\n"
-"Last-Translator: xyproto <rodseth@gmail.com>\n"
+"Last-Translator: Alexander Rødseth <rodseth@gmail.com>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/nb/)\n"
+"archlinux-pacman/language/nb/)\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index fc7f3dc9..36c85ede 100644
--- a/lib/libalpm/po/pl.po
+++ b/lib/libalpm/po/pl.po
@@ -8,11 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-08 09:10+0000\n"
-"Last-Translator: Barthalion <barthalion@gmail.com>\n"
+"Last-Translator: Bartek Piotrowski <barthalion@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/pl/)\n"
+"language/pl/)\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/pt.po b/lib/libalpm/po/pt.po
index 92388600..0c6aa676 100644
--- a/lib/libalpm/po/pt.po
+++ b/lib/libalpm/po/pt.po
@@ -8,11 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-12 13:05+0000\n"
-"Last-Translator: ArchGalileu <omeuviolino@gmail.com>\n"
+"Last-Translator: Gaspar Santos <omeuviolino@gmail.com>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/archlinux-"
-"pacman/team/pt/)\n"
+"pacman/language/pt/)\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 2f12f268..677a6f1a 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -5,17 +5,18 @@
# Translators:
# ambaratti <ambaratti.listas@gmail.com>, 2011.
# Dan McGee <dpmcgee@gmail.com>, 2011.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012.
# Rafael <rafael.f.f1@gmail.com>, 2011.
# Sandro <sandrossv@hotmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
-"PO-Revision-Date: 2011-10-06 03:50+0000\n"
-"Last-Translator: rafaelff1 <rafael.f.f1@gmail.com>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/pt_BR/)\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"PO-Revision-Date: 2012-02-27 22:06+0000\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
+"archlinux-pacman/language/pt_BR/)\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po
index 1294a516..50d741dd 100644
--- a/lib/libalpm/po/ro.po
+++ b/lib/libalpm/po/ro.po
@@ -11,11 +11,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-06 17:25+0000\n"
-"Last-Translator: z0id <mihai@m1x.ro>\n"
+"Last-Translator: Mihai Coman <mihai@m1x.ro>\n"
"Language-Team: Romanian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/team/ro/)\n"
+"pacman/language/ro/)\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index 1f6d224b..b99568bc 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@@ -11,11 +11,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2012-01-17 16:22+0000\n"
"Last-Translator: partizan <serg.partizan@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/ru/)\n"
+"language/ru/)\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/sk.po b/lib/libalpm/po/sk.po
index 21cd37e6..bf51e384 100644
--- a/lib/libalpm/po/sk.po
+++ b/lib/libalpm/po/sk.po
@@ -10,11 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-08 19:38+0000\n"
"Last-Translator: jose1711 <jose1711@gmail.com>\n"
"Language-Team: Slovak (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/sk/)\n"
+"language/sk/)\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/sr.po b/lib/libalpm/po/sr.po
index a5177cdc..1bcb0b9e 100644
--- a/lib/libalpm/po/sr.po
+++ b/lib/libalpm/po/sr.po
@@ -8,11 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-11 17:15+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
"Language-Team: Serbian (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/sr/)\n"
+"language/sr/)\n"
"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/sr@latin.po b/lib/libalpm/po/sr@latin.po
index 424e2c6f..843bd00d 100644
--- a/lib/libalpm/po/sr@latin.po
+++ b/lib/libalpm/po/sr@latin.po
@@ -8,11 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-12 15:08+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/sr@latin/)\n"
+"archlinux-pacman/language/sr@latin/)\n"
"Language: sr@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po
index 762b7fd6..782d3c6b 100644
--- a/lib/libalpm/po/sv.po
+++ b/lib/libalpm/po/sv.po
@@ -8,11 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-11-15 15:42+0000\n"
-"Last-Translator: Gazpachian <f.halldal@gmail.com>\n"
+"Last-Translator: Fredrik Halldal <f.halldal@gmail.com>\n"
"Language-Team: Swedish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/sv/)\n"
+"language/sv/)\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po
index 681b9438..32174a85 100644
--- a/lib/libalpm/po/tr.po
+++ b/lib/libalpm/po/tr.po
@@ -10,11 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-23 09:34+0000\n"
-"Last-Translator: tarakbumba <tarakbumba@gmail.com>\n"
+"Last-Translator: Atilla Öntaş <tarakbumba@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/tr/)\n"
+"language/tr/)\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po
index 9e02be3b..25831719 100644
--- a/lib/libalpm/po/uk.po
+++ b/lib/libalpm/po/uk.po
@@ -9,11 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-10 20:43+0000\n"
-"Last-Translator: Wiseacre <ted.korostiled@gmail.com>\n"
+"Last-Translator: Данило Коростіль <ted.korostiled@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.net/projects/p/archlinux-"
-"pacman/team/uk/)\n"
+"pacman/language/uk/)\n"
"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index d1c0fdc4..e2093a6f 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -10,11 +10,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-11-15 02:39+0000\n"
-"Last-Translator: ganlu <rhythm.gan@gmail.com>\n"
+"Last-Translator: 甘 露 <rhythm.gan@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/zh_CN/)\n"
+"archlinux-pacman/language/zh_CN/)\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/po/zh_TW.po b/lib/libalpm/po/zh_TW.po
index 30a3af8a..059d12c6 100644
--- a/lib/libalpm/po/zh_TW.po
+++ b/lib/libalpm/po/zh_TW.po
@@ -8,11 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
"PO-Revision-Date: 2011-10-06 03:39+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/zh_TW/)\n"
+"archlinux-pacman/language/zh_TW/)\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index cfe0f5e8..018b1cca 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -232,6 +232,14 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
gpgme_keylist_mode_t mode;
gpgme_key_t key;
int ret = -1;
+ size_t fpr_len;
+ char *full_fpr;
+
+ /* gpg2 goes full retard here. For key searches ONLY, we need to prefix the
+ * key fingerprint with 0x, or the lookup will fail. */
+ fpr_len = strlen(fpr);
+ MALLOC(full_fpr, fpr_len + 3, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
+ sprintf(full_fpr, "0x%s", fpr);
memset(&ctx, 0, sizeof(ctx));
err = gpgme_new(&ctx);
@@ -246,14 +254,14 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
_alpm_log(handle, ALPM_LOG_DEBUG, "looking up key %s remotely\n", fpr);
- err = gpgme_get_key(ctx, fpr, &key, 0);
+ err = gpgme_get_key(ctx, full_fpr, &key, 0);
if(gpg_err_code(err) == GPG_ERR_EOF) {
_alpm_log(handle, ALPM_LOG_DEBUG, "key lookup failed, unknown key\n");
/* Try an alternate lookup using the 8 character fingerprint value, since
* busted-ass keyservers can't support lookups using subkeys with the full
* value as of now. This is why 2012 is not the year of PGP encryption. */
- if(strlen(fpr) > 8) {
- const char *short_fpr = fpr + strlen(fpr) - 8;
+ if(fpr_len > 8) {
+ const char *short_fpr = memcpy(&full_fpr[fpr_len - 8], "0x", 2);
_alpm_log(handle, ALPM_LOG_DEBUG,
"looking up key %s remotely\n", short_fpr);
err = gpgme_get_key(ctx, short_fpr, &key, 0);
@@ -310,6 +318,7 @@ error:
if(ret != 1) {
_alpm_log(handle, ALPM_LOG_DEBUG, "gpg error: %s\n", gpgme_strerror(err));
}
+ free(full_fpr);
gpgme_release(ctx);
return ret;
}
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index ab7fe319..b43a61b7 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -880,7 +880,7 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay
return 0;
}
- free(payload->fileurl);
+ FREE(payload->fileurl);
payload->unlink_on_fail = 0;
}