From fcf0a8b20328c57996ff61247d5ff4b13356f72a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 Nov 2011 21:55:52 -0600 Subject: Updates in preparation for 4.0.1 release Bump the version, update the translation template files, and fill in NEWS with relevant commits and changes since 4.0.0. Signed-off-by: Dan McGee --- lib/libalpm/po/libalpm.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index a3de0732..f9de07e9 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.0rc2\n" +"Project-Id-Version: pacman 4.0.1\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3-24-g4f1b From c0ce10397a8ef4811cdde6f727a3fdd3890e8a5d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 13 Nov 2011 22:16:08 -0600 Subject: Update translations from Transifex Signed-off-by: Dan McGee --- lib/libalpm/po/ca.po | 2 +- lib/libalpm/po/cs.po | 17 ++--- lib/libalpm/po/da.po | 8 +-- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/el.po | 2 +- lib/libalpm/po/en_GB.po | 2 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fi.po | 2 +- lib/libalpm/po/fr.po | 2 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 8 +-- lib/libalpm/po/lt.po | 4 +- lib/libalpm/po/nb.po | 173 +++++++++++++++++++++++---------------------- lib/libalpm/po/pl.po | 2 +- lib/libalpm/po/pt.po | 2 +- lib/libalpm/po/pt_BR.po | 8 +-- lib/libalpm/po/ro.po | 2 +- lib/libalpm/po/ru.po | 8 +-- lib/libalpm/po/sk.po | 2 +- lib/libalpm/po/sr.po | 2 +- lib/libalpm/po/sr@latin.po | 2 +- lib/libalpm/po/sv.po | 8 +-- lib/libalpm/po/tr.po | 8 +-- lib/libalpm/po/uk.po | 2 +- lib/libalpm/po/zh_CN.po | 2 +- lib/libalpm/po/zh_TW.po | 8 +-- 27 files changed, 144 insertions(+), 140 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po index 95a62bf6..b56bd5d5 100644 --- a/lib/libalpm/po/ca.po +++ b/lib/libalpm/po/ca.po @@ -10,7 +10,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-11 14:03+0000\n" "Last-Translator: toofishes \n" "Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po index cc2855d1..c8e22b73 100644 --- a/lib/libalpm/po/cs.po +++ b/lib/libalpm/po/cs.po @@ -11,9 +11,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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-10-08 09:20+0000\n" -"Last-Translator: mmm \n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-15 08:43+0000\n" +"Last-Translator: vogo \n" "Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/" "team/cs/)\n" "Language: cs\n" @@ -88,7 +88,7 @@ msgstr "nelze změnit adresář na %s (%s)\n" #, c-format msgid "could not restore working directory (%s)\n" -msgstr "nelze obnovit pracovní adresář ('%s')\n" +msgstr "nelze obnovit pracovní adresář (%s)\n" #, c-format msgid "problem occurred while upgrading %s\n" @@ -220,7 +220,7 @@ msgstr "Diskový oddíl %s je připojen jen pro čtení\n" #, c-format msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n" -msgstr "Oddíl '%s' je plný: je potřeba %jd bloků, ale k dispozici je jen %jd\n" +msgstr "Oddíl %s je plný: je potřeba %jd bloků, ale k dispozici je jen %jd\n" #, c-format msgid "disk" @@ -460,7 +460,7 @@ msgstr "neočekávaná chyba" #, c-format msgid "could not fully load metadata for package %s-%s\n" -msgstr "nelze pořádně načíst metadata pro balícek %s-%s\n" +msgstr "nelze zcela načíst metadata pro balíček %s-%s\n" #, c-format msgid "could not find %s in database -- skipping\n" @@ -476,7 +476,7 @@ msgstr "nelze odstranit soubor '%s': %s\n" #, c-format msgid "cannot remove %s (%s)\n" -msgstr "nelze odstranit '%s' ('%s')\n" +msgstr "nelze odstranit %s (%s)\n" #, c-format msgid "could not remove database entry %s-%s\n" @@ -581,4 +581,5 @@ msgstr "neexistuje mezipaměť %s, vytváří se...\n" #, c-format msgid "couldn't find or create package cache, using %s instead\n" msgstr "" -"nepodařilo se najít nebo vytvořit cache pro balíčky, používám místo toho %s\n" +"nepodařilo se najít nebo vytvořit mezipaměť pro balíčky, používám místo toho " +"%s\n" diff --git a/lib/libalpm/po/da.po b/lib/libalpm/po/da.po index 2b93ce9f..5e899b8f 100644 --- a/lib/libalpm/po/da.po +++ b/lib/libalpm/po/da.po @@ -8,8 +8,8 @@ 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-09-22 16:37+0000\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-06 03:39+0000\n" "Last-Translator: toofishes \n" "Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/" "team/da/)\n" @@ -535,9 +535,9 @@ msgstr "kunne ikke oprette midlertidig mappe\n" msgid "could not copy tempfile to %s (%s)\n" msgstr "kunne ikke kopier midlertidig fil til %s (%s)\n" -#, fuzzy, c-format +#, c-format msgid "could not remove %s\n" -msgstr "kunne ikke fjerne tmpdir %s\n" +msgstr "" #, c-format msgid "could not remove tmpdir %s\n" diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po index c5ed7687..8673dab4 100644 --- a/lib/libalpm/po/de.po +++ b/lib/libalpm/po/de.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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-07 09:26+0000\n" "Last-Translator: tlaloc \n" "Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po index 11a8bdca..87fba486 100644 --- a/lib/libalpm/po/el.po +++ b/lib/libalpm/po/el.po @@ -10,7 +10,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-06 10:43+0000\n" "Last-Translator: nous \n" "Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po index 65ff5240..ec7c8bb8 100644 --- a/lib/libalpm/po/en_GB.po +++ b/lib/libalpm/po/en_GB.po @@ -8,7 +8,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-06 03:57+0000\n" "Last-Translator: toofishes \n" "Language-Team: LANGUAGE \n" diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po index 3f8ec08d..c19a6c24 100644 --- a/lib/libalpm/po/es.po +++ b/lib/libalpm/po/es.po @@ -12,7 +12,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-06 16:10+0000\n" "Last-Translator: juantascon \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po index 82cd3274..4bf99919 100644 --- a/lib/libalpm/po/fi.po +++ b/lib/libalpm/po/fi.po @@ -13,7 +13,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-07 18:48+0000\n" "Last-Translator: toofishes \n" "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index a241c296..520b7286 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -11,7 +11,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-06 12:57+0000\n" "Last-Translator: magicrhesus \n" "Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index d7a821cc..eb3ac989 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-08 10:04+0000\n" "Last-Translator: Citybusz \n" "Language-Team: Hungarian (http://www.transifex.net/projects/p/archlinux-" diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po index 30e30980..329b1cf0 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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-06 15:43+0000\n" "Last-Translator: giovanni \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 c93ad56a..43303702 100644 --- a/lib/libalpm/po/kk.po +++ b/lib/libalpm/po/kk.po @@ -9,8 +9,8 @@ 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-09-22 16:37+0000\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-06 03:39+0000\n" "Last-Translator: toofishes \n" "Language-Team: Kazakh (http://www.transifex.net/projects/p/archlinux-pacman/" "team/kk/)\n" @@ -537,9 +537,9 @@ msgstr "уақытша буманы құру мүмкін емес\n" msgid "could not copy tempfile to %s (%s)\n" msgstr "уақытша файлды %s ішіне көшіру мүмкін емес (%s)\n" -#, fuzzy, c-format +#, c-format msgid "could not remove %s\n" -msgstr "%s уақытша бумасын өшіру мүмкін емес\n" +msgstr "" #, c-format msgid "could not remove tmpdir %s\n" diff --git a/lib/libalpm/po/lt.po b/lib/libalpm/po/lt.po index 33a79af7..4c57e0e3 100644 --- a/lib/libalpm/po/lt.po +++ b/lib/libalpm/po/lt.po @@ -9,9 +9,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-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-07 06:12+0000\n" -"Last-Translator: gymka_ltu \n" +"Last-Translator: gymka_ltu \n" "Language-Team: Lithuanian (http://www.transifex.net/projects/p/archlinux-" "pacman/team/lt/)\n" "Language: lt\n" diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po index 0811c2fc..34784764 100644 --- a/lib/libalpm/po/nb.po +++ b/lib/libalpm/po/nb.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Alexander Rødseth , 2011. # Jon Gjengset , 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-10-06 07:31+0000\n" -"Last-Translator: Jonhoo \n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-14 16:36+0000\n" +"Last-Translator: xyproto \n" "Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/" "archlinux-pacman/team/nb/)\n" "Language: nb\n" @@ -33,7 +34,7 @@ msgstr "nedgraderer pakke %s (%s => %s)\n" #, c-format msgid "warning given when extracting %s (%s)\n" -msgstr "feilmelding gitt under utpakkingen av %s (%s)\n" +msgstr "fikk advarsel under utpakkingen av %s (%s)\n" #, c-format msgid "could not extract %s (%s)\n" @@ -49,15 +50,15 @@ msgstr "" #, c-format msgid "extract: not overwriting dir with file %s\n" -msgstr "utpakking: skriver ikke over mappe med fil %s\n" +msgstr "utpakking: overskriver ikke mappe med fil %s\n" #, c-format msgid "extract: symlink %s does not point to dir\n" -msgstr "utpakking: symlink %s viser ikke til mappe\n" +msgstr "utpakking: symbolsk lenke %s peker ikke til mappe\n" #, c-format msgid "could not rename %s to %s (%s)\n" -msgstr "kunne ikke døpe om %s til %s (%s)\n" +msgstr "kunne ikke omdøpe %s til %s (%s)\n" #, c-format msgid "%s saved as %s\n" @@ -77,7 +78,7 @@ msgstr "pakker ut %s som %s.pacnew\n" #, c-format msgid "could not get current working directory\n" -msgstr "kunne ikke motta nåværende mappe\n" +msgstr "kunne ikke finne gjeldende mappe\n" #, c-format msgid "could not change directory to %s (%s)\n" @@ -85,7 +86,7 @@ msgstr "kunne ikke endre mappe til %s (%s)\n" #, c-format msgid "could not restore working directory (%s)\n" -msgstr "kunne ikke gjenopprette arbeidsmappe (%s)\n" +msgstr "kunne ikke gjenopprette gjeldende mappe (%s)\n" #, c-format msgid "problem occurred while upgrading %s\n" @@ -97,11 +98,11 @@ msgstr "problem oppstod under installasjon av %s\n" #, c-format msgid "could not update database entry %s-%s\n" -msgstr "kunne ikke oppdatere databaseelement %s-%s\n" +msgstr "kunne ikke oppdatere databaseoppføring %s-%s\n" #, c-format msgid "could not add entry '%s' in cache\n" -msgstr "kunne ikke legge til '%s' i cache\n" +msgstr "kunne ikke legge til oppføringen '%s' i mellomlageret\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 "ugyldig navn for databaseelement '%s'\n" +msgstr "ugyldig navn for databaseoppføring '%s'\n" #, c-format msgid "duplicated database entry '%s'\n" -msgstr "gjentatt databaseelement '%s'\n" +msgstr "duplikat databaseoppføring '%s'\n" #, c-format msgid "corrupted database entry '%s'\n" -msgstr "korrupt databaseelement '%s'\n" +msgstr "korrupt databaseoppføring '%s'\n" #, c-format msgid "could not open file %s: %s\n" @@ -125,11 +126,11 @@ msgstr "kunne ikke åpne fil %s: %s\n" #, c-format msgid "%s database is inconsistent: name mismatch on package %s\n" -msgstr "%s database er ukonsistent: navn samsvarer ikke med pakke %s\n" +msgstr "%s databasen er ikke konsistent: navn samsvarer ikke med pakke %s\n" #, c-format msgid "%s database is inconsistent: version mismatch on package %s\n" -msgstr "%s database er ukonsistent: versjon samsvarer ikke med pakke %s\n" +msgstr "%s databasen er ikke konsistent: versjon samsvarer ikke med pakke %s\n" #, c-format msgid "could not create directory %s: %s\n" @@ -137,7 +138,7 @@ msgstr "kunne ikke opprette mappe %s: %s\n" #, c-format msgid "could not parse package description file in %s\n" -msgstr "kunne ikke analysere pakkebeskrivelse i fil %s\n" +msgstr "kunne ikke tolke filen med pakkebeskrivelse i %s\n" #, c-format msgid "missing package name in %s\n" @@ -149,7 +150,7 @@ msgstr "mangler pakkeversjon i %s\n" #, c-format msgid "error while reading package %s: %s\n" -msgstr "feil oppstod under lesing av pakke: %s: %s\n" +msgstr "feil oppstod ved lesing av pakke: %s: %s\n" #, c-format msgid "missing package metadata in %s\n" @@ -161,15 +162,15 @@ msgstr "fjerner ugyldig fil: %s\n" #, c-format msgid "could not remove lock file %s\n" -msgstr "kunne ikke fjerne låsingsfil %s\n" +msgstr "kunne ikke fjerne låsefil %s\n" #, c-format msgid "could not parse package description file '%s' from db '%s'\n" -msgstr "kunne ikke tolke pakkebeskrivelsesfilen '%s' fra databasen '%s'\n" +msgstr "kunne ikke tolke filen med pakkebeskrivelse '%s' fra databasen '%s'\n" #, c-format msgid "database path is undefined\n" -msgstr "databaseplassering er udefinert\n" +msgstr "stien til databasen er udefinert\n" #, c-format msgid "dependency cycle detected:\n" @@ -189,15 +190,15 @@ msgstr "ignorerer pakke %s-%s\n" #, c-format msgid "cannot resolve \"%s\", a dependency of \"%s\"\n" -msgstr "kan ikke avgjøre \"%s\", en avhengighet av \"%s\"\n" +msgstr "kan ikke finne \"%s\", en avhengighet av \"%s\"\n" #, c-format msgid "could not get filesystem information\n" -msgstr "kunne ikke hente filsysteminformasjon\n" +msgstr "kunne ikke finne filsysteminformasjon\n" #, c-format msgid "could not get filesystem information for %s: %s\n" -msgstr "kunne ikke hente filsysteminformasjon for %s: %s\n" +msgstr "kunne ikke finne filsysteminformasjon for %s: %s\n" #, c-format msgid "could not determine mount point for file %s\n" @@ -209,15 +210,15 @@ msgstr "kunne ikke avgjøre monteringspunkt for filsystem\n" #, c-format msgid "could not determine root mount point %s\n" -msgstr "kunne ikke avgjøre rotmonteringspunkt %s\n" +msgstr "kunne ikke avgjøre monteringspunkt for root %s\n" #, c-format msgid "Partition %s is mounted read only\n" -msgstr "Partisjonen %s er kun tilgjengelig for skriving\n" +msgstr "Partisjonen %s kan bare leses fra\n" #, c-format msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n" -msgstr "Diskvolumet %s er for fullt: %jd blokker trengs, %jd blokker ledig\n" +msgstr "Partisjonen %s er for full: %jd blokker trengs, %jd blokker er ledig\n" #, c-format msgid "disk" @@ -225,7 +226,7 @@ msgstr "disk" #, c-format msgid "failed to create temporary file for download\n" -msgstr "kunne ikke opprette midlertidig fil for nedlasting\n" +msgstr "kunne ikke opprette midlertidig fil i sammengeng med nedlasting\n" #, c-format msgid "url '%s' is invalid\n" @@ -233,19 +234,19 @@ msgstr "url '%s' er ugyldig\n" #, c-format msgid "failed retrieving file '%s' from %s : %s\n" -msgstr "mottakelse av fil '%s' fra %s : %s feilet\n" +msgstr "kunne ikke hente filen '%s' fra %s : %s\n" #, c-format msgid "%s appears to be truncated: %jd/%jd bytes\n" -msgstr "%s ser ut til å være trunkert: %jd/%jd bytes\n" +msgstr "%s ser ut til å være avkortet: %jd/%jd bytes\n" #, c-format msgid "failed to download %s\n" -msgstr "nedlasting av %s feilet\n" +msgstr "kunne ikke laste ned %s\n" #, c-format msgid "out of memory!" -msgstr "ikke mer minne!" +msgstr "tom for minne!" #, c-format msgid "unexpected system error" @@ -253,7 +254,7 @@ msgstr "uventet systemfeil" #, c-format msgid "insufficient privileges" -msgstr "ikke nok rettigheter" +msgstr "utilstrekkelige tilgangsrettigheter" #, c-format msgid "could not find or read file" @@ -273,35 +274,35 @@ msgstr "ikke nok ledig diskplass" #, c-format msgid "library not initialized" -msgstr "bibliotek ikke initialisert" +msgstr "bibliotek har ikke blitt initialisert" #, c-format msgid "library already initialized" -msgstr "bibliotek allerede initialisert" +msgstr "bibliotek har allerede blitt initialisert" #, c-format msgid "unable to lock database" -msgstr "kunne ikke låse database" +msgstr "kunne ikke låse databasen" #, c-format msgid "could not open database" -msgstr "kunne ikke åpne database" +msgstr "kunne ikke åpne databasen" #, c-format msgid "could not create database" -msgstr "kunne ikke opprette database" +msgstr "kunne ikke opprette databasen" #, c-format msgid "database not initialized" -msgstr "database ikke initialisert" +msgstr "databasen har ikke blitt initialisert" #, c-format msgid "database already registered" -msgstr "database allerede registret" +msgstr "databasen har allerede blitt registrert" #, c-format msgid "could not find database" -msgstr "kunne ikke finne database" +msgstr "kunne ikke finne databasen" #, c-format msgid "invalid or corrupted database" @@ -317,47 +318,47 @@ msgstr "databasen har feil versjonsnummer" #, c-format msgid "could not update database" -msgstr "kunne ikke oppdatere database" +msgstr "kunne ikke oppdatere databasen" #, c-format msgid "could not remove database entry" -msgstr "kunne ikke fjerne databaseelement" +msgstr "kunne ikke fjerne databaseoppføring" #, c-format msgid "invalid url for server" -msgstr "ugyldig url for server" +msgstr "ugyldig url for tjener" #, c-format msgid "no servers configured for repository" -msgstr "ingen servere konfigurert for pakkebrønn" +msgstr "ingen tjenere har blitt satt opp for pakkebrønn" #, c-format msgid "transaction already initialized" -msgstr "transaksjon allerede initialisert" +msgstr "transaksjonen har allerede blitt initialisert" #, c-format msgid "transaction not initialized" -msgstr "transaksjon ikke initialisert" +msgstr "transaksjonen har ikke blitt initialisert" #, c-format msgid "duplicate target" -msgstr "klonet mål" +msgstr "duplikate mål" #, c-format msgid "transaction not prepared" -msgstr "transaksjon ikke forberedt" +msgstr "transaksjonen er ikke forberedt" #, c-format msgid "transaction aborted" -msgstr "transaksjon avsluttet" +msgstr "transaksjon avbrutt" #, c-format msgid "operation not compatible with the transaction type" -msgstr "operasjon ikke kompatibel med transaksjonstypen" +msgstr "handlingen er ikke kompatibel med transaksjonstypen" #, c-format msgid "transaction commit attempt when database is not locked" -msgstr "førsøk på utføring av transaksjon mens databasen ikke er lukket" +msgstr "forsøkte å utføre transaksjon med ulåst database" #, c-format msgid "could not find or read package" @@ -365,7 +366,7 @@ msgstr "kunne ikke finne eller lese pakke" #, c-format msgid "operation cancelled due to ignorepkg" -msgstr "operasjon avsluttet grunnet ignorepkg" +msgstr "handling avbrutt pga ignorepkg" #, c-format msgid "invalid or corrupted package" @@ -381,19 +382,19 @@ msgstr "ugyldig eller korrupt pakke (PGP signatur)" #, c-format msgid "cannot open package file" -msgstr "kan ikke åpne pakkefil" +msgstr "kunne ikke åpne pakkefil" #, c-format msgid "cannot remove all files for package" -msgstr "kan ikke fjerne alle filer for pakke" +msgstr "kunne ikke fjerne alle filer for pakke" #, c-format msgid "package filename is not valid" -msgstr "pakkens filnavn er ikke gyldig" +msgstr "pakkefilnavn er ugyldig" #, c-format msgid "package architecture is not valid" -msgstr "pakkearkitekturen er ikke gyldig" +msgstr "pakkearkitektur er ugyldig" #, c-format msgid "could not find repository for target" @@ -401,7 +402,7 @@ msgstr "fant ikke pakkebrønn for mål" #, c-format msgid "missing PGP signature" -msgstr "manglende PGP signatur" +msgstr "mangler PGP signatur" #, c-format msgid "invalid PGP signature" @@ -409,11 +410,11 @@ msgstr "ugyldig PGP signatur" #, c-format msgid "invalid or corrupted delta" -msgstr "invalid" +msgstr "ugyldig eller korrupt filforskjell" #, c-format msgid "delta patch failed" -msgstr "delta-patch feilet" +msgstr "fiks av filforskjell feilet" #, c-format msgid "could not satisfy dependencies" @@ -421,19 +422,19 @@ msgstr "kunne ikke tilfredstille avhengigheter" #, c-format msgid "conflicting dependencies" -msgstr "modstridige avhengigheter" +msgstr "motstridende avhengigheter" #, c-format msgid "conflicting files" -msgstr "modstridige filer" +msgstr "motstridende filer" #, c-format msgid "failed to retrieve some files" -msgstr "mottagelsen av noen filer feilet" +msgstr "noen filer kunne ikke hentes" #, c-format msgid "invalid regular expression" -msgstr "ugyldig uttrykk" +msgstr "ugyldig regulært uttrykk" #, c-format msgid "libarchive error" @@ -449,15 +450,15 @@ msgstr "gpgme feil" #, c-format msgid "error invoking external downloader" -msgstr "påkalling av ekstern nedlaster feilet" +msgstr "feil ved bruk av eksternt nedlastningsprogram" #, c-format msgid "unexpected error" -msgstr "uforventet feil" +msgstr "uventet feil" #, c-format msgid "could not fully load metadata for package %s-%s\n" -msgstr "kunne ikke laste metadata for pakken %s-%s fullstendig\n" +msgstr "kunne ikke laste all metadata for pakken %s-%s\n" #, c-format msgid "could not find %s in database -- skipping\n" @@ -469,7 +470,7 @@ msgstr "fjerner %s fra målliste\n" #, c-format msgid "cannot remove file '%s': %s\n" -msgstr "kan ikke fjerne fil '%s': %s\n" +msgstr "kunne ikke fjerne fil '%s': %s\n" #, c-format msgid "cannot remove %s (%s)\n" @@ -477,11 +478,11 @@ msgstr "kunne ikke fjerne %s (%s)\n" #, c-format msgid "could not remove database entry %s-%s\n" -msgstr "kunne ikke fjerne databaseelement %s-%s\n" +msgstr "kunne ikke fjerne databaseoppføring %s-%s\n" #, c-format msgid "could not remove entry '%s' from cache\n" -msgstr "kunne ikke fjerne element '%s' fra cache\n" +msgstr "kunne ikke fjerne oppføring '%s' fra mellomlageret\n" #, c-format msgid "%s: ignoring package upgrade (%s => %s)\n" @@ -493,7 +494,7 @@ msgstr "%s: ignorerer pakkenedgradering (%s => %s)\n" #, c-format msgid "%s: downgrading from version %s to version %s\n" -msgstr "%s: nedgradering fra versjon %s til versjon %s\n" +msgstr "%s: nedgraderer fra versjon %s til versjon %s\n" #, c-format msgid "%s: local (%s) is newer than %s (%s)\n" @@ -501,11 +502,11 @@ msgstr "%s: lokal (%s) er nyere enn %s (%s)\n" #, c-format msgid "ignoring package replacement (%s-%s => %s-%s)\n" -msgstr "ignorerer utbytting av pakke (%s-%s => %s-%s)\n" +msgstr "ignorerer erstatning for pakke (%s-%s => %s-%s)\n" #, c-format msgid "cannot replace %s by %s\n" -msgstr "kan ikke bytte ut %s med %s\n" +msgstr "kunne ikke erstatte %s med %s\n" #, c-format msgid "unresolvable package conflicts detected\n" @@ -513,23 +514,23 @@ msgstr "uløselige pakkekonflikter oppdaget\n" #, c-format msgid "removing '%s' from target list because it conflicts with '%s'\n" -msgstr "fjerner '%s' fra mållisten fordi den strider mot '%s'\n" +msgstr "fjerner '%s' fra mållisten fordi den er i konflikt med '%s'\n" #, c-format msgid "failed to retrieve some files from %s\n" -msgstr "feilet å motta noen filer fra %s\n" +msgstr "kunne ikke motta alle filer fra %s\n" #, c-format msgid "could not commit removal transaction\n" -msgstr "kunne ikke begå fjerningstransaksjon\n" +msgstr "kunne ikke utføre transaksjon (fjerning)\n" #, c-format msgid "could not commit transaction\n" -msgstr "kunne ikke begå transaksjon\n" +msgstr "kunne ikke utføre transaksjon\n" #, c-format msgid "could not create temp directory\n" -msgstr "kunne ikke opprette midlertidig mappe\n" +msgstr "kunne ikke lage midlertidig mappe\n" #, c-format msgid "could not copy tempfile to %s (%s)\n" @@ -545,11 +546,11 @@ msgstr "kunne ikke fjerne midlertidig mappe %s\n" #, c-format msgid "could not create pipe (%s)\n" -msgstr "kunne ikke opprette filter (%s)\n" +msgstr "kunne ikke opprette dataledning (%s)\n" #, c-format msgid "could not fork a new process (%s)\n" -msgstr "kunne ikke skille ut en ny prosess (%s)\n" +msgstr "kunne ikke føde en ny prosess (%s)\n" #, c-format msgid "could not change the root directory (%s)\n" @@ -561,20 +562,22 @@ msgstr "kall til execv feilet (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" -msgstr "kall på waitpid feilet (%s)\n" +msgstr "kall til waitpid feilet (%s)\n" #, c-format msgid "could not open pipe (%s)\n" -msgstr "kunne ikke opprette filter (%s)\n" +msgstr "kunne ikke åpne dataledning (%s)\n" #, c-format msgid "command failed to execute correctly\n" -msgstr "kommando feilet å kjøre korrekt\n" +msgstr "kommandoen feilet\n" #, c-format msgid "no %s cache exists, creating...\n" -msgstr "ingen %s cache eksisterer, lager en ...\n" +msgstr "mellomlageret %s eksisterer ikke, oppretter...\n" #, c-format msgid "couldn't find or create package cache, using %s instead\n" -msgstr "kunne ikke finne eller opprette pakkelager, bruker %s istedenfor\n" +msgstr "" +"kunne ikke finne eller opprette mellomlager for pakker, bruker %s " +"istedenfor\n" diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po index 0e20a9cf..fc7f3dc9 100644 --- a/lib/libalpm/po/pl.po +++ b/lib/libalpm/po/pl.po @@ -8,7 +8,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-08 09:10+0000\n" "Last-Translator: Barthalion \n" "Language-Team: Polish (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/pt.po b/lib/libalpm/po/pt.po index d04ee825..92388600 100644 --- a/lib/libalpm/po/pt.po +++ b/lib/libalpm/po/pt.po @@ -8,7 +8,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-12 13:05+0000\n" "Last-Translator: ArchGalileu \n" "Language-Team: Portuguese (http://www.transifex.net/projects/p/archlinux-" diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po index 131d95cf..2f12f268 100644 --- a/lib/libalpm/po/pt_BR.po +++ b/lib/libalpm/po/pt_BR.po @@ -11,8 +11,8 @@ 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-09-29 10:50+0000\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-06 03:50+0000\n" "Last-Translator: rafaelff1 \n" "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/" "archlinux-pacman/team/pt_BR/)\n" @@ -545,9 +545,9 @@ msgstr "não foi possível criar diretório temporário\n" msgid "could not copy tempfile to %s (%s)\n" msgstr "não foi possível copiar arquivo temporário para %s (%s)\n" -#, fuzzy, c-format +#, c-format msgid "could not remove %s\n" -msgstr "não foi possível remover o diretório temporário %s\n" +msgstr "não foi possível remover %s\n" #, c-format msgid "could not remove tmpdir %s\n" diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po index 808be9ec..1294a516 100644 --- a/lib/libalpm/po/ro.po +++ b/lib/libalpm/po/ro.po @@ -11,7 +11,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-06 17:25+0000\n" "Last-Translator: z0id \n" "Language-Team: Romanian (http://www.transifex.net/projects/p/archlinux-" diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po index 26104d4d..e4efd0ec 100644 --- a/lib/libalpm/po/ru.po +++ b/lib/libalpm/po/ru.po @@ -10,8 +10,8 @@ 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-09-22 16:37+0000\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-06 03:39+0000\n" "Last-Translator: toofishes \n" "Language-Team: Russian (http://www.transifex.net/projects/p/archlinux-pacman/" "team/ru/)\n" @@ -540,9 +540,9 @@ msgstr "не удалось создать временный каталог\n" msgid "could not copy tempfile to %s (%s)\n" msgstr "не удалось скопировать временный файл в %s (%s)\n" -#, fuzzy, c-format +#, c-format msgid "could not remove %s\n" -msgstr "не удалось удалить временный каталог %s\n" +msgstr "" #, c-format msgid "could not remove tmpdir %s\n" diff --git a/lib/libalpm/po/sk.po b/lib/libalpm/po/sk.po index 0f97960f..21cd37e6 100644 --- a/lib/libalpm/po/sk.po +++ b/lib/libalpm/po/sk.po @@ -10,7 +10,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-08 19:38+0000\n" "Last-Translator: jose1711 \n" "Language-Team: Slovak (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/sr.po b/lib/libalpm/po/sr.po index f41d99e5..a5177cdc 100644 --- a/lib/libalpm/po/sr.po +++ b/lib/libalpm/po/sr.po @@ -8,7 +8,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-11 17:15+0000\n" "Last-Translator: Xabre \n" "Language-Team: Serbian (http://www.transifex.net/projects/p/archlinux-pacman/" diff --git a/lib/libalpm/po/sr@latin.po b/lib/libalpm/po/sr@latin.po index 474560be..424e2c6f 100644 --- a/lib/libalpm/po/sr@latin.po +++ b/lib/libalpm/po/sr@latin.po @@ -8,7 +8,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-12 15:08+0000\n" "Last-Translator: Xabre \n" "Language-Team: Serbian (Latin) (http://www.transifex.net/projects/p/" diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po index dc91dacc..981242f7 100644 --- a/lib/libalpm/po/sv.po +++ b/lib/libalpm/po/sv.po @@ -7,8 +7,8 @@ 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-09-22 16:37+0000\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-06 03:39+0000\n" "Last-Translator: toofishes \n" "Language-Team: Swedish (http://www.transifex.net/projects/p/archlinux-pacman/" "team/sv/)\n" @@ -534,9 +534,9 @@ msgstr "kunde inte skapa temporär katalog\n" msgid "could not copy tempfile to %s (%s)\n" msgstr "kunde inte kopiera temporär fil till %s (%s)\n" -#, fuzzy, c-format +#, c-format msgid "could not remove %s\n" -msgstr "kunde inte ta bort tmpdir %s\n" +msgstr "" #, c-format msgid "could not remove tmpdir %s\n" diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po index d8d9669e..681b9438 100644 --- a/lib/libalpm/po/tr.po +++ b/lib/libalpm/po/tr.po @@ -10,8 +10,8 @@ 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-09-23 22:37+0000\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-23 09:34+0000\n" "Last-Translator: tarakbumba \n" "Language-Team: Turkish (http://www.transifex.net/projects/p/archlinux-pacman/" "team/tr/)\n" @@ -538,9 +538,9 @@ msgstr "geçici dizin oluşturulamadı\n" msgid "could not copy tempfile to %s (%s)\n" msgstr "geçici dosya %s üzerine kopyalanamadı (%s)\n" -#, fuzzy, c-format +#, c-format msgid "could not remove %s\n" -msgstr "geçici dizin %s kaldırılamadı\n" +msgstr "%s kaldırılamıyor\n" #, c-format msgid "could not remove tmpdir %s\n" diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po index a0f9277e..9e02be3b 100644 --- a/lib/libalpm/po/uk.po +++ b/lib/libalpm/po/uk.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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-10 20:43+0000\n" "Last-Translator: Wiseacre \n" "Language-Team: Ukrainian (http://www.transifex.net/projects/p/archlinux-" diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index 471a7803..cec2e226 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/po/zh_CN.po @@ -10,7 +10,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: 2011-10-05 22:35-0500\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" "PO-Revision-Date: 2011-10-06 05:04+0000\n" "Last-Translator: ganlu \n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/" diff --git a/lib/libalpm/po/zh_TW.po b/lib/libalpm/po/zh_TW.po index b492e277..30a3af8a 100644 --- a/lib/libalpm/po/zh_TW.po +++ b/lib/libalpm/po/zh_TW.po @@ -8,8 +8,8 @@ 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-10-05 22:35-0500\n" -"PO-Revision-Date: 2011-09-22 16:37+0000\n" +"POT-Creation-Date: 2011-11-13 21:47-0600\n" +"PO-Revision-Date: 2011-10-06 03:39+0000\n" "Last-Translator: toofishes \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/" "archlinux-pacman/team/zh_TW/)\n" @@ -537,9 +537,9 @@ msgstr "無法創建臨時目錄\n" msgid "could not copy tempfile to %s (%s)\n" msgstr "無法複製臨時文件到 %1$s (%2$s)\n" -#, fuzzy, c-format +#, c-format msgid "could not remove %s\n" -msgstr "無法刪除臨時目錄 %s\n" +msgstr "" #, c-format msgid "could not remove tmpdir %s\n" -- cgit v1.2.3-24-g4f1b From 9363e7dc22f85c549cd90768ce884508901820a8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Nov 2011 09:12:18 -0600 Subject: Allow sync_prepare to work in certain cases without sync databases When doing a bare -U operation on a local package that doesn't pull in any dependencies from the sync databases, we can get away with missing database files. This makes the check conditional on no sync targets found in the target list. This is not the prettiest code here so we have a bit of hackish behavior required to straighten both the behavior and the nonsensical error message out. Addresses FS#26899. Signed-off-by: Dan McGee --- lib/libalpm/deps.c | 2 +- lib/libalpm/sync.c | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 60401583..89f6d691 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -631,7 +631,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, /* first check if one provider is already installed locally */ for(i = providers; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_pkghash_find(_alpm_db_get_pkgcache_hash(handle->db_local), pkg->name)) { + if(_alpm_db_get_pkgfromcache(handle->db_local, pkg->name)) { alpm_list_free(providers); return pkg; } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 54b9794a..cf209717 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -357,7 +357,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_t *i, *j; alpm_list_t *deps = NULL; alpm_list_t *unresolvable = NULL; - alpm_list_t *remove = NULL; + size_t from_sync = 0; int ret = 0; alpm_trans_t *trans = handle->trans; @@ -365,19 +365,27 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) *data = NULL; } - /* ensure all sync database are valid since we will be using them */ + for(i = trans->add; i; i = i->next) { + alpm_pkg_t *spkg = i->data; + from_sync += (spkg->origin == PKG_FROM_SYNCDB); + } + + /* ensure all sync database are valid if we will be using them */ for(i = handle->dbs_sync; i; i = i->next) { const alpm_db_t *db = i->data; if(db->status & DB_STATUS_INVALID) { RET_ERR(handle, ALPM_ERR_DB_INVALID, -1); } - if(db->status & DB_STATUS_MISSING) { + /* missing databases are not allowed if we have sync targets */ + if(from_sync && db->status & DB_STATUS_MISSING) { RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1); } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { - alpm_list_t *resolved = NULL; /* target list after resolvedeps */ + alpm_list_t *resolved = NULL; + alpm_list_t *remove = NULL; + alpm_list_t *localpkgs; /* Build up list by repeatedly resolving each transaction package */ /* Resolve targets dependencies */ @@ -394,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* Compute the fake local database for resolvedeps (partial fix for the * phonon/qt issue) */ - alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local), + localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local), trans->add, _alpm_pkg_cmp); /* Resolve packages in the transaction one at a time, in addition @@ -409,11 +417,13 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) dependencies not already on the list */ } alpm_list_free(localpkgs); + alpm_list_free(remove); /* If there were unresolvable top-level packages, prompt the user to see if they'd like to ignore them rather than failing the sync */ if(unresolvable != NULL) { int remove_unresolvable = 0; + enum _alpm_errno_t saved_err = handle->pm_errno; QUESTION(handle, ALPM_QUESTION_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolvable); if(remove_unresolvable) { @@ -421,14 +431,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) transaction. The packages will be removed from the actual transaction when the transaction packages are replaced with a dependency-reordered list below */ - handle->pm_errno = 0; /* pm_errno was set by resolvedeps */ + handle->pm_errno = 0; if(data) { alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(*data); *data = NULL; } } else { - /* pm_errno is set by resolvedeps */ + /* pm_errno was set by resolvedeps, callback may have overwrote it */ + handle->pm_errno = saved_err; alpm_list_free(resolved); ret = -1; goto cleanup; @@ -617,8 +628,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } cleanup: - alpm_list_free(remove); - return ret; } -- cgit v1.2.3-24-g4f1b From c79c068fe9b80ea9af831c8c883f27fad2e0d128 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Nov 2011 23:16:28 -0600 Subject: Update translations from Transifex Signed-off-by: Dan McGee --- lib/libalpm/po/sv.po | 63 +++++++++++++++++++++++++------------------------ lib/libalpm/po/zh_CN.po | 4 ++-- 2 files changed, 34 insertions(+), 33 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po index 981242f7..762b7fd6 100644 --- a/lib/libalpm/po/sv.po +++ b/lib/libalpm/po/sv.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 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 \n" +"PO-Revision-Date: 2011-11-15 15:42+0000\n" +"Last-Translator: Gazpachian \n" "Language-Team: Swedish (http://www.transifex.net/projects/p/archlinux-pacman/" "team/sv/)\n" "Language: sv\n" @@ -32,7 +33,7 @@ msgstr "nedgraderar paketet %s (%s => %s)\n" #, c-format msgid "warning given when extracting %s (%s)\n" -msgstr "" +msgstr "varning given vid extrahering av %s (%s)\n" #, c-format msgid "could not extract %s (%s)\n" @@ -84,7 +85,7 @@ msgstr "kunde inte byta katalog till %s (%s)\n" #, c-format msgid "could not restore working directory (%s)\n" -msgstr "" +msgstr "Kunde ej återställa arbetskatalogen (%s)\n" #, c-format msgid "problem occurred while upgrading %s\n" @@ -156,7 +157,7 @@ msgstr "saknar metadata för paketet i %s\n" #, c-format msgid "removing invalid file: %s\n" -msgstr "" +msgstr "Tar bort ogiltig fil: %s\n" #, c-format msgid "could not remove lock file %s\n" @@ -164,7 +165,7 @@ msgstr "kunde inte ta bort låsningsfil %s\n" #, c-format msgid "could not parse package description file '%s' from db '%s'\n" -msgstr "" +msgstr "Kunde ej finna paketbeskrivningsfilen '%s' från databasen '%s'\n" #, c-format msgid "database path is undefined\n" @@ -192,31 +193,31 @@ msgstr "kan inte lösa \"%s\", beroende till \"%s\", \n" #, c-format msgid "could not get filesystem information\n" -msgstr "" +msgstr "Kunde ej hämta filsysteminformation\n" #, c-format msgid "could not get filesystem information for %s: %s\n" -msgstr "" +msgstr "Kunde ej hämta filsysteminformation för %s: %s\n" #, c-format msgid "could not determine mount point for file %s\n" -msgstr "" +msgstr "Kunde ej bestämma monteringspunkt för fil %s\n" #, c-format msgid "could not determine filesystem mount points\n" -msgstr "" +msgstr "Kunde ej bestämma filsystemmonteringspunkter\n" #, c-format msgid "could not determine root mount point %s\n" -msgstr "" +msgstr "Kunde ej bestämma rootmonteringspunkt %s\n" #, c-format msgid "Partition %s is mounted read only\n" -msgstr "" +msgstr "Partition %s är monterad utan skrivrättigheter\n" #, c-format msgid "Partition %s too full: %jd blocks needed, %jd blocks free\n" -msgstr "" +msgstr "Partition %s för full: %jd block behövs, %jd block fria\n" #, c-format msgid "disk" @@ -224,7 +225,7 @@ msgstr "disk" #, c-format msgid "failed to create temporary file for download\n" -msgstr "" +msgstr "Kunde ej skapa temporär fil för nedladdning\n" #, c-format msgid "url '%s' is invalid\n" @@ -268,7 +269,7 @@ msgstr "fel eller inga argument angivna" #, c-format msgid "not enough free disk space" -msgstr "" +msgstr "ej tillräckligt fritt diskutrymme" #, c-format msgid "library not initialized" @@ -304,15 +305,15 @@ msgstr "kunde inte hitta databas" #, c-format msgid "invalid or corrupted database" -msgstr "" +msgstr "ogiltig eller korrupt databas" #, c-format msgid "invalid or corrupted database (PGP signature)" -msgstr "" +msgstr "ogiltig eller korrupt databas (PGP-signatur)" #, c-format msgid "database is incorrect version" -msgstr "" +msgstr "databas är av felaktig version" #, c-format msgid "could not update database" @@ -368,15 +369,15 @@ msgstr "operationen avbryten på grund av ignorepkg" #, c-format msgid "invalid or corrupted package" -msgstr "" +msgstr "ogiltigt eller korrupt paket" #, c-format msgid "invalid or corrupted package (checksum)" -msgstr "" +msgstr "ogiltigt eller korrupt paket (checksum)" #, c-format msgid "invalid or corrupted package (PGP signature)" -msgstr "" +msgstr "ogiltigt eller korrupt paket (PGP-signatur)" #, c-format msgid "cannot open package file" @@ -400,11 +401,11 @@ msgstr "givet förråd finns inte" #, c-format msgid "missing PGP signature" -msgstr "" +msgstr "saknad PGP-signatur" #, c-format msgid "invalid PGP signature" -msgstr "" +msgstr "ogiltig PGP-signatur" #, c-format msgid "invalid or corrupted delta" @@ -444,7 +445,7 @@ msgstr "fel vid nerladdning av bibliotek" #, c-format msgid "gpgme error" -msgstr "" +msgstr "gpgme-fel" #, c-format msgid "error invoking external downloader" @@ -456,7 +457,7 @@ msgstr "oväntat fel" #, c-format msgid "could not fully load metadata for package %s-%s\n" -msgstr "" +msgstr "kunde ej ladda metadata för paket %s-%s fullständigt\n" #, c-format msgid "could not find %s in database -- skipping\n" @@ -472,7 +473,7 @@ msgstr "kan inte ta bort '%s': %s\n" #, c-format msgid "cannot remove %s (%s)\n" -msgstr "" +msgstr "kunde ej ta bort %s (%s)\n" #, c-format msgid "could not remove database entry %s-%s\n" @@ -536,7 +537,7 @@ msgstr "kunde inte kopiera temporär fil till %s (%s)\n" #, c-format msgid "could not remove %s\n" -msgstr "" +msgstr "kunde ej ta bort %s\n" #, c-format msgid "could not remove tmpdir %s\n" @@ -544,7 +545,7 @@ msgstr "kunde inte ta bort tmpdir %s\n" #, c-format msgid "could not create pipe (%s)\n" -msgstr "" +msgstr "kunde ej skapa pipe (%s)\n" #, c-format msgid "could not fork a new process (%s)\n" @@ -556,7 +557,7 @@ msgstr "kunde inte byta rootkatalogen (%s)\n" #, c-format msgid "call to execv failed (%s)\n" -msgstr "" +msgstr "anrop till execv misslyckades (%s)\n" #, c-format msgid "call to waitpid failed (%s)\n" @@ -564,7 +565,7 @@ msgstr "anrop till waitpid misslyckades (%s)\n" #, c-format msgid "could not open pipe (%s)\n" -msgstr "" +msgstr "kunde ej öppna pipe (%s)\n" #, c-format msgid "command failed to execute correctly\n" @@ -576,4 +577,4 @@ msgstr "ingen %s cache existerar, skapar...\n" #, c-format msgid "couldn't find or create package cache, using %s instead\n" -msgstr "" +msgstr "kunde ej hitta eller skapa paketcache, använder %s istället\n" diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po index cec2e226..d1c0fdc4 100644 --- a/lib/libalpm/po/zh_CN.po +++ b/lib/libalpm/po/zh_CN.po @@ -11,7 +11,7 @@ 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 05:04+0000\n" +"PO-Revision-Date: 2011-11-15 02:39+0000\n" "Last-Translator: ganlu \n" "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/" "archlinux-pacman/team/zh_CN/)\n" @@ -493,7 +493,7 @@ msgstr "%1$s：忽略软件包更新（%2$s => %3$s）\n" #, c-format msgid "%s: ignoring package downgrade (%s => %s)\n" -msgstr "%1$s：正在忽略软件包经济（%2$s => %3$s）\n" +msgstr "%1$s：正在忽略软件包降级（%2$s => %3$s）\n" #, c-format msgid "%s: downgrading from version %s to version %s\n" -- cgit v1.2.3-24-g4f1b