From 779aba0137e0e66768682129a85d29d91dd41dbe Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 3 Oct 2011 23:33:15 +0200 Subject: [PATCH] Update translation. --- po/da.po | 141 ++++++++++++++++++++++++++++--------------------- po/de_DE.po | 141 ++++++++++++++++++++++++++++--------------------- po/es.po | 141 ++++++++++++++++++++++++++++--------------------- po/pakfire.pot | 93 ++++++++++++++++++++------------ po/ru.po | 141 ++++++++++++++++++++++++++++--------------------- 5 files changed, 379 insertions(+), 278 deletions(-) diff --git a/po/da.po b/po/da.po index 3c93b473b..65f9a4d84 100644 --- a/po/da.po +++ b/po/da.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: IPFire\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-28 12:35+0200\n" -"PO-Revision-Date: 2011-10-02 03:21+0000\n" +"POT-Creation-Date: 2011-10-02 14:37+0200\n" +"PO-Revision-Date: 2011-10-03 03:20+0000\n" "Last-Translator: Danskmand \n" "Language-Team: Danish (http://www.transifex.net/projects/p/ipfire/team/da/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "" #: ../python/pakfire/actions.py:223 ../python/pakfire/actions.py:239 #: ../python/pakfire/actions.py:262 ../python/pakfire/actions.py:285 -#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:321 +#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:328 #, python-format msgid "Running transaction test for %s" msgstr "" @@ -64,25 +64,25 @@ msgstr "sletter" msgid "Cleanup" msgstr "oprydning" -#: ../python/pakfire/actions.py:330 +#: ../python/pakfire/actions.py:337 msgid "Downgrading" msgstr "nedgraderer" -#: ../python/pakfire/base.py:199 ../python/pakfire/base.py:229 -#: ../python/pakfire/base.py:275 ../python/pakfire/base.py:316 -#: ../python/pakfire/base.py:349 +#: ../python/pakfire/base.py:203 ../python/pakfire/base.py:233 +#: ../python/pakfire/base.py:279 ../python/pakfire/base.py:320 +#: ../python/pakfire/base.py:353 msgid "Nothing to do" msgstr "Intet at gøre" -#: ../python/pakfire/base.py:261 +#: ../python/pakfire/base.py:265 msgid "There are no packages to install." msgstr "Der er ingen pakker til at installere" -#: ../python/pakfire/base.py:454 +#: ../python/pakfire/base.py:458 msgid "Build command has failed." msgstr "" -#: ../python/pakfire/base.py:538 +#: ../python/pakfire/base.py:542 msgid "Everything is fine." msgstr "alt er fint" @@ -91,22 +91,22 @@ msgid "Package information:" msgstr "" #. Copy the makefile and load source tarballs. -#: ../python/pakfire/builder.py:284 +#: ../python/pakfire/builder.py:287 msgid "Extracting" msgstr "" -#: ../python/pakfire/builder.py:540 +#: ../python/pakfire/builder.py:543 msgid "The build command failed. See logfile for details." msgstr "" #. Package the result. #. Make all these little package from the build environment. -#: ../python/pakfire/builder.py:684 +#: ../python/pakfire/builder.py:687 msgid "Creating packages:" msgstr "" #. Execute the buildscript of this stage. -#: ../python/pakfire/builder.py:704 +#: ../python/pakfire/builder.py:707 #, python-format msgid "Running stage %s:" msgstr "" @@ -239,7 +239,7 @@ msgstr "Kontroller afhængigheder for en bestemt pakke." msgid "Give name of at least one package to check." msgstr "angiv navnet på mindst én pakke som kontrolleres." -#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:274 msgid "Repository" msgstr "Projektarkivet" @@ -350,11 +350,15 @@ msgid "Do not verify build dependencies." msgstr "" #: ../python/pakfire/compress.py:133 -#: ../python/pakfire/packages/packager.py:489 +#: ../python/pakfire/packages/packager.py:487 #, python-format msgid "Compressing %s" msgstr "" +#: ../python/pakfire/downloader.py:126 +msgid "Downloading source files:" +msgstr "" + #: ../python/pakfire/errors.py:30 msgid "An unhandled error occured." msgstr "En ikke-afviklet fejl opstod." @@ -375,117 +379,122 @@ msgstr "" msgid "Running pakfire-build in a pakfire container?" msgstr "" -#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:308 +#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:338 msgid "Transaction test was not successful" msgstr "" -#: ../python/pakfire/packages/base.py:89 +#: ../python/pakfire/i18n.py:54 +#, python-format +msgid "%(commas)s and %(last)s" +msgstr "" + +#: ../python/pakfire/packages/base.py:94 msgid "Name" msgstr "navn" -#: ../python/pakfire/packages/base.py:90 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:95 ../python/pakfire/transaction.py:273 msgid "Arch" msgstr "arch" -#: ../python/pakfire/packages/base.py:91 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:273 msgid "Version" msgstr "version" -#: ../python/pakfire/packages/base.py:92 +#: ../python/pakfire/packages/base.py:97 msgid "Release" msgstr "version" -#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/packages/base.py:101 ../python/pakfire/transaction.py:274 msgid "Size" msgstr "størrelse" -#: ../python/pakfire/packages/base.py:100 +#: ../python/pakfire/packages/base.py:105 msgid "Repo" msgstr "Repo" -#: ../python/pakfire/packages/base.py:103 +#: ../python/pakfire/packages/base.py:108 msgid "Summary" msgstr "resumé" -#: ../python/pakfire/packages/base.py:104 +#: ../python/pakfire/packages/base.py:109 msgid "Groups" msgstr "grupper" -#: ../python/pakfire/packages/base.py:105 +#: ../python/pakfire/packages/base.py:110 msgid "URL" msgstr "URL" -#: ../python/pakfire/packages/base.py:106 +#: ../python/pakfire/packages/base.py:111 msgid "License" msgstr "licens" -#: ../python/pakfire/packages/base.py:109 +#: ../python/pakfire/packages/base.py:114 msgid "Description" msgstr "beskrivelse" -#: ../python/pakfire/packages/base.py:116 +#: ../python/pakfire/packages/base.py:121 msgid "Maintainer" msgstr "" -#: ../python/pakfire/packages/base.py:118 +#: ../python/pakfire/packages/base.py:123 msgid "UUID" msgstr "UUID" -#: ../python/pakfire/packages/base.py:119 +#: ../python/pakfire/packages/base.py:124 msgid "Build ID" msgstr "build-ID" -#: ../python/pakfire/packages/base.py:120 +#: ../python/pakfire/packages/base.py:125 msgid "Build date" msgstr "Build Dato" -#: ../python/pakfire/packages/base.py:121 +#: ../python/pakfire/packages/base.py:126 msgid "Build host" msgstr "Build host" -#: ../python/pakfire/packages/base.py:123 +#: ../python/pakfire/packages/base.py:128 msgid "Provides" msgstr "leverer" -#: ../python/pakfire/packages/base.py:128 +#: ../python/pakfire/packages/base.py:133 msgid "Pre-requires" msgstr "" -#: ../python/pakfire/packages/base.py:133 +#: ../python/pakfire/packages/base.py:138 msgid "Requires" msgstr "kræver" -#: ../python/pakfire/packages/base.py:138 +#: ../python/pakfire/packages/base.py:143 msgid "Conflicts" msgstr "" -#: ../python/pakfire/packages/base.py:143 +#: ../python/pakfire/packages/base.py:148 msgid "Obsoletes" msgstr "" -#: ../python/pakfire/packages/base.py:151 +#: ../python/pakfire/packages/base.py:156 msgid "File" msgstr "Fil" -#: ../python/pakfire/packages/base.py:332 +#: ../python/pakfire/packages/base.py:337 msgid "Not set" msgstr "udefineret" -#: ../python/pakfire/packages/file.py:106 +#: ../python/pakfire/packages/file.py:107 #, python-format msgid "Could not extract file: /%(src)s - %(dst)s" msgstr "" -#: ../python/pakfire/packages/file.py:156 +#: ../python/pakfire/packages/file.py:160 #, python-format msgid "Filename: %s" msgstr "" -#: ../python/pakfire/packages/make.py:100 +#: ../python/pakfire/packages/make.py:70 msgid "Package name is undefined." msgstr "" -#: ../python/pakfire/packages/make.py:103 +#: ../python/pakfire/packages/make.py:73 msgid "Package version is undefined." msgstr "" @@ -494,7 +503,7 @@ msgstr "" msgid "Packaging" msgstr "" -#: ../python/pakfire/packages/packager.py:608 +#: ../python/pakfire/packages/packager.py:606 #, python-format msgid "Building source package %s:" msgstr "" @@ -560,70 +569,80 @@ msgstr "Løsning:%s" msgid " Solutions:" msgstr "Løsninger:" -#: ../python/pakfire/transaction.py:180 +#: ../python/pakfire/transaction.py:76 +#, python-format +msgid "file %s from %s conflicts with file from package %s" +msgstr "" + +#: ../python/pakfire/transaction.py:82 +#, python-format +msgid "file %s from %s conflicts with files from %s" +msgstr "" + +#: ../python/pakfire/transaction.py:208 msgid "Downloading packages:" msgstr "Download af pakker:" -#: ../python/pakfire/transaction.py:245 +#: ../python/pakfire/transaction.py:273 msgid "Package" msgstr "pakke" -#: ../python/pakfire/transaction.py:250 +#: ../python/pakfire/transaction.py:278 msgid "Installing:" msgstr "installerer:" -#: ../python/pakfire/transaction.py:251 +#: ../python/pakfire/transaction.py:279 msgid "Reinstalling:" msgstr "Geninstallerer:" -#: ../python/pakfire/transaction.py:252 +#: ../python/pakfire/transaction.py:280 msgid "Updating:" msgstr "opdaterer:" -#: ../python/pakfire/transaction.py:253 +#: ../python/pakfire/transaction.py:281 msgid "Downgrading:" msgstr "nedgradering:" -#: ../python/pakfire/transaction.py:254 +#: ../python/pakfire/transaction.py:282 msgid "Removing:" msgstr "fjerner:" -#: ../python/pakfire/transaction.py:260 +#: ../python/pakfire/transaction.py:288 msgid "Transaction Summary" msgstr "Transaktions resumé" -#: ../python/pakfire/transaction.py:267 +#: ../python/pakfire/transaction.py:295 msgid "package" msgstr "Pakke" -#: ../python/pakfire/transaction.py:273 +#: ../python/pakfire/transaction.py:301 #, python-format msgid "Total download size: %s" msgstr "samlet download størrelse: %s" -#: ../python/pakfire/transaction.py:277 +#: ../python/pakfire/transaction.py:305 #, python-format msgid "Installed size: %s" msgstr "installeret størrelse %s" -#: ../python/pakfire/transaction.py:279 +#: ../python/pakfire/transaction.py:307 #, python-format msgid "Freed size: %s" msgstr "befriet størrelse %s" -#: ../python/pakfire/transaction.py:288 +#: ../python/pakfire/transaction.py:316 msgid "Is this okay?" msgstr "er det ok ?" -#: ../python/pakfire/transaction.py:291 +#: ../python/pakfire/transaction.py:319 msgid "Running Transaction Test" msgstr "" -#: ../python/pakfire/transaction.py:303 +#: ../python/pakfire/transaction.py:331 msgid "Transaction Test Succeeded" msgstr "" -#: ../python/pakfire/transaction.py:317 +#: ../python/pakfire/transaction.py:347 msgid "Running transaction" msgstr "løbende transaktion" diff --git a/po/de_DE.po b/po/de_DE.po index fdfe876e2..1525bf38e 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: IPFire\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-28 12:35+0200\n" -"PO-Revision-Date: 2011-10-02 03:21+0000\n" +"POT-Creation-Date: 2011-10-02 14:37+0200\n" +"PO-Revision-Date: 2011-10-03 03:20+0000\n" "Last-Translator: numark1 \n" "Language-Team: German (Germany) (http://www.transifex.net/projects/p/ipfire/team/de_DE/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "Das Script lief länger als %s Sekunden und wurde beendet." #: ../python/pakfire/actions.py:223 ../python/pakfire/actions.py:239 #: ../python/pakfire/actions.py:262 ../python/pakfire/actions.py:285 -#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:321 +#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:328 #, python-format msgid "Running transaction test for %s" msgstr "" @@ -70,25 +70,25 @@ msgstr "Entferne" msgid "Cleanup" msgstr "Aufräumen" -#: ../python/pakfire/actions.py:330 +#: ../python/pakfire/actions.py:337 msgid "Downgrading" msgstr "Herabsetzen" -#: ../python/pakfire/base.py:199 ../python/pakfire/base.py:229 -#: ../python/pakfire/base.py:275 ../python/pakfire/base.py:316 -#: ../python/pakfire/base.py:349 +#: ../python/pakfire/base.py:203 ../python/pakfire/base.py:233 +#: ../python/pakfire/base.py:279 ../python/pakfire/base.py:320 +#: ../python/pakfire/base.py:353 msgid "Nothing to do" msgstr "Nichts zu tun" -#: ../python/pakfire/base.py:261 +#: ../python/pakfire/base.py:265 msgid "There are no packages to install." msgstr "Es gibt keine Pakete zum installieren" -#: ../python/pakfire/base.py:454 +#: ../python/pakfire/base.py:458 msgid "Build command has failed." msgstr "Aufbauen fehlgeschlagen." -#: ../python/pakfire/base.py:538 +#: ../python/pakfire/base.py:542 msgid "Everything is fine." msgstr "Alles in Ordnung" @@ -97,22 +97,22 @@ msgid "Package information:" msgstr "Paket Informationen:" #. Copy the makefile and load source tarballs. -#: ../python/pakfire/builder.py:284 +#: ../python/pakfire/builder.py:287 msgid "Extracting" msgstr "Entpacke" -#: ../python/pakfire/builder.py:540 +#: ../python/pakfire/builder.py:543 msgid "The build command failed. See logfile for details." msgstr "Aufbauen fehlgeschlagen. Sehen Sie in die Logfiles für Details." #. Package the result. #. Make all these little package from the build environment. -#: ../python/pakfire/builder.py:684 +#: ../python/pakfire/builder.py:687 msgid "Creating packages:" msgstr "Erstelle Pakete:" #. Execute the buildscript of this stage. -#: ../python/pakfire/builder.py:704 +#: ../python/pakfire/builder.py:707 #, python-format msgid "Running stage %s:" msgstr "Starte Level %s:" @@ -246,7 +246,7 @@ msgstr "Überprüfe die Abhängigkeiten eines bestimmten Paketes." msgid "Give name of at least one package to check." msgstr "Gib mindestens ein Paket an das überprüft werden soll." -#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:274 msgid "Repository" msgstr "Repositorium" @@ -357,11 +357,15 @@ msgid "Do not verify build dependencies." msgstr "Überprüfe keine Abhängigkeiten beim Aufbauen." #: ../python/pakfire/compress.py:133 -#: ../python/pakfire/packages/packager.py:489 +#: ../python/pakfire/packages/packager.py:487 #, python-format msgid "Compressing %s" msgstr "Komprimiere %s" +#: ../python/pakfire/downloader.py:126 +msgid "Downloading source files:" +msgstr "" + #: ../python/pakfire/errors.py:30 msgid "An unhandled error occured." msgstr "Ein unbehandelter Fehler ist aufgetreten" @@ -382,117 +386,122 @@ msgstr "" msgid "Running pakfire-build in a pakfire container?" msgstr "" -#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:308 +#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:338 msgid "Transaction test was not successful" msgstr "" -#: ../python/pakfire/packages/base.py:89 +#: ../python/pakfire/i18n.py:54 +#, python-format +msgid "%(commas)s and %(last)s" +msgstr "" + +#: ../python/pakfire/packages/base.py:94 msgid "Name" msgstr "Name" -#: ../python/pakfire/packages/base.py:90 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:95 ../python/pakfire/transaction.py:273 msgid "Arch" msgstr "Arch" -#: ../python/pakfire/packages/base.py:91 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:273 msgid "Version" msgstr "Version" -#: ../python/pakfire/packages/base.py:92 +#: ../python/pakfire/packages/base.py:97 msgid "Release" msgstr "Release" -#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/packages/base.py:101 ../python/pakfire/transaction.py:274 msgid "Size" msgstr "Größe" -#: ../python/pakfire/packages/base.py:100 +#: ../python/pakfire/packages/base.py:105 msgid "Repo" msgstr "Repo" -#: ../python/pakfire/packages/base.py:103 +#: ../python/pakfire/packages/base.py:108 msgid "Summary" msgstr "Zusammenfassung" -#: ../python/pakfire/packages/base.py:104 +#: ../python/pakfire/packages/base.py:109 msgid "Groups" msgstr "Gruppen" -#: ../python/pakfire/packages/base.py:105 +#: ../python/pakfire/packages/base.py:110 msgid "URL" msgstr "URL" -#: ../python/pakfire/packages/base.py:106 +#: ../python/pakfire/packages/base.py:111 msgid "License" msgstr "Lizenz" -#: ../python/pakfire/packages/base.py:109 +#: ../python/pakfire/packages/base.py:114 msgid "Description" msgstr "Beschreibung" -#: ../python/pakfire/packages/base.py:116 +#: ../python/pakfire/packages/base.py:121 msgid "Maintainer" msgstr "Besitzer" -#: ../python/pakfire/packages/base.py:118 +#: ../python/pakfire/packages/base.py:123 msgid "UUID" msgstr "UUID" -#: ../python/pakfire/packages/base.py:119 +#: ../python/pakfire/packages/base.py:124 msgid "Build ID" msgstr "Build-ID" -#: ../python/pakfire/packages/base.py:120 +#: ../python/pakfire/packages/base.py:125 msgid "Build date" msgstr "Build-Datum" -#: ../python/pakfire/packages/base.py:121 +#: ../python/pakfire/packages/base.py:126 msgid "Build host" msgstr "Build-Host" -#: ../python/pakfire/packages/base.py:123 +#: ../python/pakfire/packages/base.py:128 msgid "Provides" msgstr "Bietet an" -#: ../python/pakfire/packages/base.py:128 +#: ../python/pakfire/packages/base.py:133 msgid "Pre-requires" msgstr "Vorbereitungen" -#: ../python/pakfire/packages/base.py:133 +#: ../python/pakfire/packages/base.py:138 msgid "Requires" msgstr "Benötigt" -#: ../python/pakfire/packages/base.py:138 +#: ../python/pakfire/packages/base.py:143 msgid "Conflicts" msgstr "Konflikte" -#: ../python/pakfire/packages/base.py:143 +#: ../python/pakfire/packages/base.py:148 msgid "Obsoletes" msgstr "Veraltetes" -#: ../python/pakfire/packages/base.py:151 +#: ../python/pakfire/packages/base.py:156 msgid "File" msgstr "Datei" -#: ../python/pakfire/packages/base.py:332 +#: ../python/pakfire/packages/base.py:337 msgid "Not set" msgstr "Nicht gesetzt" -#: ../python/pakfire/packages/file.py:106 +#: ../python/pakfire/packages/file.py:107 #, python-format msgid "Could not extract file: /%(src)s - %(dst)s" msgstr "" -#: ../python/pakfire/packages/file.py:156 +#: ../python/pakfire/packages/file.py:160 #, python-format msgid "Filename: %s" msgstr "Dateiname: %s" -#: ../python/pakfire/packages/make.py:100 +#: ../python/pakfire/packages/make.py:70 msgid "Package name is undefined." msgstr "Paket Name ist undefiniert." -#: ../python/pakfire/packages/make.py:103 +#: ../python/pakfire/packages/make.py:73 msgid "Package version is undefined." msgstr "Paket Version ist undefiniert." @@ -501,7 +510,7 @@ msgstr "Paket Version ist undefiniert." msgid "Packaging" msgstr "Packe ein" -#: ../python/pakfire/packages/packager.py:608 +#: ../python/pakfire/packages/packager.py:606 #, python-format msgid "Building source package %s:" msgstr "Aufbauen des Quellcode Paket %s:" @@ -566,70 +575,80 @@ msgstr "Lösung: %s" msgid " Solutions:" msgstr "Lösungen:" -#: ../python/pakfire/transaction.py:180 +#: ../python/pakfire/transaction.py:76 +#, python-format +msgid "file %s from %s conflicts with file from package %s" +msgstr "" + +#: ../python/pakfire/transaction.py:82 +#, python-format +msgid "file %s from %s conflicts with files from %s" +msgstr "" + +#: ../python/pakfire/transaction.py:208 msgid "Downloading packages:" msgstr "Herunterladen von Paketen:" -#: ../python/pakfire/transaction.py:245 +#: ../python/pakfire/transaction.py:273 msgid "Package" msgstr "Paket" -#: ../python/pakfire/transaction.py:250 +#: ../python/pakfire/transaction.py:278 msgid "Installing:" msgstr "Installiere:" -#: ../python/pakfire/transaction.py:251 +#: ../python/pakfire/transaction.py:279 msgid "Reinstalling:" msgstr "Neuinstallation:" -#: ../python/pakfire/transaction.py:252 +#: ../python/pakfire/transaction.py:280 msgid "Updating:" msgstr "Aktualisiere:" -#: ../python/pakfire/transaction.py:253 +#: ../python/pakfire/transaction.py:281 msgid "Downgrading:" msgstr "Herabsetzen:" -#: ../python/pakfire/transaction.py:254 +#: ../python/pakfire/transaction.py:282 msgid "Removing:" msgstr "Entferne:" -#: ../python/pakfire/transaction.py:260 +#: ../python/pakfire/transaction.py:288 msgid "Transaction Summary" msgstr "Zusammenfassung der Transaktion" -#: ../python/pakfire/transaction.py:267 +#: ../python/pakfire/transaction.py:295 msgid "package" msgstr "Paket" -#: ../python/pakfire/transaction.py:273 +#: ../python/pakfire/transaction.py:301 #, python-format msgid "Total download size: %s" msgstr "Gesamte Downloadgröße: %s" -#: ../python/pakfire/transaction.py:277 +#: ../python/pakfire/transaction.py:305 #, python-format msgid "Installed size: %s" msgstr "Installations Größe: %s" -#: ../python/pakfire/transaction.py:279 +#: ../python/pakfire/transaction.py:307 #, python-format msgid "Freed size: %s" msgstr "Freigegebene Größe: %s" -#: ../python/pakfire/transaction.py:288 +#: ../python/pakfire/transaction.py:316 msgid "Is this okay?" msgstr "Ist dies in Ordnung?" -#: ../python/pakfire/transaction.py:291 +#: ../python/pakfire/transaction.py:319 msgid "Running Transaction Test" msgstr "" -#: ../python/pakfire/transaction.py:303 +#: ../python/pakfire/transaction.py:331 msgid "Transaction Test Succeeded" msgstr "" -#: ../python/pakfire/transaction.py:317 +#: ../python/pakfire/transaction.py:347 msgid "Running transaction" msgstr "führe Transaktionen durch" diff --git a/po/es.po b/po/es.po index 9bc9115b4..528806105 100644 --- a/po/es.po +++ b/po/es.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: IPFire\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-28 12:35+0200\n" -"PO-Revision-Date: 2011-10-02 03:21+0000\n" +"POT-Creation-Date: 2011-10-02 14:37+0200\n" +"PO-Revision-Date: 2011-10-03 03:20+0000\n" "Last-Translator: andres_reyes \n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/ipfire/team/es/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "El scriptlet se ejecutó más de %s segundos y fué asesinado." #: ../python/pakfire/actions.py:223 ../python/pakfire/actions.py:239 #: ../python/pakfire/actions.py:262 ../python/pakfire/actions.py:285 -#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:321 +#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:328 #, python-format msgid "Running transaction test for %s" msgstr "" @@ -70,25 +70,25 @@ msgstr "Quitando" msgid "Cleanup" msgstr "Limpiar" -#: ../python/pakfire/actions.py:330 +#: ../python/pakfire/actions.py:337 msgid "Downgrading" msgstr "Desactualizando" -#: ../python/pakfire/base.py:199 ../python/pakfire/base.py:229 -#: ../python/pakfire/base.py:275 ../python/pakfire/base.py:316 -#: ../python/pakfire/base.py:349 +#: ../python/pakfire/base.py:203 ../python/pakfire/base.py:233 +#: ../python/pakfire/base.py:279 ../python/pakfire/base.py:320 +#: ../python/pakfire/base.py:353 msgid "Nothing to do" msgstr "Nada que hacer" -#: ../python/pakfire/base.py:261 +#: ../python/pakfire/base.py:265 msgid "There are no packages to install." msgstr "No hay paquetes para instalar." -#: ../python/pakfire/base.py:454 +#: ../python/pakfire/base.py:458 msgid "Build command has failed." msgstr "El comando de construcción ha fallado." -#: ../python/pakfire/base.py:538 +#: ../python/pakfire/base.py:542 msgid "Everything is fine." msgstr "Todo está bien." @@ -97,23 +97,23 @@ msgid "Package information:" msgstr "Información del paquete:" #. Copy the makefile and load source tarballs. -#: ../python/pakfire/builder.py:284 +#: ../python/pakfire/builder.py:287 msgid "Extracting" msgstr "Extrayendo" -#: ../python/pakfire/builder.py:540 +#: ../python/pakfire/builder.py:543 msgid "The build command failed. See logfile for details." msgstr "" "El comando de construcción falló. Revisar fichero de log para más detalles." #. Package the result. #. Make all these little package from the build environment. -#: ../python/pakfire/builder.py:684 +#: ../python/pakfire/builder.py:687 msgid "Creating packages:" msgstr "Creando paquetes:" #. Execute the buildscript of this stage. -#: ../python/pakfire/builder.py:704 +#: ../python/pakfire/builder.py:707 #, python-format msgid "Running stage %s:" msgstr "Fase en ejecución %s:" @@ -250,7 +250,7 @@ msgstr "Comprobar las dependencias de un paquete en particular." msgid "Give name of at least one package to check." msgstr "Dar al menos el nombre de un paquete a comprobar." -#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:274 msgid "Repository" msgstr "Repositorio" @@ -361,11 +361,15 @@ msgid "Do not verify build dependencies." msgstr "No verificar dependencias de construcción." #: ../python/pakfire/compress.py:133 -#: ../python/pakfire/packages/packager.py:489 +#: ../python/pakfire/packages/packager.py:487 #, python-format msgid "Compressing %s" msgstr "Comprimiendo %s" +#: ../python/pakfire/downloader.py:126 +msgid "Downloading source files:" +msgstr "" + #: ../python/pakfire/errors.py:30 msgid "An unhandled error occured." msgstr "Ocurrió un error no controlado" @@ -386,117 +390,122 @@ msgstr "" msgid "Running pakfire-build in a pakfire container?" msgstr "" -#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:308 +#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:338 msgid "Transaction test was not successful" msgstr "" -#: ../python/pakfire/packages/base.py:89 +#: ../python/pakfire/i18n.py:54 +#, python-format +msgid "%(commas)s and %(last)s" +msgstr "" + +#: ../python/pakfire/packages/base.py:94 msgid "Name" msgstr "Nombre" -#: ../python/pakfire/packages/base.py:90 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:95 ../python/pakfire/transaction.py:273 msgid "Arch" msgstr "Arquitectura" -#: ../python/pakfire/packages/base.py:91 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:273 msgid "Version" msgstr "Versión" -#: ../python/pakfire/packages/base.py:92 +#: ../python/pakfire/packages/base.py:97 msgid "Release" msgstr "Lanzamiento" -#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/packages/base.py:101 ../python/pakfire/transaction.py:274 msgid "Size" msgstr "Tamaño" -#: ../python/pakfire/packages/base.py:100 +#: ../python/pakfire/packages/base.py:105 msgid "Repo" msgstr "Repositorio" -#: ../python/pakfire/packages/base.py:103 +#: ../python/pakfire/packages/base.py:108 msgid "Summary" msgstr "Sumario" -#: ../python/pakfire/packages/base.py:104 +#: ../python/pakfire/packages/base.py:109 msgid "Groups" msgstr "Grupos" -#: ../python/pakfire/packages/base.py:105 +#: ../python/pakfire/packages/base.py:110 msgid "URL" msgstr "URL" -#: ../python/pakfire/packages/base.py:106 +#: ../python/pakfire/packages/base.py:111 msgid "License" msgstr "Licencia" -#: ../python/pakfire/packages/base.py:109 +#: ../python/pakfire/packages/base.py:114 msgid "Description" msgstr "Descripción" -#: ../python/pakfire/packages/base.py:116 +#: ../python/pakfire/packages/base.py:121 msgid "Maintainer" msgstr "Mantenedor" -#: ../python/pakfire/packages/base.py:118 +#: ../python/pakfire/packages/base.py:123 msgid "UUID" msgstr "UUID" -#: ../python/pakfire/packages/base.py:119 +#: ../python/pakfire/packages/base.py:124 msgid "Build ID" msgstr "ID de construcción" -#: ../python/pakfire/packages/base.py:120 +#: ../python/pakfire/packages/base.py:125 msgid "Build date" msgstr "Fecha de construcción" -#: ../python/pakfire/packages/base.py:121 +#: ../python/pakfire/packages/base.py:126 msgid "Build host" msgstr "Host de construcción" -#: ../python/pakfire/packages/base.py:123 +#: ../python/pakfire/packages/base.py:128 msgid "Provides" msgstr "Proporciona" -#: ../python/pakfire/packages/base.py:128 +#: ../python/pakfire/packages/base.py:133 msgid "Pre-requires" msgstr "Prerrequerido" -#: ../python/pakfire/packages/base.py:133 +#: ../python/pakfire/packages/base.py:138 msgid "Requires" msgstr "Requiere" -#: ../python/pakfire/packages/base.py:138 +#: ../python/pakfire/packages/base.py:143 msgid "Conflicts" msgstr "En conflicto" -#: ../python/pakfire/packages/base.py:143 +#: ../python/pakfire/packages/base.py:148 msgid "Obsoletes" msgstr "Obsoleto" -#: ../python/pakfire/packages/base.py:151 +#: ../python/pakfire/packages/base.py:156 msgid "File" msgstr "Fichero" -#: ../python/pakfire/packages/base.py:332 +#: ../python/pakfire/packages/base.py:337 msgid "Not set" msgstr "No establecido" -#: ../python/pakfire/packages/file.py:106 +#: ../python/pakfire/packages/file.py:107 #, python-format msgid "Could not extract file: /%(src)s - %(dst)s" msgstr "" -#: ../python/pakfire/packages/file.py:156 +#: ../python/pakfire/packages/file.py:160 #, python-format msgid "Filename: %s" msgstr "Nombre de fichero: %s" -#: ../python/pakfire/packages/make.py:100 +#: ../python/pakfire/packages/make.py:70 msgid "Package name is undefined." msgstr "El nombre del paquete no está definido." -#: ../python/pakfire/packages/make.py:103 +#: ../python/pakfire/packages/make.py:73 msgid "Package version is undefined." msgstr "La versión del paquete no está definida." @@ -505,7 +514,7 @@ msgstr "La versión del paquete no está definida." msgid "Packaging" msgstr "Empaquetado" -#: ../python/pakfire/packages/packager.py:608 +#: ../python/pakfire/packages/packager.py:606 #, python-format msgid "Building source package %s:" msgstr "Construyendo paquete fuente %s:" @@ -571,70 +580,80 @@ msgstr " Solución: %s" msgid " Solutions:" msgstr " Soluciones:" -#: ../python/pakfire/transaction.py:180 +#: ../python/pakfire/transaction.py:76 +#, python-format +msgid "file %s from %s conflicts with file from package %s" +msgstr "" + +#: ../python/pakfire/transaction.py:82 +#, python-format +msgid "file %s from %s conflicts with files from %s" +msgstr "" + +#: ../python/pakfire/transaction.py:208 msgid "Downloading packages:" msgstr "Descargando paquetes:" -#: ../python/pakfire/transaction.py:245 +#: ../python/pakfire/transaction.py:273 msgid "Package" msgstr "Paquete" -#: ../python/pakfire/transaction.py:250 +#: ../python/pakfire/transaction.py:278 msgid "Installing:" msgstr "Instalando:" -#: ../python/pakfire/transaction.py:251 +#: ../python/pakfire/transaction.py:279 msgid "Reinstalling:" msgstr "Reinstalando:" -#: ../python/pakfire/transaction.py:252 +#: ../python/pakfire/transaction.py:280 msgid "Updating:" msgstr "Actualizando:" -#: ../python/pakfire/transaction.py:253 +#: ../python/pakfire/transaction.py:281 msgid "Downgrading:" msgstr "Desactualizando:" -#: ../python/pakfire/transaction.py:254 +#: ../python/pakfire/transaction.py:282 msgid "Removing:" msgstr "Quitando:" -#: ../python/pakfire/transaction.py:260 +#: ../python/pakfire/transaction.py:288 msgid "Transaction Summary" msgstr "Sumario de la transacción" -#: ../python/pakfire/transaction.py:267 +#: ../python/pakfire/transaction.py:295 msgid "package" msgstr "paquete" -#: ../python/pakfire/transaction.py:273 +#: ../python/pakfire/transaction.py:301 #, python-format msgid "Total download size: %s" msgstr "Tamaño total descargado: %s" -#: ../python/pakfire/transaction.py:277 +#: ../python/pakfire/transaction.py:305 #, python-format msgid "Installed size: %s" msgstr "Tamaño instalado: %s" -#: ../python/pakfire/transaction.py:279 +#: ../python/pakfire/transaction.py:307 #, python-format msgid "Freed size: %s" msgstr "Tamaño liberado: %s" -#: ../python/pakfire/transaction.py:288 +#: ../python/pakfire/transaction.py:316 msgid "Is this okay?" msgstr "¿Es esto correcto?" -#: ../python/pakfire/transaction.py:291 +#: ../python/pakfire/transaction.py:319 msgid "Running Transaction Test" msgstr "" -#: ../python/pakfire/transaction.py:303 +#: ../python/pakfire/transaction.py:331 msgid "Transaction Test Succeeded" msgstr "" -#: ../python/pakfire/transaction.py:317 +#: ../python/pakfire/transaction.py:347 msgid "Running transaction" msgstr "Corriendo transacción" diff --git a/po/pakfire.pot b/po/pakfire.pot index 4060336b0..990e17b92 100644 --- a/po/pakfire.pot +++ b/po/pakfire.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-03 13:39+0200\n" +"POT-Creation-Date: 2011-10-03 22:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -94,18 +94,18 @@ msgstr "" msgid "Extracting" msgstr "" -#: ../python/pakfire/builder.py:543 +#: ../python/pakfire/builder.py:547 msgid "The build command failed. See logfile for details." msgstr "" #. Package the result. #. Make all these little package from the build environment. -#: ../python/pakfire/builder.py:686 +#: ../python/pakfire/builder.py:690 msgid "Creating packages:" msgstr "" #. Execute the buildscript of this stage. -#: ../python/pakfire/builder.py:706 +#: ../python/pakfire/builder.py:710 #, python-format msgid "Running stage %s:" msgstr "" @@ -238,7 +238,7 @@ msgstr "" msgid "Give name of at least one package to check." msgstr "" -#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:274 +#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:317 msgid "Repository" msgstr "" @@ -349,12 +349,12 @@ msgid "Do not verify build dependencies." msgstr "" #: ../python/pakfire/compress.py:133 -#: ../python/pakfire/packages/packager.py:489 +#: ../python/pakfire/packages/packager.py:493 #, python-format msgid "Compressing %s" msgstr "" -#: ../python/pakfire/downloader.py:129 +#: ../python/pakfire/downloader.py:132 msgid "Downloading source files:" msgstr "" @@ -377,7 +377,7 @@ msgstr "" msgid "Running pakfire-build in a pakfire container?" msgstr "" -#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:338 +#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:381 msgid "Transaction test was not successful" msgstr "" @@ -390,11 +390,11 @@ msgstr "" msgid "Name" msgstr "" -#: ../python/pakfire/packages/base.py:95 ../python/pakfire/transaction.py:273 +#: ../python/pakfire/packages/base.py:95 ../python/pakfire/transaction.py:316 msgid "Arch" msgstr "" -#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:273 +#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:316 msgid "Version" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "Release" msgstr "" -#: ../python/pakfire/packages/base.py:101 ../python/pakfire/transaction.py:274 +#: ../python/pakfire/packages/base.py:101 ../python/pakfire/transaction.py:317 msgid "Size" msgstr "" @@ -474,16 +474,16 @@ msgstr "" msgid "File" msgstr "" -#: ../python/pakfire/packages/base.py:337 +#: ../python/pakfire/packages/base.py:342 msgid "Not set" msgstr "" -#: ../python/pakfire/packages/file.py:107 +#: ../python/pakfire/packages/file.py:109 #, python-format msgid "Could not extract file: /%(src)s - %(dst)s" msgstr "" -#: ../python/pakfire/packages/file.py:160 +#: ../python/pakfire/packages/file.py:162 #, python-format msgid "Filename: %s" msgstr "" @@ -497,11 +497,11 @@ msgid "Package version is undefined." msgstr "" #. Load progressbar. -#: ../python/pakfire/packages/packager.py:315 +#: ../python/pakfire/packages/packager.py:333 msgid "Packaging" msgstr "" -#: ../python/pakfire/packages/packager.py:608 +#: ../python/pakfire/packages/packager.py:615 #, python-format msgid "Building source package %s:" msgstr "" @@ -564,80 +564,92 @@ msgstr "" msgid " Solutions:" msgstr "" -#: ../python/pakfire/transaction.py:76 +#: ../python/pakfire/transaction.py:89 #, python-format msgid "file %s from %s conflicts with file from package %s" msgstr "" -#: ../python/pakfire/transaction.py:82 +#: ../python/pakfire/transaction.py:95 #, python-format msgid "file %s from %s conflicts with files from %s" msgstr "" -#: ../python/pakfire/transaction.py:208 +#: ../python/pakfire/transaction.py:104 +#, python-format +msgid "" +"There is not enough space left on %(name)s. Need at least %(size)s to " +"perform transaction." +msgstr "" + +#: ../python/pakfire/transaction.py:253 +#, python-format +msgid "Not enough space to download %s of packages." +msgstr "" + +#: ../python/pakfire/transaction.py:256 msgid "Downloading packages:" msgstr "" -#: ../python/pakfire/transaction.py:273 +#: ../python/pakfire/transaction.py:316 msgid "Package" msgstr "" -#: ../python/pakfire/transaction.py:278 +#: ../python/pakfire/transaction.py:321 msgid "Installing:" msgstr "" -#: ../python/pakfire/transaction.py:279 +#: ../python/pakfire/transaction.py:322 msgid "Reinstalling:" msgstr "" -#: ../python/pakfire/transaction.py:280 +#: ../python/pakfire/transaction.py:323 msgid "Updating:" msgstr "" -#: ../python/pakfire/transaction.py:281 +#: ../python/pakfire/transaction.py:324 msgid "Downgrading:" msgstr "" -#: ../python/pakfire/transaction.py:282 +#: ../python/pakfire/transaction.py:325 msgid "Removing:" msgstr "" -#: ../python/pakfire/transaction.py:288 +#: ../python/pakfire/transaction.py:331 msgid "Transaction Summary" msgstr "" -#: ../python/pakfire/transaction.py:295 +#: ../python/pakfire/transaction.py:338 msgid "package" msgstr "" -#: ../python/pakfire/transaction.py:301 +#: ../python/pakfire/transaction.py:344 #, python-format msgid "Total download size: %s" msgstr "" -#: ../python/pakfire/transaction.py:305 +#: ../python/pakfire/transaction.py:348 #, python-format msgid "Installed size: %s" msgstr "" -#: ../python/pakfire/transaction.py:307 +#: ../python/pakfire/transaction.py:350 #, python-format msgid "Freed size: %s" msgstr "" -#: ../python/pakfire/transaction.py:316 +#: ../python/pakfire/transaction.py:359 msgid "Is this okay?" msgstr "" -#: ../python/pakfire/transaction.py:319 +#: ../python/pakfire/transaction.py:362 msgid "Running Transaction Test" msgstr "" -#: ../python/pakfire/transaction.py:331 +#: ../python/pakfire/transaction.py:374 msgid "Transaction Test Succeeded" msgstr "" -#: ../python/pakfire/transaction.py:347 +#: ../python/pakfire/transaction.py:390 msgid "Running transaction" msgstr "" @@ -646,6 +658,19 @@ msgstr "" msgid "%s [y/N]" msgstr "" +#: ../python/pakfire/util.py:252 +msgid "Killing orphans..." +msgstr "" + +#: ../python/pakfire/util.py:259 +#, python-format +msgid "Process ID %s is still running in chroot. Killing..." +msgstr "" + +#: ../python/pakfire/util.py:271 +msgid "Waiting for processes to terminate..." +msgstr "" + #: ../python/src/problem.c:159 #, c-format msgid "%s does not belong to a distupgrade repository" diff --git a/po/ru.po b/po/ru.po index 29285240c..19823e6d6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: IPFire\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-28 12:35+0200\n" -"PO-Revision-Date: 2011-10-02 03:21+0000\n" +"POT-Creation-Date: 2011-10-02 14:37+0200\n" +"PO-Revision-Date: 2011-10-03 03:20+0000\n" "Last-Translator: CompWorm \n" "Language-Team: Russian (http://www.transifex.net/projects/p/ipfire/team/ru/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "" #: ../python/pakfire/actions.py:223 ../python/pakfire/actions.py:239 #: ../python/pakfire/actions.py:262 ../python/pakfire/actions.py:285 -#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:321 +#: ../python/pakfire/actions.py:302 ../python/pakfire/actions.py:328 #, python-format msgid "Running transaction test for %s" msgstr "" @@ -64,25 +64,25 @@ msgstr "Удаление" msgid "Cleanup" msgstr "Чистка" -#: ../python/pakfire/actions.py:330 +#: ../python/pakfire/actions.py:337 msgid "Downgrading" msgstr "Производится откат" -#: ../python/pakfire/base.py:199 ../python/pakfire/base.py:229 -#: ../python/pakfire/base.py:275 ../python/pakfire/base.py:316 -#: ../python/pakfire/base.py:349 +#: ../python/pakfire/base.py:203 ../python/pakfire/base.py:233 +#: ../python/pakfire/base.py:279 ../python/pakfire/base.py:320 +#: ../python/pakfire/base.py:353 msgid "Nothing to do" msgstr "Нет заданий" -#: ../python/pakfire/base.py:261 +#: ../python/pakfire/base.py:265 msgid "There are no packages to install." msgstr "Нет пакетов для установки." -#: ../python/pakfire/base.py:454 +#: ../python/pakfire/base.py:458 msgid "Build command has failed." msgstr "" -#: ../python/pakfire/base.py:538 +#: ../python/pakfire/base.py:542 msgid "Everything is fine." msgstr "Все в порядке." @@ -91,22 +91,22 @@ msgid "Package information:" msgstr "" #. Copy the makefile and load source tarballs. -#: ../python/pakfire/builder.py:284 +#: ../python/pakfire/builder.py:287 msgid "Extracting" msgstr "" -#: ../python/pakfire/builder.py:540 +#: ../python/pakfire/builder.py:543 msgid "The build command failed. See logfile for details." msgstr "" #. Package the result. #. Make all these little package from the build environment. -#: ../python/pakfire/builder.py:684 +#: ../python/pakfire/builder.py:687 msgid "Creating packages:" msgstr "" #. Execute the buildscript of this stage. -#: ../python/pakfire/builder.py:704 +#: ../python/pakfire/builder.py:707 #, python-format msgid "Running stage %s:" msgstr "" @@ -241,7 +241,7 @@ msgstr "Проверить зависимости для конкретного msgid "Give name of at least one package to check." msgstr "Укажите имя хотя бы одного пакета для проверки." -#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/cli.py:299 ../python/pakfire/transaction.py:274 msgid "Repository" msgstr "Репозиторий" @@ -352,11 +352,15 @@ msgid "Do not verify build dependencies." msgstr "" #: ../python/pakfire/compress.py:133 -#: ../python/pakfire/packages/packager.py:489 +#: ../python/pakfire/packages/packager.py:487 #, python-format msgid "Compressing %s" msgstr "" +#: ../python/pakfire/downloader.py:126 +msgid "Downloading source files:" +msgstr "" + #: ../python/pakfire/errors.py:30 msgid "An unhandled error occured." msgstr "Возникла неизвестная ошибка." @@ -377,117 +381,122 @@ msgstr "" msgid "Running pakfire-build in a pakfire container?" msgstr "" -#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:308 +#: ../python/pakfire/errors.py:82 ../python/pakfire/transaction.py:338 msgid "Transaction test was not successful" msgstr "" -#: ../python/pakfire/packages/base.py:89 +#: ../python/pakfire/i18n.py:54 +#, python-format +msgid "%(commas)s and %(last)s" +msgstr "" + +#: ../python/pakfire/packages/base.py:94 msgid "Name" msgstr "Имя" -#: ../python/pakfire/packages/base.py:90 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:95 ../python/pakfire/transaction.py:273 msgid "Arch" msgstr "Архитектура" -#: ../python/pakfire/packages/base.py:91 ../python/pakfire/transaction.py:245 +#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:273 msgid "Version" msgstr "Версия" -#: ../python/pakfire/packages/base.py:92 +#: ../python/pakfire/packages/base.py:97 msgid "Release" msgstr "Релиз" -#: ../python/pakfire/packages/base.py:96 ../python/pakfire/transaction.py:246 +#: ../python/pakfire/packages/base.py:101 ../python/pakfire/transaction.py:274 msgid "Size" msgstr "Размер" -#: ../python/pakfire/packages/base.py:100 +#: ../python/pakfire/packages/base.py:105 msgid "Repo" msgstr "Репозиторий" -#: ../python/pakfire/packages/base.py:103 +#: ../python/pakfire/packages/base.py:108 msgid "Summary" msgstr "Резюме" -#: ../python/pakfire/packages/base.py:104 +#: ../python/pakfire/packages/base.py:109 msgid "Groups" msgstr "Группы" -#: ../python/pakfire/packages/base.py:105 +#: ../python/pakfire/packages/base.py:110 msgid "URL" msgstr "URL" -#: ../python/pakfire/packages/base.py:106 +#: ../python/pakfire/packages/base.py:111 msgid "License" msgstr "Лицензия" -#: ../python/pakfire/packages/base.py:109 +#: ../python/pakfire/packages/base.py:114 msgid "Description" msgstr "Описание" -#: ../python/pakfire/packages/base.py:116 +#: ../python/pakfire/packages/base.py:121 msgid "Maintainer" msgstr "" -#: ../python/pakfire/packages/base.py:118 +#: ../python/pakfire/packages/base.py:123 msgid "UUID" msgstr "UUID" -#: ../python/pakfire/packages/base.py:119 +#: ../python/pakfire/packages/base.py:124 msgid "Build ID" msgstr "ID сборки" -#: ../python/pakfire/packages/base.py:120 +#: ../python/pakfire/packages/base.py:125 msgid "Build date" msgstr "Дата сборки" -#: ../python/pakfire/packages/base.py:121 +#: ../python/pakfire/packages/base.py:126 msgid "Build host" msgstr "Хост сборки" -#: ../python/pakfire/packages/base.py:123 +#: ../python/pakfire/packages/base.py:128 msgid "Provides" msgstr "Обеспечивает" -#: ../python/pakfire/packages/base.py:128 +#: ../python/pakfire/packages/base.py:133 msgid "Pre-requires" msgstr "" -#: ../python/pakfire/packages/base.py:133 +#: ../python/pakfire/packages/base.py:138 msgid "Requires" msgstr "Требует" -#: ../python/pakfire/packages/base.py:138 +#: ../python/pakfire/packages/base.py:143 msgid "Conflicts" msgstr "" -#: ../python/pakfire/packages/base.py:143 +#: ../python/pakfire/packages/base.py:148 msgid "Obsoletes" msgstr "" -#: ../python/pakfire/packages/base.py:151 +#: ../python/pakfire/packages/base.py:156 msgid "File" msgstr "Файл" -#: ../python/pakfire/packages/base.py:332 +#: ../python/pakfire/packages/base.py:337 msgid "Not set" msgstr "Не установлено" -#: ../python/pakfire/packages/file.py:106 +#: ../python/pakfire/packages/file.py:107 #, python-format msgid "Could not extract file: /%(src)s - %(dst)s" msgstr "" -#: ../python/pakfire/packages/file.py:156 +#: ../python/pakfire/packages/file.py:160 #, python-format msgid "Filename: %s" msgstr "" -#: ../python/pakfire/packages/make.py:100 +#: ../python/pakfire/packages/make.py:70 msgid "Package name is undefined." msgstr "" -#: ../python/pakfire/packages/make.py:103 +#: ../python/pakfire/packages/make.py:73 msgid "Package version is undefined." msgstr "" @@ -496,7 +505,7 @@ msgstr "" msgid "Packaging" msgstr "" -#: ../python/pakfire/packages/packager.py:608 +#: ../python/pakfire/packages/packager.py:606 #, python-format msgid "Building source package %s:" msgstr "" @@ -561,70 +570,80 @@ msgstr " Решение: %s" msgid " Solutions:" msgstr " Решения:" -#: ../python/pakfire/transaction.py:180 +#: ../python/pakfire/transaction.py:76 +#, python-format +msgid "file %s from %s conflicts with file from package %s" +msgstr "" + +#: ../python/pakfire/transaction.py:82 +#, python-format +msgid "file %s from %s conflicts with files from %s" +msgstr "" + +#: ../python/pakfire/transaction.py:208 msgid "Downloading packages:" msgstr "Скачивание пакетов:" -#: ../python/pakfire/transaction.py:245 +#: ../python/pakfire/transaction.py:273 msgid "Package" msgstr "Пакет" -#: ../python/pakfire/transaction.py:250 +#: ../python/pakfire/transaction.py:278 msgid "Installing:" msgstr "Устанавливается" -#: ../python/pakfire/transaction.py:251 +#: ../python/pakfire/transaction.py:279 msgid "Reinstalling:" msgstr "Переустановка:" -#: ../python/pakfire/transaction.py:252 +#: ../python/pakfire/transaction.py:280 msgid "Updating:" msgstr "Обновляется" -#: ../python/pakfire/transaction.py:253 +#: ../python/pakfire/transaction.py:281 msgid "Downgrading:" msgstr "Откат:" -#: ../python/pakfire/transaction.py:254 +#: ../python/pakfire/transaction.py:282 msgid "Removing:" msgstr "Удаляется" -#: ../python/pakfire/transaction.py:260 +#: ../python/pakfire/transaction.py:288 msgid "Transaction Summary" msgstr "Информация о транзакции" -#: ../python/pakfire/transaction.py:267 +#: ../python/pakfire/transaction.py:295 msgid "package" msgstr "пакет" -#: ../python/pakfire/transaction.py:273 +#: ../python/pakfire/transaction.py:301 #, python-format msgid "Total download size: %s" msgstr "Суммарный объём загрузки: %s" -#: ../python/pakfire/transaction.py:277 +#: ../python/pakfire/transaction.py:305 #, python-format msgid "Installed size: %s" msgstr "Размер после установки: %s" -#: ../python/pakfire/transaction.py:279 +#: ../python/pakfire/transaction.py:307 #, python-format msgid "Freed size: %s" msgstr "Освобождено: %s." -#: ../python/pakfire/transaction.py:288 +#: ../python/pakfire/transaction.py:316 msgid "Is this okay?" msgstr "Всё верно?" -#: ../python/pakfire/transaction.py:291 +#: ../python/pakfire/transaction.py:319 msgid "Running Transaction Test" msgstr "" -#: ../python/pakfire/transaction.py:303 +#: ../python/pakfire/transaction.py:331 msgid "Transaction Test Succeeded" msgstr "" -#: ../python/pakfire/transaction.py:317 +#: ../python/pakfire/transaction.py:347 msgid "Running transaction" msgstr "Запуск транзакции" -- 2.39.5