February 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <dialogsolver> SuSE-Code-11-Branch : update translations
by Stefan Schubert 05 Feb '09

05 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 3e765c0a510a0094b3f05a22c2143e722dacb058 Author: Stefan Schubert <schubi(a)suse.de> Date: Thu Feb 5 15:17:02 2009 +0100 update translations --- po/cs.po | 2 +- po/de.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/nl.po | 2 +- po/pl.po | 3 +-- po/pt_BR.po | 2 +- po/ru.po | 2 +- po/sv.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3d85fbc..698f31d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 10:24\n" +"PO-Revision-Date: 2009-02-05 14:25\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/de.po b/po/de.po index 8f58755..c1f5750 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 10:00\n" +"PO-Revision-Date: 2009-02-05 13:38\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/es.po b/po/es.po index 79db78c..c203d17 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 13:34\n" +"PO-Revision-Date: 2009-02-04 14:32\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/fr.po b/po/fr.po index 5532bc7..a5aeea8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 16:42\n" +"PO-Revision-Date: 2009-02-04 15:43\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/it.po b/po/it.po index b8d37d5..0205ca9 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 18:25\n" +"PO-Revision-Date: 2009-02-05 10:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ja.po b/po/ja.po index b54403d..96b90d3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 10:05\n" +"PO-Revision-Date: 2009-02-04 15:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ko.po b/po/ko.po index 81370eb..2fefc29 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 10:16\n" +"PO-Revision-Date: 2009-02-04 15:02\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/nl.po b/po/nl.po index 594d6bd..86424d4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 09:03\n" +"PO-Revision-Date: 2009-02-05 08:00\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/pl.po b/po/pl.po index fff0c81..58e38c7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-20 22:36\n" +"PO-Revision-Date: 2009-02-03 00:14\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -222,4 +222,3 @@ msgstr "Obróć zgodnie z ruchem wskazówek zegara" #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:837 msgid "Save tree as png" msgstr "Zapisz drzewo jako plik PNG" - diff --git a/po/pt_BR.po b/po/pt_BR.po index c1c17e6..dea86e0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 19:26\n" +"PO-Revision-Date: 2009-02-05 09:28\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ru.po b/po/ru.po index 76b843d..321119c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 18:03\n" +"PO-Revision-Date: 2009-02-05 08:14\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/sv.po b/po/sv.po index 7d624f6..83400d4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 14:32\n" +"PO-Revision-Date: 2009-02-05 07:23\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index abb090b..5d5e73b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 07:18\n" +"PO-Revision-Date: 2009-02-05 09:53\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 449eade..22cf974 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 13:40\n" +"PO-Revision-Date: 2009-02-04 15:44\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <dialogsolver> master : update translations
by Stefan Schubert 05 Feb '09

05 Feb '09

ref: refs/heads/master commit 3e765c0a510a0094b3f05a22c2143e722dacb058 Author: Stefan Schubert <schubi(a)suse.de> Date: Thu Feb 5 15:17:02 2009 +0100 update translations --- po/cs.po | 2 +- po/de.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/nl.po | 2 +- po/pl.po | 3 +-- po/pt_BR.po | 2 +- po/ru.po | 2 +- po/sv.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/po/cs.po b/po/cs.po index 3d85fbc..698f31d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 10:24\n" +"PO-Revision-Date: 2009-02-05 14:25\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/de.po b/po/de.po index 8f58755..c1f5750 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 10:00\n" +"PO-Revision-Date: 2009-02-05 13:38\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/es.po b/po/es.po index 79db78c..c203d17 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 13:34\n" +"PO-Revision-Date: 2009-02-04 14:32\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/fr.po b/po/fr.po index 5532bc7..a5aeea8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 16:42\n" +"PO-Revision-Date: 2009-02-04 15:43\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/it.po b/po/it.po index b8d37d5..0205ca9 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 18:25\n" +"PO-Revision-Date: 2009-02-05 10:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ja.po b/po/ja.po index b54403d..96b90d3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 10:05\n" +"PO-Revision-Date: 2009-02-04 15:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ko.po b/po/ko.po index 81370eb..2fefc29 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 10:16\n" +"PO-Revision-Date: 2009-02-04 15:02\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/nl.po b/po/nl.po index 594d6bd..86424d4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 09:03\n" +"PO-Revision-Date: 2009-02-05 08:00\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/pl.po b/po/pl.po index fff0c81..58e38c7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-20 22:36\n" +"PO-Revision-Date: 2009-02-03 00:14\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -222,4 +222,3 @@ msgstr "Obróć zgodnie z ruchem wskazówek zegara" #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:837 msgid "Save tree as png" msgstr "Zapisz drzewo jako plik PNG" - diff --git a/po/pt_BR.po b/po/pt_BR.po index c1c17e6..dea86e0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 19:26\n" +"PO-Revision-Date: 2009-02-05 09:28\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ru.po b/po/ru.po index 76b843d..321119c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-22 18:03\n" +"PO-Revision-Date: 2009-02-05 08:14\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/sv.po b/po/sv.po index 7d624f6..83400d4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 14:32\n" +"PO-Revision-Date: 2009-02-05 07:23\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index abb090b..5d5e73b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-23 07:18\n" +"PO-Revision-Date: 2009-02-05 09:53\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 449eade..22cf974 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: dialogsolver\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2009-01-21 13:40\n" +"PO-Revision-Date: 2009-02-04 15:44\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : update translations
by Stefan Schubert 05 Feb '09

