diff options
| author | Dan McGee <dan@archlinux.org> | 2009-01-02 22:48:52 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-01-02 22:48:52 -0600 |
| commit | f8b689d48eb34cf81c22c854cd83595338d49d44 (patch) | |
| tree | dc45d9e3638581640ac5bd131529b8c2754b1143 | |
| parent | bd628274cc8db81704860e69894fcd217c2068d0 (diff) | |
| parent | c31fcfd833fc527a3774c7b1bc29686194d23942 (diff) | |
| download | pacman-f8b689d48eb34cf81c22c854cd83595338d49d44.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
po/it.po
scripts/makepkg.sh.in
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| -rw-r--r-- | doc/PKGBUILD.5.txt | 11 | ||||
| -rw-r--r-- | doc/makepkg.8.txt | 2 | ||||
| -rw-r--r-- | lib/libalpm/dload.c | 6 | ||||
| -rw-r--r-- | po/cs.po | 66 | ||||
| -rw-r--r-- | po/de.po | 72 | ||||
| -rw-r--r-- | po/en_GB.po | 66 | ||||
| -rw-r--r-- | po/es.po | 74 | ||||
| -rw-r--r-- | po/fr.po | 71 | ||||
| -rw-r--r-- | po/hu.po | 61 | ||||
| -rw-r--r-- | po/pacman.pot | 48 | ||||
| -rw-r--r-- | po/pl.po | 68 | ||||
| -rw-r--r-- | po/pt_BR.po | 70 | ||||
| -rw-r--r-- | po/ru.po | 74 | ||||
| -rw-r--r-- | po/tr.po | 70 | ||||
| -rw-r--r-- | po/uk.po | 69 | ||||
| -rw-r--r-- | po/zh_CN.po | 44 | ||||
| -rw-r--r-- | scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 123 |
19 files changed, 700 insertions, 299 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index cce0a711..7992e547 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,7 @@ ASCIIDOC_OPTS = \ -a pacman_date="`date +%Y-%m-%d`" \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ + --no-xmllint \ -d manpage \ -f manpage \ --xsltproc-opts='-param man.endnotes.list.enabled 0' \ diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index e42a8b86..96c7a505 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -160,7 +160,9 @@ name. The syntax is: `$$source=('filename::url')$$` depend on 'cron' rather than 'dcron OR fcron'. Versioned provisions are also possible, in the 'name=version' format. For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0' - dependency of other packages. + dependency of other packages. Provisions involving the '>' and '<' + operators are invalid as only specifc versions of a package may be + provided. *replaces (array)*:: An array of packages that this package should replace, and can be used @@ -367,11 +369,10 @@ The following is an example PKGBUILD for the 'patch' package. For more examples, look through the build files of your distribution's packages. For those using Arch Linux, consult the ABS tree. -[sh] -source~~~~~ +[source,sh] +------------------------------- include::PKGBUILD-example.txt[] -source~~~~~ - +------------------------------- See Also -------- diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index ddf73dae..4bb37808 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -119,7 +119,7 @@ Options *-r, \--rmdeps*:: Upon successful build, remove any dependencies installed by makepkg - during dependency auto-resolution (using `-b` or `-s`). + during dependency auto-resolution and installation when using `-s`. *-R, \--repackage*:: Repackage contents of pkg/ without rebuilding the package. This is diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9934f30a..06f643f7 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -144,6 +144,12 @@ static int download_internal(const char *url, const char *localpath, dl_thisfile = 0; } + /* print proxy info for debug purposes */ + _alpm_log(PM_LOG_DEBUG, "HTTP_PROXY: %s\n", getenv("HTTP_PROXY")); + _alpm_log(PM_LOG_DEBUG, "http_proxy: %s\n", getenv("http_proxy")); + _alpm_log(PM_LOG_DEBUG, "FTP_PROXY: %s\n", getenv("FTP_PROXY")); + _alpm_log(PM_LOG_DEBUG, "ftp_proxy: %s\n", getenv("ftp_proxy")); + /* libfetch does not reset the error code */ fetchLastErrCode = 0; @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-24 08:33+0200\n" "Last-Translator: Vojtěch Gondžala <vojtech.gondzala@gmail.com>\n" "Language-Team: Čeština\n" @@ -528,18 +528,6 @@ msgstr "" " licencí GNU GPL (General Public License).\n" #, c-format -msgid "segmentation fault\n" -msgstr "neoprávněný přístup do paměti\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Interní chyba pacman: Neoprávněný přístup do paměti.\n" -"Prosím odešlete hlášení o chybě s přepínačem --debug.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "problém s nastavením kořenového adresáře '%s' (%s)\n" @@ -571,6 +559,10 @@ msgstr "konfigurační soubor %s nelze přečíst.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "konfigurační soubor %s, řádek %d: chybné jméno sekce.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "nemohu zaregistrovat databázi 'local' (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -591,6 +583,10 @@ msgstr "konfigurační soubor %s, řádek %d: neznámá direktiva '%s'.\n" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "chybná hodnota pro 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "nemohu zaregistrovat databázi 'local' (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "selhala inicializace knihovny alpm (%s)\n" @@ -1164,6 +1160,15 @@ msgstr "Určuji poslední hg revizi..." msgid "Version found: %s" msgstr "Nalezena verze: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Použití: %s [volby]" @@ -1357,6 +1362,9 @@ msgstr "Poznámka: mnoho balíčků možná potřebuje přidat řádek do svého msgid "such as arch=('%s')." msgstr "který vypadá takto: arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Instalační skript (%s) neexistuje." @@ -1453,15 +1461,15 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "diff nebyl nalezen, prosím nainstalujte diffutils." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "Byl nalezen zámek pacmana. Nelze pokračovat, pokud pacman běží." - msgid "%s does not exist or is not a directory." msgstr "%s neexistuje, nebo není adresář." msgid "You must have correct permissions to optimize the database." msgstr "Musíte mít správná oprávnění k optimalizaci databáze." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "Byl nalezen zámek pacmana. Nelze pokračovat, pokud pacman běží." + msgid "ERROR: Can not create temp directory for database building." msgstr "CHYBA: Nemohu vytvořit dočasný adresář pro sestavení databáze." @@ -1474,27 +1482,30 @@ msgstr "Zabaluji %s pomocí tar..." msgid "Tar'ing up %s failed." msgstr "Zabalování %s pomocí tar selhalo." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Vytvářím a počítám MD5 součet nové databáze..." msgid "Untar'ing %s failed." msgstr "Rozbalování %s pomocí tar selhalo." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Synchronizuji databázi balíčků...\n" + msgid "Checking integrity..." msgstr "Kontroluji integritu..." msgid "Integrity check FAILED, reverting to old database." msgstr "Kontrola integrity SELHALA, vracím se ke staré databázi." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Umisťuji novou databázi na místo..." msgid "Finished. Your pacman database has been optimized." msgstr "Dokončeno. Databáze pacmana byla optimalizována." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "Pro plné využití výhod pacman-optimize, spusťte nyní 'sync'." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Použití: rebo-add [-q] <cesta-k-databázi> <jménoBalíčku> ...\\n" @@ -1617,3 +1628,16 @@ msgstr "Všechny balíčky budou odstraněny z databáze. Mažu '%s'." msgid "No packages modified, nothing to do." msgstr "Nebyl změněn žádný balíček, není co dělat." + +#~ msgid "segmentation fault\n" +#~ msgstr "neoprávněný přístup do paměti\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Interní chyba pacman: Neoprávněný přístup do paměti.\n" +#~ "Prosím odešlete hlášení o chybě s přepínačem --debug.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "Pro plné využití výhod pacman-optimize, spusťte nyní 'sync'." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-24 12:36+0100\n" "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n" "Language-Team: German <archlinux.de>\n" @@ -551,19 +551,6 @@ msgstr "" " General Public License frei weiterverbreitet werden.\n" #, c-format -msgid "segmentation fault\n" -msgstr "Segmentierungs-Fehler\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Interner Pacman-Fehler: Segmentierungs-Fehler.\n" -"Bitte reichen Sie einen vollständigen Bug-Report mit der Ausgabe von --debug " -"ein, wenn erforderlich.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "Problem beim Setzen des Root-Verzeichnisses '%s' (%s)\n" @@ -595,6 +582,10 @@ msgstr "Konfigurations-Datei %s konnte nicht gelesen werden.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "Konfigurations-Datei %s, Zeile %d: Schlechter Sektions-Name.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "Kein Zugriff auf die lokale Datenbank (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -616,6 +607,10 @@ msgstr "" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "Ungültiger Wert für 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "Kein Zugriff auf die lokale Datenbank (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "Konnte alpm-Bibliothek nicht initialisieren (%s)\n" @@ -1193,6 +1188,15 @@ msgstr "Bestimme letzte hg-Revision..." msgid "Version found: %s" msgstr "Gefundene Version: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Verwendung: %s [Optionen]" @@ -1412,6 +1416,9 @@ msgstr "" msgid "such as arch=('%s')." msgstr "so wie arch=('%s')" +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Installations-Skript (%s) existiert nicht." @@ -1514,10 +1521,6 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "Diff-Werkzeug nicht gefunden, bitte diffutils installieren." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft." - msgid "%s does not exist or is not a directory." msgstr "%s existiert nicht oder ist kein Verzeichnis" @@ -1525,6 +1528,10 @@ msgid "You must have correct permissions to optimize the database." msgstr "" "Sie müssen über die nötigen Rechte verfügen, um die Datenbank zu optimieren." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" +"Pacman Sperr-Datei gefunden. Kann nicht arbeiten, während Pacman läuft." + msgid "ERROR: Can not create temp directory for database building." msgstr "" "FEHLER: Konnte kein temporäres Verzeichnis für den Aufbau der Datenbank " @@ -1539,28 +1546,30 @@ msgstr "Erstelle Tarball aus %s..." msgid "Tar'ing up %s failed." msgstr "Erstellen des Tarballs %s fehlgeschlagen." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Erstelle neue DB und prüfe MD5-Summen..." msgid "Untar'ing %s failed." msgstr "Entpacken des Tarballs %s fehlgeschlagen." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Synchronisiere Paketdatenbanken...\n" + msgid "Checking integrity..." msgstr "Prüfe Integrität... " msgid "Integrity check FAILED, reverting to old database." msgstr "Integritäts-Prüfung FEHLGESCHLAGEN, kehre zur alten Datenbank zurück." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Verschiebe die neue Datenbank an ihren Ort..." msgid "Finished. Your pacman database has been optimized." msgstr "Fertig. Ihre Pacman-Datenbank wurde optimiert." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "" -"Für alle Vorteile von pacman-optimize, führen Sie nun ein 'sync' durch." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Verwendung: repo-add [-q] <Pfad-zur-Datenbank> <Paketname> ...\\n" @@ -1686,3 +1695,18 @@ msgstr "Alle Pakete wurden von der Datenbank entfernt. Lösche '%s'." msgid "No packages modified, nothing to do." msgstr "Keine Pakete modifiziert, ich kann nichts machen." + +#~ msgid "segmentation fault\n" +#~ msgstr "Segmentierungs-Fehler\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Interner Pacman-Fehler: Segmentierungs-Fehler.\n" +#~ "Bitte reichen Sie einen vollständigen Bug-Report mit der Ausgabe von --" +#~ "debug ein, wenn erforderlich.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "" +#~ "Für alle Vorteile von pacman-optimize, führen Sie nun ein 'sync' durch." diff --git a/po/en_GB.po b/po/en_GB.po index 6e85de11..74a74d97 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-07-30 08:31+0200\n" "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n" "Language-Team: English <en_gb@li.org>\n" @@ -522,18 +522,6 @@ msgstr "" " the terms of the GNU General Public License.\n" #, c-format -msgid "segmentation fault\n" -msgstr "segmentation fault\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "problem setting rootdir '%s' (%s)\n" @@ -565,6 +553,10 @@ msgstr "config file %s could not be read.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "config file %s, line %d: bad section name.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "could not register 'local' database (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "config file %s, line %d: syntax error in config file- missing key.\n" @@ -581,6 +573,10 @@ msgstr "config file %s, line %d: directive '%s' not recognised.\n" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "invalid value for 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "could not register 'local' database (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "failed to initialise alpm library (%s)\n" @@ -1156,6 +1152,15 @@ msgstr "Determining latest hg revision..." msgid "Version found: %s" msgstr "Version found: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Usage: %s [options]" @@ -1351,6 +1356,9 @@ msgstr "Note that many packages may need a line added to their %s" msgid "such as arch=('%s')." msgstr "such as arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Install scriptlet (%s) does not exist." @@ -1448,15 +1456,15 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "diff tool was not found, please install diffutils." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "Pacman lock file was found. Cannot run while pacman is running." - msgid "%s does not exist or is not a directory." msgstr "%s does not exist or is not a directory." msgid "You must have correct permissions to optimize the database." msgstr "You must have correct permissions to optimise the database." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "Pacman lock file was found. Cannot run while pacman is running." + msgid "ERROR: Can not create temp directory for database building." msgstr "ERROR: Can not create temp directory for database building." @@ -1469,27 +1477,30 @@ msgstr "Tar'ing up %s..." msgid "Tar'ing up %s failed." msgstr "Tar'ing up %s failed." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Making and MD5sum'ing the new db..." msgid "Untar'ing %s failed." msgstr "Untar'ing %s failed." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Synchronising package databases...\n" + msgid "Checking integrity..." msgstr "Checking integrity..." msgid "Integrity check FAILED, reverting to old database." msgstr "Integrity check FAILED, reverting to old database." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Putting the new database in place..." msgid "Finished. Your pacman database has been optimized." msgstr "Finished. Your pacman database has been optimised." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "For full benefits of pacman-optimize, run 'sync' now." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Usage: repo-add [-q] <path-to-db> <package> ...\\n" @@ -1613,3 +1624,16 @@ msgstr "All packages have been removed from the database. Deleting '%s'." msgid "No packages modified, nothing to do." msgstr "No packages modified, nothing to do." + +#~ msgid "segmentation fault\n" +#~ msgstr "segmentation fault\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "For full benefits of pacman-optimize, run 'sync' now." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-23 23:21+0200\n" "Last-Translator: Juan Pablo González Tognarelli <jotapesan@gmail.com>\n" "Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n" @@ -565,19 +565,6 @@ msgstr "" "License\n" #, c-format -msgid "segmentation fault\n" -msgstr "Violación de segmento\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"error interno de pacman error: Violación de segmento.\n" -"Por favor envíe un reporte de errores con la opción --debug si es " -"oportuno.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "problemas al establecer el rootdir '%s' (%s)\n" @@ -609,6 +596,10 @@ msgstr "el archivo de configuración %s no se ha podido leer.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "archivo de configuración %s, linea %d: nombre de sección erroneo.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "no se pudo registrar la base de datos 'local' (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -630,6 +621,10 @@ msgstr "" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "valor invalido para 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "no se pudo registrar la base de datos 'local' (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "falló al iniciar la biblioteca alpm (%s)\n" @@ -1205,6 +1200,15 @@ msgstr "Determinando última revisión de hg..." msgid "Version found: %s" msgstr "Versión encontrada: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Uso: %s [opciones]" @@ -1412,6 +1416,9 @@ msgstr "Advierte que muchos paquetes pueden necesitar añadir una línea a su %s msgid "such as arch=('%s')." msgstr "tales como arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "El script de instalación (%s) no existe." @@ -1510,17 +1517,17 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "no se encontró diff, por favor, instale diffutils." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Se encontró el archivo bloqueo de pacman. No se puede ejecutar mientras " -"pacman esté ejecutándose." - msgid "%s does not exist or is not a directory." msgstr "'%s' no no existe o no es un directorio." msgid "You must have correct permissions to optimize the database." msgstr "Debes tener los permisos correctos para optimizar la base de datos." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" +"Se encontró el archivo bloqueo de pacman. No se puede ejecutar mientras " +"pacman esté ejecutándose." + msgid "ERROR: Can not create temp directory for database building." msgstr "" "ERROR: No se pudo crear directorio temporal para crear la base de datos." @@ -1534,28 +1541,30 @@ msgstr "Empaquetando %s..." msgid "Tar'ing up %s failed." msgstr "Falló empaquetando %s." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Creando y haciendo md5 de la base de datos nueva." msgid "Untar'ing %s failed." msgstr "Falló desempaquetando %s." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Sincronizando las bases de datos de paquetes...\n" + msgid "Checking integrity..." msgstr "Verificando la integridad..." msgid "Integrity check FAILED, reverting to old database." msgstr "FALLÓ el test de integridad, volviendo a la base de datos antigua." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Colocando la nueva base de datos en su sitio." msgid "Finished. Your pacman database has been optimized." msgstr "Finalizado, Su base de datos de pacman ha sido optimizada." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "" -"Para beneficiarse completamente de pacman-optimize ejecute 'sync' ahora." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Uso: repo-add [-q] <ruta-a-bd> <paquete> ...\\n" @@ -1681,3 +1690,18 @@ msgstr "" msgid "No packages modified, nothing to do." msgstr "No se modificaron paquetes, nada que hacer." + +#~ msgid "segmentation fault\n" +#~ msgstr "Violación de segmento\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "error interno de pacman error: Violación de segmento.\n" +#~ "Por favor envíe un reporte de errores con la opción --debug si es " +#~ "oportuno.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "" +#~ "Para beneficiarse completamente de pacman-optimize ejecute 'sync' ahora." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-23 23:27+0200\n" "Last-Translator: Xavier <shiningxc@gmail.com>\n" "Language-Team: solsTiCe d'Hiver <solstice.dhiver@laposte.net>\n" @@ -576,18 +576,6 @@ msgstr "" " the terms of the GNU General Public License.\n" #, c-format -msgid "segmentation fault\n" -msgstr "erreur de segmentation\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Erreur de segmentation.\n" -"Soumettez un rapport de bug complet avec debug si approprié.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "problème avec rootdir '%s' (%s)\n" @@ -619,6 +607,10 @@ msgstr "Le fichier de config %s n'a pas pu être lu.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "fichier de config %s, ligne %d: mauvais nom de section.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "l'enregistrement de la base de données 'local' a échoué (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "fichier de config %s, ligne %d: erreur de syntaxe- clé manquante.\n" @@ -638,6 +630,10 @@ msgstr "" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "valeur invalide pour 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "l'enregistrement de la base de données 'local' a échoué (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "l'initialisation de la librairie alpm a échoué (%s)\n" @@ -1227,6 +1223,15 @@ msgstr "Détermination de la dernière révision hg..." msgid "Version found: %s" msgstr "Version trouvée : %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Utilisation: %s [options]" @@ -1438,6 +1443,9 @@ msgstr "Notez que beaucoup de paquets peuvent avoir besoin d'une ligne dans %s" msgid "such as arch=('%s')." msgstr "comme arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Le scriptlet d'installation (%s) n'a pas été trouvé." @@ -1536,11 +1544,6 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "L'outil diff est introuvable, installez diffutils svp." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Le fichier de verrou de pacman est présent. Ne peut pas être exécuté pendant " -"que pacman tourne." - msgid "%s does not exist or is not a directory." msgstr "'%s' n'existe pas ou n'est pas un répertoire." @@ -1549,6 +1552,11 @@ msgstr "" "Vous devez avoir les permissions suffisantes pour optimiser la base de " "donnée." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" +"Le fichier de verrou de pacman est présent. Ne peut pas être exécuté pendant " +"que pacman tourne." + msgid "ERROR: Can not create temp directory for database building." msgstr "" "ERREUR: la création du répertoire temporaire pour créer la base de données a " @@ -1563,12 +1571,17 @@ msgstr "Archive %s... " msgid "Tar'ing up %s failed." msgstr "L'archivage de %s a échoué." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Création et calcul du md5sum de la nouvelle bd..." msgid "Untar'ing %s failed." msgstr "Le désarchivage de %s a échoué." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Synchronisation des bases de données de paquets...\n" + msgid "Checking integrity..." msgstr "Analyse de l'intégrité... " @@ -1576,15 +1589,13 @@ msgid "Integrity check FAILED, reverting to old database." msgstr "" "La vérification de l'intégrité a échoué, restaure l'ancienne base de données." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Placement de la nouvelle base de données..." msgid "Finished. Your pacman database has been optimized." msgstr "Fini. La base de données de pacman a été optimisé." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "Pour que pacman-optimize soit plus efficace, lancez 'sync' maintenant." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "utilisation: repo-add [-q] <path-to-db> <packagename> ...\\n" @@ -1712,3 +1723,17 @@ msgstr "" msgid "No packages modified, nothing to do." msgstr "Aucun paquets modifiés, il n'y a rien à faire." + +#~ msgid "segmentation fault\n" +#~ msgstr "erreur de segmentation\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Erreur de segmentation.\n" +#~ "Soumettez un rapport de bug complet avec debug si approprié.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "" +#~ "Pour que pacman-optimize soit plus efficace, lancez 'sync' maintenant." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-07-30 08:36+0200\n" "Last-Translator: Nagy Gabor <ngaba@bibl.u-szeged.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -528,18 +528,6 @@ msgstr "" " General Public License feltételei szerint.\n" #, c-format -msgid "segmentation fault\n" -msgstr "szegmens hiba\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Belső pacman hiba: Szegmens hiba.\n" -"Kérem küldjön egy teljes hibajelentést (használja a --debug kapcsolót).\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "" "hiba történt a(z) '%s' telepítési gyökérkönyvtár beállítása során (%s)\n" @@ -572,6 +560,10 @@ msgstr "a %s konfigurációs fájl nem olvasható.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "%s konfigurációs fájl, %d. sor: hibás szekciónév.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "nem sikerült regisztrálni a 'local' adatbázist (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "%s konfigurációs fájl, %d. sor: szintaktikai hiba- hiányzó kulcs.\n" @@ -590,6 +582,10 @@ msgstr "%s konfigurációs fájl, %d. sor: a '%s' direktíva nem értelmezhető. msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "hibás 'CleanMethod' érték: '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "nem sikerült regisztrálni a 'local' adatbázist (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "nem sikerült inicializálni az alpm könyvtárat (%s)\n" @@ -1165,6 +1161,15 @@ msgstr "" msgid "Version found: %s" msgstr "" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "" @@ -1348,6 +1353,9 @@ msgstr "" msgid "such as arch=('%s')." msgstr "" +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "" @@ -1437,15 +1445,15 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "" -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" - msgid "%s does not exist or is not a directory." msgstr "" msgid "You must have correct permissions to optimize the database." msgstr "" +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" + msgid "ERROR: Can not create temp directory for database building." msgstr "" @@ -1458,27 +1466,28 @@ msgstr "" msgid "Tar'ing up %s failed." msgstr "" -msgid "Making and MD5sum'ing the new db..." +msgid "Making and MD5sum'ing the new database..." msgstr "" msgid "Untar'ing %s failed." msgstr "" +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: A csomagadatbázisok szinkronizálása...\n" + msgid "Checking integrity..." msgstr "" msgid "Integrity check FAILED, reverting to old database." msgstr "" -msgid "Putting the new database in place..." +msgid "Rotating database into place..." msgstr "" msgid "Finished. Your pacman database has been optimized." msgstr "" -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "" - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "" @@ -1591,3 +1600,13 @@ msgstr "" msgid "No packages modified, nothing to do." msgstr "" + +#~ msgid "segmentation fault\n" +#~ msgstr "szegmens hiba\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Belső pacman hiba: Szegmens hiba.\n" +#~ "Kérem küldjön egy teljes hibajelentést (használja a --debug kapcsolót).\n" diff --git a/po/pacman.pot b/po/pacman.pot index aae459be..f4cc3e1a 100644 --- a/po/pacman.pot +++ b/po/pacman.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -493,16 +493,6 @@ msgid "" msgstr "" #, c-format -msgid "segmentation fault\n" -msgstr "" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "" @@ -535,6 +525,10 @@ msgid "config file %s, line %d: bad section name.\n" msgstr "" #, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "" + +#, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -551,6 +545,10 @@ msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "" #, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "" + +#, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "" @@ -1119,6 +1117,15 @@ msgstr "" msgid "Version found: %s" msgstr "" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "" @@ -1302,6 +1309,9 @@ msgstr "" msgid "such as arch=('%s')." msgstr "" +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "" @@ -1391,15 +1401,15 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "" -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" - msgid "%s does not exist or is not a directory." msgstr "" msgid "You must have correct permissions to optimize the database." msgstr "" +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" + msgid "ERROR: Can not create temp directory for database building." msgstr "" @@ -1412,27 +1422,27 @@ msgstr "" msgid "Tar'ing up %s failed." msgstr "" -msgid "Making and MD5sum'ing the new db..." +msgid "Making and MD5sum'ing the new database..." msgstr "" msgid "Untar'ing %s failed." msgstr "" +msgid "Syncing database to disk..." +msgstr "" + msgid "Checking integrity..." msgstr "" msgid "Integrity check FAILED, reverting to old database." msgstr "" -msgid "Putting the new database in place..." +msgid "Rotating database into place..." msgstr "" msgid "Finished. Your pacman database has been optimized." msgstr "" -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "" - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-07-30 08:37+0200\n" "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n" "Language-Team: Polski <pl@li.org>\n" @@ -546,18 +546,6 @@ msgstr "" " zasadach licencji GNU General Public License.\n" #, c-format -msgid "segmentation fault\n" -msgstr "naruszenie ochrony pamięci\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Wewnętrzy błąd pacamna: Naruszenie ochrony pamięci.\n" -"Proszę zgłosić pełny raport błędu, w razie potrzeby z --debug.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "problem ustawiania rootdir '%s' (%s)\n" @@ -589,6 +577,10 @@ msgstr "plik konfigu %s nie może być odczytany.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "plik konfigu %s, linia %d: zła nazwa sekcji.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "nie udało się zarejestrować 'lokalnej' bazy danych (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -606,6 +598,10 @@ msgstr "plik konfigu %s, linia %d: dyrektywa '%s' nie rozpoznana.\n" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "zła wartość dla 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "nie udało się zarejestrować 'lokalnej' bazy danych (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "nie udało się zainicjować biblioteki alpm (%s)\n" @@ -1183,6 +1179,15 @@ msgstr "Sprawdzam ostatnią rewizję repozytorium hg..." msgid "Version found: %s" msgstr "Wersja : %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Użycie: %s [opcje]" @@ -1378,6 +1383,9 @@ msgstr "Dużo pakietów może potrzebować w %s pola" msgid "such as arch=('%s')." msgstr "podobnego do arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Skrypt instalacyjny (%s) nie istnieje." @@ -1475,16 +1483,16 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "Nie znaleziono programu diff, zainstaluj diffutils." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa." - msgid "%s does not exist or is not a directory." msgstr "%s nie istnieje lub nie jest katalogiem." msgid "You must have correct permissions to optimize the database." msgstr "Musisz mieć odpowiednie uprawnienia aby optymalizować bazę." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" +"Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa." + msgid "ERROR: Can not create temp directory for database building." msgstr "BŁĄD: Nie można utworzyć katalogu tymczasowego do zbudowania bazy." @@ -1497,27 +1505,30 @@ msgstr "Tworzę archiwum tar z %s..." msgid "Tar'ing up %s failed." msgstr "Stworzenie archiwum tar z %s nie udało się." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Tworzę nową bazę i generuję jej sumę kontrolną..." msgid "Untar'ing %s failed." msgstr "Nie udało się rozpakować archiwum tar z %s." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Synchronizowanie baz danych z pakietami...\n" + msgid "Checking integrity..." msgstr "Sprawdzanie spójności pakietów... " msgid "Integrity check FAILED, reverting to old database." msgstr "Test spójności NIE POWIÓDŁ się, powracam do starej bazy." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Umieszczam nową bazę w odpowiednim miejscu..." msgid "Finished. Your pacman database has been optimized." msgstr "Zakończono. Baza pacmana została zoptymalizowana." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "Aby w pełni skorzystać z optymalizacji, uruchom teraz 'sync'." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Użycie: repo-add [-q] <ścieżka-do-bazy> <pakiet> ...\\n" @@ -1640,3 +1651,16 @@ msgstr "Wszystkie pakiety zostały usunięte z bazy danych. Usuwanie '%s'." msgid "No packages modified, nothing to do." msgstr "Nie zmodyfikowano żadnego pakietu, nie ma nic do zrobienia." + +#~ msgid "segmentation fault\n" +#~ msgstr "naruszenie ochrony pamięci\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Wewnętrzy błąd pacamna: Naruszenie ochrony pamięci.\n" +#~ "Proszę zgłosić pełny raport błędu, w razie potrzeby z --debug.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "Aby w pełni skorzystać z optymalizacji, uruchom teraz 'sync'." diff --git a/po/pt_BR.po b/po/pt_BR.po index 51a940f1..920c01cc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-25 19:48+0200\n" "Last-Translator: Hugo Doria <hugo@archlinux.org>\n" "Language-Team: Brazillian Portuguese <www.archlinux-br.org>\n" @@ -559,18 +559,6 @@ msgstr "" " os termos da GNU General Public License\n" #, c-format -msgid "segmentation fault\n" -msgstr "falha de segmentação\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Erro interno do pacman: Falha de segmentação \n" -"Por favor reporte um bug completo com --debug se apropriado. \n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "problema ao configurar rootdir '%s' (%s)\n" @@ -602,6 +590,10 @@ msgstr "arquivo de configuração %s não pôde ser lido.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "arquivo de configuração %s, linha %d: nome de seção inválido.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "não foi possível registrar a base de dados 'local' (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -622,6 +614,10 @@ msgstr "arquivo de configuração %s, linha %d: diretiva '%s' não reconhecida.\ msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "valor inválido para 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "não foi possível registrar a base de dados 'local' (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "falha ao iniciar biblioteca alpm (%s)\n" @@ -1198,6 +1194,15 @@ msgstr "Determinando última revisão hg..." msgid "Version found: %s" msgstr "Versão encontrada: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Uso: %s [opções]" @@ -1407,6 +1412,9 @@ msgstr "" msgid "such as arch=('%s')." msgstr "como arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Rotina de instalação (%s) não existe." @@ -1506,17 +1514,17 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "ferramenta diff não foi encontrada, por favor instale diffutils." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Arquivo lock do pacman foi encontrado. Não é possível rodar enquanto pacman " -"está em execução." - msgid "%s does not exist or is not a directory." msgstr "%s não existe ou não é um diretório." msgid "You must have correct permissions to optimize the database." msgstr "Você deve ter as permissões corretas para otimizar a base de dados." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" +"Arquivo lock do pacman foi encontrado. Não é possível rodar enquanto pacman " +"está em execução." + msgid "ERROR: Can not create temp directory for database building." msgstr "" "ERRO: Não foi possível criar diretório temporário para construção da base de " @@ -1531,27 +1539,30 @@ msgstr "Gerando tarball de %s..." msgid "Tar'ing up %s failed." msgstr "Criação do tarball de %s falhou." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Criando a nova base de dados e calculando a soma md5..." msgid "Untar'ing %s failed." msgstr "Descompactação de %s falhou." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Sincronizando a base de dados de pacotes...\n" + msgid "Checking integrity..." msgstr "Verificando integridade..." msgid "Integrity check FAILED, reverting to old database." msgstr "Teste de integridade FALHOU, revertendo para a base de dados antiga." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Colocando a nova base de dados em sua localização correta..." msgid "Finished. Your pacman database has been optimized." msgstr "Concluído. Sua base de dados do pacman foi otimizada." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "Para o benefício total de pacman-optimize, rode 'sync' agora." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Uso: repo-add [-q] <caminho-para-bd> <pacote> ...\\n" @@ -1678,3 +1689,16 @@ msgstr "Todos os pacotes foram removidos da base de dados. Removendo '%s'." msgid "No packages modified, nothing to do." msgstr "Nenhum pacote modificado, nada a fazer." + +#~ msgid "segmentation fault\n" +#~ msgstr "falha de segmentação\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Erro interno do pacman: Falha de segmentação \n" +#~ "Por favor reporte um bug completo com --debug se apropriado. \n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "Para o benefício total de pacman-optimize, rode 'sync' agora." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-24 02:24+0300\n" "Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n" "Language-Team: Russian\n" @@ -534,18 +534,6 @@ msgstr "" " на условиях GNU General Public License\n" #, c-format -msgid "segmentation fault\n" -msgstr "ошибка сегментации\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Внутрення ошибка pacman: Ошибка сегментации.\n" -"Просьба предоставить полный отчёт с --debug, при необходимости.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "не могу установить корневой каталог '%s' (%s)\n" @@ -577,6 +565,10 @@ msgstr "не удалось прочитать конфигурационный msgid "config file %s, line %d: bad section name.\n" msgstr "конфигурационный файл %s, строка %d: неверное название секции.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "не могу зарегистрировать локальную базу данных (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -596,6 +588,10 @@ msgstr "конфигурационный файл %s, строка %d: дире msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "неизвестное значение для 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "не могу зарегистрировать локальную базу данных (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "не удалось инициализировать библиотеку alpm (%s)\n" @@ -1172,6 +1168,15 @@ msgstr "Определяю последнюю версию в hg..." msgid "Version found: %s" msgstr "Обнаружена версия: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Применение: %s [параметры]" @@ -1381,6 +1386,9 @@ msgstr "Имейте ввиду, что многим пакетам в %s мож msgid "such as arch=('%s')." msgstr "строка вида arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Установочный скрипт (%s) не существует." @@ -1479,11 +1487,6 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "утилита diff не обнаружена, пожалуйста, установите diffutils." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Обнаружен блокировочный файл pacman'а. Запуск не возможен, когда pacman уже " -"запущен." - msgid "%s does not exist or is not a directory." msgstr "%s не существует или не является директорией." @@ -1492,6 +1495,11 @@ msgstr "" "У вас должны быть соответствующие привилегии, чтобы оптимизировать базу " "данных." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" +"Обнаружен блокировочный файл pacman'а. Запуск не возможен, когда pacman уже " +"запущен." + msgid "ERROR: Can not create temp directory for database building." msgstr "ОШИБКА: Не могу создать временную директорию для создания базы данных." @@ -1504,12 +1512,17 @@ msgstr "Архивирование в tar %s..." msgid "Tar'ing up %s failed." msgstr "Не удалось запаковать в tar %s." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Создание новой базы данных и вычисление MD5-суммы..." msgid "Untar'ing %s failed." msgstr "Распаковка tar'а %s не удалась." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Синхронизируется база данных пакетов...\n" + msgid "Checking integrity..." msgstr "Проверка целостности..." @@ -1517,17 +1530,13 @@ msgid "Integrity check FAILED, reverting to old database." msgstr "" "Проверка целостности ЗАВЕРШИЛАСЬ НЕУДАЧЕЙ, возвращаюсь к старой базе данных." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Перемещение новой базы данных на место..." msgid "Finished. Your pacman database has been optimized." msgstr "Завершено. База данных pacman оптимизирована." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "" -"Чтобы полностью использовать преимущества pacman-optimize,сейчас запустите " -"'sync'." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Применение: repo-add [-q] <путь-к-БД> <имя_пакета> ...\\n" @@ -1651,3 +1660,18 @@ msgstr "Из базы данных были удалены все пакеты. msgid "No packages modified, nothing to do." msgstr "Пакеты не изменялись, делать нечего." + +#~ msgid "segmentation fault\n" +#~ msgstr "ошибка сегментации\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Внутрення ошибка pacman: Ошибка сегментации.\n" +#~ "Просьба предоставить полный отчёт с --debug, при необходимости.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "" +#~ "Чтобы полностью использовать преимущества pacman-optimize,сейчас " +#~ "запустите 'sync'." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-25 07:47+0200\n" "Last-Translator: Samed Beyribey <beyribey@gmail.com>\n" "Language-Team: Türkçe <tr@archlinuxtr.org>\n" @@ -528,18 +528,6 @@ msgstr "" " uymak şartıyla özgürce dağıtılabilir\n" #, c-format -msgid "segmentation fault\n" -msgstr "parçalama arızası\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Dahili pacman hatası: Parçalama arızası.\n" -"Lütfen --debug parametresini kullanarak hata kaydı giriniz.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "kök dizini ayarlama sorunu '%s' (%s)\n" @@ -571,6 +559,10 @@ msgstr "ayar dosyası %s okunamadı.\n" msgid "config file %s, line %d: bad section name.\n" msgstr "ayar dosyası %s, satır %d: hatalı kısım adı.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "yerel veritabanı (%s) kaydedilemedi\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -589,6 +581,10 @@ msgstr "ayar dosyası %s, satır %d: ayar satırı '%s' tanımlanamadı.\n" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "CleanMethod' için geçersiz değer : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "yerel veritabanı (%s) kaydedilemedi\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "alpm kütüphanesi başlatılamadı (%s)\n" @@ -1168,6 +1164,15 @@ msgstr "Güncel hg değişiklik numarası belirleniyor..." msgid "Version found: %s" msgstr "Değişiklik numarası bulundu: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Kullanım: %s [seçenekler]" @@ -1379,6 +1384,9 @@ msgstr "Bir çok paketin %s kısmına bir satır eklenmesi gerekebilir" msgid "such as arch=('%s')." msgstr "arch=('%s') gibi." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Kurulum betiği (%s) mevcut değil." @@ -1486,15 +1494,15 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "diff komutu bulunamadı, lütfen diffutils paketini kurun." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "Pacman kilit dosyası bulundu. Pacman çalışırken çalıştırılamaz." - msgid "%s does not exist or is not a directory." msgstr "%s bulunamadı ya da bir dizin değil." msgid "You must have correct permissions to optimize the database." msgstr "Veritabanını optimize etmek için doğru haklara sahip olmalısınız." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "Pacman kilit dosyası bulundu. Pacman çalışırken çalıştırılamaz." + msgid "ERROR: Can not create temp directory for database building." msgstr "HATA: Veritabanı oluşturmak için geçici dizin oluşturulamadı." @@ -1507,29 +1515,30 @@ msgstr "%s sıkıştırılıyor..." msgid "Tar'ing up %s failed." msgstr "Sıkıştırma başarısız." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Yeni veritabanı oluşturuluyor ve MD5SUM'ı oluşturuluyor..." msgid "Untar'ing %s failed." msgstr "%s sıkıştırılmış dosyadan açılamadı." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Paket veritabanları senkronize ediliyor...\n" + msgid "Checking integrity..." msgstr "Bütünlük kontrolü yapılıyor..." msgid "Integrity check FAILED, reverting to old database." msgstr "Bütünlük kontrolü BAŞARISIZ, eski veritabanına dönülüyor." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Yeni veritabanı yerleştiriliyor..." msgid "Finished. Your pacman database has been optimized." msgstr "Tamamlandı. Pacman veritabanınız optimize edildi." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "" -"pacman-optimize komutundan tam anlamıyla faydalanmak için şimdi 'sync' " -"komutunu çalıştırın." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Kullanım: repo-add [-q] <veritabanı-yolu> <paket-adı> ...\\n" @@ -1657,3 +1666,18 @@ msgstr "Tüm paketler veritabanından kaldırıldı. '%s' siliniyor." msgid "No packages modified, nothing to do." msgstr "Hiç bir pakette değişiklik yapılmadı, çıkılıyor." + +#~ msgid "segmentation fault\n" +#~ msgstr "parçalama arızası\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Dahili pacman hatası: Parçalama arızası.\n" +#~ "Lütfen --debug parametresini kullanarak hata kaydı giriniz.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "" +#~ "pacman-optimize komutundan tam anlamıyla faydalanmak için şimdi 'sync' " +#~ "komutunu çalıştırın." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman 3.2.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-08-25 20:14+0200\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-08-26 22:47+0200\n" "Last-Translator: Roman Kyrylych <roman@archlinux.org>\n" "Language-Team: Ukrainian\n" @@ -535,18 +535,6 @@ msgstr "" " the terms of the GNU General Public License.\n" #, c-format -msgid "segmentation fault\n" -msgstr "segmentation fault\n" - -#, c-format -msgid "" -"Internal pacman error: Segmentation fault.\n" -"Please submit a full bug report with --debug if appropriate.\n" -msgstr "" -"Внутрішня помилка: Segmentation fault.\n" -"Будь-ласка відішліть повний багрепорт з --debug, якщо можливо.\n" - -#, c-format msgid "problem setting rootdir '%s' (%s)\n" msgstr "проблема встановлення '%s' кореневим каталогом (%s)\n" @@ -578,6 +566,10 @@ msgstr "неможливо прочитати файл конфігурації msgid "config file %s, line %d: bad section name.\n" msgstr "файл конфігурації %s, рядок %d: погана назва секції.\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "неможливо зареєструвати базу даних 'local' (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "" @@ -597,6 +589,10 @@ msgstr "файл конфігурації %s, рядок %d: директива msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "невірне значення для 'CleanMethod' : '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "неможливо зареєструвати базу даних 'local' (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "не вдалося ініціалізувати бібліотеку alpm (%s)\n" @@ -1172,6 +1168,15 @@ msgstr "Визначення останніх змін hg..." msgid "Version found: %s" msgstr "Версія знайдена: %s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "Використання: %s [опції]" @@ -1378,6 +1383,9 @@ msgstr "Зверніть увагу, що багато пакунків потр msgid "such as arch=('%s')." msgstr ", такого як arch=('%s')." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "Скрипт встановлення (%s) не існує." @@ -1474,16 +1482,16 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "diff не знайдено. Будь-ласка, встановіть diffutils." -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "" -"Був знайдений lock-файл Pacman'а. Поки Pacman працює - виконання неможливе." - msgid "%s does not exist or is not a directory." msgstr "%s не існує, або не є каталогом." msgid "You must have correct permissions to optimize the database." msgstr "Ви повинні мати коректні права, щоб оптимізувати базу даних." +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "" +"Був знайдений lock-файл Pacman'а. Поки Pacman працює - виконання неможливе." + msgid "ERROR: Can not create temp directory for database building." msgstr "" "ПОМИЛКА: Неможливо створити тимчасовий каталог для побудови бази даних." @@ -1497,27 +1505,30 @@ msgstr "Пакування %s..." msgid "Tar'ing up %s failed." msgstr "Пакування %s не вдалося." -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "Створення та підрахунок MD5-суми нової бази даних..." msgid "Untar'ing %s failed." msgstr "Розпакування %s не вдалося." +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: Синхронізація бази даних пакунків...\n" + msgid "Checking integrity..." msgstr "Перевірка цілісності..." msgid "Integrity check FAILED, reverting to old database." msgstr "Перевірка цілісності НЕВДАЛА, повернення до старої бази даних." -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "Розміщення нової бази даних..." msgid "Finished. Your pacman database has been optimized." msgstr "Закінчено. База даних Pacman'a була оптимізована." -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "Для того, щоб глянути всі переваги pacman-optimize, запустіть 'sync'." - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "Використання: repo-add [-q] <path-to-db> <package> ...\\n" @@ -1641,3 +1652,17 @@ msgstr "Всі пакунки були видалені з бази даних. msgid "No packages modified, nothing to do." msgstr "Пакунки не були змінені, змін не відбулося." + +#~ msgid "segmentation fault\n" +#~ msgstr "segmentation fault\n" + +#~ msgid "" +#~ "Internal pacman error: Segmentation fault.\n" +#~ "Please submit a full bug report with --debug if appropriate.\n" +#~ msgstr "" +#~ "Внутрішня помилка: Segmentation fault.\n" +#~ "Будь-ласка відішліть повний багрепорт з --debug, якщо можливо.\n" + +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "" +#~ "Для того, щоб глянути всі переваги pacman-optimize, запустіть 'sync'." diff --git a/po/zh_CN.po b/po/zh_CN.po index a22aeaa3..32a99a29 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pacman package manager 3.1.2\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2008-10-28 21:55-0500\n" +"POT-Creation-Date: 2009-01-02 22:24-0600\n" "PO-Revision-Date: 2008-10-28 16:20+0900\n" "Last-Translator: Lyman Li <lymanrb@gmail.com>\n" "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n" @@ -536,6 +536,10 @@ msgstr "配置文件 %s 无法读取。\n" msgid "config file %s, line %d: bad section name.\n" msgstr "配置文件 %s，第 %d 行：坏的章节名。\n" +#, fuzzy, c-format +msgid "could not register '%s' database (%s)\n" +msgstr "无法登记“本地”数据库 (%s)\n" + #, c-format msgid "config file %s, line %d: syntax error in config file- missing key.\n" msgstr "配置文件 %s，第 %d 行：配置文件中语法错误－缺少关键字。\n" @@ -552,6 +556,10 @@ msgstr "配置文件 %s，第 %d 行：未知命令 '%s'\n" msgid "invalid value for 'CleanMethod' : '%s'\n" msgstr "为 'CleanMethod' 设置的无效值： '%s'\n" +#, fuzzy, c-format +msgid "could not add server URL to database '%s': %s (%s)\n" +msgstr "无法登记“本地”数据库 (%s)\n" + #, c-format msgid "failed to initialize alpm library (%s)\n" msgstr "初始化 alpm 库失败 (%s)\n" @@ -1127,6 +1135,15 @@ msgstr "正在确认最新的 hg 修正..." msgid "Version found: %s" msgstr "找到版本：%s" +msgid "requires an argument" +msgstr "" + +msgid "unrecognized option" +msgstr "" + +msgid "invalid option" +msgstr "" + msgid "Usage: %s [options]" msgstr "用法：%s [选项]" @@ -1312,6 +1329,9 @@ msgstr "注意许多软件包可能需要在 %s 中添加" msgid "such as arch=('%s')." msgstr "类似 arch=('%s') 的一行." +msgid "Provides array cannot contain comparison (< or >) operators." +msgstr "" + msgid "Install scriptlet (%s) does not exist." msgstr "安装小脚本 (%s) 不存在。" @@ -1406,15 +1426,15 @@ msgstr "" msgid "diff tool was not found, please install diffutils." msgstr "diff 工具未找到，请安装 diffutils。" -msgid "Pacman lock file was found. Cannot run while pacman is running." -msgstr "发现 Pacman 锁文件。不能在 pacman 运行时再次运行。" - msgid "%s does not exist or is not a directory." msgstr "%s 不存在或不是一个目录。" msgid "You must have correct permissions to optimize the database." msgstr "你必须拥有相应的权限才能优化数据库。" +msgid "Pacman lock file was found. Cannot run while pacman is running." +msgstr "发现 Pacman 锁文件。不能在 pacman 运行时再次运行。" + msgid "ERROR: Can not create temp directory for database building." msgstr "错误：无法为建立数据库而创建临时目录。" @@ -1427,27 +1447,30 @@ msgstr "正在打包 %s..." msgid "Tar'ing up %s failed." msgstr "打包 %s 失败。" -msgid "Making and MD5sum'ing the new db..." +#, fuzzy +msgid "Making and MD5sum'ing the new database..." msgstr "正在生成新数据库及其 MD5 校验值..." msgid "Untar'ing %s failed." msgstr "解包 %s 失败。" +#, fuzzy +msgid "Syncing database to disk..." +msgstr ":: 正在同步软件包数据库...\n" + msgid "Checking integrity..." msgstr "正在检查完整性..." msgid "Integrity check FAILED, reverting to old database." msgstr "完整性检查失败，恢复到原数据库。" -msgid "Putting the new database in place..." +#, fuzzy +msgid "Rotating database into place..." msgstr "正在把新的数据库放置到位..." msgid "Finished. Your pacman database has been optimized." msgstr "完毕。你的 pacman 数据库已经优化。" -msgid "For full benefits of pacman-optimize, run 'sync' now." -msgstr "为了充分享受到 pacman-optimize 的好处，现在运行 'sync' 吧。" - msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n" msgstr "用法：repo-add·[-q]·<path-to-db>·<package>·...\\n" @@ -1568,6 +1591,9 @@ msgstr "所有软件包已经从数据库中删除。正在删除 '%s'。" msgid "No packages modified, nothing to do." msgstr "没有软件包被修改，无事可做。" +#~ msgid "For full benefits of pacman-optimize, run 'sync' now." +#~ msgstr "为了充分享受到 pacman-optimize 的好处，现在运行 'sync' 吧。" + #~ msgid "New optional dependencies for %s\n" #~ msgstr "%s 的新可选依赖\n" diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 014ae870..6f0f25a2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -60,6 +60,7 @@ pacman-optimize: $(srcdir)/pacman-optimize.sh.in rankmirrors: $(srcdir)/rankmirrors.py.in repo-add: $(srcdir)/repo-add.sh.in repo-remove: $(srcdir)/repo-add.sh.in - ln -sf repo-add repo-remove + rm -f repo-remove + $(LN_S) repo-add repo-remove # vim:set ts=2 sw=2 noet: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 94cb942e..38081721 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1052,27 +1052,27 @@ devel_check() { # number to avoid having to determine the version number twice. # Also do a brief check to make sure we have the VCS tool available. oldpkgver=$pkgver - if [ ! -z ${_darcstrunk} ] && [ ! -z ${_darcsmod} ] ; then + if [ -n "${_darcstrunk}" -a -n "${_darcsmod}" ] ; then [ $(type -p darcs) ] || return 0 msg "$(gettext "Determining latest darcs revision...")" newpkgver=$(date +%Y%m%d) - elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then + elif [ -n "${_cvsroot}" -a -n "${_cvsmod}" ] ; then [ $(type -p cvs) ] || return 0 msg "$(gettext "Determining latest cvs revision...")" newpkgver=$(date +%Y%m%d) - elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then + elif [ -n "${_gitroot}" -a -n "${_gitname}" ] ; then [ $(type -p git) ] || return 0 msg "$(gettext "Determining latest git revision...")" newpkgver=$(date +%Y%m%d) - elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then + elif [ -n "${_svntrunk}" -a -n "${_svnmod}" ] ; then [ $(type -p svn) ] || return 0 msg "$(gettext "Determining latest svn revision...")" newpkgver=$(LC_ALL=C svn info $_svntrunk | sed -n 's/^Last Changed Rev: \([0-9]*\)$/\1/p') - elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then + elif [ -n "${_bzrtrunk}" -a -n "${_bzrmod}" ] ; then [ $(type -p bzr) ] || return 0 msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) - elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then + elif [ -n "${_hgroot}" -a -n "${_hgrepo}" ] ; then [ $(type -p hg) ] || return 0 msg "$(gettext "Determining latest hg revision...")" if [ -d ./src/$_hgrepo ] ; then @@ -1113,14 +1113,101 @@ devel_update() { if [ "$newpkgver" != "" ]; then if [ "$newpkgver" != "$pkgver" ]; then if [ -f "./$BUILDSCRIPT" ]; then - sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT - sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT - source $BUILDSCRIPT + sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT" + sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT" + source "$BUILDSCRIPT" fi fi fi } +# getopt like parser +parse_options() { + local short_options=$1; shift; + local long_options=$1; shift; + local ret=0; + local unused_options="" + + while [ -n "$1" ]; do + if [ ${1:0:2} = '--' ]; then + if [ -n "${1:2}" ]; then + local match="" + for i in ${long_options//,/ }; do + if [ ${1:2} = ${i//:} ]; then + match=$i + break + fi + done + if [ -n "$match" ]; then + if [ ${1:2} = $match ]; then + printf ' %s' "$1" + else + if [ -n "$2" ]; then + printf ' %s' "$1" + shift + printf " '%s'" "$1" + else + echo "makepkg: option '$1' $(gettext "requires an argument")" >&2 + ret=1 + fi + fi + else + echo "makepkg: $(gettext "unrecognized option") '$1'" >&2 + ret=1 + fi + else + shift + break + fi + elif [ ${1:0:1} = '-' ]; then + for ((i=1; i<${#1}; i++)); do + if [[ "$short_options" =~ "${1:i:1}" ]]; then + if [[ "$short_options" =~ "${1:i:1}:" ]]; then + if [ -n "${1:$i+1}" ]; then + printf ' -%s' "${1:i:1}" + printf " '%s'" "${1:$i+1}" + else + if [ -n "$2" ]; then + printf ' -%s' "${1:i:1}" + shift + printf " '%s'" "${1}" + else + echo "makepkg: option $(gettext "requires an argument") -- '${1:i:1}'" >&2 + ret=1 + fi + fi + break + else + printf ' -%s' "${1:i:1}" + fi + else + echo "makepkg: $(gettext "invalid option") -- '${1:i:1}'" >&2 + ret=1 + fi + done + else + unused_options="${unused_options} '$1'" + fi + shift + done + + printf " --" + if [ -n "$unused_options" ]; then + for i in ${unused_options[@]}; do + printf ' %s' "$i" + done + fi + if [ -n "$1" ]; then + while [ -n "$1" ]; do + printf " '%s'" "${1}" + shift + done + fi + printf "\n" + + return $ret +} + usage() { printf "makepkg (pacman) %s\n" "$myver" echo @@ -1186,8 +1273,8 @@ OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source" OPT_LONG="$OPT_LONG,syncdeps,version,config:" # Pacman Options OPT_LONG="$OPT_LONG,noconfirm,noprogressbar" -OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" -if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then +OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')" +if echo "$OPT_TEMP" | grep -q 'PARSE_OPTIONS FAILED'; then # This is a small hack to stop the script bailing with 'set -e' echo; usage; exit 1 # E_INVALID_OPTION; fi @@ -1299,7 +1386,7 @@ if [ "$CLEANCACHE" = "1" ]; then fi fi -if [ -z $BUILDSCRIPT ]; then +if [ -z "$BUILDSCRIPT" ]; then error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$MAKEPKG_CONF" exit 1 fi @@ -1389,11 +1476,11 @@ if [ -z "$pkgrel" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgrel" exit 1 fi -if [ $(echo "$pkgver" | grep '-') ]; then +if [ "$pkgver" != "${pkgver//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" exit 1 fi -if [ $(echo "$pkgrel" | grep '-') ]; then +if [ "$pkgrel" != "${pkgrel//-/}" ]; then error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" exit 1 fi @@ -1411,6 +1498,14 @@ if ! in_array $CARCH ${arch[@]}; then fi fi +for provide in ${provides[@]}; do + if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then + error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" + exit 1 + fi +done +unset provide + if [ "$install" -a ! -f "$install" ]; then error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" exit 1 |