From b591dfe80c2defaad381f7638d09a8e7c2ffddfe Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 28 Mar 2018 13:39:05 +0300 Subject: Preparing for rpm 4.13.1 Bump version and libtool revision, update translations. --- configure.ac | 2 +- po/ar.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/br.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/ca.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/cmn.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/cs.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/da.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/de.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/el.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/eo.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/es.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/fi.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/fr.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/is.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/it.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/ja.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/ko.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/ms.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/nb.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/nl.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/pl.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/pt.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/pt_BR.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/rpm.pot | 98 ++++++++++++++++++++++++++++++++-------------------------- po/ru.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/sk.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/sl.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/sr.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/sr@latin.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/sv.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/te.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/tr.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/uk.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/vi.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/zh_CN.po | 98 ++++++++++++++++++++++++++++++++-------------------------- po/zh_TW.po | 98 ++++++++++++++++++++++++++++++++-------------------------- rpm.am | 2 +- 37 files changed, 1927 insertions(+), 1507 deletions(-) diff --git a/configure.ac b/configure.ac index 2a4f1f43f..0b8c1b5d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.61) -AC_INIT(rpm, 4.13.0.2, rpm-maint@lists.rpm.org) +AC_INIT(rpm, 4.13.1, rpm-maint@lists.rpm.org) AC_CONFIG_SRCDIR([rpmqv.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/po/ar.po b/po/ar.po index 5dfba8c57..8c9daa6f9 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Arabic (http://www.transifex.com/rpm-team/rpm/language/ar/)\n" @@ -1327,7 +1327,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1600,22 +1600,22 @@ msgstr "تعذّر إيجاد %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1692,26 +1692,26 @@ msgstr "(غير معروفة)" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s حُفت كـ %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s أُنشئت كـ %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "دليل" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "ملف" @@ -2292,12 +2292,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2586,41 +2586,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3117,23 +3129,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "تعذّر تحميل رأس التّوقيع.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "الترويسة" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3252,72 +3264,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/br.po b/po/br.po index a8a395324..d1a0c7660 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-21 08:33+0000\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: Breton (http://www.transifex.com/rpm-team/rpm/language/br/)\n" @@ -1322,7 +1322,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Ret eo e vede ur stumm" @@ -1595,22 +1595,22 @@ msgstr "Sac'het eo bet klask %s :\n" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "Un Delta RPM eo %s neuez ne c'hell ket bezañ staliet\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "Bet eo ouzhpennet ar pakad %s dija, o tremen e-biou %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "Bet eo ouzhpennet ar pakad %s dija, o erlec'hiañ gant %s\n" @@ -1687,26 +1687,26 @@ msgstr "(dianav)" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s : sac'het eo bet lemel : %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "renkell" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "restr" @@ -2287,12 +2287,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " war restr " @@ -2581,42 +2581,54 @@ msgstr "" msgid "support for rich dependencies." msgstr "" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Ret eo e vede ur stumm" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3113,23 +3125,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3248,72 +3260,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader : o tremen e-biou" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s : sac'het eo bet regexec : %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s : sac'het eo bet regcomp : %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator : o tremen e-biou" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index 38c58103d..b6a730b80 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-26 13:57+0000\n" "Last-Translator: Robert Antoni Buj i Gelonch \n" "Language-Team: Catalan (http://www.transifex.com/rpm-team/rpm/language/ca/)\n" @@ -1392,7 +1392,7 @@ msgstr "" msgid "invalid dependency" msgstr "dependència no vàlida" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Es requereix la versió" @@ -1667,22 +1667,22 @@ msgstr "" "ha fallat la consulta del fitxer spec %s, no es pot analitzar " "sintàcticament\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s és un Delta RPM i no es pot instal·lar directament\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Les dades (%s) no estan disponibles al paquet %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "el paquet %s ja s'ha afegit, s'està ignorant %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "el paquet %s ja es va afegir, s'està reemplaçant per %s\n" @@ -1759,26 +1759,26 @@ msgstr "(deconegut)" msgid "(not a string)" msgstr "(no és una cadena)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s s'ha desat com a %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s s'ha creat com a %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: ha fallat la supressió: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "directori" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "fitxer" @@ -2370,12 +2370,12 @@ msgstr "s'espera un paquet de codi font, però s'ha trobat un de binari\n" msgid "source package contains no .spec file\n" msgstr "el paquet font no conté un fitxer .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "ha fallat el desempaquetat de l'arxiu%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " al fitxer " @@ -2675,43 +2675,55 @@ msgstr "suporta els fitxers superior als 4 GB" msgid "support for rich dependencies." msgstr "no verifiquis les dependències dels paquets" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Es requereix la versió" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "dependència no vàlida" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c sense terminar: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "dependència no vàlida" @@ -3215,23 +3227,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "No es pot tornar a carregar la capçalera de signatura.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Capçalera " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "Resum MD5:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Capçalera de resum SHA1:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3350,74 +3362,74 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "no s'ha establert cap dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: s'està ignorant" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "s'ha produït un error (%d) en emmagatzemar el registre #%d a %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: ha fallat regexec: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: ha fallat regcomp: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: s'està ignorant" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: s'ha obtingut malmesa la capçalera #%u -- s'ignora.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: no s'ha pogut llegir la capçalera a 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "no s'ha establert el dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "ha fallat en crear el directori %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "la capçalera #%u en la base de dades és incorrecta -- s'ignora.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "no es pot afegir el registre originalment a %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "no s'ha pogut reconstruir la base de dades: la base de dades original " "continua al seu lloc\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "no s'ha pogut reemplaçar la base de dades antiga amb la nova\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "reemplaçeu els fitxers a %s amb fitxers de %s per a recuperar-ho" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "no s'ha pogut suprimir el directori %s: %s\n" diff --git a/po/cmn.po b/po/cmn.po index dacfa4fb0..df757c3f4 100644 --- a/po/cmn.po +++ b/po/cmn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Chinese (Mandarin) (http://www.transifex.com/rpm-team/rpm/" @@ -1337,7 +1337,7 @@ msgstr "" msgid "invalid dependency" msgstr "無效的依存性" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "所需版本" @@ -1610,22 +1610,22 @@ msgstr "找不到 %s：\n" msgid "query of specfile %s failed, can't parse\n" msgstr "%s 規格檔查詢失敗，無法剖析\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s 是個差異 RPM 而無法直接安裝\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "未支援的酬載 (%s) 於套件 %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "套件 %s 已被加入，跳過 %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "套件 %s 已被加入，以 %s 替換\n" @@ -1702,26 +1702,26 @@ msgstr "(不明)" msgid "(not a string)" msgstr "(不是字串)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s 已被另存為 %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s 已建立為 %s \n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s：移除失敗：%s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "目錄" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "檔案" @@ -2308,12 +2308,12 @@ msgstr "預期是原始碼套件，但卻找到二進位套件\n" msgid "source package contains no .spec file\n" msgstr "原始碼套件內未包含 .spec 檔案\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "解包封存檔失敗 %s%s：%s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " 於檔案 " @@ -2603,43 +2603,55 @@ msgstr "" msgid "support for rich dependencies." msgstr "不驗證套件相依性" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "所需版本" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "無效的依存性" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "未終結的 %c：%s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "無效的依存性" @@ -3137,23 +3149,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "無法重新載入簽名標頭。\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "標頭 " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 摘要：" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "標頭 SHA1 摘要：" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3272,72 +3284,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "尚未設定 dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader：跳過" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "儲存記錄 #%2$d 到 %3$s 時發生錯誤(%1$d)\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s：regexec 失敗：%s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s：regcomp 失敗：%s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator：跳過" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb：已擷取損壞的標頭 #%u -- 跳過。\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s：無法讀取位於 0x%x 的標頭\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "尚未設定 dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "建立目錄 %s 時失敗：%s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "在資料庫中有不當的標頭 #%u -- 跳過。\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "無法加入原本位於 %u 的記錄\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "重建資料庫時失敗：原來的資料庫保持原狀\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "以新的資料庫取代舊的資料庫時失敗！\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "以 %2$s 的檔案取代 %1$s 的檔案來復原" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "移除目錄時失敗 %s：%s\n" diff --git a/po/cs.po b/po/cs.po index 8e59c5db2..d0701a240 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Czech (http://www.transifex.com/rpm-team/rpm/language/cs/)\n" @@ -1345,7 +1345,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1618,22 +1618,22 @@ msgstr "Selhalo vyhledání %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s is a Delta RPM a nemůže být přímo instalován\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Nepodporovaný payload (%s) in balíčku %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "balíček %s byl již přidán, přeskakuji %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "balíček %s byl již přidán, nahrazuji ho s %s\n" @@ -1710,26 +1710,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s uloženo jako %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s vytvořen jako %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2319,12 +2319,12 @@ msgstr "očekávám balíček se zdrojovými kódy, nalezen však binární\n" msgid "source package contains no .spec file\n" msgstr "zdrojový balíček neobsahuje .spec soubor\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbalování archívu selhalo %s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " na souboru " @@ -2615,41 +2615,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "nekontrolovat závislosti balíčků" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Neukončené %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3146,23 +3158,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Nemohu znovu přečíst hlavičku podpisu.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Hlavička " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 digest:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "SHA1 digest v hlavičce:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3281,72 +3293,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "nebyla nastavena dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: přeskakuji" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba(%d) ukládání záznamu #%d do %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec selhal: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp selhal: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: přeskakuji" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: poškozená hlavička #%u získáno -- přeskakuji.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: nemohu číst hlavičku na 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "žádný dbpath nebyl nastaven" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "selhání při vytváření adresáře %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "hlavička #%u v databázi je špatná -- přeskakuji.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "nemohu přidat záznam původně na %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "selhalo znovusestavení databáze: původní databáze zůstává na místě\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "selhalo nahrazení staré databáze novou databází!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahraď soubory v %s soubory z %s k obnovení" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "selhalo odstranění adresáře %s: %s\n" diff --git a/po/da.po b/po/da.po index dff6f15e1..fae148646 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Danish (http://www.transifex.com/rpm-team/rpm/language/da/)\n" @@ -1333,7 +1333,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1608,22 +1608,22 @@ msgstr "Kunne ikke finde %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "forespørgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1700,26 +1700,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s gemt som %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s oprettet som %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2311,12 +2311,12 @@ msgstr "kildepakke forventet, binær fundet\n" msgid "source package contains no .spec file\n" msgstr "kildepakke indeholder ingen .spec-fil\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "udpakning af arkiv mislykkedes%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " for fil " @@ -2606,41 +2606,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "undlad at tjekke pakkers afhængighedskrav" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Uafsluttet %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3140,23 +3152,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3275,72 +3287,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "der er ikke sat nogen dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan ikke læse hoved ved 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "der ikke sat nogen dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunne ikke genopbygge database: original-databasen beholdes\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "kunne ikke erstatte gammel database med ny database!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "erstat filer i %s med filer fra %s for at genoprette" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunne ikke fjerne katalog %s: %s\n" diff --git a/po/de.po b/po/de.po index fc1acfe8f..e5da1f33d 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-13 10:35+0000\n" "Last-Translator: Lubos Kardos \n" "Language-Team: German (http://www.transifex.com/rpm-team/rpm/language/de/)\n" @@ -1384,7 +1384,7 @@ msgstr "" msgid "invalid dependency" msgstr "Ungültige Abhängigkeit" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Version wird benötigt" @@ -1666,22 +1666,22 @@ msgid "query of specfile %s failed, can't parse\n" msgstr "" "Abfragen der Spec-Datei %s fehlgeschlagen, kann nicht ausgewertet werden\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s ist ein Delta-RPM und kann nicht direkt installiert werden\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Nicht unterstütze Nutzdaten (%s) in Paket %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "Paket %s wurde bereits hinzugefügt, %s wird übersprungen\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "Paket %s wurde bereits hinzugefügt, wird durch %s ersetzt\n" @@ -1758,26 +1758,26 @@ msgstr "(unbekannt)" msgid "(not a string)" msgstr "(keine Zeichenkette)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s als %s gesichert\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s erstellt als %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: Entfernen fehlgeschlagen: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "Verzeichnis" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "Datei" @@ -2372,12 +2372,12 @@ msgstr "Quell-Paket erwartet, Binär-Paket entdeckt\n" msgid "source package contains no .spec file\n" msgstr "Quell-Paket enthält keine Spec-Datei\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Entpacken des Archivs fehlgeschlagen%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " bei Datei " @@ -2677,43 +2677,55 @@ msgstr "Dateien größer als 4 GB werden unterstützt" msgid "support for rich dependencies." msgstr "Keine Überprüfung der Paket-Abhängigkeiten" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Version wird benötigt" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "Ungültige Abhängigkeit" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Nicht terminiertes %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "Ungültige Abhängigkeit" @@ -3217,23 +3229,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Header der Signatur kann nicht erneut geladen werden.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Header " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5-Prüfsumme: " -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "SHA1-Prüfsumme des Headers: " -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "Signaturüberprüfung: FALSCHE PARAMETER (%d %p %d %p %p)" @@ -3352,73 +3364,73 @@ msgstr "%s-Index kann nicht mittels %s geöffnet werden - %s (%d)\n" msgid "no dbpath has been set\n" msgstr "Datenbank-Pfad wurde nicht gesetzt\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: wird übersprungen" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "Fehler(%d) beim Speichern des Datensatzes #%d in %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec fehlgeschlagen: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp fehlgeschlagen: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: wird übersprungen" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: Beschädigten Header #%u erhalten -- wird übersprungen.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: Header bei 0x%x kann nicht gelesen werden\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "Datenbank-Pfad wurde nicht gesetzt" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "Anlegen des Verzeichnisses %s fehlgeschlagen: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "Header #%u in der Datenbank ist ungültig -- wird übersprungen.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "Ursprünglicher Datensatz %u kann nicht hinzugefügt werden\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "Neu bauen der Datenbank fehlgeschlagen: Datenbank verbleibt entsprechend\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "Konnte die alte Datenbank nicht durch die neue ersetzen!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "Für eine Wiederherstellung Dateien in %s durch Dateien aus %s ersetzen" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "Entfernen des Verzeichnisses %s fehlgeschlagen: %s\n" diff --git a/po/el.po b/po/el.po index 788a077ad..53d04a338 100644 --- a/po/el.po +++ b/po/el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Greek (http://www.transifex.com/rpm-team/rpm/language/el/)\n" @@ -1323,7 +1323,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1596,22 +1596,22 @@ msgstr "" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1688,26 +1688,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2288,12 +2288,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2582,41 +2582,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3113,23 +3125,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3248,72 +3260,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/eo.po b/po/eo.po index 0ff6e532a..282a3c0c5 100644 --- a/po/eo.po +++ b/po/eo.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Esperanto (http://www.transifex.com/rpm-team/rpm/language/" @@ -1355,7 +1355,7 @@ msgstr "" msgid "invalid dependency" msgstr "nevalida dependaĵo" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Eldono necesas" @@ -1632,22 +1632,22 @@ msgstr "Malsukcesis trovi: %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "mendo de spec-dosiero %s malsukcesis, ne eblas analizi\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s estas Pera RPM kaj ne estas rekte instalebla\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Ne komprenata ŝarĝo (%s) en pakaĵo %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "pakaĵo %s jam aldoniĝis, preterlasanta %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakaĵo %s jam aldoniĝis, anstataŭigante per %s\n" @@ -1724,26 +1724,26 @@ msgstr "(nekonata)" msgid "(not a string)" msgstr "(ne ĉeno)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s konservita kiel %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s kreita kiel %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: forigo malsukcesis: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "dosierujo" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "dosiero" @@ -2332,12 +2332,12 @@ msgstr "fontoteksta pakaĵo atendita, plenumebla trovita\n" msgid "source package contains no .spec file\n" msgstr "fontoteksta pakaĵo enhavas neniun spec-dosieron\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "Elpakado de arkivo malsukcesis%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " ĉe dosiero" @@ -2629,43 +2629,55 @@ msgstr "" msgid "support for rich dependencies." msgstr "ne konstati pakaĵo-dependaĵojn" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Eldono necesas" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "nevalida dependaĵo" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Nefinita %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "nevalida dependaĵo" @@ -3163,23 +3175,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Ne eblas reŝargi pretendo-kapon.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Kapo" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5-resumo:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "SHA1-resuma kapo:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3298,72 +3310,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "neniu dbpath estis valorizita\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: preterlasanta" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "eraro (%d) konservanta rikordon #%d al en %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec malsukcesis: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp malsukcesis: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: preterlasanta" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: difektita kapo #%u akirita -- preterlasanta.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ne eblas legi kapon en 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "neniu dbpath estis valorizita" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "malsukcesis krei dosierujon %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "kapo #%u en datumbazo estas fuŝa -- preterlasanta.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "ne eblas aldoni rikordon devene el %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "malsukcesis remunti datumbazon: neŝanĝita datumbazo restas\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "malsukcesis anstataŭigi la malnovan datumbazon per la nova!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "anstataŭigi dosierojn en %s per dosieroj el %s por reatingi" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "malsukcesis reatingi dosierujon %s: %s\n" diff --git a/po/es.po b/po/es.po index 2f6002b9b..eee536e3c 100644 --- a/po/es.po +++ b/po/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Spanish (http://www.transifex.com/rpm-team/rpm/language/es/)\n" @@ -1392,7 +1392,7 @@ msgstr "" msgid "invalid dependency" msgstr "dependencia no válida" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "se necesita una versión" @@ -1673,22 +1673,22 @@ msgstr "Falló la búsqueda de %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "la consulta del archivo spec %s falló, no se pudo analizar\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s es un RPM Delta y no puede ser instalado directamente\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Carga útil (%s) no soportada en el paquete %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "el paquete %s ya fue añadido, omitiendo %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "el paquete %s ya fue añadido, reemplazando con %s\n" @@ -1765,26 +1765,26 @@ msgstr "(desconocido) " msgid "(not a string)" msgstr "(no es una cadena)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s guardado como %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s creado como %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: falló al eliminar: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "directorio" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "archivo" @@ -2376,12 +2376,12 @@ msgstr "se esperaba el paquete fuente, paquete binario encontrado\n" msgid "source package contains no .spec file\n" msgstr "el paquete fuente no contiene archivo .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "falló el desempaquetado de archivos %s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " en archivo" @@ -2683,43 +2683,55 @@ msgstr "" msgid "support for rich dependencies." msgstr "no verificar las dependencias del paquete" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "se necesita una versión" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "dependencia no válida" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "No terminado %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "dependencia no válida" @@ -3225,23 +3237,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Incapaz de recargar el encabezado de la firma\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Encabezado" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "Resumen MD5: " -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Resumen SHA1 del encabezado:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3360,75 +3372,75 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "no se ha establecido dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: omitiendo" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "error(%d) almacenando registro #%d en %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec falló: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp falló: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: omitiendo" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: encabezado dañado #%u recuperada -- omitiendo.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: no se pudo leer encabezado en 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "no se ha establecido dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "no se pudo crear el directorio %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "encabezado #%u erróneo en la base de datos -- omitiendo.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "no se puede añadir el registro original en %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "falló la reconstrucción de la base de datos: la base de datos original " "permanece en su lugar\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" "¡falló el remplazo de la base de datos antigua con la nueva base de datos!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "reemplazar archivos en %s con los archivos de %s a recuperar" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falló la eliminación del directorio %s: %s\n" diff --git a/po/fi.po b/po/fi.po index 8b9a2d6ef..293f4e388 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Finnish (http://www.transifex.com/rpm-team/rpm/language/fi/)\n" @@ -1342,7 +1342,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1615,22 +1615,22 @@ msgstr "%s:ää ei löytynyt\n" msgid "query of specfile %s failed, can't parse\n" msgstr "määrittelytiedoston %s kysely epäonnistui\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s on Delta RPM eikä sitä voida suoraan asentaa\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Tuntematon kuorma (%s) paketissa %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "paketti %s on jo lisätty, ohitetaan %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paketti %s oli jo lisätty, korvataan %s:lla\n" @@ -1707,26 +1707,26 @@ msgstr "(tuntematon)" msgid "(not a string)" msgstr "(ei ole merkkijono)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s talletettiin %s:nä\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s luotu %s:na\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2316,12 +2316,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arkiston %s%s purkaminen epäonnistui: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " tiedostolle " @@ -2611,41 +2611,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "älä tarkista paketin riippuvuuksia" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Päättämätön %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3144,23 +3156,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Allekirjoitusotsikon uudelleenlataus ei onnistu\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Otsikko " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3279,73 +3291,73 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "dbpath ei ole asetettu\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: ohitetaan" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "virhe(%d) tallennettaessa tietuetta #%d %s:ään\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec epäonnistui: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp epäonnistui: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: ohitetaan" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: ohitetaan vioittunut otsikkotietue #%u.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: otsikkoa ei voida lukea (0x%x)\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "dbpath ei ole asetettu" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "hakemiston %s luonti epäonnistui: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "tietue numero %u tietokannassa viallinen -- ohitetaan.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "alkupäisen tietueen %u lisäys ei onnistu\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "tietokannan uudelleenrakennus epäonnistui: alkuperäinen kanta paikallaan\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "vanhan tietokannan korvaus uudella epäonnistui!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "korvaa tiedostot %s:ssä tiedostoilla %s:stä korjataksesi" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "hakemiston %s poisto epäonnistui: %s\n" diff --git a/po/fr.po b/po/fr.po index f12b0dfc0..7319f7c8e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-07-05 17:54+0000\n" "Last-Translator: Mathieu LEFEBVRE Mathdabomb \n" "Language-Team: French (http://www.transifex.com/rpm-team/rpm/language/fr/)\n" @@ -1382,7 +1382,7 @@ msgstr "" msgid "invalid dependency" msgstr "dépendance invalide" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Version requise" @@ -1662,22 +1662,22 @@ msgstr "" "échec de la requête sur le fichier spec %s, impossible de faire l'analyser " "syntaxique\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s est un Delta RPM et ne peut être installé directement\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Charge (%s) non pris en charge dans le paquet %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "le paquet %s a déjà été rajouté, %s ignoré\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "le paquet %s a déjà été rajouté, replacé par %s\n" @@ -1754,26 +1754,26 @@ msgstr "(inconnu)" msgid "(not a string)" msgstr "(pas une chaîne)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s sauvé en tant que %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s créé en tant que %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s : échec de la suppression : %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "répertoire" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "fichier" @@ -2371,12 +2371,12 @@ msgstr "paquet source attendu, paquet binaire trouvé\n" msgid "source package contains no .spec file\n" msgstr "le paquet source ne contient pas de fichier .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "échec du déballage de l'archive %s%s : %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " dans fichier " @@ -2676,43 +2676,55 @@ msgstr "supporte les fichiers supérieurs à 4GB" msgid "support for rich dependencies." msgstr "ne pas vérifier les dépendances du paquet" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Version requise" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "dépendance invalide" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c non terminé: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "dépendance invalide" @@ -3221,23 +3233,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Impossible de recharger l'entête de la signature.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Entête " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 :" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Hachage de l'entête SHA1 :" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "Vérification de signature: MAUVAIS PARAMETRES (%d %p %d %p %p)" @@ -3356,76 +3368,76 @@ msgstr "impossible d'ouvrir l'index %s en utilisant %s - %s (%d)\n" msgid "no dbpath has been set\n" msgstr "aucun dbpath n'a été fourni\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader : ignoré" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "erreur(%d) en stockant l'article nº%d dans %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s : regexec a échoué :%s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s : regcomp a échoué :%s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator : ignoré" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb : l'entête #%u endommagée a été récupérée -- ignoré.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s : impossible de lire l'entête à 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "aucun dbpath fournit" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "Impossible de créer le répertoire %s : %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "l'entête #%u dans la base de données n'est pas bon -- ignoré.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "impossible d'ajouter l'article qui était au départ à %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "Ne peut reconstruire la base de données : la base originale reste telle " "qu'elle est\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "Ne peut remplacer la vieille base de données par la nouvelle!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" "remplacer les fichiers dans %s avec les fichiers de %s pour faire une " "récupération" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "Ne peut détruire le répertoire %s : %s\n" diff --git a/po/is.po b/po/is.po index e27ac0ce8..df6d4c8cf 100644 --- a/po/is.po +++ b/po/is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Icelandic (http://www.transifex.com/rpm-team/rpm/language/" @@ -1322,7 +1322,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1595,22 +1595,22 @@ msgstr "gat ekki fundið %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1687,26 +1687,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s vistað sem %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s búið til sem %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2291,12 +2291,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "pakkinn inniheldur enga .spec skrá\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2586,41 +2586,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "ekki skoða pakkaskilyrðin" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3117,23 +3129,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3252,72 +3264,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index 4b9dfd254..76e929f7f 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Italian (http://www.transifex.com/rpm-team/rpm/language/it/)\n" @@ -1383,7 +1383,7 @@ msgstr "" msgid "invalid dependency" msgstr "Dipendenza non valida" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Versione richiesta" @@ -1662,22 +1662,22 @@ msgid "query of specfile %s failed, can't parse\n" msgstr "" "interrogazione di specfile %s fallita, impossibile eseguire il parsing\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s è un Delta RPM e non può essere installato direttamente\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Payload non supportato (%s) nel pacchetto %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "il pacchetto %s è già stato aggiunto, salto %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "il pacchetto %s è stato già aggiunto, sostituzione con %s in corso\n" @@ -1754,26 +1754,26 @@ msgstr "(sconosciuto)" msgid "(not a string)" msgstr "(non è una stringa)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s salvato come %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s creato come %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: rimozione fallita: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "directory" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "file" @@ -2369,12 +2369,12 @@ msgstr "pacchetto sorgente atteso, trovato binario\n" msgid "source package contains no .spec file\n" msgstr "il pacchetto sorgente non contiene alcun file .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "estrazione archivio fallita%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " sul file " @@ -2676,43 +2676,55 @@ msgstr "supporto per file più grandi di 4GB" msgid "support for rich dependencies." msgstr "non verificare le dipendenze dei pacchetti" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Versione richiesta" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "Dipendenza non valida" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c non terminato: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "Dipendenza non valida" @@ -3219,23 +3231,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Impossibile ricaricare intestazione della firma.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Header " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 digest:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Digest SHA1 header:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "Verifica signature: PARAMETRI NON VALIDI (%d %p %d %p %p)" @@ -3354,72 +3366,72 @@ msgstr "impossibile aprire l'indice %s usando%s - %s (%d)\n" msgid "no dbpath has been set\n" msgstr "non è stato impostato alcun dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: salto" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "errore(%d) nella memorizzazione del record #%d in %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec fallito: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp fallito: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: salto" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: intestazione #%u danneggiata -- viene omessa.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: impossibile leggere intestazione 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "non è stato impostato alcun dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "impossibile creare la cartella %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "l'intestazione #%u nel database non è valida -- viene omessa.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "impossibile aggiungere il record originariamente su %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "ricompilazione database fallita: il database originale rimane in uso\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "sostituzione del vecchio database con il nuovo database fallita!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "per eseguire un ripristino sostituire i file in %s con i file di %s" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "rimozione della directory %s fallita: %s\n" diff --git a/po/ja.po b/po/ja.po index 33da58d1d..01f906ad0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Japanese (http://www.transifex.com/rpm-team/rpm/language/" @@ -1355,7 +1355,7 @@ msgstr "" msgid "invalid dependency" msgstr "無効な依存性" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "バージョン要件" @@ -1632,22 +1632,22 @@ msgstr "%s の検索に失敗しました:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "スペックファイル %s の問い合わせに失敗しました。解析できません。\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s はデルタ RPM で、直接インストールできません。\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "パッケージ %s 内にサポートしていないペイロード (%s) です。\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "パッケージ %s は既に追加されています。%s を飛ばします。\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "パッケージ %s は既に追加されています。 %s と置換します。\n" @@ -1724,26 +1724,26 @@ msgstr "(不明) " msgid "(not a string)" msgstr "(文字列でない)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s は %s として保存されました。\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s は %s として作成されました。\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: 削除に失敗しました: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "ディレクトリー" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "ファイル" @@ -2334,12 +2334,12 @@ msgstr "ソースパッケージが期待されますが、これはバイナリ msgid "source package contains no .spec file\n" msgstr "ソースパッケージに .spec ファイルがありません\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "アーカイブの伸長に失敗%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr ": ファイル " @@ -2634,43 +2634,55 @@ msgstr "" msgid "support for rich dependencies." msgstr "パッケージの依存関係の検証を行いません。" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "バージョン要件" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "無効な依存性" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "終端されていない %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "無効な依存性" @@ -3175,23 +3187,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "署名ヘッダーの再読み込みができません。\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "ヘッダー " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 ダイジェスト:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "ヘッダー SHA1 ダイジェスト:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3310,73 +3322,73 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "dbpath が設定されていません\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: スキップします。" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "エラー(%d) - レコード #%d を %s に格納時\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: 正規表現に失敗しました: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp に失敗しました: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: スキップします。" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" "rpmdb: 破損したヘッダーインスタンス #%u を取得しました。スキップします。\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ヘッダーを読むことができません (0x%x)\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "dbpath が設定されていません。" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "ディレクトリー %s の作成に失敗しました: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "データベース中のヘッダー #%u は不正です -- スキップします。\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "元々 %u にあったレコードを追加できません。\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "データベースの再構築に失敗: オリジナルのデータベースは残っています。\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "古いデータベースを新しいデータベースで置き換えるのに失敗!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "復元するには %s 内のファイルを %s 内のファイルで置き換えて下さい" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ディレクトリー %s の削除に失敗しました: %s\n" diff --git a/po/ko.po b/po/ko.po index 2dcfc69bf..32d06221b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Korean (http://www.transifex.com/rpm-team/rpm/language/ko/)\n" @@ -1336,7 +1336,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1610,22 +1610,22 @@ msgid "query of specfile %s failed, can't parse\n" msgstr "" "%s spec 파일을 질의하는데 실패했습니다, 파일을 처리(parse)할 수 없습니다\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1702,26 +1702,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s(이)가 %s(으)로 저장되었습니다\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s(이)가 %s(으)로 생성되었습니다\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2317,12 +2317,12 @@ msgstr "소스 패키지가 필요하며, 바이너리가 검색되었습니다\ msgid "source package contains no .spec file\n" msgstr "소스 패키지에 .spec 파일이 포함되어 있지 않습니다\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "아카이브를 푸는데 실패함%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " 다음 파일의 " @@ -2612,41 +2612,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "패키지의 의존성을 검사하지 않습니다" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c(이)가 종료되지 않음: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3144,23 +3156,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "서명(signature) 헤더를 다시 읽어올 수 없습니다.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3279,73 +3291,73 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "db경로가 설정되어 있지 않습니다\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x의 헤더를 읽을 수 없습니다\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "db경로가 설정되어 있지 않습니다" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "%u에 처음부터 레코드를 추가할 수 없습니다\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "데이터베이스를 재구축하는데 실패함: 원본 데이터베이스는 그대로 유지됩니다\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "이전 데이터베이스를 새로운 데이터베이스로 교체하는데 실패했습니다!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "복구하기 위해 %2$s의 파일을 %1$s의 파일로 교체합니다" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s 디렉토리를 삭제하는데 실패함: %s\n" diff --git a/po/ms.po b/po/ms.po index a5d86314b..6a47f62c2 100644 --- a/po/ms.po +++ b/po/ms.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Malay (http://www.transifex.com/rpm-team/rpm/language/ms/)\n" @@ -1320,7 +1320,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1593,22 +1593,22 @@ msgstr "" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1685,26 +1685,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2285,12 +2285,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2579,41 +2579,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3110,23 +3122,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Pengepala" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Digest SHA1 pengepala:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3245,72 +3257,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec gagal: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp gagal: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "gagal untuk mencipta direktori %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "gagal untuk membuang direktori %s: %s\n" diff --git a/po/nb.po b/po/nb.po index 51556b6a0..f1d7f0f60 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/rpm-team/rpm/" @@ -1339,7 +1339,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1612,22 +1612,22 @@ msgstr "Klarte ikke å finne %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1704,26 +1704,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s lagret som %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s opprettet som %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2312,12 +2312,12 @@ msgstr "kildepakke forventet, binær funnet\n" msgid "source package contains no .spec file\n" msgstr "kildepakke inneholder ikke en .spec-fil\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2607,41 +2607,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "ikke verifiser pakkeavhengigheter" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3138,23 +3150,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3273,72 +3285,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/nl.po b/po/nl.po index e0f9095bc..1f742ef43 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Dutch (http://www.transifex.com/rpm-team/rpm/language/nl/)\n" @@ -1321,7 +1321,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1594,22 +1594,22 @@ msgstr "" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1686,26 +1686,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2286,12 +2286,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2580,41 +2580,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3111,23 +3123,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3246,72 +3258,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 4f4715d1a..381368495 100644 --- a/po/pl.po +++ b/po/pl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-27 16:17+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/rpm-team/rpm/language/pl/)\n" @@ -1364,7 +1364,7 @@ msgstr "" msgid "invalid dependency" msgstr "nieprawidłowa zależność" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Wersja jest wymagana" @@ -1641,23 +1641,23 @@ msgstr "Odnalezienie %s się nie powiodło:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "odpytanie pliku spec %s się nie powiodło, nie można przetworzyć\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" "%s jest pakietem RPM Delta i nie może zostać bezpośrednio zainstalowany\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Nieobsługiwane dane (%s) w pakiecie %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "pakiet %s został już dodany, pomijanie %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "pakiet %s został już dodany, zastępowanie %s\n" @@ -1734,26 +1734,26 @@ msgstr "(nieznany)" msgid "(not a string)" msgstr "(nie jest ciągiem)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s zapisano jako %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s utworzono jako %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: usunięcie się nie powiodło: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "katalog" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "plik" @@ -2346,12 +2346,12 @@ msgstr "oczekiwano pakietu źródłowego, odnaleziono binarny\n" msgid "source package contains no .spec file\n" msgstr "pakiet źródłowy nie zawiera pliku .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozpakowanie archiwum się nie powiodło%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " na pliku " @@ -2645,43 +2645,55 @@ msgstr "obsługa plików większych niż 4 GB" msgid "support for rich dependencies." msgstr "bez sprawdzania zależności pakietu" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Wersja jest wymagana" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "nieprawidłowa zależność" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Niezakończone %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "nieprawidłowa zależność" @@ -3180,23 +3192,23 @@ msgstr "pad sigh(%zd): BŁĘDNE, odczyt %zd bajtów" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "sigSize sigh(%zd): BŁĘDNE, fstat(2) się nie powiodło" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Nie można ponownie wczytać nagłówka podpisu.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Nagłówek " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "Skrót MD5:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Skrót SHA1 nagłówka:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "Sprawdzenie podpisu: BŁĘDNE PARAMETRY (%d %p %d %p %p)" @@ -3315,74 +3327,74 @@ msgstr "nie można otworzyć indeksu %s używając %s — %s (%d)\n" msgid "no dbpath has been set\n" msgstr "ścieżka bazy danych nie została ustawiona\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: pomijanie" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "błąd(%d) podczas zapisywania wpisu #%d do %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec się nie powiodło: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp się nie powiodło: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: pomijanie" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: pobrano uszkodzony nagłówek #%u — pomijanie.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: nie można odczytać nagłówka pod 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "ścieżka bazy danych nie została ustawiona" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "utworzenie katalogu %s się nie powiodło: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "nagłówek #%u w bazie danych jest błędny — pomijanie.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "nie można dodać wpisu będącego pierwotnie przy %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "przebudowanie bazy danych się nie powiodło: pierwotna baza danych pozostała " "na miejscu\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "zamiana poprzedniej bazy danych na nową się nie powiodła.\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "aby odzyskać, należy zastąpić pliki w %s plikami z %s" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "usunięcie katalogu %s się nie powiodło: %s\n" diff --git a/po/pt.po b/po/pt.po index e52504ca4..9ba301dab 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Portuguese (http://www.transifex.com/rpm-team/rpm/language/" @@ -1351,7 +1351,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1624,22 +1624,22 @@ msgstr "Não consegui encontrar o %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "a pesquisa do ficheiro spec %s falhou, não consigo analisar\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1716,26 +1716,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s gravado como %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s criado como %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2328,12 +2328,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "o pacote de código-fonte não contem um ficheiro .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a abertura do pacote falhou%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " no ficheiro " @@ -2623,41 +2623,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "não verifica as dependências do pacote" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c não terminado: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3157,23 +3169,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Não consegui reler o cabeçalho do assinatura.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3292,73 +3304,73 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "não foi definido o dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: não consigo ler o cabeçalho em 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "não foi definido o dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "não consigo adicionar o registo originalmente em %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "falhou a reconstrução da base de dados: a base de dados original mantém-se\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "falhou a substituição da base de dados antiga pela nova!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falhou a remoção da directoria %s: %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index daa28dfec..d876e3994 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rpm-team/rpm/" @@ -1374,7 +1374,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1647,22 +1647,22 @@ msgstr "Falha ao localizar %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "a consulta ao specfile %s falhou, não foi possível analisá-lo\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s é um Delta RPM e não pode ser instalado diretamente\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Carga útil (%s) não suportada no pacote %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "o pacote %s já foi adicionado, ignorando %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "o pacote %s já foi adicionado, substituindo por %s\n" @@ -1739,26 +1739,26 @@ msgstr "(desconhecido)" msgid "(not a string)" msgstr "(não é uma sequência)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s salvo como %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s criado como %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2348,12 +2348,12 @@ msgstr "um pacote fonte era esperado, mas um binário foi encontrado\n" msgid "source package contains no .spec file\n" msgstr "o pacote fonte não contém um arquivo .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "a descompactação do arquivo falhou %s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " no arquivo " @@ -2652,41 +2652,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "não verificar as dependências do pacote" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c incompleto: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3186,23 +3198,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Não foi possível recarregar o cabeçalho da assinatura.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Cabeçalho " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "Digest MD5:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Digest do cabeçalho SHA1:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3321,74 +3333,74 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "nenhum dbpath foi definido\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: ignorando" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "erro (%d) ao armazenar o registro #%d em %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: o regexec falhou: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: o regcomp falhou: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: ignorando" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: cabeçalho danificado #%u recuperado -- ignorando.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: não foi possível ler o cabeçalho em 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "nenhum dbpath foi definido" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "falha ao criar o diretório %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "o cabeçalho #%u do banco de dados é inválido -- ignorando.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "não é possível adicionar o registro originalmente em %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "falha ao reconstruir o banco de dados: o banco de dados original permanece " "no lugar\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "falha ao substituir o banco de dados velho pela novo!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "substituir arquivos em %s com arquivos de %s para recuperação" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "falha ao remover o diretório %s: %s\n" diff --git a/po/rpm.pot b/po/rpm.pot index 1ec7d4998..28f8857b6 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1320,7 +1320,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1593,22 +1593,22 @@ msgstr "" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1685,26 +1685,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2285,12 +2285,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2579,41 +2579,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3110,23 +3122,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3245,72 +3257,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 8768372d6..df14563cc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Russian (http://www.transifex.com/rpm-team/rpm/language/ru/)\n" @@ -1358,7 +1358,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1631,22 +1631,22 @@ msgstr "Невозможно найти %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "запрос файла спецификации %s не удался, невозможно разобрать файл\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s является Delta RPM и не может быть установлен напрямую\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "пакет %s был уже добавлен, пропускаем %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "пакет %s уже был добавлен, заменяется %s\n" @@ -1723,26 +1723,26 @@ msgstr "(неизвестный)" msgid "(not a string)" msgstr "(не строка)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s сохранен как %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s создан как %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2333,12 +2333,12 @@ msgstr "обнаружен двоичный пакет вместо ожидае msgid "source package contains no .spec file\n" msgstr "исходный пакет не содержит файла спецификации\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "распаковка архива не удалась%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " на файле " @@ -2628,41 +2628,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "не проверять зависимости пакета" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Незакрытая %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3160,23 +3172,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Невозможно перезагрузить заголовок подписи.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Заголовок " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3295,73 +3307,73 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "параметер dbpath не установлен\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "ошибка (%d) сохранения записи #%d в %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: получен поврежденный заголовок #%u -- пропускается.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: невозможно прочесть заголовок в 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "параметер dbpath не установлен" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "заголовок номер %u в базе данных неверный -- пропускается.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "невозможно добавить запись (первоначально в %u)\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "перестроение базы данных не удалось, старая база данных остается на месте\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "невозможно заменить старую базу данных на новую!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "файлы в %s заменяются файлами из %s для восстановления" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "ошибка удаления каталога %s: %s\n" diff --git a/po/sk.po b/po/sk.po index 713990f90..bf5a92589 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-13 10:17+0000\n" "Last-Translator: Lubos Kardos \n" "Language-Team: Slovak (http://www.transifex.com/rpm-team/rpm/language/sk/)\n" @@ -1356,7 +1356,7 @@ msgstr "" msgid "invalid dependency" msgstr "Neplatná závislosť" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Vyžadovaná verzia" @@ -1630,22 +1630,22 @@ msgstr "Zlyhalo vyhľadávanie %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "otázka na spec-súbor %s zlyhala, nie je možné analyzovať\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s je Delta RPM a nemôže byž priamo inštalovaný\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Nepodporovaný payload (%s) v balíčku %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "balíček %s už bol pridaný, %s sa preskakuje\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "balíček %s už bol pridaný, nahradzuje sa s %s\n" @@ -1722,26 +1722,26 @@ msgstr "(neznámy)" msgid "(not a string)" msgstr "(nie je reťazec)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s uložený ako %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s vytvorený ako %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2332,12 +2332,12 @@ msgstr "očakáva sa balíček so zdrojovým kódom, nájdený bol binárny\n" msgid "source package contains no .spec file\n" msgstr "balíček so zdrojovými kódmi neobsahuje .spec súbor\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "rozbaľovanie archívu zlyhalo %s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " pre súbor " @@ -2628,43 +2628,55 @@ msgstr "" msgid "support for rich dependencies." msgstr "neoverovať závislosti balíka" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Vyžadovaná verzia" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "Neplatná závislosť" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Neukončené %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "Neplatná závislosť" @@ -3163,23 +3175,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Nie je možné znova načítať hlavičku podpisu.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Hlavička" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 digest:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "SHA1 digest v hlavičke:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3298,72 +3310,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "nenastavená dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: preskakuje sa" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "chyba(%d) ukladania záznamu #%d do %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec zlyhal: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp zlyhal: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: preskakuje sa" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: poškodená hlavička #%u získaná -- preskakuje sa.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: nie je možné čítať hlavičku na 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "nebola nastavená žiadna dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "zlyhanie pri vytváraní priečinka %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "hlavička #%u v databázy je zlá -- preskakuje sa.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "nie je možné pridať záznam pôvodne na %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "zlyhalo znovuzostavenie databázy: pôvodná databáza zostáva na mieste\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "nepodarilo sa nahradiť starú databázu novou!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "nahradiť súbory v %s súbormi z %s pre obnovenie" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "nepodarilo sa odstrániť adresár %s: %s\n" diff --git a/po/sl.po b/po/sl.po index 647d3a229..fa55a3e36 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Slovenian (http://www.transifex.com/rpm-team/rpm/language/" @@ -1324,7 +1324,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1597,22 +1597,22 @@ msgstr "" msgid "query of specfile %s failed, can't parse\n" msgstr "poizvedba po datoteki spec. %s je bila neuspešna, razčlemba ni možna\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1689,26 +1689,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2295,12 +2295,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " za datoteko " @@ -2590,41 +2590,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "brez preverjanja soodvisnosti paketa" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3121,23 +3133,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3256,72 +3268,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "dbpath ni nastavljena" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspešna!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspešna odstranitev imenika %s: %s\n" diff --git a/po/sr.po b/po/sr.po index 992f20b1f..bde218ce8 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Serbian (http://www.transifex.com/rpm-team/rpm/language/sr/)\n" @@ -1345,7 +1345,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1618,22 +1618,22 @@ msgstr "Неуспело тражење %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "упит на датотеком спецификације %s није успео, не могу да протумачим\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s је Делта RPM и не може се директно инсталирати\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Неподржан терет (%s) у пакету %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "пакет %s је већ додат, прескачем %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "пакет %s је већ додат, замењујем са %s\n" @@ -1710,26 +1710,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s сачувано као %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s направљено као %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2319,12 +2319,12 @@ msgstr "очекиван је изворни пакет, пронађен је msgid "source package contains no .spec file\n" msgstr "изворни пакет не садржи .spec датотеку\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "распакивање архиве није успело %s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " на датотеци " @@ -2616,41 +2616,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "немој проверавати зависности пакета" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Неограничено %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3148,23 +3160,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Не могу да поново учитам заглавље потписа.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Заглавље " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 сажетак:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "SHA1 сажетак заглавља:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3283,74 +3295,74 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "није постављен dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: прескачем" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "грешка(%d) при записивању слога #%d у %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec није успео: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp није успео: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: прескачем" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: оштећено заглавље #%u враћено -- прескачем.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: не могу да прочитам заглавље на 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "није постављен dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "неуспело креирање директоријума %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "заглавље #%u у бази податак је лоше -- прескачем.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "не могу да додам слог првобитно на %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "неуспело поновно прављење базе података: основна база података је остала на " "месту\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "неуспела замена старе базе података са новом базом података!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "замени датотеке у %s са датотекама из %s да вратиш у претходно стање" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "неуспело уклањање директоријума %s: %s\n" diff --git a/po/sr@latin.po b/po/sr@latin.po index c33d68ee3..b99ab59ad 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/rpm-team/rpm/" @@ -1347,7 +1347,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1620,22 +1620,22 @@ msgstr "Neuspelo traženje %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "upit na datotekom specifikacije %s nije uspeo, ne mogu da protumačim\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s je Delta RPM i ne može se direktno instalirati\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Nepodržan teret (%s) u paketu %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "paket %s je već dodat, preskačem %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s je već dodat, zamenjujem sa %s\n" @@ -1712,26 +1712,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s sačuvano kao %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s napravljeno kao %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2322,12 +2322,12 @@ msgstr "očekivan je izvorni paket, pronađen je binarni\n" msgid "source package contains no .spec file\n" msgstr "izvorni paket ne sadrži .spec datoteku\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "raspakivanje arhive nije uspelo %s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " na datoteci " @@ -2620,41 +2620,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "nemoj proveravati zavisnosti paketa" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Neograničeno %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3152,23 +3164,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Ne mogu da ponovo učitam zaglavlje potpisa.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Zaglavlje " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 sažetak:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "SHA1 sažetak zaglavlja:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3287,74 +3299,74 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "nije postavljen dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: preskačem" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "greška(%d) pri zapisivanju sloga #%d u %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec nije uspeo: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp nije uspeo: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: preskačem" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: oštećeno zaglavlje #%u vraćeno -- preskačem.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: ne mogu da pročitam zaglavlje na 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "nije postavljen dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "neuspelo kreiranje direktorijuma %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "zaglavlje #%u u bazi podatak je loše -- preskačem.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "ne mogu da dodam slog prvobitno na %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "neuspelo ponovno pravljenje baze podataka: osnovna baza podataka je ostala " "na mestu\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "neuspela zamena stare baze podataka sa novom bazom podataka!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "zameni datoteke u %s sa datotekama iz %s da vratiš u prethodno stanje" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "neuspelo uklanjanje direktorijuma %s: %s\n" diff --git a/po/sv.po b/po/sv.po index 02b111671..4940742bf 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-13 10:40+0000\n" "Last-Translator: Lubos Kardos \n" "Language-Team: Swedish (http://www.transifex.com/rpm-team/rpm/language/sv/)\n" @@ -1350,7 +1350,7 @@ msgstr "" msgid "invalid dependency" msgstr "ogiltigt beroende" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Version krävs" @@ -1624,22 +1624,22 @@ msgstr "Misslyckades med att hitta %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "fråga av specfil %s misslyckades, kan inte tolka\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s är en delta-RPM och kan inte installeras direkt\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Ej stödd last (%s) i paket %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "paket %s var redan tillagt, hoppar över %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "paket %s är redan tillagt, ersätter med %s\n" @@ -1716,26 +1716,26 @@ msgstr "(okänd)" msgid "(not a string)" msgstr "(inte en sträng)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s sparades som %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s skapades som %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: borttagande misslyckades: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "katalog" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "fil" @@ -2326,12 +2326,12 @@ msgstr "källpaket förväntades, fann binärpaket\n" msgid "source package contains no .spec file\n" msgstr "källpaket innehåller ingen .spec-fil\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "uppackning av arkiv misslyckades%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " vid fil " @@ -2621,43 +2621,55 @@ msgstr "stöd filer större än 4 GB" msgid "support for rich dependencies." msgstr "verifiera inte paketberoenden" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Version krävs" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "ogiltigt beroende" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Oavslutad %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "ogiltigt beroende" @@ -3155,23 +3167,23 @@ msgstr "sighutfyllnad(%zd): FEL, läste %zd byte" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "sigh sigSize(%zd): FEL, fstat(2) misslyckades" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Kan inte läsa om signaturhuvud.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Huvud " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5-summa:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Huvudets SHA1-summa:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "Verifiera signatur: FELAKTIGA PARAMETRAR (%d %p %d %p %p)" @@ -3290,72 +3302,72 @@ msgstr "kan inte öppna %s-indexet med %s - %s (%d)\n" msgid "no dbpath has been set\n" msgstr "ingen dbpath har satts\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: hoppar över" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "fel(%d) när post nr. %d sparades i %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec misslyckades: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp misslyckades: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: hoppar över" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: skadat huvud nr. %u hämtat -- hoppar över.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: kan inte läsa huvud vid 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "ingen dbpath har satts" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "misslyckades att skapa katalogen %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "huvud nr. %u i databasen är felaktigt -- hoppar över.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "kan inte lägga till post ursprungligen vid %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "kunde inte ersätta gammal databas med ny databas!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "byt ut filer i %s med filer från %s för att återställa" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "kunde inte ta bort katalogen %s: %s\n" diff --git a/po/te.po b/po/te.po index 0ed9affaf..80f5c870b 100644 --- a/po/te.po +++ b/po/te.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Telugu (http://www.transifex.com/rpm-team/rpm/language/te/)\n" @@ -1325,7 +1325,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1598,22 +1598,22 @@ msgstr "" msgid "query of specfile %s failed, can't parse\n" msgstr "" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1690,26 +1690,26 @@ msgstr "" msgid "(not a string)" msgstr "" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2290,12 +2290,12 @@ msgstr "" msgid "source package contains no .spec file\n" msgstr "" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr "" @@ -2584,41 +2584,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, c-format msgid "Unterminated rich dependency: %s" msgstr "" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3115,23 +3127,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3250,72 +3262,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index f0f9e6934..87d05fe21 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-12-10 15:08+0000\n" "Last-Translator: Muhammet Kara \n" "Language-Team: Turkish (http://www.transifex.com/rpm-team/rpm/language/tr/)\n" @@ -1358,7 +1358,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1631,22 +1631,22 @@ msgstr "%s bulunamadı:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "%s spec dosyasının sorgulanması başarısız, çözümlenemiyor\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "" @@ -1723,26 +1723,26 @@ msgstr "(bilinmiyor)" msgid "(not a string)" msgstr "(dizge değil)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s %s olarak kaydedildi\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s %s olarak oluşturuldu\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "dizin" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "dosya" @@ -2331,12 +2331,12 @@ msgstr "kaynak paketi gerekirken çalıştırılabilir paketi bulundu\n" msgid "source package contains no .spec file\n" msgstr "kaynak paketi .spec dosyası içermiyor\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "arşiv paketi açılırken başarısız%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " dosyada " @@ -2626,41 +2626,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "paket bağımlılıklarını denetlemez" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c sonlandırılmamış: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3157,23 +3169,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "İmza başlığı yeniden yüklenemedi.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Başlık" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3292,74 +3304,74 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "belirtilmiş bir dbpath değeri yok\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: 0x%x de başlık okunamadı\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "belirtilmiş bir dbpath yok" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "kayıt özgün olarak %u e eklenemedi\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "veritabanı yeniden oluşturulamadı: mevcut veritabanı değişmeden\n" "yerinde bırakıldı\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "eski veritabanının yenisiyle değiştirilirmesi başarısız!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla değiştiriliyor" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "%s dizininin silinmesi başarısız: %s\n" diff --git a/po/uk.po b/po/uk.po index a4798acd1..53f16cef9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 12:23+0000\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian (http://www.transifex.com/rpm-team/rpm/language/" @@ -1374,7 +1374,7 @@ msgstr "" msgid "invalid dependency" msgstr "некоректна залежність" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Слід вказати версію" @@ -1656,23 +1656,23 @@ msgstr "" "спроба опитування файла специфікації %s зазнала невдачі, не вдалося " "обробити\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" "%s належить до типу Delta RPM, його не можна встановлювати безпосередньо\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Непідтримуваний вміст (%s) у пакунку %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "пакунок %s вже було додано, пропускаємо %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "пакунок %s вже було додано, замінюємо на %s\n" @@ -1749,26 +1749,26 @@ msgstr "(невідомо)" msgid "(not a string)" msgstr "(не є рядком)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s збережено як %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s створено як %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: спроба вилучення зазнала невдачі: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "каталог" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "файл" @@ -2363,12 +2363,12 @@ msgstr "слід було вказати пакунок з кодами, вка msgid "source package contains no .spec file\n" msgstr "у пакунку з кодами не міститься файла .spec\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "спроба розпакування архіву завершилася невдало%s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " на файлі " @@ -2666,43 +2666,55 @@ msgstr "підтримка файлів, розмір яких перевищу msgid "support for rich dependencies." msgstr "не перевіряти залежностей пакунків" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Слід вказати версію" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "некоректна залежність" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "Не закрито %c: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "некоректна залежність" @@ -3203,23 +3215,23 @@ msgstr "pad sigh (%zd): ПОМИЛКА, прочитано %zd байтів" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "sigSize sigh (%zd): ПОМИЛКА, помилка fstat(2)" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Не вдалося перезавантажити заголовок підпису.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Заголовок " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "Сума MD5:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Сума SHA1 заголовка:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "Перевірка підпису: ПОМИЛКОВІ ПАРАМЕТРИ (%d %p %d %p %p)" @@ -3338,74 +3350,74 @@ msgstr "не вдалося відкрити покажчик %s за допом msgid "no dbpath has been set\n" msgstr "не було встановлено шляху dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: пропущено" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "помилка (%d) збереження запису №%d до %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: помилка regexec: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: помилка regcomp: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: пропущено" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: отримано пошкоджений заголовок №%u — пропущено.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: не вдалося прочитати заголовок за адресою 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "не було встановлено шляху dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "не вдалося створити каталог %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "заголовок №%u у базі даних є помилковим — пропущено.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "не вдалося додати запис з початковим розташуванням у %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "не вдалося перебудувати базу даних: початкова база даних залишається на " "місці\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "не вдалося замінити стару базу даних новою!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "замінити файли у %s файлами з %s для відновлення" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "не вдалося вилучити каталог %s: %s\n" diff --git a/po/vi.po b/po/vi.po index 22178d00c..d5ef876f0 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-21 08:30+0000\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese (http://www.transifex.com/rpm-team/rpm/language/" @@ -1394,7 +1394,7 @@ msgstr "" msgid "invalid dependency" msgstr "phần phụ thuộc không hợp lệ" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "Yêu cầu phiên bản" @@ -1670,22 +1670,22 @@ msgstr "Gặp lỗi khi tìm %s:\n" msgid "query of specfile %s failed, can't parse\n" msgstr "lỗi truy vấn tập tin đặc tả %s nên không phân tích được\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s là một Delta RPM và không thể được cài đặt trực tiếp\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "Không hỗ trợ phần tải (%s) trong gói %s\n" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "gói %s đã được thêm vào nên bỏ qua %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "gói %s đã được thêm vào nên thay thế bằng %s\n" @@ -1762,26 +1762,26 @@ msgstr "(không hiểu)" msgid "(not a string)" msgstr "(không phải chuỗi)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s được lưu dạng %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s được tạo dạng %s\n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: gặp lỗi khi gỡ bỏ: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "thư mục" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "tập tin" @@ -2374,12 +2374,12 @@ msgstr "cần gói nguồn còn tìm thấy gói nhị phân\n" msgid "source package contains no .spec file\n" msgstr "gói nguồn không chứa tập tin đặc tả\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "lỗi giải nén kho %s%s: %s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " ở tập tin" @@ -2675,43 +2675,55 @@ msgstr "Hỗ trợ các tập tin lớn hơn 4GB" msgid "support for rich dependencies." msgstr "không thẩm tra quan hệ phụ thuộc giữa các gói" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "Yêu cầu phiên bản" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "phần phụ thuộc không hợp lệ" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "%c chưa chấm dứt: %s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "phần phụ thuộc không hợp lệ" @@ -3209,23 +3221,23 @@ msgstr "đệm sigh(%zd): SAI, đọc %zd byte" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "sigh sigSize(%zd): SAI, hàm fstat(2) gặp lỗi" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "Không thể nạp lại phần đầu chữ ký.\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "Phần đầu" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "Mã băm MD5:" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "Mã băm SHA1 phần đầu:" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "Xác minh chữ ký: CÁC ĐỐI SỐ SAI (%d %p %d %p %p)" @@ -3344,74 +3356,74 @@ msgstr "không thể mở bảng mục lục %s dùng %s - %s (%d)\n" msgid "no dbpath has been set\n" msgstr "chưa đặt đường dẫn cơ sở dữ liệu (dbpath)\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader: bỏ qua" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "gặp lỗi (%d) khi lưu bản ghi #%d vào %s\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec (thực hiện biểu thức chính quy) bị lỗi: %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp bị lỗi: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator: bỏ qua" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: nhận được phần đầu bị hỏng #%u -- bỏ qua.\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s: không thể đọc phần đầu ở 0x%x\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "chưa đặt đường dẫn cơ sở dữ liệu (dbpath)" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "gặp lỗi khi tạo thư mục %s: %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "phần đầu #%u trong cơ sở dữ liệu là sai -- bỏ qua.\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "không thể thêm bản ghi nguyên gốc tại %u\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "" "gặp lỗi khi xây dựng lại cơ sở dữ liệu: cơ sỏ dữ liệu nguyên gốc được giữ " "lại để thay thế\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "gặp lỗi khi thay thế cơ sở dữ liệu cũ bằng cái mới!\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "thay thế các tập tin trong %s bằng các tập tin từ %s để phục hồi" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "gặp lỗi khi xóa thư mục %s: %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index aae355bb4..fbad942b2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2015-08-23 16:38+0000\n" "Last-Translator: 白铭骢 \n" "Language-Team: Chinese (China) (http://www.transifex.com/rpm-team/rpm/" @@ -1347,7 +1347,7 @@ msgstr "" msgid "invalid dependency" msgstr "无效的依赖" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "版本要求" @@ -1620,22 +1620,22 @@ msgstr "查找 %s 失败：\n" msgid "query of specfile %s failed, can't parse\n" msgstr "查询 spec 文件 %s 失败，无法解析\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "%s 是一个 Delta RPM 并且无法直接被安装。\n" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "软件包 %s 已被加入，跳过 %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "软件包 %s 已被加入，以 %s 替换\n" @@ -1712,26 +1712,26 @@ msgstr "(未知)" msgid "(not a string)" msgstr "(不是字符串)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s 已另存为 %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s 已建立为 %s \n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "%s %s: 移除失败: %s\n" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "目录" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "文件" @@ -2318,12 +2318,12 @@ msgstr "期望源代码包，但找到二进制包\n" msgid "source package contains no .spec file\n" msgstr "源代码包中没有找到 .spec 文件\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "解压压缩文件 %s%s 失败：%s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " 在文件" @@ -2613,43 +2613,55 @@ msgstr "支持超过 4G 的文件" msgid "support for rich dependencies." msgstr "不验证软件包依赖" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 #, fuzzy msgid "Name required" msgstr "版本要求" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 #, fuzzy msgid "Empty rich dependency" msgstr "无效的依赖" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "未结束的 %c：%s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 #, fuzzy msgid "Junk after rich dependency" msgstr "无效的依赖" @@ -3147,23 +3159,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "sigh sigSize(%zd): BAD, fstat(2) 失败" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "无法重载签名头。\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "头" -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 摘要：" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "头 SHA1 摘要：" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "验证签名：错误的参数 (%d %p %d %p %p)" @@ -3282,72 +3294,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "没有设置 dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader：跳过" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "%s: regexec 函数执行失败： %s\n" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "%s: regcomp 函数执行失败: %s\n" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator：跳过" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb: 获取到损坏表头 #%u -- 跳过此项。\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s：无法读取位于 0x%x 的表头\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "没有设置 dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "無法建立 %s 目录： %s\n" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "无法加入原本位于 %u 的记录\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "重建数据库失败：原始数据库仍保持原状\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "用新的数据库取代旧的数据库失败！\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "用 %2$s 文件取代 %1$s 文件來恢复" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "移除目录失败 %s：%s\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 7eed1314f..f0b9c7f70 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM\n" "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n" -"POT-Creation-Date: 2017-10-25 16:11+0300\n" +"POT-Creation-Date: 2018-03-28 13:37+0300\n" "PO-Revision-Date: 2014-06-25 10:40+0000\n" "Last-Translator: pmatilai \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/rpm-team/rpm/" @@ -1336,7 +1336,7 @@ msgstr "" msgid "invalid dependency" msgstr "" -#: build/parseReqs.c:275 lib/rpmds.c:1438 +#: build/parseReqs.c:275 lib/rpmds.c:1447 msgid "Version required" msgstr "" @@ -1609,22 +1609,22 @@ msgstr "找不到 %s：\n" msgid "query of specfile %s failed, can't parse\n" msgstr "%s 規格檔查詢失敗，無法剖析\n" -#: lib/depends.c:91 +#: lib/depends.c:93 #, c-format msgid "%s is a Delta RPM and cannot be directly installed\n" msgstr "" -#: lib/depends.c:95 +#: lib/depends.c:97 #, c-format msgid "Unsupported payload (%s) in package %s\n" msgstr "" -#: lib/depends.c:375 +#: lib/depends.c:377 #, c-format msgid "package %s was already added, skipping %s\n" msgstr "套件 %s 已被加入，跳過 %s\n" -#: lib/depends.c:376 +#: lib/depends.c:378 #, c-format msgid "package %s was already added, replacing with %s\n" msgstr "套件 %s 已被加入，以 %s 替換\n" @@ -1701,26 +1701,26 @@ msgstr "(未知)" msgid "(not a string)" msgstr "(不是字串)" -#: lib/fsm.c:730 +#: lib/fsm.c:733 #, c-format msgid "%s saved as %s\n" msgstr "%s 已被另存為 %s\n" -#: lib/fsm.c:782 +#: lib/fsm.c:785 #, c-format msgid "%s created as %s\n" msgstr "%s 已建立為 %s \n" -#: lib/fsm.c:1055 +#: lib/fsm.c:1060 #, c-format msgid "%s %s: remove failed: %s\n" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "directory" msgstr "" -#: lib/fsm.c:1056 +#: lib/fsm.c:1061 msgid "file" msgstr "" @@ -2307,12 +2307,12 @@ msgstr "預期是源碼套件，但卻找到二進位套件\n" msgid "source package contains no .spec file\n" msgstr "源碼套件內未包含 .spec 檔案\n" -#: lib/psm.c:605 +#: lib/psm.c:606 #, c-format msgid "unpacking of archive failed%s%s: %s\n" msgstr "解包封存檔失敗 %s%s：%s\n" -#: lib/psm.c:606 +#: lib/psm.c:607 msgid " on file " msgstr " 於檔案 " @@ -2602,41 +2602,53 @@ msgstr "" msgid "support for rich dependencies." msgstr "不校驗套件相依性" -#: lib/rpmds.c:1384 +#: lib/rpmds.c:1387 #, c-format msgid "Unknown rich dependency op '%.*s'" msgstr "" -#: lib/rpmds.c:1419 +#: lib/rpmds.c:1428 msgid "Name required" msgstr "" -#: lib/rpmds.c:1456 +#: lib/rpmds.c:1465 +msgid "Illegal ops in with/without" +msgstr "" + +#: lib/rpmds.c:1472 +msgid "Illegal context for 'unless', please use 'or' instead" +msgstr "" + +#: lib/rpmds.c:1477 +msgid "Illegal context for 'if', please use 'and' instead" +msgstr "" + +#: lib/rpmds.c:1493 msgid "Rich dependency does not start with '('" msgstr "" -#: lib/rpmds.c:1464 +#: lib/rpmds.c:1501 msgid "Missing argument to rich dependency op" msgstr "" -#: lib/rpmds.c:1466 +#: lib/rpmds.c:1503 msgid "Empty rich dependency" msgstr "" -#: lib/rpmds.c:1480 +#: lib/rpmds.c:1521 #, fuzzy, c-format msgid "Unterminated rich dependency: %s" msgstr "未終結的 %c：%s\n" -#: lib/rpmds.c:1492 +#: lib/rpmds.c:1536 msgid "Cannot chain different ops" msgstr "" -#: lib/rpmds.c:1497 -msgid "Can only chain AND and OR ops" +#: lib/rpmds.c:1541 +msgid "Can only chain and/or/with ops" msgstr "" -#: lib/rpmds.c:1587 +#: lib/rpmds.c:1672 msgid "Junk after rich dependency" msgstr "" @@ -3133,23 +3145,23 @@ msgstr "" msgid "sigh sigSize(%zd): BAD, fstat(2) failed" msgstr "" -#: lib/signature.c:376 +#: lib/signature.c:391 msgid "Unable to reload signature header.\n" msgstr "無法重新載入簽署表頭。\n" -#: lib/signature.c:452 +#: lib/signature.c:467 msgid "Header " msgstr "表頭 " -#: lib/signature.c:471 +#: lib/signature.c:486 msgid "MD5 digest:" msgstr "MD5 摘要：" -#: lib/signature.c:474 +#: lib/signature.c:489 msgid "Header SHA1 digest:" msgstr "表頭 SHA1 摘要：" -#: lib/signature.c:493 +#: lib/signature.c:508 #, c-format msgid "Verify signature: BAD PARAMETERS (%d %p %d %p %p)" msgstr "" @@ -3268,72 +3280,72 @@ msgstr "" msgid "no dbpath has been set\n" msgstr "尚未設定 dbpath\n" -#: lib/rpmdb.c:1037 +#: lib/rpmdb.c:1034 msgid "miFreeHeader: skipping" msgstr "miFreeHeader：跳過" -#: lib/rpmdb.c:1055 +#: lib/rpmdb.c:1052 #, c-format msgid "error(%d) storing record #%d into %s\n" msgstr "儲存記錄 #%2$d 到 %3$s 時發生錯誤(%1$d)\n" -#: lib/rpmdb.c:1167 +#: lib/rpmdb.c:1164 #, c-format msgid "%s: regexec failed: %s\n" msgstr "" -#: lib/rpmdb.c:1348 +#: lib/rpmdb.c:1345 #, c-format msgid "%s: regcomp failed: %s\n" msgstr "" -#: lib/rpmdb.c:1511 +#: lib/rpmdb.c:1508 msgid "rpmdbNextIterator: skipping" msgstr "rpmdbNextIterator：跳過" -#: lib/rpmdb.c:1598 +#: lib/rpmdb.c:1595 #, c-format msgid "rpmdb: damaged header #%u retrieved -- skipping.\n" msgstr "rpmdb：已擷取損壞的表頭 #%u -- 跳過。\n" -#: lib/rpmdb.c:2131 +#: lib/rpmdb.c:2126 #, c-format msgid "%s: cannot read header at 0x%x\n" msgstr "%s：無法讀取位於 0x%x 的表頭\n" -#: lib/rpmdb.c:2566 +#: lib/rpmdb.c:2561 msgid "no dbpath has been set" msgstr "尚未設定 dbpath" -#: lib/rpmdb.c:2584 +#: lib/rpmdb.c:2579 #, c-format msgid "failed to create directory %s: %s\n" msgstr "" -#: lib/rpmdb.c:2618 +#: lib/rpmdb.c:2613 #, c-format msgid "header #%u in the database is bad -- skipping.\n" msgstr "在資料庫中有不良的表頭 #%u -- 跳過。\n" -#: lib/rpmdb.c:2631 +#: lib/rpmdb.c:2626 #, c-format msgid "cannot add record originally at %u\n" msgstr "無法加入原本位於 %u 的記錄\n" -#: lib/rpmdb.c:2647 +#: lib/rpmdb.c:2642 msgid "failed to rebuild database: original database remains in place\n" msgstr "重建資料庫時失敗：原來的資料庫保持原狀\n" -#: lib/rpmdb.c:2655 +#: lib/rpmdb.c:2650 msgid "failed to replace old database with new database!\n" msgstr "以新的資料庫取代舊的資料庫時失敗！\n" -#: lib/rpmdb.c:2657 +#: lib/rpmdb.c:2652 #, c-format msgid "replace files in %s with files from %s to recover" msgstr "以 %2$s 的檔案取代 %1$s 的檔案來復原" -#: lib/rpmdb.c:2668 +#: lib/rpmdb.c:2663 #, c-format msgid "failed to remove directory %s: %s\n" msgstr "移除目錄時失敗 %s：%s\n" diff --git a/rpm.am b/rpm.am index 28f5f6fd2..ce7b2d98b 100644 --- a/rpm.am +++ b/rpm.am @@ -7,4 +7,4 @@ rpmlibexecdir = $(prefix)/lib/rpm rpmconfigdir = $(prefix)/lib/rpm # Libtool version (current-revision-age) for all our libraries -rpm_version_info = 7:1:0 +rpm_version_info = 7:2:0 -- cgit v1.2.1