December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11903 - /trunk/dialogsolver/po/th.po
by schubi2＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: schubi2 Date: Mon Dec 8 09:41:24 2008 New Revision: 11903 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11903&view=rev Log: translation updated Modified: trunk/dialogsolver/po/th.po Modified: trunk/dialogsolver/po/th.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/po/th.po?rev=11903&… ============================================================================== --- trunk/dialogsolver/po/th.po (original) +++ trunk/dialogsolver/po/th.po Mon Dec 8 09:41:24 2008 @@ -1,18 +1,20 @@ # Thai message file for YaST2 (@memory@). # Copyright (C) 2008 SUSE Linux Products GmbH. # +# Thanomsub Noppaburana <donga.nb(a)gmail.com>, 2008. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-07-08 09:35+0200\n" -"PO-Revision-Date: 2008-01-04 08:58+0100\n" -"Last-Translator: i18n(a)suse.de\n" -"Language-Team: Thai <i18n(a)suse.de>\n" +"PO-Revision-Date: 2008-12-01 23:58+0700\n" +"Last-Translator: Thanomsub Noppaburana <donga.nb(a)gmail.com>\n" +"Language-Team: Thai <thai-l10n(a)googlegroups.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 0.2\n" #: ../src/QZyppSolverDialog.cpp:29 ../src/QZyppSolverDialog.cpp:83 #: ../src/restreewidget.cpp:290 @@ -22,7 +24,7 @@ #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/QZyppSolverDialog.cpp:83 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:290 msgid "Critical Error" -msgstr "" +msgstr "à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸à¸à¸±à¹à¸à¸§à¸´à¸à¸¤à¸à¸´" #: ../src/QZyppSolverDialog.cpp:30 ../src/QZyppSolverDialog.cpp:84 #: ../src/restreewidget.cpp:291 @@ -31,36 +33,32 @@ #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/QZyppSolverDialog.cpp:30 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/QZyppSolverDialog.cpp:84 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:291 -#, fuzzy msgid "No valid solver result" -msgstr "à¹à¸¡à¹à¸¡à¸µà¸«à¸¡à¸²à¸¢à¹à¸¥à¸à¹à¸à¸à¸µà¸à¸µà¹à¹à¸à¹à¹à¸à¹" +msgstr "à¹à¸¡à¹à¸¡à¸µà¸à¸¥à¸¥à¸±à¸à¸à¹à¸à¸à¸à¸à¸±à¸§à¹à¸à¹à¹à¸à¸à¸±à¸à¸«à¸²à¸à¸µà¹à¹à¸à¹à¸à¸²à¸à¹à¸à¹" #: ../src/restreewidget.cpp:74 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:74 -#, fuzzy msgid "show installed packages" -msgstr "à¸à¸±à¸à¹à¸à¸à¹à¸à¸à¸²à¸°à¹à¸à¸à¹à¸à¸à¸à¸µà¹à¸à¸´à¸à¸à¸±à¹à¸à¹à¸§à¹à¹à¸¥à¹à¸§à¹à¸à¹à¸²à¸à¸±à¹à¸" +msgstr "à¹à¸ªà¸à¸à¹à¸à¸à¹à¸à¸à¸à¸µà¹à¸à¸¹à¸à¸à¸´à¸à¸à¸±à¹à¸à¹à¸§à¹" #: ../src/restreewidget.cpp:75 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:75 -#, fuzzy msgid "show recommended packages" -msgstr "à¹à¸à¸à¹à¸à¸à¸à¸µà¹à¹à¸à¸°à¸à¸³" +msgstr "à¹à¸ªà¸à¸à¹à¸à¸à¹à¸à¸à¸à¸µà¹à¹à¸à¹à¸£à¸±à¸à¸à¸²à¸£à¹à¸à¸°à¸à¸³" #: ../src/restreewidget.cpp:84 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:65 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:65 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:84 -#, fuzzy msgid "Search: " -msgstr "_à¸à¹à¸à¸«à¸²:" +msgstr "à¸à¹à¸à¸«à¸²: " #: ../src/restreewidget.cpp:91 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:72 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:72 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:91 msgid "Description" -msgstr "à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸à¸´à¸à¸²à¸¢" +msgstr "à¸à¸³à¸à¸à¸´à¸à¸²à¸¢" #: ../src/restreewidget.cpp:94 ../src/restreewidget.cpp:102 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:75 @@ -89,9 +87,8 @@ #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:85 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:96 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:104 -#, fuzzy msgid "Dependency" -msgstr "à¸à¸§à¸²à¸¡à¸à¸¶à¹à¸à¹à¸à¹à¸à¸±à¸" +msgstr "à¸à¸§à¸²à¸¡à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸±à¸" #: ../src/restreewidget.cpp:97 ../src/restreewidget.cpp:105 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:78 @@ -101,137 +98,131 @@ #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:97 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:105 msgid "Kind" -msgstr "" +msgstr "à¸à¸£à¸°à¹à¸ à¸" #: ../src/restreewidget.cpp:99 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:80 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:80 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:99 msgid "Needs" -msgstr "" +msgstr "à¸à¹à¸à¸à¸à¸²à¸£" #: ../src/restreewidget.cpp:107 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:88 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/restreewidget.cpp:88 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/restreewidget.cpp:107 -#, fuzzy msgid "Needed by" -msgstr "à¹à¸à¸à¸à¹à¸à¸µà¹à¸à¸³à¹à¸à¹à¸à¸à¹à¸à¸à¹à¸à¹" +msgstr "à¸à¹à¸à¸à¸à¸²à¸£à¹à¸à¸¢" #: ../src/resgraphview.cpp:310 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:345 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:345 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:310 msgid "Error running the graph layouting tool.\n" -msgstr "" +msgstr "à¹à¸à¸´à¸à¸à¹à¸à¸à¸´à¸à¸à¸¥à¸²à¸à¸£à¸°à¸«à¸§à¹à¸²à¸à¸à¸£à¸°à¸¡à¸§à¸¥à¸à¸¥à¹à¸à¸£à¸·à¹à¸à¸à¸¡à¸·à¸à¸à¸±à¸à¹à¸¥à¸¢à¹à¹à¸à¸²à¸à¹à¸à¸£à¸²à¸\n" #: ../src/resgraphview.cpp:311 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:346 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:346 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:311 msgid "Please check that 'dot' is installed (package GraphViz)." -msgstr "" +msgstr "à¹à¸à¸£à¸à¸à¸£à¸§à¸à¸ªà¸à¸à¸§à¹à¸²à¹à¸à¸£à¹à¸à¸£à¸¡ 'dot' à¸à¸¹à¸à¸à¸´à¸à¸à¸±à¹à¸à¹à¸§à¹à¹à¸¥à¹à¸§à¸«à¸£à¸·à¸à¹à¸¡à¹ (à¹à¸à¸à¹à¸à¸ GraphViz)" #: ../src/resgraphview.cpp:405 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:435 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:435 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:405 msgid "Could not open tempfile %1 for writing." -msgstr "" +msgstr "à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸à¸´à¸à¹à¸à¹à¸¡à¸à¸±à¹à¸§à¸à¸£à¸²à¸§ %1 à¹à¸à¸·à¹à¸à¸à¸³à¸à¸²à¸£à¹à¸à¸µà¸¢à¸à¹à¸à¹" #: ../src/resgraphview.cpp:465 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:495 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:495 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:465 msgid "Could not start process \"%1\"." -msgstr "" +msgstr "à¹à¸¡à¹à¸ªà¸²à¸¡à¸²à¸£à¸à¹à¸£à¸´à¹à¸¡à¸à¸²à¸£à¸à¸³à¸à¸²à¸à¹à¸à¸£à¹à¸à¸ª \"%1\" à¹à¸à¹" #: ../src/resgraphview.cpp:511 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:538 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:538 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:511 msgid " Kind: %1 Version: %2 Source: %3</html>" -msgstr "" +msgstr " à¸à¸£à¸°à¹à¸ à¸: %1 à¸£à¸¸à¹à¸: %2 à¸à¹à¸à¸à¸à¸±à¸: %3</html>" #: ../src/resgraphview.cpp:517 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:544 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:544 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:517 -#, fuzzy msgid "Name%1%2%3" -msgstr "à¸à¸·à¹à¸à¹à¸à¸: %1" +msgstr "à¸à¸·à¹à¸%1%2%3" #: ../src/resgraphview.cpp:518 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:545 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:545 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:518 msgid "Kind%1%2%3" -msgstr "" +msgstr "à¸à¸£à¸°à¹à¸ à¸%1%2%3" #: ../src/resgraphview.cpp:522 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:549 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:549 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:522 -#, fuzzy msgid "Version%1%2%3" -msgstr "à¸£à¸¸à¹à¸à¸à¸µà¹à¸¡à¸µà¸à¸¢à¸¹à¹" +msgstr "à¸£à¸¸à¹à¸%1%2%3" #: ../src/resgraphview.cpp:523 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:550 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:550 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:523 msgid "Source%1%2%3" -msgstr "" +msgstr "à¸à¹à¸à¸à¸à¸±à¸%1%2%3" #: ../src/resgraphview.cpp:524 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:551 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:551 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:524 -#, fuzzy msgid "Description%1%2%3" -msgstr "à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸à¸´à¸à¸²à¸¢" +msgstr "à¸à¸³à¸à¸à¸´à¸à¸²à¸¢%1%2%3" #: ../src/resgraphview.cpp:825 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:854 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:854 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:825 msgid "Unselect item" -msgstr "" +msgstr "à¸¢à¸à¹à¸¥à¸´à¸à¹à¸¥à¸·à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£" #: ../src/resgraphview.cpp:827 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:856 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:856 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:827 -#, fuzzy msgid "Select item" -msgstr "à¹à¸¥à¸·à¸à¸à¹à¸à¹à¸¡" +msgstr "à¹à¸¥à¸·à¸à¸à¸£à¸²à¸¢à¸à¸²à¸£" #: ../src/resgraphview.cpp:830 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:859 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:859 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:830 -#, fuzzy msgid "Display details" -msgstr "à¸à¸±à¹à¸à¸à¹à¸²à¸à¸²à¸£à¹à¸ªà¸à¸à¸à¸¥" +msgstr "à¹à¸ªà¸à¸à¸£à¸²à¸¢à¸¥à¸°à¹à¸à¸µà¸¢à¸" #: ../src/resgraphview.cpp:833 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:862 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:862 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:833 msgid "Rotate counter-clockwise" -msgstr "" +msgstr "à¸«à¸¡à¸¸à¸à¸à¸§à¸à¹à¸à¹à¸¡à¸à¸²à¸¬à¸´à¸à¸²" #: ../src/resgraphview.cpp:834 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:863 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:863 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:834 msgid "Rotate clockwise" -msgstr "" +msgstr "à¸«à¸¡à¸¸à¸à¸à¸²à¸¡à¹à¸à¹à¸¡à¸à¸²à¸¬à¸´à¸à¸²" #: ../src/resgraphview.cpp:837 #: ../build/_CPack_Packages/Linux-Source/TZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:866 #: ../build/_CPack_Packages/Linux-Source/TGZ/libqdialogsolver1-0.1.1-Source/src/resgraphview.cpp:866 #: ../build/_CPack_Packages/Linux-Source/TBZ2/libqdialogsolver1-1.2.0/src/resgraphview.cpp:837 -#, fuzzy msgid "Save tree as png" -msgstr "à¸à¸±à¸à¹à¸à¹à¸à¸à¸²à¸£à¸à¸±à¹à¸à¸à¹à¸²à¸à¸à¸à¸£à¸°à¸à¸" +msgstr "à¸à¸±à¸à¹à¸à¹à¸à¸à¸±à¸à¸à¹à¸à¹à¸¡à¹à¹à¸à¹à¸à¸ à¸²à¸à¹à¸à¸ png" + -- 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] r11902 - /trunk/libzypp/po/cs.po
by schubi2＠svn.opensuse.org 08 Dec '08

08 Dec '08

Author: schubi2 Date: Mon Dec 8 09:40:59 2008 New Revision: 11902 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11902&view=rev Log: translation updated Modified: trunk/libzypp/po/cs.po Modified: trunk/libzypp/po/cs.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cs.po?rev=11902&r1=11… ============================================================================== --- trunk/libzypp/po/cs.po (original) +++ trunk/libzypp/po/cs.po Mon Dec 8 09:40:59 2008 @@ -17,13 +17,13 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-21 09:10+0100\n" -"PO-Revision-Date: 2008-11-17 11:15+0100\n" -"Last-Translator: VojtÄch Zeisek <vojta.sc(a)seznam.cz>\n" +"PO-Revision-Date: 2008-12-02 17:51+0100\n" +"Last-Translator: Josef Reidinger <jreidinger(a)suse.cz>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: KBabel 1.11.4\n" #: ../zypp/solver/detail/SATResolver.cc:993 @@ -158,7 +158,8 @@ msgstr "AlbÃ¡nie" #. language code: alb sqi sq -#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 +#: ../zypp/LanguageCode.cc:262 +#: ../zypp/LanguageCode.cc:264 msgid "Albanian" msgstr "AlbÃ¡nÅ¡tina" @@ -274,7 +275,8 @@ # AM #. language code: arm hye hy -#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286 +#: ../zypp/LanguageCode.cc:284 +#: ../zypp/LanguageCode.cc:286 msgid "Armenian" msgstr "ArmÃ©nÅ¡tina" @@ -440,7 +442,8 @@ msgstr "BaÅ¡kirÅ¡tina" #. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 +#: ../zypp/LanguageCode.cc:326 +#: ../zypp/LanguageCode.cc:328 msgid "Basque" msgstr "BaskiÄtina" @@ -633,7 +636,8 @@ msgstr "Burkina Faso" #. language code: bur mya my -#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 +#: ../zypp/LanguageCode.cc:372 +#: ../zypp/LanguageCode.cc:374 msgid "Burmese" msgstr "BarmÅ¡tina" @@ -867,7 +871,8 @@ msgstr "ÄÃna" #. language code: chi zho zh -#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 +#: ../zypp/LanguageCode.cc:400 +#: ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "ÄÃnÅ¡tina" @@ -946,7 +951,8 @@ # CG #. :CCK:166: #. :CAF:140: -#: ../zypp/CountryCode.cc:262 ../zypp/CountryCode.cc:264 +#: ../zypp/CountryCode.cc:262 +#: ../zypp/CountryCode.cc:264 msgid "Congo" msgstr "Kongo" @@ -1024,7 +1030,8 @@ msgstr "Chorvatsko" #. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 +#: ../zypp/LanguageCode.cc:1008 +#: ../zypp/LanguageCode.cc:1010 msgid "Croatian" msgstr "ChorvatskÃ©" @@ -1046,7 +1053,8 @@ msgstr "Kypr" #. language code: cze ces cs -#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 +#: ../zypp/LanguageCode.cc:446 +#: ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "ÄeskÃ©" @@ -1121,7 +1129,8 @@ msgstr "DominikÃ¡nskÃ¡ republika" #. TranslatorExplanation: curl is the name of a library, don't translate -#: ../zypp/media/MediaException.cc:92 ../zypp/media/MediaException.cc:100 +#: ../zypp/media/MediaException.cc:92 +#: ../zypp/media/MediaException.cc:100 #, c-format msgid "Download (Metalink curl) initialization failed for '%s'" msgstr "Inicializace staÅ¾enÃ (Metalink curl) selhala na '%s'" @@ -1143,7 +1152,8 @@ msgid "Download (curl) initialization failed for '%s'" msgstr "Inicializace staÅ¾enÃ (curl) '%s' selhala" -#: ../zypp/media/MediaException.cc:186 ../zypp/media/MediaException.cc:204 +#: ../zypp/media/MediaException.cc:186 +#: ../zypp/media/MediaException.cc:204 #, c-format msgid "" "Download (metalink curl) error for '%s':\n" @@ -1171,7 +1181,8 @@ msgstr "PochybnÃ½ typ '%s' pro %u kontrolnÃ souÄet bytÅ¯'%s'" #. language code: dut nld nl -#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 +#: ../zypp/LanguageCode.cc:478 +#: ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "NizozemskÃ©" @@ -1281,7 +1292,8 @@ msgstr "BÄhem stahovÃ¡nÃ nastavenÃ pro '%s' doÅ¡lo chybÄ:" #. TranslatorExplanation: curl is the name of a library, don't translate -#: ../zypp/media/MediaException.cc:195 ../zypp/media/MediaException.cc:213 +#: ../zypp/media/MediaException.cc:195 +#: ../zypp/media/MediaException.cc:213 #, c-format msgid "Error occurred while setting download (metalink curl) options for '%s':" msgstr "BÄhem zaklÃ¡dÃ¡nÃ stahovÃ¡nÃ (metalink curl) doÅ¡lo v chybÄ v nastavenÃ pro '%s':" @@ -1489,7 +1501,8 @@ msgstr "Francie" #. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 +#: ../zypp/LanguageCode.cc:522 +#: ../zypp/LanguageCode.cc:524 msgid "French" msgstr "FrancouzskÃ©" @@ -1597,12 +1610,14 @@ msgstr "Gruzie" #. language code: geo kat ka -#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546 +#: ../zypp/LanguageCode.cc:544 +#: ../zypp/LanguageCode.cc:546 msgid "Georgian" msgstr "GruzÃnÅ¡tina" #. language code: ger deu de -#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550 +#: ../zypp/LanguageCode.cc:548 +#: ../zypp/LanguageCode.cc:550 msgid "German" msgstr "NÄmeckÃ©" @@ -1673,7 +1688,8 @@ msgstr "StaroÅeÄtina (do 1453)" #. language code: gre ell el -#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580 +#: ../zypp/LanguageCode.cc:578 +#: ../zypp/LanguageCode.cc:580 msgid "Greek, Modern (1453-)" msgstr "NovoÅeÄtina (od 1453)" @@ -1752,7 +1768,8 @@ msgid "Haitian" msgstr "HaitÅ¡tina" -#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55 +#: ../zypp/target/hal/HalException.h:46 +#: ../zypp/target/hal/HalException.h:55 #: ../zypp/target/hal/HalException.h:64 msgid "Hal Exception" msgstr "VÃ½jimka HAL" @@ -1882,7 +1899,8 @@ msgstr "Island" #. language code: ice isl is -#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 +#: ../zypp/LanguageCode.cc:622 +#: ../zypp/LanguageCode.cc:624 msgid "Icelandic" msgstr "IslandÅ¡tina" @@ -1947,7 +1965,8 @@ msgid "Ingush" msgstr "Ingush" -#: ../zypp/target/TargetImpl.cc:692 ../zypp/target/TargetImpl.cc:963 +#: ../zypp/target/TargetImpl.cc:692 +#: ../zypp/target/TargetImpl.cc:963 msgid "Installation has been aborted as directed." msgstr "Instalace byla zruÅ¡ena podle pÅÃkazu." @@ -2518,7 +2537,8 @@ msgstr "Makedonie" #. language code: mac mkd mk -#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 +#: ../zypp/LanguageCode.cc:772 +#: ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "MakedonÅ¡tina" @@ -2562,7 +2582,8 @@ msgstr "Malawi" #. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 +#: ../zypp/LanguageCode.cc:800 +#: ../zypp/LanguageCode.cc:802 msgid "Malay" msgstr "MalajÅ¡tina" @@ -2637,7 +2658,8 @@ msgstr "ManÅ¡tina" #. language code: mao mri mi -#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 +#: ../zypp/LanguageCode.cc:790 +#: ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "MaorÅ¡tina" @@ -2858,7 +2880,8 @@ #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:387 +#: ../zypp/LanguageCode.cc:858 +#: ../zypp/CountryCode.cc:387 msgid "Nauru" msgstr "Nauru" @@ -2979,7 +3002,8 @@ #. Defined LanguageCode constants #. Defined CountryCode constants -#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215 +#: ../zypp/LanguageCode.cc:225 +#: ../zypp/CountryCode.cc:215 msgid "No Code" msgstr "Å½Ã¡dnÃ½ kÃ³d" @@ -3228,7 +3252,8 @@ msgstr "PÅÃstup k '%s' byl zamÃtnut." #. language code: per fas fa -#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 +#: ../zypp/LanguageCode.cc:938 +#: ../zypp/LanguageCode.cc:940 msgid "Persian" msgstr "PerÅ¡tina" @@ -3294,15 +3319,15 @@ #: ../zypp/VendorSupportOptions.cc:45 msgid "Problem determination, which means technical support designed to provide compatibility information, installation assistance, usage support, on-going maintenance and basic troubleshooting. Level 1 Support is not intended to correct product defect errors." -msgstr "" +msgstr "Detekce problÃ©mu, tedy technickÃ¡ podpora zajiÅ¡Å¥uje informaci o sluÄitelnosti produktÅ¯, asistenci pÅi instalaci a pouÅ¾ÃvÃ¡nÃ, nÃ¡slednou ÃºdrÅ¾bu a zÃ¡kladnÃ ÅeÅ¡enÃ problÃ©mÅ¯. PrvnÃ ÃºroveÅ podpory neslouÅ¾Ã k opravÃ¡m chyb v produktu." #: ../zypp/VendorSupportOptions.cc:48 msgid "Problem isolation, which means technical support designed to duplicate customer problems, isolate problem area and provide resolution for problems not resolved by Level 1 Support." -msgstr "" +msgstr "Izolace problÃ©mu, tedy podporu pÅi zreplikovÃ¡nÃ zÃ¡kaznÃkova problÃ©mu, specifikace problematickÃ©ho mÃsta a poskytuje ÅeÅ¡enÃ problÃ©mÅ¯, kterÃ© neÅeÅ¡Ã prvnÃ ÃºroveÅ." #: ../zypp/VendorSupportOptions.cc:51 msgid "Problem resolution, which means technical support designed to resolve complex problems by engaging engineering in resolution of product defects which have been identified by Level 2 Support." -msgstr "" +msgstr "VyÅeÅ¡enÃ problÃ©mu, tedy technickÃ¡ podpora pro vyÅeÅ¡enÃ sloÅ¾itÃ©ho problÃ©mu zajiÅ¡tÄnÃm prostÅedkÅ¯ pro vyÅeÅ¡enÃ problÃ©mu zjiÅ¡tÄnÃ©ho v podpoÅe druhÃ© ÃºrovnÄ." #. language code: pro #: ../zypp/LanguageCode.cc:956 @@ -3329,13 +3354,15 @@ msgid "Quechua" msgstr "KeÄua (InkovÃ©)" -#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229 +#: ../zypp/url/UrlBase.cc:782 +#: ../zypp/url/UrlBase.cc:1229 msgid "Query string parsing not supported for this URL" msgstr "Pro toto URL nenÃ podporovÃ¡na analÃ½za ÅetÄzce dotazu." #. TranslatorExplanation after semicolon is error message #. 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:893 +#: ../zypp/target/rpm/RpmDb.cc:2084 #: ../zypp/target/rpm/RpmDb.cc:2220 msgid "RPM failed: " msgstr "RPM selhalo: " @@ -3362,7 +3389,8 @@ msgid "Rarotongan" msgstr "RarotongÃ¡nÅ¡tina (tahitÅ¡tina VelikonoÄnÃho ostrova - Rapa-Nui)" -#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131 +#: ../zypp/url/UrlBase.cc:1117 +#: ../zypp/url/UrlBase.cc:1131 msgid "Relative path not allowed if authority exists" msgstr "RelativnÃ cesta nenÃ povolena, pokud existuje autorita" @@ -3393,7 +3421,8 @@ msgstr "Rumunsko" #. language code: rum ron ro -#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 +#: ../zypp/LanguageCode.cc:974 +#: ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "RumunÅ¡tina" @@ -3558,7 +3587,8 @@ msgstr "Srbsko a ÄernÃ¡ Hora" #. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 +#: ../zypp/LanguageCode.cc:1000 +#: ../zypp/LanguageCode.cc:1002 msgid "Serbian" msgstr "SrbÅ¡tina" @@ -3661,7 +3691,8 @@ msgstr "SlovanskÃ© (jinÃ©)" #. language code: slo slk sk -#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034 +#: ../zypp/LanguageCode.cc:1032 +#: ../zypp/LanguageCode.cc:1034 msgid "Slovak" msgstr "SlovenÅ¡tina" @@ -3968,7 +3999,8 @@ msgstr "Tento poÅ¾adavek poÅ¡kodÃ vÃ¡Å¡ systÃ©m!" #. language code: tib bod bo -#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 +#: ../zypp/LanguageCode.cc:1112 +#: ../zypp/LanguageCode.cc:1114 msgid "Tibetan" msgstr "TibetÅ¡tina" @@ -4017,7 +4049,8 @@ # TK #. language code: tkl #. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1122 +#: ../zypp/CountryCode.cc:435 msgid "Tokelau" msgstr "Tokelau" @@ -4116,7 +4149,8 @@ # TV #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:442 +#: ../zypp/LanguageCode.cc:1152 +#: ../zypp/CountryCode.cc:442 msgid "Tuvalu" msgstr "Tuvalu" @@ -4178,7 +4212,8 @@ msgid "Unable to initalize HAL context -- hald not running?" msgstr "Nelze inicializovat kontext HAL - je spuÅ¡tÄna sluÅ¾ba hald?" -#: ../zypp/Url.cc:322 ../zypp/Url.cc:336 +#: ../zypp/Url.cc:322 +#: ../zypp/Url.cc:336 msgid "Unable to parse Url components" msgstr "Nelze analyzovat souÄÃ¡sti URL." @@ -4392,7 +4427,8 @@ msgstr "Washo" #. language code: wel cym cy -#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194 +#: ../zypp/LanguageCode.cc:1192 +#: ../zypp/LanguageCode.cc:1194 msgid "Welsh" msgstr "WelÅ¡tina" @@ -4667,3 +4703,4 @@ #: ../zypp/VendorSupportOptions.cc:17 msgid "unsupported" msgstr "nepodporovÃ¡no" + -- 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] r11901 - in /trunk/libzypp: libzypp.spec.cmake package/libzypp.changes
by coolo＠svn.opensuse.org 07 Dec '08

07 Dec '08

Author: coolo Date: Sun Dec 7 20:21:57 2008 New Revision: 11901 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11901&view=rev Log: not my fault Modified: trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=1… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Sun Dec 7 20:21:57 2008 @@ -150,7 +150,8 @@ OLDLOCKSFILE=/etc/zypp/locks.old is_old(){ - test -f ${LOCKSFILE} || return 0 + # if no such file, exit with false (1 in bash) + test -f ${LOCKSFILE} || return 1 TEMP_FILE=`mktemp` cat ${LOCKSFILE} | sed '/^\#.*/ d;/.*:.*/d;/^[^[a-zA-Z\*?.0-9]*$/d' > ${TEMP_FILE} if [ -s ${TEMP_FILE} ] Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Sun Dec 7 20:21:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Dec 7 20:21:09 CET 2008 - coolo(a)suse.de + +- note for coolo: do not trust bash advisory from TPM colleagues + +------------------------------------------------------------------- Fri Dec 5 14:22:11 CET 2008 - ma(a)suse.de - Fix solvers inappropriate selection as byUSER (bnc 455965) -- 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] r11900 - /trunk/sat-solver/tools/repo2solv.sh
by mlschroe＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlschroe Date: Fri Dec 5 18:59:05 2008 New Revision: 11900 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11900&view=rev Log: - assume repotype=plaindir if -R option is given Modified: trunk/sat-solver/tools/repo2solv.sh Modified: trunk/sat-solver/tools/repo2solv.sh URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo2solv.sh?re… ============================================================================== --- trunk/sat-solver/tools/repo2solv.sh (original) +++ trunk/sat-solver/tools/repo2solv.sh Fri Dec 5 18:59:05 2008 @@ -25,6 +25,7 @@ parser_options=${PARSER_OPTIONS:-} findopt="-prune" +repotype= while true ; do if test "$1" = "-o" ; then @@ -34,6 +35,7 @@ elif test "$1" = "-R" ; then # recursive findopt= + repotype=plaindir shift else break @@ -42,7 +44,19 @@ dir="$1" cd "$dir" || exit 1 -if test -d repodata ; then + +if test -z "$repotype" ; then + # autodetect repository type + if test -d repodata ; then + repotype=rpmmd + elif test_susetags ; then + repotype=susetags + else + repotype=plaindir + fi +fi + +if test "$repotype" = rpmmd ; then cd repodata || exit 2 primfile="/nonexist" @@ -232,7 +246,7 @@ mergesolv $m_repomdfile $m_suseinfofile $m_primfile $m_prodfile $m_patternfile $m_patchfile $m_updateinfofile $m_deltainfofile rm -f $repomdfile $suseinfofile $primfile $patternfile $prodfile $patchfile $updateinfofile $deltainfofile -elif test_susetags; then +elif test "$repotype" = susetags ; then olddir=`pwd` DESCR=`grep DESCRDIR content | cut -d ' ' -f 2` if test -z $DESCR; then @@ -300,6 +314,9 @@ ) | susetags2solv -c "${olddir}/content" $parser_options || exit 4 cd "$olddir" -else +elif test "$repotype" = plaindir ; then find * -name .\* -prune -o $findopt -name \*.delta.rpm -o -name \*.patch.rpm -o -name \*.rpm -a -type f -print0 | rpms2solv -0 -m - +else + echo "unknown repository type '$repotype'" >&2 + exit 1 fi -- 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] r11899 - in /trunk/sat-solver/src: solver.c solver.h
by mlschroe＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlschroe Date: Fri Dec 5 18:36:57 2008 New Revision: 11899 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11899&view=rev Log: - fix disabling of weak job rules [bnc#450844] Modified: trunk/sat-solver/src/solver.c trunk/sat-solver/src/solver.h Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1189… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri Dec 5 18:36:57 2008 @@ -27,6 +27,8 @@ #define RULES_BLOCK 63 +static void disableupdaterules(Solver *solv, Queue *job, int jobidx); + /******************************************************************** * * dependency check helpers @@ -774,7 +776,14 @@ POOL_DEBUG(SAT_DEBUG_UNSOLVABLE, "assertion conflict, but I am weak, disabling "); solver_printrule(solv, SAT_DEBUG_UNSOLVABLE, r); - disablerule(solv, r); + + if (ri >= solv->jobrules && ri < solv->jobrules_end) + v = -(solv->ruletojob.elements[ri - solv->jobrules] + 1); + else + v = ri; + disableproblem(solv, v); + if (v < 0) + disableupdaterules(solv, solv->job, -(v + 1)); } POOL_DEBUG(SAT_DEBUG_SCHUBI, "----- makeruledecisions end; size decisionq: %d -----\n",solv->decisionq.count); @@ -967,6 +976,8 @@ s = pool->solvables + what; if (s->repo == installed) { + if (MAPTST(&solv->noupdate, what - installed->start)) + break; r = solv->rules + solv->updaterules + (what - installed->start); if (r->d >= 0) break; @@ -2125,13 +2136,19 @@ if (lastweak) { + Id v; /* disable last weak rule */ solv->problems.count = oldproblemcount; solv->learnt_pool.count = oldlearntpoolcount; - r = solv->rules + lastweak; + if (lastweak >= solv->jobrules && lastweak < solv->jobrules_end) + v = -(solv->ruletojob.elements[lastweak - solv->jobrules] + 1); + else + v = lastweak; POOL_DEBUG(SAT_DEBUG_UNSOLVABLE, "disabling "); - solver_printruleclass(solv, SAT_DEBUG_UNSOLVABLE, r); - disablerule(solv, r); + solver_printruleclass(solv, SAT_DEBUG_UNSOLVABLE, solv->rules + lastweak); + disableproblem(solv, v); + if (v < 0) + disableupdaterules(solv, solv->job, -(v + 1)); reset_solver(solv); return 1; } @@ -4198,9 +4215,12 @@ if (!pool->whatprovides) pool_createwhatprovides(pool); - /* create obsolete index if needed */ + /* create obsolete index */ create_obsolete_index(solv); + /* remember job */ + solv->job = job; + /* * create basic rule set of all involved packages * use addedmap bitmap to make sure we don't create rules twice @@ -4799,6 +4819,7 @@ queue_free(&redoq); POOL_DEBUG(SAT_DEBUG_STATS, "final solver statistics: %d learned rules, %d unsolvable\n", solv->stats_learned, solv->stats_unsolvable); POOL_DEBUG(SAT_DEBUG_STATS, "solver_solve took %d ms\n", sat_timems(solve_start)); + solv->job = 0; } /***********************************************************************/ Modified: trunk/sat-solver/src/solver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.h?rev=1189… ============================================================================== --- trunk/sat-solver/src/solver.h (original) +++ trunk/sat-solver/src/solver.h Fri Dec 5 18:36:57 2008 @@ -204,10 +204,10 @@ /* some strange queue that doesn't belong here */ - Queue covenantq; /* Covenants honored by this solver (generic locks) */ + Queue *job; /* tmp store for job we're working on */ } Solver; /* -- 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] r11898 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes zypp/target/TargetImpl.cc
by mlandres＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlandres Date: Fri Dec 5 17:43:12 2008 New Revision: 11898 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11898&view=rev Log: - Prune soft locks to prevent installation but not update of already installed packages. Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Fri Dec 5 17:43:12 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "27") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Fri Dec 5 17:43:12 2008 @@ -1,8 +1,16 @@ ------------------------------------------------------------------- +Fri Dec 5 17:38:30 CET 2008 - ma(a)suse.de + +- Prune soft locks to prevent installation but not update of + already installed packages. (bnc #425054, et al.) +- revision 11898 +- version 4.27.5 + +------------------------------------------------------------------- Mon Oct 27 14:51:59 CET 2008 - ma(a)suse.de - Rewrote repo2solv.sh call to use execv, getting rid of any need - for argument quoting. (#439058) + for argument quoting. (bnc #439058) - revision 11505 - version 4.27.4 Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc Fri Dec 5 17:43:12 2008 @@ -450,9 +450,14 @@ } } { - const SoftLocksFile::Data & softLocks( _softLocksFile.data() ); + SoftLocksFile::Data softLocks( _softLocksFile.data() ); if ( ! softLocks.empty() ) { + // Don't soft lock any installed item. + for_( it, system.solvablesBegin(), system.solvablesEnd() ) + { + softLocks.erase( it->ident() ); + } ResPool::instance().setAutoSoftLocks( softLocks ); } } -- 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] r11897 - /trunk/zypper/src/bash-completion.sh
by jkupec＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: jkupec Date: Fri Dec 5 15:30:16 2008 New Revision: 11897 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11897&view=rev Log: - fixed bash completion script to default to path completion if no command or option matches Modified: trunk/zypper/src/bash-completion.sh Modified: trunk/zypper/src/bash-completion.sh URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/bash-completion.sh?re… ============================================================================== --- trunk/zypper/src/bash-completion.sh (original) +++ trunk/zypper/src/bash-completion.sh Fri Dec 5 15:30:16 2008 @@ -1,12 +1,8 @@ -# zypper completion v 0.2 aplha 1 :-) (This is not feature complete version!) -# A hackweek gift from Marek Stopka <marekstopka(a)gmail.com> +# zypper completion v 0.2 aplha 2 :-) +# A hackweek gift from Marek Stopka <mstopka(a)opensuse.org> # # some TODOs: # - complete package names for install/remove/update -# - make sure the default file completion always works for: -# * install (to install plain rpms) -# * addrepo --repo (to specify .repo file) -# * maybe other cases _zypper() { ZYPPER_CMDLIST=() @@ -112,4 +108,4 @@ esac } -complete -F _zypper -d -X -o default zypper +complete -F _zypper -o default zypper -- 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] r11896 - in /trunk/zypper/po: cs.po pl.po zh_CN.po zh_TW.po
by jkupec＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: jkupec Date: Fri Dec 5 15:15:58 2008 New Revision: 11896 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11896&view=rev Log: - translations Added: trunk/zypper/po/zh_CN.po Modified: trunk/zypper/po/cs.po trunk/zypper/po/pl.po trunk/zypper/po/zh_TW.po Modified: trunk/zypper/po/cs.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/cs.po?rev=11896&r1=118… ============================================================================== --- trunk/zypper/po/cs.po (original) +++ trunk/zypper/po/cs.po Fri Dec 5 15:15:58 2008 @@ -16,14 +16,14 @@ "Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-11-17 20:22+0100\n" -"Last-Translator: VojtÄch Zeisek <vojta.sc(a)seznam.cz>\n" +"PO-Revision-Date: 2008-12-02 17:59+0100\n" +"Last-Translator: Josef Reidinger <jreidinger(a)suse.cz>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../src/callbacks/keyring.h:48 #, c-format @@ -168,9 +168,12 @@ msgid "No digest for file %s." msgstr "Å½Ã¡dnÃ½ pÅehled pro soubor %s." -#: ../src/callbacks/keyring.h:256 ../src/callbacks/keyring.h:266 -#: ../src/callbacks/keyring.h:288 ../src/callbacks/rpm.h:61 -#: ../src/solve-commit.cc:1033 ../src/solve-commit.cc:1057 +#: ../src/callbacks/keyring.h:256 +#: ../src/callbacks/keyring.h:266 +#: ../src/callbacks/keyring.h:288 +#: ../src/callbacks/rpm.h:61 +#: ../src/solve-commit.cc:1033 +#: ../src/solve-commit.cc:1057 msgid "Continue?" msgstr "PokraÄovat?" @@ -206,7 +209,8 @@ msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation." msgstr "ProsÃm vloÅ¾te mÃ©dium [%s] # %d a zadejte 'y' pro pokraÄovÃ¡nÃ, nebo operaci zruÅ¡te zadÃ¡nÃm 'n'." -#: ../src/callbacks/media.h:228 ../src/callbacks/media.h:235 +#: ../src/callbacks/media.h:228 +#: ../src/callbacks/media.h:235 msgid "User Name" msgstr "JmÃ©no uÅ¾ivatele" @@ -245,8 +249,10 @@ msgid "Running: %s (%s, %s)" msgstr "SpouÅ¡tÃ se: %s (%s, %s)" -#: ../src/callbacks/rpm.h:139 ../src/callbacks/rpm.h:148 -#: ../src/callbacks/rpm.h:156 ../src/callbacks/rpm.h:163 +#: ../src/callbacks/rpm.h:139 +#: ../src/callbacks/rpm.h:148 +#: ../src/callbacks/rpm.h:156 +#: ../src/callbacks/rpm.h:163 msgid "Reading installed packages" msgstr "NaÄÃtajÃ se nainstalovanÃ© balÃky" @@ -363,15 +369,20 @@ msgid "Conflict" msgstr "Konflikt" -#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 msgid "Catalog: " msgstr "Katalog: " -#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 msgid "Repository: " msgstr "RepozitÃ¡Å: " -#: ../src/info.cc:157 ../src/info.cc:279 +#: ../src/info.cc:157 +#: ../src/info.cc:279 msgid "Installed: " msgstr "NainstalovÃ¡no: " @@ -379,22 +390,39 @@ #. autorefresh? #. enabled? #. autorefresh? -#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 -#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 -#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 -#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 msgid "Yes" msgstr "Ano" -#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 -#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 -#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 -#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 msgid "No" msgstr "Ne" #. ! \todo fix this - arch? -#: ../src/info.cc:160 ../src/info.cc:209 +#: ../src/info.cc:160 +#: ../src/info.cc:209 msgid "Status: " msgstr "Stav: " @@ -447,41 +475,64 @@ msgid "Requires:" msgstr "VyÅ¾aduje:" -#: ../src/info.cc:246 ../src/search.cc:323 +#: ../src/info.cc:246 +#: ../src/search.cc:323 msgid "Recommended" msgstr "DoporuÄeno" -#: ../src/info.cc:248 ../src/search.cc:325 +#: ../src/info.cc:248 +#: ../src/search.cc:325 msgid "Suggested" msgstr "NavrÅ¾eno" #. translators: S for 'installed Status' #. translators: S for installed Status #. TranslatorExplanation S stands for Status -#: ../src/info.cc:289 ../src/search.cc:38 ../src/search.cc:54 -#: ../src/search.cc:214 ../src/search.cc:385 ../src/search.cc:441 -#: ../src/search.cc:533 ../src/update.cc:397 +#: ../src/info.cc:289 +#: ../src/search.cc:38 +#: ../src/search.cc:54 +#: ../src/search.cc:214 +#: ../src/search.cc:385 +#: ../src/search.cc:441 +#: ../src/search.cc:533 +#: ../src/update.cc:397 msgid "S" msgstr "S" #. translators: name (general header) -#: ../src/info.cc:289 ../src/locks.cc:39 ../src/repos.cc:655 -#: ../src/repos.cc:704 ../src/repos.cc:2081 ../src/search.cc:44 -#: ../src/search.cc:56 ../src/search.cc:215 ../src/search.cc:264 -#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:534 -#: ../src/update.cc:152 ../src/update.cc:405 ../src/Zypper.cc:3973 +#: ../src/info.cc:289 +#: ../src/locks.cc:39 +#: ../src/repos.cc:655 +#: ../src/repos.cc:704 +#: ../src/repos.cc:2081 +#: ../src/search.cc:44 +#: ../src/search.cc:56 +#: ../src/search.cc:215 +#: ../src/search.cc:264 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:534 +#: ../src/update.cc:152 +#: ../src/update.cc:405 +#: ../src/Zypper.cc:3973 msgid "Name" msgstr "JmÃ©no" #. translators: type (general header) #. translators: product type (addon/base) (rug calls it Category) -#: ../src/info.cc:289 ../src/locks.cc:43 ../src/repos.cc:655 -#: ../src/repos.cc:713 ../src/repos.cc:2089 ../src/search.cc:58 -#: ../src/search.cc:218 ../src/search.cc:541 +#: ../src/info.cc:289 +#: ../src/locks.cc:43 +#: ../src/repos.cc:655 +#: ../src/repos.cc:713 +#: ../src/repos.cc:2089 +#: ../src/search.cc:58 +#: ../src/search.cc:218 +#: ../src/search.cc:541 msgid "Type" msgstr "Typ" -#: ../src/info.cc:289 ../src/search.cc:388 +#: ../src/info.cc:289 +#: ../src/search.cc:388 msgid "Dependency" msgstr "ZÃ¡vislost" @@ -495,7 +546,9 @@ #. translators: patch category (recommended, security) #. translators: product category (the rug term) -#: ../src/info.cc:351 ../src/search.cc:267 ../src/search.cc:538 +#: ../src/info.cc:351 +#: ../src/search.cc:267 +#: ../src/search.cc:538 #: ../src/update.cc:152 msgid "Category" msgstr "Kategorie" @@ -504,7 +557,8 @@ msgid "Flavor" msgstr "VÅ¯nÄ" -#: ../src/info.cc:353 ../src/utils/misc.cc:111 +#: ../src/info.cc:353 +#: ../src/utils/misc.cc:111 msgid "Installed" msgstr "NainstalovÃ¡no" @@ -513,7 +567,8 @@ msgstr "ZkrÃ¡cenÃ½ nÃ¡zev" #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:68 ../src/install.cc:182 +#: ../src/install.cc:68 +#: ../src/install.cc:182 #, c-format msgid "'%s' not found" msgstr "'%s' nelze nalÃ©zt" @@ -541,13 +596,15 @@ msgid "Failed to add '%s' to the list of packages to be removed." msgstr "NepodaÅilo se pÅidat '%s' do seznamu balÃÄkÅ¯ k instalaci." -#: ../src/install.cc:373 ../src/install.cc:659 +#: ../src/install.cc:373 +#: ../src/install.cc:659 #, c-format msgid "'%s' is already installed." msgstr "zÃ¡vislost '%s' je jiÅ¾ nainstalovÃ¡na" #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:413 ../src/install.cc:673 +#: ../src/install.cc:413 +#: ../src/install.cc:673 #, c-format msgid "'%s' is not installed." msgstr "zÃ¡vislost '%s' nenÃ nainstalovÃ¡na" @@ -604,18 +661,25 @@ #. translators: locks table value #. importance -#: ../src/locks.cc:22 ../src/locks.cc:63 ../src/locks.cc:76 +#: ../src/locks.cc:22 +#: ../src/locks.cc:63 +#: ../src/locks.cc:76 msgid "(any)" msgstr "(jakÃ½koli)" #. translators: locks table value -#: ../src/locks.cc:24 ../src/locks.cc:60 ../src/search.cc:311 +#: ../src/locks.cc:24 +#: ../src/locks.cc:60 +#: ../src/search.cc:311 msgid "(multiple)" msgstr "(vÃce)" #. translators: catalog (rug's word for repository) (header) -#: ../src/locks.cc:41 ../src/search.cc:40 ../src/search.cc:263 -#: ../src/update.cc:151 ../src/update.cc:399 +#: ../src/locks.cc:41 +#: ../src/search.cc:40 +#: ../src/search.cc:263 +#: ../src/update.cc:151 +#: ../src/update.cc:399 msgid "Catalog" msgstr "Katalog" @@ -624,8 +688,12 @@ msgstr "DÅ¯leÅ¾itost" #. translators: package's repository (header) -#: ../src/locks.cc:43 ../src/search.cc:64 ../src/search.cc:388 -#: ../src/search.cc:446 ../src/update.cc:151 ../src/update.cc:399 +#: ../src/locks.cc:43 +#: ../src/search.cc:64 +#: ../src/search.cc:388 +#: ../src/search.cc:446 +#: ../src/update.cc:151 +#: ../src/update.cc:399 msgid "Repository" msgstr "RepozitÃ¡Å" @@ -736,7 +804,8 @@ msgid "Installed packages with EULAs: %d" msgstr "NainstalovanÃ© balÃÄky s EULAmi: %d" -#: ../src/misc.cc:372 ../src/misc.cc:397 +#: ../src/misc.cc:372 +#: ../src/misc.cc:397 #, c-format msgid "Source package '%s' not found." msgstr "ZdrojovÃ½ balÃk '%s' nebyl nalezen." @@ -760,16 +829,20 @@ msgid "Warning: " msgstr "UpozornÄnÃ: " -#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 msgid "error" msgstr "chyba" -#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 msgid "done" msgstr "dokonÄeno" -#: ../src/output/OutNormal.cc:165 ../src/output/OutNormal.cc:167 -#: ../src/output/OutNormal.cc:191 ../src/output/OutNormal.cc:217 +#: ../src/output/OutNormal.cc:165 +#: ../src/output/OutNormal.cc:167 +#: ../src/output/OutNormal.cc:191 +#: ../src/output/OutNormal.cc:217 msgid "Retrieving:" msgstr "ZÃskÃ¡vÃ¡m:" @@ -815,8 +888,11 @@ msgid "Problem retrieving files from '%s'." msgstr "ProblÃ©m pÅi stahovÃ¡nÃ souborÅ¯ z '%s'." -#: ../src/repos.cc:160 ../src/repos.cc:2861 ../src/solve-commit.cc:1109 -#: ../src/solve-commit.cc:1137 ../src/solve-commit.cc:1169 +#: ../src/repos.cc:160 +#: ../src/repos.cc:2861 +#: ../src/solve-commit.cc:1109 +#: ../src/solve-commit.cc:1137 +#: ../src/solve-commit.cc:1169 msgid "Please see the above error message for a hint." msgstr "NÃ¡povÄdu naleznete v uvedenÃ© chybovÃ© zprÃ¡vÄ." @@ -882,12 +958,14 @@ msgid "Use '%s' to get the list of defined repositories." msgstr "PouÅ¾ijte '%s' pro zÃskÃ¡nÃ seznamu definovanÃ½ch repozitÃ¡ÅÅ¯." -#: ../src/repos.cc:490 ../src/repos.cc:497 +#: ../src/repos.cc:490 +#: ../src/repos.cc:497 #, c-format msgid "Ignoring repository '%s' because of '%s' option." msgstr "Ignoruji repozitÃ¡Å '%s' z dÅ¯vodu volby '%s'." -#: ../src/repos.cc:527 ../src/repos.cc:563 +#: ../src/repos.cc:527 +#: ../src/repos.cc:563 #, c-format msgid "Disabling repository '%s' because of the above error." msgstr "RepozitÃ¡Å '%s' bude kvÅ¯li uvedenÃ© chybÄ vypnut." @@ -915,12 +993,15 @@ msgid "Target initialization failed:" msgstr "Inicializace cÃle selhala:" -#: ../src/repos.cc:635 ../src/Zypper.cc:3343 +#: ../src/repos.cc:635 +#: ../src/Zypper.cc:3343 msgid "Running 'zypper refresh' as root might resolve the problem." msgstr "SpuÅ¡tÄnÃ 'zypper refresh' jako root by mohlo vyÅeÅ¡it problÃ©m." #. translators: patch status (installed, uninstalled, needed) -#: ../src/repos.cc:655 ../src/search.cc:269 ../src/update.cc:152 +#: ../src/repos.cc:655 +#: ../src/search.cc:269 +#: ../src/update.cc:152 msgid "Status" msgstr "Stav" @@ -939,26 +1020,33 @@ # printers.ycp.noloc:1270 # printers.ycp.noloc:1270 # printers.ycp.noloc:1270 -#: ../src/repos.cc:703 ../src/repos.cc:2080 ../src/Zypper.cc:3973 +#: ../src/repos.cc:703 +#: ../src/repos.cc:2080 +#: ../src/Zypper.cc:3973 msgid "Alias" msgstr "Alias" #. TranslatorExplanation used as e.g. "Enabled: Yes" -#: ../src/repos.cc:705 ../src/repos.cc:1336 ../src/repos.cc:2082 +#: ../src/repos.cc:705 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:2082 msgid "Enabled" msgstr "povoleno" #. translators: 'zypper repos' column - whether autorefresh is enabled for the repository -#: ../src/repos.cc:707 ../src/repos.cc:2084 +#: ../src/repos.cc:707 +#: ../src/repos.cc:2084 msgid "Refresh" msgstr "Obnovit" #. translators: repository priority (in zypper repos -p or -d) -#: ../src/repos.cc:711 ../src/repos.cc:2088 +#: ../src/repos.cc:711 +#: ../src/repos.cc:2088 msgid "Priority" msgstr "Priorita" -#: ../src/repos.cc:715 ../src/repos.cc:2091 +#: ../src/repos.cc:715 +#: ../src/repos.cc:2091 msgid "URI" msgstr "Adresa URI" @@ -970,25 +1058,31 @@ msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories." msgstr "Nejsou definovÃ¡ny Å¾Ã¡dnÃ© repozitÃ¡Åe. PÅidejte jeden nebo vÃce repozitÃ¡ÅÅ¯ pÅÃkazem 'zypper addrepo'." -#: ../src/repos.cc:837 ../src/repos.cc:909 ../src/repos.cc:1079 +#: ../src/repos.cc:837 +#: ../src/repos.cc:909 +#: ../src/repos.cc:1079 msgid "Error reading repositories:" msgstr "Chyba pÅi ÄtenÃ repozitÃ¡ÅÅ¯:" -#: ../src/repos.cc:865 ../src/repos.cc:2213 +#: ../src/repos.cc:865 +#: ../src/repos.cc:2213 #, c-format msgid "Can't open %s for writing." msgstr "Nelze otevÅÃt soubor '%s' pro zÃ¡pis." -#: ../src/repos.cc:867 ../src/repos.cc:2215 +#: ../src/repos.cc:867 +#: ../src/repos.cc:2215 msgid "Maybe you do not have write permissions?" msgstr "PravdÄpodobnÄ nemÃ¡te oprÃ¡vnÄnÃ k zÃ¡pisu." -#: ../src/repos.cc:874 ../src/repos.cc:2222 +#: ../src/repos.cc:874 +#: ../src/repos.cc:2222 #, c-format msgid "Repositories have been successfully exported to %s." msgstr "RepozitÃ¡Åe byly ÃºspÄÅ¡nÄ vyexportovÃ¡ny do %s." -#: ../src/repos.cc:927 ../src/repos.cc:1097 +#: ../src/repos.cc:927 +#: ../src/repos.cc:1097 msgid "Specified repositories: " msgstr "ZadanÃ© repozitÃ¡Åe: " @@ -1080,7 +1174,8 @@ msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh." msgstr "Toto mÃ©dium je vÃ½mÄnnÃ© a pouze pro ÄtenÃ (CD/DVD), vypÃnÃ¡ se automatickÃ© obnovenÃ." -#: ../src/repos.cc:1282 ../src/repos.cc:1543 +#: ../src/repos.cc:1282 +#: ../src/repos.cc:1543 #, c-format msgid "Repository named '%s' already exists. Please use another alias." msgstr "RepozitÃ¡Å s nÃ¡zvem '%s' jiÅ¾ existuje. PouÅ¾ijte jinÃ½ alias." @@ -1089,7 +1184,8 @@ msgid "Could not determine the type of the repository. Please check if the defined URIs (see below) point to a valid repository:" msgstr "Typ repozitÃ¡Åe se nepodaÅilo urÄit. Zkontrolujte, zda definovanÃ© adresy URI (uvedenÃ© nÃÅ¾e) ukazujÃ na platnÃ½ repozitÃ¡Å:" -#: ../src/repos.cc:1300 ../src/Zypper.cc:2420 +#: ../src/repos.cc:1300 +#: ../src/Zypper.cc:2420 msgid "Can't find a valid repository at given location:" msgstr "Na zadanÃ©m umÃstÄnÃ nelze najÃt platnÃ½ repozitÃ¡Å:" @@ -1175,7 +1271,8 @@ msgid "Repository '%s' renamed to '%s'." msgstr "RepozitÃ¡Å '%s' byl pÅejmenovÃ¡n na '%s'." -#: ../src/repos.cc:1549 ../src/repos.cc:1769 +#: ../src/repos.cc:1549 +#: ../src/repos.cc:1769 msgid "Error while modifying the repository:" msgstr "Chyba pÅi zmÄnÄ repozitÃ¡Åe:" @@ -1426,12 +1523,14 @@ msgid "Repository '%s' not cached. Caching..." msgstr "RepozitÃ¡Å '%s' nenÃ uloÅ¾en ve vyrovnÃ¡vacÃ pamÄti. UklÃ¡dÃ¡ se..." -#: ../src/repos.cc:2806 ../src/repos.cc:2834 +#: ../src/repos.cc:2806 +#: ../src/repos.cc:2834 #, c-format msgid "Problem loading data from '%s'" msgstr "ProblÃ©m pÅi naÄÃtÃ¡nÃ dat z '%s'" -#: ../src/repos.cc:2807 ../src/repos.cc:2840 +#: ../src/repos.cc:2807 +#: ../src/repos.cc:2840 #, c-format msgid "Resolvables from '%s' not loaded because of error." msgstr "ZÃ¡vislosti z '%s' nebyly naÄteny, protoÅ¾e doÅ¡lo k chybÄ." @@ -1467,25 +1566,35 @@ "K tomuto ÃºÄelu pouÅ¾ijte program rug nebo yast2." #. translators: Bundle is a term used in rug. See rug for how to translate it. -#: ../src/search.cc:42 ../src/search.cc:444 ../src/update.cc:402 +#: ../src/search.cc:42 +#: ../src/search.cc:444 +#: ../src/update.cc:402 msgid "Bundle" msgstr "Skupina" #. translators: package version (header) #. best_effort does not know version or arch yet -#: ../src/search.cc:46 ../src/search.cc:60 ../src/search.cc:265 -#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:535 -#: ../src/update.cc:152 ../src/update.cc:407 +#: ../src/search.cc:46 +#: ../src/search.cc:60 +#: ../src/search.cc:265 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:535 +#: ../src/update.cc:152 +#: ../src/update.cc:407 msgid "Version" msgstr "Verze" #. translators: package architecture (header) -#: ../src/search.cc:48 ../src/search.cc:62 ../src/search.cc:447 +#: ../src/search.cc:48 +#: ../src/search.cc:62 +#: ../src/search.cc:447 #: ../src/update.cc:407 msgid "Arch" msgstr "Arch" -#: ../src/search.cc:178 ../src/search.cc:192 +#: ../src/search.cc:178 +#: ../src/search.cc:192 msgid "System Packages" msgstr "SystÃ©movÃ© balÃÄky" @@ -1502,7 +1611,8 @@ msgid "No patterns found." msgstr "Nebyly nalezeny Å¾Ã¡dnÃ© profily." -#: ../src/search.cc:497 ../src/Zypper.cc:3301 +#: ../src/search.cc:497 +#: ../src/Zypper.cc:3301 msgid "No packages found." msgstr "Nebyly nalezeny Å¾Ã¡dnÃ© balÃÄky." @@ -1617,7 +1727,7 @@ msgid_plural "The following products are going to be upgraded:" msgstr[0] "NÃ¡sledujÃcÃ produkt bude aktualizovÃ¡n:" msgstr[1] "NÃ¡sledujÃcÃ produkty budou aktualizovÃ¡ny:" -msgstr[2] "" +msgstr[2] "NÃ¡sledujÃcÃ produkty budou aktualizovÃ¡ny:" #: ../src/solve-commit.cc:391 msgid "The following package is going to be downgraded:" @@ -1911,7 +2021,8 @@ msgid "(dry run)" msgstr "(pouze test)" -#: ../src/solve-commit.cc:1108 ../src/solve-commit.cc:1147 +#: ../src/solve-commit.cc:1108 +#: ../src/solve-commit.cc:1147 msgid "Problem retrieving the package file from the repository:" msgstr "ProblÃ©m pÅi stahovÃ¡nÃ souboru balÃÄku z repozitÃ¡Åe:" @@ -1968,7 +2079,8 @@ msgstr[1] "%d bezpeÄnostnÃ opravy" msgstr[2] "%d bezpeÄnostnÃch oprav" -#: ../src/update.cc:174 ../src/utils/misc.cc:113 +#: ../src/update.cc:174 +#: ../src/utils/misc.cc:113 msgid "Needed" msgstr "Je potÅeba" @@ -1980,7 +2092,8 @@ "VAROVÃNÃ: Toto jsou jen aktualizace, kterÃ© majÃ vliv na samotnÃ½ aktualizÃ¡tor.\n" "K dispozici jsou takÃ© dalÅ¡Ã aktualizace.\n" -#: ../src/update.cc:198 ../src/update.cc:448 +#: ../src/update.cc:198 +#: ../src/update.cc:448 msgid "No updates found." msgstr "Nebyly nalezeny Å¾Ã¡dnÃ© aktualizace." @@ -2060,8 +2173,10 @@ msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "Instrukce jsou k dispozici na adrese http://en.opensuse.org/Zypper#Troubleshooting." -#: ../src/utils/messages.cc:40 ../src/utils/messages.cc:50 -#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3677 +#: ../src/utils/messages.cc:40 +#: ../src/utils/messages.cc:50 +#: ../src/utils/messages.cc:68 +#: ../src/Zypper.cc:3677 msgid "Usage" msgstr "PouÅ¾itÃ" @@ -2069,7 +2184,9 @@ msgid "Too many arguments." msgstr "PÅÃliÅ¡ mnoho argumentÅ¯" -#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2706 ../src/Zypper.cc:3674 +#: ../src/utils/messages.cc:48 +#: ../src/Zypper.cc:2706 +#: ../src/Zypper.cc:3674 msgid "Required argument missing." msgstr "ChybÃ vyÅ¾adovanÃ½ argument." @@ -2213,12 +2330,14 @@ msgid "Abort, retry, ignore?" msgstr "(A) PÅeruÅ¡it, (R) opakovat, (I) ignorovat?" -#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:197 +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:197 #: ../src/utils/prompt.cc:253 msgid "yes" msgstr "ano" -#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:198 +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:198 #: ../src/utils/prompt.cc:253 msgid "no" msgstr "ne" @@ -2865,7 +2984,8 @@ #. translators: this is just a rug compatiblity command #. translators: this is just a rug-compatiblity command -#: ../src/Zypper.cc:1250 ../src/Zypper.cc:2127 +#: ../src/Zypper.cc:1250 +#: ../src/Zypper.cc:2127 msgid "" "list-resolvables (lr)\n" "\n" @@ -3620,7 +3740,8 @@ "Tento program mÃ¡ loutkovou implementaci, kterÃ¡ vÅ¾dy vracÃ 0.\n" "Je dodÃ¡vÃ¡n kvÅ¯li kompatibilitÄ s rugem.\n" -#: ../src/Zypper.cc:2212 ../src/Zypper.cc:3959 +#: ../src/Zypper.cc:2212 +#: ../src/Zypper.cc:3959 msgid "Unexpected program flow." msgstr "BÄh programu probÄhl neoÄekÃ¡vanÃ½m zpÅ¯sobem." @@ -3643,7 +3764,8 @@ msgid "Root privileges are required for refreshing services." msgstr "K aktualizaci sluÅ¾eb je tÅeba mÃt oprÃ¡vnÄnÃ uÅ¾ivatele root." -#: ../src/Zypper.cc:2352 ../src/Zypper.cc:2699 +#: ../src/Zypper.cc:2352 +#: ../src/Zypper.cc:2699 msgid "Root privileges are required for modifying system services." msgstr "Ke zmÄnÄ systÃ©movÃ½ch sluÅ¾eb je tÅeba mÃt oprÃ¡vnÄnÃ uÅ¾ivatele root." @@ -3670,7 +3792,8 @@ #. followed by ms command help text which will explain it #. translators: aggregate option is e.g. "--all". This message will be #. followed by mr command help text which will explain it -#: ../src/Zypper.cc:2484 ../src/Zypper.cc:2852 +#: ../src/Zypper.cc:2484 +#: ../src/Zypper.cc:2852 msgid "Alias or an aggregate option is required." msgstr "Je poÅ¾adovÃ¡n alias nebo hromadnÃ¡ moÅ¾nost." @@ -3679,12 +3802,15 @@ msgid "Service '%s' not found." msgstr "SluÅ¾ba '%s' nebyla nalezena" -#: ../src/Zypper.cc:2554 ../src/Zypper.cc:2698 ../src/Zypper.cc:2784 +#: ../src/Zypper.cc:2554 +#: ../src/Zypper.cc:2698 +#: ../src/Zypper.cc:2784 #: ../src/Zypper.cc:2840 msgid "Root privileges are required for modifying system repositories." msgstr "Ke zmÄnÄ systÃ©movÃ½ch repozitÃ¡ÅÅ¯ je tÅeba mÃt oprÃ¡vnÄnÃ uÅ¾ivatele root." -#: ../src/Zypper.cc:2603 ../src/Zypper.cc:2960 +#: ../src/Zypper.cc:2603 +#: ../src/Zypper.cc:2960 msgid "Too few arguments." msgstr "PÅÃliÅ¡ mÃ¡lo argumentÅ¯" @@ -3788,7 +3914,8 @@ msgid "No valid arguments specified." msgstr "Nebyly zadÃ¡ny Å¾Ã¡dnÃ© platnÃ© argumenty." -#: ../src/Zypper.cc:3100 ../src/Zypper.cc:3178 +#: ../src/Zypper.cc:3100 +#: ../src/Zypper.cc:3178 msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed." msgstr "VarovÃ¡nÃ: NenÃ definovÃ¡n Å¾Ã¡dnÃ½ repozitÃ¡Å. Pracuje se pouze s nainstalovanÃ½mi zÃ¡vislostmi. Nebude moÅ¾nÃ© provÃ¡dÄt instalaci." @@ -3796,8 +3923,11 @@ msgid "Source package name is a required argument." msgstr "NÃ¡zev zdrojovÃ©ho balÃÄku je vyÅ¾adovanÃ½ argument." -#: ../src/Zypper.cc:3235 ../src/Zypper.cc:3495 ../src/Zypper.cc:3579 -#: ../src/Zypper.cc:3702 ../src/Zypper.cc:3770 +#: ../src/Zypper.cc:3235 +#: ../src/Zypper.cc:3495 +#: ../src/Zypper.cc:3579 +#: ../src/Zypper.cc:3702 +#: ../src/Zypper.cc:3770 #, c-format msgid "Unknown package type '%s'." msgstr "NeznÃ¡mÃ½ typ balÃÄkÅ¯: '%s'" @@ -3811,7 +3941,8 @@ msgstr "NÃ¡povÄd naleznete v pÅedchozÃ zprÃ¡vÄ." #. translators: Running as 'rug', cannot use 'best-effort' option. -#: ../src/Zypper.cc:3514 ../src/Zypper.cc:3597 +#: ../src/Zypper.cc:3514 +#: ../src/Zypper.cc:3597 #, c-format msgid "Running as '%s', cannot use '%s' option." msgstr "SpuÅ¡tÄn jako '%s', nelze pouÅ¾Ãt volbu '%s'." @@ -3824,7 +3955,8 @@ msgid "Root privileges are required for performing a distribution upgrade." msgstr "K aktualizaci distribuce jsou potÅeba prÃ¡va uÅ¾ivatele \"root\"." -#: ../src/Zypper.cc:3732 ../src/Zypper.cc:3793 +#: ../src/Zypper.cc:3732 +#: ../src/Zypper.cc:3793 msgid "Root privileges are required for adding of package locks." msgstr "K pÅidÃ¡vÃ¡nÃ zÃ¡mkÅ¯ balÃÄkÅ¯ je tÅeba mÃt oprÃ¡vnÄnÃ uÅ¾ivatele root." Modified: trunk/zypper/po/pl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pl.po?rev=11896&r1=118… ============================================================================== --- trunk/zypper/po/pl.po (original) +++ trunk/zypper/po/pl.po Fri Dec 5 15:15:58 2008 @@ -167,12 +167,9 @@ msgid "No digest for file %s." msgstr "Brak podsumowania dla pliku %s." -#: ../src/callbacks/keyring.h:256 -#: ../src/callbacks/keyring.h:266 -#: ../src/callbacks/keyring.h:288 -#: ../src/callbacks/rpm.h:61 -#: ../src/solve-commit.cc:1033 -#: ../src/solve-commit.cc:1057 +#: ../src/callbacks/keyring.h:256 ../src/callbacks/keyring.h:266 +#: ../src/callbacks/keyring.h:288 ../src/callbacks/rpm.h:61 +#: ../src/solve-commit.cc:1033 ../src/solve-commit.cc:1057 msgid "Continue?" msgstr "Czy kontynuowaÄ?" @@ -208,8 +205,7 @@ msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation." msgstr "ProszÄ wÅoÅ¼yÄ noÅnik [%s] #%d i nacisnÄÄ 't' aby kontynuowaÄ lub 'n' aby przerwaÄ operacjÄ." -#: ../src/callbacks/media.h:228 -#: ../src/callbacks/media.h:235 +#: ../src/callbacks/media.h:228 ../src/callbacks/media.h:235 msgid "User Name" msgstr "Nazwa uÅ¼ytkownika" @@ -248,10 +244,8 @@ msgid "Running: %s (%s, %s)" msgstr "Uruchomiono: %s (%s, %s)" -#: ../src/callbacks/rpm.h:139 -#: ../src/callbacks/rpm.h:148 -#: ../src/callbacks/rpm.h:156 -#: ../src/callbacks/rpm.h:163 +#: ../src/callbacks/rpm.h:139 ../src/callbacks/rpm.h:148 +#: ../src/callbacks/rpm.h:156 ../src/callbacks/rpm.h:163 msgid "Reading installed packages" msgstr "Odczytywanie zainstalowanych pakietÃ³w" @@ -368,20 +362,15 @@ msgid "Conflict" msgstr "Konflikt" -#: ../src/info.cc:152 -#: ../src/info.cc:274 -#: ../src/info.cc:345 +#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 msgid "Catalog: " msgstr "Katalog: " -#: ../src/info.cc:152 -#: ../src/info.cc:274 -#: ../src/info.cc:345 +#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 msgid "Repository: " msgstr "Repozytorium:" -#: ../src/info.cc:157 -#: ../src/info.cc:279 +#: ../src/info.cc:157 ../src/info.cc:279 msgid "Installed: " msgstr "Zainstalowano: " @@ -389,39 +378,22 @@ #. autorefresh? #. enabled? #. autorefresh? -#: ../src/info.cc:157 -#: ../src/info.cc:214 -#: ../src/info.cc:220 -#: ../src/info.cc:222 -#: ../src/info.cc:279 -#: ../src/repos.cc:735 -#: ../src/repos.cc:737 -#: ../src/repos.cc:1336 -#: ../src/repos.cc:1338 -#: ../src/repos.cc:2014 -#: ../src/repos.cc:2016 -#: ../src/solve-commit.cc:855 +#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 +#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 +#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 +#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 msgid "Yes" msgstr "Tak" -#: ../src/info.cc:157 -#: ../src/info.cc:214 -#: ../src/info.cc:220 -#: ../src/info.cc:222 -#: ../src/info.cc:279 -#: ../src/repos.cc:735 -#: ../src/repos.cc:737 -#: ../src/repos.cc:1336 -#: ../src/repos.cc:1338 -#: ../src/repos.cc:2014 -#: ../src/repos.cc:2016 -#: ../src/solve-commit.cc:855 +#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 +#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 +#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 +#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 msgid "No" msgstr "Nie" #. ! \todo fix this - arch? -#: ../src/info.cc:160 -#: ../src/info.cc:209 +#: ../src/info.cc:160 ../src/info.cc:209 msgid "Status: " msgstr "Status: " @@ -474,64 +446,41 @@ msgid "Requires:" msgstr "Wymaga:" -#: ../src/info.cc:246 -#: ../src/search.cc:323 +#: ../src/info.cc:246 ../src/search.cc:323 msgid "Recommended" msgstr "Zalecany" -#: ../src/info.cc:248 -#: ../src/search.cc:325 +#: ../src/info.cc:248 ../src/search.cc:325 msgid "Suggested" msgstr "Sugerowany" #. translators: S for 'installed Status' #. translators: S for installed Status #. TranslatorExplanation S stands for Status -#: ../src/info.cc:289 -#: ../src/search.cc:38 -#: ../src/search.cc:54 -#: ../src/search.cc:214 -#: ../src/search.cc:385 -#: ../src/search.cc:441 -#: ../src/search.cc:533 -#: ../src/update.cc:397 +#: ../src/info.cc:289 ../src/search.cc:38 ../src/search.cc:54 +#: ../src/search.cc:214 ../src/search.cc:385 ../src/search.cc:441 +#: ../src/search.cc:533 ../src/update.cc:397 msgid "S" msgstr "S" #. translators: name (general header) -#: ../src/info.cc:289 -#: ../src/locks.cc:39 -#: ../src/repos.cc:655 -#: ../src/repos.cc:704 -#: ../src/repos.cc:2081 -#: ../src/search.cc:44 -#: ../src/search.cc:56 -#: ../src/search.cc:215 -#: ../src/search.cc:264 -#: ../src/search.cc:386 -#: ../src/search.cc:447 -#: ../src/search.cc:534 -#: ../src/update.cc:152 -#: ../src/update.cc:405 -#: ../src/Zypper.cc:3973 +#: ../src/info.cc:289 ../src/locks.cc:39 ../src/repos.cc:655 +#: ../src/repos.cc:704 ../src/repos.cc:2081 ../src/search.cc:44 +#: ../src/search.cc:56 ../src/search.cc:215 ../src/search.cc:264 +#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:534 +#: ../src/update.cc:152 ../src/update.cc:405 ../src/Zypper.cc:3973 msgid "Name" msgstr "Nazwa" #. translators: type (general header) #. translators: product type (addon/base) (rug calls it Category) -#: ../src/info.cc:289 -#: ../src/locks.cc:43 -#: ../src/repos.cc:655 -#: ../src/repos.cc:713 -#: ../src/repos.cc:2089 -#: ../src/search.cc:58 -#: ../src/search.cc:218 -#: ../src/search.cc:541 +#: ../src/info.cc:289 ../src/locks.cc:43 ../src/repos.cc:655 +#: ../src/repos.cc:713 ../src/repos.cc:2089 ../src/search.cc:58 +#: ../src/search.cc:218 ../src/search.cc:541 msgid "Type" msgstr "Typ" -#: ../src/info.cc:289 -#: ../src/search.cc:388 +#: ../src/info.cc:289 ../src/search.cc:388 msgid "Dependency" msgstr "ZaleÅ¼noÅÄ" @@ -545,9 +494,7 @@ #. translators: patch category (recommended, security) #. translators: product category (the rug term) -#: ../src/info.cc:351 -#: ../src/search.cc:267 -#: ../src/search.cc:538 +#: ../src/info.cc:351 ../src/search.cc:267 ../src/search.cc:538 #: ../src/update.cc:152 msgid "Category" msgstr "Kategoria" @@ -556,8 +503,7 @@ msgid "Flavor" msgstr "Rodzaj" -#: ../src/info.cc:353 -#: ../src/utils/misc.cc:111 +#: ../src/info.cc:353 ../src/utils/misc.cc:111 msgid "Installed" msgstr "Zainstalowano" @@ -566,8 +512,7 @@ msgstr "SkrÃ³cona nazwa" #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:68 -#: ../src/install.cc:182 +#: ../src/install.cc:68 ../src/install.cc:182 #, c-format msgid "'%s' not found" msgstr "Nie znaleziono '%s'" @@ -595,15 +540,13 @@ msgid "Failed to add '%s' to the list of packages to be removed." msgstr "Dodanie '%s' do listy pakietÃ³w przeznaczonych do usuniÄcia nie powiodÅo siÄ." -#: ../src/install.cc:373 -#: ../src/install.cc:659 +#: ../src/install.cc:373 ../src/install.cc:659 #, c-format msgid "'%s' is already installed." msgstr "'%s' jest juÅ¼ zainstalowany." #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:413 -#: ../src/install.cc:673 +#: ../src/install.cc:413 ../src/install.cc:673 #, c-format msgid "'%s' is not installed." msgstr "'%s' nie jest zainstalowany." @@ -660,25 +603,18 @@ #. translators: locks table value #. importance -#: ../src/locks.cc:22 -#: ../src/locks.cc:63 -#: ../src/locks.cc:76 +#: ../src/locks.cc:22 ../src/locks.cc:63 ../src/locks.cc:76 msgid "(any)" msgstr "(ktÃ³rykolwiek)" #. translators: locks table value -#: ../src/locks.cc:24 -#: ../src/locks.cc:60 -#: ../src/search.cc:311 +#: ../src/locks.cc:24 ../src/locks.cc:60 ../src/search.cc:311 msgid "(multiple)" msgstr "(wielokrotny)" #. translators: catalog (rug's word for repository) (header) -#: ../src/locks.cc:41 -#: ../src/search.cc:40 -#: ../src/search.cc:263 -#: ../src/update.cc:151 -#: ../src/update.cc:399 +#: ../src/locks.cc:41 ../src/search.cc:40 ../src/search.cc:263 +#: ../src/update.cc:151 ../src/update.cc:399 msgid "Catalog" msgstr "Katalog" @@ -687,12 +623,8 @@ msgstr "WaÅ¼ne" #. translators: package's repository (header) -#: ../src/locks.cc:43 -#: ../src/search.cc:64 -#: ../src/search.cc:388 -#: ../src/search.cc:446 -#: ../src/update.cc:151 -#: ../src/update.cc:399 +#: ../src/locks.cc:43 ../src/search.cc:64 ../src/search.cc:388 +#: ../src/search.cc:446 ../src/update.cc:151 ../src/update.cc:399 msgid "Repository" msgstr "Repozytorium" @@ -803,8 +735,7 @@ msgid "Installed packages with EULAs: %d" msgstr "Zainstalowane pakiety z EULA: %d" -#: ../src/misc.cc:372 -#: ../src/misc.cc:397 +#: ../src/misc.cc:372 ../src/misc.cc:397 #, c-format msgid "Source package '%s' not found." msgstr "Pakiet ÅºrÃ³dÅowy \"%s\" nie zostaÅ znaleziony." @@ -829,20 +760,16 @@ msgid "Warning: " msgstr "Uwaga: " -#: ../src/output/OutNormal.cc:151 -#: ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 msgid "error" msgstr "bÅÄd" -#: ../src/output/OutNormal.cc:151 -#: ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 msgid "done" msgstr "zrobione" -#: ../src/output/OutNormal.cc:165 -#: ../src/output/OutNormal.cc:167 -#: ../src/output/OutNormal.cc:191 -#: ../src/output/OutNormal.cc:217 +#: ../src/output/OutNormal.cc:165 ../src/output/OutNormal.cc:167 +#: ../src/output/OutNormal.cc:191 ../src/output/OutNormal.cc:217 msgid "Retrieving:" msgstr "Wyszukiwanie informacji:" @@ -888,11 +815,8 @@ msgid "Problem retrieving files from '%s'." msgstr "Problem podczas pobierania plikÃ³w z '%s'." -#: ../src/repos.cc:160 -#: ../src/repos.cc:2861 -#: ../src/solve-commit.cc:1109 -#: ../src/solve-commit.cc:1137 -#: ../src/solve-commit.cc:1169 +#: ../src/repos.cc:160 ../src/repos.cc:2861 ../src/solve-commit.cc:1109 +#: ../src/solve-commit.cc:1137 ../src/solve-commit.cc:1169 msgid "Please see the above error message for a hint." msgstr "WiÄcej informacji dostÄpne w powyÅ¼szym komunikacie bÅÄdÃ³w." @@ -958,14 +882,12 @@ msgid "Use '%s' to get the list of defined repositories." msgstr "NaleÅ¼y uÅ¼yÄ '%s' by otrzymaÄ listÄ zdefiniowanych repozytoriÃ³w." -#: ../src/repos.cc:490 -#: ../src/repos.cc:497 +#: ../src/repos.cc:490 ../src/repos.cc:497 #, c-format msgid "Ignoring repository '%s' because of '%s' option." msgstr "Zignorowano repozytorium '%s' z powodu opcji '%s'." -#: ../src/repos.cc:527 -#: ../src/repos.cc:563 +#: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format msgid "Disabling repository '%s' because of the above error." msgstr "WyÅÄczono repozytorium \"%s\" z powodu powyÅ¼szego bÅÄdu." @@ -993,15 +915,12 @@ msgid "Target initialization failed:" msgstr "Inicjalizacja nie powiodÅa siÄ:" -#: ../src/repos.cc:635 -#: ../src/Zypper.cc:3343 +#: ../src/repos.cc:635 ../src/Zypper.cc:3343 msgid "Running 'zypper refresh' as root might resolve the problem." msgstr "Wydanie polecenia 'zypper refresh' z prawami roota moÅ¼e rozwiÄzaÄ problem." #. translators: patch status (installed, uninstalled, needed) -#: ../src/repos.cc:655 -#: ../src/search.cc:269 -#: ../src/update.cc:152 +#: ../src/repos.cc:655 ../src/search.cc:269 ../src/update.cc:152 msgid "Status" msgstr "Status" @@ -1016,33 +935,26 @@ msgid "Disabled" msgstr "WyÅÄczono" -#: ../src/repos.cc:703 -#: ../src/repos.cc:2080 -#: ../src/Zypper.cc:3973 +#: ../src/repos.cc:703 ../src/repos.cc:2080 ../src/Zypper.cc:3973 msgid "Alias" msgstr "Alias" #. TranslatorExplanation used as e.g. "Enabled: Yes" -#: ../src/repos.cc:705 -#: ../src/repos.cc:1336 -#: ../src/repos.cc:2082 +#: ../src/repos.cc:705 ../src/repos.cc:1336 ../src/repos.cc:2082 msgid "Enabled" msgstr "WÅÄczono" #. translators: 'zypper repos' column - whether autorefresh is enabled for the repository -#: ../src/repos.cc:707 -#: ../src/repos.cc:2084 +#: ../src/repos.cc:707 ../src/repos.cc:2084 msgid "Refresh" msgstr "OdÅwieÅ¼" #. translators: repository priority (in zypper repos -p or -d) -#: ../src/repos.cc:711 -#: ../src/repos.cc:2088 +#: ../src/repos.cc:711 ../src/repos.cc:2088 msgid "Priority" msgstr "Priorytet" -#: ../src/repos.cc:715 -#: ../src/repos.cc:2091 +#: ../src/repos.cc:715 ../src/repos.cc:2091 msgid "URI" msgstr "Adres URL" @@ -1054,31 +966,25 @@ msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories." msgstr "Nie zdefiniowano Å¼adnych repozytoriÃ³w. Aby je dodaÄ, naleÅ¼y skorzystaÄ z polecenia \"zypper addrepo\"." -#: ../src/repos.cc:837 -#: ../src/repos.cc:909 -#: ../src/repos.cc:1079 +#: ../src/repos.cc:837 ../src/repos.cc:909 ../src/repos.cc:1079 msgid "Error reading repositories:" msgstr "BÅÄd odczytu repozytoriÃ³w:" -#: ../src/repos.cc:865 -#: ../src/repos.cc:2213 +#: ../src/repos.cc:865 ../src/repos.cc:2213 #, c-format msgid "Can't open %s for writing." msgstr "Nie moÅ¼na otworzyÄ pliku %s do zapisu." -#: ../src/repos.cc:867 -#: ../src/repos.cc:2215 +#: ../src/repos.cc:867 ../src/repos.cc:2215 msgid "Maybe you do not have write permissions?" msgstr "ProszÄ sprawdziÄ prawa dostÄpu." -#: ../src/repos.cc:874 -#: ../src/repos.cc:2222 +#: ../src/repos.cc:874 ../src/repos.cc:2222 #, c-format msgid "Repositories have been successfully exported to %s." msgstr "Repozytoria zostaÅy wyeksportowane do \"%s\"." -#: ../src/repos.cc:927 -#: ../src/repos.cc:1097 +#: ../src/repos.cc:927 ../src/repos.cc:1097 msgid "Specified repositories: " msgstr "Wybrane repozytoria:" @@ -1170,8 +1076,7 @@ msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh." msgstr "To jest wymienny noÅnik tylko do odczytu (CD/DVD). AutoodÅwieÅ¼anie wyÅÄczone." -#: ../src/repos.cc:1282 -#: ../src/repos.cc:1543 +#: ../src/repos.cc:1282 ../src/repos.cc:1543 #, c-format msgid "Repository named '%s' already exists. Please use another alias." msgstr "Repozytorium '%s' juÅ¼ istnieje. ProszÄ uÅ¼yÄ innego aliasu." @@ -1180,8 +1085,7 @@ msgid "Could not determine the type of the repository. Please check if the defined URIs (see below) point to a valid repository:" msgstr "Nie moÅ¼na okreÅliÄ typu repozytorium. ProszÄ sprawdziÄ czy zdefiniowane adresy (poniÅ¼ej) URL wskazujÄ na poprawne repozytoria:" -#: ../src/repos.cc:1300 -#: ../src/Zypper.cc:2420 +#: ../src/repos.cc:1300 ../src/Zypper.cc:2420 msgid "Can't find a valid repository at given location:" msgstr "Nie moÅ¼na znaleÅºÄ poprawnego repozytorium w podanym miejscu:" @@ -1267,8 +1171,7 @@ msgid "Repository '%s' renamed to '%s'." msgstr "Zmieniono nazwÄ repozytorium %s na %s." -#: ../src/repos.cc:1549 -#: ../src/repos.cc:1769 +#: ../src/repos.cc:1549 ../src/repos.cc:1769 msgid "Error while modifying the repository:" msgstr "WystÄpiÅ bÅÄd podczas modyfikacji repozytorium." @@ -1519,14 +1422,12 @@ msgid "Repository '%s' not cached. Caching..." msgstr "Brak pamiÄci podrÄcznej dla repozytorium \"%s\". Tworzenie..." -#: ../src/repos.cc:2806 -#: ../src/repos.cc:2834 +#: ../src/repos.cc:2806 ../src/repos.cc:2834 #, c-format msgid "Problem loading data from '%s'" msgstr "Problem przy wczytywaniu danych z \"%s\"" -#: ../src/repos.cc:2807 -#: ../src/repos.cc:2840 +#: ../src/repos.cc:2807 ../src/repos.cc:2840 #, c-format msgid "Resolvables from '%s' not loaded because of error." msgstr "Pakiety z \"%s\" nie zostaÅy wczytane z powodu bÅÄdu." @@ -1562,35 +1463,25 @@ "NaleÅ¼y uÅ¼yÄ rug lub yast2." #. translators: Bundle is a term used in rug. See rug for how to translate it. -#: ../src/search.cc:42 -#: ../src/search.cc:444 -#: ../src/update.cc:402 +#: ../src/search.cc:42 ../src/search.cc:444 ../src/update.cc:402 msgid "Bundle" msgstr "Zestaw" #. translators: package version (header) #. best_effort does not know version or arch yet -#: ../src/search.cc:46 -#: ../src/search.cc:60 -#: ../src/search.cc:265 -#: ../src/search.cc:386 -#: ../src/search.cc:447 -#: ../src/search.cc:535 -#: ../src/update.cc:152 -#: ../src/update.cc:407 +#: ../src/search.cc:46 ../src/search.cc:60 ../src/search.cc:265 +#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:535 +#: ../src/update.cc:152 ../src/update.cc:407 msgid "Version" msgstr "Wersja" #. translators: package architecture (header) -#: ../src/search.cc:48 -#: ../src/search.cc:62 -#: ../src/search.cc:447 +#: ../src/search.cc:48 ../src/search.cc:62 ../src/search.cc:447 #: ../src/update.cc:407 msgid "Arch" msgstr "Arch" -#: ../src/search.cc:178 -#: ../src/search.cc:192 +#: ../src/search.cc:178 ../src/search.cc:192 msgid "System Packages" msgstr "Pakiety systemowe" @@ -1607,8 +1498,7 @@ msgid "No patterns found." msgstr "Nie znaleziono wzorcÃ³w." -#: ../src/search.cc:497 -#: ../src/Zypper.cc:3301 +#: ../src/search.cc:497 ../src/Zypper.cc:3301 msgid "No packages found." msgstr "Nie znaleziono pakietÃ³w." @@ -2017,8 +1907,7 @@ msgid "(dry run)" msgstr "(sprawdzanie)" -#: ../src/solve-commit.cc:1108 -#: ../src/solve-commit.cc:1147 +#: ../src/solve-commit.cc:1108 ../src/solve-commit.cc:1147 msgid "Problem retrieving the package file from the repository:" msgstr "Problem podczas pobierania pliku pakietu z repozytorium:" @@ -2076,8 +1965,7 @@ msgstr[1] "%d poprawki bezpieczeÅstwa" msgstr[2] "%d poprawki bezpieczeÅstwa" -#: ../src/update.cc:174 -#: ../src/utils/misc.cc:113 +#: ../src/update.cc:174 ../src/utils/misc.cc:113 msgid "Needed" msgstr "Potrzebna" @@ -2089,8 +1977,7 @@ "UWAGA: Te uaktualnienia dotyczÄ samego programu uaktualniajÄcego.\n" "DostÄpne sÄ takÅ¼e inne uaktualnienia.\n" -#: ../src/update.cc:198 -#: ../src/update.cc:448 +#: ../src/update.cc:198 ../src/update.cc:448 msgid "No updates found." msgstr "Nie znaleziono aktualizacji." @@ -2170,10 +2057,8 @@ msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "W celu uzyskania dodatkowych informacji, zajrzyj na http://en.opensuse.org/Zypper#Troubleshooting ." -#: ../src/utils/messages.cc:40 -#: ../src/utils/messages.cc:50 -#: ../src/utils/messages.cc:68 -#: ../src/Zypper.cc:3677 +#: ../src/utils/messages.cc:40 ../src/utils/messages.cc:50 +#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3677 msgid "Usage" msgstr "UÅ¼ycie" @@ -2181,9 +2066,7 @@ msgid "Too many arguments." msgstr "Zbyt wiele argumentÃ³w." -#: ../src/utils/messages.cc:48 -#: ../src/Zypper.cc:2706 -#: ../src/Zypper.cc:3674 +#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2706 ../src/Zypper.cc:3674 msgid "Required argument missing." msgstr "Brak wymaganego parametru." @@ -2327,14 +2210,12 @@ msgid "Abort, retry, ignore?" msgstr "Przerwij, sprÃ³buj ponownie, ignoruj?" -#: ../src/utils/prompt.cc:169 -#: ../src/utils/prompt.cc:197 +#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:197 #: ../src/utils/prompt.cc:253 msgid "yes" msgstr "tak" -#: ../src/utils/prompt.cc:169 -#: ../src/utils/prompt.cc:198 +#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:198 #: ../src/utils/prompt.cc:253 msgid "no" msgstr "nie" @@ -2983,8 +2864,7 @@ #. translators: this is just a rug compatiblity command #. translators: this is just a rug-compatiblity command -#: ../src/Zypper.cc:1250 -#: ../src/Zypper.cc:2127 +#: ../src/Zypper.cc:1250 ../src/Zypper.cc:2127 msgid "" "list-resolvables (lr)\n" "\n" @@ -3742,8 +3622,7 @@ "Komenda zwracajÄca 0.\n" "Istnieje dla kompatybilnoÅci z rug.\n" -#: ../src/Zypper.cc:2212 -#: ../src/Zypper.cc:3959 +#: ../src/Zypper.cc:2212 ../src/Zypper.cc:3959 msgid "Unexpected program flow." msgstr "Nieoczekiwany przebieg programu" @@ -3766,8 +3645,7 @@ msgid "Root privileges are required for refreshing services." msgstr "Do odÅwieÅ¼ania repozytoriÃ³w konieczne sÄ uprawnienia administratora." -#: ../src/Zypper.cc:2352 -#: ../src/Zypper.cc:2699 +#: ../src/Zypper.cc:2352 ../src/Zypper.cc:2699 msgid "Root privileges are required for modifying system services." msgstr "Do modyfikacji repozytoriÃ³w konieczne sÄ uprawnienia administratora." @@ -3793,8 +3671,7 @@ #. followed by ms command help text which will explain it #. translators: aggregate option is e.g. "--all". This message will be #. followed by mr command help text which will explain it -#: ../src/Zypper.cc:2484 -#: ../src/Zypper.cc:2852 +#: ../src/Zypper.cc:2484 ../src/Zypper.cc:2852 msgid "Alias or an aggregate option is required." msgstr "Wymagany jest alias lub opcja agregatu." @@ -3803,15 +3680,12 @@ msgid "Service '%s' not found." msgstr "Nie znaleziono serwera %s." -#: ../src/Zypper.cc:2554 -#: ../src/Zypper.cc:2698 -#: ../src/Zypper.cc:2784 +#: ../src/Zypper.cc:2554 ../src/Zypper.cc:2698 ../src/Zypper.cc:2784 #: ../src/Zypper.cc:2840 msgid "Root privileges are required for modifying system repositories." msgstr "Do modyfikacji repozytoriÃ³w konieczne sÄ uprawnienia administratora." -#: ../src/Zypper.cc:2603 -#: ../src/Zypper.cc:2960 +#: ../src/Zypper.cc:2603 ../src/Zypper.cc:2960 msgid "Too few arguments." msgstr "Zbyt maÅo parametrÃ³w." @@ -3915,8 +3789,7 @@ msgid "No valid arguments specified." msgstr "Nie podano prawidÅowego pliku Å¼Ädania." -#: ../src/Zypper.cc:3100 -#: ../src/Zypper.cc:3178 +#: ../src/Zypper.cc:3100 ../src/Zypper.cc:3178 msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed." msgstr "OstrzeÅ¼enie: Brak repozytorÃ³w. Operacja obejmie tylko zainstalowane pakiety. Nic nowego nie moÅ¼e zostaÄ zainstalowane." @@ -3924,11 +3797,8 @@ msgid "Source package name is a required argument." msgstr "Nazwa pakietu jest wymaganym parametrem." -#: ../src/Zypper.cc:3235 -#: ../src/Zypper.cc:3495 -#: ../src/Zypper.cc:3579 -#: ../src/Zypper.cc:3702 -#: ../src/Zypper.cc:3770 +#: ../src/Zypper.cc:3235 ../src/Zypper.cc:3495 ../src/Zypper.cc:3579 +#: ../src/Zypper.cc:3702 ../src/Zypper.cc:3770 #, c-format msgid "Unknown package type '%s'." msgstr "Nieznany typ pakietu '%s'." @@ -3942,8 +3812,7 @@ msgstr "WskazÃ³wki moÅ¼na znaleÅºÄ w powyÅ¼szym komunikacie." #. translators: Running as 'rug', cannot use 'best-effort' option. -#: ../src/Zypper.cc:3514 -#: ../src/Zypper.cc:3597 +#: ../src/Zypper.cc:3514 ../src/Zypper.cc:3597 #, c-format msgid "Running as '%s', cannot use '%s' option." msgstr "Uruchomione jako '%s', nie moÅ¼na wykonaÄ opcji '%s'." @@ -3956,8 +3825,7 @@ msgid "Root privileges are required for performing a distribution upgrade." msgstr "Do przeprowadzenia aktualizacji dystrybucji wymagane sÄ uprawnienia administratora." -#: ../src/Zypper.cc:3732 -#: ../src/Zypper.cc:3793 +#: ../src/Zypper.cc:3732 ../src/Zypper.cc:3793 msgid "Root privileges are required for adding of package locks." msgstr "Do zablokowania pakietÃ³w wymagane sÄ uprawnienia administratora." @@ -3994,6 +3862,6 @@ #~ msgid "Do you want to trust the key?" #~ msgstr "DodaÄ klucz do listy zaufanych?" + #~ msgid "n/t/i" #~ msgstr "n/z/zi" - Added: trunk/zypper/po/zh_CN.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/zh_CN.po?rev=11896&vie… ============================================================================== --- trunk/zypper/po/zh_CN.po (added) +++ trunk/zypper/po/zh_CN.po Fri Dec 5 15:15:58 2008 @@ -0,0 +1,3815 @@ +# @TITLE@ +# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg +# Thruth Wang <lihaow(a)opera.com>, 2007, 2008. +# Eric Shan <ericalways(a)gmail.com>, 2008. +# +# This file is distributed under the same license as @PACKAGE@ package. FIRST +# +msgid "" +msgstr "" +"Project-Id-Version: @PACKAGE@\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-10-27 18:08+0100\n" +"PO-Revision-Date: 2008-12-02 21:25+0800\n" +"Last-Translator: Thruth Wang <wanglihao(a)gmail.com>\n" +"Language-Team: Simplified Chinese\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../src/callbacks/keyring.h:48 +#, c-format +msgid "Accepting an unsigned file '%s'." +msgstr "æ¥åæªç¾åæä»¶ '%s'ã" + +#: ../src/callbacks/keyring.h:52 +#, c-format +msgid "Accepting an unsigned file '%s' from repository '%s'." +msgstr "æ¥åæªç¾åçæ¥èªå®è£æº '%2$s' çæä»¶ '%1$s' ã" + +#. TranslatorExplanation: speaking of a file +#: ../src/callbacks/keyring.h:63 +#, c-format +msgid "File '%s' is unsigned, continue?" +msgstr "æä»¶ '%s' æªç¾åï¼æ¯å¦ç»§ç»ï¼ " + +#. TranslatorExplanation: speaking of a file +#: ../src/callbacks/keyring.h:67 +#, c-format +msgid "File '%s' from repository '%s' is unsigned, continue?" +msgstr "æ¥èªå®è£æº '%2$s' çæä»¶ '%1$s' æªç¾åï¼æ¯å¦ç»§ç»ï¼ " + +#: ../src/callbacks/keyring.h:90 +#, c-format +msgid "Accepting file '%s' signed with an unknown key '%s'." +msgstr "æ¥åæä»¶ '%s'ï¼æ¤æä»¶ç¨æªç¥çå¯é¥ '%s' è¿è¡ç¾åã" + +#: ../src/callbacks/keyring.h:94 +#, c-format +msgid "Accepting file '%s' from repository '%s' signed with an unknown key '%s'." +msgstr "æ¥åæ¥èªå®è£æº '%2$s' çæä»¶ '%1$s'ï¼æ¤æä»¶ä½¿ç¨æªç¥çå¯é¥ '%3$s' è¿è¡ç¾åã" + +#. translators: the last %s is gpg key ID +#: ../src/callbacks/keyring.h:104 +#, c-format +msgid "File '%s' is signed with an unknown key '%s'. Continue?" +msgstr "æä»¶ '%s' ä½¿ç¨äºæªç¥çå¯é¥ '%s' ç¾ç½²ãæ¯å¦ç»§ç»ï¼" + +#. translators: the last %s is gpg key ID +#: ../src/callbacks/keyring.h:108 +#, c-format +msgid "File '%s' from repository '%s' is signed with an unknown key '%s'. Continue?" +msgstr "æ¥èªå®è£æº '%2$s' çæä»¶ '%1$s' ä½¿ç¨äºæªç¥çå¯é¥ '%3$s' ç¾åãæ¯å¦ç»§ç»ï¼" + +#: ../src/callbacks/keyring.h:125 +msgid "Automatically trusting the following key:" +msgstr "èªå¨ä¿¡ä»»ä¸åå¯é¥ï¼" + +#: ../src/callbacks/keyring.h:127 +msgid "New repository or package signing key received:" +msgstr "æ¶å°æ°å®è£æºæè½¯ä»¶åçç¾åå¯é¥ï¼" + +#: ../src/callbacks/keyring.h:131 +#, c-format +msgid "Key ID: %s" +msgstr "å¯é¥ ID: %s" + +#: ../src/callbacks/keyring.h:132 +#, c-format +msgid "Key Name: %s" +msgstr "å¯é¥åç§°ï¼%s" + +#: ../src/callbacks/keyring.h:133 +#, c-format +msgid "Key Fingerprint: %s" +msgstr "æçº¹å¯é¥ï¼%s" + +#: ../src/callbacks/keyring.h:135 +#, c-format +msgid "Repository: %s" +msgstr "å®è£æºï¼%s" + +#. translators: this message is shown after showing description of the key +#: ../src/callbacks/keyring.h:150 +msgid "Do you want to reject the key, trust temporarily, or trust always?" +msgstr "ä½ å¸ææç»å¯é¥ãä¸´æ¶ä¿¡ä»»å®ï¼è¿æ¯æ°¸ä¹ä¿¡ä»»å®ï¼" + +#. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) +#. translate to whatever is appropriate for your language +#. The anserws must be separated by slash characters '/' and must +#. correspond to reject/trusttemporarily/trustalways in that order. +#. The answers should be lower case letters. +#: ../src/callbacks/keyring.h:162 +msgid "r/t/a/" +msgstr "r/t/a/" + +#. translators: the same as r/t/a, but without 'a' +#: ../src/callbacks/keyring.h:165 +msgid "r/t" +msgstr "r/t" + +#. translators: help text for the 'r' option in the 'r/t/a' prompt +#: ../src/callbacks/keyring.h:167 +msgid "Don't trust the key." +msgstr "ä¸ä¿¡ä»»å¯é¥ã" + +#. translators: help text for the 't' option in the 'r/t/a' prompt +#: ../src/callbacks/keyring.h:169 +msgid "Trust the key temporarily." +msgstr "ä¸´æ¶ä¿¡ä»»å¯é¥ã" + +#. translators: help text for the 'a' option in the 'r/t/a' prompt +#: ../src/callbacks/keyring.h:172 +msgid "Trust the key and import it into trusted keyring." +msgstr "ä¿¡ä»»æ¤å¯é¥å¹¶å¯¼å¥å°å¯ä¿¡å¯é¥ç¯ï¼" + +#: ../src/callbacks/keyring.h:206 +#, c-format +msgid "Ignoring failed signature verification for file '%s'!" +msgstr "ä¸ºæä»¶ '%s' å¿½ç¥å¤±è´¥çç¾åæ ¡éªï¼" + +#: ../src/callbacks/keyring.h:209 +#, c-format +msgid "Ignoring failed signature verification for file '%s' from repository '%s'!" +msgstr "ä¸ºæ¥èªå®è£æº '%2$s' çæä»¶ '%1$s' å¿½ç¥å¤±è´¥çç¾åæ ¡éªï¼" + +#: ../src/callbacks/keyring.h:214 +msgid "Double-check this is not caused by some malicious changes in the file!" +msgstr "è¯·åæ¬¡æ£æ¥è¿æ¯å¦ç±æä»¶ä¸çæ¶ææ´æ¹æå¼èµ·ï¼" + +#: ../src/callbacks/keyring.h:224 +#, c-format +msgid "Signature verification failed for file '%s'." +msgstr "æä»¶ '%s' ç¾åæ ¡éªå¤±è´¥ã" + +#: ../src/callbacks/keyring.h:227 +#, c-format +msgid "Signature verification failed for file '%s' from repository '%s'." +msgstr "æ¥èªå®è£æº '%2$s' çæä»¶ '%1$s' ç¾åæ ¡éªå¤±è´¥ã" + +#: ../src/callbacks/keyring.h:232 +msgid "" +"Warning: This might be caused by a malicious change in the file!\n" +"Continuing might be risky. Continue anyway?" +msgstr "" +"è¦åï¼è¿å¯è½ç±æä»¶ä¸çæ¶ææ´æ¹æå¼èµ·ï¼\n" +"ç»§ç»ä¼æé£é©ï¼æ¯å¦ç»§ç»ï¼" + +#: ../src/callbacks/keyring.h:256 +#, c-format +msgid "No digest for file %s." +msgstr "æä»¶ %s æ²¡ææè¦ã" + +# internal key used: Ok +#: ../src/callbacks/keyring.h:256 +#: ../src/callbacks/keyring.h:266 +#: ../src/callbacks/keyring.h:288 +#: ../src/callbacks/rpm.h:61 +#: ../src/solve-commit.cc:1033 +#: ../src/solve-commit.cc:1057 +msgid "Continue?" +msgstr "æ¯å¦ç»§ç»ï¼" + +#: ../src/callbacks/keyring.h:265 +#, c-format +msgid "Unknown digest %s for file %s." +msgstr "æä»¶ %2$s çæè¦ %1$s æªç¥ã" + +#: ../src/callbacks/keyring.h:280 +#, c-format +msgid "Ignoring failed digest verification for %s (expected %s, found %s)." +msgstr "å¿½ç¥æªéè¿ç %s çæè¦éªè¯ï¼ææ %s, åç° %s ï¼ã" + +#: ../src/callbacks/keyring.h:287 +#, c-format +msgid "Digest verification failed for %s. Expected %s, found %s." +msgstr "%s çæè¦æ ¡éªå¤±è´¥ãæææ¯ %sï¼åç°æ¯ %sã" + +#: ../src/callbacks/locks.h:29 +msgid "The following query locks some of the objects you want to unlock:" +msgstr "ä¸åè¯·æ±éå®äºä¸äºæ¨å¸æè§£éçå¯¹è±¡ï¼" + +#: ../src/callbacks/locks.h:42 +msgid "The following query does not lock anything:" +msgstr "ä¸åè¯·æ±ä¸ä¼éå®ä»»ä½å¯¹è±¡ï¼" + +#. TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language. +#. Try to check what answers does zypper accept (it always accepts y/n at least) +#. You can also have a look at the regular expressions used to check the answer here: +#. /usr/lib/locale/<your_locale>/LC_MESSAGES/SYS_LC_MESSAGES +#: ../src/callbacks/media.h:84 +#, c-format +msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation." +msgstr "è¯·æå¥ä»è´¨ [%s] #%d å¹¶è¾å¥ 'y' ç»§ç»æèè¾å¥ 'n' åæ¶æä½ã" + +#: ../src/callbacks/media.h:228 +#: ../src/callbacks/media.h:235 +msgid "User Name" +msgstr "ç¨æ·å" + +# password dialog title +#: ../src/callbacks/media.h:242 +msgid "Password" +msgstr "å£ä»¤" + +#: ../src/callbacks/repo.h:49 +msgid "Retrieving delta" +msgstr "æ£å¨æ¥æ¶ delta å¢éåçº§" + +#. translators: this text is a progress display label e.g. "Applying delta foo [42%]" +#: ../src/callbacks/repo.h:85 +msgid "Applying delta" +msgstr "æ£å¨åºç¨ delta å¢éåçº§" + +#: ../src/callbacks/repo.h:115 +msgid "Retrieving patch rpm" +msgstr "æ£å¨æ¥æ¶è¡¥ä¸å" + +#: ../src/callbacks/repo.h:152 +#, c-format +msgid "Retrieving %s %s-%s.%s" +msgstr "æ£å¨æ¥æ¶ %s %s-%s.%s" + +#. TranslatorExplanation %s is package size like "5.6 M" +#: ../src/callbacks/repo.h:167 +#, c-format +msgid "(%s unpacked)" +msgstr "(è§£åå %s)" + +#. TranslatorExplanation speaking of a script - "Running: script file name (package name, script dir)" +#: ../src/callbacks/rpm.h:75 +#, c-format +msgid "Running: %s (%s, %s)" +msgstr "æ£å¨è¿è¡ï¼ %s (%s, %s)" + +#: ../src/callbacks/rpm.h:139 +#: ../src/callbacks/rpm.h:148 +#: ../src/callbacks/rpm.h:156 +#: ../src/callbacks/rpm.h:163 +msgid "Reading installed packages" +msgstr "æ£å¨è¯»åå·²å®è£çå" + +#. translators: This text is a progress display label e.g. "Removing packagename-x.x.x [42%]" +#: ../src/callbacks/rpm.h:183 +#, c-format +msgid "Removing %s-%s" +msgstr "æ£å¨å é¤ %s-%s" + +#: ../src/callbacks/rpm.h:202 +#, c-format +msgid "Removal of %s failed:" +msgstr "å é¤ %s å¤±è´¥ï¼" + +#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate +#. ! \todo use format +#: ../src/callbacks/rpm.h:224 +msgid "(with --nodeps)" +msgstr "(ç¨ --nodeps)" + +#: ../src/callbacks/rpm.h:224 +msgid "(with --nodeps --force)" +msgstr "(ç¨ --nodeps --force)" + +#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]" +#: ../src/callbacks/rpm.h:246 +#, c-format +msgid "Installing: %s-%s" +msgstr "æ£å¨å®è£ï¼ %s-%s" + +#: ../src/callbacks/rpm.h:272 +#, c-format +msgid "Installation of %s-%s failed:" +msgstr "å®è£ %s-%s å¤±è´¥ï¼" + +#: ../src/Command.cc:174 +#, c-format +msgid "Unknown command '%s'" +msgstr "æªç¥å½ä»¤ '%s'" + +#: ../src/info.cc:37 +msgid "Name: " +msgstr "åç§°ï¼" + +#: ../src/info.cc:38 +msgid "Version: " +msgstr "çæ¬ï¼" + +#: ../src/info.cc:39 +msgid "Arch: " +msgstr "åæ¡£ï¼" + +#: ../src/info.cc:40 +msgid "Vendor: " +msgstr "åè¡èï¼" + +#: ../src/info.cc:45 +msgid "Summary: " +msgstr "æ¦è¦ï¼" + +#: ../src/info.cc:46 +msgid "Description: " +msgstr "æè¿°ï¼" + +#. TranslatorExplanation E.g. "package 'zypper' not found." +#. ! \todo use a separate string for each kind so that it is translatable. +#: ../src/info.cc:79 +#, c-format +msgid "%s '%s' not found." +msgstr "%s '%s' æªæ¾å°ã" + +#: ../src/info.cc:91 +#, c-format +msgid "Information for %s %s:" +msgstr "%s %s çä¿¡æ¯ï¼" + +#: ../src/info.cc:108 +#, c-format +msgid "Info for type '%s' not implemented." +msgstr "ç±»å'%s'çä¿¡æ¯å°æªå®ç°ã" + +#: ../src/info.cc:114 +msgid "None" +msgstr "æ " + +#: ../src/info.cc:115 +msgid "Requires" +msgstr "éè¦" + +#: ../src/info.cc:116 +msgid "Provides" +msgstr "æä¾" + +#: ../src/info.cc:117 +msgid "Conflicts" +msgstr "å²çª" + +#: ../src/info.cc:118 +msgid "Obsoletes" +msgstr "åºå¼" + +#. translators: package requirements table header +#: ../src/info.cc:120 +msgid "Requirement" +msgstr "éè¦" + +#. translators: package requirements table header +#: ../src/info.cc:122 +msgid "Provided By" +msgstr "æä¾è" + +#. translators: package conflicts table header +#: ../src/info.cc:124 +msgid "Conflict" +msgstr "å²çª" + +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 +msgid "Catalog: " +msgstr "ç¼ç®ï¼" + +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 +msgid "Repository: " +msgstr "å®è£æºï¼" + +#: ../src/info.cc:157 +#: ../src/info.cc:279 +msgid "Installed: " +msgstr "å·²å®è£ï¼" + +#. enabled? +#. autorefresh? +#. enabled? +#. autorefresh? +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 +msgid "Yes" +msgstr "æ¯" + +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 +msgid "No" +msgstr "å¦" + +#. ! \todo fix this - arch? +#: ../src/info.cc:160 +#: ../src/info.cc:209 +msgid "Status: " +msgstr "ç¶æï¼" + +#: ../src/info.cc:164 +msgid "up-to-date" +msgstr "ææ°" + +#: ../src/info.cc:168 +#, c-format +msgid "out-of-date (version %s installed)" +msgstr "è¿æ¶ (å®è£çæ¬ %s)" + +#: ../src/info.cc:173 +msgid "not installed" +msgstr "æªå®è£" + +#: ../src/info.cc:175 +msgid "Installed Size: " +msgstr "å·²å®è£çå¤§å°ï¼" + +#: ../src/info.cc:212 +msgid "Category: " +msgstr "ç±»å«ï¼" + +#: ../src/info.cc:213 +msgid "Created On: " +msgstr "åå»ºæ¥æï¼" + +#: ../src/info.cc:214 +msgid "Reboot Required: " +msgstr "éè¦éå¼å¯¼ï¼" + +#: ../src/info.cc:217 +msgid "Package Manager Restart Required" +msgstr "éè¦éæ°å¯å¨è½¯ä»¶åç®¡çå¨" + +#: ../src/info.cc:219 +msgid "Restart Required: " +msgstr "éè¦éæ°å¯å¨ï¼" + +#: ../src/info.cc:222 +msgid "Interactive: " +msgstr "äº¤äºçï¼" + +#: ../src/info.cc:226 +msgid "Provides:" +msgstr "æä¾ï¼" + +#: ../src/info.cc:235 +msgid "Requires:" +msgstr "éè¦ï¼" + +#: ../src/info.cc:246 +#: ../src/search.cc:323 +msgid "Recommended" +msgstr "æ¨è" + +#: ../src/info.cc:248 +#: ../src/search.cc:325 +msgid "Suggested" +msgstr "å»ºè®®" + +#. translators: S for 'installed Status' +#. translators: S for installed Status +#. TranslatorExplanation S stands for Status +#: ../src/info.cc:289 +#: ../src/search.cc:38 +#: ../src/search.cc:54 +#: ../src/search.cc:214 +#: ../src/search.cc:385 +#: ../src/search.cc:441 +#: ../src/search.cc:533 +#: ../src/update.cc:397 +msgid "S" +msgstr "ç¶æ" + +#. translators: name (general header) +#: ../src/info.cc:289 +#: ../src/locks.cc:39 +#: ../src/repos.cc:655 +#: ../src/repos.cc:704 +#: ../src/repos.cc:2081 +#: ../src/search.cc:44 +#: ../src/search.cc:56 +#: ../src/search.cc:215 +#: ../src/search.cc:264 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:534 +#: ../src/update.cc:152 +#: ../src/update.cc:405 +#: ../src/Zypper.cc:3973 +msgid "Name" +msgstr "åç§°" + +#. translators: type (general header) +#. translators: product type (addon/base) (rug calls it Category) +#: ../src/info.cc:289 +#: ../src/locks.cc:43 +#: ../src/repos.cc:655 +#: ../src/repos.cc:713 +#: ../src/repos.cc:2089 +#: ../src/search.cc:58 +#: ../src/search.cc:218 +#: ../src/search.cc:541 +msgid "Type" +msgstr "ç±»å" + +#: ../src/info.cc:289 +#: ../src/search.cc:388 +msgid "Dependency" +msgstr "ä¾èµå³ç³»" + +#: ../src/info.cc:307 +msgid "Contents" +msgstr "åå®¹" + +#: ../src/info.cc:309 +msgid "(empty)" +msgstr "(ç©º)" + +#. translators: patch category (recommended, security) +#. translators: product category (the rug term) +#: ../src/info.cc:351 +#: ../src/search.cc:267 +#: ../src/search.cc:538 +#: ../src/update.cc:152 +msgid "Category" +msgstr "ç±»å«" + +#: ../src/info.cc:352 +msgid "Flavor" +msgstr "" + +#: ../src/info.cc:353 +#: ../src/utils/misc.cc:111 +msgid "Installed" +msgstr "å·²å®è£ " + +#: ../src/info.cc:354 +msgid "Short Name" +msgstr "çåç§°" + +#. translators: meaning a package %s or provider of capability %s +#: ../src/install.cc:68 +#: ../src/install.cc:182 +#, c-format +msgid "'%s' not found" +msgstr "æ²¡ææ¾å° '%s'ã" + +#. translators: e.g. skipping package 'zypper' (the newest version already installed) +#. ! \todo capitalize the first letter +#: ../src/install.cc:104 +#, c-format +msgid "skipping %s '%s' (the newest version already installed)" +msgstr "æ£å¨è·³è¿ %s '%s'ï¼å·²ç»å®è£äºææ°çæ¬ï¼" + +#. translators: %s-%s.%s is name-version.arch +#: ../src/install.cc:116 +#, c-format +msgid "Package %s-%s.%s not found in repositories, cannot reinstall." +msgstr "å¨å®è£æºä¸æ¾ä¸å° %s-%s.%s è½¯ä»¶åï¼æ æ³å®è£ã" + +#: ../src/install.cc:129 +#, c-format +msgid "Failed to add '%s' to the list of packages to be installed." +msgstr "æªè½å°'%s'æ·»å å°è¦å®è£çååè¡¨ã" + +#: ../src/install.cc:152 +#, c-format +msgid "Failed to add '%s' to the list of packages to be removed." +msgstr "æªè½å°'%s'æ·»å å°è¦å é¤çååè¡¨ã" + +#: ../src/install.cc:373 +#: ../src/install.cc:659 +#, c-format +msgid "'%s' is already installed." +msgstr "'%s'å·²å®è£ã" + +#. translators: meaning a package %s or provider of capability %s +#: ../src/install.cc:413 +#: ../src/install.cc:673 +#, c-format +msgid "'%s' is not installed." +msgstr "'%s'æªå®è£ã" + +#: ../src/install.cc:437 +msgid "Cannot uninstall patches." +msgstr "æ æ³åå®è£è¡¥ä¸ã" + +#: ../src/install.cc:438 +msgid "" +"Installed status of a patch is determined solely based on its dependencies.\n" +"Patches are not installed in sense of copied files, database records,\n" +"or similar." +msgstr "" +"ä¸æ¬¾è¡¥ä¸çå®è£æåµå®å¨åºäºå®çä¾èµæ§å³å®ã\n" +"å¨å¤å¶æä»¶ãæ°æ®åºè®°å½æç±»ä¼¼æåµä¸ï¼è¡¥ä¸ä¸\n" +"ä¼è¢«å®è£ã" + +#: ../src/install.cc:449 +msgid "Uninstallation of a pattern is currently not defined and implemented." +msgstr "å½åæ²¡æå®ä¹æ¨¡å¼åå®è£ï¼ä¹æ²¡æå®ç°ã" + +#: ../src/install.cc:463 +#, c-format +msgid "%s contradicts %s" +msgstr "%s ä¸ %s å²çª" + +#. translators: meaning --force with --capability +#: ../src/install.cc:472 +#, c-format +msgid "%s cannot currently be used with %s" +msgstr "%s ç°å¨ä¸è½å %s ä¸èµ·ä½¿ç¨" + +#: ../src/install.cc:520 +msgid "Specifying architecture when selecting packages by name is not implemented." +msgstr "ä¸è½å®ç°æåç§°éæ©è½¯ä»¶åæ¶æå®æ¶æã" + +#: ../src/install.cc:555 +#, c-format +msgid "'%s' is not a valid package or capability name." +msgstr "`%s'ä¸æ¯ææçè½¯ä»¶åæè Capacity åç§°ã" + +#. translators: meaning a package %s or provider of capability %s +#: ../src/install.cc:630 +#, c-format +msgid "'%s' not found." +msgstr "æ²¡ææ¾å° '%s'ã" + +#. translators: %s are package names +#: ../src/install.cc:663 +#, c-format +msgid "'%s' providing '%s' is already installed." +msgstr "'%s' æä¾ '%s' å·²å®è£ã" + +#. translators: locks table value +#. importance +#: ../src/locks.cc:22 +#: ../src/locks.cc:63 +#: ../src/locks.cc:76 +msgid "(any)" +msgstr "ï¼ä»»ä½ï¼" + +#. translators: locks table value +#: ../src/locks.cc:24 +#: ../src/locks.cc:60 +#: ../src/search.cc:311 +msgid "(multiple)" +msgstr "ï¼å¤ä¸ªï¼" + +#. translators: catalog (rug's word for repository) (header) +#: ../src/locks.cc:41 +#: ../src/search.cc:40 +#: ../src/search.cc:263 +#: ../src/update.cc:151 +#: ../src/update.cc:399 +msgid "Catalog" +msgstr "ç¼ç®" + +#: ../src/locks.cc:41 +msgid "Importance" +msgstr "éè¦æ§" + +#. translators: package's repository (header) +#: ../src/locks.cc:43 +#: ../src/search.cc:64 +#: ../src/search.cc:388 +#: ../src/search.cc:446 +#: ../src/update.cc:151 +#: ../src/update.cc:399 +msgid "Repository" +msgstr "å®è£æº" + +#: ../src/locks.cc:95 +msgid "There are no package locks defined." +msgstr "æ²¡æå®ä¹è½¯ä»¶åçéå®ã" + +#: ../src/locks.cc:102 +msgid "Error reading the locks file:" +msgstr "è¯»åéå®æä»¶æ¶åºéï¼" + +#: ../src/locks.cc:153 +msgid "Problem adding the package lock:" +msgstr "æ·»å è½¯ä»¶åéå®æ¶åºç°é®é¢ï¼" + +#: ../src/locks.cc:158 +msgid "Specified lock has been successfully added." +msgid_plural "Specified locks have been successfully added." +msgstr[0] "æå®çéå®å·²æåæ·»å ã" + +#: ../src/locks.cc:181 +msgid "Specified lock has been successfully removed." +msgstr "æå®çéå®å·²ç»æåå é¤ã" + +#: ../src/locks.cc:228 +msgid "No lock has been removed." +msgstr "æ²¡æå é¤ä»»ä½éå®ã" + +#: ../src/locks.cc:232 +#, c-format +msgid "%lu lock has been successfully removed." +msgid_plural "%lu locks have been succesfully removed." +msgstr[0] "æåç§»é¤ %lu éå®ã" + +#: ../src/locks.cc:239 +msgid "Problem removing the package lock:" +msgstr "å é¤è½¯ä»¶åéå®æ¶åºç°é®é¢ï¼" + +#. translators: this will show up if you press ctrl+c twice outside of zypper shell +#: ../src/main.cc:38 +msgid "OK OK! Exiting immediately..." +msgstr "å¥½å§ï¼é©¬ä¸éåº..." + +#. TranslatorExplanation The first %s is name of the resolvable, the second is its kind (e.g. 'zypper package') +#: ../src/misc.cc:136 +#, c-format +msgid "Automatically agreeing with %s %s license." +msgstr "èªå¨åæ %s %s çè®¸å¯ã" + +#. translators: the first %s is the name of the package, the second +#. is " (package-type)" if other than "package" (patch/product/pattern) +#: ../src/misc.cc:157 +#, c-format +msgid "In order to install '%s'%s, you must agree to terms of the following license agreement:" +msgstr "è¦å®è£â%sâ%sï¼æ¨å¿é¡»åæä»¥ä¸è®¸å¯è¯æ¡æ¬¾ï¼" + +#. lincense prompt +#: ../src/misc.cc:174 +msgid "Do you agree with the terms of the license?" +msgstr "æ¨æ¯å¦åæè¿äºè®¸å¯æ¡æ¬¾ï¼" + +#: ../src/misc.cc:183 +msgid "Aborting installation due to the need for license confirmation." +msgstr "ç±äºæªç¡®è®¤è®¸å¯è¯ï¼æ£å¨ä¸æ¢å®è£ã" + +#. translators: %sanslate the '--auto-agree-with-licenses', +#. it is a command line option +#: ../src/misc.cc:188 +#, c-format +msgid "Please restart the operation in interactive mode and confirm your agreement with required licenses, or use the %s option." +msgstr "è¯·ä»¥äº¤äºæ¹å¼éå¯å¨æä½å¹¶ç¡®è®¤æ¨åææéçè®¸å¯ï¼æèä½¿ç¨ %s éé¡¹ã" + +#. translators: e.g. "... with flash package license." +#. ! \todo fix this to allow proper translation +#: ../src/misc.cc:200 +#, c-format +msgid "Aborting installation due to user disagreement with %s %s license." +msgstr "ç±äºç¨æ·ä¸åæ %s %s è®¸å¯ï¼æ£å¨ä¸æ¢å®è£" + +#: ../src/misc.cc:247 +msgid "License" +msgstr "è®¸å¯è¯" + +#: ../src/misc.cc:265 +msgid "EULA" +msgstr "EULA" + +#: ../src/misc.cc:283 +msgid "SUMMARY" +msgstr "å°ç»" + +#: ../src/misc.cc:284 +#, c-format +msgid "Installed packages: %d" +msgstr "å·²å®è£è½¯ä»¶åï¼%d" + +#: ../src/misc.cc:285 +#, c-format +msgid "Installed packages with counterparts in repositories: %d" +msgstr "å¨å®è£æºä¸æå¯¹åºç»ä»¶çå·²å®è£è½¯ä»¶åï¼%d" + +#: ../src/misc.cc:286 +#, c-format +msgid "Installed packages with EULAs: %d" +msgstr "å·²å®è£å¸¦æ EULA çè½¯ä»¶åï¼%d" + +#: ../src/misc.cc:372 +#: ../src/misc.cc:397 +#, c-format +msgid "Source package '%s' not found." +msgstr "æºç¨åºå'%s'æªæ¾å°ã" + +#: ../src/misc.cc:407 +#, c-format +msgid "Installing source package %s-%s" +msgstr "æ£å¨å®è£æºç¨åºå %s-%s" + +#: ../src/misc.cc:416 +#, c-format +msgid "Source package %s-%s successfully installed." +msgstr "æºç¨åºå %s-%s å·²æåå®è£ã" + +#: ../src/misc.cc:423 +#, c-format +msgid "Problem installing source package %s-%s:" +msgstr "å®è£æºç¨åºå %s-%s æ¶åºç°é®é¢ï¼" + +#: ../src/output/OutNormal.cc:54 +msgid "Warning: " +msgstr "è¦å:" + +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 +msgid "error" +msgstr "éè¯¯" + +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 +msgid "done" +msgstr "å®æ¯" + +#: ../src/output/OutNormal.cc:165 +#: ../src/output/OutNormal.cc:167 +#: ../src/output/OutNormal.cc:191 +#: ../src/output/OutNormal.cc:217 +msgid "Retrieving:" +msgstr "æ£å¨æ¥æ¶ï¼" + +# window title for kernel loading (see txt_load_kernel) +#: ../src/output/OutNormal.cc:173 +msgid "starting" +msgstr "æ£å¨å¯å¨" + +#: ../src/output/OutNormal.cc:250 +msgid "No help available for this prompt." +msgstr "æ¤æç¤ºæ å¸®å©å¯ç¨" + +#: ../src/output/OutNormal.cc:260 +msgid "no help available for this option" +msgstr "å¯¹æ¤éé¡¹æ å¸®å©åå®¹" + +#: ../src/repos.cc:80 +#, c-format +msgid "Checking whether to refresh metadata for %s" +msgstr "æ£å¨æ£æ¥æ¯å¦éè¦å·æ° %s çåæ°æ®" + +#: ../src/repos.cc:102 +#, c-format +msgid "Repository '%s' is up to date." +msgstr "è½¯ä»¶æº'%s'æ¯ææ°çã" + +#: ../src/repos.cc:106 +#, c-format +msgid "The up-to-date check of '%s' has been delayed." +msgstr "å¯¹ '%s' çæ´æ°æ£æ¥è¢«å»¶è¿ã" + +#: ../src/repos.cc:128 +msgid "Forcing raw metadata refresh" +msgstr "å¼ºå¶æ§è¡åå§åæ°æ®å·æ°" + +#: ../src/repos.cc:135 +#, c-format +msgid "Retrieving repository '%s' metadata" +msgstr "æ£å¨æ¥åæå¡ '%s' çåæ°æ®" + +#: ../src/repos.cc:159 +#, c-format +msgid "Problem retrieving files from '%s'." +msgstr "ä» '%s' æ¥æ¶æä»¶æ¶åºç°é®é¢ã" + +#: ../src/repos.cc:160 +#: ../src/repos.cc:2861 +#: ../src/solve-commit.cc:1109 +#: ../src/solve-commit.cc:1137 +#: ../src/solve-commit.cc:1169 +msgid "Please see the above error message for a hint." +msgstr "è¯·åè§ä»¥ä¸éè¯¯ä¿¡æ¯æ¾å°çº¿ç´¢ã" + +#: ../src/repos.cc:173 +#, c-format +msgid "No URIs defined for '%s'." +msgstr "æ²¡æä¸º '%s' å®ä¹ URIã" + +#. TranslatorExplanation the first %s is a .repo file path +#: ../src/repos.cc:177 +#, c-format +msgid "Please add one or more base URI (baseurl=URI) entries to %s for repository '%s'." +msgstr "è¯·ä¸ºå®è£æº '%2$s' æ·»å ä¸ä¸ªæèæ´å¤çåº URI æ¡ç® (baseurl=URI) è³ %1$s ã" + +#: ../src/repos.cc:190 +msgid "No alias defined for this repository." +msgstr "è¯¥è½¯ä»¶æºæ²¡æå®ä¹å«åã" + +#: ../src/repos.cc:203 +#, c-format +msgid "Repository '%s' is invalid." +msgstr "å®è£æº '%s' æ æã" + +#: ../src/repos.cc:204 +msgid "Please check if the URIs defined for this repository are pointing to a valid repository." +msgstr "è¯·æ£æ¥è¿ä¸ªå®è£æºå®ä¹ç URI æåä¸ä¸ªææçè½¯ä»¶æºã" + +#: ../src/repos.cc:217 +#, c-format +msgid "Error retrieving metadata for '%s':" +msgstr "æ¥æ¶ '%s' åæ°æ®æ¶åºéï¼" + +#: ../src/repos.cc:232 +msgid "Forcing building of repository cache" +msgstr "å¼ºå¶æå»ºè½¯ä»¶æºç¼å" + +#: ../src/repos.cc:245 +#, c-format +msgid "Error parsing metadata for '%s':" +msgstr "åæ'%s'çåæ°æ®æ¶åºéï¼" + +#. TranslatorExplanation Don't translate the URL unless it is translated, too +#: ../src/repos.cc:247 +msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper#Troubleshooting" +msgstr "è¿å¯è½æ¯ç±å®è£æºä¸éè¯¯çåæ°æ®æèåæ°æ®åæç¨åºç bug å¯¼è´çãå¦ææ¯åä¸ç§æåµï¼æèä¸ç¡®å®ï¼è¯·åè http://en.opensuse.org/Zypper#Troubleshooting æ¥åéè¯¯ã" + +#: ../src/repos.cc:261 +#, c-format +msgid "Repository metadata for '%s' not found in local cache." +msgstr "å¨æ¬å°ç¼åä¸æ¾ä¸å°'%s'çè½¯ä»¶æºåæ°æ®ã" + +#: ../src/repos.cc:269 +msgid "Error building the cache:" +msgstr "æå»ºç¼åæ¶åºéï¼" + +#: ../src/repos.cc:422 +#, c-format +msgid "Repository '%s' not found by its alias, number, or URI." +msgstr "æ æ³éè¿å«åãç¼å·æ URI æ¾å°è½¯ä»¶æº '%s'ã" + +#: ../src/repos.cc:426 +#, c-format +msgid "Use '%s' to get the list of defined repositories." +msgstr "ç¨ '%s' è·å¾å·²å®ä¹çå®è£æºåè¡¨ã" + +#: ../src/repos.cc:490 +#: ../src/repos.cc:497 +#, c-format +msgid "Ignoring repository '%s' because of '%s' option." +msgstr "ç±äº '%2$s' éé¡¹å¿½ç¥å®è£æº '%1$s'ã" + +#: ../src/repos.cc:527 +#: ../src/repos.cc:563 +#, c-format +msgid "Disabling repository '%s' because of the above error." +msgstr "ç±äºå¦ä¸éè¯¯ç¦ç¨å®è£æº '%s' ã" + +#: ../src/repos.cc:545 +#, c-format +msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it." +msgstr "å®è£æº '%s' å·²ç»è¿æ¶ãä»¥ root èº«ä»½è¿è¡ 'zypper refresh' æ¥æ´æ°å®ã" + +#: ../src/repos.cc:580 +#, c-format +msgid "The metadata cache needs to be built for the '%s' repository. You can run 'zypper refresh' as root to do this." +msgstr "éè¦å»ºç«å®è£æº '%s' çåæ°æ®ç¼åãæ¨å¯ä»¥ root èº«ä»½è¿è¡ 'zypper refresh' æ§è¡æ¤æä½ã" + +#: ../src/repos.cc:587 +#, c-format +msgid "Disabling repository '%s'." +msgstr "æ£å¨ç¦ç¨è½¯ä»¶æº'%s'ã" + +#: ../src/repos.cc:624 +msgid "Initializing Target" +msgstr "æ£å¨åå§åç®æ " + +#: ../src/repos.cc:633 +msgid "Target initialization failed:" +msgstr "ç®æ åå§åå¤±è´¥ï¼" + +#: ../src/repos.cc:635 +#: ../src/Zypper.cc:3343 +msgid "Running 'zypper refresh' as root might resolve the problem." +msgstr "ä»¥ root è¿è¡ 'zypper refresh' æè®¸ä¼è§£å³é®é¢ã" + +#. translators: patch status (installed, uninstalled, needed) +#: ../src/repos.cc:655 +#: ../src/search.cc:269 +#: ../src/update.cc:152 +msgid "Status" +msgstr "ç¶æ" + +#. status +#. rug's status (active, pending => active, disabled <= enabled, disabled) +#. this is probably the closest possible compatibility arrangement +#: ../src/repos.cc:672 +msgid "Active" +msgstr "ä¸»å¨" + +#: ../src/repos.cc:672 +msgid "Disabled" +msgstr "å·²ç¦ç¨" + +#: ../src/repos.cc:703 +#: ../src/repos.cc:2080 +#: ../src/Zypper.cc:3973 +msgid "Alias" +msgstr "å«å" + +#. TranslatorExplanation used as e.g. "Enabled: Yes" +#: ../src/repos.cc:705 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:2082 +msgid "Enabled" +msgstr "å·²å¯ç¨" + +#. translators: 'zypper repos' column - whether autorefresh is enabled for the repository +#: ../src/repos.cc:707 +#: ../src/repos.cc:2084 +msgid "Refresh" +msgstr "å·æ°" + +#. translators: repository priority (in zypper repos -p or -d) +#: ../src/repos.cc:711 +#: ../src/repos.cc:2088 +msgid "Priority" +msgstr "ä¼åçº§" + +#: ../src/repos.cc:715 +#: ../src/repos.cc:2091 +msgid "URI" +msgstr "URI" + +#: ../src/repos.cc:717 +msgid "Service" +msgstr "æå¡" + +#: ../src/repos.cc:761 +msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories." +msgstr "æ²¡æå®ä¹è½¯ä»¶æºãä½¿ç¨ 'zypper addrepo' å½ä»¤æ·»å ä¸ä¸ªæå¤ä¸ªè½¯ä»¶æºã" + +#: ../src/repos.cc:837 +#: ../src/repos.cc:909 +#: ../src/repos.cc:1079 +msgid "Error reading repositories:" +msgstr "è¯»åå®è£æºæ¶åºéï¼" + +#: ../src/repos.cc:865 +#: ../src/repos.cc:2213 +#, c-format +msgid "Can't open %s for writing." +msgstr "æ æ³æå¼ %s è¿è¡åæä½ã" + +#: ../src/repos.cc:867 +#: ../src/repos.cc:2215 +msgid "Maybe you do not have write permissions?" +msgstr "æ¨æ¯ä¸æ¯æ²¡æåçæéå¢ï¼" + +#: ../src/repos.cc:874 +#: ../src/repos.cc:2222 +#, c-format +msgid "Repositories have been successfully exported to %s." +msgstr "è½¯ä»¶æºå·²ç»è¢«æåå¯¼åºå° %sã" + +#: ../src/repos.cc:927 +#: ../src/repos.cc:1097 +msgid "Specified repositories: " +msgstr "æå®çè½¯ä»¶æºï¼" + +#: ../src/repos.cc:966 +#, c-format +msgid "Skipping disabled repository '%s'" +msgstr "æ£å¨è·³è¿å·²ç¦ç¨çå®è£æº '%s'" + +#: ../src/repos.cc:981 +#, c-format +msgid "Skipping repository '%s' because of the above error." +msgstr "æ£å¨è·³è¿åºç°å¦ä¸éè¯¯çå®è£æº '%s' ã" + +#: ../src/repos.cc:996 +#, c-format +msgid "Use '%s' or '%s' commands to add or enable repositories." +msgstr "ä½¿ç¨ '%s' æè '%s' å½ä»¤æ·»å æå¯ç¨å®è£æºã" + +#: ../src/repos.cc:999 +msgid "Specified repositories are not enabled or defined." +msgstr "æå®å®è£æºæ²¡æè¢«å¯ç¨æèå®ä¹ã" + +#: ../src/repos.cc:1001 +msgid "There are no enabled repositories defined." +msgstr "æªå®ä¹å·²ç»å¯ç¨çè½¯ä»¶æºã" + +#: ../src/repos.cc:1005 +msgid "Could not refresh the repositories because of errors." +msgstr "ç±äºåºéæ æ³å·æ°è½¯ä»¶å®è£æºã" + +#: ../src/repos.cc:1011 +msgid "Some of the repositories have not been refreshed because of an error." +msgstr "ç±äºåºéï¼ä¸äºè½¯ä»¶æºæªè¢«å·æ°ã" + +#: ../src/repos.cc:1016 +msgid "Specified repositories have been refreshed." +msgstr "æå®å®è£æºåå·²å·æ°ã" + +#: ../src/repos.cc:1018 +msgid "All repositories have been refreshed." +msgstr "ææå®è£æºåå·²å·æ°ã" + +#: ../src/repos.cc:1154 +#, c-format +msgid "Cleaning metadata cache for '%s'." +msgstr "æ£å¨æ¸ç'%s'çåæ°æ®ã" + +#: ../src/repos.cc:1161 +#, c-format +msgid "Cleaning raw metadata cache for '%s'." +msgstr "æ£å¨ä¸º'%s'æ¸çåå§åæ°æ®ã" + +#. translators: meaning the cached rpm files +#: ../src/repos.cc:1169 +#, c-format +msgid "Cleaning packages for '%s'." +msgstr "æ£å¨ä¸º '%s' æ¸çè½¯ä»¶åã" + +#: ../src/repos.cc:1177 +#, c-format +msgid "Cannot clean repository '%s' because of an error." +msgstr "ç±äºåºéæ æ³æ¸çè½¯ä»¶æº '%s' ã" + +#: ../src/repos.cc:1191 +msgid "Cleaning installed packages cache." +msgstr "æ£å¨æ¸çå·²å®è£è½¯ä»¶åç¼åã" + +#: ../src/repos.cc:1199 +msgid "Cannot clean installed packages cache because of an error." +msgstr "ç±äºåºéæ æ³æ¸çå·²å®è£è½¯ä»¶åçç¼åã" + +#: ../src/repos.cc:1207 +msgid "Could not clean the repositories because of errors." +msgstr "ç±äºåºéæ æ³æ¸çè½¯ä»¶å®è£æºã" + +#: ../src/repos.cc:1214 +msgid "Some of the repositories have not been cleaned up because of an error." +msgstr "ç±äºåºéï¼ä¸äºè½¯ä»¶æºæªè¢«æ¸çã" + +#: ../src/repos.cc:1219 +msgid "Specified repositories have been cleaned up." +msgstr "æå®çè½¯ä»¶æºæ¸çå®æ¯ã" + +#: ../src/repos.cc:1221 +msgid "All repositories have been cleaned up." +msgstr "ææè½¯ä»¶æºæ¸çå®æ¯ã" + +#: ../src/repos.cc:1261 +msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh." +msgstr "è¿æ¯ä¸ä¸ªå¯ä»¥æ¹åçåªè¯»ä»è´¨ï¼CD/DVDï¼ï¼ç¦ç¨èªå¨å·æ°ã" + +#: ../src/repos.cc:1282 +#: ../src/repos.cc:1543 +#, c-format +msgid "Repository named '%s' already exists. Please use another alias." +msgstr "å·²ç»åå¨åç§°ä¸º'%s'çè½¯ä»¶æºãè¯·å¦å¤éæ©ä¸ä¸ªå«åã" + +#: ../src/repos.cc:1293 +msgid "Could not determine the type of the repository. Please check if the defined URIs (see below) point to a valid repository:" +msgstr "ä¸è½ç¡®å®è½¯ä»¶æºçç±»åãè¯·æ£æ¥ä¸é¢å®ä¹ç URI æ¯å¦æåä¸ä¸ªææçè½¯ä»¶æºï¼" + +#: ../src/repos.cc:1300 +#: ../src/Zypper.cc:2420 +msgid "Can't find a valid repository at given location:" +msgstr "ä¸è½å¨æå®çä½ç½®æ¾å°ä¸ä¸ªæ£ç¡®çå®è£æºï¼" + +#: ../src/repos.cc:1309 +msgid "Problem transferring repository data from specified URI:" +msgstr "ä»æå® URI ä¼ è¾è½¯ä»¶æºæ°æ®åºç°é®é¢ï¼" + +#: ../src/repos.cc:1310 +msgid "Please check whether the specified URI is accessible." +msgstr "è¯·æ£æ¥æå®ç URI æ¯å¦å¯è®¿é®ã" + +#: ../src/repos.cc:1318 +msgid "Unknown problem when adding repository:" +msgstr "æ·»å è½¯ä»¶æºæ¶åºç°æªç¥é®é¢ï¼" + +#: ../src/repos.cc:1324 +#, c-format +msgid "Repository '%s' successfully added" +msgstr "æåæ·»å äºå®è£æº '%s' " + +#. TranslatorExplanation used as e.g. "Autorefresh: Yes" +#: ../src/repos.cc:1338 +msgid "Autorefresh" +msgstr "èªå¨å·æ°" + +#: ../src/repos.cc:1353 +#, c-format +msgid "Reading data from '%s' media" +msgstr "æ£å¨ä»ä»è´¨ '%s' è¯»åæ°æ®" + +#: ../src/repos.cc:1360 +#, c-format +msgid "Problem reading data from '%s' media" +msgstr "ä»ä»è´¨ '%s' è¯»åæ°æ®åºç°é®é¢" + +#: ../src/repos.cc:1361 +msgid "Please check if your installation media is valid and readable." +msgstr "è¯·æ£æ¥æ¨çå®è£ä»è´¨æ¯å¦æ£ç¡®åå¯è¯»ã" + +#: ../src/repos.cc:1426 +msgid "Problem accessing the file at the specified URI" +msgstr "è®¿é®æå® URI å¤æä»¶åºç°é®é¢" + +#: ../src/repos.cc:1427 +msgid "Please check if the URI is valid and accessible." +msgstr "è¯·æ£æ¥ URI æ¯ææçä¸å¯è®¿é®çã" + +#: ../src/repos.cc:1435 +msgid "Problem parsing the file at the specified URI" +msgstr "è§£ææå® URI çæä»¶åºç°é®é¢" + +#. TranslatorExplanation don't translate the URI if the URI itself is not translated. +#. Also don't translate the '.repo' string. +#: ../src/repos.cc:1438 +msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details." +msgstr "è¿æ¯ä¸ä¸ª .repo æä»¶åï¼ ç»èè¯·ç http://en.opensuse.org/Standards/RepoInfo" + +#: ../src/repos.cc:1446 +msgid "Problem encountered while trying to read the file at the specified URI" +msgstr "å°è¯è¯»åæå® URI å¤æä»¶æ¶éå°é®é¢" + +#: ../src/repos.cc:1460 +msgid "Repository with no alias defined found in the file, skipping." +msgstr "å¨æä»¶ä¸åç°ä¸ä¸ªå®è£æºæ²¡æå®ä¹å«åï¼æ£å¨è·³è¿ã" + +#: ../src/repos.cc:1467 +#, c-format +msgid "Repository '%s' has no URI defined, skipping." +msgstr "å®è£æº '%s' æªå®ä¹ URIï¼æ£å¨è·³è¿ã" + +#: ../src/repos.cc:1507 +#, c-format +msgid "Repository '%s' has been removed." +msgstr "å®è£æº '%s' å·²ç»è¢«ç§»é¤ã" + +#: ../src/repos.cc:1526 +#, c-format +msgid "Cannot change alias of '%s' repository. The repository belongs to service '%s' which is responsible for setting its alias." +msgstr "æ æ³æ¹åå®è£æº '%s' çå«åãæ¤å®è£æºå±äºæå¡'%s' ï¼è¯¥æå¡è´è´£æå®å«åã" + +#: ../src/repos.cc:1537 +#, c-format +msgid "Repository '%s' renamed to '%s'." +msgstr "å®è£æº '%s' éå½åä¸º '%s' ã" + +#: ../src/repos.cc:1549 +#: ../src/repos.cc:1769 +msgid "Error while modifying the repository:" +msgstr "ä¿®æ¹å®è£æºæ¶åºç°éè¯¯ï¼" + +#: ../src/repos.cc:1550 +#, c-format +msgid "Leaving repository '%s' unchanged." +msgstr "ä¸æ¹åå®è£æº '%s' " + +#: ../src/repos.cc:1687 +#, c-format +msgid "Invalid priority '%s'. Use a positive integer number. The greater the number, the lower the priority." +msgstr "ä¼åçº§ '%s' æ æãè¯·ä½¿ç¨æ£æ´æ°ãæ°åè¶å¤§ï¼ä¼åçº§è¶ä½ã" + +#: ../src/repos.cc:1695 +#, c-format +msgid "Repository '%s' priority has been left unchanged (%d)" +msgstr "å®è£æº '%s' çä¼åçº§æªè¢«æ¹å(%d)" + +#: ../src/repos.cc:1721 +#, c-format +msgid "Repository '%s' has been sucessfully enabled." +msgstr "æåå¯ç¨è½¯ä»¶æº '%s'ã" + +#: ../src/repos.cc:1724 +#, c-format +msgid "Repository '%s' has been sucessfully disabled." +msgstr "æåç¦ç¨è½¯ä»¶æº '%s'ã" + +#: ../src/repos.cc:1731 +#, c-format +msgid "Autorefresh has been enabled for repository '%s'." +msgstr "å·²å¯ç¨å®è£æº'%s'çèªå¨å·æ°ã" + +#: ../src/repos.cc:1734 +#, c-format +msgid "Autorefresh has been disabled for repository '%s'." +msgstr "å·²ç¦ç¨å®è£æº'%s'çèªå¨å·æ°ã" + +#: ../src/repos.cc:1741 +#, c-format +msgid "RPM files caching has been enabled for repository '%s'." +msgstr "ç¼å RPM æä»¶å¨è½¯ä»¶æº '%s' è¢«å¯ç¨ã" + +#: ../src/repos.cc:1744 +#, c-format +msgid "RPM files caching has been disabled for repository '%s'." +msgstr "ç¼å RPM æä»¶å¨è½¯ä»¶æº '%s' è¢«ç¦ç¨ã" + +#: ../src/repos.cc:1750 +#, c-format +msgid "Repository '%s' priority has been set to %d." +msgstr "å®è£æº '%s' çä¼åçº§è¢«è®¾ä¸º %dã" + +#: ../src/repos.cc:1756 +#, c-format +msgid "Name of repository '%s' has been set to '%s'." +msgstr "å®è£æº '%s' åç§°è¢«è®¾å®ä¸º '%s'ã" + +#: ../src/repos.cc:1762 +#, c-format +msgid "Nothing to change for repository '%s'." +msgstr "å¯¹å®è£æº '%s' æªä½ä»»ä½æ¹åã" + +#: ../src/repos.cc:1770 +#, c-format +msgid "Leaving repository %s unchanged." +msgstr "å®è£æº %s æªææ¹åã" + +#: ../src/repos.cc:1808 +msgid "Error reading services:" +msgstr "è¯»åæå¡æ¶åºéï¼" + +#: ../src/repos.cc:1897 +#, c-format +msgid "Service '%s' not found by its alias, number, or URI." +msgstr "æ æ³éè¿å«åãç¼å·æ URI æ¾å°æå¡ '%s'ã" + +#: ../src/repos.cc:1901 +#, c-format +msgid "Use '%s' to get the list of defined services." +msgstr "ç¨ '%s' è·å¾å·²å®ä¹çæå¡åè¡¨ã" + +#: ../src/repos.cc:2127 +#, c-format +msgid "No services defined. Use the '%s' command to add one or more services." +msgstr "æ²¡æå®ä¹æå¡ãä½¿ç¨ '%s' å½ä»¤æ·»å ä¸ä¸ªæå¤ä¸ªæå¡ã" + +#: ../src/repos.cc:2253 +#, c-format +msgid "Service aliased '%s' already exists. Please use another alias." +msgstr "å·²ç»åå¨å«åä¸º'%s'çæå¡ãè¯·å¦å¤éæ©ä¸ä¸ªå«åã" + +#: ../src/repos.cc:2263 +#, c-format +msgid "Error occured while adding service '%s'." +msgstr "æ·»å æå¡ '%s' åºéã" + +#: ../src/repos.cc:2269 +#, c-format +msgid "Service '%s' has been successfully added." +msgstr "æåæ·»å äºæå¡ '%s'ã" + +#: ../src/repos.cc:2308 +#, c-format +msgid "Removing service '%s':" +msgstr "æ£å¨ç§»é¤æå¡ '%s'ï¼" + +#: ../src/repos.cc:2311 +#, c-format +msgid "Service '%s' has been removed." +msgstr "æå¡ '%s' å·²ç»è¢«ç§»é¤ã" + +#: ../src/repos.cc:2327 +#, c-format +msgid "Refreshing service '%s'." +msgstr "æ£å¨å·æ°æå¡ '%s'ã" + +#: ../src/repos.cc:2336 +#, c-format +msgid "Problem retrieving the repository index file for service '%s':" +msgstr "ä»å®è£æºæ¥åæå¡ '%s' çç´¢å¼æä»¶åºéï¼" + +#: ../src/repos.cc:2338 +msgid "Check if the URI is valid and accessible." +msgstr "æ£æ¥ URI æ¯ææçä¸å¯è®¿é®çã" + +#: ../src/repos.cc:2396 +#, c-format +msgid "Skipping disabled service '%s'" +msgstr "æ£å¨è·³è¿å·²ç¦ç¨çæå¡ '%s'" + +#: ../src/repos.cc:2442 +#, c-format +msgid "Skipping service '%s' because of the above error." +msgstr "æ£å¨è·³è¿åºç°å¦ä¸éè¯¯çæå¡ '%s' ã" + +#: ../src/repos.cc:2457 +#, c-format +msgid "Use '%s' or '%s' commands to add or enable services." +msgstr "ä½¿ç¨ '%s' æè '%s' å½ä»¤æ·»å æå¯ç¨æå¡ã" + +#: ../src/repos.cc:2460 +msgid "Specified services are not enabled or defined." +msgstr "æå®æå¡æ²¡æè¢«å¯ç¨æèå®ä¹ã" + +#: ../src/repos.cc:2462 +msgid "There are no enabled services defined." +msgstr "æªå®ä¹å·²å¯ç¨çæå¡ã" + +#: ../src/repos.cc:2466 +msgid "Could not refresh the services because of errors." +msgstr "ç±äºåºéæ æ³å·æ°æå¡ã" + +#: ../src/repos.cc:2472 +msgid "Some of the services have not been refreshed because of an error." +msgstr "ç±äºåºéï¼ä¸äºæå¡æªè¢«å·æ°ã" + +#: ../src/repos.cc:2477 +msgid "Specified services have been refreshed." +msgstr "æå®æå¡åå·²å·æ°ã" + +#: ../src/repos.cc:2479 +msgid "All services have been refreshed." +msgstr "æææå¡åå·²å·æ°ã" + +#: ../src/repos.cc:2601 +#, c-format +msgid "Service '%s' has been sucessfully enabled." +msgstr "æåå¯ç¨æå¡ '%s'ã" + +#: ../src/repos.cc:2604 +#, c-format +msgid "Service '%s' has been sucessfully disabled." +msgstr "æåç¦ç¨æå¡ '%s'ã" + +#: ../src/repos.cc:2611 +#, c-format +msgid "Autorefresh has been enabled for service '%s'." +msgstr "å·²å¯ç¨æå¡ '%s' çèªå¨å·æ°ã" + +#: ../src/repos.cc:2614 +#, c-format +msgid "Autorefresh has been disabled for service '%s'." +msgstr "å·²ç¦ç¨æå¡ '%s' çèªå¨å·æ°ã" + +#: ../src/repos.cc:2620 +#, c-format +msgid "Name of service '%s' has been set to '%s'." +msgstr "æå¡ '%s' åç§°è¢«è®¾å®ä¸º '%s'ã" + +#: ../src/repos.cc:2626 +#, c-format +msgid "Repository '%s' has been added to enabled repositories of service '%s'" +msgid_plural "Repositories '%s' have been added to enabled repositories of service '%s'" +msgstr[0] "å®è£æº '%s' å·²è¢«å å¥æå¡ '%s' ä¸è¢«å¯ç¨çå®è£æºã" + +#: ../src/repos.cc:2634 +#, c-format +msgid "Repository '%s' has been added to disabled repositories of service '%s'" +msgid_plural "Repositories '%s' have been added to disabled repositories of service '%s'" +msgstr[0] "å®è£æº '%s' å·²è¢«å å¥æå¡ '%s' ä¸è¢«ç¦ç¨çå®è£æºã" + +#: ../src/repos.cc:2642 +#, c-format +msgid "Repository '%s' has been removed from enabled repositories of service '%s'" +msgid_plural "Repositories '%s' have been removed from enabled repositories of service '%s'" +msgstr[0] "å®è£æº '%s' å·²ä»æå¡ '%s' ä¸è¢«å¯ç¨çå®è£æºä¸ç§»é¤ã" + +#: ../src/repos.cc:2650 +#, c-format +msgid "Repository '%s' has been removed from disabled repositories of service '%s'" +msgid_plural "Repositories '%s' have been removed from disabled repositories of service '%s'" +msgstr[0] "å®è£æº '%s' å·²ä»æå¡ '%s' ä¸è¢«ç¦ç¨çå®è£æºä¸ç§»é¤ã" + +#: ../src/repos.cc:2659 +#, c-format +msgid "Nothing to change for service '%s'." +msgstr "å¯¹æå¡ '%s' æªä½ä»»ä½æ¹åã" + +#: ../src/repos.cc:2666 +msgid "Error while modifying the service:" +msgstr "ä¿®æ¹æå¡æ¶åºç°éè¯¯ï¼" + +#: ../src/repos.cc:2667 +#, c-format +msgid "Leaving service %s unchanged." +msgstr "æå¡ %s æªææ¹åã" + +#: ../src/repos.cc:2774 +msgid "Loading repository data..." +msgstr "æ£å¨å è½½å®è£æºæ°æ®..." + +#: ../src/repos.cc:2792 +#, c-format +msgid "Retrieving repository '%s' data..." +msgstr "æ£å¨æ¥åå®è£æº %s çæ°æ®..." + +#: ../src/repos.cc:2799 +#, c-format +msgid "Repository '%s' not cached. Caching..." +msgstr "å®è£æº '%s' æªè¢«ç¼åãæ£å¨ç¼åä¸..." + +#: ../src/repos.cc:2806 +#: ../src/repos.cc:2834 +#, c-format +msgid "Problem loading data from '%s'" +msgstr "ä» '%s' å è½½æ°æ®åºé" + +#: ../src/repos.cc:2807 +#: ../src/repos.cc:2840 +#, c-format +msgid "Resolvables from '%s' not loaded because of error." +msgstr "åºç°éè¯¯ï¼æªå è½½æ¥èª '%s' çå¯è§£æé¡¹ã" + +#: ../src/repos.cc:2823 +#, c-format +msgid "Repository '%s' appears to outdated. Consider using a different mirror or server." +msgstr "å®è£æº '%s' å¯è½å·²ç»è¿æå¤±æãè¯·èèä½¿ç¨ä¸ä¸ªä¸åçéåææå¡å¨ã" + +#. translators: the first %s is 'zypper refresh' and the second 'zypper clean -m' +#: ../src/repos.cc:2836 +#, c-format +msgid "Try '%s', or even '%s' before doing so." +msgstr "å°è¯ '%s'ï¼æä¹åä½¿ç¨ '%s'ã" + +#: ../src/repos.cc:2849 +msgid "Reading installed packages..." +msgstr "æ£å¨è¯»åå·²å®è£çè½¯ä»¶å..." + +#: ../src/repos.cc:2860 +msgid "Problem occured while reading the installed packages:" +msgstr "è¯»åå·²å®è£è½¯ä»¶åæ¶åºç°é®é¢ï¼" + +#. list name, exact match +#: ../src/repos.cc:2875 +msgid "" +"ZENworks Management Daemon is running.\n" +"WARNING: this command will not synchronize changes.\n" +"Use rug or yast2 for that." +msgstr "" +"ZENworks ç®¡çåå°æ£å¨è¿è¡ã\n" +"è¦åï¼æ¤å½ä»¤å°ä¸åæ¥åæ´ã\n" +"è¯·ç¨ rug æè yast2 åæ¥ã" + +#. translators: Bundle is a term used in rug. See rug for how to translate it. +#: ../src/search.cc:42 +#: ../src/search.cc:444 +#: ../src/update.cc:402 +msgid "Bundle" +msgstr "æç»è½¯ä»¶" + +#. translators: package version (header) +#. best_effort does not know version or arch yet +#: ../src/search.cc:46 +#: ../src/search.cc:60 +#: ../src/search.cc:265 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:535 +#: ../src/update.cc:152 +#: ../src/update.cc:407 +msgid "Version" +msgstr "çæ¬" + +#. translators: package architecture (header) +#: ../src/search.cc:48 +#: ../src/search.cc:62 +#: ../src/search.cc:447 +#: ../src/update.cc:407 +msgid "Arch" +msgstr "åæ¡£" + +#: ../src/search.cc:178 +#: ../src/search.cc:192 +msgid "System Packages" +msgstr "ç³»ç»è½¯ä»¶å" + +#. translators: package summary (header) +#: ../src/search.cc:217 +msgid "Summary" +msgstr "å°ç»" + +#: ../src/search.cc:347 +msgid "No needed patches found." +msgstr "æ¾ä¸å°éè¦çè¡¥ä¸ç¨åºã" + +#: ../src/search.cc:419 +msgid "No patterns found." +msgstr "æ²¡ææ¾å°æ ·å¼ã" + +#: ../src/search.cc:497 +#: ../src/Zypper.cc:3301 +msgid "No packages found." +msgstr "æ²¡ææ¾å°è½¯ä»¶åã" + +#: ../src/search.cc:574 +msgid "No products found." +msgstr "æ²¡ææ¾å°äº§åã" + +#: ../src/search.cc:597 +#, c-format +msgid "No providers of '%s' found." +msgstr "æ¾ä¸å° '%s' æä¾èã" + +#. translators: meaning 'dependency problem' found during solving +#: ../src/solve-commit.cc:44 +msgid "Problem: " +msgstr "é®é¢ï¼" + +#. TranslatorExplanation %d is the solution number +#: ../src/solve-commit.cc:57 +#, c-format +msgid " Solution %d: " +msgstr "æ¹æ¡ %dï¼" + +#: ../src/solve-commit.cc:76 +msgid "Choose the above solution using '1' or skip, retry or cancel" +msgid_plural "Choose from above solutions by number or skip, retry or cancel" +msgstr[0] "è¯·ä»ä»¥ä¸æ¹æ¡ä¸éæ©ï¼æ°åãè·³è¿ãéè¯æèåæ¶" + +#. translators: translate 'c' to whatever you translated the 'c' in +#. "c" and "s/r/c" strings +#: ../src/solve-commit.cc:83 +msgid "Choose the above solution using '1' or cancel using 'c'" +msgid_plural "Choose from above solutions by number or cancel" +msgstr[0] "è¯·ä»ä»¥ä¸æ¹æ¡ä¸éæ©ï¼æ°åæèåæ¶" + +#. translators: answers for dependency problem solution input prompt: +#. "Choose from above solutions by number or skip, retry or cancel" +#. Translate the letters to whatever is suitable for your language. +#. The anserws must be separated by slash characters '/' and must +#. correspond to skip/retry/cancel in that order. +#. The answers should be lower case letters. +#: ../src/solve-commit.cc:102 +msgid "s/r/c" +msgstr "s/r/c" + +#. translators: answers for dependency problem solution input prompt: +#. "Choose from above solutions by number or cancel" +#. Translate the letter 'c' to whatever is suitable for your language +#. and to the same as you translated it in the "s/r/c" string +#. See the "s/r/c" comment for other details. +#. One letter string for translation can be tricky, so in case of problems, +#. please report a bug against zypper at bugzilla.novell.com, we'll try to solve it. +#: ../src/solve-commit.cc:114 +msgid "c" +msgstr "c" + +#. continue with next problem +#: ../src/solve-commit.cc:134 +#, c-format +msgid "Applying solution %s" +msgstr "åºç¨æ¹æ¡ %s" + +#: ../src/solve-commit.cc:158 +#, c-format +msgid "%d Problem:" +msgid_plural "%d Problems:" +msgstr[0] "%d é®é¢ï¼" + +#. should not happen! If solve() failed at least one problem must be set! +#: ../src/solve-commit.cc:162 +msgid "Specified capability not found" +msgstr "æªæ¾å°æå®çåè½ã" + +#: ../src/solve-commit.cc:173 +#, c-format +msgid "Problem: %s" +msgstr "é®é¢ï¼%s" + +#: ../src/solve-commit.cc:188 +msgid "Resolving dependencies..." +msgstr "æ£å¨è§£æä¾èµæ§..." + +#: ../src/solve-commit.cc:369 +msgid "The following package is going to be upgraded:" +msgid_plural "The following packages are going to be upgraded:" +msgstr[0] "ä»¥ä¸è½¯ä»¶åå°è¢«åçº§ï¼" + +#: ../src/solve-commit.cc:374 +msgid "The following patch is going to be upgraded:" +msgid_plural "The following patches are going to be upgraded:" +msgstr[0] "ä»¥ä¸è¡¥ä¸å°è¢«åçº§ï¼" + +#: ../src/solve-commit.cc:379 +msgid "The following pattern is going to be upgraded:" +msgid_plural "The following patterns are going to be upgraded:" +msgstr[0] "ä»¥ä¸æ¨¡å¼å°è¢«åçº§ï¼" + +#: ../src/solve-commit.cc:384 +msgid "The following product is going to be upgraded:" +msgid_plural "The following products are going to be upgraded:" +msgstr[0] "ä»¥ä¸äº§åå°è¢«åçº§ï¼" + +#: ../src/solve-commit.cc:391 +msgid "The following package is going to be downgraded:" +msgid_plural "The following packages are going to be downgraded:" +msgstr[0] "ä»¥ä¸è½¯ä»¶åå°è¢«éçº§ï¼" + +#: ../src/solve-commit.cc:396 +msgid "The following patch is going to be downgraded:" +msgid_plural "The following patches are going to be downgraded:" +msgstr[0] "ä»¥ä¸è¡¥ä¸å°è¢«éçº§ï¼" + +#: ../src/solve-commit.cc:401 +msgid "The following pattern is going to be downgraded:" +msgid_plural "The following patterns are going to be downgraded:" +msgstr[0] "ä»¥ä¸æ¨¡å¼å°è¢«éçº§ï¼" + +#: ../src/solve-commit.cc:406 +msgid "The following product is going to be downgraded:" +msgid_plural "The following products are going to be downgraded:" +msgstr[0] "ä»¥ä¸äº§åå°è¢«éçº§ï¼" + +#: ../src/solve-commit.cc:413 +msgid "The following NEW package is going to be installed:" +msgid_plural "The following NEW packages are going to be installed:" +msgstr[0] "ä»¥ä¸æ°çè½¯ä»¶åå°è¢«å®è£ï¼" + +#: ../src/solve-commit.cc:418 +msgid "The following NEW patch is going to be installed:" +msgid_plural "The following NEW patches are going to be installed:" +msgstr[0] "ä»¥ä¸æ°çè¡¥ä¸å°è¢«å®è£ï¼" + +#: ../src/solve-commit.cc:423 +msgid "The following NEW pattern is going to be installed:" +msgid_plural "The following NEW patterns are going to be installed:" +msgstr[0] "ä»¥ä¸æ°çæ¨¡å¼å°è¢«å®è£ï¼" + +#: ../src/solve-commit.cc:428 +msgid "The following NEW product is going to be installed:" +msgid_plural "The following NEW products are going to be installed:" +msgstr[0] "ä»¥ä¸æ°çäº§åå°è¢«å®è£ï¼" + +#: ../src/solve-commit.cc:433 +msgid "The following source package is going to be installed:" +msgid_plural "The following source packages are going to be installed:" +msgstr[0] "ä»¥ä¸æºä»£ç åå°è¢«å®è£ï¼" + +#: ../src/solve-commit.cc:440 +msgid "The following package is going to be reinstalled:" +msgid_plural "The following packages are going to be reinstalled:" +msgstr[0] "ä»¥ä¸è½¯ä»¶åå°è¢«éæ°å®è£ï¼" + +#: ../src/solve-commit.cc:445 +msgid "The following patch is going to be reinstalled:" +msgid_plural "The following patches are going to be reinstalled:" +msgstr[0] "ä»¥ä¸è¡¥ä¸å°è¢«éæ°å®è£ï¼" + +#: ../src/solve-commit.cc:450 +msgid "The following pattern is going to be reinstalled:" +msgid_plural "The following patterns are going to be reinstalled:" +msgstr[0] "ä»¥ä¸æ¨¡å¼å°è¢«éæ°å®è£ï¼" + +#: ../src/solve-commit.cc:455 +msgid "The following product is going to be reinstalled:" +msgid_plural "The following products are going to be reinstalled:" +msgstr[0] "ä»¥ä¸äº§åå°è¢«éæ°å®è£ï¼" + +#: ../src/solve-commit.cc:462 +msgid "The following package is going to be REMOVED:" +msgid_plural "The following packages are going to be REMOVED:" +msgstr[0] "ä»¥ä¸è½¯ä»¶åå°è¢«å é¤ï¼" + +#: ../src/solve-commit.cc:467 +msgid "The following patch is going to be REMOVED:" +msgid_plural "The following patches are going to be REMOVED:" +msgstr[0] "ä»¥ä¸è¡¥ä¸å°è¢«å é¤ï¼" + +#: ../src/solve-commit.cc:472 +msgid "The following pattern is going to be REMOVED:" +msgid_plural "The following patterns are going to be REMOVED:" +msgstr[0] "ä»¥ä¸æ¨¡å¼å°è¢«å é¤ï¼" + +#: ../src/solve-commit.cc:477 +msgid "The following product is going to be REMOVED:" +msgid_plural "The following products are going to be REMOVED:" +msgstr[0] "ä»¥ä¸äº§åå°è¢«å é¤ï¼" + +#: ../src/solve-commit.cc:484 +msgid "The following package is going to change architecture:" +msgid_plural "The following packages are going to change architecture:" +msgstr[0] "ä»¥ä¸è½¯ä»¶åå°æ¹åä½ç³»ï¼" + +#: ../src/solve-commit.cc:489 +msgid "The following patch is going to change architecture:" +msgid_plural "The following patches are going to change architecture:" +msgstr[0] "ä»¥ä¸è¡¥ä¸å°æ¹åä½ç³»ï¼" + +#: ../src/solve-commit.cc:494 +msgid "The following pattern is going to change architecture:" +msgid_plural "The following patterns are going to change architecture:" +msgstr[0] "ä»¥ä¸æ¨¡å¼å°æ¹åä½ç³»ï¼" + +#: ../src/solve-commit.cc:499 +msgid "The following product is going to change architecture:" +msgid_plural "The following products are going to change architecture:" +msgstr[0] "ä»¥ä¸äº§åå°æ¹åä½ç³»ï¼" + +#: ../src/solve-commit.cc:506 +msgid "The following package is going to change vendor:" +msgid_plural "The following packages are going to change vendor:" +msgstr[0] "ä»¥ä¸è½¯ä»¶åçåè¡æ¹å°æ¹åï¼" + +#: ../src/solve-commit.cc:511 +msgid "The following patch is going to change vendor:" +msgid_plural "The following patches are going to change vendor:" +msgstr[0] "ä»¥ä¸è¡¥ä¸çåè¡æ¹å°æ¹åï¼" + +#: ../src/solve-commit.cc:516 +msgid "The following pattern is going to change vendor:" +msgid_plural "The following patterns are going to change vendor:" +msgstr[0] "ä»¥ä¸æ¨¡å¼çåè¡æ¹å°æ¹åï¼" + +#: ../src/solve-commit.cc:521 +msgid "The following product is going to change vendor:" +msgid_plural "The following products are going to change vendor:" +msgstr[0] "ä»¥ä¸äº§åçåè¡æ¹å°æ¹åï¼" + +#: ../src/solve-commit.cc:529 +msgid "The following package is not supported by its vendor:" +msgid_plural "The following packages are not supported by their vendor:" +msgstr[0] "ä»¥ä¸è½¯ä»¶åçä¸è¢«å¶æä¾èæ¯æï¼" + +#: ../src/solve-commit.cc:603 +msgid "Dependencies of all installed packages are satisfied." +msgstr "ææå·²å®è£çè½¯ä»¶åçä¾èµå³ç³»é½æ»¡è¶³ã" + +#: ../src/solve-commit.cc:605 +msgid "Nothing to do." +msgstr "æ æä½ã" + +#: ../src/solve-commit.cc:610 +msgid "Some of the dependencies of installed packages are broken. In order to fix these dependencies, the following actions need to be taken:" +msgstr "ä¸äºå®è£çè½¯ä»¶åä¾èµå³ç³»å·²ç»æåãè¦ä¿®å¤ä¾èµï¼éè¦æ§è¡ä»¥ä¸æä½ï¼" + +#: ../src/solve-commit.cc:764 +#, c-format +msgid "Overall download size: %s." +msgstr "æ»ä¸è½½å¤§å°ï¼%s ã" + +#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K +#: ../src/solve-commit.cc:769 +#, c-format +msgid "After the operation, additional %s will be used." +msgstr "æä½å®æåï¼é¢å¤ç %s ç©ºé´å°ä¼è¢«ä½¿ç¨ã" + +#: ../src/solve-commit.cc:772 +msgid "No additional space will be used or freed after the operation." +msgstr "æä½å®æåï¼ä¸ä¼å ç¨æéæ¾é¢å¤çç©ºé´ã" + +#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K +#: ../src/solve-commit.cc:779 +#, c-format +msgid "After the operation, %s will be freed." +msgstr "æä½å®æåï¼%s å°è¢«éæ¾ã" + +#. translators: meaning --force-resolution and --no-force-resolution +#: ../src/solve-commit.cc:829 +#, c-format +msgid "%s conflicts with %s, will use the less aggressive %s" +msgstr "%s ä¸ %s å²çªï¼å°ä½¿ç¨æ²¡æè¿ä¹æ¿è¿ç %s" + +#: ../src/solve-commit.cc:855 +msgid "Force resolution:" +msgstr "å¼ºå¶åè¾¨çï¼" + +#: ../src/solve-commit.cc:911 +msgid "Verifying dependencies..." +msgstr "æ£å¨æ£æ¥ä¾èµå³ç³»..." + +#: ../src/solve-commit.cc:920 +msgid "Computing upgrade..." +msgstr "è®¡ç®åçº§..." + +#: ../src/solve-commit.cc:931 +msgid "Generating solver test case..." +msgstr "æ£å¨çæè§£æç¨åºè¯ä¾..." + +#: ../src/solve-commit.cc:934 +#, c-format +msgid "Solver test case generated successfully at %s." +msgstr "è§£æç¨åºè¯ä¾å¨ %s æåçæã" + +#: ../src/solve-commit.cc:938 +msgid "Error creating the solver test case." +msgstr "åå»ºè§£æç¨åºä¾èµå³ç³»çè¯ä¾åºéã" + +#: ../src/solve-commit.cc:977 +msgid "Computing distribution upgrade..." +msgstr "æ£å¨è®¡ç®å¤§çæ¬åçº§..." + +#: ../src/solve-commit.cc:983 +msgid "Resolving package dependencies..." +msgstr "æ£å¨è§£æè½¯ä»¶åä¾èµæ§..." + +#: ../src/solve-commit.cc:1009 +msgid "Root privileges are required to fix broken package dependencies." +msgstr "ä¿®å¤è½¯ä»¶åä¾èµå³ç³»éè¦æ root ç¹æã" + +#. translators: Yes / No / show Problems. This prompt will appear +#. after install/update command summary if there will be any package +#. to-be-removed automatically to show why, if asked. +#. Translate to whathever is suitable for your language +#. The anserws must be separated by slash characters '/' and must +#. correspond to yes/no/showproblems in that order. +#. The answers should be lower case letters. +#: ../src/solve-commit.cc:1026 +msgid "y/n/p" +msgstr "y/n/p" + +#. translators: help text for 'y' option in the y/n/p prompt +#: ../src/solve-commit.cc:1028 +msgid "Accept the summary and proceed with installation/removal of packages." +msgstr "æ¥åæ¦è¿°ï¼ç»§ç»å®è£/å é¤è½¯ä»¶åã" + +#. translators: help text for 'n' option in the y/n/p prompt +#: ../src/solve-commit.cc:1030 +msgid "Cancel the operation." +msgstr "åæ¶æä½ã" + +#. translators: help text for 'p' option in the y/n/p prompt +#: ../src/solve-commit.cc:1032 +msgid "Restart solver in no-force-resolution mode in order to show dependency problems." +msgstr "éæ°ä»¥æ å¼ºå¶è§£å³æ¨¡å¼å¯å¨è§£æç¨åºï¼ä»¥æ¾ç¤ºä¾èµæ§é®é¢ã" + +#: ../src/solve-commit.cc:1074 +msgid "committing" +msgstr "æ£å¨æäº¤" + +#: ../src/solve-commit.cc:1079 +msgid "(dry run)" +msgstr "(æ¼ä¹ )" + +#: ../src/solve-commit.cc:1108 +#: ../src/solve-commit.cc:1147 +msgid "Problem retrieving the package file from the repository:" +msgstr "ä»è½¯ä»¶æºä¸è½½è½¯ä»¶åæä»¶åºéï¼" + +#. translators: the first %s is 'zypper refresh' and the second +#. is repo allias +#: ../src/solve-commit.cc:1143 +#, c-format +msgid "Repository '%s' is out of date. Running '%s' might help." +msgstr "è½¯ä»¶æº '%s' å¤ªæ§ãè¿è¡ '%s' å¯è½ææã" + +#: ../src/solve-commit.cc:1155 +msgid "" +"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n" +"\n" +"- just retry previous command\n" +"- refresh the repositories using 'zypper refresh'\n" +"- use another installation medium (if e.g. damaged)\n" +"- use another repository" +msgstr "" +"è½¯ä»¶åå®æ´æ§æ£æ¥å¤±è´¥ãå¯è½æ¯å ä¸ºå®è£æºæä»è´¨åå¨é®é¢ãè¯·å°è¯ä»¥ä¸æä¸ªæä½ï¼\n" +" \n" +" ï¼ éè¯åä¸ä¸ªå½ä»¤\n" +" ï¼ ä½¿ç¨âzypper refreshâå·æ°å®è£æº\n" +" ï¼ ä½¿ç¨å¶ä»å®è£ä»è´¨(å¦æå·²ç»æå)\n" +" ï¼ ä½¿ç¨å¶ä»å®è£æº" + +#: ../src/solve-commit.cc:1168 +msgid "Problem occured during or after installation or removal of packages:" +msgstr "ä¸åè½¯ä»¶åå¨å®è£æé´æå®è£åæç§»é¤æ¶åºç°é®é¢ï¼" + +#: ../src/solve-commit.cc:1188 +msgid "One of installed patches requires reboot of your machine. Reboot as soon as possible." +msgstr "å®è£çè¡¥ä¸ä¹ä¸éè¦éæ°å¯å¨è®¡ç®æºãè¯·å°½å¿«éå¯ã" + +#: ../src/solve-commit.cc:1192 +msgid "One of installed patches affects the package manager itself. Run this command once more to install any other needed patches." +msgstr "å¶ä¸ä¸ä¸ªå·²å®è£è¡¥ä¸å½±åå°è½¯ä»¶åç®¡çç¨åºæ¬èº«ãéæ°è¿è¡æ¤å½ä»¤ä»¥å®è£å¶å®æéè¡¥ä¸ã" + +#. translators: %d is the number of needed patches +#: ../src/update.cc:65 +#, c-format +msgid "%d patch needed" +msgid_plural "%d patches needed" +msgstr[0] "éè¦ %d ä¸ªè¡¥ä¸" + +#. translators: %d is the number of security patches +#: ../src/update.cc:69 +#, c-format +msgid "%d security patch" +msgid_plural "%d security patches" +msgstr[0] "%d ä¸ªå®å¨è¡¥ä¸" + +#: ../src/update.cc:174 +#: ../src/utils/misc.cc:113 +msgid "Needed" +msgstr "éè¦" + +#: ../src/update.cc:190 +msgid "" +"These are only the updates affecting the updater itself.\n" +"Other updates are available too.\n" +msgstr "" +"è¿äºåªæ¯å½±åæ´æ°ç¨åºæ¬èº«çæ´æ°ã\n" +"è¿åå¨å¶ä»å¯ç¨æ´æ°ã\n" + +#: ../src/update.cc:198 +#: ../src/update.cc:448 +msgid "No updates found." +msgstr "æ²¡ææ´æ°ã" + +#: ../src/update.cc:333 +msgid "Package updates" +msgstr "è½¯ä»¶åæ´æ°" + +#: ../src/update.cc:335 +msgid "Patches" +msgstr "è¡¥ä¸" + +#: ../src/update.cc:337 +msgid "Pattern updates" +msgstr "æ¨¡å¼æ´æ°" + +#: ../src/update.cc:339 +msgid "Product updates" +msgstr "äº§åæ´æ°" + +#: ../src/update.cc:512 +#, c-format +msgid "Cannot parse '%s < %s'" +msgstr "æ æ³åæ '%s < %s'" + +#. translators: %s is the name of a patch +#: ../src/update.cc:568 +#, c-format +msgid "'%s' is interactive, skipping." +msgstr "'%s'æ¯äº¤äºçï¼è·³è¿ã" + +#: ../src/update.cc:623 +#, c-format +msgid "No patches matching '%s' found." +msgstr "æ²¡ææ¾å°å¹é '%s' çè¡¥ä¸ã" + +#: ../src/update.cc:626 +#, c-format +msgid "Patch '%s' not found." +msgstr "æ²¡ææ¾å°è¡¥ä¸ '%s'ã" + +#: ../src/update.cc:694 +#, c-format +msgid "No packages matching '%s' are installed." +msgstr "æ²¡æå¹é '%s' çè½¯ä»¶åè¢«å®è£ã" + +#: ../src/update.cc:697 +#, c-format +msgid "Package '%s' is not installed." +msgstr "è½¯ä»¶å '%s' æ²¡æå®è£ã" + +#: ../src/update.cc:714 +#, c-format +msgid "No update candidate for '%s'." +msgstr "æ²¡æ'%s'çæ´æ°åéã" + +#: ../src/utils/getopt.cc:57 +msgid "Unknown option " +msgstr "æªç¥éé¡¹" + +#: ../src/utils/getopt.cc:60 +msgid "Missing argument for " +msgstr "ç¼ºå°ä»¥ä¸é¡¹çèªåé" + +#. translators: speaking of two mutually contradicting command line options +#: ../src/utils/getopt.cc:87 +#, c-format +msgid "%s used together with %s, which contradict each other. This property will be left unchanged." +msgstr "%s å %s å¨ä¸èµ·ç¸æµè§¦ãè¿ä¸ªå±æ§å°ä¸åä¿®æ¹ã" + +#: ../src/utils/messages.cc:22 +msgid "Please file a bug report about this." +msgstr "è¯·æäº¤å³äºæ¤æåµçéè¯¯æ¥åã" + +#. TranslatorExplanation remember not to translate the URL +#. unless you translate the actual page :) +#: ../src/utils/messages.cc:25 +msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." +msgstr "è¯·åé http://en.opensuse.org/Zypper#Troubleshooting ç«ç¹ä¸çæå¯¼ã" + +#: ../src/utils/messages.cc:40 +#: ../src/utils/messages.cc:50 +#: ../src/utils/messages.cc:68 +#: ../src/Zypper.cc:3677 +msgid "Usage" +msgstr "ç¨æ³" + +#: ../src/utils/messages.cc:41 +msgid "Too many arguments." +msgstr "å¤ªå¤èªåéã" + +#: ../src/utils/messages.cc:48 +#: ../src/Zypper.cc:2706 +#: ../src/Zypper.cc:3674 +msgid "Required argument missing." +msgstr "ç¼ºå°éè¦çä¿¡æ¯ã" + +#: ../src/utils/messages.cc:60 +#, c-format +msgid "The '--%s' option has currently no effect." +msgstr " '--%s' éé¡¹å½åæ æã" + +#: ../src/utils/messages.cc:78 +#, c-format +msgid "You have chosen to ignore a problem with download or installation of a package which might lead to broken dependencies of other packages. It is recommended to run '%s' after the operation has finished." +msgstr "æ¨éæ©äºå¿½ç¥è½¯ä»¶åå®è£æä¸è½½ä¸çä¸ä¸ªéè¯¯ï¼å¯è½å¯¼è´æ æ³æ»¡è¶³å¶å®è½¯ä»¶åä¾èµæ§ãæ¨èæ¤æä½ç»æåæ§è¡ '%s' ã" + +#: ../src/utils/misc.cc:87 +msgid "package" +msgid_plural "packages" +msgstr[0] "è½¯ä»¶å" + +#: ../src/utils/misc.cc:89 +msgid "pattern" +msgid_plural "patterns" +msgstr[0] "æ¨¡å¼" + +#: ../src/utils/misc.cc:91 +msgid "product" +msgid_plural "product" +msgstr[0] "äº§å" + +#: ../src/utils/misc.cc:93 +msgid "patch" +msgid_plural "patches" +msgstr[0] "è¡¥ä¸" + +#: ../src/utils/misc.cc:95 +msgid "srcpackage" +msgid_plural "srcpackages" +msgstr[0] "æºä»£ç å" + +#. default +#: ../src/utils/misc.cc:97 +msgid "resolvable" +msgid_plural "resolvables" +msgstr[0] "å¯è§£æé¡¹" + +#: ../src/utils/misc.cc:106 +msgid "Unknown" +msgstr "æªç¥" + +#: ../src/utils/misc.cc:118 +msgid "Not Applicable" +msgstr "ä¸éç¨" + +#: ../src/utils/misc.cc:191 +msgid "Specified local path does not exist or is not accessible." +msgstr "æå®çæ¬å°è·¯å¾ä¸åå¨æèæ æéè®¿é®ã" + +#: ../src/utils/misc.cc:203 +msgid "Given URI is invalid" +msgstr "æç»ç URL æ æ" + +#: ../src/utils/misc.cc:254 +msgid "Problem copying the specified RPM file to the cache directory." +msgstr "å¤å¶æå® RPM æä»¶å°ç¼åç®å½æ¶åºç°é®é¢ã" + +#: ../src/utils/misc.cc:255 +msgid "Perhaps you are running out of disk space." +msgstr "å¯è½ä½ çç£çç©ºé´ä¸å¤äºã" + +#: ../src/utils/misc.cc:263 +msgid "Problem retrieving the specified RPM file" +msgstr "ä¸è½½æå® RPM æä»¶åºé" + +#: ../src/utils/misc.cc:264 +msgid "Please check whether the file is accessible." +msgstr "è¯·æ£æ¥æä»¶æ¯å¦å¯ä»¥è®¿é®ã" + +#: ../src/utils/misc.cc:321 +#, c-format +msgid "Cannot parse capability '%s'." +msgstr "æ æ³è§£æ capability '%s'ã" + +#: ../src/utils/pager.cc:35 +#, c-format +msgid "Press '%c' to exit the pager." +msgstr "æ '%c' éåºå°åé¡µå¨ã" + +#: ../src/utils/pager.cc:47 +msgid "Use arrows or pgUp/pgDown keys to scroll the text by lines or pages." +msgstr "ä½¿ç¨æ¹åé®æè pgUp/pgDown é®åå«æè¡åæé¡µæ»å¨ææ¬ã" + +#: ../src/utils/pager.cc:51 +msgid "Use the Enter or Space key to scroll the text by lines or pages." +msgstr "ä½¿ç¨åè½¦æç©ºæ ¼é®åå«æè¡ææé¡µæ»å¨ææ¬ã" + +# internal key used: Cancel +#. ---------------------------------------------------------------------------- +#: ../src/utils/prompt.cc:88 +msgid "abort" +msgstr "ä¸æ¢" + +#: ../src/utils/prompt.cc:88 +msgid "retry" +msgstr "éè¯" + +#: ../src/utils/prompt.cc:88 +msgid "ignore" +msgstr "å¿½ç¥" + +#: ../src/utils/prompt.cc:100 +msgid "Abort, retry, ignore?\n" +msgstr "ä¸æ¢ãéè¯ãå¿½ç¥ï¼\n" + +#: ../src/utils/prompt.cc:135 +#, c-format +msgid "autoselect %s after %u " +msgstr "èªå¨éæ© %s ç±äº %u " + +#. translators: "a/r/i" are the answers to the +#. "Abort, retry, ignore?" prompt +#. Translate the letters to whatever is suitable for your language. +#. the answers must be separated by slash characters '/' and must +#. correspond to abort/retry/ignore in that order. +#. The answers should be lower case letters. +#: ../src/utils/prompt.cc:159 +msgid "a/r/i" +msgstr "a/r/i" + +#: ../src/utils/prompt.cc:160 +msgid "Abort, retry, ignore?" +msgstr "ä¸æ¢ãéè¯ãå¿½ç¥ï¼" + +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:197 +#: ../src/utils/prompt.cc:253 +msgid "yes" +msgstr "æ¯" + +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:198 +#: ../src/utils/prompt.cc:253 +msgid "no" +msgstr "å¦" + +#: ../src/utils/prompt.cc:245 +#, c-format +msgid "Invalid answer '%s'." +msgstr "æ æçåå¤ '%s'ã" + +#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers. +#. The second and the third %s is the translated 'yes' and 'no' string (lowercase). +#: ../src/utils/prompt.cc:252 +#, c-format +msgid "Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you." +msgstr "å¦æå¶å®è¾å¥æ¹æ³ä¸å¯ç¨ï¼é®å¥ 'y' ä¸º '%s'ï¼é®å¥ 'n' ä¸º '%s'ã" + +#: ../src/utils/prompt.cc:266 +#, c-format +msgid "" +"If you run zypper without a terminal, use '%s' global\n" +"option to make zypper use default answers to prompts." +msgstr "" +"å¦ææ¨ä¸ä½¿ç¨ç»ç«¯è¿è¡ zypperï¼è¯·ç¨ '%s' å¨å±éé¡¹\n" +"ä»¥ä½¿ zypper ä½¿ç¨é»è®¤åçã" + +#. TranslatorExplanation These are reasons for various failures. +#: ../src/utils/prompt.h:125 +msgid "Not found" +msgstr "æªæ¾å°" + +# error box title +#: ../src/utils/prompt.h:125 +msgid "I/O error" +msgstr "I/O éè¯¯" + +#: ../src/utils/prompt.h:125 +msgid "Invalid object" +msgstr "æ æå¯¹è±¡ã" + +#: ../src/utils/prompt.h:132 +msgid "Error" +msgstr "éè¯¯" + +#: ../src/Zypper.cc:153 +msgid "" +" Global Options:\n" +"\t--help, -h\t\tHelp.\n" +"\t--version, -V\t\tOutput the version number.\n" +"\t--quiet, -q\t\tSuppress normal output, print only error\n" +"\t\t\t\tmessages.\n" +"\t--verbose, -v\t\tIncrease verbosity.\n" +"\t--no-abbrev, -A\t\tDo not abbreviate text in tables.\n" +"\t--table-style, -s\tTable style (integer).\n" +"\t--rug-compatible, -r\tTurn on rug compatibility.\n" +"\t--non-interactive, -n\tDo not ask anything, use default answers\n" +"\t\t\t\tautomatically.\n" +"\t--xmlout, -x\t\tSwitch to XML output.\n" +"\t--reposd-dir, -D <dir>\tUse alternative repository definition files\n" +"\t\t\t\tdirectory.\n" +"\t--cache-dir, -C <dir>\tUse alternative meta-data cache directory.\n" +"\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory.\n" +msgstr "" +" å¨å±éé¡¹ï¼\n" +"\t--help, -h\t\tå¸®å©ã\n" +"\t--version, -V\t\tè¾åºçæ¬å·ã\n" +"\t--quiet, -q\t\tåå°æ®éè¾åºï¼ä»æå°éè¯¯ä¿¡æ¯ã\n" +"\t--verbose, -v\t\tå¢å ä¿¡æ¯çè¯¦ç»ç¨åº¦\n" +"\t--no-abbrev, -A\t\tè¡¨æ ¼ä¸ä¸åºç°ç¼©åææ¬ã\n" +"\t--table-style, -s\tè¡¨æ ¼æ ·å¼ (æ´æ°)ã\n" +"\t--rug-compatible, -r\tå¼å¯ä¸ rug çå¼å®¹ã\n" +"\t--non-interactive, -n\tä¸è¯¢é®ä»»ä½é®é¢ï¼èªå¨ä½¿ç¨é»è®¤çåå¤ã\n" +"\t--xmlout, -x\t\tåæ¢å° XML è¾åºã\n" +"\t--reposd-dir, -D <dir>\tä½¿ç¨å¶ä»çå®è£æºå®ä¹æä»¶ç®å½ã\n" +"\t--cache-dir, -C <dir>\tä½¿ç¨å¶ä»çåæ°æ®ç¼åæ°æ®åºç®å½ã\n" +"\t--raw-cache-dir <dir>\tä½¿ç¨å¶ä»çåå§åæ°æ®ç¼åç®å½ã\n" + +#: ../src/Zypper.cc:171 +msgid "" +" Repository Options:\n" +"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" +"\t--plus-repo, -p <URI>\tUse an additional repository.\n" +"\t--disable-repositories\tDo not read meta-data from repositories.\n" +"\t--no-refresh\t\tDo not refresh the repositories.\n" +msgstr "" +" å®è£æºéé¡¹ï¼\n" +"\t--no-gpg-checks\t\tå¿½ç¥ GPG æ£æ¥å¤±è´¥å¹¶ç»§ç»ã\n" +"\t--plus-repo, -p <URI>\tä½¿ç¨éå å®è£æºã\n" +"\t--disable-repositories\tä¸ä»å®è£æºè¯»ååæ°æ®ã\n" +"\t--no-refresh\t\tä¸å·æ°å®è£æºã\n" + +#. translators: these belong to Repository Options main help text +#: ../src/Zypper.cc:178 +msgid "" +"\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" +"\t--no-remote\t\tIgnore remote repositories.\n" +msgstr "" +"\t--no-cd\t\t\tå¿½ç¥ CD/DVD å®è£æºã\n" +"\t--no-remote\t\tå¿½ç¥è¿ç¨å®è£æºã\n" + +#: ../src/Zypper.cc:182 +msgid "" +" Target Options:\n" +"\t--root, -R <dir>\tOperate on a different root directory.\n" +"\t--disable-system-resolvables\n" +"\t\t\t\tDo not read installed packages.\n" +msgstr "" +" ç®æ éé¡¹ï¼\n" +"\t--root, -R <dir>\tå¨ä¸åçæ ¹ç®å½ä¸æä½ã\n" +"\t--disable-system-resolvables\n" +"\t\t\t\tä¸è¯»åå·²å®è£è½¯ä»¶åã\n" + +#: ../src/Zypper.cc:189 +msgid "" +" Commands:\n" +"\thelp, ?\t\t\tPrint help.\n" +"\tshell, sh\t\tAccept multiple commands at once.\n" +msgstr "" +" å½ä»¤ï¼\n" +"\thelp, ?\t\t\tæå°å¸®å©ã\n" +"\tshell, sh\t\tä¸æ¬¡æ¥åå¤ä¸ªå½ä»¤.\n" + +#: ../src/Zypper.cc:194 +msgid "" +" Repository Management:\n" +"\trepos, lr\t\tList all defined repositories.\n" +"\taddrepo, ar\t\tAdd a new repository.\n" +"\tremoverepo, rr\t\tRemove specified repository.\n" +"\trenamerepo, nr\t\tRename specified repository.\n" +"\tmodifyrepo, mr\t\tModify specified repository.\n" +"\trefresh, ref\t\tRefresh all repositories.\n" +"\tclean\t\t\tClean local caches.\n" +msgstr "" +" å®è£æºç®¡çï¼\n" +"\trepos, lr\t\tååºææå®ä¹çå®è£æºã\n" +"\taddrepo, ar\t\tæ·»å ä¸ä¸ªæ°çå®è£æºã\n" +"\tremoverepo, rr\t\tå é¤æå®å®è£æºã\n" +"\trenamerepo, nr\t\téå½åæå®å®è£æºã\n" +"\tmodifyrepo, mr\t\tä¿®æ¹æå®çå®è£æºã\n" +"\trefresh, ref\t\tå·æ°ææå®è£æºã\n" +"\tclean\t\t\tæ¸çæ¬å°ç¼åã\n" + +#: ../src/Zypper.cc:204 +msgid "" +" Service Management:\n" +"\tservices, ls\t\tList all defined services.\n" +"\taddservice, as\t\tAdd a new service.\n" +"\tmodifyservice, ms\tModify specified service.\n" +"\tremoveservice, rs\tRemove specified service.\n" +"\trefresh-services, refs\tRefresh all services.\n" +msgstr "" +" æå¡ç®¡çï¼\n" +"\tservices, ls\t\tååºææå®ä¹çæå¡ã\n" +"\taddservice, as\t\tæ·»å æ°æå¡ã\n" +"\tmodifyservice, ms\tä¿®æ¹æå®æå¡ã\n" +"\tremoveservice, rs\tç§»é¤æå®æå¡ã\n" +"\trefresh-services, refs\tå·æ°æææå¡ã\n" + +#: ../src/Zypper.cc:212 +msgid "" +" Software Management:\n" +"\tinstall, in\t\tInstall packages.\n" +"\tremove, rm\t\tRemove packages.\n" +"\tverify, ve\t\tVerify integrity of package dependencies.\n" +"\tsource-install, si\tInstall source packages and their build\n" +"\t\t\t\tdependencies.\n" +"\tinstall-new-recommends, inr\n" +"\t\t\t\tInstall newly added packages recommended\n" +"\t\t\t\tby installed packages.\n" +msgstr "" +" è½¯ä»¶ç®¡çï¼\n" +"\tinstall, in\t\tå®è£è½¯ä»¶åã\n" +"\tremove, rm\t\tç§»é¤è½¯ä»¶åã\n" +"\tverify, ve\t\tæ£éªè½¯ä»¶åçä¾èµå³ç³»å®æ´æ§ã\n" +"\tsource-install, si\tå®è£æºä»£ç åå¹¶æ»¡è¶³å¶æå»ºä¾èµ\n" +"\t\t\t\tæ§ã\n" +"\tinstall-new-recommends, inr\n" +"\t\t\t\tå®è£å·²å®è£è½¯ä»¶åææ¨èçæ°å è½¯ä»¶åã\n" + +#: ../src/Zypper.cc:223 +msgid "" +" Update Management:\n" +"\tupdate, up\t\tUpdate installed packages with newer versions.\n" +"\tlist-updates, lu\tList available updates.\n" +"\tpatch\t\t\tInstall needed patches.\n" +"\tlist-patches, lp\tList needed patches.\n" +"\tdist-upgrade, dup\tPerform a distribution upgrade.\n" +"\tpatch-check, pchk\tCheck for patches.\n" +msgstr "" +" æ´æ°ç®¡çï¼\n" +"\tupdate, up\t\tç¨æ°çæ¬æ´æ°å·²å®è£è½¯ä»¶åã\n" +"\tlist-updates, lu\tååºå¯ç¨æ´æ°ã\n" +"\tpatch\t\t\tå®è£æéè¡¥ä¸ã\n" +"\tlist-patches, lp\tååºæéè¡¥ä¸ã\n" +"\tdist-upgrade, dup\tæ§è¡å¤§çæ¬åçº§ã\n" +"\tpatch-check, pchk\tæ£æ¥è¡¥ä¸ã\n" + +#: ../src/Zypper.cc:232 +msgid "" +" Querying:\n" +"\tsearch, se\t\tSearch for packages matching a pattern.\n" +"\tinfo, if\t\tShow full information for specified packages.\n" +"\tpatch-info\t\tShow full information for specified patches.\n" +"\tpattern-info\t\tShow full information for specified patterns.\n" +"\tproduct-info\t\tShow full information for specified products.\n" +"\tpatches, pch\t\tList all available patches.\n" +"\tpackages, pa\t\tList all available packages.\n" +"\tpatterns, pt\t\tList all available patterns.\n" +"\tproducts, pd\t\tList all available products.\n" +"\twhat-provides, wp\tList packages providing specified capability.\n" +msgstr "" +" æ¥è¯¢ï¼\n" +"\tsearch, se\t\tæ¥æ¾ç¬¦åä¸ä¸ªæ¨¡å¼çè½¯ä»¶åã\n" +"\tinfo, if\t\tæ¾ç¤ºæå®è½¯ä»¶åçå®æ´ä¿¡æ¯ã\n" +"\tpatch-info\t\tæ¾ç¤ºæå®è¡¥ä¸çå®æ´ä¿¡æ¯ã\n" +"\tpattern-info\t\tæ¾ç¤ºæå®æ¨¡å¼çå®æ´ä¿¡æ¯ã\n" +"\tproduct-info\t\tæ¾ç¤ºæå®äº§åçå®æ´ä¿¡æ¯ã\n" +"\tpatch-check, pchk\tæ£æ¥è¡¥ä¸ã\n" +"\tlist-updates, lu\tååºå¯ç¨çæ´æ°ã\n" +"\tpatches, pch\t\tååºææå¯ç¨çè¡¥ä¸ã\n" +"\tpackages, pa\t\tååºææå¯ç¨çè½¯ä»¶åã\n" +"\tpatterns, pt\t\tååºææå¯ç¨çæ¨¡å¼ã\n" +"\tproducts, pd\t\tååºææå¯ç¨çäº§åã\n" +"\twhat-provides, wp\tååºè½å¤æä¾æå®åè½çè½¯ä»¶åã\n" + +#: ../src/Zypper.cc:247 +msgid "" +" Package Locks:\n" +"\taddlock, al\t\tAdd a package lock.\n" +"\tremovelock, rl\t\tRemove a package lock.\n" +"\tlocks, ll\t\tList current package locks.\n" +msgstr "" +" è½¯ä»¶åéå®ï¼\n" +"\taddlock, al\t\tæ·»å ä¸ä¸ªè½¯ä»¶åéå®ã\n" +"\tremovelock, rl\t\tåæ¶ä¸ä¸ªè½¯ä»¶åéå®ã\n" +"\tlocks, ll\t\tååºå½åçè½¯ä»¶åéå®ã\n" + +#: ../src/Zypper.cc:253 +msgid "" +" Other Commands:\n" +"\tversioncmp, vcmp\tCompare two version strings.\n" +"\ttargetos, tos\t\tPrint the target operating system ID string.\n" +"\tlicenses\t\tPrint report about licenses and EULAs of\n" +"\t\t\t\tinstalled packages.\n" +msgstr "" +" å¶å®å½ä»¤ï¼\n" +"\tversioncmp, vcmp\tæ¯è¾ä¸¤ä¸ªçæ¬åç¬¦ä¸²ã\n" +"\ttargetos, tos\t\tæå°ç®æ æä½ç³»ç» ID åç¬¦ä¸²ã\n" +"\tlicenses\t\tæå°å·²ç»å®è£è½¯ä»¶åçè®¸å¯å EULA\n" +"\t\t\t\tç¸å³ä¿¡æ¯ã\n" + +#: ../src/Zypper.cc:261 +msgid "" +" Usage:\n" +"\tzypper [--global-options] <command> [--command-options] [arguments]\n" +msgstr "" +" ç¨æ³ï¼\n" +"\tzypper [--å¨å±éé¡¹] <å½ä»¤> [--å½ä»¤éé¡¹] [åæ°]\n" + +#. translators: %s is "help" or "zypper help" depending on whether +#. zypper shell is running or not +#: ../src/Zypper.cc:286 +#, c-format +msgid "Type '%s' to get a list of global options and commands." +msgstr "è¾å¥ '%s' æ¥è·å¾å¨å±éé¡¹åå½ä»¤çåè¡¨ã" + +#. translators: %s is "help" or "zypper help" depending on whether +#. zypper shell is running or not +#: ../src/Zypper.cc:295 +#, c-format +msgid "Type '%s' to get command-specific help." +msgstr "è¾å¥ '%s' æ¥è·å¾å·ä½å½ä»¤çå¸®å©ã" + +#: ../src/Zypper.cc:398 +#, c-format +msgid "Verbosity: %d" +msgstr "è¯¦ç»ç¨åº¦ï¼%d" + +#: ../src/Zypper.cc:412 +#, c-format +msgid "Invalid table style %d." +msgstr "æ æçè¡¨æ ¼æ ·å¼ %dã" + +#: ../src/Zypper.cc:413 +#, c-format +msgid "Use an integer number from %d to %d" +msgstr "ä½¿ç¨ä¸ä¸ªä» %d å° %d çæ´æ°" + +#: ../src/Zypper.cc:444 +msgid "Entering non-interactive mode." +msgstr "æ£å¨è¿å¥éäº¤äºæ¨¡å¼ã" + +#: ../src/Zypper.cc:450 +msgid "Entering 'no-gpg-checks' mode." +msgstr "æ£å¨è¿å¥æ gpg æ£æ¥æ¨¡å¼ã" + +#: ../src/Zypper.cc:461 +msgid "The path specified in the --root option must be absolute." +msgstr "å¨ --root éé¡¹ä¸çæå®çè·¯å¾å¿é¡»æ¯ç»å¯¹è·¯å¾ã" + +#: ../src/Zypper.cc:490 +msgid "Repositories disabled, using the database of installed packages only." +msgstr "å®è£æºè¢«ç¦ç¨ï¼ä»ä½¿ç¨å·²ç»å®è£çè½¯ä»¶åçæ°æ®åºã" + +#: ../src/Zypper.cc:502 +msgid "Autorefresh disabled." +msgstr "èªå¨å·æ°å·²ç¦ç¨" + +#: ../src/Zypper.cc:509 +msgid "CD/DVD repositories disabled." +msgstr "CD/DVD å®è£æºå·²ç¦ç¨ã" + +#: ../src/Zypper.cc:516 +msgid "Remote repositories disabled." +msgstr "è¿ç¨å®è£æºå·²ç¦ç¨ã" + +#: ../src/Zypper.cc:523 +msgid "Ignoring installed resolvables." +msgstr "æ£å¨å¿½ç¥å·²å®è£çå¯è§£æé¡¹ã" + +#. TranslatorExplanation The %s is "--plus-repo" +#: ../src/Zypper.cc:618 +#, c-format +msgid "The %s option has no effect here, ignoring." +msgstr "%s éé¡¹å¨è¿éæ æï¼å¿½ç¥ã" + +#: ../src/Zypper.cc:795 +msgid "Unexpected exception." +msgstr "æå¤å¼å¸¸ã" + +#. TranslatorExplanation the first %s = "package, patch, pattern, product" +#. and the second %s = "package" +#. ! \todo A capability is NAME[.ARCH][OP<VERSION>] now, +#. ! the help text will be changed after release +#: ../src/Zypper.cc:881 +#, c-format +msgid "" +"install (in) [options] <capability|rpm_file_uri> ...\n" +"\n" +"Install packages with specified capabilities or RPM files with specified location. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Install packages only from the specified repository.\n" +"-t, --type <type> Type of package (%s).\n" +" Default: %s.\n" +"-n, --name Select packages by plain name, not by capability.\n" +"-C, --capability Select packages by capability.\n" +"-f, --force Install even if the item is already installed (reinstall).\n" +"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n" +" See 'man zypper' for more details.\n" +" --debug-solver Create solver test case for debugging.\n" +" --no-recommends Do not install recommended packages, only required.\n" +"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n" +" --force-resolution Force the solver to find a solution (even an agressive).\n" +"-D, --dry-run Test the installation, do not actually install.\n" +msgstr "" +"install (in) [options] <capability|rpm_file_uri> ...\n" +"\n" +"å®è£æå®åè½æèæå®ä½ç½®ç RPM è½¯ä»¶åãåè½å®ä¹ä¸º NAME[OP<VERSION>]ï¼æ¤å¤ç OP æ¯ <, <=, =, >=, > ä¸ä¹ä¸\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-r, --repo <alias|#|URI> éäºä»æå®å®è£æºå®è£è½¯ä»¶åã\n" +"-t, --type <type> è½¯ä»¶åç±»å (%s)ã\n" +" é»è®¤ï¼%sã\n" +"-n, --name ç¨åç§°éæ©è½¯ä»¶åï¼ä¸éè¿åè½ã\n" +"-C, --capability ç¨åè½éå®è½¯ä»¶åã\n" +"-f, --force è¥å·²å®è£è¯¥é¡¹ä»å¼ºå¶å®è£ï¼éè£ï¼ã\n" +"-l, --auto-agree-with-licenses å¯¹ç¬¬ä¸æ¹è®¸å¯ç¡®è®¤æç¤ºèªå¨åç 'yes'ã\n" +" è¯¦æåè 'man zypper'ã\n" +" --debug-solver ä¸ºè°è¯åå»ºä¾èµå³ç³»è§£å³æµè¯ç¨ä¾ã\n" +" --no-recommends ä¸å®è£æ¨èçè½¯ä»¶åï¼ä»å®è£å¿éçã\n" +"-R, --no-force-resolution ä¸å¼ºå¶è§£å³ä¾èµæ§ï¼åè®¸æé®ã\n" +" --force-resolution å¼ºå¶è§£å³ä¾èµæ§ï¼å³ä½¿æ¹æ¡å¾æ¿è¿ï¼ã\n" +"-D, --dry-run æµè¯å®è£ï¼å¹¶ä¸çæ£å®è£ã\n" + +#. TranslatorExplanation the first %s = "package, patch, pattern, product" +#. and the second %s = "package" +#: ../src/Zypper.cc:930 +#, fuzzy, c-format +msgid "" +"remove (rm) [options] <capability> ...\n" +"\n" +"Remove packages with specified capabilities. A capability is NAME[OP<VERSION>], where OP is one of <, <=, =, >=, >.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Operate only with packages from the specified repository.\n" +"-t, --type <type> Type of package (%s).\n" +" Default: %s.\n" +"-n, --name Select packages by plain name, not by capability.\n" +"-C, --capability Select packages by capability.\n" +" --debug-solver Create solver test case for debugging.\n" +"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n" +" --force-resolution Force the solver to find a solution (even an agressive).\n" +"-D, --dry-run Test the removal, do not actually remove.\n" +msgstr "" +"install (in) [options] <capability|rpm_file_uri> ...\n" +"\n" +"å®è£æå® capacity çå¯è§£æé¡¹ææå®ä½ç½®ç RPM æä»¶ãä¸ä¸ª capability ä¸º NAME[OP<VERSION>]ï¼OPæ¯ <, <=, =, >=, > ä¸ä¸ç§ã\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Install resolvables only from the specified repository.\n" +"-t, --type <type> Type of resolvable (%s).\n" +" Default: %s.\n" +"-n, --name Select resolvables by plain name, not by capability.\n" +"-C, --capability Select resolvables by capability.\n" +"-f, --force Install even if the item is already installed (reinstall).\n" +"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n" +" See 'man zypper' for more details.\n" +" --debug-solver Create solver test case for debugging.\n" +" --no-recommends Do not install recommended packages, only required.\n" +"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n" +" --force-resolution Force the solver to find a solution (even an agressive).\n" +"-D, --dry-run Test the installation, do not actually install.\n" + +#: ../src/Zypper.cc:960 +msgid "" +"source-install (si) [options] <name> ...\n" +"\n" +"Install specified source packages and their build dependencies.\n" +"\n" +" Command options:\n" +"-d, --build-deps-only Install only build dependencies of specified packages.\n" +"-D, --no-build-deps Don't install build dependencies.\n" +"-r, --repo <alias|#|URI> Install packages only from specified repositories.\n" +msgstr "" +"source-install (si) [options] <name> ...\n" +"\n" +"å®è£æå®æºä»£ç è½¯ä»¶åå¹¶æ»¡è¶³å¶æå»ºä¾èµæ§ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-d, --build-deps-only ä»æ»¡è¶³æå®è½¯ä»¶åæå»ºä¾èµæ§ã\n" +"-D, --no-build-deps ä¸å®è£åä»¥æ»¡è¶³æå»ºä¾èµæ§ã\n" +"-r, --repo <alias|#|URI> éä½¿ç¨æå®çå®è£æºç¨äºå®è£è½¯ä»¶åã\n" + +#: ../src/Zypper.cc:988 +msgid "" +"verify (ve) [options]\n" +"\n" +"Check whether dependencies of installed packages are satisfied and repair eventual dependency problems.\n" +"\n" +" Command options:\n" +" --no-recommends Do not install recommended packages, only required.\n" +"-D, --dry-run Test the repair, do not actually do anything to the system.\n" +"-r, --repo <alias|#|URI> Use only specified repositories to install missing packages.\n" +msgstr "" + +#: ../src/Zypper.cc:1012 +msgid "" +"install-new-recommends (inr) [options]\n" +"\n" +"Install newly added packages recommended by already installed packages. This can typically be used to install new language packages or drivers for newly added hardware.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Use only specified repositories to install packages.\n" +"-D, --dry-run Test the installation, do not actually install anything.\n" +" --debug-solver Create solver test case for debugging.\n" +msgstr "" + +#. TranslatorExplanation the %s = "yast2, rpm-md, plaindir" +#: ../src/Zypper.cc:1039 +#, c-format +msgid "" +"addservice (as) [options] <URI> <alias>\n" +"\n" +"Add a repository index service to the system.\n" +"\n" +" Command options:\n" +"-t, --type <TYPE> Type of the service (%s).\n" +"-d, --disable Add the service as disabled.\n" +"-n, --name Specify descriptive name for the service.\n" +msgstr "" + +#. TranslatorExplanation the %s = "yast2, rpm-md, plaindir" +#. TODO +#: ../src/Zypper.cc:1063 +msgid "" +"removeservice (rs) [options] <alias|#|URI>\n" +"\n" +"Remove specified repository index service from the sytem..\n" +"\n" +" Command options:\n" +" --loose-auth Ignore user authentication data in the URI.\n" +" --loose-query Ignore query string in the URI.\n" +msgstr "" + +#. translators: %s is "--all" and "--all" +#: ../src/Zypper.cc:1099 +#, c-format +msgid "" +"modifyservice (ms) <options> <alias|#|URI>\n" +"modifyservice (ms) <options> <%s>\n" +"\n" +"Modify properties of services specified by alias, number, or URI, or by the\n" +"'%s' aggregate options.\n" +"\n" +" Command options:\n" +"-d, --disable Disable the service (but don't remove it).\n" +"-e, --enable Enable a disabled service.\n" +"-r, --refresh Enable auto-refresh of the service.\n" +"-R, --no-refresh Disable auto-refresh of the service.\n" +"-n, --name Set a descriptive name for the service.\n" +"\n" +"-i, --ar-to-enable <alias> Add a RIS service repository to enable.\n" +"-I, --ar-to-disable <alias> Add a RIS service repository to disable.\n" +"-j, --rr-to-enable <alias> Remove a RIS service repository to enable.\n" +"-J, --rr-to-disable <alias> Remove a RIS service repository to disable.\n" +"-k, --cl-to-enable Clear the list of RIS repositories to enable.\n" +"-K, --cl-to-disable Clear the list of RIS repositories to disable.\n" +"\n" +"-a, --all Apply changes to all services.\n" +"-l, --local Apply changes to all local services.\n" +"-t, --remote Apply changes to all remote services.\n" +"-m, --medium-type <type> Apply changes to services of specified type.\n" +msgstr "" + +#: ../src/Zypper.cc:1147 +msgid "" +"services (ls) [options]\n" +"\n" +"List defined services.\n" +"\n" +" Command options:\n" +"-u, --uri Show also base URI of repositories.\n" +"-p, --priority Show also repository priority.\n" +"-d, --details Show more information like URI, priority, type.\n" +"-r, --with-repos Show also repositories belonging to the services.\n" +"-P, --sort-by-priority Sort the list by repository priority.\n" +"-U, --sort-by-uri Sort the list by URI.\n" +"-N, --sort-by-name Sort the list by name.\n" +msgstr "" +"services (ls) [options]\n" +"\n" +"ååºå·²å®ä¹çæå¡ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-u, --uri åæ¶æ¾ç¤ºå®è£æºçåº URIã\n" +"-p, --priority åæ¶æ¾ç¤ºå®è£æºä¼åçº§ã\n" +"-d, --details æ¾ç¤ºæ´å¤ä¿¡æ¯ï¼æ¯å¦ URIãä¼åçº§ãç±»åã\n" +"-r, --with-repos åæ¶æ¾ç¤ºå®è£æºæå±æå¡ã\n" +"-P, --sort-by-priority æä¼åçº§æåå®è£æºã\n" +"-U, --sort-by-uri æ URL æåã\n" +"-N, --sort-by-name æåç§°æåã\n" + +#: ../src/Zypper.cc:1173 +msgid "" +"refresh-services (refs) [options]\n" +"\n" +"Refresh defined repository index services.\n" +"\n" +" Command options:\n" +"-r, --with-repos Refresh also repositories.\n" +msgstr "" + +#. TranslatorExplanation the %s = "yast2, rpm-md, plaindir" +#: ../src/Zypper.cc:1201 +#, fuzzy, c-format +msgid "" +"addrepo (ar) [options] <URI> <alias>\n" +"addrepo (ar) [options] <FILE.repo>\n" +"\n" +"Add a repository to the sytem. The repository can be specified by its URI or can be read from specified .repo file (even remote).\n" +"\n" +" Command options:\n" +"-r, --repo <FILE.repo> Just another means to specify a .repo file to read.\n" +"-t, --type <TYPE> Type of repository (%s).\n" +"-d, --disable Add the repository as disabled.\n" +"-c, --check Probe URI.\n" +"-C, --no-check Don't probe URI, probe later during refresh.\n" +"-n, --name Specify descriptive name for the repository.\n" +"-k, --keep-packages Enable RPM files caching.\n" +"-K, --no-keep-packages Disable RPM files caching.\n" +"-f, --refresh Enable autorefresh of the repository.\n" +msgstr "" +"addrepo (ar) [options] <URI> <å«å>\n" +"addrepo (ar) [options] <FILE.repo>\n" +"\n" +"æ·»å å®è£æºå°ç³»ç»ä¸ãå®è£æºå¯ä»¥éè¿ URI æå®ï¼ä¹å¯ä»¥ä»æå®ç .repo æä»¶(çè³æ¯è¿ç¨ç)ä¸è¯»åã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-r, --repo <FILE.repo> ä»æä»¶(çè³æ¯è¿ç¨ç)ä¸è¯»å URI åå«åã\n" +"-t, --type <TYPE> å®è£æºç±»å (%s)ã\n" +"-d, --disable æ·»å å®è£æºåè®¾ç½®ä¸ºç¦ç¨ã\n" +"-c, --check æ£æµ URIã\n" +"-C, --no-check ä¸æ£æµ URIï¼å¨å·æ°è¿ç¨ä¸åæ£æµã\n" +"-n, --name ä¸ºå®è£æºæå®ä¸ä¸ªæè¿°çåç§°ã\n" +"-k, --keep-packages å¯ç¨ RPM æä»¶ç¼åã\n" +"-K, --no-keep-packages ç¦ç¨ RPM æä»¶ç¼åã\n" + +#. translators: this is just a rug compatiblity command +#. translators: this is just a rug-compatiblity command +#: ../src/Zypper.cc:1250 +#: ../src/Zypper.cc:2127 +msgid "" +"list-resolvables (lr)\n" +"\n" +"List available resolvable types.\n" +msgstr "" +"list-resolvable (lr)\n" +"\n" +"ååºå¯ç¨çè§£æé¡¹ç±»åã\n" + +#: ../src/Zypper.cc:1258 +msgid "" +"repos (lr) [options]\n" +"\n" +"List all defined repositories.\n" +"\n" +" Command options:\n" +"-e, --export <FILE.repo> Export all defined repositories as a single local .repo file.\n" +"-u, --uri Show also base URI of repositories.\n" +"-p, --priority Show also repository priority.\n" +"-d, --details Show more information like URI, priority, type.\n" +"-U, --sort-by-uri Sort the list by URI.\n" +"-P, --sort-by-priority Sort the list by repository priority.\n" +"-A, --sort-by-alias Sort the list by alias.\n" +"-N, --sort-by-name Sort the list by name.\n" +msgstr "" +"repos (lr) [options]\n" +"\n" +"ååºææå·²å®ä¹çå®è£æºã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-e, --export <FILE.repo> å¯¼åºææå®ä¹çå®è£æºå°ä¸ä¸ªæ¬å° .repo æä»¶ã\n" +"-u, --uri åæ¶æ¾ç¤ºå®è£æºåº URIã\n" +"-p, --priority åæ¶æ¾ç¤ºå®è£æºä¼åçº§ã\n" +"-d, --details æ¾ç¤ºæ´å¤ä¿¡æ¯ï¼å¦ URIãä¼åçº§ãç±»åã\n" +"-U, --sort-by-uri æ URI æååè¡¨ã\n" +"-P, --sort-by-priority æå®è£æºä¼åçº§æååè¡¨ã\n" +"-A, --sort-by-alias æå«åæååè¡¨ã\n" +"-N, --sort-by-name æåç§°æååè¡¨ã\n" + +#. translators: this option belongs to 'lr' command help +#: ../src/Zypper.cc:1273 +msgid "-s, --service Show also alias of parent service.\n" +msgstr "-s, --service åæ¶æ¾ç¤ºæ¯æå¡çå«åã\n" + +#: ../src/Zypper.cc:1288 +msgid "" +"removerepo (rr) [options] <alias|#|URI>\n" +"\n" +"Remove repository specified by alias, number or URI.\n" +"\n" +" Command options:\n" +" --loose-auth Ignore user authentication data in the URI.\n" +" --loose-query Ignore query string in the URI.\n" +msgstr "" +"removerepo (rr) [options] <alias|#|URI>\n" +"\n" +"ç§»é¤éè¿å«åãç¼å·æ URI å¶å®çå®è£æºã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +" --loose-auth å¿½ç¥ URI ä¸ç¨æ·è®¤è¯æ°æ®ã\n" +" --loose-query å¿½ç¥ URI ä¸çæ¥è¯¢åç¬¦ä¸²ã\n" + +#: ../src/Zypper.cc:1307 +msgid "" +"renamerepo (nr) [options] <alias|#|URI> <new-alias>\n" +"\n" +"Assign new alias to the repository specified by alias, number or URI.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"renamerepo (nr) [options] <å«å|#|URI> <æ°å«å>\n" +"\n" +"ç»å®è£æºè®¾ç½®æ°çå«åï¼å®è£æºå¯ä»¥éè¿å«åãç¼å·æè URI æ¥æå®ã\n" +"\n" +"æ¤å½ä»¤æ éå éé¡¹ã\n" + +#. translators: %s is "--all|--remote|--local|--medium-type" +#. and "--all, --remote, --local, --medium-type" +#: ../src/Zypper.cc:1338 +#, c-format +msgid "" +"modifyrepo (mr) <options> <alias|#|URI>\n" +"modifyrepo (mr) <options> <%s>\n" +"\n" +"Modify properties of repositories specified by alias, number, or URI, or by the\n" +"'%s' aggregate options.\n" +"\n" +" Command options:\n" +"-d, --disable Disable the repository (but don't remove it).\n" +"-e, --enable Enable a disabled repository.\n" +"-r, --refresh Enable auto-refresh of the repository.\n" +"-R, --no-refresh Disable auto-refresh of the repository.\n" +"-n, --name Set a descriptive name for the repository.\n" +"-p, --priority <1-99> Set priority of the repository.\n" +"-k, --keep-packages Enable RPM files caching.\n" +"-K, --no-keep-packages Disable RPM files caching.\n" +"\n" +"-a, --all Apply changes to all repositories.\n" +"-l, --local Apply changes to all local repositories.\n" +"-t, --remote Apply changes to all remote repositories.\n" +"-m, --medium-type <type> Apply changes to repositories of specified type.\n" +msgstr "" + +#: ../src/Zypper.cc:1378 +msgid "" +"refresh (ref) [alias|#|URI] ...\n" +"\n" +"Refresh repositories specified by their alias, number or URI. If none are specified, all enabled repositories will be refreshed.\n" +"\n" +" Command options:\n" +"-f, --force Force a complete refresh.\n" +"-b, --force-build Force rebuild of the database.\n" +"-d, --force-download Force download of raw metadata.\n" +"-B, --build-only Only build the database, don't download metadata.\n" +"-D, --download-only Only download raw metadata, don't build the database.\n" +"-r, --repo <alias|#|URI> Refresh only specified repositories.\n" +"-s, --services Refresh also services before refreshing repos.\n" +msgstr "" +"refresh (ref) [alias|#|URI] ...\n" +"\n" +"æå®å«åãç¼å·æ URI ä»¥å·æ°å®è£æºãå¦ææ²¡ææå®ä»»æé¡¹ï¼å°å·æ°ææå¯ç¨çå®è£æºã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-f, --force å¼ºå¶å¨é¨å·æ°ã\n" +"-b, --force-build å¼ºå¶éææ°æ®åºã\n" +"-d, --force-download å¼ºå¶ä¸è½½åå§åæ°æ®ã\n" +"-B, --build-only ä»æå»ºæ°æ®åºï¼ä¸ä¸è½½åæ°æ®ã\n" +"-D, --download-only ä»ä¸è½½åæ°æ®ï¼ä¸æå»ºæ°æ®åºã\n" +"-r, --repo <alias|#|URI> ä»å·æ°æå®å®è£æºã\n" +"-s, --services å·æ°å®è£æºä¹åå·æ°æå¡ã\n" + +#: ../src/Zypper.cc:1407 +msgid "" +"clean [alias|#|URI] ...\n" +"\n" +"Clean local caches.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Clean only specified repositories.\n" +"-m, --metadata Clean metadata cache.\n" +"-M, --raw-metadata Clean raw metadata cache.\n" +"-a, --all Clean both metadata and package caches.\n" +msgstr "" +"clean [å«å|#|URI] ...\n" +"\n" +"æ¸çæ¬å°ç¼åã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-r, --repo <å«å|#|URI> ä»æ¸çæå®è½¯ä»¶æºã\n" +"-m, --metadata æ¸çåæ°æ®ç¼åã\n" +"-M, --raw-metadata æ¸çåå§åæ°æ®ç¼åã\n" +"-a, --all æ¸çåæ°æ®åè½¯ä»¶åç¼åã\n" + +#. TranslatorExplanation the first %s = "package, patch, pattern, product" +#. and the second %s = "patch" +#: ../src/Zypper.cc:1436 +#, fuzzy, c-format +msgid "" +"list-updates (lu) [options]\n" +"\n" +"List all available updates.\n" +"\n" +" Command options:\n" +"-t, --type <type> Type of package (%s).\n" +" Default: %s.\n" +"-r, --repo <alias|#|URI> List only updates from the specified repository.\n" +" --best-effort Do a 'best effort' approach to update. Updates\n" +" to a lower than the latest version are\n" +" also acceptable.\n" +"-a, --all List all packages for which newer versions are\n" +" available, regardless whether they are\n" +" installable or not.\n" +msgstr "" +"list-updates (lu) [options]\n" +"\n" +"ååºææå¯ç¨æ´æ°ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-t, --type <type> å¯è§£æé¡¹ç±»å(%s)ã\n" +" é»è®¤ï¼ %s.\n" +"-r, --repo <å«å|#|URI> ä»ä»ååºæ¥èªæå®è½¯ä»¶æºçæ´æ°ã\n" +" --best-effort éè¿'best effort'æ¹å¼æ´æ°ãæ´æ°å°é\n" +" ææ°çæ¬æ¯å¯ä»¥æ¥åçã\n" + +#. TranslatorExplanation the first %s = "package, patch, pattern, product" +#. and the second %s = "patch" +#: ../src/Zypper.cc:1487 +#, fuzzy, c-format +msgid "" +"update (up) [options] ...\n" +"\n" +"Update all or specified installed packages with newer versions, if possible.\n" +"\n" +" Command options:\n" +"\n" +"-t, --type <type> Type of package (%s).\n" +" Default: %s.\n" +"-r, --repo <alias|#|URI> Limit updates to the specified repository.\n" +" --skip-interactive Skip interactive updates.\n" +"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n" +" confirmation prompt.\n" +" See man zypper for more details.\n" +" --best-effort Do a 'best effort' approach to update. Updates\n" +" to a lower than the latest version are\n" +" also acceptable.\n" +" --debug-solver Create solver test case for debugging.\n" +" --no-recommends Do not install recommended packages, only required.\n" +"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n" +" --force-resolution Force the solver to find a solution (even an agressive).\n" +"-D, --dry-run Test the update, do not actually update.\n" +msgstr "" +"install (in) [options] <capability|rpm_file_uri> ...\n" +"\n" +"å®è£æå® capacity çå¯è§£æé¡¹ææå®ä½ç½®ç RPM æä»¶ãä¸ä¸ª capability ä¸º NAME[OP<VERSION>]ï¼OPæ¯ <, <=, =, >=, > ä¸ä¸ç§ã\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Install resolvables only from the specified repository.\n" +"-t, --type <type> Type of resolvable (%s).\n" +" Default: %s.\n" +"-n, --name Select resolvables by plain name, not by capability.\n" +"-C, --capability Select resolvables by capability.\n" +"-f, --force Install even if the item is already installed (reinstall).\n" +"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n" +" See 'man zypper' for more details.\n" +" --debug-solver Create solver test case for debugging.\n" +" --no-recommends Do not install recommended packages, only required.\n" +"-R, --no-force-resolution Do not force the solver to find solution, let it ask.\n" +" --force-resolution Force the solver to find a solution (even an agressive).\n" +"-D, --dry-run Test the installation, do not actually install.\n" + +#: ../src/Zypper.cc:1526 +msgid "" +"patch [options]\n" +"\n" +"Install all available needed patches.\n" +"\n" +" Command options:\n" +"\n" +"-r, --repo <alias|#|URI> Work only with specified repository.\n" +" --skip-interactive Skip interactive patches.\n" +"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license\n" +" confirmation prompt.\n" +" See man zypper for more details.\n" +" --debug-solver Create solver test case for debugging.\n" +"-D, --dry-run Test the update, do not actually update.\n" +msgstr "" +"patch [options]\n" +"\n" +"å®è£ææå¯ç¨ä¸éè¦çè¡¥ä¸ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <alias|#|URI> éå®ä½¿ç¨æå®å®è£æºã\n" +" --skip-interactive è·³è¿éè¦äºå¨çè¡¥ä¸ã\n" +"-l, --auto-agree-with-licenses èªå®å¯¹ç¬¬ä¸æ¹è®¸å¯ç¡®è®¤æç¤ºåç 'yes'ã\n" +" ç¨ man zypper è·åè¯¦æã\n" +" --debug-solver ä¸ºè°è¯åå»ºä¾èµå³ç³»æµè¯ç¨ä¾ã\n" +"-D, --dry-run ä»æµè¯æ´æ°ï¼å¹¶ä¸çæ£æ´æ°ã\n" + +#: ../src/Zypper.cc:1552 +#, fuzzy +msgid "" +"list-patches (lp) [options]\n" +"\n" +"List all available needed patches.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> List only patches from the specified repository.\n" +msgstr "" +"patch-check (pchk) [options]\n" +"\n" +"æ£æ¥å¯ç¨è¡¥ä¸\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <å«å|#|URI> æ£æ¥æå®å®è£æºä¸çè¡¥ä¸ã\n" + +#: ../src/Zypper.cc:1577 +msgid "" +"dist-upgrade (dup) [options]\n" +"\n" +"Perform a distribution upgrade.\n" +"\n" +" Command options:\n" +"\n" +"-r, --repo <alias|#|URI> Limit the upgrade to the specified repository.\n" +" --no-recommends Do not install recommended packages, only required.\n" +"-l, --auto-agree-with-licenses Automatically say 'yes' to third party license confirmation prompt.\n" +" See man zypper for more details.\n" +" --debug-solver Create solver test case for debugging\n" +"-D, --dry-run Test the upgrade, do not actually upgrade\n" +msgstr "" +"dist-upgrade (dup) [options]\n" +"\n" +"æ§è¡å¤§çæ¬åçº§ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <alias|#|URI> éå®åçº§ä½¿ç¨æå®çå®è£æºã\n" +" --no-recommends ä¸å®è£æ¨èè½¯ä»¶åï¼ä»ä»å®è£å¿éçã\n" +"-l, --auto-agree-with-licenses å¯¹ç¬¬ä¸æ¹è®¸å¯ç¡®å®æç¤ºèªå¨åç 'yes'ã\n" +" ä½¿ç¨ man zypper è·åæ´å¤ä¿¡æ¯ã\n" +" --debug-solver ä¸ºè°è¯åå»ºè§£å³æµè¯ç¨ä¾\n" +"-D, --dry-run æµè¯åçº§æ¯å¦å¯è¡ï¼å¹¶ä¸çæ£è¿è¡åçº§\n" + +#: ../src/Zypper.cc:1619 +msgid "" +"search (se) [options] [querystring] ...\n" +"\n" +"Search for packages matching given search strings.\n" +"\n" +" Command options:\n" +" --match-all Search for a match with all search strings (default).\n" +" --match-any Search for a match with any of the search strings.\n" +" --match-substrings Search for a match to partial words (default).\n" +" --match-words Search for a match to whole words only.\n" +" --match-exact Searches for an exact package name.\n" +"-d, --search-descriptions Search also in package summaries and descriptions.\n" +"-C, --case-sensitive Perform case-sensitive search.\n" +"-i, --installed-only Show only packages that are already installed.\n" +"-u, --uninstalled-only Show only packages that are not currently installed.\n" +"-t, --type <type> Search only for packages of the specified type.\n" +"-r, --repo <alias|#|URI> Search only in the specified repository.\n" +" --sort-by-name Sort packages by name (default).\n" +" --sort-by-repo Sort packages by repository.\n" +"-s, --details Show each available version in each repository\n" +" on a separate line.\n" +"\n" +"* and ? wildcards can also be used within search strings.\n" +msgstr "" +"search (se) [options] [æ¥è¯¢åç¬¦ä¸²...]\n" +"\n" +"æç´¢ä¸ç»å®æç´¢åç¬¦ä¸²å¹éçå\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +" --match-all æç´¢æææç´¢åç¬¦ä¸²çå¹éé¡¹(é»è®¤)ã\n" +" --match-any æç´¢ä»»ä¸æç´¢åç¬¦ä¸²çå¹éé¡¹ã\n" +" --match-substrings æç´¢åç¬¦ä¸²çå¹éé¡¹å¯è½æ¯åè¯çä¸é¨å(é»è®¤)ã\n" +" --match-words æç´¢åç¬¦ä¸²çå¹éé¡¹åªè½æ¯æ´ä¸ªåè¯ã\n" +" --match-exact æç´¢ç²¾ç¡®çååç§°ã\n" +"-d, --search-descriptions åæ¶è¿æç´¢åæè¦åè¯´æã\n" +"-C, --case-sensitive æç´¢æ¶åºåå¤§å°åã\n" +"-i, --installed-only åªæ¾ç¤ºå·²å®è£çåã\n" +"-u, --uninstalled-only åªæ¾ç¤ºå½åæªå®è£çåã\n" +"-t, --type <type> åªæç´¢æå®ç±»åçåã\n" +"-r, --repo <å«å|#|URI> åªæç´¢æå®çå®è£æºã\n" +" --sort-by-name æè½¯ä»¶ååç§°æåº(é»è®¤)ã\n" +" --sort-by-repo æå®è£æºæåºã\n" +" --details åè¡æ¾ç¤ºæ¯ä¸ªå®è£æºä¸å¯ä»¥çåä¸ªçæ¬ã\n" +"\n" +" * å ? ééç¬¦ä¹å¯ä»¥ç¨å¨æç´¢åç¬¦ä¸²ä¸ã\n" + +#: ../src/Zypper.cc:1656 +msgid "" +"patch-check (pchk) [options]\n" +"\n" +"Check for available patches.\n" +"\n" +" Command options:\n" +"\n" +"-r, --repo <alias|#|URI> Check for patches only in the specified repository.\n" +msgstr "" +"patch-check (pchk) [options]\n" +"\n" +"æ£æ¥å¯ç¨è¡¥ä¸\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <å«å|#|URI> æ£æ¥æå®å®è£æºä¸çè¡¥ä¸ã\n" + +#: ../src/Zypper.cc:1678 +msgid "" +"patches (pch) [repository] ...\n" +"\n" +"List all patches available in specified repositories.\n" +"\n" +" Command options:\n" +"\n" +"-r, --repo <alias|#|URI> Just another means to specify repository.\n" +msgstr "" +"patches (pch) [å®è£æº] ...\n" +"\n" +"ååºæå®å®è£æºä¸å¨é¨å¯ç¨çè¡¥ä¸ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <å«å|#|URI> æå®å®è£æºã\n" + +#: ../src/Zypper.cc:1705 +#, fuzzy +msgid "" +"packages (pa) [options] [repository] ...\n" +"\n" +"List all packages available in specified repositories.\n" +"\n" +" Command options:\n" +"\n" +"-r, --repo <alias|#|URI> Just another means to specify repository.\n" +"-i, --installed-only Show only installed packages.\n" +"-u, --uninstalled-only Show only packages which are not installed.\n" +"-N, --sort-by-name Sort the list by package name.\n" +"-R, --sort-by-repo Sort the list by repository.\n" +msgstr "" +"packages (pa) [options] [å®è£æº] ...\n" +"\n" +"ååºæå®å®è£æºä¸å¨é¨å¯ç¨çè½¯ä»¶åã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <å«å|#|URI> æå®å®è£æºã\n" +"-i, --installed-only åªæ¾ç¤ºå·²å®è£çè½¯ä»¶åã\n" +"-u, --uninstalled-only åªæ¾ç¤ºæªå®è£çè½¯ä»¶åã\n" +"-N, --sort-by-name æç§è½¯ä»¶ååç§°æåºã\n" +"-R, --sort-by-repo æç§å®è£æºæåºã\n" + +#: ../src/Zypper.cc:1733 +#, fuzzy +msgid "" +"patterns (pt) [options] [repository] ...\n" +"\n" +"List all patterns available in specified repositories.\n" +"\n" +" Command options:\n" +"\n" +"-r, --repo <alias|#|URI> Just another means to specify repository.\n" +"-i, --installed-only Show only installed patterns.\n" +"-u, --uninstalled-only Show only patterns which are not installed.\n" +msgstr "" +"patterns (pt) [options] [å®è£æº] ...\n" +"\n" +"ååºæå®å®è£æºä¸å¨é¨å¯ç¨çæ¨¡å¼ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <å«å|#|URI> æå®å®è£æºã\n" +"-i, --installed-only åªæ¾ç¤ºå·²å®è£çæ¨¡å¼ã\n" +"-u, --uninstalled-only åªæ¾ç¤ºæªå®è£çæ¨¡å¼ã\n" + +#: ../src/Zypper.cc:1759 +#, fuzzy +msgid "" +"products (pd) [options] [repository] ...\n" +"\n" +"List all products available in specified repositories.\n" +"\n" +" Command options:\n" +"\n" +"-r, --repo <alias|#|URI> Just another means to specify repository.\n" +"-i, --installed-only Show only installed products.\n" +"-u, --uninstalled-only Show only products which are not installed.\n" +msgstr "" +"products (pd) [options] [å®è£æº] ...\n" +"\n" +"ååºæå®å®è£æºä¸å¨é¨å¯ç¨çæ¨¡å¼ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"\n" +"-r, --repo <å«å|#|URI> æå®å®è£æºã\n" +"-i, --installed-only åªæ¾ç¤ºå·²å®è£çäº§åã\n" +"-u, --uninstalled-only åªæ¾ç¤ºæªå®è£çäº§åã\n" + +#: ../src/Zypper.cc:1784 +#, c-format +msgid "" +"info (if) [options] <name> ...\n" +"\n" +"Show detailed information for specified packages.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Work only with the specified repository.\n" +"-t, --type <type> Type of package (%s).\n" +" Default: %s." +msgstr "" +"info (if) [options] <name> ...\n" +"\n" +"æ¾ç¤ºæå®è½¯ä»¶åçè¯¦ç»ä¿¡æ¯ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-r, --repo <å«å|#|URI> éäºæå®çå®è£æºã\n" +"-t, --type <type> è½¯ä»¶åçç±»å (%s)ã\n" +" é»è®¤ï¼%sã" + +#: ../src/Zypper.cc:1807 +#, c-format +msgid "" +"patch-info <patchname> ...\n" +"\n" +"Show detailed information for patches.\n" +"\n" +"This is a rug compatibility alias for '%s'.\n" +msgstr "" +"patch-info <è¡¥ä¸åç§°> ...\n" +"\n" +"æ¾ç¤ºè¡¥ä¸çè¯¦ç»ä¿¡æ¯\n" +"\n" +"è¿æ¯å rug å¼å®¹ç '%s' çå«å.\n" + +#: ../src/Zypper.cc:1826 +#, c-format +msgid "" +"pattern-info <pattern_name> ...\n" +"\n" +"Show detailed information for patterns.\n" +"\n" +"This is a rug compatibility alias for '%s'.\n" +msgstr "" +"patterns-info <æ¨¡å¼åç§°> ...\n" +"\n" +"æ¾ç¤ºæ¨¡å¼çè¯¦ç»ä¿¡æ¯\n" +"\n" +"è¿æ¯å rug å¼å®¹ç '%s' çå«å.\n" + +#: ../src/Zypper.cc:1845 +#, c-format +msgid "" +"product-info <product_name> ...\n" +"\n" +"Show detailed information for products.\n" +"\n" +"This is a rug compatibility alias for '%s'.\n" +msgstr "" +"product-info <äº§ååç§°> ...\n" +"\n" +"æ¾ç¤ºäº§åçè¯¦ç»ä¿¡æ¯\n" +"\n" +"è¿æ¯å rug å¼å®¹ç '%s' çå«å.\n" + +#: ../src/Zypper.cc:1862 +msgid "" +"what-provides (wp) <capability>\n" +"\n" +"List all packages providing the specified capability.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"what-provides (wp) <åè½>\n" +"\n" +"ååºæä¾æå®åè½çå¨é¨è½¯ä»¶åã\n" +"\n" +"æ¤å½ä»¤æ²¡æéå éé¡¹ã\n" + +#: ../src/Zypper.cc:1913 +msgid "" +"moo\n" +"\n" +"Show an animal.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"moo\n" +"\n" +"æ¾ç¤ºä¸åªå¨ç©\n" +"\n" +"æ¤å½ä»¤æ²¡æéå éé¡¹ã\n" + +#: ../src/Zypper.cc:1935 +#, c-format +msgid "" +"addlock (al) [options] <packagename> ...\n" +"\n" +"Add a package lock. Specify packages to lock by exact name or by a glob pattern using '*' and '?' wildcard characters.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Restrict the lock to the specified repository.\n" +"-t, --type <type> Type of package (%s).\n" +" Default: %s.\n" +msgstr "" +"addlock (al) [options] <packagename> ...\n" +"\n" +"æ·»å ä¸ä¸ªè½¯ä»¶åéå®ãæå®è½¯ä»¶åå¯ä»¥ç¨ç²¾ç¡®çåç§°ï¼ä¹å¯ä»¥ä½¿ç¨ '*' å '?' ééç¬¦å¹éæ ·å¼ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-r, --repo <alias|#|URI> éäºæå®çå®è£æºã\n" +"-t, --type <type> è½¯ä»¶åçç±»å (%s)ã\n" +" é»è®¤ï¼%sã\n" + +#: ../src/Zypper.cc:1961 +#, c-format +msgid "" +"removelock (rl) [options] <lock-number|packagename> ...\n" +"\n" +"Remove a package lock. Specify the lock to remove by its number obtained with '%s' or by package name.\n" +"\n" +" Command options:\n" +"-r, --repo <alias|#|URI> Remove only locks with specified repository.\n" +msgstr "" +"removelock (rl) [options] <lock-number|packagename> ...\n" +"\n" +"åæ¶ä¸ä¸ªè½¯ä»¶åéå®ãéè¿ '%s' è·å¾ç¼å·æéè¿è½¯ä»¶ååç§°æå®è¦åæ¶çéå®ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-r, --repo <alias|#|URI> ä»éäºå¶å®å®è£æºåå é¤éå®ã\n" + +#: ../src/Zypper.cc:1981 +msgid "" +"locks (ll)\n" +"\n" +"List current package locks.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"locks (ll)\n" +"\n" +"ååºå½åçè½¯ä»¶åéå®ã\n" +"\n" +"æ¤å½ä»¤æ éå éé¡¹ã\n" + +#: ../src/Zypper.cc:2021 +msgid "" +"targetos (tos)\n" +"\n" +"Show the ID string of the target Operating System.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"targetos (tos)\n" +"\n" +"æ¾ç¤ºç®æ æä½ç³»ç»ç ID åç¬¦ä¸²ã\n" +"\n" +"æ¤å½ä»¤æ éå éé¡¹ã\n" + +#: ../src/Zypper.cc:2040 +msgid "" +"versioncmp (vcmp) <version1> <version2>\n" +"\n" +"Compare the versions supplied as arguments.\n" +"\n" +" Command options:\n" +"-m, --match Takes missing release number as any release.\n" +msgstr "" +"versioncmp (vcmp) <version1> <version2>\n" +"\n" +"æ¯è¾ä½ä¸ºåæ°æä¾ççæ¬å·ã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-m, --match å°æ²¡æçåå¸å·ä½ä¸ºä»»æåå¸å·ã\n" + +#: ../src/Zypper.cc:2059 +msgid "" +"licenses\n" +"\n" +"Report Licenses and EULA of currently installed software packages.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"è®¸å¯\n" +"\n" +"æ¥åå½åå·²å®è£è½¯ä»¶åçè®¸å¯å EULAã\n" +"\n" +"æ¤å½ä»¤æ²¡æéå éé¡¹ã\n" + +#: ../src/Zypper.cc:2076 +msgid "" +"quit (exit, ^D)\n" +"\n" +"Quit the current zypper shell.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"quit (exit, ^D)\n" +"\n" +"éåºå½åç zypper shellã\n" +"\n" +"è¯¥å½ä»¤æ²¡æéå çéé¡¹ã\n" + +#: ../src/Zypper.cc:2093 +msgid "" +"shell (sh)\n" +"\n" +"Enter the zypper command shell.\n" +"\n" +"This command has no additional options.\n" +msgstr "" +"shell (sh)\n" +"\n" +"è¿å¥ zypper å½ä»¤ shellã\n" +"\n" +"è¯¥å½ä»¤æ²¡æéå çéé¡¹ã\n" + +#. translators: this is just a rug-compatiblity command +#: ../src/Zypper.cc:2111 +msgid "" +"service-types (st)\n" +"\n" +"List available service types.\n" +msgstr "" +"service-types (st)\n" +"\n" +"ååºå¯ç¨çæå¡ç±»åã\n" + +#. trunslators: this is a rug-compatibility command (equivalent of +#. 'zypper addrepo -t plaindir URI'). You can refer to rug's translations +#. for how to translate specific terms like channel or service if in doubt. +#: ../src/Zypper.cc:2149 +msgid "" +"mount\n" +"\n" +"Mount directory with RPMs as a channel.\n" +"\n" +" Command options:\n" +"-a, --alias <alias> Use given string as service alias.\n" +"-n, --name <name> Use given string as service name.\n" +"-r, --recurse Dive into subdirectories.\n" +msgstr "" +"mount\n" +"\n" +"ç´æ¥æè½½æ RPM çç®å½ä½ä¸ºæ¸ éã\n" +"\n" +" å½ä»¤éé¡¹ï¼\n" +"-a, --alias <alias> ä½¿ç¨ç»å®åç¬¦ä¸²ä½ä¸ºå«åã\n" +"-n, --name <name> ä½¿ç¨ç»å®åç¬¦ä¸²ä½ä¸ºæå¡åã\n" +"-r, --recurse æ£æµåç®å½ã\n" + +#: ../src/Zypper.cc:2180 +#, c-format +msgid "" +"patch-search [options] [querystring...]\n" +"\n" +"Search for patches matching given search strings. This is a rug-compatibility alias for '%s'. See zypper's manual page for details.\n" +msgstr "" +"patch-search [options] [querystring...]\n" +"\n" +"æç´¢ç¬¦åç»å®æ¡ä»¶çè¡¥ä¸ãè¿æ¯ '%s' çrugå¼å®¹æ§å«åãè¯¦æåè§ zypper ç¨æ·æåé¡µã\n" + +#. translators: this is just a rug-compatiblity command +#: ../src/Zypper.cc:2198 +msgid "" +"ping [options]\n" +"\n" +"This command has dummy implementation which always returns 0.\n" +"It is provided for compatibility with rug.\n" +msgstr "" +"ping [options]\n" +"\n" +"æ¤å½ä»¤åºç¨äºä¸ä¸ªèè®¾å®ç°ï¼æ»æ¯è¿å 0ã\n" +"è¿æ¯ä¸ºäºå rug ä¿æå¼å®¹æ§ã\n" + +#: ../src/Zypper.cc:2212 +#: ../src/Zypper.cc:3959 +msgid "Unexpected program flow." +msgstr "æªé¢æçç¨åºæµã" + +#: ../src/Zypper.cc:2236 +msgid "Non-option program arguments: " +msgstr "æ éé¡¹ç¨åºåæ°ï¼" + +#. TranslatorExplanation this is a hedgehog, paint another animal, if you want +#: ../src/Zypper.cc:2298 +msgid "" +" \\\\\\\\\\\n" +" \\\\\\\\\\\\\\__o\n" +"__\\\\\\\\\\\\\\'/_" +msgstr "" +" \\\\\\\\\\\n" +" \\\\\\\\\\\\\\__o\n" +"__\\\\\\\\\\\\\\'/_" + +#: ../src/Zypper.cc:2325 +msgid "Root privileges are required for refreshing services." +msgstr "å·æ°æå¡éè¦æ root ç¹æã" + +#: ../src/Zypper.cc:2352 +#: ../src/Zypper.cc:2699 +msgid "Root privileges are required for modifying system services." +msgstr "ä¿®æ¹ç³»ç»æå¡éè¦æ root ç¹æã" + +#: ../src/Zypper.cc:2421 +msgid "Could not determine the type of the repository. Check if the specified URI points to a valid repository." +msgstr "ä¸è½ç¡®å®å®è£æºçç±»åãè¯·æ£æ¥æå®ç URI æ¯å¦æåä¸ä¸ªææçè½¯ä»¶æºã" + +#: ../src/Zypper.cc:2453 +#, c-format +msgid "'%s' is not a valid service type." +msgstr "`%s' ä¸æ¯ææçæå¡ç±»åã" + +#: ../src/Zypper.cc:2455 +#, c-format +msgid "See '%s' or '%s' to get a list of known service types." +msgstr "è¯·åè'%s' æ '%s' æ¥çå·²ç¥çæå¡ç±»ååè¡¨ã" + +#: ../src/Zypper.cc:2472 +msgid "Root privileges are required for modifying services." +msgstr "ä¿®æ¹æå¡éè¦æ root ç¹æã" + +#. translators: aggregate option is e.g. "--all". This message will be +#. followed by ms command help text which will explain it +#. translators: aggregate option is e.g. "--all". This message will be +#. followed by mr command help text which will explain it +#: ../src/Zypper.cc:2484 +#: ../src/Zypper.cc:2852 +msgid "Alias or an aggregate option is required." +msgstr "éè¦å«åæèä¸ä¸ªæ»ä½çéé¡¹ã" + +#: ../src/Zypper.cc:2518 +#, c-format +msgid "Service '%s' not found." +msgstr "æ²¡ææ¾å°æå¡ '%s'ã" + +#: ../src/Zypper.cc:2554 +#: ../src/Zypper.cc:2698 +#: ../src/Zypper.cc:2784 +#: ../src/Zypper.cc:2840 +msgid "Root privileges are required for modifying system repositories." +msgstr "ä¿®æ¹ç³»ç»å®è£æºéè¦æ root ç¹æã" + +#: ../src/Zypper.cc:2603 +#: ../src/Zypper.cc:2960 +msgid "Too few arguments." +msgstr "åæ°å¤ªå°ã" + +#: ../src/Zypper.cc:2627 +msgid "If only one argument is used, it must be a URI pointing to a .repo file." +msgstr "å¦æåªç¨ä¸ä¸ªåæ°ï¼å¿é¡»æ¯ä¸ä¸ªæå .repo æä»¶ç URIã" + +#: ../src/Zypper.cc:2653 +#, c-format +msgid "Cannot use %s together with %s. Using the %s setting." +msgstr "ä¸è½åæ¶ä½¿ç¨ %s å %sãä½¿ç¨ %s è®¾ç½®ã" + +#: ../src/Zypper.cc:2676 +msgid "Specified type is not a valid repository type:" +msgstr "æå®çç±»åä¸æ¯ææçè½¯ä»¶æºç±»åï¼" + +#: ../src/Zypper.cc:2678 +#, c-format +msgid "See '%s' or '%s' to get a list of known repository types." +msgstr "è¯·åè'%s' æ '%s' æ¥çå·²ç¥çå®è£æºç±»ååè¡¨ã" + +#. translators: %s is the supplied command line argument which +#. for which no repository counterpart was found +#: ../src/Zypper.cc:2734 +#, c-format +msgid "Repository '%s' not found by alias, number or URI." +msgstr "éè¿å«åãç¼å·æ URI é½æªæ¾å°å®è£æº '%s'ã" + +#. translators: %s is the supplied command line argument which +#. for which no service counterpart was found +#: ../src/Zypper.cc:2757 +#, c-format +msgid "Service '%s' not found by alias, number or URI." +msgstr "éè¿å«åãç¼å·æ URI é½æªæ¾å°æå¡ '%s'ã" + +#: ../src/Zypper.cc:2791 +msgid "Too few arguments. At least URI and alias are required." +msgstr "åæ°è¿å°ãè³å°éè¦ URI åå«åã" + +#: ../src/Zypper.cc:2816 +#, c-format +msgid "Repository '%s' not found." +msgstr "æ¾ä¸å°å®è£æº'%s'ã" + +#: ../src/Zypper.cc:2882 +#, c-format +msgid "Repository %s not found." +msgstr "æ¾ä¸å°å®è£æº %sã" + +#: ../src/Zypper.cc:2900 +msgid "Root privileges are required for refreshing system repositories." +msgstr "å·æ°ç³»ç»å®è£æºéè¦æ root ç¹æã" + +#: ../src/Zypper.cc:2907 +#, c-format +msgid "The '%s' global option has no effect here." +msgstr "å¨å±éé¡¹'%s'å¨è¿éæ æã" + +#: ../src/Zypper.cc:2915 +#, c-format +msgid "Arguments are not allowed if '%s' is used." +msgstr "è¥ä½¿ç¨ '%s' åä¸åè®¸ä½¿ç¨åæ°ã" + +#: ../src/Zypper.cc:2941 +msgid "Root privileges are required for cleaning local caches." +msgstr "æ¸çæ¬å°ç¼åéè¦æ root ç¹æã" + +#: ../src/Zypper.cc:2961 +msgid "At least one package name is required." +msgstr "è³å°éè¦æå®ä¸ä¸ªè½¯ä»¶ååç§°ã" + +#: ../src/Zypper.cc:2975 +msgid "Root privileges are required for installing or uninstalling packages." +msgstr "å®è£æå é¤è½¯ä»¶åéè¦æ root ç¹æã" + +#: ../src/Zypper.cc:2990 +#, c-format +msgid "Unknown package type: %s" +msgstr "æªç¥è½¯ä»¶åç±»åï¼%s" + +#: ../src/Zypper.cc:3010 +#, c-format +msgid "'%s' looks like an RPM file. Will try to download it." +msgstr "'%s'è²ä¼¼æ¯ä¸ä¸ª RPM æä»¶ï¼å°å°è¯ä¸è½½ä¹ã" + +#: ../src/Zypper.cc:3023 +#, c-format +msgid "Problem with the RPM file specified as '%s', skipping." +msgstr "æå®ä¸º '%s' çRPM æä»¶åºç°é®é¢ï¼æ£å¨è·³è¿ã" + +#: ../src/Zypper.cc:3046 +#, c-format +msgid "Problem reading the RPM header of %s. Is it an RPM file?" +msgstr "è¯»å %s ç RPM å¤´åºç°é®é¢ãè¿çæ¯ä¸ä¸ª RPM æä»¶ä¹ï¼" + +#: ../src/Zypper.cc:3071 +msgid "Plain RPM files cache" +msgstr "çº¯ RPM æä»¶ç¼å" + +#: ../src/Zypper.cc:3086 +msgid "No valid arguments specified." +msgstr "æ²¡ææå®ææçåæ°ã" + +#: ../src/Zypper.cc:3100 +#: ../src/Zypper.cc:3178 +msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed." +msgstr "è¦åï¼æ²¡æè®¾å®å®è£æºãæä½åªè½å±éäºå·²å®è£çå¯è§£æé¡¹ãä¸è½å®è£æ°è½¯ä»¶ã" + +#: ../src/Zypper.cc:3129 +msgid "Source package name is a required argument." +msgstr "æºä»£ç è½¯ä»¶ååç§°æ¯ä¸ä¸ªå¿é¡»çåæ°ã" + +#: ../src/Zypper.cc:3235 +#: ../src/Zypper.cc:3495 +#: ../src/Zypper.cc:3579 +#: ../src/Zypper.cc:3702 +#: ../src/Zypper.cc:3770 +#, c-format +msgid "Unknown package type '%s'." +msgstr "æªç¥è½¯ä»¶åç±»å '%s'ã" + +#: ../src/Zypper.cc:3341 +msgid "Problem occurred initializing or executing the search query" +msgstr "å¨åå§åææ§è¡æç´¢è¯·æ±æ¶åºç°é®é¢" + +#: ../src/Zypper.cc:3342 +msgid "See the above message for a hint." +msgstr "è¯·åèä»¥ä¸ä¿¡æ¯ï¼ä»ä¸è·å¾æç¤ºã" + +#. translators: Running as 'rug', cannot use 'best-effort' option. +#: ../src/Zypper.cc:3514 +#: ../src/Zypper.cc:3597 +#, c-format +msgid "Running as '%s', cannot use '%s' option." +msgstr "ä»¥ '%s' è¿è¡ï¼æ æ³ä½¿ç¨ '%s' åæ°ã" + +#: ../src/Zypper.cc:3542 +msgid "Root privileges are required for updating packages." +msgstr "æ´æ°è½¯ä»¶åéè¦æ root ç¹æã" + +#: ../src/Zypper.cc:3635 +msgid "Root privileges are required for performing a distribution upgrade." +msgstr "åçº§åè¡çæ¬éè¦æ root ç¹æã" + +#: ../src/Zypper.cc:3732 +#: ../src/Zypper.cc:3793 +msgid "Root privileges are required for adding of package locks." +msgstr "æ·»å è½¯ä»¶åéå®éè¦æ root ç¹æã" + +#: ../src/Zypper.cc:3901 +#, c-format +msgid "%s matches %s" +msgstr "%s å¹é %s" + +#: ../src/Zypper.cc:3903 +#, c-format +msgid "%s is newer than %s" +msgstr "%s æ¯ %s è¾æ°" + +#: ../src/Zypper.cc:3905 +#, c-format +msgid "%s is older than %s" +msgstr "%s æ¯ %s è¾æ§" + +#: ../src/Zypper.cc:3944 +msgid "This command only makes sense in the zypper shell." +msgstr "è¿ä¸ªå½ä»¤åªæå¨ zypper shell éé¢ä½¿ç¨æææä¹ã" + +#: ../src/Zypper.cc:3956 +msgid "You already are running zypper's shell." +msgstr "æ¨å·²ç»å¨è¿è¡ zypper ç shellã" + +#: ../src/Zypper.cc:3973 +msgid "Description" +msgstr "è¯´æ" + +#: ../src/Zypper.cc:4037 +msgid "Resolvable Type" +msgstr "å¯è§£æé¡¹ç±»å" + Modified: trunk/zypper/po/zh_TW.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/zh_TW.po?rev=11896&r1=… ============================================================================== --- trunk/zypper/po/zh_TW.po (original) +++ trunk/zypper/po/zh_TW.po Fri Dec 5 15:15:58 2008 @@ -11,7 +11,7 @@ "Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-11-28 21:23+0800\n" +"PO-Revision-Date: 2008-12-01 22:05+0800\n" "Last-Translator: swyear <swyear(a)gmail.com>\n" "Language-Team: Traditional Chinese <opensuse-translation(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -561,7 +561,7 @@ #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "åå®è£ä¸åæ¨£å¼ç®åä»æªå®ç¾©ä¸æªå®æã" #: ../src/install.cc:463 #, c-format @@ -576,7 +576,7 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "ç¶ä»¥åç¨±é¸æå¥ä»¶ææå®æ¶æ§çåè½æªå®æã" #: ../src/install.cc:555 #, c-format @@ -788,7 +788,7 @@ #: ../src/repos.cc:106 #, c-format msgid "The up-to-date check of '%s' has been delayed." -msgstr "" +msgstr "'%s' çæ´æ°æª¢æ¥å·²è¢«å»¶é²ã" #: ../src/repos.cc:128 msgid "Forcing raw metadata refresh" @@ -1153,7 +1153,7 @@ #: ../src/repos.cc:1526 #, c-format msgid "Cannot change alias of '%s' repository. The repository belongs to service '%s' which is responsible for setting its alias." -msgstr "" +msgstr "ç¡æ³è®æ´ '%s' å¥ä»¶åº«çå¥åãæ¤å¥ä»¶åº«å±¬æ¼ '%s' æåï¼æ¤æåæè½è¨å®å®çå¥åã" #: ../src/repos.cc:1537 #, c-format @@ -1281,7 +1281,7 @@ #: ../src/repos.cc:2336 #, c-format msgid "Problem retrieving the repository index file for service '%s':" -msgstr "" +msgstr "çºæå '%s' åå¾å¥ä»¶åº«ç´¢å¼æªæ¡æç¼çåé¡ï¼" #: ../src/repos.cc:2338 msgid "Check if the URI is valid and accessible." @@ -1355,25 +1355,25 @@ #, c-format msgid "Repository '%s' has been added to enabled repositories of service '%s'" msgid_plural "Repositories '%s' have been added to enabled repositories of service '%s'" -msgstr[0] "" +msgstr[0] "å¥ä»¶åº« '%s' å·²è¢«å å¥æå '%s' çåç¨å¥ä»¶åº«" #: ../src/repos.cc:2634 #, c-format msgid "Repository '%s' has been added to disabled repositories of service '%s'" msgid_plural "Repositories '%s' have been added to disabled repositories of service '%s'" -msgstr[0] "" +msgstr[0] "å¥ä»¶åº« '%s' å·²è¢«å å¥æå '%s' çåç¨å¥ä»¶åº«" #: ../src/repos.cc:2642 #, c-format msgid "Repository '%s' has been removed from enabled repositories of service '%s'" msgid_plural "Repositories '%s' have been removed from enabled repositories of service '%s'" -msgstr[0] "" +msgstr[0] "å¥ä»¶åº« '%s' å·²å¾æå '%s' çåç¨å¥ä»¶åº«è¢«ç§»é¤" #: ../src/repos.cc:2650 #, c-format msgid "Repository '%s' has been removed from disabled repositories of service '%s'" msgid_plural "Repositories '%s' have been removed from disabled repositories of service '%s'" -msgstr[0] "" +msgstr[0] "å¥ä»¶åº« '%s' å·²å¾æå '%s' çåç¨å¥ä»¶åº«ä¸ç§»é¤" #: ../src/repos.cc:2659 #, c-format @@ -1490,7 +1490,7 @@ #: ../src/search.cc:597 #, c-format msgid "No providers of '%s' found." -msgstr "" +msgstr "æ¾ä¸å° '%s' çæä¾èã" #. translators: meaning 'dependency problem' found during solving #: ../src/solve-commit.cc:44 @@ -1749,7 +1749,7 @@ #: ../src/solve-commit.cc:829 #, c-format msgid "%s conflicts with %s, will use the less aggressive %s" -msgstr "" +msgstr "%s å %s è¡çªï¼å°ä½¿ç¨è¼å°å·å®³ç %s" #: ../src/solve-commit.cc:855 msgid "Force resolution:" @@ -1812,7 +1812,7 @@ #. translators: help text for 'p' option in the y/n/p prompt #: ../src/solve-commit.cc:1032 msgid "Restart solver in no-force-resolution mode in order to show dependency problems." -msgstr "" +msgstr "éæ°ä»¥ä¸å¼·è¿«è§£æ±ºæ¨¡å¼ååè§£æèï¼ä»¥é¡¯ç¤ºç¸ä¾æ§åé¡ã" #: ../src/solve-commit.cc:1074 msgid "committing" @@ -1988,7 +1988,7 @@ #: ../src/utils/messages.cc:78 #, c-format msgid "You have chosen to ignore a problem with download or installation of a package which might lead to broken dependencies of other packages. It is recommended to run '%s' after the operation has finished." -msgstr "" +msgstr "æ¨å·²ç¶é¸æå»å¿½ç¥å¥ä»¶ä¸è¼æå®è£çåé¡ï¼éå¯è½å°è´å¶ä»å¥ä»¶çç¸ä¾æ§è¢«ç ´å£ãå»ºè°æ¨å¨æ¤æä½å®æå¾å·è¡ '%s' å½ä»¤ã" #: ../src/utils/misc.cc:87 msgid "package" @@ -2136,6 +2136,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"å¦ææ¨ä¸¦éä½¿ç¨çµç«¯æ©å·è¡ zypper ï¼ä½¿ç¨ '%s' å¨åé¸é \n" +"è® zypper å°æç¤ºä½¿ç¨é è¨ççæ¡ã" #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2211,6 +2213,8 @@ "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" msgstr "" +"\t--no-cd\t\t\tå¿½ç¥ CD/DVD å¥ä»¶åº«ã\n" +"\t--no-remote\t\tå¿½ç¥é ç«¯å¥ä»¶åº«ã\n" #: ../src/Zypper.cc:182 msgid "" @@ -2263,6 +2267,12 @@ "\tremoveservice, rs\tRemove specified service.\n" "\trefresh-services, refs\tRefresh all services.\n" msgstr "" +" æåç®¡çï¼\n" +"\tservices, ls\t\tååºææå·²å®ç¾©çæåã\n" +"\taddservice, as\t\tå å¥ä¸åæ°çæåã\n" +"\tmodifyservice, ms\tä¿®æ¹æå®çæåã\n" +"\tremoveservice, rs\tç§»é¤æå®çæåã\n" +"\trefresh-services, refs\téæ°æ´çææçæåã\n" #: ../src/Zypper.cc:212 msgid "" @@ -2296,6 +2306,13 @@ "\tdist-upgrade, dup\tPerform a distribution upgrade.\n" "\tpatch-check, pchk\tCheck for patches.\n" msgstr "" +" æ´æ°ç®¡çï¼\n" +"\tupdate, up\t\tä½¿ç¨è¼æ°çæ¬æ´æ°å·²å®è£çå¥ä»¶ã\n" +"\tlist-updates, lu\tååºå¯ç¨çæ´æ°ã\n" +"\tpatch\t\t\tå®è£æéçä¿®è£ç¨å¼ã\n" +"\tlist-patches, lp\tååºæéçä¿®è£ç¨å¼ã\n" +"\tdist-upgrade, dup\té²è¡ä¸åçæ¬åç´ã\n" +"\tpatch-check, pchk\tæª¢æ¥æç¡ä¿®è£ç¨å¼ã\n" #: ../src/Zypper.cc:232 msgid "" @@ -2343,6 +2360,11 @@ "\tlicenses\t\tPrint report about licenses and EULAs of\n" "\t\t\t\tinstalled packages.\n" msgstr "" +" å¶ä»å½ä»¤ï¼\n" +"\tversioncmp, vcmp\tæ¯è¼å©åçæ¬åä¸²ã\n" +"\ttargetos, tos\t\tå°åºç®æ¨ä½æ¥ç³»çµ± ID åä¸²ã\n" +"\tlicenses\t\tå°åºéæ¼å·²å®è£å¥ä»¶çææ¬\n" +"\t\t\t\tè EULAsã\n" #: ../src/Zypper.cc:261 msgid "" @@ -2554,6 +2576,14 @@ "-D, --dry-run Test the installation, do not actually install anything.\n" " --debug-solver Create solver test case for debugging.\n" msgstr "" +"install-new-recommends (inr) [é¸é ]\n" +"\n" +"å®è£å·²å®è£å¥ä»¶æå»ºè°çæ°å¢å å¥ä»¶ãééå¸¸æå¨å®è£æ°èªè¨å¥ä»¶æé©åç¨å¼æä½¿ç¨ã\n" +"\n" +" å½ä»¤é¸é ï¼\n" +"-r, --repo <å¥å|ç·¨è|ä½å> åä½¿ç¨æå®çå¥ä»¶åº«ä¾å®è£å¥ä»¶ã\n" +"-D, --dry-run æ¸¬è©¦å®è£ï¼ä¸è¦ççå®è£ä»»ä½æ±è¥¿ã\n" +" --debug-solver å»ºç«è§£æ±ºæ¹æ¡æ¸¬è©¦æ¡ä¾ä»¥åµé¯ã\n" #. TranslatorExplanation the %s = "yast2, rpm-md, plaindir" #: ../src/Zypper.cc:1039 @@ -2568,6 +2598,14 @@ "-d, --disable Add the service as disabled.\n" "-n, --name Specify descriptive name for the service.\n" msgstr "" +"addservice (as) [é¸é ] <ä½å> <å¥å>\n" +"\n" +"å å¥ä¸åå¥ä»¶åº«ç´¢å¼æåå°ç³»çµ±ã\n" +"\n" +" å½ä»¤é¸é ï¼\n" +"-t, --type <é¡å> æåçé¡å (%s)ã\n" +"-d, --disable å å¥åç¨çæåã\n" +"-n, --name çºæ¤æåæå®æè¿°æ§çåç¨±ã\n" #. TranslatorExplanation the %s = "yast2, rpm-md, plaindir" #. TODO @@ -2581,6 +2619,13 @@ " --loose-auth Ignore user authentication data in the URI.\n" " --loose-query Ignore query string in the URI.\n" msgstr "" +"removeservice (rs) [é¸é ] <å¥å|ç·¨è|ä½å>\n" +"\n" +"å¾ç³»çµ±ä¸ç§»é¤æå®çå¥ä»¶åº«ç´¢å¼æå..\n" +"\n" +" å½ä»¤é¸é ï¼\n" +" --loose-auth å¿½ç¥ URI ä¸çä½¿ç¨èææ¬è³æã\n" +" --loose-query å¿½ç¥ URI ä¸çæ¥è©¢åä¸²ã\n" #. translators: %s is "--all" and "--all" #: ../src/Zypper.cc:1099 -- 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] r11895 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: jkupec Date: Fri Dec 5 14:50:34 2008 New Revision: 11895 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11895&view=rev Log: - some examples added Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11895&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Fri Dec 5 14:50:34 2008 @@ -162,6 +162,20 @@ .I \-t, \-\-type <type> Type of package (default: package). See section \fBPackage Types\fR for list of available package types. +.TP +Examples: + +Show information about package 'workrave': +.br +.B $ zypper info workrave + +Show information about patch 'libzypp': +.br +.B $ zypper info -t patch libzypp + +Show information about pattern 'lamp_server': +.br +.B $ zypper info -t pattern lamp_server .TP .B install (in) [options] <name|capability|rpm_file_uri> ... @@ -217,7 +231,6 @@ interpretation as a command option. .B $ zypper install -- -boring-game great-game great-game-manual - .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -292,13 +305,39 @@ .I \-D, \-\-dry\-run Test the installation, do not actually install any package. This option will add the \-\-test option to the rpm commands run by the install command. +.TP +More examples: + +Install lamp_server pattern: +.br +.B $ zypper install -t pattern lamp_server + +Install GhostScript viewer, but ignore recommended packages: +.br +.B $ zypper install --no-recommends gv + +Install version 2.0.6 of virtualbox-ose package (any of the following): +.br +.B $ zypper install virtualbox-ose-2.0.6 +.br +.B $ zypper install virtualbox-ose=2.0.6 +.br +.B $ zypper install virtualbox-ose = 2.0.6 .TP .B source-install (si) <name> ... Install specified source packages and their build dependencies. -This command will try to find the newest available versions of the source packages and use rpm -i to install them. +This command will try to find the newest available versions of the source +packages and use rpm -i to install them and the packages that are required +to build the source package. + +Note that the source packages must be available in repositories you are using. +You can check whether a repository contains any source packages using the +following command: + +.B $ zypper search -t srcpackage -r <alias|#|URI> .TP .I \-d, \-\-build\-deps\-only @@ -310,6 +349,12 @@ \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This option can be used multiple times. +.TP +Examples: + +Install build dependencies of dbus-1 source package: +.br +.B $ zypper si -D dbus-1 .TP .B verify (ve) [options] @@ -419,6 +464,9 @@ \fI\-t, --type\fR <type> Type of package (default: package). See section \fBPackage Types\fR for list of available package types. + +If \fIpatch\fR is specified, zypper acts as if the \fBlist-patches\fR command +was executed. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -448,6 +496,9 @@ \fI\-t, -\-type\fR <type> Type of package (default: package). See section \fBPackage Types\fR for list of available package types. + +If \fIpatch\fR is specified, zypper acts as if the \fBpatche\fR command +was executed. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -508,6 +559,18 @@ option can be used multiple times. .TP +.B patch-check (pchk) +Check for patches. Displays a count of applicable patches and how many +of them have the security category. +.PP +See also the EXIT CODES section for details on exit status of 0, 100, and 101 +returned by this command. +.TP +.I \-r, \-\-repo <alias|#|URI> +Check for patches only in the repository specified by the alias, number or URI. +This option can be used multiple times. + +.TP .B patch [options] Install all available needed patches. @@ -559,7 +622,14 @@ .I \-D, \-\-dry\-run Test the upgrade, do not actually install or update any package. This option will add the \-\-test option to the rpm commands run by the dist-upgrade command. +.TP +Examples: +Upgrade the system using 'factory' and 'packman' repository: +.br +.B $ zypper install zypper libzypp +.br +.B $ zypper dup -r factory -r packman .SS Query Commands @@ -605,7 +675,6 @@ of available package types. Multiple \-t option are allowed. See also the type-specific query commands like \fBpackages\fR, \fBpatterns\fR, etc. - .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -620,11 +689,49 @@ .I \-s, \-\-details Show all available versions of found packages, each version in each repository on a separate line. +.TP +Examples: + +Search for YaST packages (quote the string to prevent the shell +from expanding the wildcard): +.br +.B $ zypper se 'yast*' + +Show all available versions of package 'kernel-default': +.br +.B $ zypper se -s --match-exact kernel-default + +Look for RSI acronym (case-sensitively), also in summaries and descriptions: +.br +.B $ zypper se -dC --match-words RSI + + +.TP +.B packages (pa) [options] [repository] ... +List all available packages or all packages from specified repositories. +Similar to \fBzypper search -s -t package\fR. +.TP +.I \-r, \-\-repo <alias|#|URI> +Just another means to specify repositories. +.TP +.I \-i, \-\-installed\-only +Show only installed packages. +.TP +.I \-u, \-\-uninstalled\-only +Show only packages which are not installed. + +.TP +.B patches (pch) [options] [repository] ... +List all available patches from specified repositories, including those not +needed. Similar to \fBzypper search -s -t patch\fR. +.TP +\fI\-r, \-\-repo\fR <alias|#|URI> +Just another means to specify repositories. .TP .B patterns (pt) [options] [repository] ... List all available patterns or all patterns from specified repositories. -Similar to \fBzypper search -s -t pattern\fR +Similar to \fBzypper search -s -t pattern\fR. .TP .I \-r, \-\-repo <alias|#|URI> Just another means to specify repositories. @@ -654,28 +761,6 @@ .B what-provides (wp) <capability> List all packages providing the specified capability. See also the \fBinstall\fR command for hint about capabilities. -.SS Patch Management - -.TP -.B patch-check (pchk) -Check for patches. Displays a count of applicable patches and how many -of them have the security category. -.PP -See also the EXIT CODES section for details on exit status of 0, 100, and 101 -returned by this command. -.TP -.I \-r, \-\-repo <alias|#|URI> -Check for patches only in the repository specified by the alias, number or URI. -This option can be used multiple times. - -.TP -.B patches (pch) -List patches. Lists all patches that are available, including -installed and not applicable ones. -.TP -\fI\-r, \-\-repo\fR <alias|#|URI> -Work only with the repository specified by the alias, number or URI. This -option can be used multiple times. .SS Repository Management @@ -732,6 +817,19 @@ .I \-f, \-\-refresh Enable autorefresh of the repository. The autorefresh is disabled by default when adding new repositories. +.TP +Examples: + +Add an HTTP repository, probe it, name it 'Packman 11.1 repo', and use 'packman' as alias: +.br +.B $ zypper ar -c -n 'Packman 11.1 repo' http://packman.iu-bremen.de/suse/11.1 packman + +Add repositories from a repo file: +.br +.B $ zypper ar http://download.opensuse.org/repositories/zypp:/svn/openSUSE_Factory/zypp:s… +.br +.B $ zypper ar myreposbackup.repo + .TP .B removerepo (rr) [options] <alias|#|URI> ... @@ -786,10 +884,27 @@ .TP .I \-N, \-\-sort\-by\-name Sort the list by name. +.TP +Examples: + +Backup your repository setup: +.br +.B $ zypper repos -e myreposbackup.repo + +List repositories with their URIs and priorities: +.br +.B $ zypper lr -pu .TP .B renamerepo (nr) <alias|#|URI> <new-alias> Assign new alias to the repository specified by alias, number or URI. +.TP +Example: + +Rename repository number 8 to 'myrepo' (useful if the repo has some +dreadful alias which is not usable on the command line). +.br +.B $ zypper nr 8 myrepo .TP .B modifyrepo (mr) <options> <alias|#|URI> @@ -838,6 +953,20 @@ Apply changes to repositories of specified type. The type corresponds to the repository URI scheme identifier like http, dvd, etc. You can find complete list of valid types at http://en.opensuse.org/Libzypp/URI. +.TP +Examples: + +Enable keeping of packages for all remote repositories: +.br +.B $ zypper mr -kt + +Enable repository 'updates' and switch on autorefresh for the repo: +.br +.B $ zypper mr -er updates + +Disable all repositories: +.br +.B $ zypper mr -da .TP .B refresh (ref) [alias|#] ... @@ -861,7 +990,7 @@ Only download the raw metadata, don't parse it or build the database. .TP -.B clean [alias|#|URI] ... +.B clean [options] [alias|#|URI] ... Clean the local caches for all known or specified repositories. By default, only caches of downloaded packages are cleaned. .TP -- 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] r11894 - /trunk/sat-solver/package/libsatsolver.changes
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:44:31 2008 New Revision: 11894 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11894&view=rev Log: document binding enhancements Modified: trunk/sat-solver/package/libsatsolver.changes Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Dec 5 14:44:31 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Dec 5 14:43:55 CET 2008 - kkaempf(a)suse.de + +- enhance bindings to provide reasons for solver decisions + +------------------------------------------------------------------- Mon Dec 1 11:50:12 CET 2008 - mls(a)suse.de - prefer patterns again until there's a real fix [bnc#450226] -- 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] r11893 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:41:37 2008 New Revision: 11893 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11893&view=rev Log: clean up bash install test by not installing recommends (recommends are not properly reflected in decisionq_why yet) Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 14:41:37 2008 @@ -223,6 +223,7 @@ @pool.prepare solver = @pool.create_solver( ) + solver.dont_install_recommended = true solver.solve( transaction ) solver.each_to_install { |s| puts "Install #{s}" -- 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] r11892 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Test.cc package/libzypp.changes zypp/HistoryLog.cc zypp/solver/detail/SATResolver.cc
by mlandres＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlandres Date: Fri Dec 5 14:28:47 2008 New Revision: 11892 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11892&view=rev Log: - Fix solvers inappropriate selection as byUSER (bnc 455965) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Test.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/HistoryLog.cc trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11892&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Dec 5 14:28:47 2008 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "6") # -# LAST RELEASED: 5.24.5 (23) +# LAST RELEASED: 5.24.6 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/devel/devel.ma/Test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Test.cc?r… ============================================================================== --- trunk/libzypp/devel/devel.ma/Test.cc (original) +++ trunk/libzypp/devel/devel.ma/Test.cc Fri Dec 5 14:28:47 2008 @@ -3,6 +3,22 @@ #include <zypp/sat/LookupAttr.h> + static std::string pidAndAppname() + { + static std::string _val; + if ( _val.empty() ) + { + pid_t mypid = getpid(); + Pathname p( "/proc/"+str::numstring(mypid)+"/exe" ); + Pathname myname( filesystem::readlink( p ) ); + + _val += str::numstring(mypid); + _val += ":"; + _val += myname.basename(); + } + return _val; + } + /****************************************************************** ** ** FUNCTION NAME : main @@ -12,6 +28,11 @@ { INT << "===[START]==========================================" << endl; + SEC << pidAndAppname() << endl; + + + INT << "===[END]============================================" << endl << endl; + return 0; Pathname mroot( "/tmp/Bb" ); TestSetup test( mroot, Arch_x86_64 ); test.loadRepo( "/Local/ROOT/cache/raw/11.1-update" ); @@ -36,6 +57,8 @@ MIL << it << endl; } + + INT << "===[END]============================================" << endl << endl; return 0; } Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Dec 5 14:28:47 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Dec 5 14:22:11 CET 2008 - ma(a)suse.de + +- Fix solvers inappropriate selection as byUSER (bnc 455965) +- revision 11891 +- version 5.24.6 (23) + +------------------------------------------------------------------- Thu Dec 4 11:10:35 CET 2008 - coolo(a)suse.de - fix %post script to not warn on fresh install Modified: trunk/libzypp/zypp/HistoryLog.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/HistoryLog.cc?rev=1… ============================================================================== --- trunk/libzypp/zypp/HistoryLog.cc (original) +++ trunk/libzypp/zypp/HistoryLog.cc Fri Dec 5 14:28:47 2008 @@ -47,6 +47,22 @@ } return result; } + + static std::string pidAndAppname() + { + static std::string _val; + if ( _val.empty() ) + { + pid_t mypid = getpid(); + zypp::Pathname p( "/proc/"+zypp::str::numstring(mypid)+"/exe" ); + zypp::Pathname myname( zypp::filesystem::readlink( p ) ); + + _val += zypp::str::numstring(mypid); + _val += ":"; + _val += myname.basename(); + } + return _val; + } } namespace zypp @@ -239,10 +255,11 @@ << _sep << p->edition() // 4 evr << _sep << p->arch(); // 5 arch - if (pi.status().isByUser()) + // ApplLow is what the solver selected on behalf of the user. + if (pi.status().isByUser() || pi.status().isByApplLow() ) _log << _sep << userAtHostname(); // 6 reqested by - //else if (pi.status().isByApplHigh() || pi.status().isByApplLow()) - // _log << _sep << "appl"; + else if (pi.status().isByApplHigh()) + _log << _sep << pidAndAppname(); else _log << _sep; @@ -269,10 +286,11 @@ << _sep << p->edition() // 4 evr << _sep << p->arch(); // 5 arch - if (pi.status().isByUser()) + // ApplLow is what the solver selected on behalf of the user. + if ( pi.status().isByUser() || pi.status().isByApplLow() ) _log << _sep << userAtHostname(); // 6 reqested by - //else if (pi.status().isByApplHigh() || pi.status().isByApplLow()) - // _log << _sep << "appl"; + else if (pi.status().isByApplHigh()) + _log << _sep << pidAndAppname(); else _log << _sep; Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Fri Dec 5 14:28:47 2008 @@ -584,17 +584,15 @@ } // Solvables which were selected due requirements which have been made by the user will - // be selected by USER. - // FIXME: The request queue should contains the TransactBy field - // ma: this is also deadly for the UI as it converts the requirement into a fix selection, - // which will serve as user input on the next solver run. + // be selected by APPL_LOW. We can't use any higher level, because this setting must + // not serve as a request for the next solver run. APPL_LOW is reset before solving. for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) { sat::WhatProvides rpmProviders(*iter); for_( iter2, rpmProviders.begin(), rpmProviders.end() ) { PoolItem poolItem(*iter2); if (poolItem.status().isToBeInstalled()) { MIL << "User requirement " << *iter << " sets " << poolItem << endl; - poolItem.status().setTransactByValue (ResStatus::USER); + poolItem.status().setTransactByValue (ResStatus::APPL_LOW); } } } @@ -604,7 +602,7 @@ PoolItem poolItem(*iter2); if (poolItem.status().isToBeUninstalled()) { MIL << "User conflict " << *iter << " sets " << poolItem << endl; - poolItem.status().setTransactByValue (ResStatus::USER); + poolItem.status().setTransactByValue (ResStatus::APPL_LOW); } } } -- 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] r11891 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:22:42 2008 New Revision: 11891 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11891&view=rev Log: test allowuninstall Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 14:22:42 2008 @@ -60,7 +60,11 @@ end else # d < 0 if p < 0 - "cnf! #{to_solvable(pool, -p)} conflicts #{to_solvable(pool, -d)}" + if d == -1 + "del! #{to_solvable(pool, -p)}" + else + "cnf! #{to_solvable(pool, -p)} conflicts #{to_solvable(pool, -d)}" + end else "error p #{p}, d #{d}, w1 #{w1}, w2 {w2}" end @@ -320,4 +324,44 @@ puts "\t [#{src} #{pis} #{rel}: #{tgt}]" end end + def test_indirect_removal + solv1 = @repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + rel = @pool.create_relation( "a", Satsolver::REL_EQ, "42" ) + assert rel + solv1.provides << rel + + puts "\n---\nB-1.0-0 requires a = 42, provided by A-1.0-0. Removal of A should remove B" + solv2.requires << rel + assert solv2.requires.size == 1 + + @pool.installed = @repo + + transaction = @pool.create_transaction + transaction.remove( solv1 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.allow_uninstall = true + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end end -- 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] r11890 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:13:47 2008 New Revision: 11890 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11890&view=rev Log: add obsoletes and conflicts test Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 14:13:47 2008 @@ -41,7 +41,11 @@ if p > 0 "or! #{to_solvable(pool, p)}, #{to_solvable(pool, w2)}" else - "bin! #{to_solvable(pool, -p)} requires #{to_solvable(pool, w2)}" + if w2 > 0 + "bin! #{to_solvable(pool, -p)} requires #{to_solvable(pool, w2)}" + else + "bin! #{to_solvable(pool, -p)} obsoletes #{to_solvable(pool, -w2)}" + end end else # p != w1 "error d = 0, w2 = #{w2}, p #{p} != w1 #{w1}" @@ -185,9 +189,6 @@ transaction.install( solv2 ) @pool.prepare - @pool.each_provider(rel) do |p| - puts "#{p} provides #{rel}" - end solver = @pool.create_solver( ) solver.solve( transaction ) solver.each_to_install { |s| @@ -242,6 +243,81 @@ puts "\t [#{src} #{pis} #{rel}: #{tgt}]" end end - def test_indirect_requires2 + def test_conflicts + installed = @pool.create_repo( 'installed' ) + solv1 = installed.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + @pool.installed = installed + + rel = @pool.create_relation( "a", Satsolver::REL_EQ, "42" ) + assert rel + solv1.provides << rel + solv2.conflicts << rel + + puts "\n---\nB-1.0-0 conflicts a = 42, provided by installed A-1.0-0" + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_obsoletes + installed = @pool.create_repo( 'installed' ) + solv1 = installed.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + @pool.installed = installed + + rel = @pool.create_relation( "A" ) + assert rel + solv2.obsoletes << rel + + puts "\n---\nB-1.0-0 obsoletes a = 42, provided by installed A-1.0-0" + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end end end -- 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] r11889 - /trunk/sat-solver/applayer/decision.c
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 14:13:29 2008 New Revision: 11889 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11889&view=rev Log: more comments Modified: trunk/sat-solver/applayer/decision.c Modified: trunk/sat-solver/applayer/decision.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?r… ============================================================================== --- trunk/sat-solver/applayer/decision.c (original) +++ trunk/sat-solver/applayer/decision.c Fri Dec 5 14:13:29 2008 @@ -95,14 +95,14 @@ { continue; } - else + else /* p > 0 */ { s = p; if (installed) { Solvable *solv = pool_id2solvable( pool, p ); if (solv->repo == installed) - continue; + continue; /* thats a 'keep installed' decision, don't report */ } if (!obsoletesmap[p]) { -- 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] r11888 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:22:12 2008 New Revision: 11888 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11888&view=rev Log: more testcases for digging through decision explanation Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb Modified: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Fri Dec 5 12:22:12 2008 @@ -6,15 +6,92 @@ $:.unshift "../../../build/bindings/ruby" require 'test/unit' +require 'pathname' require 'satsolver' +module Satsolver + class Rule + def to_solvable pool, id + if (id < 0) + "!#{pool.solvable(-id)}" + else + "#{pool.solvable(id)}" + end + end + def to_s + "p #{p}, d #{d}, w1 #{w1}, w2 #{w2}" + end + def solvables pool + "p #{to_solvable(pool, p)}, d #{to_solvable(pool, d)}, w1 #{to_solvable(pool, w1)}, w2 #{to_solvable(pool, w2)}" + end + def to_dep pool + if d == 0 + if w2 == 0 + if p == w1 + if p > 0 + "install! #{to_solvable(pool, p)}" + else + "remove! #{to_solvable(pool, -p)}" + end + else # p != w1 + "error d = 0, w2 = 0, p #{p} != w1 #{w1}" + end + else # w2 != 0 + if p == w1 + if p > 0 + "or! #{to_solvable(pool, p)}, #{to_solvable(pool, w2)}" + else + "bin! #{to_solvable(pool, -p)} requires #{to_solvable(pool, w2)}" + end + else # p != w1 + "error d = 0, w2 = #{w2}, p #{p} != w1 #{w1}" + end + end + else # d != 0 + if d > 0 + if p < 0 + "req! #{to_solvable(pool, -p)} requires #{to_solvable(pool, d)}, provided by #{to_solvable(pool, w2)}..." + else + "upd! #{to_solvable(pool, d)} updates #{to_solvable(pool, p)}, provided by #{to_solvable(pool, w2)}..." + end + else # d < 0 + if p < 0 + "cnf! #{to_solvable(pool, -p)} conflicts #{to_solvable(pool, -d)}" + else + "error p #{p}, d #{d}, w1 #{w1}, w2 {w2}" + end + end + end + end # to_dep + end # class Rule +end + +# SolverProbleminfo to string +def pi_s pi + case pi + when Satsolver::SOLVER_PROBLEM_UPDATE_RULE: "update" + when Satsolver::SOLVER_PROBLEM_JOB_RULE: "job" + when Satsolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP: "job nothing provides" + when Satsolver::SOLVER_PROBLEM_NOT_INSTALLABLE: "solvable not installable" + when Satsolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP: "nothing provides" + when Satsolver::SOLVER_PROBLEM_SAME_NAME: "same name" + when Satsolver::SOLVER_PROBLEM_PACKAGE_CONFLICT: "conflicts" + when Satsolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES: "obsoletes" + when Satsolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE: "requires" + when Satsolver::SOLVER_PROBLEM_SELF_CONFLICT: "self conflict" + when Satsolver::SOLVER_PROBLEM_RPM_RULE: "rpm rule" + else + "unknown" + end +end + class ReasonsTest < Test::Unit::TestCase def setup @pool = Satsolver::Pool.new @pool.arch = "i686" @repo = @pool.create_repo( 'test' ) end - def test_simple_requires + def test_direct_requires solv1 = @repo.create_solvable( 'A', '1.0-0' ) assert solv1 solv2 = @repo.create_solvable( 'B', '1.0-0' ) @@ -23,13 +100,51 @@ rel = @pool.create_relation( "A", Satsolver::REL_EQ, "1.0-0" ) assert rel - # B-1.0-0 requires A = 1.0-0 + puts "\n---\nB-1.0-0 requires A = 1.0-0" + solv2.requires << rel + assert solv2.requires.size == 1 + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_indirect_requires + solv1 = @repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + rel = @pool.create_relation( "a", Satsolver::REL_EQ, "42" ) + assert rel + solv1.provides << rel + + puts "\n---\nB-1.0-0 requires a = 42, provided by A-1.0-0" solv2.requires << rel assert solv2.requires.size == 1 transaction = @pool.create_transaction transaction.install( solv2 ) + @pool.prepare solver = @pool.create_solver( ) solver.solve( transaction ) solver.each_to_install { |s| @@ -39,9 +154,94 @@ puts "Remove #{s}" } - puts "#{solver.decision_count} decisions" solver.each_decision do |d| - puts "Decision: #{d.solvable}: #{d.op_s} (#{d.reason})" + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool)} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" end end + def test_indirect_requires_choose + solv1 = @repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + solv3 = @repo.create_solvable( 'C', '1.0-0' ) + assert solv3 + + rel = @pool.create_relation( "a", Satsolver::REL_EQ, "42" ) + assert rel + solv1.provides << rel + solv3.provides << rel + + puts "\n---\nB-1.0-0 requires a = 42, provided by A-1.0-0 and C-1.0-0" + solv2.requires << rel + assert solv2.requires.size == 1 + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + @pool.prepare + @pool.each_provider(rel) do |p| + puts "#{p} provides #{rel}" + end + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_install_bash + solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-beta5-i386.solv" + repo = @pool.add_solv( solvpath ) + repo.name = "beta5" + + puts "\n---\nInstalling bash" + transaction = @pool.create_transaction + transaction.install( "bash" ) + + @pool.prepare + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + puts "#{solver.rule_count} rules" + puts "rpm(#{solver.rpmrules_start}..#{solver.rpmrules_end})" + puts "feature(#{solver.featurerules_start}..#{solver.featurerules_end})" + puts "update(#{solver.updaterules_start}..#{solver.updaterules_end})" + puts "job(#{solver.jobrules_start}..#{solver.jobrules_end})" + puts "learnt(#{solver.learntrules_start}..#{solver.learntrules_end})" + solver.each_decision do |d| + puts " #{d.solvable}\n\t#{d.op_s} (#{d.rule}:#{d.rule.to_dep(@pool) if d.rule} | #{d.reason})" + e = solver.explain( transaction, d) + pis = pi_s e.shift + rel = e.shift + src = e.shift + tgt = e.shift + puts "\t [#{src} #{pis} #{rel}: #{tgt}]" + end + end + def test_indirect_requires2 + end end -- 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] r11887 - /trunk/sat-solver/bindings/ruby/tests/search.rb
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:21:39 2008 New Revision: 11887 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11887&view=rev Log: test per-repo search Modified: trunk/sat-solver/bindings/ruby/tests/search.rb Modified: trunk/sat-solver/bindings/ruby/tests/search.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/search.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/search.rb Fri Dec 5 12:21:39 2008 @@ -51,7 +51,7 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + repo.search("yast2", Satsolver::SEARCH_STRING) do |d| puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" end end @@ -63,7 +63,7 @@ solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) repo.name = "test" - pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + repo.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| puts "#{d.solvable} matches '/usr/bin/python' in #{d.key.name}: #{d.value}" end end -- 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] r11886 - /trunk/sat-solver/bindings/solver.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:21:16 2008 New Revision: 11886 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11886&view=rev Log: add Solver::explain to get reasons for a decision expose rule counter internals Modified: trunk/sat-solver/bindings/solver.i Modified: trunk/sat-solver/bindings/solver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solver.i?rev… ============================================================================== --- trunk/sat-solver/bindings/solver.i (original) +++ trunk/sat-solver/bindings/solver.i Fri Dec 5 12:21:16 2008 @@ -143,6 +143,17 @@ void set_no_update_provide( int bflag ) { $self->noupdateprovide = bflag; } + int rule_count() { return $self->nrules; } + int rpmrules_start() { return 0; } + int rpmrules_end() { return $self->rpmrules_end; } + int featurerules_start() { return $self->featurerules; } + int featurerules_end() { return $self->featurerules_end; } + int updaterules_start() { return $self->updaterules; } + int updaterules_end() { return $self->updaterules_end; } + int jobrules_start() { return $self->jobrules; } + int jobrules_end() { return $self->jobrules_end; } + int learntrules_start() { return $self->learntrules; } + int learntrules_end() { return $self->nrules; } /************************** * Covenants @@ -274,6 +285,39 @@ { return solver_decisions_iterate( $self, solver_decisions_iterate_callback, NULL ); } #endif + /* + * explain a decision + * + * returns 4-element list [<SOLVER_PROBLEM_xxx>, Relation, Solvable, Solvable] + * + */ +#if defined(SWIGRUBY) + VALUE +#endif +#if defined(SWIGPYTHON) + PyObject * +#endif +#if defined(SWIGPERL) + SV * +#endif + explain(Transaction *t, Decision *decision) + { + Id depp = 0, sourcep = 0, targetp = 0; + SolverProbleminfo pi; + Swig_Type result = Swig_Array(); + if (decision->rule > 0) { + pi = solver_problemruleinfo($self, &(t->queue), decision->rule - $self->rules, &depp, &sourcep, &targetp); + Swig_Append(result, Swig_Int(pi)); + } + else { + Swig_Append(result, Swig_Int(-1)); + } + Swig_Append(result, SWIG_NewPointerObj((void*)relation_new($self->pool, depp), SWIGTYPE_p__Relation, 0)); + Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, sourcep), SWIGTYPE_p__Solvable, 0)); + Swig_Append(result, SWIG_NewPointerObj((void*)xsolvable_new($self->pool, targetp), SWIGTYPE_p__Solvable, 0)); + return result; + } + #if defined(SWIGRUBY) %rename("problems?") problems_found(); %typemap(out) int problems_found -- 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] r11885 - /trunk/sat-solver/bindings/decision.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:20:19 2008 New Revision: 11885 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11885&view=rev Log: make Rule leading to decision accessible Modified: trunk/sat-solver/bindings/decision.i Modified: trunk/sat-solver/bindings/decision.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/decision.i?r… ============================================================================== --- trunk/sat-solver/bindings/decision.i (original) +++ trunk/sat-solver/bindings/decision.i Fri Dec 5 12:20:19 2008 @@ -36,5 +36,7 @@ { return xsolvable_new( $self->pool, $self->solvable ); } XSolvable *reason() { return xsolvable_new( $self->pool, $self->reason ); } + Rule *rule() + { return $self->rule; } } -- 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] r11884 - /trunk/sat-solver/bindings/problem.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:19:54 2008 New Revision: 11884 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11884&view=rev Log: extend SOLVER_PROBLEM constants Modified: trunk/sat-solver/bindings/problem.i Modified: trunk/sat-solver/bindings/problem.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/problem.i?re… ============================================================================== --- trunk/sat-solver/bindings/problem.i (original) +++ trunk/sat-solver/bindings/problem.i Fri Dec 5 12:19:54 2008 @@ -35,6 +35,8 @@ %constant int SOLVER_PROBLEM_PACKAGE_CONFLICT = SOLVER_PROBLEM_PACKAGE_CONFLICT; %constant int SOLVER_PROBLEM_PACKAGE_OBSOLETES = SOLVER_PROBLEM_PACKAGE_OBSOLETES; %constant int SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE = SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE; + %constant int SOLVER_PROBLEM_SELF_CONFLICT = SOLVER_PROBLEM_SELF_CONFLICT; + %constant int SOLVER_PROBLEM_RPM_RULE = SOLVER_PROBLEM_RPM_RULE; /* no constructor defined, Problems are created by accessing the Solver result. See 'Solver.each_problem'. */ -- 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] r11883 - /trunk/sat-solver/bindings/repo.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:19:32 2008 New Revision: 11883 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11883&view=rev Log: Repo::search (limit search to repo) Modified: trunk/sat-solver/bindings/repo.i Modified: trunk/sat-solver/bindings/repo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repo.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/repo.i (original) +++ trunk/sat-solver/bindings/repo.i Fri Dec 5 12:19:32 2008 @@ -187,5 +187,17 @@ yield d %} #endif + +#if defined(SWIGRUBY) + void search(const char *match, int flags, XSolvable *xs = NULL, const char *keyname = NULL) + { + Dataiterator *di; + di = swig_dataiterator_new($self->pool, $self, match, flags, xs, keyname); + while( dataiterator_step(di) ) { + rb_yield(SWIG_NewPointerObj((void*) di, SWIGTYPE_p__Dataiterator, 0)); + } + swig_dataiterator_free(di); + } +#endif } -- 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] r11882 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:19:13 2008 New Revision: 11882 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11882&view=rev Log: conversion from Id to XSolvable Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Fri Dec 5 12:19:13 2008 @@ -57,6 +57,11 @@ ~Pool() { pool_free($self); } + XSolvable *solvable(int id) + { + return xsolvable_new( $self, (Id)id); + } + #if defined(SWIGRUBY) %{ /* -- 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] r11881 - in /trunk/sat-solver/bindings: rule.i satsolver.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:18:15 2008 New Revision: 11881 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11881&view=rev Log: make Rules accessible in bindings Added: trunk/sat-solver/bindings/rule.i Modified: trunk/sat-solver/bindings/satsolver.i Added: trunk/sat-solver/bindings/rule.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/rule.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/rule.i (added) +++ trunk/sat-solver/bindings/rule.i Fri Dec 5 12:18:15 2008 @@ -0,0 +1,25 @@ +/* + * Rule + */ + +%nodefault rule; +%rename(Rule) rule; +typedef struct rule {} Rule; + + +%extend Rule { + /* no constructor, Rule is embedded in Solver */ + + int p() + { return $self->p; } + + int d() + { return $self->d; } + + int w1() + { return $self->w1; } + + int w2() + { return $self->w2; } + +} Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Fri Dec 5 12:18:15 2008 @@ -378,5 +378,6 @@ %include "problem.i" %include "solution.i" %include "covenant.i" +%include "rule.i" %include "solver.i" %include "dataiterator.i" -- 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] r11880 - in /trunk/sat-solver/applayer: decision.c decision.h
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:17:38 2008 New Revision: 11880 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11880&view=rev Log: make decisionq_why accessible Modified: trunk/sat-solver/applayer/decision.c trunk/sat-solver/applayer/decision.h Modified: trunk/sat-solver/applayer/decision.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?r… ============================================================================== --- trunk/sat-solver/applayer/decision.c (original) +++ trunk/sat-solver/applayer/decision.c Fri Dec 5 12:17:38 2008 @@ -20,13 +20,14 @@ #include "solverdebug.h" Decision * -decision_new( Pool *pool, int op, Id solvable, Id reason ) +decision_new( Pool *pool, int op, Id solvable, Id reason, Rule *rule ) { Decision *d = (Decision *)malloc( sizeof( Decision )); d->pool = pool; d->op = op; d->solvable = solvable; d->reason = reason; + d->rule = rule; return d; } @@ -43,6 +44,7 @@ Repo *installed = solver->installed; Id p, *obsoletesmap = solver_create_decisions_obsoletesmap( solver ); Id s, r; + int why; int op; Decision *d; int i; @@ -72,6 +74,7 @@ for ( i = 0; i < solver->decisionq.count; i++) { p = solver->decisionq.elements[i]; + why = solver->decisionq_why.elements[i]; r = 0; if (p < 0) /* remove */ @@ -119,7 +122,7 @@ } } } - d = decision_new( pool, op, s, r ); + d = decision_new( pool, op, s, r, why ? solver->rules + why : NULL ); if (callback( d, user_data )) break; } Modified: trunk/sat-solver/applayer/decision.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.h?r… ============================================================================== --- trunk/sat-solver/applayer/decision.h (original) +++ trunk/sat-solver/applayer/decision.h Fri Dec 5 12:17:38 2008 @@ -32,9 +32,10 @@ Pool *pool; Id solvable; Id reason; + Rule *rule; } Decision; -Decision *decision_new( Pool *pool, int op, Id solvable, Id reason ); +Decision *decision_new( Pool *pool, int op, Id solvable, Id reason, Rule *rule ); void decision_free( Decision *d ); void solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, void *user_data ), void *user_data); -- 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] r11879 - /trunk/sat-solver/applayer/xsolvable.c
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:16:38 2008 New Revision: 11879 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11879&view=rev Log: creating xsolvable with Id 0 will return NULL Modified: trunk/sat-solver/applayer/xsolvable.c Modified: trunk/sat-solver/applayer/xsolvable.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/xsolvable.c?… ============================================================================== --- trunk/sat-solver/applayer/xsolvable.c (original) +++ trunk/sat-solver/applayer/xsolvable.c Fri Dec 5 12:16:38 2008 @@ -28,11 +28,14 @@ XSolvable * xsolvable_new( Pool *pool, Id id ) { - XSolvable *xsolvable = (XSolvable *)malloc( sizeof( XSolvable )); - xsolvable->pool = pool; - xsolvable->id = id; + if (id) { + XSolvable *xsolvable = (XSolvable *)malloc( sizeof( XSolvable )); + xsolvable->pool = pool; + xsolvable->id = id; - return xsolvable; + return xsolvable; + } + return NULL; } -- 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] r11878 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
by mlandres＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlandres Date: Fri Dec 5 11:35:53 2008 New Revision: 11878 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11878&view=rev Log: comment added Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Fri Dec 5 11:35:53 2008 @@ -586,6 +586,8 @@ // Solvables which were selected due requirements which have been made by the user will // be selected by USER. // FIXME: The request queue should contains the TransactBy field + // ma: this is also deadly for the UI as it converts the requirement into a fix selection, + // which will serve as user input on the next solver run. for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) { sat::WhatProvides rpmProviders(*iter); for_( iter2, rpmProviders.begin(), rpmProviders.end() ) { -- 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] r11877 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: jkupec Date: Fri Dec 5 11:12:23 2008 New Revision: 11877 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11877&view=rev Log: - some package --type info added Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11877&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Fri Dec 5 11:12:23 2008 @@ -90,7 +90,9 @@ \- group of packages which are necessary to install a product .LP Throughout this manual we will refer to resolvables simply as \fIpackages\fR -and to resolvable types as \fIpackage types\fR. +and to resolvable types as \fIpackage types\fR. These type names can be used +as arguments of \fI--type\fR option in several commands like \fBinstall\fR, +\fBinfo\fR, or \fBsearch\fR. .SS Package Dependencies .LP @@ -158,8 +160,8 @@ option can be used multiple times. .TP .I \-t, \-\-type <type> -Type of package (default: package). Currently supported package types for -the info command are: package, patch, pattern, product. +Type of package (default: package). See section \fBPackage Types\fR for list +of available package types. .TP .B install (in) [options] <name|capability|rpm_file_uri> ... @@ -222,8 +224,30 @@ option can be used multiple times. .TP \fI\-t, \-\-type\fR <type> -Type of package (default: package). See the beginning of this subsection for the list -of available package types. +Type of package to install (default: package). See section \fBPackage Types\fR +for list of available package types. + +If \fIpattern\fR is specified, and the pattern is not yet installed, +all packages required and recommended by the pattern will be installed. +A pattern is considered installed if all the packages and patterns +it requires are installed. Thus a pattern can be evalueated as installed +even if you do not install the pattern itself, but rather the packages +it requries. Use \fBzypper search -t pattern [name]\fR to look for available +patterns and \fBzypper info -t pattern <name>\fR to list its contents. + +If \fIpatch\fR is specified, zypper will install and/or remove packages +to satisfy specified patch. This is a way to ensure that specific +bug fix is installed. Like patterns, patches can also be evaluated as installed +by installing the packages needed to satisfy the patch. +Use \fBzypper list-patches\fR to look for available +needed patches and \fBzypper info -t patch <name>\fR to display detailed +information about a patch. + +If \fIproduct\fR is specified, zypper ensures all packages required +by the product are installed. Use \fBzypper se -t product [name]\fR to look +for available products and \fBzypper info -t product <name>\fR to display +detailed information about a product. + .TP .I \-n, \-\-name Select packages by their name, don't try to select by capabilities. @@ -335,15 +359,7 @@ Remove (uninstall) packages. The packages can be selected by their name or by a capability they provide. -For details on package selection see the install command description. - -Since \fBpatches\fR are not installed in sense of copying files or recording -a database entry, they cannot be uninstalled, even though zypper shows -them as installed. The installed status is determined solely based on -the installed status of its required dependencies. If these dependencies -are satisified, the patch is rendered installed. - -Uninstallation of \fBpatterns\fR is currently not implemented. +For details on package selection see the \fBinstall\fR command description. .TP \fI\-r, \-\-repo\fR <alias|#|URI> @@ -351,8 +367,16 @@ option can be used multiple times. .TP \fI\-t, -\-type\fR <type> -Type of package (default: package). See the beginning of this subsection for the list +Type of package (default: package). See section \fBPackage Types\fR for list of available package types. + +Since \fBpatches\fR are not installed in sense of copying files or recording +a database entry, they cannot be uninstalled, even though zypper shows +them as installed. The installed status is determined solely based on +the installed status of its required dependencies. If these dependencies +are satisified, the patch is rendered installed. + +Uninstallation of \fBpatterns\fR is currently not implemented. .TP .I \-n, \-\-name Select packages by their name (default). @@ -393,8 +417,8 @@ .TP \fI\-t, --type\fR <type> -Type of package (default: package). See Package Managemet Commands subsection -for the list of available package types. +Type of package (default: package). See section \fBPackage Types\fR for list +of available package types. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -422,8 +446,8 @@ .TP \fI\-t, -\-type\fR <type> -Type of package (default: package). See Package Management Commands subsection -for the list of available package types. +Type of package (default: package). See section \fBPackage Types\fR for list +of available package types. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -546,8 +570,6 @@ .IP Results of search are printed in a table with following columns: S (status), Catalog, Type (type of package), Name, Version, Arch (architecture). Status column can contain following values: i - installed, v - another version installed, or an empty space for neither of the former cases. .IP -In \fBrug compatibility mode\fR the --type option defaults to \fBpackage\fR. Furthermore, Instead of the Type column, rug's Bundle column is printed, however, with no contents. -.IP This command accepts the following options: .TP @@ -579,8 +601,11 @@ Show only packages that are not currently installed. .TP .I \-t, -\-type <type> -Search only for packages of specified type. See the beginning of the subsection for the list of available package types. -Multiple \-t option are allowed. +Search only for packages of specified type. See section \fBPackage Types\fR for list +of available package types. Multiple \-t option are allowed. + +See also the type-specific query commands like \fBpackages\fR, \fBpatterns\fR, etc. + .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -1028,7 +1053,9 @@ Restrict the lock to the specified repository. .TP .I \-t, \-\-type <type> -Type of resolvable (package, patch, pattern, product). Default: package. +Lock only packages of specified type (default: package). +See section \fBPackage Types\fR for list +of available package types. .TP .B removelock (rl) [options] <lock-number|package-name> ... @@ -1374,9 +1401,6 @@ mode. The update operation is restricted to the specified repositories. .RS .TP -.I \-t, \-\-type -This option defaults to 'package' in rug compatibility mode. Zypper's default is 'patch'. -.TP .I \-y, \-\-no\-confirm Don't require user interaction. This option is implemented using zypper's non-interactive mode. .TP @@ -1400,6 +1424,13 @@ .TP .I rug search (se) zypper search (se) +.IP +Instead of the Type column, rug's Bundle column is printed, however, with no contents. +.RS +.TP +.I \-t, \-\-type +In rug compatibility mode the --type option defaults to \fIpackage\fR. Zypper +searches all package types by default. .TP \fI \-\-sort\-by\-catalog\fR Sort packages by catalog, not by name. This option is an alias to zypper's -- 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] r11876 - /trunk/sat-solver/src/solver.c
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 10:46:23 2008 New Revision: 11876 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11876&view=rev Log: extend comment Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1187… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri Dec 5 10:46:23 2008 @@ -298,11 +298,12 @@ * d == 0: unary rule, assertion => (A) or (-A) * * Install: p > 0, d = 0 (A) user requested install - * Remove: p < 0, d = 0 (-A) user requested remove + * Remove: p < 0, d = 0 (-A) user requested remove (also: uninstallable) * Requires: p < 0, d > 0 (-A|B1|B2|...) d: <list of providers for requirement of p> * Updates: p > 0, d > 0 (A|B1|B2|...) d: <list of updates for solvable p> * Conflicts: p < 0, d < 0 (-A|-B) either p (conflict issuer) or d (conflict provider) (binary rule) - * ? p > 0, d < 0 (A|-B) + * also used for obsoletes + * ?: p > 0, d < 0 (A|-B) * No-op ?: p = 0, d = 0 (null) (used as policy rule placeholder) * * resulting watches: -- 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] r11875 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlschroe Date: Fri Dec 5 10:42:59 2008 New Revision: 11875 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11875&view=rev Log: - initialize decisioncount before installing supplemented packages Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1187… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri Dec 5 10:42:59 2008 @@ -2918,7 +2918,7 @@ if (dq.count) { Map dqmap; - int decisioncount; + int decisioncount = solv->decisionq.count; if (dq.count == 1) { @@ -2952,7 +2952,7 @@ if (level <= olevel) break; } - if (i < dqs.count) + if (i < dqs.count || solv->decisionq.count < decisioncount) { map_free(&dqmap); continue; @@ -2961,7 +2961,6 @@ /* install all recommended packages */ /* more work as we want to created branches if multiple * choices are valid */ - decisioncount = solv->decisionq.count; for (i = 0; i < decisioncount; i++) { Id rec, *recp, pp; -- 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] r11874 - /trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution
by mlschroe＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: mlschroe Date: Thu Dec 4 18:06:50 2008 New Revision: 11874 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11874&view=rev Log: - revert again Modified: trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution Modified: trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/solver/data.lib… ============================================================================== --- trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution (original) +++ trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution Thu Dec 4 18:06:50 2008 @@ -248,8 +248,6 @@ >!> install galago-sharp-0.5.0-216.noarch[openSUSE-DVD 11.0] >!> install gawk-3.1.5h-29.i586[openSUSE-DVD 11.0] >!> install gcalctool-5.22.1-3.i586[openSUSE-DVD 11.0] ->!> install gcc-gij-4.3-30.i586[openSUSE-DVD 11.0] ->!> install gcc43-gij-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] >!> install gconf-editor-2.22.0-13.i586[openSUSE-DVD 11.0] >!> install gconf-sharp2-2.20.0-1.i586[openSUSE-DVD 11.0] >!> install gconf2-2.22.0-13.i586[openSUSE-DVD 11.0] @@ -405,7 +403,6 @@ >!> install iputils-ss021109-257.i586[openSUSE-DVD 11.0] >!> install iso-codes-2.0-4.noarch[openSUSE-DVD 11.0] >!> install iso_ent-2000.11.03-769.noarch[openSUSE-DVD 11.0] ->!> install java-1_5_0-gcj-compat-1.5.0.0-49.i586[openSUSE-DVD 11.0] >!> install java-1_6_0-sun-1.6.0.u5-5.i586[openSUSE-DVD 11.0] >!> install java-1_6_0-sun-plugin-1.6.0.u5-5.i586[openSUSE-DVD 11.0] >!> install joe-3.5-94.i586[openSUSE-DVD 11.0] @@ -476,8 +473,6 @@ >!> install libgail-gnome-1.20.0-86.i586[openSUSE-DVD 11.0] >!> install libgalago-0.5.2-101.i586[openSUSE-DVD 11.0] >!> install libgcc43-4.3.1_20080409-2.i586[openSUSE-DVD 11.0] ->!> install libgcj43-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] ->!> install libgcj43-jar-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] >!> install libgcrypt11-1.4.0-3.i586[openSUSE-DVD 11.0] >!> install libgda-3.1.2-23.i586[openSUSE-DVD 11.0] >!> install libgda-3_0-3.1.2-23.i586[openSUSE-DVD 11.0] @@ -1047,4 +1042,4 @@ >!> install zlib-1.2.3-105.i586[openSUSE-DVD 11.0] >!> install zsh-4.3.6-5.i586[openSUSE-DVD 11.0] >!> install zypper-0.11.0-3.i586[openSUSE-DVD 11.0] ->!> installs=1042, upgrades=0, uninstalls=0 +>!> installs=1037, upgrades=0, uninstalls=0 -- 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] r11873 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: mlschroe Date: Thu Dec 4 18:06:07 2008 New Revision: 11873 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11873&view=rev Log: - real fix for #450226 - also speeds up solving a lot Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1187… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Thu Dec 4 18:06:07 2008 @@ -2823,8 +2823,8 @@ int qcount; POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended packages\n"); - queue_empty(&dq); - queue_empty(&dqs); + queue_empty(&dq); /* recommended packages */ + queue_empty(&dqs); /* supplemented packages */ for (i = 1; i < pool->nsolvables; i++) { if (solv->decisionmap[i] < 0) @@ -2867,12 +2867,11 @@ continue; if (!solver_is_supplementing(solv, s)) continue; - if (solv->ignorealreadyrecommended && solv->installed) - queue_pushunique(&dqs, i); /* needs filter */ - else - queue_pushunique(&dq, i); + queue_push(&dqs, i); } } + + /* filter out all already supplemented packages if requested */ if (solv->ignorealreadyrecommended && dqs.count) { /* turn off all new packages */ @@ -2886,15 +2885,16 @@ solv->decisionmap[p] = -solv->decisionmap[p]; } /* filter out old supplements */ - for (i = 0; i < dqs.count; i++) + for (i = j = 0; i < dqs.count; i++) { p = dqs.elements[i]; s = pool->solvables + p; if (!s->supplements) continue; if (!solver_is_supplementing(solv, s)) - queue_pushunique(&dq, p); + dqs.elements[j++] = p; } + dqs.count = j; /* undo turning off */ for (i = 0; i < solv->decisionq.count; i++) { @@ -2906,6 +2906,111 @@ solv->decisionmap[p] = -solv->decisionmap[p]; } } + + /* make dq contain both recommended and supplemented pkgs */ + if (dqs.count) + { + for (i = 0; i < dqs.count; i++) + queue_pushunique(&dq, dqs.elements[i]); + } + +#if 1 + if (dq.count) + { + Map dqmap; + int decisioncount; + + if (dq.count == 1) + { + /* simple case, just one package. no need to choose */ + p = dq.elements[0]; + if (dqs.count) + POOL_DEBUG(SAT_DEBUG_POLICY, "installing supplemented %s\n", solvable2str(pool, pool->solvables + p)); + else + POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); + queue_push(&solv->recommendations, p); + level = setpropagatelearn(solv, level, p, 0); + continue; + } + + /* filter and create a map of result */ + policy_filter_unwanted(solv, &dq, POLICY_MODE_RECOMMEND); + map_init(&dqmap, pool->nsolvables); + for (i = 0; i < dq.count; i++) + MAPSET(&dqmap, dq.elements[i]); + + /* install all supplemented packages */ + for (i = 0; i < dqs.count; i++) + { + p = dqs.elements[i]; + if (solv->decisionmap[p] || !MAPTST(&dqmap, p)) + continue; + POOL_DEBUG(SAT_DEBUG_POLICY, "installing supplemented %s\n", solvable2str(pool, pool->solvables + p)); + queue_push(&solv->recommendations, p); + olevel = level; + level = setpropagatelearn(solv, level, p, 0); + if (level <= olevel) + break; + } + if (i < dqs.count) + { + map_free(&dqmap); + continue; + } + + /* install all recommended packages */ + /* more work as we want to created branches if multiple + * choices are valid */ + decisioncount = solv->decisionq.count; + for (i = 0; i < decisioncount; i++) + { + Id rec, *recp, pp; + p = solv->decisionq.elements[i]; + if (p < 0) + continue; + s = pool->solvables + p; + if (!s->repo || (solv->ignorealreadyrecommended && s->repo == solv->installed)) + continue; + if (!s->recommends) + continue; + recp = s->repo->idarraydata + s->recommends; + while ((rec = *recp++) != 0) + { + queue_empty(&dq); + FOR_PROVIDES(p, pp, rec) + { + if (solv->decisionmap[p] > 0) + { + dq.count = 0; + break; + } + else if (solv->decisionmap[p] == 0 && MAPTST(&dqmap, p)) + queue_pushunique(&dq, p); + } + if (!dq.count) + continue; + if (dq.count > 1) + { + /* multiple candidates, open a branch */ + for (i = 1; i < dq.count; i++) + queue_push(&solv->branches, dq.elements[i]); + queue_push(&solv->branches, -level); + } + p = dq.elements[0]; + POOL_DEBUG(SAT_DEBUG_POLICY, "installing recommended %s\n", solvable2str(pool, pool->solvables + p)); + queue_push(&solv->recommendations, p); + olevel = level; + level = setpropagatelearn(solv, level, p, 0); + if (level <= olevel || solv->decisionq.count < decisioncount) + break; + } + if (rec) + break; /* had a problem above, quit loop */ + } + map_free(&dqmap); + continue; + } +#else if (dq.count) { if (dq.count > 1) @@ -2924,6 +3029,7 @@ level = setpropagatelearn(solv, level, p, 0); continue; } +#endif } if (solv->distupgrade && solv->installed) @@ -3009,7 +3115,7 @@ /* kill old solvable so that we do not loop */ p = solv->branches.elements[lasti]; solv->branches.elements[lasti] = 0; - POOL_DEBUG(SAT_DEBUG_STATS, "minimizing %d -> %d with %s\n", solv->decisionmap[p], l, solvable2str(pool, pool->solvables + p)); + POOL_DEBUG(SAT_DEBUG_STATS, "minimizing %d -> %d with %s\n", solv->decisionmap[p], lastl, solvable2str(pool, pool->solvables + p)); minimizationsteps++; level = lastl; -- 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] r11872 - in /trunk/zypper/doc: TODO zypper.8
by jkupec＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: jkupec Date: Thu Dec 4 17:54:54 2008 New Revision: 11872 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11872&view=rev Log: - --no-recommends added to the man page Modified: trunk/zypper/doc/TODO trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/TODO URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/TODO?rev=11872&r1=118… ============================================================================== --- trunk/zypper/doc/TODO (original) +++ trunk/zypper/doc/TODO Thu Dec 4 17:54:54 2008 @@ -29,6 +29,8 @@ patches have been installed + zypper up --some-option repofoo (like 'rug up repo'?) - update packages from specified repos without disabling the others ++ zypper lu --some-option to make it list any newer versions of installed + packages, regardless whether they are installable or not. Packages Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11872&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Thu Dec 4 17:54:54 2008 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "1.0.1" "zypper" "System Tools" +.TH "zypper" "8" "1.0.3" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR] @@ -92,6 +92,15 @@ Throughout this manual we will refer to resolvables simply as \fIpackages\fR and to resolvable types as \fIpackage types\fR. +.SS Package Dependencies +.LP +Software packages depend on each other in various ways. Packages usually +require or recommend other packages, they can declare that they conflict +with other packages, etc. Packages can also depend on specific hardware. +See http://en.opensuse.org/Software_Management/Dependencies for more +information. Zypper utilizes a \fIdependency solver\fR to find out what +packages are needed to be installed according to user's request. + .SH "COMMANDS" .LP @@ -238,7 +247,12 @@ Create solver test case for debugging. Use this option, if you think the dependencies were not solved all right and attach the resulting /var/log/zypper.solverTestCase directory to your bug report. To use this option, simply add it to the problematic -install or remove command. +install or remove command. +.TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones. +This option causes the recomended packages to be ingored and only the +required ones to be installed. .TP .I \-R, \-\-no\-force\-resolution Do not force the solver to find a solution. Instead, report @@ -281,6 +295,12 @@ to install or remove to fix them. .TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones +(the ones needed to fix broken dependencies in this case). +This option causes the recomended packages to be ingored and only the +required ones to be installed. +.TP .I \-D, \-\-dry-run Test the repair, do not actually do anything to the system. .TP @@ -420,6 +440,11 @@ .I \ \ \ \ \-\-debug\-solver Create solver test case for debugging. See the install command for details. .TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones. +This option causes the recomended packages to be ingored and only the +required ones to be installed. +.TP .I \-R, \-\-no\-force\-resolution Do not force the solver to find a solution. Instead, report dependency problem and prompt the user to resolve it manually. @@ -499,6 +524,11 @@ .I \-l, \-\-auto\-agree\-with\-licenses Automatically say 'yes' to third party license confirmation prompt. By using this option, you choose to agree with licenses of all third-party software this command will install. This option is particularly useful for administators installing the same set of packages on multiple machines (by an automated process) and have the licenses confirmed before. .TP +.I \ \ \ \ \-\-no\-recommends +By default, zypper installs also packages recommended by the requested ones. +This option causes the recomended packages to be ingored and only the +required ones to be installed. +.TP .I \ \ \ \ \-\-debug\-solver Create solver test case for debugging. See the install command for details. .TP -- 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] r11871 - /trunk/sat-solver/cmake/modules/FindCheck.cmake
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 17:50:46 2008 New Revision: 11871 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11871&view=rev Log: fix 'check' test for cmake > 2.4 Modified: trunk/sat-solver/cmake/modules/FindCheck.cmake Modified: trunk/sat-solver/cmake/modules/FindCheck.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/cmake/modules/FindChe… ============================================================================== --- trunk/sat-solver/cmake/modules/FindCheck.cmake (original) +++ trunk/sat-solver/cmake/modules/FindCheck.cmake Thu Dec 4 17:50:46 2008 @@ -9,13 +9,13 @@ # Look for the library. FIND_LIBRARY(CHECK_LIBRARY NAMES check) -IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4) +IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) # handle the QUIETLY and REQUIRED arguments and set CHECK_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Check "Please install 'check' and 'check-devel' packages" CHECK_LIBRARY CHECK_INCLUDE_DIR) -ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERISION} GREATER 2.4) +ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) IF(CHECK_FOUND) SET( CHECK_LIBRARIES ${CHECK_LIBRARY} ) -- 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] r11870 - /trunk/sat-solver/bindings/python/tests/search.py
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 17:42:09 2008 New Revision: 11870 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11870&view=rev Log: test filelist search Modified: trunk/sat-solver/bindings/python/tests/search.py Modified: trunk/sat-solver/bindings/python/tests/search.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/search.py (original) +++ trunk/sat-solver/bindings/python/tests/search.py Thu Dec 4 17:42:09 2008 @@ -20,7 +20,7 @@ repo = pool.add_solv( "os11-biarch.solv" ) repo.set_name("test") i = 0 - for d in pool.search("yast2", satsolver.SEARCH_STRING): + for d in pool.search("yast2", satsolver.SEARCH_STRING,None,"solvable:filelist"): print d.solvable(), "matches 'yast2' in ", d.keyname(), ": ", d.value() i = i + 1 if i > 10: -- 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] r11869 - /trunk/sat-solver/bindings/ruby/tests/reasons.rb
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 15:15:33 2008 New Revision: 11869 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11869&view=rev Log: beginning of tests for decision reasons Added: trunk/sat-solver/bindings/ruby/tests/reasons.rb Added: trunk/sat-solver/bindings/ruby/tests/reasons.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/reasons.rb (added) +++ trunk/sat-solver/bindings/ruby/tests/reasons.rb Thu Dec 4 15:15:33 2008 @@ -0,0 +1,47 @@ +# +# reasons.rb +# test decision reasons +# + +$:.unshift "../../../build/bindings/ruby" + +require 'test/unit' +require 'satsolver' + +class ReasonsTest < Test::Unit::TestCase + def setup + @pool = Satsolver::Pool.new + @pool.arch = "i686" + @repo = @pool.create_repo( 'test' ) + end + def test_simple_requires + solv1 = @repo.create_solvable( 'A', '1.0-0' ) + assert solv1 + solv2 = @repo.create_solvable( 'B', '1.0-0' ) + assert solv2 + + rel = @pool.create_relation( "A", Satsolver::REL_EQ, "1.0-0" ) + assert rel + + # B-1.0-0 requires A = 1.0-0 + solv2.requires << rel + assert solv2.requires.size == 1 + + transaction = @pool.create_transaction + transaction.install( solv2 ) + + solver = @pool.create_solver( ) + solver.solve( transaction ) + solver.each_to_install { |s| + puts "Install #{s}" + } + solver.each_to_remove { |s| + puts "Remove #{s}" + } + + puts "#{solver.decision_count} decisions" + solver.each_decision do |d| + puts "Decision: #{d.solvable}: #{d.op_s} (#{d.reason})" + end + end +end -- 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] r11868 - /trunk/sat-solver/bindings/decision.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 15:14:51 2008 New Revision: 11868 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11868&view=rev Log: add 'op_s': decision operator as string Modified: trunk/sat-solver/bindings/decision.i Modified: trunk/sat-solver/bindings/decision.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/decision.i?r… ============================================================================== --- trunk/sat-solver/bindings/decision.i (original) +++ trunk/sat-solver/bindings/decision.i Thu Dec 4 15:14:51 2008 @@ -22,6 +22,16 @@ { return $self->pool; } int op() { return $self->op; } + const char *op_s() + { switch ($self->op) { + case DECISION_INSTALL: return "install"; + case DECISION_REMOVE: return "remove"; + case DECISION_UPDATE: return "update"; + case DECISION_OBSOLETE: return "obsolete"; + default: break; + } + return "unknown"; + } XSolvable *solvable() { return xsolvable_new( $self->pool, $self->solvable ); } XSolvable *reason() -- 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] r11867 - /trunk/sat-solver/bindings/relation.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:44:06 2008 New Revision: 11867 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11867&view=rev Log: handle more than just standard ops Modified: trunk/sat-solver/bindings/relation.i Modified: trunk/sat-solver/bindings/relation.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/relation.i?r… ============================================================================== --- trunk/sat-solver/bindings/relation.i (original) +++ trunk/sat-solver/bindings/relation.i Thu Dec 4 13:44:06 2008 @@ -71,12 +71,22 @@ "", ">", "=", ">=", "<", "<>", "<=", "<=>" }; - int op = 0; + unsigned int op = 0; if (ISRELDEP( $self->id )) { Reldep *rd = GETRELDEP( $self->pool, $self->id ); op = rd->flags; } - return ops[op % 8]; + if (op < 8) + return ops[op]; + switch (op) { + case REL_AND: return "and"; + case REL_OR: return "or"; + case REL_WITH: return "with"; + case REL_NAMESPACE: return "namespace"; + case REL_ARCH: return "arch"; + default: break; + } + return "<op>"; } #if defined(SWIGRUBY) -- 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] r11866 - in /trunk/sat-solver/bindings/ruby/tests: covenants.rb decisions.rb problems.rb repodata.rb search.rb solutions.rb solvable.rb solver.rb
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:10:35 2008 New Revision: 11866 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11866&view=rev Log: make (most) Ruby tests work again Modified: trunk/sat-solver/bindings/ruby/tests/covenants.rb trunk/sat-solver/bindings/ruby/tests/decisions.rb trunk/sat-solver/bindings/ruby/tests/problems.rb trunk/sat-solver/bindings/ruby/tests/repodata.rb trunk/sat-solver/bindings/ruby/tests/search.rb trunk/sat-solver/bindings/ruby/tests/solutions.rb trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/ruby/tests/solver.rb Modified: trunk/sat-solver/bindings/ruby/tests/covenants.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/c… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/covenants.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/covenants.rb Thu Dec 4 13:10:35 2008 @@ -15,16 +15,23 @@ assert repo.size > 0 repo.name = "test" + first = second = nil + repo.each do |s| + if first + second = s + break + else + first = s + end + end + solver = pool.create_solver solver.include( "foo" ) - puts "Hi" - puts "#{repo[0]}" - puts "Ho" - solver.include( repo[0] ) + solver.include( first ) solver.include( Satsolver::Relation.new( pool, "foo", Satsolver::REL_EQ, "42-7" ) ) solver.exclude( "bar" ) - solver.exclude( repo[1] ) + solver.exclude( second ) solver.exclude( Satsolver::Relation.new( pool, "bar", Satsolver::REL_EQ, "42-7" ) ) assert solver.covenants_count == 6 solver.each_covenant do |c| Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/d… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/decisions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/decisions.rb Thu Dec 4 13:10:35 2008 @@ -59,7 +59,8 @@ transaction.install( solv3 ) transaction.remove( "D" ) - solver = pool.create_solver( installed ) + pool.installed = installed + solver = pool.create_solver( ) solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/p… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/problems.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/problems.rb Thu Dec 4 13:10:35 2008 @@ -47,14 +47,13 @@ require 'test/unit' require 'satsolver' -def solve_and_check solver, transaction, problem +def solve_and_check solver, transaction, reason - assert solver.problems? - puts "[#{problem}] Problems found" +# assert solver.problems? i = 0 found = false solver.each_problem( transaction ) { |p| - found = true if p.reason == problem + found = true if p.reason == reason i += 1 case p.reason when Satsolver::SOLVER_PROBLEM_UPDATE_RULE #1 @@ -106,19 +105,22 @@ def test_update_rule transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_UPDATE_RULE ) end def test_job_rule transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_JOB_RULE ) end def test_job_nothing_provides transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP ) end @@ -127,7 +129,8 @@ solv = @pool.find( "A", @repo ) solv.requires << @pool.create_relation( "ZZ" ) transaction.install( solv ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_NOT_INSTALLABLE ) end @@ -138,7 +141,8 @@ solvB = @pool.find( "B", @repo ) solvB.requires << @pool.create_relation( "ZZ" ) transaction.install( solvA ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP ) end @@ -148,7 +152,8 @@ transaction.install( solvA ) solvA = @repo.create_solvable( "A", "2.0-0" ) transaction.install( solvA ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_SAME_NAME ) end @@ -160,7 +165,8 @@ solvB.conflicts << @pool.create_relation( solvA.name, Satsolver::REL_EQ, solvA.evr ) transaction.install( solvA ) transaction.install( solvB ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_PACKAGE_CONFLICT ) end @@ -169,13 +175,15 @@ solvCC = @pool.find( "CC", @repo ) solvCC.obsoletes << @pool.create_relation( "A" ) transaction.install( solvCC ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES ) end def test_providers_not_installable transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE ) end Modified: trunk/sat-solver/bindings/ruby/tests/repodata.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/r… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repodata.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repodata.rb Thu Dec 4 13:10:35 2008 @@ -31,7 +31,7 @@ repodata = repo.data(0) assert repodata - puts "Repodata is at '#{repodata.location}' with #{repodata.keysize} keys" + puts "Repodata has #{repodata.keysize} keys" repodata.each_key { |k| puts " Key '#{k.name}' is #{k.type}[#{k.type_id}] with #{k.size} bytes" } Modified: trunk/sat-solver/bindings/ruby/tests/search.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/search.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/search.rb Thu Dec 4 13:10:35 2008 @@ -22,20 +22,22 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - for d in pool.search("yast2", satsolver.SEARCH_STRING): - print d.solvable(), "matches 'yast2' in ", d.key(), ": ", d.value() - assert True + pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" + end + end - def test_pool_search_files(self): - pool = satsolver.Pool() + def test_pool_search_files + pool = Satsolver::Pool.new assert pool - pool.set_arch("i686") + pool.arch = "i686" solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) - repo.set_name("test") - for d in pool.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): - print d.solvable(), "matches '/usr/bin/python' in ", d.key(), ": ", d.value() - assert True + repo.name = "test" + pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + puts "#{d.solvable} matches '/usr/bin/python' in #{d.key.name}: #{d.value}" + end + end # # Repo search @@ -49,20 +51,21 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - for d in repo.search("yast2", satsolver.SEARCH_STRING): - print d.solvable(), "matches 'yast2' in ", d.key(), ": ", d.value() - assert True + pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" + end + end - def test_repo_search_files(self): - pool = satsolver.Pool() + def test_repo_search_files + pool = Satsolver::Pool.new assert pool - pool.set_arch("i686") + pool.arch = "i686" solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) - repo.set_name("test") - for d in repo.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): - print d.solvable(), "matches '/usr/bin/python' in ", d.key(), ": ", d.value() - assert True + repo.name = "test" + pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + puts "#{d.solvable} matches '/usr/bin/python' in #{d.key.name}: #{d.value}" + end + end -if __name__ == '__main__': - unittest.main() +end \ No newline at end of file Modified: trunk/sat-solver/bindings/ruby/tests/solutions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solutions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solutions.rb Thu Dec 4 13:10:35 2008 @@ -45,7 +45,8 @@ transaction.install( solv1 ) transaction.remove( "Z" ) - solver = pool.create_solver( installed ) + pool.installed = installed + solver = pool.create_solver( ) # solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Thu Dec 4 13:10:35 2008 @@ -17,7 +17,7 @@ end deps.each { |d| - puts "\t#{d.name} #{d.op} #{d.evr}" + puts "\t#{d.name} #{d.op_s} #{d.evr}" } end @@ -30,20 +30,17 @@ @pool.add_solv( solvpath ) assert @pool.size > 0 end - def test_solvable - solv = @pool[2] - assert solv - puts solv - puts "#{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" - end def test_deps - return + i = 0 + puts "test_deps" @pool.each { |s| - puts s + puts "Solvable >#{s}<" show_dep "Provides", s.provides show_dep "Requires", s.requires show_dep "Obsoletes", s.obsoletes show_dep "Conflicts", s.conflicts + i += 1 + break if i > 5 } end def test_creation @@ -71,7 +68,7 @@ transaction = @pool.create_transaction transaction.install( solv1 ) - solver = @pool.create_solver( @pool.create_repo( "system" ) ) + solver = @pool.create_solver( ) # @pool.debug = 255 solver.solve( transaction ) solver.each_to_install { |s| Modified: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/s… ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Thu Dec 4 13:10:35 2008 @@ -19,7 +19,8 @@ transaction.install( "A" ) transaction.remove( "xorg-x11" ) - solver = Satsolver::Solver.new( pool, system ) + pool.installed = system + solver = Satsolver::Solver.new( pool ) solver.allow_uninstall = true assert solver.allow_uninstall pool.prepare -- 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] r11865 - in /trunk/sat-solver/bindings: perl/CMakeLists.txt python/CMakeLists.txt ruby/CMakeLists.txt
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:10:10 2008 New Revision: 11865 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11865&view=rev Log: remove features from swig cmdline, those are set in satsolver.i Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt trunk/sat-solver/bindings/python/CMakeLists.txt trunk/sat-solver/bindings/ruby/CMakeLists.txt Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/perl/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/perl/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/perl/CMakeLists.txt Thu Dec 4 13:10:10 2008 @@ -33,7 +33,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Perl ..." - COMMAND ${SWIG_EXECUTABLE} -perl -features autodoc -o ${SWIG_OUTPUT} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} -perl -o ${SWIG_OUTPUT} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMake… ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Thu Dec 4 13:10:10 2008 @@ -26,7 +26,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Python ..." - COMMAND ${SWIG_EXECUTABLE} -python -features autodoc -o ${SWIG_OUTPUT} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} -python -o ${SWIG_OUTPUT} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLi… ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Thu Dec 4 13:10:10 2008 @@ -1,8 +1,9 @@ # # CMakeLists.txt for bindings/ruby # + ENABLE_TESTING() -#ADD_SUBDIRECTORY(tests) +ADD_SUBDIRECTORY(tests) # SWIG_OUPUT is per-target @@ -15,7 +16,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Ruby..." - COMMAND ${SWIG_EXECUTABLE} -ruby -features autodoc -autorename -o ${SWIG_OUTPUT} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} -ruby -o ${SWIG_OUTPUT} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i -- 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] r11864 - in /trunk/sat-solver/bindings: dataiterator.i satsolver.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:08:55 2008 New Revision: 11864 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11864&view=rev Log: factorize Dataiterator constructor/destructor out so Repo::search can use it Modified: trunk/sat-solver/bindings/dataiterator.i trunk/sat-solver/bindings/satsolver.i Modified: trunk/sat-solver/bindings/dataiterator.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dataiterator… ============================================================================== --- trunk/sat-solver/bindings/dataiterator.i (original) +++ trunk/sat-solver/bindings/dataiterator.i Thu Dec 4 13:08:55 2008 @@ -6,7 +6,6 @@ %rename(Dataiterator) _Dataiterator; typedef struct _Dataiterator {} Dataiterator; - %extend Dataiterator { %constant int SEARCH_STRINGMASK = SEARCH_STRINGMASK; %constant int SEARCH_STRING = SEARCH_STRING; @@ -33,21 +32,10 @@ Dataiterator(Pool *pool, Repo *repo, const char *match, int option, XSolvable *xs = 0, const char *keyname = 0) { - Dataiterator *di = calloc(1, sizeof( Dataiterator )); - Solvable *s = 0; - /* cope with pool or repo being NULL */ - if (!pool) { - if (!repo) { - /* raise exception (FIXME) */ - } - pool = repo->pool; - } - if (xs) s = xsolvable_solvable(xs); - dataiterator_init(di, pool, repo, s ? s - s->repo->pool->solvables : 0, keyname && pool ? str2id(pool, keyname, 0) : 0, match, option); - return di; + return swig_dataiterator_new(pool, repo, match, option, xs, keyname); } - ~Dataiterator() { dataiterator_free($self); free( $self ); } + ~Dataiterator() { swig_dataiterator_free($self); } XSolvable *solvable() { Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Thu Dec 4 13:08:55 2008 @@ -16,6 +16,10 @@ %module satsolver %feature("autodoc","1"); +#if defined(SWIGRUBY) +%include <ruby.swg> +#endif + %{ /*=============================================================*/ @@ -144,6 +148,38 @@ } #endif +/* + * create Dataiterator + * (used by dataiterator.i and pool.search) + */ + +static Dataiterator * +swig_dataiterator_new(Pool *pool, Repo *repo, const char *match, int option, XSolvable *xs, const char *keyname) +{ + Dataiterator *di = calloc(1, sizeof( Dataiterator )); + Solvable *s = 0; + /* cope with pool or repo being NULL */ + if (!pool) { + if (!repo) { + /* raise exception (FIXME) */ + } + pool = repo->pool; + } + if (xs) s = xsolvable_solvable(xs); + dataiterator_init(di, pool, repo, s ? s - s->repo->pool->solvables : 0, keyname && pool ? str2id(pool, keyname, 0) : 0, match, option); + return di; +} + +/* + * destroy Dataiterator + */ +void +swig_dataiterator_free(Dataiterator *di) +{ + dataiterator_free(di); + free( di ); +} + /* convert Dataiterator to target value * if *more != 0 on return, value is incomplete */ @@ -253,6 +289,7 @@ /* types and typemaps */ #if defined(SWIGRUBY) + /* * FILE * to Ruby * (copied from /usr/share/swig/ruby/file.i) -- 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] r11863 - /trunk/sat-solver/bindings/repokey.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:08:06 2008 New Revision: 11863 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11863&view=rev Log: fix name() default string() to equal name() Modified: trunk/sat-solver/bindings/repokey.i Modified: trunk/sat-solver/bindings/repokey.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repokey.i?re… ============================================================================== --- trunk/sat-solver/bindings/repokey.i (original) +++ trunk/sat-solver/bindings/repokey.i Thu Dec 4 13:08:06 2008 @@ -35,7 +35,7 @@ const char *name() { Repokey *key = xrepokey_repokey( $self ); - return my_id2str( $self->repodata->repo->pool, key->name ); + return my_id2str( $self->repo->pool, key->name ); } /* type id of key */ int type_id() @@ -128,7 +128,8 @@ #endif const char *string() { - return "<Repokey>"; + Repokey *key = xrepokey_repokey( $self ); + return my_id2str( $self->repo->pool, key->name ); } } -- 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] r11862 - in /trunk/sat-solver/bindings: dependency.i transaction.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:06:53 2008 New Revision: 11862 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11862&view=rev Log: mixin Enumerable for Ruby Modified: trunk/sat-solver/bindings/dependency.i trunk/sat-solver/bindings/transaction.i Modified: trunk/sat-solver/bindings/dependency.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dependency.i… ============================================================================== --- trunk/sat-solver/bindings/dependency.i (original) +++ trunk/sat-solver/bindings/dependency.i Thu Dec 4 13:06:53 2008 @@ -25,6 +25,10 @@ typedef struct _Dependency {} Dependency; +#if defined(SWIGRUBY) +%mixin Dependency "Enumerable"; +#endif + %extend Dependency { %constant int DEP_PRV = DEP_PRV; %constant int DEP_REQ = DEP_REQ; Modified: trunk/sat-solver/bindings/transaction.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/transaction.… ============================================================================== --- trunk/sat-solver/bindings/transaction.i (original) +++ trunk/sat-solver/bindings/transaction.i Thu Dec 4 13:06:53 2008 @@ -25,6 +25,9 @@ %rename(Transaction) _Transaction; typedef struct _Transaction {} Transaction; +#if defined(SWIGRUBY) +%mixin Transaction "Enumerable"; +#endif %extend Transaction { Transaction( Pool *pool ) -- 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] r11861 - /trunk/sat-solver/bindings/repo.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:06:13 2008 New Revision: 11861 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11861&view=rev Log: mixin Enumerable for Ruby Modified: trunk/sat-solver/bindings/repo.i Modified: trunk/sat-solver/bindings/repo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repo.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/repo.i (original) +++ trunk/sat-solver/bindings/repo.i Thu Dec 4 13:06:13 2008 @@ -6,6 +6,9 @@ %rename(Repo) _Repo; typedef struct _Repo {} Repo; +#if defined(SWIGRUBY) +%mixin Repo "Enumerable"; +#endif %extend Repo { Repo( Pool *pool, const char *reponame ) -- 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] r11860 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:04:37 2008 New Revision: 11860 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11860&view=rev Log: Ruby enhancements - mixin Enumerable - pool.search() Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Thu Dec 4 13:04:37 2008 @@ -35,6 +35,10 @@ typedef struct _Pool {} Pool; %rename(Pool) _Pool; +#if defined(SWIGRUBY) +%mixin Pool "Enumerable"; +#endif + %extend Pool { /* @@ -364,6 +368,18 @@ %} #endif +#if defined(SWIGRUBY) + void search(const char *match, int flags, XSolvable *xs = NULL, const char *keyname = NULL) + { + Dataiterator *di; + di = swig_dataiterator_new($self, NULL, match, flags, xs, keyname); + while( dataiterator_step(di) ) { + rb_yield(SWIG_NewPointerObj((void*) di, SWIGTYPE_p__Dataiterator, 0)); + } + swig_dataiterator_free(di); + } +#endif + /************************** * Transaction management */ -- 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] r11859 - /trunk/sat-solver/applayer/dependency.c
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 13:03:48 2008 New Revision: 11859 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11859&view=rev Log: deal with accessing a single dep correctly Modified: trunk/sat-solver/applayer/dependency.c Modified: trunk/sat-solver/applayer/dependency.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/dependency.c… ============================================================================== --- trunk/sat-solver/applayer/dependency.c (original) +++ trunk/sat-solver/applayer/dependency.c Thu Dec 4 13:03:48 2008 @@ -58,17 +58,16 @@ int dependency_size( const Dependency *dep ) { - int i = 0; - Solvable *s; - Id *ids; Offset *relations = dependency_relations( dep ); if (relations) { - s = xsolvable_solvable( dep->xsolvable ); - ids = s->repo->idarraydata + *relations; + Solvable *s = xsolvable_solvable( dep->xsolvable ); + Id *ids = s->repo->idarraydata + *relations; + int i = 0; while (*ids++) ++i; + return i; } - return i; + return 0; } @@ -87,15 +86,17 @@ { Solvable *s = xsolvable_solvable( dep->xsolvable ); Offset *relations = dependency_relations( dep ); - /* loop over it to detect end */ - Id *ids = s->repo->idarraydata + *relations; - while ( i-- >= 0 ) { - if ( !*ids ) - break; - if ( i == 0 ) { - return relation_new( s->repo->pool, *ids ); + if (relations) { + /* loop over it to detect end */ + Id *ids = s->repo->idarraydata + *relations; + while ( i >= 0 ) { + if ( !*ids ) + break; + if ( i-- == 0 ) { + return relation_new( s->repo->pool, *ids ); + } + ++ids; } - ++ids; } return NULL; } -- 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] r11858 - in /trunk/libzypp: libzypp.spec.cmake package/libzypp.changes
by coolo＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: coolo Date: Thu Dec 4 11:11:05 2008 New Revision: 11858 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11858&view=rev Log: later products might finally install without warning Modified: trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=1… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Thu Dec 4 11:11:05 2008 @@ -150,6 +150,7 @@ OLDLOCKSFILE=/etc/zypp/locks.old is_old(){ + test -f ${LOCKSFILE} || return 0 TEMP_FILE=`mktemp` cat ${LOCKSFILE} | sed '/^\#.*/ d;/.*:.*/d;/^[^[a-zA-Z\*?.0-9]*$/d' > ${TEMP_FILE} if [ -s ${TEMP_FILE} ] Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Dec 4 11:11:05 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Dec 4 11:10:35 CET 2008 - coolo(a)suse.de + +- fix %post script to not warn on fresh install + +------------------------------------------------------------------- Mon Dec 1 19:38:24 CET 2008 - ma(a)suse.de - Fix install order computation losing some installed packages -- 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] r11857 - /trunk/sat-solver/bindings/relation.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 10:52:41 2008 New Revision: 11857 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11857&view=rev Log: access relation operator as string Modified: trunk/sat-solver/bindings/relation.i Modified: trunk/sat-solver/bindings/relation.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/relation.i?r… ============================================================================== --- trunk/sat-solver/bindings/relation.i (original) +++ trunk/sat-solver/bindings/relation.i Thu Dec 4 10:52:41 2008 @@ -65,6 +65,20 @@ return 0; } + const char *op_s() + { + static const char *ops[] = { + "", ">", "=", ">=", + "<", "<>", "<=", "<=>" + }; + int op = 0; + if (ISRELDEP( $self->id )) { + Reldep *rd = GETRELDEP( $self->pool, $self->id ); + op = rd->flags; + } + return ops[op % 8]; + } + #if defined(SWIGRUBY) %alias compare "<=>"; #endif -- 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] r11856 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: kkaempf Date: Thu Dec 4 10:52:18 2008 New Revision: 11856 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11856&view=rev Log: rubyfy setting the 'installed' repo Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Thu Dec 4 10:52:18 2008 @@ -375,6 +375,9 @@ * Solver management */ +#if defined(SWIGRUBY) + %rename( "installed=" ) set_installed( Repo *repo ); +#endif void set_installed(Repo *installed = NULL) { pool_set_installed( $self, installed); -- 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] r11855 - /trunk/sat-solver/package/libsatsolver.spec.in
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 21:48:09 2008 New Revision: 11855 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11855&view=rev Log: allow SLE10 build Modified: trunk/sat-solver/package/libsatsolver.spec.in Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Wed Dec 3 21:48:09 2008 @@ -18,7 +18,11 @@ BuildRequires: perl-devel %endif %if 0%{?suse_version} +%if 0%{?suse_version} < 1030 +BuildRequires: expat +%else BuildRequires: libexpat-devel +%endif %if 0%{?suse_version} < 1100 BuildRequires: graphviz %endif @@ -157,8 +161,13 @@ %files -n ruby-satsolver %defattr(-,root,root,-) %if 0%{?suse_version} +%if 0%{?suse_version} < 1100 +%dir %{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch} +%{_libdir}/ruby/site_ruby/%{rb_ver}/%{rb_arch}/satsolver.so +%else %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolver.so %endif +%endif %if 0%{?mandriva_version} %{ruby_sitearchdir}/satsolverx.so %endif -- 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] r11854 - /trunk/sat-solver/bindings/python/tests/providers.py
by kkaempf＠svn.opensuse.org 03 Dec '08

03 Dec '08

Author: kkaempf Date: Wed Dec 3 18:44:36 2008 New Revision: 11854 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11854&view=rev Log: testcase for Python 'providers' iterator Modified: trunk/sat-solver/bindings/python/tests/providers.py Modified: trunk/sat-solver/bindings/python/tests/providers.py URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/tests… ============================================================================== --- trunk/sat-solver/bindings/python/tests/providers.py (original) +++ trunk/sat-solver/bindings/python/tests/providers.py Wed Dec 3 18:44:36 2008 @@ -2,36 +2,36 @@ # Check each_provider callback # -$:.unshift ".." +import unittest -# test EachProvider -require 'test/unit' -require 'satsolver' - -class EachProviderTest < Test::Unit::TestCase - def test_repo_create - pool = Satsolver::Pool.new +import sys +sys.path.insert(0, '../../../build/bindings/python') + +import satsolver + + +class TestSequenceFunctions(unittest.TestCase): + + def test_each_provider(self): + pool = satsolver.Pool() assert pool - pool.arch = "x86_64" - repo = pool.add_solv( "os11-biarch.solv" ) - repo.name = "openSUSE 11.0 Beta3 BiArch" - puts "Repo #{repo.name} loaded with #{repo.size} solvables" + pool.set_arch("x86_64") + repo = pool.add_solv( "../../testdata/os11-biarch.solv" ) + repo.set_name( "openSUSE 11.0 Beta3 BiArch" ) + print "Repo ", repo.name(), " loaded with ", repo.size(), " solvables" system = pool.add_rpmdb( "/" ) - system.name = "@system" - puts "Repo #{system.name} loaded with #{system.size} solvables" - - pool.prepare + system.set_name("@system") + print "Repo ", system.name(), " loaded with ", system.size(), " solvables" - puts "Providers of 'ispell_dictionary':" - pool.each_provider( "ispell_dictionary" ) { |s| - puts " #{s} [#{s.repo.name}]" - } - - rel = pool.create_relation( "ispell_english_dictionary", Satsolver::REL_GT, "3.3.02-23" ) + pool.prepare() + + i = 0 + for solv in pool.providers("ispell_dictionary"): + print solv, " provides ispell_dictionary" - puts "Providers of #{rel}:" - pool.each_provider(rel) { |s| - puts " #{s} [#{s.repo.name}]" - } - end -end + rel = pool.create_relation( "ispell_english_dictionary", satsolver.REL_GT, "3.3.02-23" ) + for solv in pool.providers(rel): + print solv, solv.repo().name() + +if __name__ == '__main__': + unittest.main() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0