November 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11835 - /trunk/sat-solver/package/libsatsolver.changes
by mlschroe＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: mlschroe Date: Fri Nov 28 18:31:50 2008 New Revision: 11835 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11835&view=rev Log: - add version info 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 Nov 28 18:31:50 2008 @@ -2,6 +2,7 @@ Fri Nov 28 18:29:08 CET 2008 - mls(a)suse.de - correct problem solving algorithm +- 0.13.0 ------------------------------------------------------------------- Fri Nov 21 16:54:44 CET 2008 - dmacvicar(a)suse.de -- 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] r11834 - /trunk/sat-solver/package/libsatsolver.changes
by mlschroe＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: mlschroe Date: Fri Nov 28 18:29:57 2008 New Revision: 11834 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11834&view=rev Log: - add changes 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 Nov 28 18:29:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 28 18:29:08 CET 2008 - mls(a)suse.de + +- correct problem solving algorithm + +------------------------------------------------------------------- Fri Nov 21 16:54:44 CET 2008 - dmacvicar(a)suse.de - remove unused updaterepokey, replaced by repo -- 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] r11833 - in /trunk/zypper: VERSION.cmake package/zypper.changes
by jkupec＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: jkupec Date: Fri Nov 28 18:28:55 2008 New Revision: 11833 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11833&view=rev Log: - release Modified: trunk/zypper/VERSION.cmake trunk/zypper/package/zypper.changes Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=11833&r… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Fri Nov 28 18:28:55 2008 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") -# LAST RELEASED: 1.0.1 +# LAST RELEASED: 1.0.2 #======= Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Fri Nov 28 18:28:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 28 18:28:15 CET 2008 - jkupec(a)suse.cz + +- translations update +- 1.0.2 + +------------------------------------------------------------------- Mon Nov 24 20:44:40 CET 2008 - jkupec(a)suse.cz - fixed segfault in 'info' when looking for package to show -- 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] r11832 - in /trunk/zypper/po: hu.po ko.po pl.po zh_TW.po
by jkupec＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: jkupec Date: Fri Nov 28 18:27:42 2008 New Revision: 11832 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11832&view=rev Log: - translations Modified: trunk/zypper/po/hu.po trunk/zypper/po/ko.po trunk/zypper/po/pl.po trunk/zypper/po/zh_TW.po Modified: trunk/zypper/po/hu.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/hu.po?rev=11832&r1=118… ============================================================================== --- trunk/zypper/po/hu.po (original) +++ trunk/zypper/po/hu.po Fri Nov 28 18:27:42 2008 @@ -15,7 +15,7 @@ "Project-Id-Version: zypper.hu\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-11-17 14:46+0100\n" +"PO-Revision-Date: 2008-11-27 10:40+0100\n" "Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n" "Language-Team: Hungarian <hu(a)li.org>\n" "MIME-Version: 1.0\n" @@ -1712,50 +1712,50 @@ #: ../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] "Az alÃ¡bbi csomag vÃ¡ltoztatja meg az architektÃºrÃ¡t:" -msgstr[1] "Az alÃ¡bbi csomagok vÃ¡ltoztatjÃ¡k meg az architektÃºrÃ¡t:" +msgstr[0] "Az alÃ¡bbi csomag mÃ³dosÃtja az architektÃºrÃ¡t:" +msgstr[1] "Az alÃ¡bbi csomagok mÃ³dosÃtjÃ¡k az architektÃºrÃ¡t:" #: ../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] "Az alÃ¡bbi javÃtÃ¡s vÃ¡ltoztatja meg az architektÃºrÃ¡t:" -msgstr[1] "Az alÃ¡bbi javÃtÃ¡sok vÃ¡ltoztatjÃ¡k meg az architektÃºrÃ¡t:" +msgstr[0] "Az alÃ¡bbi javÃtÃ¡s mÃ³dosÃtja az architektÃºrÃ¡t:" +msgstr[1] "Az alÃ¡bbi javÃtÃ¡sok mÃ³dosÃtjÃ¡k az architektÃºrÃ¡t:" #: ../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] "Az alÃ¡bbi minta vÃ¡ltoztatja meg az architektÃºrÃ¡t:" -msgstr[1] "Az alÃ¡bbi mintÃ¡k vÃ¡ltoztatjÃ¡k meg az architektÃºrÃ¡t:" +msgstr[0] "Az alÃ¡bbi minta mÃ³dosÃtja az architektÃºrÃ¡t:" +msgstr[1] "Az alÃ¡bbi mintÃ¡k mÃ³dosÃtjÃ¡k az architektÃºrÃ¡t:" #: ../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] "Az alÃ¡bbi termÃ©k vÃ¡ltoztatja meg az architektÃºrÃ¡t:" -msgstr[1] "Az alÃ¡bbi termÃ©kek vÃ¡ltoztatjÃ¡k meg az architektÃºrÃ¡t:" +msgstr[0] "Az alÃ¡bbi termÃ©k mÃ³dosÃtja az architektÃºrÃ¡t:" +msgstr[1] "Az alÃ¡bbi termÃ©kek mÃ³dosÃtjÃ¡k meg az architektÃºrÃ¡t:" #: ../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] "Az alÃ¡bbi csomag vÃ¡ltoztatja meg a gyÃ¡rtÃ³t:" -msgstr[1] "Az alÃ¡bbi csomagok vÃ¡ltoztatjÃ¡k meg a gyÃ¡rtÃ³t:" +msgstr[0] "Az alÃ¡bbi csomag mÃ³dosÃtja a gyÃ¡rtÃ³t:" +msgstr[1] "Az alÃ¡bbi csomagok mÃ³dosÃtja a gyÃ¡rtÃ³t:" #: ../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] "Az alÃ¡bbi javÃtÃ¡s vÃ¡ltoztatja meg a gyÃ¡rtÃ³t:" -msgstr[1] "Az alÃ¡bbi javÃtÃ¡sok vÃ¡ltoztatjÃ¡k meg a gyÃ¡rtÃ³t:" +msgstr[0] "Az alÃ¡bbi javÃtÃ¡s mÃ³dosÃtja a gyÃ¡rtÃ³t:" +msgstr[1] "Az alÃ¡bbi javÃtÃ¡sok mÃ³dosÃtjÃ¡k a gyÃ¡rtÃ³t:" #: ../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] "Az alÃ¡bbi minta vÃ¡ltoztatja meg a gyÃ¡rtÃ³t:" -msgstr[1] "Az alÃ¡bbi mintÃ¡k vÃ¡ltoztatjÃ¡k meg a gyÃ¡rtÃ³t:" +msgstr[0] "Az alÃ¡bbi minta mÃ³dosÃtja a gyÃ¡rtÃ³t:" +msgstr[1] "Az alÃ¡bbi mintÃ¡k mÃ³dosÃtjÃ¡k a gyÃ¡rtÃ³t:" #: ../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] "Az alÃ¡bbi termÃ©k vÃ¡ltoztatja meg a gyÃ¡rtÃ³t:" -msgstr[1] "Az alÃ¡bbi termÃ©kek vÃ¡ltoztatjÃ¡k meg a gyÃ¡rtÃ³t:" +msgstr[0] "Az alÃ¡bbi termÃ©k mÃ³dosÃtja a gyÃ¡rtÃ³t:" +msgstr[1] "Az alÃ¡bbi termÃ©kek mÃ³dosÃtjÃ¡k a gyÃ¡rtÃ³t:" #: ../src/solve-commit.cc:529 msgid "The following package is not supported by its vendor:" Modified: trunk/zypper/po/ko.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/ko.po?rev=11832&r1=118… ============================================================================== --- trunk/zypper/po/ko.po (original) +++ trunk/zypper/po/ko.po Fri Nov 28 18:27:42 2008 @@ -6,7 +6,7 @@ "Project-Id-Version: zypper.ko\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-11-04 20:34+0900\n" +"PO-Revision-Date: 2008-11-28 11:31+0900\n" "Last-Translator: YunSeok Choi <xein(a)naver.com>\n" "Language-Team: Korean <xein(a)naver.com>\n" "MIME-Version: 1.0\n" @@ -1964,7 +1964,7 @@ #: ../src/solve-commit.cc:1143 #, c-format msgid "Repository '%s' is out of date. Running '%s' might help." -msgstr "ì ì¥ì '%s' ë ì íµê¸°íì´ ì§ë¬ìµëë¤. '%s' ë¥¼ ì¤ííì¸ì." +msgstr "ì ì¥ì '%s' ë ì í¨ê¸°íì´ ì§ë¬ìµëë¤. '%s' ë¥¼ ì¤ííì¸ì." #: ../src/solve-commit.cc:1155 msgid "" Modified: trunk/zypper/po/pl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pl.po?rev=11832&r1=118… ============================================================================== --- trunk/zypper/po/pl.po (original) +++ trunk/zypper/po/pl.po Fri Nov 28 18:27:42 2008 @@ -8,13 +8,15 @@ # Wadim Dziedzic <wdziedzic(a)aviary.pl>, 2008. # PaweÅ Filar <pawelfilar(a)yahoo.pl>, 2008. # Karol Sikora <karol(a)elektrrrus.pl>, 2008. +# Przemyslaw Bojczuk <pbojczuk(a)gmail.com>, 2008. +# Piotr Krakowiak <piotr.krakowiak(a)suse.pl>, 2008. msgid "" msgstr "" "Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-25 11:47+0100\n" -"Last-Translator: Piotr Krakowiak <piotr.krakowiak(a)suse.pl>\n" +"PO-Revision-Date: 2008-11-26 01:45+0100\n" +"Last-Translator: PrzemysÅaw Bojczuk <pbojczuk(a)gmail.com>\n" "Language-Team: <pl(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +66,7 @@ #: ../src/callbacks/keyring.h:108 #, c-format msgid "File '%s' from repository '%s' is signed with an unknown key '%s'. Continue?" -msgstr "Plik '%s' z repozytorium '%s' jest podpisany nieznanym kluczem %s. KontynuowaÄ? " +msgstr "Plik '%s' z repozytorium '%s' jest podpisany nieznanym kluczem '%s'. KontynuowaÄ? " #: ../src/callbacks/keyring.h:125 msgid "Automatically trusting the following key:" @@ -97,7 +99,7 @@ #. 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 "" +msgstr "Czy (o)drzuciÄ klucz, zaakceptowaÄ go (c)zasowo, czy zaakceptowaÄ (t)rwale?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -106,13 +108,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "o/c/t/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/zi" +msgstr "o/c" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -141,7 +142,7 @@ #: ../src/callbacks/keyring.h:214 msgid "Double-check this is not caused by some malicious changes in the file!" -msgstr "PodwÃ³jne sprawdzanie nie jest spowodowane zÅoÅliwymi zmianami w pliku !" +msgstr "PodwÃ³jne sprawdzanie nie jest spowodowane zÅoÅliwymi zmianami w pliku!" #: ../src/callbacks/keyring.h:224 #, c-format @@ -166,9 +167,12 @@ 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Ä?" @@ -204,7 +208,8 @@ 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" @@ -224,7 +229,7 @@ #: ../src/callbacks/repo.h:115 msgid "Retrieving patch rpm" -msgstr "Pobieranie poprawki" +msgstr "Pobieranie poprawki rpm" #: ../src/callbacks/repo.h:152 #, c-format @@ -243,8 +248,10 @@ 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" @@ -257,7 +264,7 @@ #: ../src/callbacks/rpm.h:202 #, c-format msgid "Removal of %s failed:" -msgstr "BÅÄd podczas usuwania %s:" +msgstr "Usuwania %s nie powiodÅo siÄ:" #. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate #. ! \todo use format @@ -283,7 +290,7 @@ #: ../src/Command.cc:174 #, c-format msgid "Unknown command '%s'" -msgstr "Nieznane polecenie \"%s\"" +msgstr "Nieznane polecenie '%s'" #: ../src/info.cc:37 msgid "Name: " @@ -319,12 +326,12 @@ #: ../src/info.cc:91 #, c-format msgid "Information for %s %s:" -msgstr "%s %s -- informacje:" +msgstr "Informacje o %s %s:" #: ../src/info.cc:108 #, c-format msgid "Info for type '%s' not implemented." -msgstr "Informacja '%s' nie zostaÅa jeszcze zaimplementowana." +msgstr "Informacja o '%s' nie zostaÅa jeszcze zaimplementowana." #: ../src/info.cc:114 msgid "None" @@ -354,22 +361,27 @@ #. translators: package requirements table header #: ../src/info.cc:122 msgid "Provided By" -msgstr "Dostarczony przez" +msgstr "Dostarczany przez" #. translators: package conflicts table header #: ../src/info.cc:124 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: " @@ -377,22 +389,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 "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: " @@ -403,7 +432,7 @@ #: ../src/info.cc:168 #, c-format msgid "out-of-date (version %s installed)" -msgstr "przestarzaÅy (zainstalowana wersja to %s) " +msgstr "nieaktualna (zainstalowana wersja to %s) " #: ../src/info.cc:173 msgid "not installed" @@ -423,7 +452,7 @@ #: ../src/info.cc:214 msgid "Reboot Required: " -msgstr "Ponowne uruchomienie:" +msgstr "Wymagane ponowne uruchomienie:" #: ../src/info.cc:217 msgid "Package Manager Restart Required" @@ -431,11 +460,11 @@ #: ../src/info.cc:219 msgid "Restart Required: " -msgstr "Ponowne uruchomienie:" +msgstr "Wymagane ponowne uruchomienie:" #: ../src/info.cc:222 msgid "Interactive: " -msgstr "Interktywny:" +msgstr "Interktywny: " #: ../src/info.cc:226 msgid "Provides:" @@ -445,41 +474,64 @@ 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ÅÄ" @@ -493,16 +545,19 @@ #. 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" #: ../src/info.cc:352 msgid "Flavor" -msgstr "rodzaj" +msgstr "Rodzaj" -#: ../src/info.cc:353 ../src/utils/misc.cc:111 +#: ../src/info.cc:353 +#: ../src/utils/misc.cc:111 msgid "Installed" msgstr "Zainstalowano" @@ -511,7 +566,8 @@ 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'" @@ -532,28 +588,29 @@ #: ../src/install.cc:129 #, c-format msgid "Failed to add '%s' to the list of packages to be installed." -msgstr "Dodanie \"%s\" do listy pakietÃ³w przeznaczonych do instalacji nie powiodÅo siÄ." +msgstr "Dodanie '%s' do listy pakietÃ³w przeznaczonych do instalacji nie powiodÅo siÄ." #: ../src/install.cc:152 #, c-format 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Ä." +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." #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "Czyszczenie bufora zainstalowanych pakietÃ³w." +msgstr "Nie moÅ¼na zainstalowaÄ uaktualnieÅ." #: ../src/install.cc:438 msgid "" @@ -561,10 +618,13 @@ "Patches are not installed in sense of copied files, database records,\n" "or similar." msgstr "" +"Status poprawki jest okreÅlany na podstawie jej zaleznoÅci.\n" +"Poprawki nie sÄ instalowane na zasadzie kopiowania plikÃ³w, rekordÃ³w\n" +"w bazie danych, itp." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "Odinstalowywanie wzorcÃ³w nie jest jeszcze zaimplementowane." #: ../src/install.cc:463 #, c-format @@ -579,12 +639,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "OkreÅlenie architektury podczas wybierania pakietÃ³w w/g nazwy nie zostaÅo jeszcze zaimplementowane." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "'%s' jest niepoprawnym typem usÅugi." +msgstr "'%s' jest niepoprawnÄ nazwÄ pakietu lub wÅaÅciwoÅci." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -600,18 +660,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 "(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" @@ -620,8 +687,12 @@ 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" @@ -642,7 +713,7 @@ msgid_plural "Specified locks have been successfully added." msgstr[0] "Dodano wybranÄ blokadÄ." msgstr[1] "Dodano wybrane blokady." -msgstr[2] "Dodano wybrane blokady." +msgstr[2] "Dodano wybranych blokad." #: ../src/locks.cc:181 msgid "Specified lock has been successfully removed." @@ -656,9 +727,9 @@ #, c-format msgid "%lu lock has been successfully removed." msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "UsuniÄto blokady %lu." +msgstr[0] "UsuniÄto blokadÄ %lu." msgstr[1] "UsuniÄto blokady %lu." -msgstr[2] "UsuniÄto blokady %lu." +msgstr[2] "UsuniÄto blokad %lu." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" @@ -673,7 +744,7 @@ #: ../src/misc.cc:136 #, c-format msgid "Automatically agreeing with %s %s license." -msgstr "Automatycznie zaakceptowano licencjÄ obiektu \"%s\" typu \"%s\"" +msgstr "Automatycznie akceptuje licencjÄ %s %s" #. translators: the first %s is the name of the package, the second #. is " (package-type)" if other than "package" (patch/product/pattern) @@ -730,50 +801,55 @@ #: ../src/misc.cc:286 #, c-format msgid "Installed packages with EULAs: %d" -msgstr "Zainstalowane pakiety EULA: %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 z kodem ÅºrÃ³dÅowym \"%s\" nie zostaÅ znaleziony." +msgstr "Pakiet ÅºrÃ³dÅowy \"%s\" nie zostaÅ znaleziony." #: ../src/misc.cc:407 #, c-format msgid "Installing source package %s-%s" -msgstr "Insalowanie pakietu z kodem ÅºrÃ³dÅowym %s-%s" +msgstr "Insalowanie pakietu ÅºrÃ³dÅowego %s-%s" #: ../src/misc.cc:416 #, c-format msgid "Source package %s-%s successfully installed." -msgstr "Pakiet z kodem ÅºrÃ³dÅowym %s-%s zostaÅ zainstalowany pomyÅlnie." +msgstr "Pakiet ÅºrÃ³dÅowy %s-%s zostaÅ zainstalowany pomyÅlnie." #: ../src/misc.cc:423 #, c-format msgid "Problem installing source package %s-%s:" -msgstr "Problem podczas instalacji pakietu z kodem ÅºrÃ³dÅowym %s-%s" +msgstr "Problem podczas instalacji pakietu ÅºrÃ³dÅowego %s-%s" # internal key used: Warning #: ../src/output/OutNormal.cc:54 msgid "Warning: " -msgstr "OstrzeÅ¼enie: " +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:" # window title for kernel loading (see txt_load_kernel) #: ../src/output/OutNormal.cc:173 msgid "starting" -msgstr "Uruchamianie" +msgstr "uruchamianie" #: ../src/output/OutNormal.cc:250 msgid "No help available for this prompt." @@ -791,12 +867,12 @@ #: ../src/repos.cc:102 #, c-format msgid "Repository '%s' is up to date." -msgstr "Repozytorium \"%s\" jest aktualne." +msgstr "Repozytorium '%s' jest aktualne." #: ../src/repos.cc:106 #, c-format msgid "The up-to-date check of '%s' has been delayed." -msgstr "Sprawdzenie aktualizacji '%s' zostaÅo przeÅoÅ¼one na pÃ³Åºniej." +msgstr "Sprawdzenie aktualizacji '%s' zostaÅo odÅoÅ¼one na pÃ³Åºniej." #: ../src/repos.cc:128 msgid "Forcing raw metadata refresh" @@ -812,8 +888,11 @@ 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." @@ -835,7 +914,7 @@ #: ../src/repos.cc:203 #, c-format msgid "Repository '%s' is invalid." -msgstr "Repozytorium \"%s\" jest niepoprawne." +msgstr "Repozytorium '%s' jest niepoprawne." #: ../src/repos.cc:204 msgid "Please check if the URIs defined for this repository are pointing to a valid repository." @@ -848,7 +927,7 @@ #: ../src/repos.cc:232 msgid "Forcing building of repository cache" -msgstr "Wymuszono przebudowane pamiÄci podrÄcznej repozytorium" +msgstr "Wymuszono przebudowanie pamiÄci podrÄcznej repozytorium" #: ../src/repos.cc:245 #, c-format @@ -877,14 +956,16 @@ #: ../src/repos.cc:426 #, c-format msgid "Use '%s' to get the list of defined repositories." -msgstr "UÅ¼ywa '%s' by otrzymaÄ listÄ zdefiniowanych repozytoriÃ³w." +msgstr "NaleÅ¼y uÅ¼yÄ '%s' by otrzymaÄ listÄ zdefiniowanych repozytoriÃ³w." -#: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#: ../src/repos.cc:490 +#: ../src/repos.cc:497 +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "Nie moÅ¼na wyczyÅciÄ repozytorium '%s\" z powodu bÅÄdu." +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." @@ -912,12 +993,15 @@ 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" @@ -932,26 +1016,33 @@ 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" @@ -963,25 +1054,31 @@ 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:" @@ -1043,7 +1140,7 @@ #: ../src/repos.cc:1177 #, c-format msgid "Cannot clean repository '%s' because of an error." -msgstr "Nie moÅ¼na wyczyÅciÄ repozytorium '%s\" z powodu bÅÄdu." +msgstr "Nie moÅ¼na wyczyÅciÄ repozytorium '%s' z powodu bÅÄdu." #: ../src/repos.cc:1191 msgid "Cleaning installed packages cache." @@ -1073,7 +1170,8 @@ 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." @@ -1082,7 +1180,8 @@ 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:" @@ -1168,7 +1267,8 @@ 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." @@ -1235,7 +1335,7 @@ #: ../src/repos.cc:1770 #, c-format msgid "Leaving repository %s unchanged." -msgstr "Nie zmieniono repozytorium \"%s\"." +msgstr "Nie zmieniono repozytorium '%s'." #: ../src/repos.cc:1808 msgid "Error reading services:" @@ -1419,12 +1519,14 @@ 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." @@ -1460,25 +1562,35 @@ "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" @@ -1495,7 +1607,8 @@ 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." @@ -1511,7 +1624,7 @@ #. translators: meaning 'dependency problem' found during solving #: ../src/solve-commit.cc:44 msgid "Problem: " -msgstr "Problem:" +msgstr "Problem: " #. TranslatorExplanation %d is the solution number #: ../src/solve-commit.cc:57 @@ -1522,18 +1635,18 @@ #: ../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] "NaleÅ¼y wybraÄ '1' by uÅ¼yÄ powyÅ¼szego rozwiÄzania lub moÅ¼na pominÄÄ, sprÃ³bowaÄ ponownie lub przerwaÄ" -msgstr[1] "NaleÅ¼y wybraÄ '1' by uÅ¼yÄ powyÅ¼szych rozwiÄzaÅ lub moÅ¼na pominÄÄ, sprÃ³bowaÄ ponownie lub przerwaÄ" -msgstr[2] "NaleÅ¼y wybraÄ '1' by uÅ¼yÄ powyÅ¼szych rozwiÄzaÅ lub moÅ¼na pominÄÄ, sprÃ³bowaÄ ponownie lub przerwaÄ\t" +msgstr[0] "NaleÅ¼y wybraÄ '1' by uÅ¼yÄ powyÅ¼szego rozwiÄzania. MoÅ¼na teÅ¼ ominÄÄ, sprÃ³bowaÄ ponownie lub przerwaÄ" +msgstr[1] "NaleÅ¼y wybraÄ '1' by uÅ¼yÄ powyÅ¼szych rozwiÄzaÅ. MoÅ¼na teÅ¼ ominÄÄ, sprÃ³bowaÄ ponownie lub przerwaÄ" +msgstr[2] "NaleÅ¼y wybraÄ '1' by uÅ¼yÄ powyÅ¼szych rozwiÄzaÅ. MoÅ¼na teÅ¼ ominÄÄ, sprÃ³bowaÄ ponownie lub przerwaÄ\t" #. 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] "NaleÅ¼y wybraÄ powyÅ¼sze rozwiÄzanie wybierajÄc '1' lub przerwaÄ wybierajÄc 'c'" -msgstr[1] "NaleÅ¼y wybraÄ powyÅ¼sze rozwiÄzania wybierajÄc '1' lub przerwaÄ wybierajÄc 'c'" -msgstr[2] "NaleÅ¼y wybraÄ powyÅ¼sze rozwiÄzania wybierajÄc '1' lub przerwaÄ wybierajÄc 'c'" +msgstr[0] "NaleÅ¼y wybraÄ powyÅ¼sze rozwiÄzanie wybierajÄc '1' lub (p)rzerwaÄ wybierajÄc 'p'" +msgstr[1] "NaleÅ¼y wybraÄ powyÅ¼sze rozwiÄzania wybierajÄc '1' lub (p)rzerwaÄ wybierajÄc 'p'" +msgstr[2] "NaleÅ¼y wybraÄ powyÅ¼sze rozwiÄzania wybierajÄc '1' lub (p)rzerwaÄ wybierajÄc 'p'" #. translators: answers for dependency problem solution input prompt: #. "Choose from above solutions by number or skip, retry or cancel" @@ -1543,7 +1656,7 @@ #. The answers should be lower case letters. #: ../src/solve-commit.cc:102 msgid "s/r/c" -msgstr "po/pn/a" +msgstr "o/s/p" #. translators: answers for dependency problem solution input prompt: #. "Choose from above solutions by number or cancel" @@ -1554,7 +1667,7 @@ #. please report a bug against zypper at bugzilla.novell.com, we'll try to solve it. #: ../src/solve-commit.cc:114 msgid "c" -msgstr "a" +msgstr "p" #. continue with next problem #: ../src/solve-commit.cc:134 @@ -1629,9 +1742,9 @@ #: ../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] "NastÄpujÄcy %s zostanie przywrÃ³cone do wczeÅniejszej wersji:" -msgstr[1] "NastÄpujÄce %s zostanÄ przywrÃ³cone do wczeÅniejszej wersji:" -msgstr[2] "NastÄpujÄce uaktualnienie zostanÄ przywrÃ³cone do wczeÅniejszej wersji:" +msgstr[0] "NastÄpujÄcy wzorce %s zostanie przywrÃ³cone do wczeÅniejszej wersji:" +msgstr[1] "NastÄpujÄce wzorce %s zostanÄ przywrÃ³cone do wczeÅniejszej wersji:" +msgstr[2] "NastÄpujÄce wzorce %s zostanÄ przywrÃ³cone do wczeÅniejszej wersji:" #: ../src/solve-commit.cc:406 msgid "The following product is going to be downgraded:" @@ -1748,9 +1861,9 @@ #: ../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] "Zostanie zmieniona architektura jÄcego wzorca:" -msgstr[1] "Zostanie zmieniona architektura jÄcych wzorcÃ³w:" -msgstr[2] "Zostanie zmieniona architektura jÄcych wzorcÃ³w:" +msgstr[0] "Zostanie zmieniona architektura nastÄpujÄcego wzorca:" +msgstr[1] "Zostanie zmieniona architektura nastÄpujÄcych wzorcÃ³w:" +msgstr[2] "Zostanie zmieniona architektura nastÄpujÄcych wzorcÃ³w:" #: ../src/solve-commit.cc:499 msgid "The following product is going to change architecture:" @@ -1889,12 +2002,12 @@ #. translators: help text for 'n' option in the y/n/p prompt #: ../src/solve-commit.cc:1030 msgid "Cancel the operation." -msgstr "Przerywa. czynnoÅÄ." +msgstr "Zatrzymanie czynnoÅci." #. 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 "NaleÅ¼y uruchom ponownie w trybie no-force-resolution, by zobaczyÄ pro" +msgstr "NaleÅ¼y uruchomiÄ ponownie w trybie no-force-resolution, by uzyskaÄ informacjÄ o problemach." #: ../src/solve-commit.cc:1074 msgid "committing" @@ -1904,7 +2017,8 @@ 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:" @@ -1962,7 +2076,8 @@ 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" @@ -1974,7 +2089,8 @@ "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." @@ -2054,8 +2170,10 @@ 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" @@ -2063,7 +2181,9 @@ 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." @@ -2116,17 +2236,17 @@ #: ../src/utils/misc.cc:97 msgid "resolvable" msgid_plural "resolvables" -msgstr[0] "pakiet rozwiÄzywalny" -msgstr[1] "pakiety rozwiÄzywalne" -msgstr[2] "pakietÃ³w rozwiÄzywalnych" +msgstr[0] "pakiet speÅniajÄcy zaleÅ¼noÅci" +msgstr[1] "pakiety speÅniajÄce zaleÅ¼noÅci" +msgstr[2] "pakietÃ³w speÅniajÄcych zaleÅ¼noÅci" #: ../src/utils/misc.cc:106 msgid "Unknown" -msgstr "Nieznana opcja " +msgstr "Nieznana opcja" #: ../src/utils/misc.cc:118 msgid "Not Applicable" -msgstr "Nieodpowiednia" +msgstr "Nie moÅ¼na zastosowaÄ" #: ../src/utils/misc.cc:191 msgid "Specified local path does not exist or is not accessible." @@ -2155,7 +2275,7 @@ #: ../src/utils/misc.cc:321 #, c-format msgid "Cannot parse capability '%s'." -msgstr "Nie moÅ¼na zanalizowaÄ wÅaÅciwoÅci \"%s\"" +msgstr "Nie przetworzyÄ wÅaÅciwoÅci '%s'" #: ../src/utils/pager.cc:35 #, c-format @@ -2174,7 +2294,7 @@ #. ---------------------------------------------------------------------------- #: ../src/utils/prompt.cc:88 msgid "abort" -msgstr "Przerwij" +msgstr "przerwij" #: ../src/utils/prompt.cc:88 msgid "retry" @@ -2182,11 +2302,11 @@ #: ../src/utils/prompt.cc:88 msgid "ignore" -msgstr "Ignoruj" +msgstr "ignoruj" #: ../src/utils/prompt.cc:100 msgid "Abort, retry, ignore?\n" -msgstr "Przerwij (a), ponÃ³w (r), ignoruj (i)?\n" +msgstr "Przerwij, sprÃ³bÃ³j ponownie, ignoruj?\n" #: ../src/utils/prompt.cc:135 #, c-format @@ -2201,18 +2321,20 @@ #. The answers should be lower case letters. #: ../src/utils/prompt.cc:159 msgid "a/r/i" -msgstr "p/po/i" +msgstr "p/s/i" #: ../src/utils/prompt.cc:160 msgid "Abort, retry, ignore?" -msgstr "Przerwij (a), ponÃ³w (r), ignoruj (i)?" +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" @@ -2220,14 +2342,14 @@ #: ../src/utils/prompt.cc:245 #, c-format msgid "Invalid answer '%s'." -msgstr "NieprawidÅowa odpowiedÅº '%s'.." +msgstr "NieprawidÅowa odpowiedÅº '%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 "ProszÄ wybraÄ 'y' dla '%s' lub 'n' dla '%s' jeÅli nic innego nie dziaÅa" +msgstr "ProszÄ wybraÄ 't' dla '%s' lub 'n' dla '%s' jeÅli nic innego nie dziaÅa" #: ../src/utils/prompt.cc:266 #, c-format @@ -2235,6 +2357,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"WywoÅujÄc zypper poza terminalem, naleÅ¼y uÅ¼yÄ opcji globalnej\n" +"'%s' by zypper stosowaÅ domyÅlne odpowiedzi na zapytania." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2311,6 +2435,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\tIgnorowanie repozytoriÃ³w na CD/DVD.\n" +"\t--no-remote\t\tIgnorowanie zdalnych repozytoriÃ³w.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2519,14 +2645,12 @@ msgstr "AutoodÅwieÅ¼anie wyÅÄczone." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "AutoodÅwieÅ¼anie wyÅÄczone." +msgstr "Repozytoria CD/DVD wyÅÄczone." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "AutoodÅwieÅ¼anie wyÅÄczone." +msgstr "Zdalne repozytoria wyÅÄczone." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -2859,7 +2983,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" @@ -2902,7 +3027,7 @@ #. translators: this option belongs to 'lr' command help #: ../src/Zypper.cc:1273 msgid "-s, --service Show also alias of parent service.\n" -msgstr "-s, --services Pokazuje takÅ¼e aliasy macierzystych usÅug.\n" +msgstr "-s, --services Pokazuje takÅ¼e aliasy macierzystych serwerÃ³w.\n" #: ../src/Zypper.cc:1288 msgid "" @@ -2964,7 +3089,7 @@ "modifyrepo (mr) <parametry> <alias|#|URI>\n" "modifyrepo (mr) <paramatry> <%s>\n" "\n" -"Modyfikuje wÅÄÅciwoÅci repozytoriÃ³Å okreÅlonych aliasem, numerem, adresem URL, lub za pomocÄ opcji '%s'.\n" +"Modyfikuje wÅaÅciwoÅci repozytoriÃ³w okreÅlonych aliasem, numerem, adresem URL, lub za pomocÄ opcji '%s'.\n" "\n" " Parametry polecenia:\n" "-d, --disable WyÅÄcza repozytorium, ale nie usuwa go.\n" @@ -3001,7 +3126,7 @@ "OdÅwieÅ¼a repozytoria na podstawie aliasu, numeru, lub adresu URL. JeÅ¼eli Å¼adne nie bÄdzie wybrane, zostanÄ odÅwiezone wszystkie.\n" "\n" " Parametry polecenia:\n" -"-f, --force Wymusza peÅne odÅwieÅ¼enie.\n" +"-f, --force Wymusza peÅne odÅwieÅ¼anie.\n" "-b, --force-build Wymusza przebudowanie bazy danych pakietÃ³w.\n" "-d, --force-download Force download of raw metadata.\n" "-B, --build-only Tworzy tylko bazÄ danych, nie po biera metadanych.\n" @@ -3405,7 +3530,7 @@ "\n" "WyÅwietla szczegÃ³Åowe informacje na temat produktÃ³w.\n" "\n" -"To polecenie to alias kompatybilnoÅci dla \"%s\".\n" +"To polecenie to alias kompatybilnoÅci dla '%s'.\n" #: ../src/Zypper.cc:1862 msgid "" @@ -3617,7 +3742,8 @@ "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" @@ -3640,7 +3766,8 @@ 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." @@ -3666,7 +3793,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 "Wymagany jest alias lub opcja agregatu." @@ -3675,12 +3803,15 @@ 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." @@ -3784,7 +3915,8 @@ 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." @@ -3792,8 +3924,11 @@ 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'." @@ -3807,7 +3942,8 @@ 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'." @@ -3820,7 +3956,8 @@ 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." @@ -3857,6 +3994,6 @@ #~ msgid "Do you want to trust the key?" #~ msgstr "DodaÄ klucz do listy zaufanych?" - #~ msgid "n/t/i" #~ msgstr "n/z/zi" + Modified: trunk/zypper/po/zh_TW.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/zh_TW.po?rev=11832&r1=… ============================================================================== --- trunk/zypper/po/zh_TW.po (original) +++ trunk/zypper/po/zh_TW.po Fri Nov 28 18:27:42 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-23 11:39+0800\n" +"PO-Revision-Date: 2008-11-28 21:23+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" @@ -187,11 +187,11 @@ #: ../src/callbacks/locks.h:29 msgid "The following query locks some of the objects you want to unlock:" -msgstr "" +msgstr "ä¸åçæ¥è©¢éå®äºä¸äºæ¨æ³è¦è§£éçç©ä»¶ï¼" #: ../src/callbacks/locks.h:42 msgid "The following query does not lock anything:" -msgstr "" +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) @@ -2156,7 +2156,6 @@ msgstr "é¯èª¤" #: ../src/Zypper.cc:153 -#, fuzzy msgid "" " Global Options:\n" "\t--help, -h\t\tHelp.\n" @@ -2178,19 +2177,21 @@ " å¨åé¸é ï¼\n" "\t--helpï¼ -h\t\tèªªæè¨æ¯ã\n" "\t--versionï¼ -V\t\tè¼¸åºçæ¬ç·¨èã\n" -"\t--quietï¼ -q\t\té±èä¸è¬è¼¸åºï¼åå°åºé¯èª¤è¨æ¯ã\n" +"\t--quietï¼ -q\t\té±èä¸è¬è¼¸åºï¼åå°åºé¯èª¤\n" +"\t\t\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--non-interactiveï¼ -n\tä¸åä»»ä½äºï¼èªåä½¿ç¨é è¨ç\n" +"\t\t\t\tçæ¡ã\n" "\t--xmloutï¼ -x\t\tåæçº XML è¼¸åºã\n" -"\t--reposd-dirï¼ -D <dir>\tä½¿ç¨ä¸åçå¥ä»¶åº«å®ç¾©æªçç®éã\n" +"\t--reposd-dirï¼ -D <dir>\tä½¿ç¨ä¸åçå¥ä»¶åº«å®ç¾©æªç\n" +"\t\t\t\tç®éã\n" "\t--cache-dirï¼ -C <dir>\tä½¿ç¨ä¸åçä¸ç¹¼è³æå¿«åè³æåº«çç®éã\n" "\t--raw-cache-dir <dir>\tä½¿ç¨ä¸åç raw ä¸ç¹¼è³æå¿«åçç®éã\n" #: ../src/Zypper.cc:171 -#, fuzzy msgid "" " Repository Options:\n" "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" @@ -2198,7 +2199,7 @@ "\t--disable-repositories\tDo not read meta-data from repositories.\n" "\t--no-refresh\t\tDo not refresh the repositories.\n" msgstr "" -"\tå¥ä»¶åº«é¸é ï¼\n" +" å¥ä»¶åº«é¸é ï¼\n" "\t--no-gpg-checks\t\tå¿½ç¥ GPG æª¢æ¥é¯èª¤ä¸¦ç¹¼çºã\n" "\t--plus-repoï¼ -p <URI>\tä½¿ç¨éå çå¥ä»¶åº«ã\n" "\t--disable-repositories\tä¸è¦ç±å¥ä»¶åº«è®åä¸ç¹¼è³æã\n" @@ -2212,16 +2213,16 @@ msgstr "" #: ../src/Zypper.cc:182 -#, fuzzy 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 "" -"\tç®æ¨é¸é ï¼\n" +" ç®æ¨é¸é ï¼\n" "\t--rootï¼ -R <dir>\tå¨ä¸åçæ ¹ç®éæä½ã\n" -"\t--disable-system-resolvablesã-T\t\tä¸è¦è®åå·²å®è£çè§£æ±ºæ¹æ¡ã\n" +"\t--disable-system-resolvables\n" +"\t\t\t\tä¸è¦è®åå·²å®è£çå¥ä»¶ã\n" #: ../src/Zypper.cc:189 msgid "" @@ -2234,7 +2235,6 @@ "\tshell, sh\t\tåææ¥åå¤éæä»¤ã\n" #: ../src/Zypper.cc:194 -#, fuzzy msgid "" " Repository Management:\n" "\trepos, lr\t\tList all defined repositories.\n" @@ -2245,7 +2245,7 @@ "\trefresh, ref\t\tRefresh all repositories.\n" "\tclean\t\t\tClean local caches.\n" msgstr "" -"\tå¥ä»¶åº«èçï¼\n" +" å¥ä»¶åº«ç®¡çï¼\n" "\trepos, lr\t\tååºææå·²å®ç¾©çå¥ä»¶åº«ã\n" "\taddrepo, ar\t\tå å¥ä¸åæ°çå¥ä»¶åº«ã\n" "\tremoverepo, rr\t\tç§»é¤æå®çå¥ä»¶åº«ã\n" @@ -2265,7 +2265,6 @@ msgstr "" #: ../src/Zypper.cc:212 -#, fuzzy msgid "" " Software Management:\n" "\tinstall, in\t\tInstall packages.\n" @@ -2277,13 +2276,15 @@ "\t\t\t\tInstall newly added packages recommended\n" "\t\t\t\tby installed packages.\n" msgstr "" -"\tè»é«ç®¡çï¼\n" +" è»é«ç®¡çï¼\n" "\tinstall, in\t\tå®è£å¥ä»¶ã\n" "\tremove, rm\t\tç§»é¤å¥ä»¶ã\n" "\tverify, ve\t\tç¢ºèªå¥ä»¶ç¸ä¾æ§æ´åã\n" -"\tupdate, up\t\tæ´æ°å·²å®è£çå¥ä»¶å°è¼æ°çæ¬ã\n" -"\tdist-upgrade, dup\té²è¡ç¼è¡çæ¬åç´ã\n" -"\tsource-install, si\tå®è£æºç¢¼å¥ä»¶åå»ºæ§è»é«æéç¸ä¾å¥ä»¶ã\n" +"\tsource-install, si\tå®è£åå§ç¢¼å¥ä»¶åå¶å»ºæ§æé\n" +"\t\t\t\tç¸ä¾æ§ã\n" +"\tinstall-new-recommends, inr\n" +"\t\t\t\tå®è£å·²å®è£å¥ä»¶æå»ºè°\n" +"\t\t\t\tçæ°å¥ä»¶ã\n" #: ../src/Zypper.cc:223 msgid "" @@ -2297,7 +2298,6 @@ msgstr "" #: ../src/Zypper.cc:232 -#, fuzzy msgid "" " Querying:\n" "\tsearch, se\t\tSearch for packages matching a pattern.\n" @@ -2311,14 +2311,12 @@ "\tproducts, pd\t\tList all available products.\n" "\twhat-provides, wp\tList packages providing specified capability.\n" msgstr "" -"\tæ¥è©¢ï¼\n" +" æ¥è©¢ï¼\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" @@ -2326,14 +2324,13 @@ "\twhat-provides, wp\tååºæä¾æå®ç¸å®¹æ§çå¥ä»¶ã\n" #: ../src/Zypper.cc:247 -#, fuzzy 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 "" -"\tå¥ä»¶éå®ï¼\n" +" å¥ä»¶éå®ï¼\n" "\taddlock, al\t\tå å¥ä¸åå¥ä»¶éå®ã\n" "\tremovelock, rl\t\tè§£é¤ä¸åå¥ä»¶éå®ã\n" "\tlocks, ll\t\tååºç®åçå¥ä»¶éå®ã\n" @@ -2431,7 +2428,7 @@ #. ! \todo A capability is NAME[.ARCH][OP<VERSION>] now, #. ! the help text will be changed after release #: ../src/Zypper.cc:881 -#, fuzzy, c-format +#, c-format msgid "" "install (in) [options] <capability|rpm_file_uri> ...\n" "\n" @@ -2474,7 +2471,7 @@ #. TranslatorExplanation the first %s = "package, patch, pattern, product" #. and the second %s = "package" #: ../src/Zypper.cc:930 -#, fuzzy, c-format +#, c-format msgid "" "remove (rm) [options] <capability> ...\n" "\n" @@ -2643,7 +2640,7 @@ #. TranslatorExplanation the %s = "yast2, rpm-md, plaindir" #: ../src/Zypper.cc:1201 -#, fuzzy, c-format +#, c-format msgid "" "addrepo (ar) [options] <URI> <alias>\n" "addrepo (ar) [options] <FILE.repo>\n" @@ -2675,6 +2672,7 @@ "-n, --name æå®æ¤å¥ä»¶åº«çæè¿°åç¨±ã\n" "-k, --keep-packages åç¨ RPM æªæ¡å¿«åã\n" "-K, --no-keep-packages åç¨ RPM æªæ¡å¿«åã\n" +"-f, --refresh åç¨å¥ä»¶åº«çèªåéæ°æ´çã\n" #. translators: this is just a rug compatiblity command #. translators: this is just a rug-compatiblity command @@ -2755,7 +2753,7 @@ #. translators: %s is "--all|--remote|--local|--medium-type" #. and "--all, --remote, --local, --medium-type" #: ../src/Zypper.cc:1338 -#, fuzzy, c-format +#, c-format msgid "" "modifyrepo (mr) <options> <alias|#|URI>\n" "modifyrepo (mr) <options> <%s>\n" @@ -2781,7 +2779,7 @@ "modifyrepo (mr) <é¸é > <å¥å|ç·¨è|ä½å>\n" "modifyrepo (mr) <é¸é > <%s>\n" "\n" -"ä¿®æ¹æå®å¥åç·¨èæä½åçå¥ä»¶åº«æ§è³ªãæä½¿ç¨ '%s' é¸é ã\n" +"ä¿®æ¹æå®å¥åç·¨èæä½åçå¥ä»¶åº«æ§è³ªãæä½¿ç¨ '%s' èéé¸é ã\n" "\n" " æä»¤é¸é :\n" "-d, --disable åç¨å¥ä»¶åº«(ä½æªç§»é¤å®)\n" @@ -2789,16 +2787,16 @@ "-r, --refresh åç¨å¥ä»¶åº«çèªåéæ°æ´ç\n" "-R, --no-refresh åç¨è©²å¥ä»¶åº«çèªåéæ°æ´ç\n" "-n, --name Set a descriptive name for the repository.\n" -"-p, --priority <1-99> è¨å®å¥ä»¶åº«çåªåæ§ãè«åèèªªææåä»¥å¾å°æ´è©³ç´°çè³è¨ã\n" -"-k, --keep-packages Enable RPM files caching.\n" -"-K, --no-keep-packages Disable RPM files caching.\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" +"-p, --priority <1-99> è¨å®å¥ä»¶åº«çåªåæ§ã\n" +"-k, --keep-packages åç¨ RPM æªæ¡å¿«åã\n" +"-K, --no-keep-packages åç¨ RPM æªæ¡å¿«åã\n" +"\n" +"-a, --all å¥ç¨è®æ´å°æå¥ä»¶åº«ã\n" +"-l, --local å¥ç¨è®æ´å°æææ¬å°å¥ä»¶åº«ã\n" +"-t, --remote å¥ç¨è®æ´å°ææé ç«¯å¥ä»¶åº«ã\n" +"-m, --medium-type <é¡å> å¥ç¨è®æ´å°æå®é¡åçå¥ä»¶åº«ã\n" #: ../src/Zypper.cc:1378 -#, fuzzy msgid "" "refresh (ref) [alias|#|URI] ...\n" "\n" @@ -2824,6 +2822,7 @@ "-B, --build-only åå»ºç«è³æåº«ï¼ä¸ä¸è¼ä¸ç¹¼è³æã\n" "-D, --download-only åä¸è¼ raw ä¸ç¹¼è³æï¼ä¸å»ºç«è³æåº«\n" "-r, --repo <å¥å|ç·¨è|ä½å> éæ°æ´çæå®çå¥ä»¶åº«ã\n" +"-s, --services å¨éæ°æ´çå¥ä»¶åº«ååéæ°æ´çæåã\n" #: ../src/Zypper.cc:1407 msgid "" @@ -2850,7 +2849,7 @@ #. TranslatorExplanation the first %s = "package, patch, pattern, product" #. and the second %s = "patch" #: ../src/Zypper.cc:1436 -#, fuzzy, c-format +#, c-format msgid "" "list-updates (lu) [options]\n" "\n" @@ -2872,16 +2871,20 @@ "ååºææå¯ç¨çæ´æ°\n" "\n" " æä»¤é¸é ï¼\n" -"-t, --type <é¡å> è§£æ±ºæ¹æ¡çé¡å (%s)\n" +"-t, --type <é¡å> å¥ä»¶çé¡å (%s)\n" " é è¨çºï¼ %s\n" "-r, --repo <å¥å|ç·¨è|ä½å> åååºæå®å¥ä»¶åº«ä¸çæ´æ°ã\n" " --best-effort ç¡æå¤§åªåä¾è¶¨è¿ææ°çæï¼\n" -" æ´æ°å°æ¯ææ°çæ¬éä½äºçä¹å¯ä»¥æ¥åã\n" +" æ´æ°å°æ¯ææ°çæ¬éä½äºçä¹\n" +" å¯ä»¥æ¥åã\n" +"-a, --all ååºæææè¼æ°çæ¬å¯ç¨ç\n" +" å¥ä»¶ï¼ä¸è«ä»åæ¯å¦\n" +" å¯ä»¥å®è£ã\n" #. TranslatorExplanation the first %s = "package, patch, pattern, product" #. and the second %s = "patch" #: ../src/Zypper.cc:1487 -#, fuzzy, c-format +#, c-format msgid "" "update (up) [options] ...\n" "\n" @@ -2905,19 +2908,22 @@ " --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 "" -"update (up) [é¸é ]\n" +"update (up) [é¸é ] ...\n" +"\n" +"æ´æ°ææææå®çå·²å®è£å¥ä»¶å°å¯ç¨çè¼æ°çæ¬ã\n" "\n" -"æ´æ°ææå·²å®è£çè§£æ±ºæ¹æ¡å°å¯ç¨çè¼æ°çæ¬ã\n" "\n" " æä»¤é¸é ï¼\n" "\n" -"-t, --type <é¡å> è§£æ±ºæ¹æ¡çé¡å (%s)\n" +"-t, --type <é¡å> å¥ä»¶çé¡å (%s)\n" " é è¨çºï¼ %s\n" "-r, --repo <å¥å|ç·¨è|ä½å> éå¶åç¨æå®çå¥ä»¶åº«ä¾æ´æ°ã\n" " --skip-interactive è·³éäºåå¼æ´æ°\n" "-l, --auto-agree-with-licenses èªåå°ç¬¬ä¸æ¹ææ¬ç¢ºèªæç¤ºèªª 'yes'ã\n" " è«åé± man zypper ä»¥ç²å¾æ´é²ä¸æ¥çç´°ç¯ã\n" -" --best-effort ç¡æå¤§åªåä¾è¶¨è¿ææ°çæï¼æ´æ°å°æ¯ææ°çæ¬éä½äºçä¹å¯ä»¥æ¥åã\n" +" --best-effort ç¡æå¤§åªåä¾è¶¨è¿ææ°çæï¼\n" +" æ´æ°å°æ¯ææ°çæ¬éä½äºç\n" +" ä¹å¯ä»¥æ¥åã\n" " --debug-solver å»ºç«è§£æ±ºæ¸¬è©¦æ¡ä¾ä¾åµé¯\n" " --no-recommends ä¸è¦å®è£å»ºè°å¥ä»¶ï¼åªå®è£éè¦çã\n" "-R, --no-force-resolution ä¸è¦å¼·è¿«æ¾å°è§£æ±ºæ¹æ¡ï¼åè©¢åã\n" @@ -3064,7 +3070,6 @@ "-r, --repo <å¥å|ç·¨è|ä½å> åååºæå®å¥ä»¶åº«ä¸çä¿®è£ç¨å¼ã\n" #: ../src/Zypper.cc:1705 -#, fuzzy msgid "" "packages (pa) [options] [repository] ...\n" "\n" @@ -3091,7 +3096,6 @@ "-R, --sort-by-repo ä»¥å¥ä»¶åº«æåæ¸å®ã\n" #: ../src/Zypper.cc:1733 -#, fuzzy msgid "" "patterns (pt) [options] [repository] ...\n" "\n" @@ -3114,7 +3118,6 @@ "-u, --uninstalled-only åé¡¯ç¤ºæªå®è£çæ¨£å¼ã\n" #: ../src/Zypper.cc:1759 -#, fuzzy msgid "" "products (pd) [options] [repository] ...\n" "\n" @@ -3137,7 +3140,7 @@ "-u, --uninstalled-only åé¡¯ç¤ºæªå®è£çç¢åã\n" #: ../src/Zypper.cc:1784 -#, fuzzy, c-format +#, c-format msgid "" "info (if) [options] <name> ...\n" "\n" @@ -3153,8 +3156,8 @@ "é¡¯ç¤ºæå®å¥ä»¶çè©³ç´°è³è¨ã\n" "\n" " æä»¤é¸é ï¼\n" -"-r, --repo <å¥å|ç·¨è|URI> åªæå¨æå®å¥ä»¶åº«ææè½å·¥ä½ã\n" -"-t, --type <type> è§£æ±ºæ¹æ¡çé¡å (%s).\n" +"-r, --repo <å¥å|ç·¨è|URI> åªæå¨æå®å¥ä»¶åº«æä½¿ç¨ã\n" +"-t, --type <type> å¥ä»¶çé¡å (%s).\n" " é è¨ï¼ %s." #: ../src/Zypper.cc:1807 @@ -3242,6 +3245,14 @@ "-t, --type <type> Type of package (%s).\n" " Default: %s.\n" msgstr "" +"addlock (al) [é¸é ] <å¥ä»¶åç¨±> ...\n" +"\n" +"å å¥ä¸åå¥ä»¶éå®ãä½¿ç¨å®æ´åç¨±æä½¿ç¨è¬ç¨åå '*' å '?' ä¾æå®è¦éå®çå¥ä»¶ã\n" +"\n" +" æä»¤é¸é :\n" +"-r, --repo <å¥å|ç·¨è|ä½å> éå¶éå°æå®å¥ä»¶åº«é²è¡éå®ã\n" +"-t, --type <é¡å> å¥ä»¶çé¡å (%s).\n" +" é è¨: %s.\n" #: ../src/Zypper.cc:1961 #, c-format -- 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] r11831 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: mlschroe Date: Fri Nov 28 18:26:21 2008 New Revision: 11831 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11831&view=rev Log: - fix problem sorting 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=1183… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri Nov 28 18:26:21 2008 @@ -3224,8 +3224,8 @@ { Queue *job = problems_sort_data; int af = job->elements[-a - 1] & SOLVER_ESSENTIAL; - int bf = job->elements[-a - 1] & SOLVER_ESSENTIAL; - int x = bf - af; + int bf = job->elements[-b - 1] & SOLVER_ESSENTIAL; + int x = af - bf; if (x) return x; } -- 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] r11830 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/target/TargetImpl.cc
by mlandres＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: mlandres Date: Fri Nov 28 16:36:47 2008 New Revision: 11830 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11830&view=rev Log: - Prune soft locks to prevent installation but not update of already installed packages. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11830&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Nov 28 16:36:47 2008 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "4") # -# LAST RELEASED: 5.24.3 (23) +# LAST RELEASED: 5.24.4 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= 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 Nov 28 16:36:47 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 28 16:33:56 CET 2008 - ma(a)suse.de + +- Prune soft locks to prevent installation but not update of + already installed packages. +- revision 11829 +- version 5.24.4 (23) + +------------------------------------------------------------------- Fri Nov 28 11:36:03 CET 2008 - schubi(a)suse.de - Taking solutions which based on user requirements/conflict Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Fri Nov 28 16:36:47 2008 @@ -384,7 +384,7 @@ Pathname idpath( home() / "AnonymousUniqueId"); try - { + { updateFileContent( idpath, boost::bind(fileMissing, idpath), generateRandomId ); @@ -393,7 +393,7 @@ { WAR << "Can't create anonymous id file" << endl; } - + } void TargetImpl::createLastDistributionFlavorCache() const @@ -411,10 +411,10 @@ } string flavor = p->flavor(); - + try { - + updateFileContent( flavorpath, // only if flavor is not empty functor::Constant<bool>( ! flavor.empty() ), @@ -588,9 +588,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 ); } } @@ -602,7 +607,7 @@ ResPool::instance().setHardLockQueries( hardLocks ); } } - + // now that the target is loaded, we can cache the flavor createLastDistributionFlavorCache(); -- 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] r11829 - /trunk/libzypp/devel/devel.ma/Iorder.cc
by mlandres＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: mlandres Date: Fri Nov 28 16:36:12 2008 New Revision: 11829 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11829&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/Iorder.cc Modified: trunk/libzypp/devel/devel.ma/Iorder.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Iorder.cc… ============================================================================== --- trunk/libzypp/devel/devel.ma/Iorder.cc (original) +++ trunk/libzypp/devel/devel.ma/Iorder.cc Fri Nov 28 16:36:12 2008 @@ -373,7 +373,7 @@ INT << "===[START]==========================================" << endl; Pathname mroot( "/tmp/Bb" ); - TestSetup test( mroot, Arch_ppc64 ); + TestSetup test( mroot, Arch_i686 ); // <<< arch ResPool pool( test.pool() ); sat::Pool satpool( test.satpool() ); @@ -381,38 +381,36 @@ { zypp::base::LogControl::TmpLineWriter shutUp; test.loadTarget(); - test.loadTestcaseRepos( "/suse/ma/BUGS/439802/bug439802/YaST2/solverTestcase" ); + test.loadTestcaseRepos( "/suse/ma/BUGS/153548/YaST2/solverTestcase" ); // <<< repos } + save(); - if ( 0 ) - { - PoolItem pi = getPi<Package>( "bash", Edition("3.1-24.14"), Arch("ppc64") ); - pi.status().setTransact( true, ResStatus::USER ); - } - save(); - { + { // <<< transaction zypp::base::LogControl::TmpLineWriter shutUp; - getPi<Product>( "SUSE_SLES", Edition("11"), Arch("ppc64") ).status().setTransact( true, ResStatus::USER ); - getPi<Package>( "sles-release", Edition("11-54.3"), Arch("ppc64") ).status().setTransact( true, ResStatus::USER ); + getPi<Product>( "SUSE_SLED" ).status().setTransact( true, ResStatus::USER ); + getPi<Package>( "kernel-pae" ).status().setTransact( true, ResStatus::USER ); + getPi<Package>( "sled-release" ).status().setTransact( true, ResStatus::USER ); + getPi<Pattern>( "apparmor" ).status().setTransact( true, ResStatus::USER ); + getPi<Pattern>( "desktop-base" ).status().setTransact( true, ResStatus::USER ); + getPi<Pattern>( "desktop-gnome" ).status().setTransact( true, ResStatus::USER ); + getPi<Pattern>( "x11" ).status().setTransact( true, ResStatus::USER ); upgrade(); } vdumpPoolStats( USR << "Transacting:"<< endl, make_filter_begin<resfilter::ByTransact>(pool), make_filter_end<resfilter::ByTransact>(pool) ) << endl; - pool::GetResolvablesToInsDel collect( pool, pool::GetResolvablesToInsDel::ORDER_BY_MEDIANR ); - USR << ui::Selectable::get( "libcdio" ) << endl; - USR << ui::Selectable::get( "libcdio7" ) << endl; - - std::set<IdString> interested; - //interested.insert( IdString("libcdio") ); - //interested.insert( IdString("libcdio7") ); + USR << ui::Selectable::get( "libtiff" ) << endl; restore(); - - display( collect, interested ); + { + //base::LogControl::TmpLineWriter shutUp( new log::FileLineWriter( "iorder.log" ) ); + std::set<IdString> interested; + interested.insert( IdString("libtiff") ); + display( collect, interested ); + } INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::TmpLineWriter shutUp; -- 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] r11827 - in /trunk/libzypp/zypp: MediaSetAccess.cc MediaSetAccess.h
by jkupec＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: jkupec Date: Fri Nov 28 13:33:47 2008 New Revision: 11827 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11827&view=rev Log: - docs - removed unused code Modified: trunk/libzypp/zypp/MediaSetAccess.cc trunk/libzypp/zypp/MediaSetAccess.h Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?r… ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Fri Nov 28 13:33:47 2008 @@ -444,18 +444,6 @@ ERR << "Failed to release media " << _media << endl; } - //MIL << "Releasing all medias of all sources" << endl; - try - { - //! \todo do we need replacement for this at all? - //zypp::SourceManager::sourceManager()->releaseAllSources(); - } - catch (const zypp::Exception& excpt_r) - { - ZYPP_CAUGHT(excpt_r); - ERR << "Failed to release all sources" << endl; - } - // set up the reason media::MediaChangeReport::Error reason = media::MediaChangeReport::INVALID; @@ -492,6 +480,7 @@ DBG << "Aborting" << endl; ZYPP_RETHROW ( excp ); } + //! \todo FIXME media::MediaChangeReport::IGNORE handling else if (user == media::MediaChangeReport::EJECT) { DBG << "Eject: try to release" << endl; Modified: trunk/libzypp/zypp/MediaSetAccess.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.h?re… ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.h (original) +++ trunk/libzypp/zypp/MediaSetAccess.h Fri Nov 28 13:33:47 2008 @@ -35,7 +35,7 @@ // /** * Media access layer responsible for handling files distributed on a set - * of media. + * of media with media change and abort/retry/ingore user callback handling. * * This is provided as a means to handle CD or DVD sets accessible through * dir, iso, nfs or other URL schemes other than cd/dvd (see @@ -113,8 +113,14 @@ * \param on_media_file location of the file on media * \return local pathname of the requested file * - * \throws MediaException if a problem occurs, - * see \ref media::MediaManager::provideFile() + * \throws MediaException if a problem occured and user has chosen to + * abort the operation. The calling code should take care + * to quit the current operation. + * \throws SkipRequestException if a problem occured and user has chosen + * to skip the current operation. The calling code should continue + * with the next one, if possible. + * + * \see zypp::media::MediaManager::provideFile() */ Pathname provideFile( const OnMediaLocation & on_media_file ); @@ -125,16 +131,20 @@ * \param media_nr the media number in the media set * \return local pathname of the requested file * - * \throws MediaException if a problem occurs, - * see \ref media::MediaManager::provideFile() + * \throws MediaException if a problem occured and user has chosen to + * abort the operation. The calling code should take care + * to quit the current operation. + * \throws SkipRequestException if a problem occured and user has chosen + * to skip the current operation. The calling code should continue + * with the next one, if possible. + * \see zypp::media::MediaManager::provideFile() */ Pathname provideFile(const Pathname & file, unsigned media_nr = 1 ); /** - * The same as provideFile(Pathname,unsigned) but does not throw. - * - * This method does not call the user callbacks, except of the case of - * not wrong media in the drive, but won't throw an exception in any case. + * The same as provideFile(Pathname,unsigned) but this method does not + * call the user callbacks, except of the case of + * wrong media in the drive, and it won't throw an exception in any case. * * \return Path to the provided file on success, an empty Pathname() otherwise. */ @@ -148,7 +158,7 @@ */ void releaseFile( const OnMediaLocation & on_media_file ); - + /** * Release file from media. * This signal that file is not needed anymore. @@ -166,22 +176,35 @@ * \param media_nr the media number in the media set * \return local pathname of the requested directory * - * \throws MediaException if a problem occurs, - * see \ref media::MediaManager::provideDir() - * and \ref media::MediaManager::provideDirTree() + * \throws MediaException if a problem occured and user has chosen to + * abort the operation. The calling code should take care + * to quit the current operation. + * \todo throw SkipRequestException if a problem occured and user has chosen + * to skip the current operation. The calling code should continue + * with the next one, if possible. + * \see zypp::media::MediaManager::provideDir() + * \see zypp::media::MediaManager::provideDirTree() */ Pathname provideDir(const Pathname & dir, bool recursive, unsigned media_nr = 1); /** - * check if a file exists on the specified media + * Checks if a file exists on the specified media, with user callbacks. * * \param file file to check * \param media_nr Media number + * + * \throws MediaException if a problem occured and user has chosen to + * abort the operation. The calling code should take care + * to quit the current operation. + * \throws SkipRequestException if a problem occured and user has chosen + * to skip the current operation. The calling code should continue + * with the next one, if possible. + * \see zypp::media::MediaManager::doesFileExist(MediaAccessId,const Pathname&) */ bool doesFileExist(const Pathname & file, unsigned media_nr = 1 ); /** - * Fills \ref retlist with directory information + * Fills \ref retlist with directory information. */ void dirInfo( filesystem::DirContent &retlist, const Pathname &dirname, bool dots = true, unsigned media_nr = 1 ); @@ -210,6 +233,21 @@ static Url rewriteUrl (const Url & url_r, const media::MediaNr medianr); protected: + /** + * Provides the \a file from medium number \a media_nr and returns its + * local path. + * + * \note The method must not throw if \a checkonly is <tt>true</tt>. + * + * \throws MediaException \a checkonly is <tt>false</tt> and + * a problem occured and user has chosen to + * abort the operation. The calling code should take care + * to quit the current operation. + * \throws SkipRequestException \a checkonly is <tt>false</tt> and + * a problem occured and user has chosen + * to skip the current operation. The calling code should continue + * with the next one, if possible. + */ Pathname provideFileInternal(const Pathname & file, unsigned media_nr, bool checkonly, bool cached); media::MediaAccessId getMediaAccessId (media::MediaNr medianr); virtual std::ostream & dumpOn( std::ostream & str ) const; -- 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] r11826 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: schubi2 Date: Fri Nov 28 11:37:15 2008 New Revision: 11826 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11826&view=rev Log: r 11825 Modified: trunk/libzypp/package/libzypp.changes 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 Nov 28 11:37:15 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 28 11:36:03 CET 2008 - schubi(a)suse.de + +- Taking solutions which based on user requirements/conflict + "by User" solutions (bnc #442718) +- revision 11825 + +------------------------------------------------------------------- Fri Nov 28 00:05:17 CET 2008 - ma(a)suse.de - Take into account the requirements of all obsoleted packages uninstall -- 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] r11825 - in /trunk/libzypp/zypp: ResStatus.h solver/detail/SATResolver.cc solver/detail/SATResolver.h
by schubi2＠svn.opensuse.org 28 Nov '08