05 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit ffc7d370a33d39b1ea15e56ce8f47560a7dba591 Author: Stefan Schubert <schubi(a)suse.de> Date: Thu Feb 5 15:09:22 2009 +0100 update translations --- po/cs.po | 2 +- po/de.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/hu.po | 384 ++++++++++++++++++++++++++++-------------------- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/nl.po | 2 +- po/pl.po | 477 ++++++++++++++++++++++++++++++++++++++--------------------- po/pt_BR.po | 2 +- po/ru.po | 2 +- po/sv.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 15 files changed, 546 insertions(+), 341 deletions(-) diff --git a/po/cs.po b/po/cs.po index 509a563..6237e8d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-23 10:24\n" +"PO-Revision-Date: 2009-02-05 14:25\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/de.po b/po/de.po index 8fd3a0b..3a44be4 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-23 10:00\n" +"PO-Revision-Date: 2009-02-05 13:38\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/es.po b/po/es.po index f163889..5ddbf6a 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-22 13:34\n" +"PO-Revision-Date: 2009-02-04 14:32\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/fr.po b/po/fr.po index 98fd31c..7c42fd3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-21 16:42\n" +"PO-Revision-Date: 2009-02-04 15:44\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/hu.po b/po/hu.po index f6a9b7d..50cbe70 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,14 +11,14 @@ # Sári Gábor <saga(a)tux.hu>, 2000. # Steve Varadi <svaradi(a)usa.com>, 2000. # Zoltán Levárdy <pogacsa(a)programmer.net>, 1999. -# Kalman Kemenczy <kkemenczy(a)novell.com>, 2006, 2007, 2008. +# Kalman Kemenczy <kkemenczy(a)novell.com>, 2006, 2007, 2008, 2009. # Ervin Novak <enovak(a)novell.com>, 2008. msgid "" msgstr "" "Project-Id-Version: zypp.hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2008-12-05 14:03+0100\n" +"POT-Creation-Date: 2009-02-02 14:08+0100\n" +"PO-Revision-Date: 2009-02-02 18:33+0100\n" "Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n" "Language-Team: Hungarian <hu(a)li.org>\n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../zypp/solver/detail/SATResolver.cc:981 +#: ../zypp/solver/detail/SATResolver.cc:1018 msgid "" "\n" "uninstallable providers: " @@ -35,77 +35,45 @@ msgstr "" "\n" "nem telepíthető szolgáltatók: " -#: ../zypp/media/MediaException.cc:214 +#: ../zypp/media/MediaException.cc:266 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr "" " hiba az SSL-tanúsítvánnyal, ellenőrizze, hogy megfelelő-e a CA tanúsítványa " "a következőhöz: '%s'." -#. timestamp -#: ../zypp/target/TargetImpl.cc:85 +#: ../zypp/target/TargetImpl.cc:88 msgid " executed" msgstr " végrehajtva" -#. timestamp -#: ../zypp/target/TargetImpl.cc:106 +#: ../zypp/target/TargetImpl.cc:110 msgid " execution failed" msgstr " végrehajtás sikertelen" -#. timestamp -#: ../zypp/target/TargetImpl.cc:190 +#: ../zypp/target/TargetImpl.cc:196 msgid " execution skipped while aborting" msgstr " megszakítás közben a végrehajtás átugorva" -#: ../zypp/solver/detail/SATResolver.cc:928 +#: ../zypp/solver/detail/SATResolver.cc:965 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s ütközik a(z) %s csomaggal, amit a(z) %s csomag biztosít" # modules/inst_target_part.ycp:676 -#. %s = filename of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2075 -#, c-format -msgid "%s install failed" -msgstr "A(z) %s csomag nem telepíthető" - -# modules/inst_target_part.ycp:676 -#. %s = filename of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2084 -#, c-format -msgid "%s installed ok" -msgstr "A(z) %s csomag telepítése sikeres" - -# modules/inst_target_part.ycp:676 -#: ../zypp/solver/detail/SATResolver.cc:914 +#: ../zypp/solver/detail/SATResolver.cc:951 #, c-format msgid "%s is not installable" msgstr "%s nem telepíthető" -#: ../zypp/solver/detail/SATResolver.cc:933 +#: ../zypp/solver/detail/SATResolver.cc:970 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s elavulttá teszi a(z) %s csomagot, amit a(z) %s csomag biztosít" -#. %s = name of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2209 -#, c-format -msgid "%s remove failed" -msgstr "A(z) %s csomag eltávolítása sikertelen" - -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2217 -#, c-format -msgid "%s remove ok" -msgstr "A(z) %s csomag eltávolítása sikeres" - -#: ../zypp/solver/detail/SATResolver.cc:969 +#: ../zypp/solver/detail/SATResolver.cc:1006 #, c-format msgid "%s requires %s, but this requirement cannot be provided" -msgstr "%s csomagnak a következőre van szüksége:%s, de ez nem teljesíthető" +msgstr "%s csomagnak a következőre van szüksége: %s, de ez nem teljesíthető" #. language code: abk ab #: ../zypp/LanguageCode.cc:240 @@ -127,7 +95,7 @@ msgstr "acsoli" msgid "Adangme" msgstr "adangme" -#: ../zypp/RepoManager.cc:1182 +#: ../zypp/RepoManager.cc:1280 #, c-format msgid "Adding repository '%s'" msgstr "A(z) '%s' telepítési forrás hozzáadása" @@ -136,10 +104,6 @@ msgstr "A(z) '%s' telepítési forrás hozzáadása" msgid "Additional Customer Contract Necessary" msgstr "További Ügyfélszerződés szükséges" -#: ../zypp/target/rpm/RpmDb.cc:2087 ../zypp/target/rpm/RpmDb.cc:2220 -msgid "Additional rpm output:" -msgstr "További rpm kimenet:" - #. language code: ady #: ../zypp/LanguageCode.cc:248 msgid "Adyghe" @@ -372,7 +336,8 @@ msgstr "Ausztria" msgid "Austronesian (Other)" msgstr "ausztronéziai (egyéb)" -#: ../zypp/media/MediaCurl.cc:1615 +#. !\todo add comma to the message for the next release +#: ../zypp/media/MediaCurl.cc:1718 ../zypp/media/MediaSMB.cc:432 #, c-format msgid "Authentication required for '%s'" msgstr "Felhasználóhitelesítés szükséges ehhez: '%s'" @@ -659,7 +624,7 @@ msgstr "Brunei Darussalam" msgid "Buginese" msgstr "buginéz" -#: ../zypp/RepoManager.cc:977 +#: ../zypp/RepoManager.cc:1030 #, c-format msgid "Building repository '%s' cache" msgstr "A(z) '%s' telepítési forrás gyorsítótárának felépítése" @@ -714,7 +679,7 @@ msgstr "Kambodzsa" msgid "Cameroon" msgstr "Kamerun" -#: ../zypp/sat/detail/PoolImpl.cc:148 +#: ../zypp/sat/detail/PoolImpl.cc:169 msgid "Can not create sat-pool." msgstr "Nem hozható létre sat-pool." @@ -722,23 +687,37 @@ msgstr "Nem hozható létre sat-pool." msgid "Can't acquire the mutex lock" msgstr "A mutex zárolás sikertelen" -#: ../zypp/ExternalProgram.cc:245 +#: ../zypp/ExternalProgram.cc:301 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." msgstr "A könyvtár '/'-ra váltása a chroot-ban sikertelen (%s)." -#: ../zypp/ExternalProgram.cc:238 +#: ../zypp/ExternalProgram.cc:294 #, c-format msgid "Can't chroot to '%s' (%s)." msgstr "A chroot sikertelen ide: '%s' (%s)." +#. TranslatorExplanation '%s' is a filename +#: ../zypp/RepoManager.cc:1449 ../zypp/RepoManager.cc:1682 +#, c-format +msgid "Can't delete '%s'" +msgstr "A(z) '%s' nem törölhető" + #. don't want to get here -#: ../zypp/ExternalProgram.cc:259 +#: ../zypp/ExternalProgram.cc:315 #, c-format msgid "Can't exec '%s' (%s)." msgstr "'%s' végrehajtása sikertelen (%s)." -#: ../zypp/ExternalProgram.cc:267 +#: ../zypp/RepoManager.cc:1437 ../zypp/RepoManager.cc:1516 +msgid "Can't figure out where the repo is stored." +msgstr "Nem deríthető ki a telepítési forrás helye." + +#: ../zypp/RepoManager.cc:1670 ../zypp/RepoManager.cc:1927 +msgid "Can't figure out where the service is stored." +msgstr "Nem deríthető ki a szolgáltatás helye." + +#: ../zypp/ExternalProgram.cc:323 #, c-format msgid "Can't fork (%s)." msgstr "A forkolás sikertelen (%s)." @@ -751,17 +730,26 @@ msgstr "A mutex attributum inicializációja sikertelen" msgid "Can't initialize recursive mutex" msgstr "Rekurzív mutex attributum inicializációja sikertelen" -#: ../zypp/base/InterProcessMutex.cc:79 +#. TranslatorExplanation '%s' is a filename +#: ../zypp/RepoManager.cc:448 ../zypp/RepoManager.cc:928 +#: ../zypp/RepoManager.cc:1319 ../zypp/RepoManager.cc:1392 +#: ../zypp/RepoManager.cc:1467 ../zypp/RepoManager.cc:1535 +#: ../zypp/RepoManager.cc:1694 +#, c-format +msgid "Can't open file '%s' for writing." +msgstr "A(z) '%s' fájl írásra nem nyitható meg." + +#: ../zypp/base/InterProcessMutex.cc:83 #, c-format msgid "Can't open lock file: %s" msgstr "A zárolt fájl nem nyitható meg: %s" -#: ../zypp/ExternalProgram.cc:174 +#: ../zypp/ExternalProgram.cc:230 #, c-format msgid "Can't open pipe (%s)." msgstr "A cső nem nyitható meg (%s)." -#: ../zypp/ExternalProgram.cc:163 +#: ../zypp/ExternalProgram.cc:219 #, c-format msgid "Can't open pty (%s)." msgstr "A pty nem nyitható meg (%s)." @@ -784,21 +772,25 @@ msgstr "Rekurzív mutex attributum nem állítható be" msgid "Canada" msgstr "Kanada" -#: ../zypp/KeyRing.cc:285 +#: ../zypp/KeyRing.cc:275 #, c-format msgid "Cannot create public key %s from %s keyring to file %s" -msgstr "" -"A(z) %s publikus kulcs elkészítése %s kulcstartóból %s fájlba sikertelen" +msgstr "A(z) %s publikus kulcs elkészítése %s kulcstartóból %s fájlba sikertelen" -#: ../zypp/media/MediaException.cc:182 +#: ../zypp/media/MediaException.cc:234 msgid "Cannot eject any media" msgstr "Nincs kiadható adathordozó" -#: ../zypp/media/MediaException.cc:184 +#: ../zypp/media/MediaException.cc:236 #, c-format msgid "Cannot eject media '%s'" msgstr "A(z) '%s' adathordozó kiadása sikertelen" +#: ../zypp/media/MediaException.cc:273 +#, c-format +msgid "Cannot find available loop device to mount the image file from '%s'" +msgstr "Nem található szabad hurokeszköz a lemezkép felcsatolására innen: '%s'" + #: ../zypp/media/MediaException.cc:67 #, c-format msgid "Cannot write file '%s'." @@ -880,7 +872,7 @@ msgstr "csamorro" # menuentries/menuentry_lan_sendmail.ycp:14 #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1898 +#: ../zypp/target/rpm/RpmDb.cc:1896 #, c-format msgid "Changed configuration files for %s:" msgstr "%s módosított konfigurációs fájljai:" @@ -979,16 +971,16 @@ msgstr "Cocos (Keeling) -szigetek" msgid "Colombia" msgstr "Kolumbia" -#: ../zypp/ExternalProgram.cc:346 +#: ../zypp/ExternalProgram.cc:402 #, c-format msgid "Command exited with status %d." msgstr "A parancs visszatérési értéke %d." -#: ../zypp/ExternalProgram.cc:371 +#: ../zypp/ExternalProgram.cc:427 msgid "Command exited with unknown error." msgstr "A parancs végrehajtása ismeretlen hibával leállt." -#: ../zypp/ExternalProgram.cc:366 +#: ../zypp/ExternalProgram.cc:422 #, c-format msgid "Command was killed by signal %d (%s)." msgstr "A parancs végrehajtását a(z) %d szignál megszakította (%s)." @@ -1180,7 +1172,13 @@ msgstr "Dominika" msgid "Dominican Republic" msgstr "Dominikai Köztársaság" -#: ../zypp/media/MediaException.cc:152 +#. TranslatorExplanation: curl is the name of a library, don't translate +#: ../zypp/media/MediaException.cc:92 ../zypp/media/MediaException.cc:100 +#, c-format +msgid "Download (Metalink curl) initialization failed for '%s'" +msgstr "A letöltés (Metalink curl) előkészítése meghiúsult a következőhöz: '%s'" + +#: ../zypp/media/MediaException.cc:168 #, c-format msgid "" "Download (curl) error for '%s':\n" @@ -1197,6 +1195,17 @@ msgstr "" msgid "Download (curl) initialization failed for '%s'" msgstr "A letöltés (curl) inicializálása meghiúsult: '%s'" +#: ../zypp/media/MediaException.cc:186 ../zypp/media/MediaException.cc:204 +#, c-format +msgid "" +"Download (metalink curl) error for '%s':\n" +"Error code: %s\n" +"Error message: %s\n" +msgstr "" +"Letöltési (metalink curl) hiba: '%s'\n" +"Hibakód: %s\n" +"Hibaüzenet: %s\n" + #. language code: dra #: ../zypp/LanguageCode.cc:470 msgid "Dravidian (Other)" @@ -1208,7 +1217,7 @@ msgid "Duala" msgstr "duala" #. dubious: Throw on malformed known types, otherwise log a warning. -#: ../zypp/CheckSum.cc:97 +#: ../zypp/CheckSum.cc:98 #, c-format msgid "Dubious type '%s' for %u byte checksum '%s'" msgstr "'%s' bizonytalan típus %u byte, ellenőrzőösszeg '%s'" @@ -1274,15 +1283,15 @@ msgstr "Salvador" msgid "Elamite" msgstr "elamit" -#: ../zypp/media/MediaException.cc:135 +#: ../zypp/media/MediaException.cc:151 msgid "Empty destination in URI" msgstr "Üres cél a hivatkozásban" -#: ../zypp/media/MediaException.cc:130 +#: ../zypp/media/MediaException.cc:146 msgid "Empty filesystem in URI" msgstr "Üres fájlrendszer a hivatkozásban" -#: ../zypp/media/MediaException.cc:125 +#: ../zypp/media/MediaException.cc:141 msgid "Empty host name in URI" msgstr "Üres hosztnév a hivatkozásban" @@ -1319,11 +1328,28 @@ msgid "Eritrea" msgstr "Eritrea" #. TranslatorExplanation: curl is the name of a library, don't translate -#: ../zypp/media/MediaException.cc:161 +#: ../zypp/media/MediaException.cc:177 #, c-format msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Hiba történt a '%s' letöltési (curl) beállításainak beállítása közben:" +#. TranslatorExplanation: curl is the name of a library, don't translate +#: ../zypp/media/MediaException.cc:195 ../zypp/media/MediaException.cc:213 +#, c-format +msgid "Error occurred while setting download (metalink curl) options for '%s':" +msgstr "Hiba történt a(z) '%s' letöltés (metalink curl) beállításai közben:" + +#. prepare exception to be thrown if the type could not be determined +#. due to a media exception. We can't throw right away, because of some +#. problems with proxy servers returning an incorrect error +#. on ftp file-not-found(bnc #335906). Instead we'll check another types +#. before throwing. +#. TranslatorExplanation '%s' is an URL +#: ../zypp/RepoManager.cc:1143 ../zypp/RepoManager.cc:1986 +#, c-format +msgid "Error trying to read from '%s'" +msgstr "Nem sikerült olvasni innen: '%s'" + #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1362,11 +1388,16 @@ msgstr "ewe" msgid "Ewondo" msgstr "evondo" -#: ../zypp/KeyRing.cc:587 +#: ../zypp/RepoManager.cc:1103 +#, c-format +msgid "Failed to cache repo (%d)." +msgstr "A telepítési forrás beolvasása gyorsítótárba sikertelen (%d)." + +#: ../zypp/KeyRing.cc:577 msgid "Failed to delete key." msgstr "A kulcs törlése sikertelen." -#: ../zypp/target/rpm/RpmDb.cc:1066 +#: ../zypp/target/rpm/RpmDb.cc:1064 #, c-format msgid "Failed to import public key from file %s: %s" msgstr "Nem sikerült a(z) %s fájlból importálni a publikus kulcsot: %s" @@ -1376,7 +1407,19 @@ msgstr "Nem sikerült a(z) %s fájlból importálni a publikus kulcsot: %s" msgid "Failed to mount %s on %s" msgstr "Nem sikerült a(z) %s felcsatolása ide: %s" -#: ../zypp/target/rpm/RpmDb.cc:1143 +#. TranslatorExplanation %s = name of the package being processed. +#: ../zypp/repo/PackageProvider.cc:124 +#, c-format +msgid "Failed to provide Package %s. Do you want to retry retrieval?" +msgstr "A(z) %s csomagot nem siekrült elérni. Megpróbálja újra?" + +#. TranslatorExplanation '%s' is a pathname +#: ../zypp/RepoManager.cc:247 ../zypp/RepoManager.cc:523 +#, c-format +msgid "Failed to read directory '%s'" +msgstr "A(z) '%s' könyvtár beolvasása sikertelen" + +#: ../zypp/target/rpm/RpmDb.cc:1141 #, c-format msgid "Failed to remove public key %s: %s" msgstr "A(z) %s publikus kulcs eltávolítása sikertelen: %s" @@ -1828,7 +1871,7 @@ msgstr "A HalVolume inicializálása sikertelen" msgid "Hausa" msgstr "hausza" -#: ../zypp/solver/detail/SATResolver.cc:910 +#: ../zypp/solver/detail/SATResolver.cc:947 msgid "Have you enabled all requested repositories?" msgstr "Minden szükséges telepítési forrást engedélyezett?" @@ -1876,7 +1919,7 @@ msgid "Hiri Motu" msgstr "hiri motu" #. TranslatorExplanation followed by the list of error messages that lead to this exception -#: ../zypp/base/Exception.cc:89 +#: ../zypp/base/Exception.cc:103 msgid "History:" msgstr "Előzmények:" @@ -2003,7 +2046,7 @@ msgstr "indonéz" msgid "Ingush" msgstr "ingus" -#: ../zypp/target/TargetImpl.cc:601 ../zypp/target/TargetImpl.cc:839 +#: ../zypp/target/TargetImpl.cc:702 ../zypp/target/TargetImpl.cc:997 msgid "Installation has been aborted as directed." msgstr "A kérésnek megfelelően a telepítés megszakad." @@ -2067,27 +2110,27 @@ msgstr "Érvénytelen tömbösszefűzés-elválasztó (array join separator) kar #: ../zypp/url/UrlUtils.cc:173 msgid "Invalid parameter array split separator character" -msgstr "" -"Érvénytelen tömbszétválasztás-elválasztó (array split separator) karakter" +msgstr "Érvénytelen tömbszétválasztás-elválasztó (array split separator) karakter" #: ../zypp/url/UrlUtils.cc:213 msgid "Invalid parameter map split separator character" -msgstr "" -"Érvénytelen leképezésszétválasztás-elválasztó (map split separator) karakter" +msgstr "Érvénytelen leképezésszétválasztás-elválasztó (map split separator) karakter" #: ../zypp/url/UrlBase.cc:1079 #, c-format msgid "Invalid port component '%s'" msgstr "Érvénytelen port komponens: '%s'" -#: ../zypp/PoolQuery.cc:443 +#: ../zypp/PoolQuery.cc:440 #, c-format msgid "Invalid regular expression '%s': regcomp returned %d" msgstr "Érvénytelen reguláris kifejezés '%s': regcomp visszatérési értéke: %d" -#: ../zypp/media/MediaCurl.cc:1612 -msgid "Invalid user name or password." -msgstr "Érvénytelen felhasználói név vagy jelszó." +#. TranslatorExplanation '%s' is an URL +#: ../zypp/RepoManager.cc:1378 +#, c-format +msgid "Invalid repo file name at '%s'" +msgstr "A(z) '%s' telepítési forrás fájlja érvénytelen" # IR # fuzzy @@ -2654,7 +2697,7 @@ msgstr "Malajzia" msgid "Maldives" msgstr "Maldív Szigetek" -#: ../zypp/media/MediaException.cc:115 +#: ../zypp/media/MediaException.cc:131 msgid "Malformed URI" msgstr "Hibás URI" @@ -2776,12 +2819,12 @@ msgstr "maja nyelvek" msgid "Mayotte" msgstr "Mayotte" -#: ../zypp/media/MediaException.cc:169 +#: ../zypp/media/MediaException.cc:221 #, c-format msgid "Media source '%s' does not contain the desired medium" msgstr "A '%s' adathordozó forrása nem tartalmazza a kívánt adathordozót" -#: ../zypp/media/MediaException.cc:175 +#: ../zypp/media/MediaException.cc:227 #, c-format msgid "Medium '%s' is in use by another instance" msgstr "Jelenleg egy másik folyamat használja a(z) '%s' adathordozót" @@ -2793,8 +2836,7 @@ msgstr "Az adathordozó nincs csatlakoztatva" #: ../zypp/media/MediaException.cc:53 #, c-format msgid "Medium not opened when trying to perform action '%s'." -msgstr "" -"Az adathordozó elérése a(z) '%s' művelet végrehajtása közben nem sikerült." +msgstr "Az adathordozó elérése a(z) '%s' művelet végrehajtása közben nem sikerült." #. language code: men #: ../zypp/LanguageCode.cc:808 @@ -3170,7 +3212,7 @@ msgstr "Omán" msgid "One or both of '%s' or '%s' attributes is required." msgstr "Legalább az egyik szükséges a '%s' és '%s' paraméterekből." -#: ../zypp/media/MediaException.cc:145 +#: ../zypp/media/MediaException.cc:161 msgid "Operation not supported by medium" msgstr "Az adathordozó nem támogatja ezt a műveletet" @@ -3200,10 +3242,12 @@ msgid "Otomian Languages" msgstr "otomi nyelvek" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:320 +#: ../zypp/repo/PackageProvider.cc:277 #, c-format -msgid "Package %s fails integrity check. Do you want to retry?" -msgstr "A(z) %s csomag integritásvizsgálata sikertelen. Megpróbálja újra?" +msgid "" +"Package %s seems to be corrupted during transfer. Do you want to retry " +"retrieval?" +msgstr "A(z) %s csomag valószínűleg a letöltés közben hibás lett. Megpróbálja újra?" #. language code: pal #: ../zypp/LanguageCode.cc:926 @@ -3278,21 +3322,34 @@ msgstr "pápua (egyéb)" msgid "Paraguay" msgstr "Paraguay" -#: ../zypp/media/MediaException.cc:106 +#: ../zypp/media/MediaException.cc:122 #, c-format msgid "Path '%s' on medium '%s' is not a directory." msgstr "A(z) '%s' elérési út a(z) '%s' adathordozón nem könyvtár." -#: ../zypp/media/MediaException.cc:98 +#: ../zypp/media/MediaException.cc:114 #, c-format msgid "Path '%s' on medium '%s' is not a file." msgstr "A(z) '%s' elérési út a(z) '%s' adathordozón nem fájl." -#: ../zypp/media/MediaException.cc:200 +#: ../zypp/media/MediaException.cc:252 #, c-format msgid "Permission to access '%s' denied." msgstr "Hozzáférés megtagadva: '%s'." +#: ../zypp/media/MediaCurl.cc:1089 ../zypp/media/MediaCurl.cc:1334 +#, c-format +msgid "" +"Permission to access '%s' denied.\n" +"\n" +"Visit the Novell Customer Center to check whether your registration is valid " +"and has not expired." +msgstr "" +"A(z) '%s' elérése nem engedélyezett.\n" +"\n" +"Látogasson el a Novell Customer Center oldalára és ellenőrizze, " +"hogy a regisztrációja érvényes vagy nem járt-e le." + # clients/inst_sw_single.ycp:1320 clients/inst_sw_single.ycp:1971 #. language code: per fas fa #: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 @@ -3421,8 +3478,9 @@ msgid "Query string parsing not supported for this URL" msgstr "A lekérdezés feldolgozása ehhez az URL-hez nem támogatott" #. TranslatorExplanation after semicolon is error message -#: ../zypp/target/rpm/RpmDb.cc:892 ../zypp/target/rpm/RpmDb.cc:2078 -#: ../zypp/target/rpm/RpmDb.cc:2212 +#. TranslatorExplanation the colon is followed by an error message +#: ../zypp/target/rpm/RpmDb.cc:893 ../zypp/target/rpm/RpmDb.cc:2084 +#: ../zypp/target/rpm/RpmDb.cc:2220 msgid "RPM failed: " msgstr "RPM sikertelen: " @@ -3451,10 +3509,9 @@ msgstr "rarotongai" #: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131 msgid "Relative path not allowed if authority exists" -msgstr "" -"Megadott hitelesítő esetén a relatív elérési útvonal megadása nem támogatott" +msgstr "Megadott hitelesítő esetén a relatív elérési útvonal megadása nem támogatott" -#: ../zypp/RepoManager.cc:1304 +#: ../zypp/RepoManager.cc:1418 #, c-format msgid "Removing repository '%s'" msgstr "A(z) '%s' telepítési forrás eltávolítása" @@ -3701,7 +3758,7 @@ msgstr "Sierra Leone" msgid "Sign Languages" msgstr "jelnyelvek" -#: ../zypp/KeyRing.cc:597 +#: ../zypp/KeyRing.cc:587 #, c-format msgid "Signature file %s not found" msgstr "A(z) %s aláírás-fájl nem található" @@ -3783,7 +3840,7 @@ msgstr "szogdiai" msgid "Solomon Islands" msgstr "Salamon-szigetek" -#: ../zypp/solver/detail/SATResolver.cc:937 +#: ../zypp/solver/detail/SATResolver.cc:974 #, c-format msgid "Solvable %s conflicts with %s provided by itself" msgstr "%s ütközik a(z) %s csomaggal, amit saját maga biztosít" @@ -3954,7 +4011,7 @@ msgstr "Szíria" msgid "Syriac" msgstr "szír" -#: ../zypp/media/MediaException.cc:91 +#: ../zypp/media/MediaException.cc:107 #, c-format msgid "System exception '%s' on medium '%s'." msgstr "%s rendszerkivétel történt a(z) '%s' adathordozón." @@ -3963,7 +4020,7 @@ msgstr "%s rendszerkivétel történt a(z) '%s' adathordozón." #, c-format msgid "" "System management is locked by the application with pid %d (%s).\n" -"Please close this application before trying again." +"Close this application before trying again." msgstr "" "A rendszerkezelőt a %d (%s) pid-del rendelkező folyamat zárolta.\n" "Kérem, zárja be az alkalmazást, majd próbálja újra." @@ -4053,12 +4110,12 @@ msgstr "Nincs meghatározva a támogatás szintje" msgid "The vendor does not provide support." msgstr "A gyártó nem biztosít támogatást." -#: ../zypp/base/InterProcessMutex.cc:139 +#: ../zypp/base/InterProcessMutex.cc:143 msgid "This action is being run by another program already." msgstr "Ezt a folyamatot már elindította egy másik program." -#: ../zypp/solver/detail/SATResolver.cc:1118 -#: ../zypp/solver/detail/SATResolver.cc:1136 +#: ../zypp/solver/detail/SATResolver.cc:1155 +#: ../zypp/solver/detail/SATResolver.cc:1173 msgid "This request will break your system!" msgstr "A kért módosítás a rendszer meghibásodásához vezet!" @@ -4078,7 +4135,7 @@ msgstr "tigre" msgid "Tigrinya" msgstr "tigrinja" -#: ../zypp/media/MediaException.cc:207 +#: ../zypp/media/MediaException.cc:259 #, c-format msgid "Timeout exceed when access '%s'." msgstr "Időtúllépés a '%s' elérése közben." @@ -4133,7 +4190,7 @@ msgstr "tonga (Nyasa)" msgid "Tonga (Tonga Islands)" msgstr "tongai (Tonga-szigetek)" -#: ../zypp/KeyRing.cc:536 +#: ../zypp/KeyRing.cc:526 #, c-format msgid "Tried to import not existant key %s into keyring %s" msgstr "Nem létező kulcsot (%s) próbált a %s kulcstartóba importálni" @@ -4271,8 +4328,7 @@ msgstr "A dbus kapcsolat létrehozása sikertelen" #: ../zypp/target/hal/HalContext.cc:249 msgid "Unable to initalize HAL context -- hald not running?" -msgstr "" -"A HAL kontextus inicializálása sikertelen -- lehetséges, hogy a hald nem fut?" +msgstr "A HAL kontextus inicializálása sikertelen -- lehetséges, hogy a hald nem fut?" #: ../zypp/Url.cc:322 ../zypp/Url.cc:336 msgid "Unable to parse Url components" @@ -4284,6 +4340,10 @@ msgstr "Az URL komponens feldolgozása sikertelen" msgid "Undetermined" msgstr "meghatározatlan" +#: ../zypp/RepoManager.cc:1113 +msgid "Unhandled repository type" +msgstr "Nem kezelt telepítési forrás típus" + #. :AND:020: #: ../zypp/CountryCode.cc:225 msgid "United Arab Emirates" @@ -4306,7 +4366,7 @@ msgstr "Amerikai Egyesült Államok" msgid "United States Minor Outlying Islands" msgstr "Amerikai Egyesült Államok - kisebb külső szigetek" -#: ../zypp/target/TargetImpl.cc:879 +#: ../zypp/target/TargetImpl.cc:1031 msgid "Unknown Distribution" msgstr "Ismeretlen disztribúció" @@ -4314,6 +4374,12 @@ msgstr "Ismeretlen disztribúció" msgid "Unknown country: " msgstr "Ismeretlen ország: " +#. TranslatorExplanation '%s' is an URL +#: ../zypp/RepoManager.cc:1196 ../zypp/RepoManager.cc:1994 +#, c-format +msgid "Unknown error reading from '%s'" +msgstr "ismeretlen hiba lépett fel a(z) '%s' beolvasása közben" + #: ../zypp/LanguageCode.cc:145 msgid "Unknown language: " msgstr "Ismeretlen nyelv: " @@ -4327,7 +4393,7 @@ msgstr "Ismeretlen támogatási opció. Leírás nem található" msgid "Unsupported HTTP authentication method '%s'" msgstr "Nem támogatott HTTP hitelesítési metódus: '%s'" -#: ../zypp/media/MediaException.cc:140 +#: ../zypp/media/MediaException.cc:156 #, c-format msgid "Unsupported URI scheme in '%s'." msgstr "Érvénytelen URI séma: '%s'." @@ -4408,7 +4474,7 @@ msgid "Vai" msgstr "vai" #. we will throw this later if no URL checks out fine -#: ../zypp/RepoManager.cc:790 +#: ../zypp/RepoManager.cc:839 msgid "Valid metadata not found at specified URL(s)" msgstr "A megadokt URL nem tartalmaz érvényes metaadatot" @@ -4593,89 +4659,88 @@ msgstr "zulu" msgid "Zuni" msgstr "zuni" -#: ../zypp/repo/PackageProvider.cc:239 +#: ../zypp/repo/PackageProvider.cc:225 msgid "applydeltarpm check failed." msgstr "az applydeltarpm ellenőrzés sikertelen." -#: ../zypp/repo/PackageProvider.cc:253 +#: ../zypp/repo/PackageProvider.cc:242 msgid "applydeltarpm failed." msgstr "az applydeltarpm futtatása sikertelen." -#: ../zypp/solver/detail/SATResolver.cc:1194 +#: ../zypp/solver/detail/SATResolver.cc:1244 #, c-format msgid "architecture change of %s to %s" msgstr "A(z) %s csomag helyett a(z) %s architektúrájú csomag telepítése" # modules/inst_target_part.ycp:676 -#: ../zypp/solver/detail/SATResolver.cc:923 +#: ../zypp/solver/detail/SATResolver.cc:960 #, c-format msgid "cannot install both %s and %s" msgstr "nem telepíthető %s és %s is" -#: ../zypp/solver/detail/SATResolver.cc:903 +#: ../zypp/solver/detail/SATResolver.cc:940 msgid "conflicting requests" msgstr "ütköző kérelmek" -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2362 +#: ../zypp/target/rpm/RpmDb.cc:2372 #, c-format msgid "created backup %s" msgstr "%s másolata létrehozva" -#: ../zypp/solver/detail/SATResolver.cc:1222 +#: ../zypp/solver/detail/SATResolver.cc:1272 #, c-format msgid "deinstallation of %s" msgstr "%s eltávolítása" -#: ../zypp/solver/detail/SATResolver.cc:971 +#: ../zypp/solver/detail/SATResolver.cc:1008 msgid "deleted providers: " msgstr "törölt csomagok: " -#: ../zypp/solver/detail/SATResolver.cc:1139 +#: ../zypp/solver/detail/SATResolver.cc:1176 #, c-format msgid "do not ask to delete all solvables providing %s" msgstr "ne kérdezzen rá a %s-t biztosító feloldhatók eltávolítására" -#: ../zypp/solver/detail/SATResolver.cc:1121 +#: ../zypp/solver/detail/SATResolver.cc:1158 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "ne kérdezzen rá a %s-t biztosító feloldható telepítésére" # modules/inst_target_part.ycp:676 -#: ../zypp/solver/detail/SATResolver.cc:1066 +#: ../zypp/solver/detail/SATResolver.cc:1103 #, c-format msgid "do not forbid installation of %s" msgstr "A(z) %s csomag telepítése" # modules/inst_target_part.ycp:676 -#: ../zypp/solver/detail/SATResolver.cc:1045 -#: ../zypp/solver/detail/SATResolver.cc:1083 +#: ../zypp/solver/detail/SATResolver.cc:1082 +#: ../zypp/solver/detail/SATResolver.cc:1120 #, c-format msgid "do not install %s" msgstr "Ne telepítse a(z) %s csomagot" -#: ../zypp/solver/detail/SATResolver.cc:1152 +#: ../zypp/solver/detail/SATResolver.cc:1189 #, c-format msgid "do not install most recent version of %s" msgstr "Ne telepítse a(z) %s csomag legújabb verzióját" # modules/inst_target_part.ycp:676 -#: ../zypp/solver/detail/SATResolver.cc:1040 +#: ../zypp/solver/detail/SATResolver.cc:1077 #, c-format msgid "do not keep %s installed" msgstr "A(z) %s csomag eltávolítása" -#: ../zypp/solver/detail/SATResolver.cc:1186 +#: ../zypp/solver/detail/SATResolver.cc:1236 #, c-format msgid "downgrade of %s to %s" -msgstr "A(z) %s csomag viszzafejlesztése a(z) %s csomagra" +msgstr "A(z) %s csomag visszafejlesztése a(z) %s csomagra" -#: ../zypp/solver/detail/SATResolver.cc:1119 -#: ../zypp/solver/detail/SATResolver.cc:1137 +#: ../zypp/solver/detail/SATResolver.cc:1156 +#: ../zypp/solver/detail/SATResolver.cc:1174 msgid "ignore the warning of a broken system" msgstr "a hibás rendszer figyelmeztetésének figyelmen kívül hagyása" -#: ../zypp/solver/detail/SATResolver.cc:1202 +#: ../zypp/solver/detail/SATResolver.cc:1252 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4692,8 +4757,10 @@ msgstr "" msgid "invalid" msgstr "érvénytelen" -#: ../zypp/solver/detail/SATResolver.cc:1061 -#: ../zypp/solver/detail/SATResolver.cc:1104 +#. for solver reason: NOT weak lock. +#: ../zypp/solver/detail/SATResolver.cc:1098 +#: ../zypp/solver/detail/SATResolver.cc:1141 +#: ../zypp/solver/detail/SATResolver.cc:1218 #, c-format msgid "keep %s" msgstr "%s megtartása" @@ -4706,37 +4773,36 @@ msgstr "libhal_ctx_new: A libhal kontextus létrehozása sikertelen" msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: A dbus kapcsolat beállítása sikertelen" -#: ../zypp/solver/detail/SATResolver.cc:918 +#: ../zypp/solver/detail/SATResolver.cc:955 #, c-format msgid "nothing provides %s needed by %s" msgstr "" "semmi sem biztosítja a(z) %s csomagot, amely szükséges a(z) %s csomag " "telepítéséhez" -#: ../zypp/solver/detail/SATResolver.cc:909 +#: ../zypp/solver/detail/SATResolver.cc:946 #, c-format msgid "nothing provides requested %s" msgstr "semmi nem biztosítja a(z) %s csomagot" -#: ../zypp/solver/detail/SATResolver.cc:900 +#: ../zypp/solver/detail/SATResolver.cc:937 #, c-format msgid "problem with installed package %s" msgstr "probléma a telepített csomaggal: %s" -#: ../zypp/solver/detail/SATResolver.cc:1210 +#: ../zypp/solver/detail/SATResolver.cc:1260 #, c-format msgid "replacement of %s with %s" msgstr "%s cseréje erre: %s" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2067 +#: ../zypp/target/rpm/RpmDb.cc:2070 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" -msgstr "" -"Az rpm létrehozta %s-t, mint %s, de nem sikerült megállapítani a különbséget" +msgstr "Az rpm létrehozta %s-t, mint %s, de nem sikerült megállapítani a különbséget" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2069 +#: ../zypp/target/rpm/RpmDb.cc:2072 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4745,19 +4811,14 @@ msgstr "" "Az rpm létrehozta %s-t, mint %s.\n" "A különbség első 25 sora:\n" -#: ../zypp/target/rpm/RpmDb.cc:2076 ../zypp/target/rpm/RpmDb.cc:2210 -msgid "rpm output:" -msgstr "rpm kimenete:" - #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2062 +#: ../zypp/target/rpm/RpmDb.cc:2065 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" -msgstr "" -"Az rpm elmentette %s-t, mint %s, de nem sikerült megállapítani a különbséget" +msgstr "Az rpm elmentette %s-t, mint %s, de nem sikerült megállapítani a különbséget" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2064 +#: ../zypp/target/rpm/RpmDb.cc:2067 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4766,11 +4827,11 @@ msgstr "" "Az rpm elmentette %s-t, mint %s.\n" "A különbség első 25 sora:\n" -#: ../zypp/solver/detail/SATResolver.cc:906 +#: ../zypp/solver/detail/SATResolver.cc:943 msgid "some dependency problem" msgstr "bizonyos függőségi probléma" -#: ../zypp/solver/detail/SATResolver.cc:983 +#: ../zypp/solver/detail/SATResolver.cc:1020 msgid "uninstallable providers: " msgstr "nem telepíthető csomagok: " @@ -4781,3 +4842,4 @@ msgstr "ismeretlen" #: ../zypp/VendorSupportOptions.cc:17 msgid "unsupported" msgstr "nem támogatott" + diff --git a/po/it.po b/po/it.po index 48d9b8d..a0ef0dc 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-22 18:25\n" +"PO-Revision-Date: 2009-02-05 10:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ja.po b/po/ja.po index 1b40e7d..e9dfb6f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-21 10:05\n" +"PO-Revision-Date: 2009-02-04 15:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ko.po b/po/ko.po index b4bacc1..e845bcc 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-23 10:16\n" +"PO-Revision-Date: 2009-02-04 15:02\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/nl.po b/po/nl.po index 3a3915e..cbd6b99 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-22 09:04\n" +"PO-Revision-Date: 2009-02-05 08:00\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/pl.po b/po/pl.po index 0a80d38..858791a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,81 +5,55 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-20 22:36\n" +"POT-Creation-Date: 2009-02-02 14:08+0100\n" +"PO-Revision-Date: 2009-02-03 00:14\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../zypp/solver/detail/SATResolver.cc:981 -msgid "\nuninstallable providers: " -msgstr "\ndostawcy, których nie można zainstalować: " +#: ../zypp/solver/detail/SATResolver.cc:1018 +msgid "" +"\n" +"uninstallable providers: " +msgstr "" +"\n" +"dostawcy, których nie można zainstalować: " -#: ../zypp/media/MediaException.cc:214 +#: ../zypp/media/MediaException.cc:266 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr "Problem z certyfikatem SSL; proszę sprawdzić, czy certyfikat CA jest odpowiedni dla \"%s\"." -#. timestamp -#: ../zypp/target/TargetImpl.cc:85 +#: ../zypp/target/TargetImpl.cc:88 msgid " executed" msgstr " wykonano" -#. timestamp -#: ../zypp/target/TargetImpl.cc:106 +#: ../zypp/target/TargetImpl.cc:110 msgid " execution failed" msgstr " wykonanie nie powiodło się" -#. timestamp -#: ../zypp/target/TargetImpl.cc:190 +#: ../zypp/target/TargetImpl.cc:196 msgid " execution skipped while aborting" msgstr " nie wykonano w wyniku przerwania" -#: ../zypp/solver/detail/SATResolver.cc:928 +#: ../zypp/solver/detail/SATResolver.cc:965 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s jest w konflikcie z %s dostarczonym przez %s" -#. %s = filename of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2075 -#, c-format -msgid "%s install failed" -msgstr "Instalacja %s nie powiodła się" - -#. %s = filename of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2084 -#, c-format -msgid "%s installed ok" -msgstr "Pakiet %s jest zainstalowany prawidłowo" - -#: ../zypp/solver/detail/SATResolver.cc:914 +#: ../zypp/solver/detail/SATResolver.cc:951 #, c-format msgid "%s is not installable" msgstr "%s nie można zainstalować" -#: ../zypp/solver/detail/SATResolver.cc:933 +#: ../zypp/solver/detail/SATResolver.cc:970 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s dezaktualizuje %s, dostarczony przez %s" -#. %s = name of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2209 -#, c-format -msgid "%s remove failed" -msgstr "Usunięcie %s nie powiodło się" - -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2217 -#, c-format -msgid "%s remove ok" -msgstr "Usunięcie %s powiodło się" - -#: ../zypp/solver/detail/SATResolver.cc:969 +#: ../zypp/solver/detail/SATResolver.cc:1006 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s wymaga %s, lecz to wymagania tego nie można spełnić" @@ -104,7 +78,7 @@ msgstr "aczoli" msgid "Adangme" msgstr "adangme" -#: ../zypp/RepoManager.cc:1182 +#: ../zypp/RepoManager.cc:1280 #, c-format msgid "Adding repository '%s'" msgstr "Dodawanie repozytorium \"%s\"" @@ -113,10 +87,6 @@ msgstr "Dodawanie repozytorium \"%s\"" msgid "Additional Customer Contract Necessary" msgstr "Wymagana dodatkowa umowa użytkownika" -#: ../zypp/target/rpm/RpmDb.cc:2087 ../zypp/target/rpm/RpmDb.cc:2220 -msgid "Additional rpm output:" -msgstr "Dodatkowe wyjście rpm:" - #. language code: ady #: ../zypp/LanguageCode.cc:248 msgid "Adyghe" @@ -330,7 +300,8 @@ msgstr "Austria" msgid "Austronesian (Other)" msgstr "języki malajo-polinezyjskie" -#: ../zypp/media/MediaCurl.cc:1615 +#. !\todo add comma to the message for the next release +#: ../zypp/media/MediaCurl.cc:1718 ../zypp/media/MediaSMB.cc:432 #, c-format msgid "Authentication required for '%s'" msgstr "Wymagane uwierzytelnienie dla \"%s\"" @@ -594,7 +565,7 @@ msgstr "Brunei" msgid "Buginese" msgstr "bugijski" -#: ../zypp/RepoManager.cc:977 +#: ../zypp/RepoManager.cc:1030 #, c-format msgid "Building repository '%s' cache" msgstr "Budowanie pamięci podręcznej repozytorium \"%s\"" @@ -644,7 +615,7 @@ msgstr "Kambodża" msgid "Cameroon" msgstr "Kamerun" -#: ../zypp/sat/detail/PoolImpl.cc:148 +#: ../zypp/sat/detail/PoolImpl.cc:169 msgid "Can not create sat-pool." msgstr "Nie można utworzyć \"sat-pool\"" @@ -652,23 +623,36 @@ msgstr "Nie można utworzyć \"sat-pool\"" msgid "Can't acquire the mutex lock" msgstr "Nie można pobrać blokady muteksu." -#: ../zypp/ExternalProgram.cc:245 +#: ../zypp/ExternalProgram.cc:301 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." msgstr "Nie można zmienić katalogu na \"/\" wewnątrz środowiska chroot (%s)." -#: ../zypp/ExternalProgram.cc:238 +#: ../zypp/ExternalProgram.cc:294 #, c-format msgid "Can't chroot to '%s' (%s)." msgstr "Nie można wykonać chroot dla \"%s\" (%s)." +#. TranslatorExplanation '%s' is a filename +#: ../zypp/RepoManager.cc:1449 ../zypp/RepoManager.cc:1682 +msgid "Can't delete '%s'" +msgstr "Nie można usunąć \"%s\"" + #. don't want to get here -#: ../zypp/ExternalProgram.cc:259 +#: ../zypp/ExternalProgram.cc:315 #, c-format msgid "Can't exec '%s' (%s)." msgstr "Nie można wykonać \"%s\" (%s)." -#: ../zypp/ExternalProgram.cc:267 +#: ../zypp/RepoManager.cc:1437 ../zypp/RepoManager.cc:1516 +msgid "Can't figure out where the repo is stored." +msgstr "Nie można określić, gdzie przechowywane jest repozytorium." + +#: ../zypp/RepoManager.cc:1670 ../zypp/RepoManager.cc:1927 +msgid "Can't figure out where the service is stored." +msgstr "Nie można określić, gdzie przechowywana jest usługa. " + +#: ../zypp/ExternalProgram.cc:323 #, c-format msgid "Can't fork (%s)." msgstr "Nie można wykonać fork (%s)." @@ -681,17 +665,25 @@ msgstr "Nie można zainicjować atrybutów muteksu" msgid "Can't initialize recursive mutex" msgstr "Nie można zainicjować rekursyjnego muteksu" -#: ../zypp/base/InterProcessMutex.cc:79 +#. TranslatorExplanation '%s' is a filename +#: ../zypp/RepoManager.cc:448 ../zypp/RepoManager.cc:928 +#: ../zypp/RepoManager.cc:1319 ../zypp/RepoManager.cc:1392 +#: ../zypp/RepoManager.cc:1467 ../zypp/RepoManager.cc:1535 +#: ../zypp/RepoManager.cc:1694 +msgid "Can't open file '%s' for writing." +msgstr "Nie można otworzyć pliku \"%s\" do zapisu." + +#: ../zypp/base/InterProcessMutex.cc:83 #, c-format msgid "Can't open lock file: %s" msgstr "Nie można otworzyć pliku blokady : %s" -#: ../zypp/ExternalProgram.cc:174 +#: ../zypp/ExternalProgram.cc:230 #, c-format msgid "Can't open pipe (%s)." msgstr "Nie można otworzyć potoku (%s)." -#: ../zypp/ExternalProgram.cc:163 +#: ../zypp/ExternalProgram.cc:219 #, c-format msgid "Can't open pty (%s)." msgstr "Nie można otworzyć pty (%s)." @@ -714,20 +706,25 @@ msgstr "Nie można ustawić atrybutu rekurencyjności muteksu" msgid "Canada" msgstr "Kanada" -#: ../zypp/KeyRing.cc:285 +#: ../zypp/KeyRing.cc:275 #, c-format msgid "Cannot create public key %s from %s keyring to file %s" msgstr "Nie można utworzyć klucza publicznego %s z zestawu %s do pliku %s" -#: ../zypp/media/MediaException.cc:182 +#: ../zypp/media/MediaException.cc:234 msgid "Cannot eject any media" msgstr "Nie można wysunąć żadnego nośnika" -#: ../zypp/media/MediaException.cc:184 +#: ../zypp/media/MediaException.cc:236 #, c-format msgid "Cannot eject media '%s'" msgstr "Nie można wysunąć nośnika \"%s\"" +#: ../zypp/media/MediaException.cc:273 +#, c-format +msgid "Cannot find available loop device to mount the image file from '%s'" +msgstr "Nie można znaleźć dostępnego urządzenia pętli do zamontowania pliku obrazu z \"%s\"" + #: ../zypp/media/MediaException.cc:67 #, c-format msgid "Cannot write file '%s'." @@ -800,7 +797,7 @@ msgstr "chamorro" #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1898 +#: ../zypp/target/rpm/RpmDb.cc:1896 #, c-format msgid "Changed configuration files for %s:" msgstr "Zmienione pliki konfiguracyjne dla %s:" @@ -895,16 +892,16 @@ msgstr "Wyspy Kokosowe" msgid "Colombia" msgstr "Kolumbia" -#: ../zypp/ExternalProgram.cc:346 +#: ../zypp/ExternalProgram.cc:402 #, c-format msgid "Command exited with status %d." msgstr "Polecenie zakończone statusem %d." -#: ../zypp/ExternalProgram.cc:371 +#: ../zypp/ExternalProgram.cc:427 msgid "Command exited with unknown error." msgstr "Polecenie zakończone nieznanym błędem." -#: ../zypp/ExternalProgram.cc:366 +#: ../zypp/ExternalProgram.cc:422 #, c-format msgid "Command was killed by signal %d (%s)." msgstr "Polecenie zakończone przez sygnał %d (%s)." @@ -1085,10 +1082,21 @@ msgstr "Dominika" msgid "Dominican Republic" msgstr "Dominikana" -#: ../zypp/media/MediaException.cc:152 +#. TranslatorExplanation: curl is the name of a library, don't translate +#: ../zypp/media/MediaException.cc:92 ../zypp/media/MediaException.cc:100 +msgid "Download (Metalink curl) initialization failed for '%s'" +msgstr "Inicjalizacja pobierania (Metalink curl) dla \"%s\" zakończona niepowodzeniem" + +#: ../zypp/media/MediaException.cc:168 #, c-format -msgid "Download (curl) error for '%s':\nError code: %s\nError message: %s\n" -msgstr "Błąd pobierania (curl) dla \"%s\":\nKod błędu: %s\nKomunikat błędu: %s\n" +msgid "" +"Download (curl) error for '%s':\n" +"Error code: %s\n" +"Error message: %s\n" +msgstr "" +"Błąd pobierania (curl) dla \"%s\":\n" +"Kod błędu: %s\n" +"Komunikat błędu: %s\n" #. TranslatorExplanation: curl is the name of a library, don't translate #: ../zypp/media/MediaException.cc:84 @@ -1096,6 +1104,16 @@ msgstr "Błąd pobierania (curl) dla \"%s\":\nKod błędu: %s\nKomunikat błędu msgid "Download (curl) initialization failed for '%s'" msgstr "Inicjalizacja pobierania (curl) dla \"%s\" zakończona niepowodzeniem" +#: ../zypp/media/MediaException.cc:186 ../zypp/media/MediaException.cc:204 +msgid "" +"Download (metalink curl) error for '%s':\n" +"Error code: %s\n" +"Error message: %s\n" +msgstr "" +"Błąd pobierania (metalink curl) dla \"%s\":\n" +"Kod błędu: %s\n" +"Komunikat błędu: %s\n" + #. language code: dra #: ../zypp/LanguageCode.cc:470 msgid "Dravidian (Other)" @@ -1107,7 +1125,7 @@ msgid "Duala" msgstr "duala" #. dubious: Throw on malformed known types, otherwise log a warning. -#: ../zypp/CheckSum.cc:97 +#: ../zypp/CheckSum.cc:98 #, c-format msgid "Dubious type '%s' for %u byte checksum '%s'" msgstr "Niepewny typ \"%s\" dla %u-bajtowej sumy kontrolnej \"%s\"" @@ -1172,15 +1190,15 @@ msgstr "Salwador" msgid "Elamite" msgstr "elamicki" -#: ../zypp/media/MediaException.cc:135 +#: ../zypp/media/MediaException.cc:151 msgid "Empty destination in URI" msgstr "Pusty element docelowy w adresie URI" -#: ../zypp/media/MediaException.cc:130 +#: ../zypp/media/MediaException.cc:146 msgid "Empty filesystem in URI" msgstr "Pusty system plików w adresie URI" -#: ../zypp/media/MediaException.cc:125 +#: ../zypp/media/MediaException.cc:141 msgid "Empty host name in URI" msgstr "Pusta nazwa hosta w adresie URI" @@ -1214,11 +1232,27 @@ msgid "Eritrea" msgstr "Erytrea" #. TranslatorExplanation: curl is the name of a library, don't translate -#: ../zypp/media/MediaException.cc:161 +#: ../zypp/media/MediaException.cc:177 #, c-format msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Napotkano błąd podczas ustawiania opcji pobierania (curl) dla \"%s\":" +#. TranslatorExplanation: curl is the name of a library, don't translate +#: ../zypp/media/MediaException.cc:195 ../zypp/media/MediaException.cc:213 +msgid "Error occurred while setting download (metalink curl) options for '%s':" +msgstr "Napotkano błąd podczas ustawiania opcji pobierania (metalink curl) dla \"%s\":" + +#. prepare exception to be thrown if the type could not be determined +#. due to a media exception. We can't throw right away, because of some +#. problems with proxy servers returning an incorrect error +#. on ftp file-not-found(bnc #335906). Instead we'll check another types +#. before throwing. +#. TranslatorExplanation '%s' is an URL +#: ../zypp/RepoManager.cc:1143 ../zypp/RepoManager.cc:1986 +#, c-format +msgid "Error trying to read from '%s'" +msgstr "Błąd podczas próbu odczytu z \"%s\"" + #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1254,11 +1288,16 @@ msgstr "ewe" msgid "Ewondo" msgstr "ewondo" -#: ../zypp/KeyRing.cc:587 +#: ../zypp/RepoManager.cc:1103 +#, c-format +msgid "Failed to cache repo (%d)." +msgstr "Tworzenie pamięci podręcznej repozytorium (%d) zakończone niepowodzeniem." + +#: ../zypp/KeyRing.cc:577 msgid "Failed to delete key." msgstr "Usunięcie klucza nie powiodło się." -#: ../zypp/target/rpm/RpmDb.cc:1066 +#: ../zypp/target/rpm/RpmDb.cc:1064 #, c-format msgid "Failed to import public key from file %s: %s" msgstr "Nie udało się zaimportować klucza publicznego z pliku %s: %s" @@ -1268,7 +1307,18 @@ msgstr "Nie udało się zaimportować klucza publicznego z pliku %s: %s" msgid "Failed to mount %s on %s" msgstr "Montowanie %s w %s zakończone niepowodzeniem" -#: ../zypp/target/rpm/RpmDb.cc:1143 +#. TranslatorExplanation %s = name of the package being processed. +#: ../zypp/repo/PackageProvider.cc:124 +#, c-format +msgid "Failed to provide Package %s. Do you want to retry retrieval?" +msgstr "Dostarczenie pakietu %s nie powiodło się. Czy podjąć kolejną próbę pobrania?" + +#. TranslatorExplanation '%s' is a pathname +#: ../zypp/RepoManager.cc:247 ../zypp/RepoManager.cc:523 +msgid "Failed to read directory '%s'" +msgstr "Odczyt katalogu \"%s\" nie powiódł się" + +#: ../zypp/target/rpm/RpmDb.cc:1141 #, c-format msgid "Failed to remove public key %s: %s" msgstr "Usunięcie klucza publicznego nie powiodło się %s: %s" @@ -1320,33 +1370,62 @@ msgstr "fidżyjski" #: ../devel/devel.mvidner/installation_sources.cc:99 #, c-format -msgid "File %s does not have a checksum.\nUse the file anyway?" -msgstr "Plik %s nie posiada sumy kontrolnej.\nUżyć pliku mimo wszystko?" +msgid "" +"File %s does not have a checksum.\n" +"Use the file anyway?" +msgstr "" +"Plik %s nie posiada sumy kontrolnej.\n" +"Użyć pliku mimo wszystko?" #: ../devel/devel.mvidner/installation_sources.cc:85 #, c-format -msgid "File %s failed integrity check with the folowing key:\n%s|%s|%s\nUse the file anyway?" -msgstr "Test integralności pliku %s nie powiódł się z kluczem:%s|%s|%s\nUżyć pliku mimo wszystko?" +msgid "" +"File %s failed integrity check with the folowing key:\n" +"%s|%s|%s\n" +"Use the file anyway?" +msgstr "" +"Test integralności pliku %s nie powiódł się z kluczem:%s|%s|%s\n" +"Użyć pliku mimo wszystko?" #: ../devel/devel.mvidner/installation_sources.cc:117 #, c-format -msgid "File %s has an invalid checksum.\nExpected %s, found %s\nUse the file anyway?" -msgstr "Plik %s posiada nieprawidłową sumę kontrolną.\nOczekiwano %s, napotkano %s\nUżyć pliku mimo wszystko?" +msgid "" +"File %s has an invalid checksum.\n" +"Expected %s, found %s\n" +"Use the file anyway?" +msgstr "" +"Plik %s posiada nieprawidłową sumę kontrolną.\n" +"Oczekiwano %s, napotkano %s\n" +"Użyć pliku mimo wszystko?" #: ../devel/devel.mvidner/installation_sources.cc:108 #, c-format -msgid "File %s has an unknown checksum %s.\nUse the file anyway?" -msgstr "Plik %s posiada nieznaną sumę kontrolną %s.\nUżyć pliku mimo wszystko?" +msgid "" +"File %s has an unknown checksum %s.\n" +"Use the file anyway?" +msgstr "" +"Plik %s posiada nieznaną sumę kontrolną %s.\n" +"Użyć pliku mimo wszystko?" #: ../devel/devel.mvidner/installation_sources.cc:56 #, c-format -msgid "File %s is not signed.\nUse it anyway?" -msgstr "Plik %s nie jest podpisany.\nCzy użyć go mimo to?" +msgid "" +"File %s is not signed.\n" +"Use it anyway?" +msgstr "" +"Plik %s nie jest podpisany.\n" +"Czy użyć go mimo to?" #: ../devel/devel.mvidner/installation_sources.cc:65 #, c-format -msgid "File %s is signed with an unknown key:\n%s|%s|%s\nUse the file anyway?" -msgstr "Plik %s jest podpisany nieznanym kluczem:\n%s|%s|%s\nCzy użyć go mimo to?" +msgid "" +"File %s is signed with an unknown key:\n" +"%s|%s|%s\n" +"Use the file anyway?" +msgstr "" +"Plik %s jest podpisany nieznanym kluczem:\n" +"%s|%s|%s\n" +"Czy użyć go mimo to?" #: ../zypp/media/MediaException.cc:60 #, c-format @@ -1658,7 +1737,7 @@ msgstr "HalVolume: niezainicjowany." msgid "Hausa" msgstr "hausański" -#: ../zypp/solver/detail/SATResolver.cc:910 +#: ../zypp/solver/detail/SATResolver.cc:947 msgid "Have you enabled all requested repositories?" msgstr "Czy włączono wszystkie wymagane repozytoria?" @@ -1703,7 +1782,7 @@ msgid "Hiri Motu" msgstr "hiri motu" #. TranslatorExplanation followed by the list of error messages that lead to this exception -#: ../zypp/base/Exception.cc:89 +#: ../zypp/base/Exception.cc:103 msgid "History:" msgstr "Historia:" @@ -1823,7 +1902,7 @@ msgstr "indonezyjski" msgid "Ingush" msgstr "inguski" -#: ../zypp/target/TargetImpl.cc:601 ../zypp/target/TargetImpl.cc:839 +#: ../zypp/target/TargetImpl.cc:702 ../zypp/target/TargetImpl.cc:997 msgid "Installation has been aborted as directed." msgstr "Instalacja przerwana zgodnie z życzeniem." @@ -1897,14 +1976,15 @@ msgstr "Nieprawidłowy znak parametru podziału mapy" msgid "Invalid port component '%s'" msgstr "Nieprawidłowy komponent portu \"%s\"" -#: ../zypp/PoolQuery.cc:443 +#: ../zypp/PoolQuery.cc:440 #, c-format msgid "Invalid regular expression '%s': regcomp returned %d" msgstr "Nieprawidłowe wyrażenie regularne \"%s\": regcomp zwróciło %d" -#: ../zypp/media/MediaCurl.cc:1612 -msgid "Invalid user name or password." -msgstr "Nieprawidłowa nazwa użytkownika lub hasło." +#. TranslatorExplanation '%s' is an URL +#: ../zypp/RepoManager.cc:1378 +msgid "Invalid repo file name at '%s'" +msgstr "Nieprawidłowa nazwa pliku repozytorium \"%s\"" #. :IRQ:368: #: ../zypp/CountryCode.cc:329 @@ -2438,7 +2518,7 @@ msgstr "Malezja" msgid "Maldives" msgstr "Malediwy" -#: ../zypp/media/MediaException.cc:115 +#: ../zypp/media/MediaException.cc:131 msgid "Malformed URI" msgstr "Błędny adres URI" @@ -2547,12 +2627,12 @@ msgstr "języki majskie" msgid "Mayotte" msgstr "Majotta" -#: ../zypp/media/MediaException.cc:169 +#: ../zypp/media/MediaException.cc:221 #, c-format msgid "Media source '%s' does not contain the desired medium" msgstr "Źródło nośników \"%s\" nie zawiera żądanego nośnika" -#: ../zypp/media/MediaException.cc:175 +#: ../zypp/media/MediaException.cc:227 #, c-format msgid "Medium '%s' is in use by another instance" msgstr "Nośnik \"%s\" jest używany przez inną instancję" @@ -2916,7 +2996,7 @@ msgstr "Oman" msgid "One or both of '%s' or '%s' attributes is required." msgstr "Wymagany jeden lub oba atrybuty \"%s\" i \"%s\"." -#: ../zypp/media/MediaException.cc:145 +#: ../zypp/media/MediaException.cc:161 msgid "Operation not supported by medium" msgstr "Operacja nieobsługiwana przez nośnik" @@ -2946,10 +3026,9 @@ msgid "Otomian Languages" msgstr "języki otomiańskie" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:320 -#, c-format -msgid "Package %s fails integrity check. Do you want to retry?" -msgstr "Pakiet %s nie przeszedł testu integralności. Czy powtórzyć?" +#: ../zypp/repo/PackageProvider.cc:277 +msgid "Package %s seems to be corrupted during transfer. Do you want to retry retrieval?" +msgstr "Pakiet %s wygląda na uszkodzony podczas przesyłu. Czy powtórzyć pobieranie?" #. language code: pal #: ../zypp/LanguageCode.cc:926 @@ -3021,21 +3100,32 @@ msgstr "papuaskie (inne)" msgid "Paraguay" msgstr "Paragwaj" -#: ../zypp/media/MediaException.cc:106 +#: ../zypp/media/MediaException.cc:122 #, c-format msgid "Path '%s' on medium '%s' is not a directory." msgstr "Ścieżka \"%s\" na nośniku \"%s\" nie prowadzi do katalogu." -#: ../zypp/media/MediaException.cc:98 +#: ../zypp/media/MediaException.cc:114 #, c-format msgid "Path '%s' on medium '%s' is not a file." msgstr "Ścieżka \"%s\" na nośniku \"%s\" nie prowadzi do pliku." -#: ../zypp/media/MediaException.cc:200 +#: ../zypp/media/MediaException.cc:252 #, c-format msgid "Permission to access '%s' denied." msgstr "Dostęp do \"%s\" zabroniony." +#: ../zypp/media/MediaCurl.cc:1089 ../zypp/media/MediaCurl.cc:1334 +#, c-format +msgid "" +"Permission to access '%s' denied.\n" +"\n" +"Visit the Novell Customer Center to check whether your registration is valid and has not expired." +msgstr "Dostęp do \"%s\" jest zabroniony/\n" +"\n" +"Proszę odwiedzić Centrum Obsługi Klienta firmy Novell w celu sprawdzenia, czy rejestracja jest ważna i czy nie wygasła." + + #. language code: per fas fa #: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 msgid "Persian" @@ -3143,8 +3233,9 @@ msgid "Query string parsing not supported for this URL" msgstr "Analiza zapytania nie jest obsługiwana dla tego adresu URL" #. TranslatorExplanation after semicolon is error message -#: ../zypp/target/rpm/RpmDb.cc:892 ../zypp/target/rpm/RpmDb.cc:2078 -#: ../zypp/target/rpm/RpmDb.cc:2212 +#. TranslatorExplanation the colon is followed by an error message +#: ../zypp/target/rpm/RpmDb.cc:893 ../zypp/target/rpm/RpmDb.cc:2084 +#: ../zypp/target/rpm/RpmDb.cc:2220 msgid "RPM failed: " msgstr "Wystąpił błąd RPM:" @@ -3172,7 +3263,7 @@ msgstr "rarotongański" msgid "Relative path not allowed if authority exists" msgstr "Względna ścieżka nie jest dozwolona, jeśli usługa istnieje" -#: ../zypp/RepoManager.cc:1304 +#: ../zypp/RepoManager.cc:1418 #, c-format msgid "Removing repository '%s'" msgstr "Usuwanie repozytorium \"%s\"" @@ -3397,7 +3488,7 @@ msgstr "Sierra Leone" msgid "Sign Languages" msgstr "języki migowe" -#: ../zypp/KeyRing.cc:597 +#: ../zypp/KeyRing.cc:587 #, c-format msgid "Signature file %s not found" msgstr "Nie znaleziono pliku sygnatury %s" @@ -3477,7 +3568,7 @@ msgstr "sogdyjski" msgid "Solomon Islands" msgstr "Wyspy Salomona" -#: ../zypp/solver/detail/SATResolver.cc:937 +#: ../zypp/solver/detail/SATResolver.cc:974 #, c-format msgid "Solvable %s conflicts with %s provided by itself" msgstr "Element rozwiązywalny %s jest w konflikcie z %s, dostarczonym przez samego siebie" @@ -3632,15 +3723,18 @@ msgstr "Syria" msgid "Syriac" msgstr "syryjski" -#: ../zypp/media/MediaException.cc:91 +#: ../zypp/media/MediaException.cc:107 #, c-format msgid "System exception '%s' on medium '%s'." msgstr "Wyjątek systemowy \"%s\" na nośniku \"%s\"." #: ../zypp/ZYppFactory.cc:361 -#, c-format -msgid "System management is locked by the application with pid %d (%s).\nPlease close this application before trying again." -msgstr "Zarządzanie systemem jest zablokowane przez aplikację o identyfikatorze pid %d (%s).\nNależy zamknąć tę aplikację i spróbowac ponownie." +msgid "" +"System management is locked by the application with pid %d (%s).\n" +"Close this application before trying again." +msgstr "" +"Zarządzanie systemem jest zablokowane przez aplikację o identyfikatorze pid %d (%s).\n" +"Należy zamknąć tę aplikację i spróbowac ponownie." #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 @@ -3725,12 +3819,12 @@ msgstr "Nieokreślony poziom wsparcia" msgid "The vendor does not provide support." msgstr "Producent nie zapewnia wsparcia." -#: ../zypp/base/InterProcessMutex.cc:139 +#: ../zypp/base/InterProcessMutex.cc:143 msgid "This action is being run by another program already." msgstr "Inny program wykonuje już tę czynność." -#: ../zypp/solver/detail/SATResolver.cc:1118 -#: ../zypp/solver/detail/SATResolver.cc:1136 +#: ../zypp/solver/detail/SATResolver.cc:1155 +#: ../zypp/solver/detail/SATResolver.cc:1173 msgid "This request will break your system!" msgstr "To żądanie uszkodzi system!" @@ -3749,7 +3843,7 @@ msgstr "tigre" msgid "Tigrinya" msgstr "tigrinya" -#: ../zypp/media/MediaException.cc:207 +#: ../zypp/media/MediaException.cc:259 #, c-format msgid "Timeout exceed when access '%s'." msgstr "Przekroczono limit czasu podczas dostępu do \"%s\"." @@ -3800,7 +3894,7 @@ msgstr "tongański (Niasa)" msgid "Tonga (Tonga Islands)" msgstr "tangański (wyspy Tonga)" -#: ../zypp/KeyRing.cc:536 +#: ../zypp/KeyRing.cc:526 #, c-format msgid "Tried to import not existant key %s into keyring %s" msgstr "Próba importu nieistniejącego klucza %s do bazy kluczy %s" @@ -3942,6 +4036,10 @@ msgstr "Analiza komponentów URL nie powiodła się" msgid "Undetermined" msgstr "nieokreślony" +#: ../zypp/RepoManager.cc:1113 +msgid "Unhandled repository type" +msgstr "Nieobsługiwany typ repozytorium" + #. :AND:020: #: ../zypp/CountryCode.cc:225 msgid "United Arab Emirates" @@ -3962,7 +4060,7 @@ msgstr "Stany Zjednoczone Ameryki Północnej" msgid "United States Minor Outlying Islands" msgstr "Dalekie Wyspy Mniejsze Stanów Zjednoczonych" -#: ../zypp/target/TargetImpl.cc:879 +#: ../zypp/target/TargetImpl.cc:1031 msgid "Unknown Distribution" msgstr "Nieznana dystrybucja" @@ -3970,6 +4068,12 @@ msgstr "Nieznana dystrybucja" msgid "Unknown country: " msgstr "Nieznane państwo: " +#. TranslatorExplanation '%s' is an URL +#: ../zypp/RepoManager.cc:1196 ../zypp/RepoManager.cc:1994 +#, c-format +msgid "Unknown error reading from '%s'" +msgstr "Nieznany błąd podczas odczytu z \"%s\"" + #: ../zypp/LanguageCode.cc:145 msgid "Unknown language: " msgstr "Nieznany język:" @@ -3983,15 +4087,21 @@ msgstr "Nieznana opcja wsparcia. Brak opisu." msgid "Unsupported HTTP authentication method '%s'" msgstr "Nieobsługiwana metoda uwierzytelniania HTTP: \"%s\"" -#: ../zypp/media/MediaException.cc:140 +#: ../zypp/media/MediaException.cc:156 #, c-format msgid "Unsupported URI scheme in '%s'." msgstr "Nieobsługiwany schemat adresu URI w \"%s\"" #: ../devel/devel.mvidner/installation_sources.cc:75 #, c-format -msgid "Untrusted key found:\n%s|%s|%s\nTrust key?" -msgstr "Napotkano niezaufany klucz:\n%s|%s|%s\nDodać go do listy zaufanych?" +msgid "" +"Untrusted key found:\n" +"%s|%s|%s\n" +"Trust key?" +msgstr "" +"Napotkano niezaufany klucz:\n" +"%s|%s|%s\n" +"Dodać go do listy zaufanych?" #. language code: hsb #: ../zypp/LanguageCode.cc:612 @@ -4057,7 +4167,7 @@ msgid "Vai" msgstr "vai" #. we will throw this later if no URL checks out fine -#: ../zypp/RepoManager.cc:790 +#: ../zypp/RepoManager.cc:839 msgid "Valid metadata not found at specified URL(s)" msgstr "Pod podanymi adresami URL nie znaleziono prawidłowych metadanych." @@ -4226,95 +4336,104 @@ msgstr "zulu" msgid "Zuni" msgstr "zuni" -#: ../zypp/repo/PackageProvider.cc:239 +#: ../zypp/repo/PackageProvider.cc:225 msgid "applydeltarpm check failed." msgstr "Sprawdzenie applydeltarpm zakończone niepowodzeniem." -#: ../zypp/repo/PackageProvider.cc:253 +#: ../zypp/repo/PackageProvider.cc:242 msgid "applydeltarpm failed." msgstr "applydeltarpm zakończone niepowodzeniem." -#: ../zypp/solver/detail/SATResolver.cc:1194 +#: ../zypp/solver/detail/SATResolver.cc:1244 #, c-format msgid "architecture change of %s to %s" msgstr "zmiana architektury z %s na %s" -#: ../zypp/solver/detail/SATResolver.cc:923 +#: ../zypp/solver/detail/SATResolver.cc:960 #, c-format msgid "cannot install both %s and %s" msgstr "nie można jednocześnie zainstalować %s i %s" -#: ../zypp/solver/detail/SATResolver.cc:903 +#: ../zypp/solver/detail/SATResolver.cc:940 msgid "conflicting requests" msgstr "sprzeczne żądania" -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2362 +#: ../zypp/target/rpm/RpmDb.cc:2372 #, c-format msgid "created backup %s" msgstr "utworzono zapasowy %s" -#: ../zypp/solver/detail/SATResolver.cc:1222 +#: ../zypp/solver/detail/SATResolver.cc:1272 #, c-format msgid "deinstallation of %s" msgstr "usunięcie %s" -#: ../zypp/solver/detail/SATResolver.cc:971 +#: ../zypp/solver/detail/SATResolver.cc:1008 msgid "deleted providers: " msgstr "usunięci dostawcy:" -#: ../zypp/solver/detail/SATResolver.cc:1139 +#: ../zypp/solver/detail/SATResolver.cc:1176 #, c-format msgid "do not ask to delete all solvables providing %s" msgstr "nie pytaj o usunięcie wszystkich elementów rozwiązywalnych, dostarczających %s" -#: ../zypp/solver/detail/SATResolver.cc:1121 +#: ../zypp/solver/detail/SATResolver.cc:1158 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "nie pytaj o instalację wszystkich elementów rozwiązywalnych, dostarczających %s" -#: ../zypp/solver/detail/SATResolver.cc:1066 +#: ../zypp/solver/detail/SATResolver.cc:1103 #, c-format msgid "do not forbid installation of %s" msgstr "nie zakazuj instalacji %s" -#: ../zypp/solver/detail/SATResolver.cc:1045 -#: ../zypp/solver/detail/SATResolver.cc:1083 +#: ../zypp/solver/detail/SATResolver.cc:1082 +#: ../zypp/solver/detail/SATResolver.cc:1120 #, c-format msgid "do not install %s" msgstr "nie instaluj %s" -#: ../zypp/solver/detail/SATResolver.cc:1152 +#: ../zypp/solver/detail/SATResolver.cc:1189 #, c-format msgid "do not install most recent version of %s" msgstr "nie instaluj najnowszej wersji %s" -#: ../zypp/solver/detail/SATResolver.cc:1040 +#: ../zypp/solver/detail/SATResolver.cc:1077 #, c-format msgid "do not keep %s installed" msgstr "nie utrzymuj zainstalowanego %s" -#: ../zypp/solver/detail/SATResolver.cc:1186 +#: ../zypp/solver/detail/SATResolver.cc:1236 #, c-format msgid "downgrade of %s to %s" msgstr "przywróć %s do %s" -#: ../zypp/solver/detail/SATResolver.cc:1119 -#: ../zypp/solver/detail/SATResolver.cc:1137 +#: ../zypp/solver/detail/SATResolver.cc:1156 +#: ../zypp/solver/detail/SATResolver.cc:1174 msgid "ignore the warning of a broken system" msgstr "ignoruj ostrzeżenie o uszkodzeniu systemu" -#: ../zypp/solver/detail/SATResolver.cc:1202 +#: ../zypp/solver/detail/SATResolver.cc:1252 #, c-format -msgid "install %s (with vendor change)\n %s\n-->\n %s" -msgstr "zainstaluj %s (ze zmianą dostawcy)\n %s\n-->\n %s" +msgid "" +"install %s (with vendor change)\n" +" %s\n" +"-->\n" +" %s" +msgstr "" +"zainstaluj %s (ze zmianą dostawcy)\n" +" %s\n" +"-->\n" +" %s" #: ../zypp/VendorSupportOptions.cc:31 msgid "invalid" msgstr "nieprawidłowy" -#: ../zypp/solver/detail/SATResolver.cc:1061 -#: ../zypp/solver/detail/SATResolver.cc:1104 +#. for solver reason: NOT weak lock. +#: ../zypp/solver/detail/SATResolver.cc:1098 +#: ../zypp/solver/detail/SATResolver.cc:1141 +#: ../zypp/solver/detail/SATResolver.cc:1218 #, c-format msgid "keep %s" msgstr "zachowaj %s" @@ -4327,59 +4446,63 @@ msgstr "libhal_ctx_new: nie można utworzyć kontekstu libhal" msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: nie można ustanowić połączenia dbus" -#: ../zypp/solver/detail/SATResolver.cc:918 +#: ../zypp/solver/detail/SATResolver.cc:955 #, c-format msgid "nothing provides %s needed by %s" msgstr "żaden pakiet nie dostarcza %s wymaganego przez %s" -#: ../zypp/solver/detail/SATResolver.cc:909 +#: ../zypp/solver/detail/SATResolver.cc:946 #, c-format msgid "nothing provides requested %s" msgstr "żaden pakiet nie dostarcza żądanego %s" -#: ../zypp/solver/detail/SATResolver.cc:900 +#: ../zypp/solver/detail/SATResolver.cc:937 #, c-format msgid "problem with installed package %s" msgstr "problem z zainstalowanym pakietem %s" -#: ../zypp/solver/detail/SATResolver.cc:1210 +#: ../zypp/solver/detail/SATResolver.cc:1260 #, c-format msgid "replacement of %s with %s" msgstr "zamiana %s na %s" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2067 +#: ../zypp/target/rpm/RpmDb.cc:2070 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm utworzył %s jako %s, ale nie można było określić różnicy" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2069 +#: ../zypp/target/rpm/RpmDb.cc:2072 #, c-format -msgid "rpm created %s as %s.\nHere are the first 25 lines of difference:\n" -msgstr "rpm utworzył %s jako %s.\nOto pierwszych 25 linii różnicy:\n" - -#: ../zypp/target/rpm/RpmDb.cc:2076 ../zypp/target/rpm/RpmDb.cc:2210 -msgid "rpm output:" -msgstr "Wyjście rpm:" +msgid "" +"rpm created %s as %s.\n" +"Here are the first 25 lines of difference:\n" +msgstr "" +"rpm utworzył %s jako %s.\n" +"Oto pierwszych 25 linii różnicy:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2062 +#: ../zypp/target/rpm/RpmDb.cc:2065 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm zapisał %s jako %s, ale nie można było określić różnicy" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2064 +#: ../zypp/target/rpm/RpmDb.cc:2067 #, c-format -msgid "rpm saved %s as %s.\nHere are the first 25 lines of difference:\n" -msgstr "rpm zapisał %s jako %s.\nOto pierwszych 25 linii różnicy:\n" +msgid "" +"rpm saved %s as %s.\n" +"Here are the first 25 lines of difference:\n" +msgstr "" +"rpm zapisał %s jako %s.\n" +"Oto pierwszych 25 linii różnicy:\n" -#: ../zypp/solver/detail/SATResolver.cc:906 +#: ../zypp/solver/detail/SATResolver.cc:943 msgid "some dependency problem" msgstr "problem z kilkoma zależnościami" -#: ../zypp/solver/detail/SATResolver.cc:983 +#: ../zypp/solver/detail/SATResolver.cc:1020 msgid "uninstallable providers: " msgstr "dostawcy, których nie można zainstalować:" @@ -4391,3 +4514,23 @@ msgstr "nieznany" msgid "unsupported" msgstr "niewspierany" +#~ msgid "%s install failed" +#~ msgstr "Instalacja %s nie powiodła się" + +#~ msgid "%s installed ok" +#~ msgstr "Pakiet %s jest zainstalowany prawidłowo" + +#~ msgid "%s remove failed" +#~ msgstr "Usunięcie %s nie powiodło się" + +#~ msgid "%s remove ok" +#~ msgstr "Usunięcie %s powiodło się" + +#~ msgid "Additional rpm output:" +#~ msgstr "Dodatkowe wyjście rpm:" + +#~ msgid "Invalid user name or password." +#~ msgstr "Nieprawidłowa nazwa użytkownika lub hasło." + +#~ msgid "rpm output:" +#~ msgstr "Wyjście rpm:" diff --git a/po/pt_BR.po b/po/pt_BR.po index fbd4a40..81c7ed2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-22 19:26\n" +"PO-Revision-Date: 2009-02-05 09:28\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/ru.po b/po/ru.po index f88629c..da5716b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-22 18:03\n" +"PO-Revision-Date: 2009-02-05 08:14\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/sv.po b/po/sv.po index 1adac38..fd93484 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-21 14:32\n" +"PO-Revision-Date: 2009-02-05 07:23\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1c97c37..83fed44 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-23 07:18\n" +"PO-Revision-Date: 2009-02-05 09:53\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 1ed384a..d26aa36 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-22 16:02+0200\n" -"PO-Revision-Date: 2009-01-21 13:40\n" +"PO-Revision-Date: 2009-02-04 15:44\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : add support for webrick to WebServer.
by Duncan Mac-Vicar P 05 Feb '09