28 Nov '08

Author: schubi2 Date: Fri Nov 28 11:35:46 2008 New Revision: 11825 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11825&view=rev Log: Taking solutions which based on user requirements/conflict as sulution "by User" Bug 442718 Modified: trunk/libzypp/zypp/ResStatus.h trunk/libzypp/zypp/solver/detail/SATResolver.cc trunk/libzypp/zypp/solver/detail/SATResolver.h Modified: trunk/libzypp/zypp/ResStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=118… ============================================================================== --- trunk/libzypp/zypp/ResStatus.h (original) +++ trunk/libzypp/zypp/ResStatus.h Fri Nov 28 11:35:46 2008 @@ -291,7 +291,16 @@ TransactByValue getTransactByValue() const { return (TransactByValue)_bitfield.value<TransactByField>(); } - + bool setTransactByValue(TransactByValue causer) + { + if ( isLessThan<TransactByField>( causer ) ) { + fieldValueAssign<TransactByField>( causer ); + return true; + } else { + return false; + } + } + bool isToBeUninstalledDueToObsolete () const { return isToBeUninstalled() && fieldValueIs<TransactDetailField>( DUE_TO_OBSOLETE ); } 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 Nov 28 11:35:46 2008 @@ -429,7 +429,8 @@ }; bool -SATResolver::solving() +SATResolver::solving(const CapabilitySet & requires_caps, + const CapabilitySet & conflict_caps) { _solv = solver_create( _SATPool ); _solv->vendorCheckCb = &vendorCheck; @@ -582,6 +583,30 @@ } } + // 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 + 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); + } + } + } + for (CapabilitySet::const_iterator iter = conflict_caps.begin(); iter != conflict_caps.end(); iter++) { + sat::WhatProvides rpmProviders(*iter); + for_( iter2, rpmProviders.begin(), rpmProviders.end() ) { + PoolItem poolItem(*iter2); + if (poolItem.status().isToBeUninstalled()) { + MIL << "User conflict " << *iter << " sets " << poolItem << endl; + poolItem.status().setTransactByValue (ResStatus::USER); + } + } + } + if (_solv->problems.count > 0 ) { ERR << "Solverrun finished with an ERROR" << endl; @@ -698,7 +723,7 @@ setLocks(); // solving - bool ret = solving(); + bool ret = solving(requires_caps, conflict_caps); // cleanup if (ret) solverEnd(); // remove solver only if no errors happend. Need it for solving problems Modified: trunk/libzypp/zypp/solver/detail/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.h (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.h Fri Nov 28 11:35:46 2008 @@ -99,7 +99,8 @@ // Create a SAT solver and reset solver selection in the pool (Collecting void solverInit(const PoolItemList & weakItems); // common solver run with the _jobQueue; Save results back to pool - bool solving(); + bool solving(const CapabilitySet & requires_caps = CapabilitySet(), + const CapabilitySet & conflict_caps = CapabilitySet()); // cleanup solver void solverEnd(); // set locks for the solver -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0