05 Feb '09

ref: refs/heads/master commit e50f1afeeabc80368a7cbaa8363c9978ec57f110 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Thu Feb 5 15:00:30 2009 +0100 add support for webrick to WebServer. Make aria the default --- tests/lib/CMakeLists.txt | 4 +- tests/lib/WebServer.cc | 245 +++++++++++++++++++++++++++++++++++--------- tests/lib/WebServer.h | 27 ++--- tests/zypp/Fetcher_test.cc | 11 ++- vendor/CMakeLists.txt | 5 +- zypp/media/MediaAccess.cc | 9 +-- zypp/media/MediaAria2c.cc | 6 +- 7 files changed, 227 insertions(+), 80 deletions(-) diff --git a/tests/lib/CMakeLists.txt b/tests/lib/CMakeLists.txt index e99de9b..5ff5932 100644 --- a/tests/lib/CMakeLists.txt +++ b/tests/lib/CMakeLists.txt @@ -1,5 +1,5 @@ -INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/vendor/shttpd ) +INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/vendor/mongoose ) ADD_LIBRARY(zypp_test_utils TestSetup.h @@ -7,4 +7,4 @@ ADD_LIBRARY(zypp_test_utils WebServer.cc ) -TARGET_LINK_LIBRARIES(zypp_test_utils shttp zypp boost_thread-mt) +TARGET_LINK_LIBRARIES(zypp_test_utils mongoose zypp boost_thread-mt) diff --git a/tests/lib/WebServer.cc b/tests/lib/WebServer.cc index 98a47b3..4d05eb8 100644 --- a/tests/lib/WebServer.cc +++ b/tests/lib/WebServer.cc @@ -1,78 +1,227 @@ -#include <sys/types.h> -#include <sys/select.h> -#include <sys/wait.h> -#include <stdio.h> -#include <stdlib.h> -#include <assert.h> -#include <string.h> +//#include "zypp/ZYpp.h" -#include "zypp/ZYpp.h" - -using namespace zypp; - -#include "shttpd.h" +#include <sstream> +#include <string> #include "boost/bind.hpp" + +#include "zypp/base/Logger.h" +#include "zypp/base/String.h" +#include "zypp/base/Exception.h" +#include "zypp/ExternalProgram.h" #include "WebServer.h" -#define LISTENING_PORT "8080" +#include "mongoose.h" -static shttpd_ctx * do_init_ctx() +using namespace zypp; +using namespace std; + +#define WEBRICK 0 + +class WebServer::Impl { - static const char *argv[] = {"a", "-ports", LISTENING_PORT, NULL}; - static int argc = sizeof(argv) / sizeof(argv[0]) - 1; - shttpd_ctx *ctx; +public: + Impl() + {} - ctx = shttpd_init(argc, const_cast<char**>(argv)); - return ctx; -} - -WebServer::WebServer(const Pathname root, unsigned int port) - : _docroot(root), _port(port), _stop(false) + virtual ~Impl() + {} + + virtual string log() const + { return string(); } + + virtual void start() + {} + + virtual void stop() + {} + + virtual void worker_thread() + {} + +private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } +}; + +class WebServerWebrickImpl : public WebServer::Impl { - // init with a user port - _ctx = do_init_ctx(); - setStrOption("root", root.asString()); - setNumOption("ports", port); -} +public: + WebServerWebrickImpl(const Pathname &root, unsigned int port) + : _docroot(root), _port(port), _stop(false), _stopped(true) + { + } + + ~WebServerWebrickImpl() + { + if ( ! _stopped ) + stop(); + } + + virtual void worker_thread() + { + _log.clear(); + + stringstream strlog(_log); -void WebServer::start() + string webrick_code = str::form("require 'webrick'; s = WEBrick::HTTPServer.new(:Port => %d, :DocumentRoot => '%s'); trap('INT'){ s.shutdown }; trap('SIGKILL') { s.shutdown }; s.start;", _port, _docroot.c_str()); + + const char* argv[] = + { + "/usr/bin/ruby", + "-e", + webrick_code.c_str(), + NULL + }; + + ExternalProgram prog(argv,ExternalProgram::Discard_Stderr, false, -1, true); + string line; + + _stopped = false; + + while ( _stop ); + + /* + for(line = prog.receiveLine(); + !line.empty(); + line = prog.receiveLine() ) + { + strlog << line; + if ( _stop ) + break; + } + */ + MIL << "Thread end requested" << endl; + //prog.close(); + if ( prog.running() ) + prog.kill(); + MIL << "Thread about to finish" << endl; + } + + virtual string log() const + { + return _log; + } + + virtual void stop() + { + MIL << "Waiting for Webrick thread to finish" << endl; + _stop = true; + _thrd->join(); + MIL << "Webrick thread finished" << endl; + _thrd.reset(); + _stopped = true; + } + + virtual void start() + { + _thrd.reset( new boost::thread( boost::bind(&WebServerWebrickImpl::worker_thread, this) ) ); + } + + zypp::Pathname _docroot; + unsigned int _port; + zypp::shared_ptr<boost::thread> _thrd; + bool _stop; + bool _stopped; + std::string _log; +}; + +class WebServerMongooseImpl : public WebServer::Impl { -// _thrd.reset( new boost::thread(web_thread(_ctx)) ); - _thrd.reset( new boost::thread( boost::bind(&WebServer::worker_thread, this) ) ); +public: + WebServerMongooseImpl(const Pathname &root, unsigned int port) + : _ctx(0L), _docroot(root) + , _port(port), _stop(false) + , _stopped(true) + { + } + + ~WebServerMongooseImpl() + { + if ( ! _stopped ) + stop(); + } + + virtual void worker_thread() + { + _log.clear(); + _ctx = mg_start(); + if ( ! mg_set_option(_ctx, "ports", str::form("%d", _port).c_str()) ) + ZYPP_THROW(Exception("Failed to set port")); + + mg_set_option(_ctx, "root", _docroot.c_str()); + stringstream strlog(_log); + + while ( !_stop ) + { + // loop + } + MIL << "Thread end requested, shutting down shttpd" << endl; + mg_stop(_ctx); + _ctx = 0; + } + + virtual string log() const + { + return _log; + } + + virtual void stop() + { + MIL << "Waiting for shttpd thread to finish" << endl; + _stop = true; + _thrd->join(); + MIL << "shttpd thread to finished" << endl; + _thrd.reset(); + _stopped = true; + } + + virtual void start() + { + MIL << "Starting shttpd (mongoose) thread" << endl; + _thrd.reset( new boost::thread( boost::bind(&WebServerMongooseImpl::worker_thread, this) ) ); + } + + mg_context *_ctx; + zypp::Pathname _docroot; + unsigned int _port; + zypp::shared_ptr<boost::thread> _thrd; + bool _stop; + bool _stopped; + std::string _log; +}; + + +WebServer::WebServer(const Pathname &root, unsigned int port) +#if WEBRICK + : _pimpl(new WebServerWebrickImpl(root, port)) +#else + : _pimpl(new WebServerMongooseImpl(root, port)) +#endif +{ } -void WebServer::worker_thread() +void WebServer::start() { - while( ! _stop ) - shttpd_poll(_ctx, 1000); + _pimpl->start(); } -void WebServer::setStrOption( std::string name, std::string value) +std::string WebServer::log() const { - if ( ! shttpd_set_option(_ctx, name.c_str(), - value.c_str() ) ) - ZYPP_THROW(Exception("bad option")); + return _pimpl->log(); } -void WebServer::setNumOption( std::string name, int value) -{ - if ( ! shttpd_set_option(_ctx, name.c_str(), - str::numstring(value).c_str()) ) - ZYPP_THROW(Exception("bad ioption")); -} void WebServer::stop() { - _stop = true; - _thrd->join(); - _thrd.reset(); + _pimpl->stop(); } WebServer::~WebServer() { - shttpd_fini(_ctx); } diff --git a/tests/lib/WebServer.h b/tests/lib/WebServer.h index 02d6625..e7c5420 100644 --- a/tests/lib/WebServer.h +++ b/tests/lib/WebServer.h @@ -1,6 +1,6 @@ -#ifndef ZYPP_WEBSERVER_H -#define ZYPP_WEBSERVER_H +#ifndef ZYPP_TEST_WEBSERVER_H +#define ZYPP_TEST_WEBSERVER_H #include "boost/thread.hpp" #include "boost/smart_ptr.hpp" @@ -8,12 +8,11 @@ #include "zypp/Pathname.h" #include "zypp/base/PtrTypes.h" -struct shttpd_ctx; - /** * * Starts a webserver to simulate remote transfers in * testcases + * \author Duncan Mac-Vicar P. <dmacvicar(a)suse.de> * * \code * #include "WebServer.h" @@ -39,7 +38,7 @@ class WebServer /** * creates a web server on \ref root and \port */ - WebServer(const zypp::Pathname root, unsigned int port=9099); + WebServer(const zypp::Pathname &root, unsigned int port=10001); ~WebServer(); /** * Starts the webserver worker thread @@ -50,17 +49,15 @@ class WebServer */ void stop(); - private: - - void setStrOption( std::string name, std::string value); - void setNumOption( std::string name, int value); + /** + * shows the log of last run + */ + std::string log() const; - void worker_thread(); - struct shttpd_ctx *_ctx; - zypp::Pathname _docroot; - unsigned int _port; - zypp::shared_ptr<boost::thread> _thrd; - bool _stop; + class Impl; +private: + /** Pointer to implementation */ + zypp::RWCOW_pointer<Impl> _pimpl; }; #endif diff --git a/tests/zypp/Fetcher_test.cc b/tests/zypp/Fetcher_test.cc index 10c2602..a00ece2 100644 --- a/tests/zypp/Fetcher_test.cc +++ b/tests/zypp/Fetcher_test.cc @@ -325,10 +325,10 @@ BOOST_AUTO_TEST_CASE(enqueuedir_http) // add the key as trusted //getZYpp()->keyRing()->importKey(PublicKey(DATADIR + "/complexdir/subdir1/SHA1SUMS.key"), true); - WebServer web((Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site").c_str() ); + WebServer web((Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site").c_str(), 10001); web.start(); - MediaSetAccess media( Url("http://localhost:9099"), "/" ); + MediaSetAccess media( Url("http://127.0.0.1:10001"), "/" ); Fetcher fetcher; filesystem::TmpDir dest; @@ -355,10 +355,10 @@ BOOST_AUTO_TEST_CASE(enqueuedir_http_broken) // add the key as trusted //getZYpp()->keyRing()->importKey(PublicKey(DATADIR + "/complexdir/subdir1/SHA1SUMS.key"), true); - WebServer web((Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site").c_str() ); + WebServer web((Pathname(TESTS_SRC_DIR) + "/zypp/data/Fetcher/remote-site").c_str() , 10002 ); web.start(); - MediaSetAccess media( Url("http://localhost:9099"), "/" ); + MediaSetAccess media( Url("http://127.0.0.1:10002"), "/" ); Fetcher fetcher; filesystem::TmpDir dest; @@ -380,6 +380,9 @@ BOOST_AUTO_TEST_CASE(enqueuedir_http_broken) fetcher.reset(); web.stop(); + + MIL << web.log(); + } } diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 46dd22c..a651570 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -1,2 +1,5 @@ -ADD_SUBDIRECTORY(shttpd) +ADD_SUBDIRECTORY(mongoose) + + + diff --git a/zypp/media/MediaAccess.cc b/zypp/media/MediaAccess.cc index 815de4c..85ac5ea 100644 --- a/zypp/media/MediaAccess.cc +++ b/zypp/media/MediaAccess.cc @@ -128,14 +128,7 @@ MediaAccess::open (const Url& url, const Pathname & preferred_attach_point) else if (scheme == "cifs") _handler = new MediaCIFS (url,preferred_attach_point); else if (scheme == "ftp" || scheme == "http" || scheme == "https") - { - // Another good idea would be activate MediaAria2c handler via external var - if ( getenv( "ZYPP_ARIA2C" ) && - MediaAria2c::existsAria2cmd() ) - _handler = new MediaAria2c (url,preferred_attach_point); - else - _handler = new MediaCurl (url,preferred_attach_point); - } + _handler = new MediaAria2c (url,preferred_attach_point); else { ZYPP_THROW(MediaUnsupportedUrlSchemeException(url)); diff --git a/zypp/media/MediaAria2c.cc b/zypp/media/MediaAria2c.cc index 2eacecf..8720c7f 100644 --- a/zypp/media/MediaAria2c.cc +++ b/zypp/media/MediaAria2c.cc @@ -421,6 +421,7 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ ExternalProgram::Arguments args = _args; args.push_back(str::form("--dir=%s", target.dirname().c_str())); + args.push_back(fileurl.asString()); do @@ -450,8 +451,8 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ ZYPP_THROW(MediaFileNotFoundException(_url, filename)); } - if (!ariaResponse.substr(0,9).compare("[#2 SIZE:")) { - + if (!ariaResponse.substr(0,9).compare("[#2 SIZE:")) + { if (!nLine) { size_t left_bound = ariaResponse.find('(',0) + 1; @@ -467,6 +468,7 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ } } } + aria.close(); report->finish( _url , zypp::media::DownloadProgressReport::NO_ERROR, ""); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Let xml::ParseDef skip initial comments.
by Michael Andres 04 Feb '09

04 Feb '09

ref: refs/heads/master commit 527ee0b8adfe124a95953d36ab4c99d26eec7042 Author: Michael Andres <ma(a)suse.de> Date: Wed Feb 4 17:11:51 2009 +0100 Let xml::ParseDef skip initial comments. --- zypp/parser/xml/ParseDef.cc | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/zypp/parser/xml/ParseDef.cc b/zypp/parser/xml/ParseDef.cc index 58b1a8a..04dcdae 100644 --- a/zypp/parser/xml/ParseDef.cc +++ b/zypp/parser/xml/ParseDef.cc @@ -241,7 +241,21 @@ namespace zypp { if ( reader_r->nodeType() != XML_READER_TYPE_ELEMENT ) { - ZYPP_THROW( ParseDefValidateException( exstr("Expected ELEMENT", *this, reader_r) ) ); + if ( reader_r->depth() == 0 ) + { + // on the verry first level we skip any initial whitespace and comments... + do { + // advance to next node + if ( ! reader_r.nextNode() ) + { + ZYPP_THROW( ParseDefValidateException( exstr( "Unexpected EOF ", *this ) ) ); + } + } while( reader_r->nodeType() != XML_READER_TYPE_ELEMENT ); + } + else + { + ZYPP_THROW( ParseDefValidateException( exstr("Expected ELEMENT", *this, reader_r) ) ); + } } if ( reader_r->name() != _name ) { @@ -320,6 +334,7 @@ namespace zypp break; default: + //DBG << exstr("SKIP ", *this, reader_r) << endl; break; } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : Let xml::ParseDef skip initial comments.
by Michael Andres 04 Feb '09

04 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit f0d7c3db25514bf8c0cb5c338585870cc2476aee Author: Michael Andres <ma(a)suse.de> Date: Wed Feb 4 17:11:51 2009 +0100 Let xml::ParseDef skip initial comments. --- zypp/parser/xml/ParseDef.cc | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/zypp/parser/xml/ParseDef.cc b/zypp/parser/xml/ParseDef.cc index 58b1a8a..04dcdae 100644 --- a/zypp/parser/xml/ParseDef.cc +++ b/zypp/parser/xml/ParseDef.cc @@ -241,7 +241,21 @@ namespace zypp { if ( reader_r->nodeType() != XML_READER_TYPE_ELEMENT ) { - ZYPP_THROW( ParseDefValidateException( exstr("Expected ELEMENT", *this, reader_r) ) ); + if ( reader_r->depth() == 0 ) + { + // on the verry first level we skip any initial whitespace and comments... + do { + // advance to next node + if ( ! reader_r.nextNode() ) + { + ZYPP_THROW( ParseDefValidateException( exstr( "Unexpected EOF ", *this ) ) ); + } + } while( reader_r->nodeType() != XML_READER_TYPE_ELEMENT ); + } + else + { + ZYPP_THROW( ParseDefValidateException( exstr("Expected ELEMENT", *this, reader_r) ) ); + } } if ( reader_r->name() != _name ) { @@ -320,6 +334,7 @@ namespace zypp break; default: + //DBG << exstr("SKIP ", *this, reader_r) << endl; break; } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <cmpi-zypp> master : Start adding example applications tying out powerCIM.
by Michael Andres 03 Feb '09

03 Feb '09

ref: refs/heads/master commit 762fec511e263a873251d784d41139dd4b083c69 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 3 20:11:06 2009 +0100 Start adding example applications tying out powerCIM. --- examples/README | 17 +++++++++++++++++ examples/TODO | 24 ++++++++++++++++++++++++ examples/list_packages.py | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 0 deletions(-) diff --git a/examples/README b/examples/README new file mode 100644 index 0000000..71e5141 --- /dev/null +++ b/examples/README @@ -0,0 +1,17 @@ + +Some example applications using powerCIM (http://en.opensuse.org/PowerCIM) + +#> zypper ar http://download.opensuse.org/repositories/home:/mmrazik/openSUSE_Factory powerCIM +#> zypper in powerCIM + + +In each example you must define 4 variables to access the WEBMserver. +Instead of editing each file you can write your values to ~/.cmpi-zypp. +(one value per line, in the sequence above) +(*** do 'chmod 600 ~/.cmpi-zypp' to protect the password! ) + +# WBEMServer = 'https://localhost:5989' +# login = 'root' +# password = '*******' +# namespace = 'root/cimv2' + diff --git a/examples/TODO b/examples/TODO new file mode 100644 index 0000000..502bb65 --- /dev/null +++ b/examples/TODO @@ -0,0 +1,24 @@ + +- list_packages.py works with a test repom but not with real life data from my system. + Have to check why. + + Traceback (most recent call last): + File "./list_packages.py", line 32, in <module> + for package in system._GetAssociators( namespace, 'SUSE_InstalledSoftwareIdentity' ): + File "/usr/lib/python2.6/site-packages/powerCIM/cim.py", line 348, in _GetAssociators + resultRole=resultRole) + File "/usr/lib/python2.6/site-packages/powerCIM/meta.py", line 50, in myFunc + ret = func(self, *args,**kws) + File "/usr/lib/python2.6/site-packages/powerCIM/wbemconnection.py", line 231, in Associators + return self.connection.Associators(name,**params) + File "/usr/lib/python2.6/site-packages/pywbem/cim_operations.py", line 696, in Associators + **params) + File "/usr/lib/python2.6/site-packages/pywbem/cim_operations.py", line 178, in imethodcall + reply_dom = minidom.parseString(resp_xml) + File "/usr/lib/python2.6/site-packages/_xmlplus/dom/minidom.py", line 1925, in parseString + return expatbuilder.parseString(string) + File "/usr/lib/python2.6/site-packages/_xmlplus/dom/expatbuilder.py", line 942, in parseString + return builder.parseString(string) + File "/usr/lib/python2.6/site-packages/_xmlplus/dom/expatbuilder.py", line 223, in parseString + parser.Parse(string, True) + xml.parsers.expat.ExpatError: not well-formed (invalid token): line 31864, column 4 diff --git a/examples/list_packages.py b/examples/list_packages.py new file mode 100755 index 0000000..37fcbf6 --- /dev/null +++ b/examples/list_packages.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python +# +# Example application using powerCIM (http://en.opensuse.org/PowerCIM) +# +# It connects to given host and lists all inatalled and available +# packages. +# +import os +import powerCIM + +# Define those 4 variables or write their values to ~/.cmpi-zypp +# +# WBEMServer = 'https://localhost:5989' +# login = 'root' +# password = '*******' +# namespace = 'root/cimv2' +if os.path.exists('%s/.cmpi-zypp'%os.environ['HOME']): + with open( '%s/.cmpi-zypp'%os.environ['HOME'], 'r' ) as f: + WBEMServer = f.readline().rstrip() + login = f.readline().rstrip() + password = f.readline().rstrip() + namespace = f.readline().rstrip() + +# create factory/connection +factory = powerCIM.WBEMFactory( WBEMServer, login, password, namespace ) + +# get all installed packages +print '===[installed packages]============================================================' +systems = factory.EnumerateInstances( 'Linux_ComputerSystem' ) +for system in systems: + for package in system._GetAssociators( namespace, 'SUSE_InstalledSoftwareIdentity' ): + print package.InstanceID + +# get all packages +print '===[all packages]============================================================' +instances = factory.EnumerateInstances( 'SUSE_SoftwareIdentity' ) +for package in instances: + print package.InstanceID + -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : changes
by Michael Andres 03 Feb '09

03 Feb '09

ref: refs/heads/master commit a354b024b431ce8476d90816c3349f5a76ec9361 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 3 18:08:31 2009 +0100 changes --- package/libzypp.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 9670a5f..ba223b9 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 3 18:07:38 CET 2009 - ma(a)suse.de + +- Send any output from rpm install/delete scripts via callback, so + applications are able to display it. (bnc #369450) + +------------------------------------------------------------------- Mon Feb 2 14:12:08 CET 2009 - ma(a)suse.de - Add missing translations (bnc #256289) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Send any output from rpm install/delete scripts via callback,
by Michael Andres 03 Feb '09

03 Feb '09

ref: refs/heads/master commit b5408f5b4b5abf89ffbeb4322ee2b01044bc2047 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 3 17:09:48 2009 +0100 Send any output from rpm install/delete scripts via callback, so applications are able to display it. (bnc #369450) --- zypp/target/TargetCallbackReceiver.cc | 14 +++++++++++- zypp/target/TargetCallbackReceiver.h | 31 +++++++++++++++++----------- zypp/target/TargetImpl.cc | 5 ++- zypp/target/rpm/RpmCallbacks.h | 36 ++++++++++++++++---------------- zypp/target/rpm/RpmDb.cc | 8 +++++++ 5 files changed, 60 insertions(+), 34 deletions(-) diff --git a/zypp/target/TargetCallbackReceiver.cc b/zypp/target/TargetCallbackReceiver.cc index 463fd9d..0d02f92 100644 --- a/zypp/target/TargetCallbackReceiver.cc +++ b/zypp/target/TargetCallbackReceiver.cc @@ -81,10 +81,15 @@ namespace zypp return rpm::RpmInstallReport::problem( excpt_r ); } + void RpmInstallPackageReceiver::finishInfo( const std::string & info_r ) + { + _finishInfo = info_r; + } + /** Finish operation in case of success */ void RpmInstallPackageReceiver::finish() { - _report->finish( _resolvable, rpm::InstallResolvableReport::NO_ERROR, std::string(), _level ); + _report->finish( _resolvable, rpm::InstallResolvableReport::NO_ERROR, _finishInfo, _level ); } /** Finish operation in case of success */ @@ -161,11 +166,16 @@ namespace zypp return rpm::RpmRemoveReport::problem( excpt_r ); } + void RpmRemovePackageReceiver::finishInfo( const std::string & info_r ) + { + _finishInfo = info_r; + } + /** Finish operation in case of success */ void RpmRemovePackageReceiver::finish() { _report->progress( 100, _resolvable ); - _report->finish( _resolvable, rpm::RemoveResolvableReport::NO_ERROR, std::string() ); + _report->finish( _resolvable, rpm::RemoveResolvableReport::NO_ERROR, _finishInfo ); } /** Finish operation in case of success */ diff --git a/zypp/target/TargetCallbackReceiver.h b/zypp/target/TargetCallbackReceiver.h index 04ca7ba..8b435bc 100644 --- a/zypp/target/TargetCallbackReceiver.h +++ b/zypp/target/TargetCallbackReceiver.h @@ -22,28 +22,29 @@ namespace zypp namespace target { ///////////////////////////////////////////////////////////////// - class RpmInstallPackageReceiver + class RpmInstallPackageReceiver : public callback::ReceiveReport<rpm::RpmInstallReport> { callback::SendReport <rpm::InstallResolvableReport> _report; Resolvable::constPtr _resolvable; target::rpm::InstallResolvableReport::RpmLevel _level; bool _abort; + std::string _finishInfo; public: RpmInstallPackageReceiver (Resolvable::constPtr res); virtual ~RpmInstallPackageReceiver (); - + virtual void reportbegin(); - + virtual void reportend(); /** Start the operation */ virtual void start( const Pathname & name ); - + void tryLevel( target::rpm::InstallResolvableReport::RpmLevel level_r ); - + bool aborted() const { return _abort; } /** @@ -55,33 +56,36 @@ namespace zypp /** inform user about a problem */ virtual rpm::RpmInstallReport::Action problem( Exception & excpt_r ); + /** Additional rpm output to be reported in \ref finish in case of success. */ + virtual void finishInfo( const std::string & info_r ); + /** Finish operation in case of success */ virtual void finish(); /** Finish operatin in case of fail, report fail exception */ virtual void finish( Exception & excpt_r ); }; - - class RpmRemovePackageReceiver + + class RpmRemovePackageReceiver : public callback::ReceiveReport<rpm::RpmRemoveReport> { callback::SendReport <rpm::RemoveResolvableReport> _report; Resolvable::constPtr _resolvable; bool _abort; - + std::string _finishInfo; public: RpmRemovePackageReceiver (Resolvable::constPtr res); virtual ~RpmRemovePackageReceiver (); - + virtual void reportbegin(); - + virtual void reportend(); /** Start the operation */ virtual void start( const std::string & name ); - + /** * Inform about progress * Return true on abort @@ -96,13 +100,16 @@ namespace zypp /** inform user about a problem */ virtual rpm::RpmRemoveReport::Action problem( Exception & excpt_r ); + /** Additional rpm output to be reported in \ref finish in case of success. */ + virtual void finishInfo( const std::string & info_r ); + /** Finish operation in case of success */ virtual void finish(); /** Finish operatin in case of fail, report fail exception */ virtual void finish( Exception & excpt_r ); }; - + ///////////////////////////////////////////////////////////////// } // namespace target /////////////////////////////////////////////////////////////////// diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc index d5af084..92ff04e 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -831,7 +831,7 @@ namespace zypp progress.connect(); // disconnected on destruction. bool success = false; - rpm::RpmInstFlags flags; + rpm::RpmInstFlags flags( policy_r.rpmInstFlags() & rpm::RPMINST_JUSTDB ); // Why force and nodeps? // // Because zypp builds the transaction and the resolver asserts that @@ -899,7 +899,8 @@ namespace zypp progress.connect(); // disconnected on destruction. bool success = false; - rpm::RpmInstFlags flags( rpm::RPMINST_NODEPS ); + rpm::RpmInstFlags flags( policy_r.rpmInstFlags() & rpm::RPMINST_JUSTDB ); + flags |= rpm::RPMINST_NODEPS; if (policy_r.dryRun()) flags |= rpm::RPMINST_TEST; try { diff --git a/zypp/target/rpm/RpmCallbacks.h b/zypp/target/rpm/RpmCallbacks.h index f65ae68..6fd0071 100644 --- a/zypp/target/rpm/RpmCallbacks.h +++ b/zypp/target/rpm/RpmCallbacks.h @@ -41,27 +41,27 @@ struct RpmRemoveReport : public callback::ReportBase /** Start the operation */ virtual void start( const std::string & name ) - { } + {} /** * Inform about progress * Return true on abort */ virtual bool progress( unsigned percent ) - { - return false; - } + { return false; } virtual Action problem( Exception & excpt_r ) - { - return ABORT; - } + { return ABORT; } + + /** Additional rpm output to be reported in \ref finish in case of success. */ + virtual void finishInfo( const std::string & info_r ) + {} /** Finish operation in case of success */ virtual void finish() - { } + {} /** Finish operation in case of fail, report fail exception */ virtual void finish( Exception & excpt_r ) - { } + {} }; /////////////////////////////////////////////////////////////////// @@ -78,28 +78,28 @@ struct RpmInstallReport : public callback::ReportBase /** Start the operation */ virtual void start( const Pathname & name ) - { } + {} /** * Inform about progress * Return false on abort */ virtual bool progress( unsigned percent ) - { - return true; - } + { return true; } + + /** Additional rpm output to be reported in \ref finish in case of success. */ + virtual void finishInfo( const std::string & info_r ) + {} /** Finish operation in case of success */ virtual void finish() - { } + {} virtual Action problem( Exception & excpt_r ) - { - return ABORT; - } + { return ABORT; } /** Finish operation in case of fail, report fail exception */ virtual void finish( Exception & excpt_r ) - { } + {} }; } // namespace rpm diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc index 4af210a..a207cf5 100644 --- a/zypp/target/rpm/RpmDb.cc +++ b/zypp/target/rpm/RpmDb.cc @@ -2092,6 +2092,10 @@ void RpmDb::doInstallPackage( const Pathname & filename, RpmInstFlags flags, cal ostringstream sstr; sstr << "Additional rpm output:" << endl << rpmmsg << endl; historylog.comment(sstr.str()); + + // report additional rpm output in finish + // TranslatorExplanation Text is followed by a ':' and the actual output. + report->finishInfo(str::form( "%s:\n%s\n", _("Additional rpm output"), rpmmsg.c_str() )); } } @@ -2228,6 +2232,10 @@ void RpmDb::doRemovePackage( const string & name_r, RpmInstFlags flags, callback ostringstream sstr; sstr << "Additional rpm output:" << endl << rpmmsg << endl; historylog.comment(sstr.str()); + + // report additional rpm output in finish + // TranslatorExplanation Text is followed by a ':' and the actual output. + report->finishInfo(str::form( "%s:\n%s\n", _("Additional rpm output"), rpmmsg.c_str() )); } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : backup
by Michael Andres 03 Feb '09

03 Feb '09

ref: refs/heads/SuSE-Code-11-Branch commit 1a34dbb4ed1e1a42ba584486e02589eda3e63f13 Author: Michael Andres <ma(a)suse.de> Date: Tue Feb 3 17:31:14 2009 +0100 backup --- devel/devel.ma/CMakeLists.txt | 2 +- devel/devel.ma/CommitCb.cc | 46 ++++++++++++++++------------------------- devel/devel.ma/Main.cc | 18 ---------------- devel/devel.ma/NewPool.cc | 18 +++------------ devel/devel.ma/Tools.h | 17 ++++++++++++++- devel/devel.ma/ma_test | 2 +- devel/devel.ma/main.cc | 44 +++++++++++++------------------------- 7 files changed, 55 insertions(+), 92 deletions(-) diff --git a/devel/devel.ma/CMakeLists.txt b/devel/devel.ma/CMakeLists.txt index 425f469..08d375d 100644 --- a/devel/devel.ma/CMakeLists.txt +++ b/devel/devel.ma/CMakeLists.txt @@ -24,7 +24,7 @@ ADD_CUSTOM_TARGET( ma_test ## ############################################################ -FOREACH( loop_var MaTest NewPool DumpSolv Iorder Xml Ex Main FakePool AOUT Parse Test Basic Sat TransList) +FOREACH( loop_var MaTest NewPool CommitCb DumpSolv Iorder Xml Ex main Main FakePool AOUT Parse Test Basic Sat TransList) ADD_EXECUTABLE( ${loop_var} ${loop_var}.cc ) diff --git a/devel/devel.ma/CommitCb.cc b/devel/devel.ma/CommitCb.cc index a0990ba..7ed90d4 100644 --- a/devel/devel.ma/CommitCb.cc +++ b/devel/devel.ma/CommitCb.cc @@ -37,28 +37,17 @@ struct IRR : public zypp::callback::ReceiveReport<zypp::target::rpm::InstallReso virtual void reportend() { SEC << endl; } - virtual void start(Resolvable::constPtr /*resolvable*/) - { INT << endl; } + virtual void start( Resolvable::constPtr resolvable ) + { INT << "START " << resolvable << endl; } - virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable*/) - { - static int i = 4; - if ( --i <= 0 ) - { - INT << "return abort" << endl; - return false; - } - return true; - } + virtual bool progress(int value, Resolvable::constPtr /*resolvable*/) + { INT << "..... " << value << "%" << endl; return true; } - virtual Action problem(Resolvable::constPtr /*resolvable*/, Error /*error*/, const std::string &/*description*/, RpmLevel /*level*/) - { - INT << "return abort" << endl; - return ABORT; - } + virtual Action problem(Resolvable::constPtr /*resolvable*/, Error error, const std::string & description, RpmLevel /*level*/) + { INT << "ERROR " << error << ": " << description << endl; return IGNORE; } - virtual void finish(Resolvable::constPtr /*resolvable*/, Error /*error*/, const std::string &/*reason*/, RpmLevel /*level*/) - { INT << endl; } + virtual void finish(Resolvable::constPtr /*resolvable*/, Error error, const std::string & reason, RpmLevel /*level*/) + { INT << "DONE " << error << ": " << reason << endl; } }; struct RRR : public zypp::callback::ReceiveReport<zypp::target::rpm::RemoveResolvableReport> @@ -85,17 +74,17 @@ struct RRR : public zypp::callback::ReceiveReport<zypp::target::rpm::RemoveResol virtual void reportend() { SEC << endl; } - virtual void start( Resolvable::constPtr /*resolvable*/ ) - { INT << endl; } + virtual void start( Resolvable::constPtr resolvable ) + { INT << "START " << resolvable << endl; } - virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable*/) - { INT << endl; return true; } + virtual bool progress(int value, Resolvable::constPtr /*resolvable*/) + { INT << "..... " << value << "%" << endl; return true; } - virtual Action problem( Resolvable::constPtr /*resolvable*/ , Error /*error*/ , const std::string &/*description*/ ) - { INT << endl; return ABORT; } + virtual Action problem( Resolvable::constPtr /*resolvable*/, Error error, const std::string & description ) + { INT << "ERROR " << error << ": " << description << endl; return ABORT; } - virtual void finish( Resolvable::constPtr /*resolvable*/ , Error /*error*/ , const std::string &/*reason*/ ) - { INT << endl; } + virtual void finish( Resolvable::constPtr /*resolvable*/ , Error error, const std::string & reason ) + { INT << "DONE " << error << ": " << reason << endl; } }; bool solve() @@ -119,7 +108,8 @@ bool solve() bool install() { ZYppCommitPolicy pol; -//pol.dryRun(true); + //pol.dryRun(true); + pol.rpmNoSignature( true ); pol.rpmInstFlags( pol.rpmInstFlags().setFlag( target::rpm::RPMINST_JUSTDB ) ); SEC << "START commit..." << endl; SEC << getZYpp()->commit( pol ) << endl; diff --git a/devel/devel.ma/Main.cc b/devel/devel.ma/Main.cc index 8201ed3..0aa3c3e 100644 --- a/devel/devel.ma/Main.cc +++ b/devel/devel.ma/Main.cc @@ -9,10 +9,6 @@ #include "zypp/TmpPath.h" -#include "zypp/RepoManager.h" -#include "zypp/RepoInfo.h" -#include "zypp/repo/PackageProvider.h" - #include "zypp/ResPoolProxy.h" using std::endl; @@ -40,20 +36,6 @@ bool solve() return true; } -ManagedFile providePkg( const PoolItem & pi ) -{ - Package::constPtr p = asKind<Package>( pi.resolvable() ); - if ( ! pi ) - return ManagedFile(); - - repo::RepoMediaAccess access; - std::list<Repository> repos; - repo::DeltaCandidates deltas( repos ); - repo::PackageProvider pkgProvider( access, p, deltas ); - - return pkgProvider.providePackage(); -} - /****************************************************************** ** ** FUNCTION NAME : main diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc index b72bea5..2cc6d32 100644 --- a/devel/devel.ma/NewPool.cc +++ b/devel/devel.ma/NewPool.cc @@ -54,7 +54,7 @@ using namespace zypp::ui; /////////////////////////////////////////////////////////////////// -static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" ); +static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Loacl/ROOT" ); /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// @@ -553,20 +553,10 @@ try { /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - dumpRange( MIL, pool.byKindBegin<Product>(), pool.byKindEnd<Product>() ) << endl; - //getZYpp()->resolver()->addConflict( Capability("product:openSUSE.i586") ); - //getZYpp()->resolver()->addConflict( Capability("openSUSE-release") ); + dumpRange( MIL, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) << endl; - getZYpp()->resolver()->addRequire( Capability("product:openSUSE.i586") ); - //getZYpp()->resolver()->addRequire( Capability("openSUSE-release") ); - - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; - solve(); - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; + ManagedFile f( repoProvidePackage( *pool.byKindBegin<Package>() ) ); + USR << f << endl; ////////////////////////////////////////////////////////////////// diff --git a/devel/devel.ma/Tools.h b/devel/devel.ma/Tools.h index 1d9d9d6..53e32d9 100644 --- a/devel/devel.ma/Tools.h +++ b/devel/devel.ma/Tools.h @@ -30,7 +30,8 @@ #include "zypp/ui/Selectable.h" #include <zypp/Repository.h> #include <zypp/RepoManager.h> - +#include "zypp/RepoInfo.h" +#include "zypp/repo/PackageProvider.h" using namespace zypp; using zypp::debug::Measure; @@ -148,6 +149,20 @@ inline RepoManager makeRepoManager( const Pathname & mgrdir_r ) return RepoManager(); } +ManagedFile providePkg( const PoolItem & pi ) +{ + Package::constPtr p = asKind<Package>( pi.resolvable() ); + if ( ! pi ) + return ManagedFile(); + + repo::RepoMediaAccess access; + std::list<Repository> repos; + repo::DeltaCandidates deltas( repos ); + repo::PackageProvider pkgProvider( access, p, deltas ); + + return pkgProvider.providePackage(); +} + /////////////////////////////////////////////////////////////////// template<class _Res> diff --git a/devel/devel.ma/ma_test b/devel/devel.ma/ma_test index 680d02a..4baea41 100755 --- a/devel/devel.ma/ma_test +++ b/devel/devel.ma/ma_test @@ -5,7 +5,7 @@ PRG=Main SUDO= if [ "$1" = -su ]; then - SUDO=sudo + SUDO="sudo -E" shift fi diff --git a/devel/devel.ma/main.cc b/devel/devel.ma/main.cc index 9e85f45..8cef44f 100644 --- a/devel/devel.ma/main.cc +++ b/devel/devel.ma/main.cc @@ -1,23 +1,10 @@ #include "Tools.h" #include "zypp/pool/GetResolvablesToInsDel.h" -static TestSetup test( Arch_x86_64 ); // use x86_64 as system arch +#include "zypp/parser/plaindir/RepoParser.h" -bool solve() -{ - bool rres = false; - { - //zypp::base::LogControl::TmpLineWriter shutUp; - rres = test.resolver().resolvePool(); - } - if ( ! rres ) - { - ERR << "resolve " << rres << endl; - return false; - } - MIL << "resolve " << rres << endl; - return true; -} +static TestSetup test( "/tmp/ToolScanRepos", Arch_x86_64 ); // use x86_64 as system arch +//static TestSetup test( Arch_x86_64 ); // use x86_64 as system arch int main( int argc, char * argv[] ) try { @@ -26,22 +13,21 @@ try { zypp::base::LogControl::instance().logToStdErr(); INT << "===[START]==========================================" << endl; - test.loadTarget(); // initialize and load target - test.loadRepo( Url("iso:/?iso=/mounts/dist/install/openSUSE-11.1-Beta2-DONTUSE/kiwi.out.dvd-i586.iso") ); + test.loadRepos(); + ResPool pool( test.pool() ); - ResPool pool( test.pool() ); - Resolver & resolver( test.resolver() ); + static const sat::SolvAttr susetagsDatadir( "susetags:datadir" ); + sat::LookupRepoAttr q( susetagsDatadir ); + dumpRange(SEC << q << " ", q.begin(), q.end() ) << endl; - resolver.addRequire( Capability("glibc") ); - resolver.addRequire( Capability("zlib") ); - resolver.addRequire( Capability("lsb-buildenv") ); - solve(); - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; + for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) + { + ManagedFile p( providePkg( *it ) ); + PathInfo pi( p ); + (pi.isFile() ? USR : INT) << pi << endl; + break; + } - pool::GetResolvablesToInsDel collect( pool, pool::GetResolvablesToInsDel::ORDER_BY_MEDIANR ); - MIL << "GetResolvablesToInsDel:" << endl << collect << endl; /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0