Zypp Commits

Download

zypp-commit@lists.opensuse.org

September 2007

12 participants
325 discussions

[zypp-commit] r7166 - /trunk/libzypp/po/
by schubi2＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: schubi2 Date: Mon Sep 10 16:18:44 2007 New Revision: 7166 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7166&view=rev Log: new translations Modified: trunk/libzypp/po/af.po trunk/libzypp/po/ar.po trunk/libzypp/po/bg.po trunk/libzypp/po/bn.po trunk/libzypp/po/bs.po trunk/libzypp/po/ca.po trunk/libzypp/po/cs.po trunk/libzypp/po/cy.po trunk/libzypp/po/da.po trunk/libzypp/po/de.po trunk/libzypp/po/el.po trunk/libzypp/po/en_GB.po trunk/libzypp/po/en_US.po trunk/libzypp/po/es.po trunk/libzypp/po/et.po trunk/libzypp/po/fi.po trunk/libzypp/po/fr.po trunk/libzypp/po/gl.po trunk/libzypp/po/gu.po trunk/libzypp/po/he.po trunk/libzypp/po/hi.po trunk/libzypp/po/hr.po trunk/libzypp/po/hu.po trunk/libzypp/po/id.po trunk/libzypp/po/it.po trunk/libzypp/po/ja.po trunk/libzypp/po/ka.po trunk/libzypp/po/km.po trunk/libzypp/po/ko.po trunk/libzypp/po/lo.po trunk/libzypp/po/lt.po trunk/libzypp/po/mk.po trunk/libzypp/po/mr.po trunk/libzypp/po/nb.po trunk/libzypp/po/nl.po trunk/libzypp/po/pa.po trunk/libzypp/po/pl.po trunk/libzypp/po/pt.po trunk/libzypp/po/pt_BR.po trunk/libzypp/po/ro.po trunk/libzypp/po/ru.po trunk/libzypp/po/si.po trunk/libzypp/po/sk.po trunk/libzypp/po/sl.po trunk/libzypp/po/sr.po trunk/libzypp/po/sv.po trunk/libzypp/po/ta.po trunk/libzypp/po/tr.po trunk/libzypp/po/uk.po trunk/libzypp/po/vi.po trunk/libzypp/po/wa.po trunk/libzypp/po/xh.po trunk/libzypp/po/zh_CN.po trunk/libzypp/po/zh_TW.po trunk/libzypp/po/zu.po Modified: trunk/libzypp/po/af.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/af.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/af.po (original) +++ trunk/libzypp/po/af.po Mon Sep 10 16:18:44 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -108,37 +108,37 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm-nagaan het misluk." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm het misluk." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Pakket %s se integriteitsnagaan misluk. Wil u dit weer probeer aflaai?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "LÃªer %1 nie in die bewaarplek gevind nie." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "Kan %s vanaf %s nie voorsien nie" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -163,27 +163,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Terugstel van hulpbronne" @@ -2634,19 +2635,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Gewysigde konfigurasielÃªers vir %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm geberg %s as %s, maar dit was onmoontlik om die verskil te bepaal" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2656,13 +2657,13 @@ "Hier is die eerste 25 rÃ«els van verskil:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm geskep %s as %s, maar dit was onmoontlik om die verskil te bepaal" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2673,46 +2674,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s installasie misluk" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm-uitset:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s geÃ¯nstalleer is goed" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Bykomende rpm-uitset:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s verwyder het misluk" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s verwyder is goed" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "geskepte rugsteun %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Installasie is gestaak soos gelas." @@ -2730,7 +2731,7 @@ msgstr "%s vervang deur %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2738,58 +2739,68 @@ "Hierdie oplossings sal uit die stelsel geskrap word." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s sal nie ongeÃ¯nstalleer word nie, want dit word steeds vereis" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Ongeldige inligting" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s word deur ander oplossings benodig" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s word benodig deur %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2799,7 +2810,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s verkeer in konflik met ander oplossings" @@ -2808,14 +2819,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s verkeer in konflik met %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2825,24 +2836,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s maak ander oplossings uitgedien" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s uitgediendes %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s uitgediendes:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2851,7 +2862,7 @@ "Hierdie oplossings sal uit die stelsel geskrap word." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s hang van ander oplossings af" @@ -2859,38 +2870,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s hang af van %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s hang af van:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Kind van" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Kan %s nie installeer nie" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Geen voorsiening %s nie" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2899,32 +2910,32 @@ "\n" "Daar is geen hulpbron wat hierdie vereiste ondersteun, beskikbaar nie." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Toekomstige probleme wat bo/onder hierdie resolusie beskryf word, sal nie alle afhanklikhede oplos nie" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Kan %s nie installeer nie, omdat dit in konflik verkeer met %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s word nie geÃ¯nstalleer nie en is as oninstalleerbaar gemerk" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Kan %s nie installeer nie vanweÃ« afhanklikheidsprobleme" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2932,8 +2943,8 @@ msgstr "skrap %s?" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2941,79 +2952,79 @@ msgstr "moenie %s installeer nie" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s het vereistes waaraan nie voldoen is nie" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s het afhanklikhede wat ontbreek" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s kan nie geÃ¯nstalleer word nie vanweÃ« ontbrekende afhanklikhede" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s vervul afhanklikhede van %s, maar sal ongeÃ¯nstalleer word" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s vervul afhanklikhede van %s, maar sal op u stelsel gehou word" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Geen nodigheid om %s te installeer nie" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Kan %s nie installeer om die afhanklikhede van %s te vervul nie" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Kan %s nie installeer om die afhanklikhede van %s te vervul nie" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s sal nie ongeÃ¯nstalleer word nie, want dit word steeds vereis" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s uitgediendes %s. Maar %s kan nie geskrap word nie, want dit is gesluit." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Kan %s nie installeer nie, want dit verkeer in konflik" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s is oninstalleerbaar vanweÃ« konflikte met %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3076,7 +3087,7 @@ msgstr "Moenie waar oplossings ter sprake is, installeer of skrap nie" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "om %s vir %s te vereis tydens bywerk van %s" @@ -3434,14 +3445,22 @@ msgid "Install missing resolvables" msgstr "Installeer ontbrekende oplossings" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3492,6 +3511,14 @@ msgid "%s part of %s" msgstr "%s deel van %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "ontsluit alle oplossings" Modified: trunk/libzypp/po/ar.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ar.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ar.po (original) +++ trunk/libzypp/po/ar.po Mon Sep 10 16:18:44 2007 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-09-27 09:57+0200\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -114,37 +114,37 @@ msgid "History:" msgstr "XF86History" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "ÙØ´Ù Ø§ÙØªØÙÙ ÙÙ applydeltarpm." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "ÙØ´Ù applydeltarpm." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "ÙØ´Ù Ø§ÙØªØÙÙ ÙÙ Ø³ÙØ§ÙØ© Ø§ÙØØ²ÙØ© %s. ÙÙ ØªØ±ÙØ¯ Ø¥Ø¹Ø§Ø¯Ø© ÙØØ§ÙÙØ© Ø¥ÙØ²Ø§ÙÙØ§Ø" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "ÙÙ ÙØªÙ Ø§ÙØ¹Ø«ÙØ± Ø¹ÙÙ Ø§ÙÙÙÙ %1 ÙÙ Ø§ÙÙØ®Ø²Ù." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "ØªØ¹Ø°Ø± ØªÙÙÙØ± %s ÙÙ %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -169,27 +169,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "ÙØªÙ Ø§ÙØ¢Ù Ø¥Ø¶Ø§ÙØ© Ø§ÙÙÙØ§Ø±Ø¯" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "ÙØªÙ Ø§ÙØ¢Ù Ø¥Ø¶Ø§ÙØ© Ø§ÙÙÙØ§Ø±Ø¯" @@ -2640,19 +2641,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "ÙÙÙØ§Øª ØªÙÙÙÙ %s Ø§ÙØªÙ ØªÙ ØªØºÙÙØ±ÙØ§:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "ØªÙ ØÙØ¸ rpm %s Ø¨Ø§Ø¹ØªØ¨Ø§Ø±ÙØ§ %s ÙÙÙÙ ØªØ¹Ø°Ø± ØªØØ¯ÙØ¯ Ø§ÙÙØ±Ù" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2662,13 +2663,13 @@ "ÙÙÙØ§ ÙÙÙ Ø£ÙÙ 25 Ø³Ø·Ø±ÙØ§ ÙÙ Ø³Ø·ÙØ± Ø§ÙÙØ±Ù:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "ØªÙ Ø¥ÙØ´Ø§Ø¡ rpm %s Ø¨Ø§Ø¹ØªØ¨Ø§Ø±ÙØ§ %s ÙÙÙÙ ØªØ¹Ø°Ø± ØªØØ¯ÙØ¯ Ø§ÙÙØ±Ù" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2679,46 +2680,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "ÙØ´Ù ØªØ«Ø¨ÙØª %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "ÙØ®Ø±Ø¬Ø§Øª rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "ØªÙ ØªØ«Ø¨ÙØª %s Ø¨ÙØ¬Ø§Ø" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "ÙØ®Ø±Ø¬Ø§Øª rpm Ø§ÙØ¥Ø¶Ø§ÙÙØ©:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "ÙØ´ÙØª Ø¥Ø²Ø§ÙØ© %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "ØªÙØª Ø¥Ø²Ø§ÙØ© %s Ø¨ÙØ¬Ø§Ø" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "ØªÙ Ø¥ÙØ´Ø§Ø¡ Ø§ÙÙØ³Ø®Ø© Ø§ÙØ§ØØªÙØ§Ø·ÙØ© %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "ØªÙ Ø¥ÙÙØ§Ù Ø§ÙØªØ«Ø¨ÙØª ÙÙÙÙØ§ ÙÙØªØ¹ÙÙÙØ§Øª." @@ -2736,7 +2737,7 @@ msgstr "%s ØªÙ Ø§Ø³ØªØ¨Ø¯Ø§ÙÙ Ø¨Ù %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2744,58 +2745,68 @@ "Ø³ÙØªÙ ØØ°Ù ÙØ°Ù Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ ÙÙ Ø§ÙÙØ¸Ø§Ù." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "ÙÙ ÙØªÙ Ø¥ÙØºØ§Ø¡ ØªØ«Ø¨ÙØª %s ÙØ£ÙÙ ÙØ§ ÙØ²Ø§Ù ÙØ·ÙÙØ¨ÙØ§" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Ø§ÙÙØ¹ÙÙÙØ§Øª ØºÙØ± ØµØ§ÙØØ©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s ÙØ·ÙÙØ¨ Ø¨ÙØ§Ø³Ø·Ø© Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ Ø§ÙØ£Ø®Ø±Ù" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s ÙØ·ÙÙØ¨ Ø¨ÙØ§Ø³Ø·Ø© %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2805,7 +2816,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "ÙØªØ¹Ø§Ø±Ø¶ %s ÙØ¹ Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ Ø§ÙØ£Ø®Ø±Ù" @@ -2814,14 +2825,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s ÙØªØ¹Ø§Ø±Ø¶ ÙØ¹ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2831,24 +2842,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s ÙØ¬Ø¹Ù Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ Ø§ÙØ£Ø®Ø±Ù ÙØ¯ÙÙØ©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s ÙØ¬Ø¹Ù Ø§ÙØ¹ÙØµØ± Ø§ÙØªØ§ÙÙ ÙØ¯ÙÙÙØ§ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s ÙØ¬Ø¹Ù Ø§ÙØ¹ÙØµØ± Ø§ÙØªØ§ÙÙ ÙØ¯ÙÙÙØ§:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2857,7 +2868,7 @@ "Ø³ÙØªÙ ØØ°Ù ÙØ°Ù Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ ÙÙ Ø§ÙÙØ¸Ø§Ù." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s ÙØ¹ØªÙØ¯ Ø¹ÙÙ Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ Ø§ÙØ£Ø®Ø±Ù" @@ -2865,38 +2876,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s ÙØ¹ØªÙØ¯ Ø¹ÙÙ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s ÙØ¹ØªÙØ¯ Ø¹ÙÙ:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Ø¹ÙØµØ± ÙØ±Ø¹Ù ÙÙ" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "ÙØ§ ÙÙØ¬Ø¯ Ø£Ù Ø´ÙØ¡ ÙÙÙØ± %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2905,32 +2916,32 @@ "\n" "ÙØ§ ÙØªÙÙØ± Ø£Ù ÙÙØ±Ø¯ ÙØ¯Ø¹Ù ÙØ°Ø§ Ø§ÙÙØªØ·ÙØ¨." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "ÙØªÙØ¬Ø© ÙÙÙØ´ÙÙØ§Øª Ø§ÙÙÙØ¶ØØ© Ø£Ø¹ÙØ§Ù/Ø£Ø¯ÙØ§ÙØ ÙÙ ÙÙÙÙ ÙØ°Ø§ Ø§ÙØªØØ¯ÙØ¯ Ø¨ØÙ ÙØ§ÙØ© Ø§ÙØªØ¨Ø¹ÙØ§Øª" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s ÙØ£ÙÙ ÙØªØ¹Ø§Ø±Ø¶ ÙØ¹ %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "ÙÙ ÙØªÙ ØªØ«Ø¨ÙØª %s ÙØªÙ ÙØ¶Ø¹ Ø¹ÙØ§ÙØ© Ø¹ÙÙÙ ÙÙØ§Ø¨Ù ÙØ¥ÙØºØ§Ø¡ Ø§ÙØªØ«Ø¨ÙØª" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s Ø¨Ø³Ø¨Ø¨ ÙØ¬ÙØ¯ ÙØ´ÙÙØ§Øª ÙÙ Ø§ÙØªØ¨Ø¹ÙØ©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2938,8 +2949,8 @@ msgstr "ØØ°Ù %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2947,79 +2958,79 @@ msgstr "Ø¹Ø¯Ù ØªØ«Ø¨ÙØª %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "ÙÙ ÙØªÙ Ø§Ø³ØªÙÙØ§Ø¡ ÙØªØ·ÙØ¨Ø§Øª %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "ØªÙ ÙÙØ¯ ØªØ¨Ø¹ÙØ§Øª %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s Ø¨Ø³Ø¨Ø¨ Ø¹Ø¯Ù ÙØ¬ÙØ¯ Ø§ÙØªØ¨Ø¹ÙØ§Øª" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "ÙØ³ØªÙÙÙ %s ØªØ¨Ø¹ÙØ§Øª %sØ ÙÙÙ Ø³ÙØªÙ Ø¥ÙØºØ§Ø¡ ØªØ«Ø¨ÙØªÙ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "ÙØ³ØªÙÙÙ %s ØªØ¨Ø¹ÙØ§Øª %sØ ÙÙÙ Ø³ÙØªÙ Ø§ÙØ§ØØªÙØ§Ø¸ Ø¨Ù ÙÙ Ø§ÙÙØ¸Ø§Ù ÙØ¯ÙÙ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "ÙØ§ Ø¯Ø§Ø¹Ù ÙØªØ«Ø¨ÙØª %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s ÙØ§Ø³ØªÙÙØ§Ø¡ ØªØ¨Ø¹ÙØ§Øª %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s ÙØ§Ø³ØªÙÙØ§Ø¡ ØªØ¨Ø¹ÙØ§Øª %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "ÙÙ ÙØªÙ Ø¥ÙØºØ§Ø¡ ØªØ«Ø¨ÙØª %s ÙØ£ÙÙ ÙØ§ ÙØ²Ø§Ù ÙØ·ÙÙØ¨ÙØ§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s ÙØ¬Ø¹Ù %s ÙØ¯ÙÙÙØ§. ÙÙÙ ÙØªØ¹Ø°Ø± ØØ°Ù %s ÙØ£ÙÙ ÙÙÙÙ." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s ÙØ£ÙÙ ÙØªØ¹Ø§Ø±Ø¶" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s ÙÙÙÙ Ø¥ÙØºØ§Ø¡ ØªØ«Ø¨ÙØªÙ ÙØ£ÙÙ ÙØªØ¹Ø§Ø±Ø¶ ÙØ¹ %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3082,7 +3093,7 @@ msgstr "Ø¹Ø¯Ù ØªØ«Ø¨ÙØª Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ Ø§ÙÙØªØ¹ÙÙØ© Ø£Ù ØØ°ÙÙØ§" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "ÙØ·ÙØ¨ %s ÙÙ %s Ø¹ÙØ¯ ØªØØ¯ÙØ« %s" @@ -3440,14 +3451,22 @@ msgid "Install missing resolvables" msgstr "ØªØ«Ø¨ÙØª Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ Ø§ÙÙÙÙÙØ¯Ø©" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3498,6 +3517,15 @@ msgid "%s part of %s" msgstr "%s Ø¬Ø²Ø¡ ÙÙ %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "ÙÙØ¹Ø¯ Ø§ÙØ§Ø³ØªØÙØ§Ù: %1" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "Ø¥ÙØºØ§Ø¡ ÙÙÙ ÙØ§ÙØ© Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ" Modified: trunk/libzypp/po/bg.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bg.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/bg.po (original) +++ trunk/libzypp/po/bg.po Mon Sep 10 16:18:44 2007 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: zypp.bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-11-09 18:05+0200\n" "Last-Translator: Borislav Mitev <morbid_viper(a)tkzs.org>\n" "Language-Team: Bulgarian <bg(a)li.org>\n" @@ -118,36 +118,36 @@ msgid "History:" msgstr "ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð¸ÑÑÐ¾ÑÐ¸ÑÑÐ°" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "ÐÐ¸ÐºÐ¾Ð¹ Ð½Ðµ Ð´Ð¾ÑÑÐ°Ð²Ñ %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -172,27 +172,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2742,19 +2743,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "ÐÑÐ¾Ð¼ÐµÐ½ÐµÐ½Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm Ð·Ð°Ð¿Ð°Ð·Ð¸ %s ÐºÐ°ÑÐ¾ %s, Ð½Ð¾ Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð° ÑÐµ Ð¾ÑÐºÑÐ¸Ðµ ÑÐ°Ð·Ð»Ð¸ÐºÐ°ÑÐ°" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2764,13 +2765,13 @@ "ÐÑÐ¾ Ð¿ÑÑÐ²Ð¸ÑÐµ 25 ÑÐµÐ´Ð° Ð¾Ñ ÑÐ°Ð·Ð»Ð¸ÐºÐ¸ÑÐµ:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm ÑÑÐ·Ð´Ð°Ð´Ðµ %s ÐºÐ°ÑÐ¾ %s, Ð½Ð¾ Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð° ÑÐµ Ð¾ÑÐºÑÐ¸Ðµ ÑÐ°Ð·Ð»Ð¸ÐºÐ°ÑÐ°" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2781,46 +2782,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "ÐÐ·ÑÐ¾Ð´ Ð¾Ñ rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ ÑÑÐ¿ÐµÑÐ½Ð¾" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "ÐÐ¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»ÐµÐ½ Ð¸Ð·ÑÐ¾Ð´ Ð¾Ñ rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ ÑÑÐ¿ÐµÑÐ½Ð¾" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "ÑÑÐ·Ð´Ð°Ð´ÐµÐ½Ð¾ ÑÐµÐ·ÐµÑÐ²Ð½Ð¾ ÐºÐ¾Ð¿Ð¸Ðµ %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2838,7 +2839,7 @@ msgstr "%s Ðµ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½ Ð¾Ñ %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2846,58 +2847,68 @@ "Ð¢ÐµÐ·Ð¸ Ð¿Ð°ÐºÐµÑÐ¸ ÑÐµ Ð±ÑÐ´Ð°Ñ Ð¸Ð·ÑÑÐ¸ÑÐ¸ Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s Ð½ÑÐ¼Ð° Ð´Ð° Ð±ÑÐ´Ðµ Ð´ÐµÐ¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½, Ð·Ð°ÑÐ¾ÑÐ¾ Ð²ÑÐµ Ð¾ÑÐµ Ðµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s Ðµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð½Ð° Ð´ÑÑÐ³ Ð¿Ð°ÐºÐµÑ" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s Ðµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð½Ð° %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2907,7 +2918,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s Ðµ Ð² ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ñ Ð´ÑÑÐ³Ð¸ Ð¿Ð°ÐºÐµÑÐ¸" @@ -2916,14 +2927,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s Ðµ Ð² ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ñ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2933,24 +2944,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s Ð¿ÑÐ°Ð²Ð¸ Ð½ÐµÐ½ÑÐ¶Ð½Ð¸ Ð´ÑÑÐ³Ð¸ Ð¿Ð°ÐºÐµÑÐ¸" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s Ð¿ÑÐ°Ð²Ð¸ Ð½ÐµÐ½ÑÐ¶Ð½Ð¾ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s Ð¿ÑÐ°Ð²Ð¸ Ð½ÐµÐ½ÑÐ¶Ð½Ð¾: %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2959,7 +2970,7 @@ "Ð¢ÐµÐ·Ð¸ Ð¿Ð°ÐºÐµÑÐ¸ ÑÐµ Ð±ÑÐ´Ð°Ñ Ð¸Ð·ÑÑÐ¸ÑÐ¸ Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s Ð·Ð°Ð²Ð¸ÑÐ¸ Ð¾Ñ Ð´ÑÑÐ³Ð¸ Ð¿Ð°ÐºÐµÑÐ¸" @@ -2967,38 +2978,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s Ð·Ð°Ð²Ð¸ÑÐ¸ Ð¾Ñ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s Ð·Ð°Ð²Ð¸ÑÐ¸ Ð¾Ñ: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "ÐÐµÑÐµ Ð½Ð°" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "ÐÐ¸ÐºÐ¾Ð¹ Ð½Ðµ Ð´Ð¾ÑÑÐ°Ð²Ñ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -3007,32 +3018,32 @@ "\n" "ÐÑÐ¼Ð° Ð½Ð°Ð»Ð¸ÑÐµÐ½ ÑÐµÑÑÑÑ Ð·Ð° Ð¿Ð¾Ð´Ð´ÑÑÐ¶ÐºÐ°ÑÐ° Ð½Ð° ÑÐ¾Ð²Ð° Ð¸Ð·Ð¸ÑÐºÐ²Ð°Ð½Ðµ." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "ÐÐ¾ÑÐ°Ð´Ð¸ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ÑÐµ, ÐºÐ¾Ð¸ÑÐ¾ ÑÐ° Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ð¸ Ð¿Ð¾-Ð´Ð¾Ð»Ñ/Ð³Ð¾ÑÐµ ÑÐµÐ³Ð° Ð½ÑÐ¼Ð° Ð´Ð° Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° ÑÐµÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑ Ð²ÑÐ¸ÑÐºÐ¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸." -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½, Ð·Ð°ÑÐ¾ÑÐ¾ Ðµ Ð² ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ñ %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s Ð½Ðµ Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¼Ð°ÑÐºÐ¸ÑÐ°Ð½ Ð·Ð° Ð´ÐµÐ¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ." #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ Ð¿Ð¾ÑÐ°Ð´Ð¸ Ð¿ÑÐ¾Ð±ÐµÐ¼ ÑÑÑ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ÑÐµ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3040,8 +3051,8 @@ msgstr "Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3049,79 +3060,79 @@ msgstr "Ð±ÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s Ð¸Ð¼Ð° Ð½ÐµÐ·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð¸ Ð¸Ð·Ð¸ÑÐºÐ°Ð½Ð¸Ñ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s Ð¸Ð¼Ð° Ð»Ð¸Ð¿ÑÐ²Ð°ÑÐ¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ Ð¿Ð¾ÑÐ°Ð´Ð¸ Ð»Ð¸Ð¿ÑÐ²Ð°ÑÐ¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð° Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° %s, Ð½Ð¾ ÑÐµ Ð±ÑÐ´Ðµ Ð´ÐµÐ¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð° Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° %s, Ð½Ð¾ ÑÐµ Ð±ÑÐ´Ðµ Ð´ÐµÐ¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "ÐÑÐ¼Ð° Ð½ÑÐ¶Ð´Ð° Ð¾Ñ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ Ð·Ð° Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ Ð·Ð° Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s Ð½ÑÐ¼Ð° Ð´Ð° Ð±ÑÐ´Ðµ Ð´ÐµÐ¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½, Ð·Ð°ÑÐ¾ÑÐ¾ Ð²ÑÐµ Ð¾ÑÐµ Ðµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s Ð¿ÑÐ°Ð²Ð¸ Ð½ÐµÐ½ÑÐ¶ÐµÐ½ %s, Ð½Ð¾ %s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð·ÑÑÐ¸Ñ, Ð·Ð°ÑÐ¾ÑÐ¾ Ðµ Ð·Ð°ÐºÐ»ÑÑÐµÐ½." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½, Ð·Ð°ÑÐ¾ÑÐ¾ Ðµ Ð² ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s Ðµ Ð½ÐµÐ´ÐµÐ¸Ð½ÑÑÐ°Ð»Ð¸ÑÑÐµÐ¼ Ð¿Ð¾ÑÐ°Ð´Ð¸ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ° Ñ %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3184,7 +3195,7 @@ msgstr "ÐÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ¼Ð°ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ½Ð¸ÑÐµ Ð¿Ð°ÐºÐµÑÐ¸" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "Ð·Ð° Ð¸Ð·Ð¸ÑÐºÐ°Ð½Ð¾ÑÐ¾ %s Ð·Ð° %s, ÐºÐ¾Ð³Ð°ÑÐ¾ ÑÐµ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð° %s" @@ -3542,14 +3553,22 @@ msgid "Install missing resolvables" msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð»Ð¸Ð¿ÑÐ²Ð°ÑÐ¸ÑÐµ Ð¿Ð°ÐºÐµÑÐ¸" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3600,6 +3619,14 @@ msgid "%s part of %s" msgstr "%s Ðµ ÑÐ°ÑÑ Ð¾Ñ %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "Ð¾ÑÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ Ð¿Ð°ÐºÐµÑÐ¸" Modified: trunk/libzypp/po/bn.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bn.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/bn.po (original) +++ trunk/libzypp/po/bn.po Mon Sep 10 16:18:44 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n" @@ -107,37 +107,37 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm à¦¯à¦¾à¦à¦¾à¦ à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§à¥¤" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§à¥¤" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "%s à¦ªà§à¦¯à¦¾à¦à§à¦à§à¦° à¦¶à§à¦¦à§à¦§à¦¤à¦¾ à¦¯à¦¾à¦à¦¾à¦ à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§à¥¤ à¦à¦ªà¦¨à¦¿ à¦à¦¿ à¦à¦à¦¾à¦à§ à¦ªà§à¦¨à¦°à¦¾à§ à¦¡à¦¾à¦à¦¨à¦²à§à¦¡ à¦à¦°à¦¾à¦° à¦à§à¦·à§à¦à¦¾ à¦à¦°à¦¤à§ à¦à¦¾à¦¨?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "à¦°à¦¿à¦ªà§à¦¸à¦¿à¦à¦¾à¦°à¦¿à¦¤à§ à¦«à¦¾à¦à¦² %1 à¦ªà¦¾à¦à§à¦¾ à¦¯à¦¾à§à¦¨à¦¿" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "%s à¦¥à§à¦à§ %s à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -162,27 +162,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "à¦¸à¦à¦¸à§à¦¥à¦¾à¦¨ à¦ªà§à¦¨à¦à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦à§" @@ -2633,19 +2634,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr " %s-à¦à¦° à¦à¦¨à§à¦¯ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¿à¦¤ à¦à¦¨à¦«à¦¿à¦à¦¾à¦°à§à¦¶à¦¨ à¦«à¦¾à¦à¦²à¦¸à¦®à§à¦¹ :" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm %s à¦à§ %sà¦°à§à¦ªà§ à¦¸à¦à¦°à¦à§à¦·à¦£ à¦à¦°à§à¦à¦¿à¦² ,à¦à¦¿à¦¨à§à¦¤à§ à¦ªà¦¾à¦°à§à¦¥à¦à§à¦¯ à¦¨à¦¿à¦°à§à¦ªà¦£ à¦à¦°à¦¾ à¦à¦¸à¦®à§à¦à¦¬ à¦¹à§à§à¦à¦¿à¦² " #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2655,13 +2656,13 @@ "à¦à¦à¦¾à¦¨à§ à¦ªà¦¾à¦°à§à¦¥à¦à§à¦¯à§à¦° à¦ªà§à¦°à¦¥à¦® à§¨à§« à¦à¦¿ à¦²à¦¾à¦à¦¨ à¦¦à§à¦à§à¦¾ à¦à¦à§:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm %s à¦à§ %sà¦°à§à¦ªà§ à¦¸à¦à¦°à¦à§à¦·à¦£ à¦à¦°à§à¦à¦¿à¦² ,à¦à¦¿à¦¨à§à¦¤à§ à¦ªà¦¾à¦°à§à¦¥à¦à§à¦¯ à¦¨à¦¿à¦°à§à¦ªà¦£ à¦à¦°à¦¾ à¦à¦¸à¦®à§à¦à¦¬ à¦¹à§à§à¦à¦¿à¦² " #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2672,46 +2673,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§ " -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm à¦à¦à¦à¦ªà§à¦" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦ à¦¿à¦ à¦à¦à§" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "à¦à¦¤à¦¿à¦°à¦¿à¦à§à¦¤ à¦¤à¦¥à§à¦¯" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s à¦à¦ªà¦¸à¦¾à¦°à¦£ à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s à¦à¦ªà¦¸à¦¾à¦°à¦£ à¦ à¦¿à¦ à¦à¦à§" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "%s à¦¬à§à¦¯à¦¾à¦à¦à¦ª à¦¤à§à¦°à§ à¦à¦°à¦à§" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "à¦¨à¦¿à¦°à§à¦¦à§à¦¶à¦®à¦¤ à¦¸à§à¦¥à¦¾à¦ªà¦¨à¦¾ à¦¬à¦¾à¦¤à¦¿à¦² à¦à¦°à¦¾ à¦¹à§à§à¦à§à¥¤" @@ -2729,7 +2730,7 @@ msgstr "%s à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à§à§à¦à§ %s à¦¦à§à¦¬à¦¾à¦°à¦¾" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2737,58 +2738,68 @@ "à¦à¦ à¦°à¦¿à¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ à¦¸à¦¿à¦¸à§à¦à§à¦® à¦¥à§à¦à§ à¦®à§à¦à§ à¦¦à§à¦à§à¦¾ à¦¹à¦¬à§à¥¤" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s à¦¬à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦¬à§ à¦¨à¦¾ à¦à¦¾à¦°à¦£ à¦à¦à¦¾à¦° à¦à¦à¦¨à¦ à¦ªà§à¦°à§à§à¦à¦¨ à¦à¦à§" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "à¦à¦¬à§à¦§ à¦¤à¦¥à§à¦¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "à¦à¦¨à§à¦¯à¦¾à¦¨à§à¦¯ à¦°à¦¿à¦à¦²à¦à§à¦¬à¦²à§à¦° %s à¦ªà§à¦°à§à§à¦à¦¨" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s à¦à¦° %s à¦¦à¦°à¦à¦¾à¦°" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2798,7 +2809,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "à¦à¦¨à§à¦¯à¦¾à¦¨à§à¦¯ à¦¬à¦¿à¦¶à§à¦²à§à¦·à§à¦¯à¦à§à¦²à¦¿à¦° à¦¸à¦à§à¦à§ %s à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬" @@ -2807,14 +2818,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s-à¦à¦° à¦¸à¦à§à¦à§ %s-à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2824,24 +2835,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s à¦à¦¨à§à¦¯à¦¾à¦¨à§à¦¯ à¦°à¦¿à¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦à§ à¦ªà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ à¦¦à¦¿à§à§à¦à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s %sà¦à§ à¦ªà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ à¦¦à¦¿à§à§à¦à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s à¦ªà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ à¦¦à¦¿à§à§à¦à§: %sà¦à§" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2850,7 +2861,7 @@ "à¦à¦ à¦°à¦¿à¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ à¦¸à¦¿à¦¸à§à¦à§à¦® à¦¥à§à¦à§ à¦®à§à¦à§ à¦¦à§à¦à§à¦¾ à¦¹à¦¬à§à¥¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s à¦à¦¨à§à¦¯ à¦°à¦¿à¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦° à¦à¦ªà¦°à§ à¦¨à¦¿à¦°à§à¦à¦° à¦à¦°à§" @@ -2858,38 +2869,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s à¦¨à¦¿à¦°à§à¦à¦° à¦à¦°à§ %s à¦à¦° à¦à¦ªà¦°à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s à¦¨à¦¿à¦°à§à¦à¦° à¦à¦°à§ à¦à¦° à¦à¦ªà¦°à§: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "à¦à¦° à¦¸à¦¨à§à¦¤à¦¾à¦¨" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "in/ssTklà¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ à¦¯à¦¾à¦¬à§ à¦¨à¦¾" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "à¦à§à¦¨à¦à¦à¦¾à¦ %s à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ à¦¨à¦¾" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2898,32 +2909,32 @@ "\n" "à¦à¦®à¦¨ à¦à§à¦¨à¦ à¦¸à¦à¦¸à§à¦¥à¦¾à¦¨ à¦à¦ªà¦²à¦¬à§à¦§ à¦¨à§à¦ à¦¯à¦¾ à¦à¦ à¦ªà§à¦°à§à§à¦à¦¨à¦à¦¿à¦à§ à¦¸à¦®à¦°à§à¦¥à¦¨ à¦à¦°à§" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "à¦à¦ à¦°à§à¦à¦²à¦¿à¦à¦¶à¦¨à§à¦° à¦à¦ªà¦°à§/à¦¨à¦¿à¦à§ à¦¬à¦°à§à¦£à¦¿à¦¤ à¦¸à¦®à¦¸à§à¦¯à¦¾à¦à§à¦²à¦¿ à¦¸à¦®à¦¸à§à¦¤ à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿à¦° à¦¸à¦®à¦¾à¦§à¦¾à¦¨ à¦à¦°à¦¬à§ à¦¨à¦¾" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾ à¦à¦¾à¦°à¦£ à¦à¦à¦¾ %s à¦à¦° à¦¸à¦¾à¦¥à§ à¦¬à¦¿à¦¬à¦¾à¦¦ à¦¤à§à¦°à¦¿ à¦à¦°à¦à§" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ à¦¨à§à¦ à¦à¦¬à¦ à¦à¦¨à¦à¦¨à§à¦¸à¦à¦² à¦¹à¦¿à¦¸à¦¾à¦¬à§ à¦à¦¿à¦¹à§à¦¨à¦¿à¦¤ à¦à¦°à¦¾ à¦¹à§à§à¦à§" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾ à¦¸à¦®à¦¸à§à¦¯à¦¾à¦à§à¦²à¦¿à¦° à¦à¦¾à¦°à¦£à§ %s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2931,8 +2942,8 @@ msgstr "%s à¦®à§à¦à§ à¦«à§à¦²à§à¦¨" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2940,79 +2951,79 @@ msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à§ à¦¨à¦¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s à¦à¦° à¦à¦ªà§à¦°à§à¦£ à¦ªà§à¦°à§à§à¦à¦¨ à¦à¦à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s à¦à¦° à¦¹à¦¾à¦°à¦¿à§à§ à¦¯à¦¾à¦à§à¦¾ à¦¨à¦¿à¦°à§à¦à¦°à¦¶à§à¦²à¦à§à¦²à¦¿ à¦à¦à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "à¦¹à¦¾à¦°à¦¿à§à§ à¦¯à¦¾à¦à§à¦¾ à¦¨à¦¿à¦°à§à¦à¦°à¦¶à§à¦²à¦à§à¦²à¦¿à¦° à¦à¦¨à§à¦¯ %s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ à¦¯à¦¾à¦¬à§ à¦¨à¦¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s %s à¦à¦° à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ à¦ªà§à¦°à¦£ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ à¦¬à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦¬à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s %s à¦à¦° à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ à¦ªà§à¦°à¦£ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ à¦à¦à§ à¦à¦ªà¦¨à¦¾à¦° à¦¸à¦¿à¦¸à§à¦à§à¦®à§ à¦°à¦¾à¦à¦¾ à¦¹à¦¬à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° à¦ªà§à¦°à§à§à¦à¦¨ à¦¨à§à¦" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s à¦à¦° à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ à¦ªà§à¦°à¦£ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯à§ %s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s à¦à¦° à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ à¦ªà§à¦°à¦£ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯à§ %s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s à¦¬à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦¬à§ à¦¨à¦¾ à¦à¦¾à¦°à¦£ à¦à¦à¦¾à¦° à¦à¦à¦¨à¦ à¦ªà§à¦°à§à§à¦à¦¨ à¦à¦à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s %s à¦à§ à¦ªà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ à¦¦à¦¿à§à§à¦à§à¥¤ à¦à¦¿à¦¨à§à¦¤à§ %s à¦®à§à¦à§ à¦¦à§à¦à§à¦¾ à¦¯à¦¾à§ à¦¨à¦¾ à¦à¦¾à¦°à¦£ à¦à¦à¦¾ à¦²à¦ à¦¹à§à§ à¦à¦à§à¥¤" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾ à¦à¦¾à¦°à¦£ à¦à¦à¦¾ à¦¬à¦¿à¦¬à¦¾à¦¦ à¦¤à§à¦°à¦¿ à¦à¦°à¦à§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s à¦à¦° à¦¸à¦à§à¦à§ à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬à§à¦° à¦à¦¨à§à¦¯ %s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° à¦à¦¯à§à¦à§à¦¯" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3075,7 +3086,7 @@ msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "%s à¦à¦¨à§à¦¨à§à¦¤ à¦à¦°à¦¾à¦° à¦¸à¦®à§à§ %s à¦à¦° à¦à¦¨à§à¦¯à§ %s à¦à¦° à¦ªà§à¦°à§à§à¦à¦¨à§à¦° à¦à¦¨à§à¦¯à§" @@ -3433,14 +3444,22 @@ msgid "Install missing resolvables" msgstr "à¦¡à§à¦°à¦¾à¦à¦à¦¾à¦° à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ à¦¹à¦à§à¦à§..." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3491,6 +3510,14 @@ msgid "%s part of %s" msgstr "%s, %s à¦à¦° à¦à¦à§à¦" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§" Modified: trunk/libzypp/po/bs.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bs.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/bs.po (original) +++ trunk/libzypp/po/bs.po Mon Sep 10 16:18:44 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2002-07-23 18:27+0200\n" "Last-Translator: Damir Bjelobradic <Nagual(a)lugbih.org>\n" "Language-Team: Bosnian <i18n(a)suse.de>\n" @@ -113,36 +113,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -166,27 +166,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2970,19 +2971,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "Editor konfiguracijskih datoteka" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2990,13 +2991,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -3005,12 +3006,12 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "Nova instalacija" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 #, fuzzy msgid "rpm output:" msgstr "" @@ -3019,36 +3020,36 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "&Da, instaliraj" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "&Dodatne informacije za korisnika" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3066,64 +3067,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3131,7 +3142,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -3140,14 +3151,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3155,31 +3166,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3187,68 +3198,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instaliram driver..." #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3256,8 +3267,8 @@ msgstr "Izbrii" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3265,79 +3276,79 @@ msgstr "Instaliram driver..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "&Da, instaliraj" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3399,7 +3410,7 @@ msgstr "Instaliram driver..." #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3761,14 +3772,22 @@ msgid "Install missing resolvables" msgstr "Instaliram driver..." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3819,6 +3838,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/ca.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ca.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ca.po (original) +++ trunk/libzypp/po/ca.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-02-26 19:15+0100\n" "Last-Translator: Olga LÃ³pez\n" "Language-Team: Catalan\n" @@ -113,37 +113,37 @@ msgid "History:" msgstr "XF86History" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "La comprovaciÃ³ de l'applydeltarpm ha fallat." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "L'applydeltarpm ha fallat." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "El paquet %s no ha superat la comprovaciÃ³ d'integritat. Voleu intentar baixar-lo de nou?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "No s'ha trobat el fitxer %1 al dipÃ²sit." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "No es pot proporcionar %s des de %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -168,27 +168,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "S'estan afegint recursos" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "S'estan afegint recursos" @@ -2781,19 +2782,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Fitxers de configuraciÃ³ modificats per a %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "L'rpm ha desat %s com a %s perÃ² no ha estat possible determinar la diferÃ¨ncia" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2803,13 +2804,13 @@ "Aquestes sÃ³n les primeres 25 lÃnies de diferÃ¨ncia:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "L'rpm ha creat %s com a %s perÃ² no ha estat possible determinar la diferÃ¨ncia" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2820,46 +2821,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "S'ha produÃ¯t un error en instalÂ·lar %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Sortida de l'rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s s'ha instalÂ·lat correctament" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Sortida addicional de l'rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "S'ha produÃ¯t un error en suprimir %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s s'ha suprimit correctament" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "cÃ²pia de seguretat creada %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "La instalÂ·laciÃ³ s'ha avortat tal com heu indicat." @@ -2877,7 +2878,7 @@ msgstr "%s ha estat reemplaÃ§at per %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2885,58 +2886,68 @@ "Aquests Ãtems amb dependÃ¨ncies es suprimiran del sistema." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s no es desinstalÂ·larÃ perquÃ¨ encara es necessita" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "La informaciÃ³ no Ã©s vÃ lida" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "Altres Ãtems amb dependÃ¨ncies necessiten %s" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s requereix %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2946,7 +2957,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s entra en conflicte amb altres Ãtems amb dependÃ¨ncies" @@ -2955,14 +2966,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s entra en conflicte amb %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2972,24 +2983,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s desactualitza altres Ãtems amb dependÃ¨ncies" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s desactualitza %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s desactualitza:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2998,7 +3009,7 @@ "Aquests Ãtems amb dependÃ¨ncies es suprimiran del sistema." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s depÃ¨n d'altres Ãtems amb dependÃ¨ncies" @@ -3006,38 +3017,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s depÃ¨n de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s depÃ¨n de:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Fill de" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "No es pot instalÂ·lar %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "No es proporciona %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -3046,32 +3057,32 @@ "\n" "No hi ha cap recurs disponible que admeti aquest requisit." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Atesos els problemes descrits anteriorment o a continuaciÃ³, aquesta resoluciÃ³ no resoldrÃ totes les dependÃ¨ncies" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "No es pot instalÂ·lar %s perquÃ¨ entra en conflicte amb %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s no s'ha instalÂ·lat i s'ha marcat com a no instalÂ·lable" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "No es pot instalÂ·lar %s a causa de problemes de dependÃ¨ncia" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3079,8 +3090,8 @@ msgstr "suprimeix %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3088,79 +3099,79 @@ msgstr "no instalÂ·lis %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s tÃ© requisits no complerts" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "Falten dependÃ¨ncies per a %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s no es pot instalÂ·lar atÃ¨s que falten dependÃ¨ncies" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s compleixen les dependÃ¨ncies de %s perÃ² es desinstalÂ·laran" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s compleixen les dependÃ¨ncies de %s perÃ² es conservaran al sistema" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "No cal instalÂ·lar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "No es pot instalÂ·lar %s per a complir les dependÃ¨ncies de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "No es pot instalÂ·lar %s per a complir les dependÃ¨ncies de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s no es desinstalÂ·larÃ perquÃ¨ encara es necessita" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s desactualitza %s. No obstant, %s no es pot suprimir perquÃ¨ estÃ bloquejat." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "No es pot instalÂ·lar %s perquÃ¨ entra en conflicte" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s no es pot instalÂ·lar atesos els conflictes amb %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3223,7 +3234,7 @@ msgstr "No instalÂ·lis ni suprimeixis els Ãtems amb dependÃ¨ncies relacionats" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "per a requerir %s per a %s en actualitzar %s" @@ -3581,15 +3592,25 @@ msgid "Install missing resolvables" msgstr "InstalÂ·la els Ãtems amb dependÃ¨ncies que falten" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 #, fuzzy msgid "Regarding all resolvables with a compatible architecture." msgstr "S'estan capturant els Ãtems amb dependÃ¨ncies que coincideixen amb el criteri de cerca definit..." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "S'estan capturant els Ãtems amb dependÃ¨ncies que coincideixen amb el criteri de cerca definit..." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "S'estan capturant els Ãtems amb dependÃ¨ncies que coincideixen amb el criteri de cerca definit..." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3640,6 +3661,15 @@ msgid "%s part of %s" msgstr "%s Ã©s part de %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "Temps d'espera de doble clic " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "desbloqueja tots els Ãtems amb dependÃ¨ncies" Modified: trunk/libzypp/po/cs.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cs.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/cs.po (original) +++ trunk/libzypp/po/cs.po Mon Sep 10 16:18:44 2007 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-23 18:25+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-06 19:10+0200\n" "Last-Translator: Jakub Hegenbart <jhegenbart(a)suse.cz>\n" "Language-Team: <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -116,36 +116,36 @@ msgid "History:" msgstr "Historie:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Kontrola aplikovÃ¡nÃ delta RPM se nezdaÅila." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "AplikovÃ¡nÃ delta RPM se nezdaÅilo." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete pokus opakovat?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Adresa URL nebyla nalezena v repozitÃ¡Åi." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Nelze poskytnout soubor %s z repozitÃ¡Åe %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "NaÄÃtÃ¡ se vyrovnÃ¡vacÃ pamÄÅ¥ repozitÃ¡Åe '%s'" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "NaÄÃtajÃ se balÃÄky oprav RPM a delta RPM z vyrovnÃ¡vacÃ pamÄti repozitÃ¡Åe '%s'" @@ -169,27 +169,28 @@ msgid "Cleaning repository '%s' cache" msgstr "ProbÃhÃ¡ ÄistÄnÃ vyrovnÃ¡vacÃ pamÄti repozitÃ¡Åe '%s'." -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Na zadanÃ© adrese nebo adresÃ¡ch URL nebyla nalezena platnÃ¡ metadata" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "VytvÃ¡ÅÃ se vyrovnÃ¡vacÃ pamÄÅ¥ repozitÃ¡Åe '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "NaÄÃtÃ¡ se vyrovnÃ¡vacÃ pamÄÅ¥ repozitÃ¡Åe '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "PÅidÃ¡vÃ¡ se repozitÃ¡Å '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "OdebÃrÃ¡ se repozitÃ¡Å '%s'" @@ -2705,19 +2706,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "ZmÄnÄnÃ© konfiguraÄnÃ soubory pro %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "Program rpm uloÅ¾il %s jako %s, ale nebylo moÅ¾nÃ© zjistit rozdÃl" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2727,13 +2728,13 @@ "PrvnÃch 25 ÅÃ¡dek rozdÃlÅ¯:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "Program rpm vytvoÅil %s jako %s, ale nebylo moÅ¾nÃ© zjistit rozdÃl" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2744,47 +2745,47 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Instalace %s selhala" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "VÃ½stup programu rpm:" # #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s nainstalovÃ¡n ok" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "DalÅ¡Ã vÃ½stup programu rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "OdstranÄnÃ %s se nezdaÅilo" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s odstranÄnÃ ok" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "vytvoÅena zÃ¡loha %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Instalace byla zruÅ¡ena podle pÅÃkazu." @@ -2802,64 +2803,74 @@ msgstr "%s nahrazen %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s bude odstranÄn uÅ¾ivatelem.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s bude odstranÄn jinou aplikacÃ. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s bude nainstalovÃ¡n uÅ¾ivatelem.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s bude nainstalovÃ¡n jinou aplikacÃ. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "V ÄasovÃ©m limitu %d s nebylo nalezeno Å¾Ã¡dnÃ© platnÃ© ÅeÅ¡enÃ" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "ÅeÅ¡itel vyÄerpal zadanÃ½ ÄasovÃ½ limit" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Nebylo nalezeno Å¾Ã¡dnÃ© platnÃ© ÅeÅ¡enÃ se zÃ¡vislostmi pouze nejlepÅ¡Ã architektury." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "PÅi tÃ©to operaci byly vzaty v Ãºvahu pouze zÃ¡vislosti s nejlepÅ¡Ã architekturou.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Pokud jsou zahrnuty vÅ¡echny moÅ¾nÃ© zÃ¡vislosti, mÅ¯Å¾e operace trvat delÅ¡Ã dobu, ale dospÄje k platnÃ©mu vÃ½sledku." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ChybnÃ¡ informace" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s je poÅ¾adovÃ¡n jinÃ½mi balÃÄky" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s je poÅ¾adovÃ¡n pro %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2869,7 +2880,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s koliduje" @@ -2878,14 +2889,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s koliduje s %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2895,24 +2906,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s je novÄjÅ¡Ã neÅ¾ jinÃ© zÃ¡visejÃcÃ balÃÄky" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s je novÄjÅ¡Ã neÅ¾ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s je novÄjÅ¡Ã neÅ¾: %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2921,7 +2932,7 @@ "Tyto balÃÄky budou smazÃ¡ny." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s zÃ¡vislÃ na jinÃ½ch balÃÄcÃch" @@ -2929,38 +2940,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s zÃ¡visÃ na %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s zÃ¡visÃ na: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Potomek" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Nelze nainstalovat %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Å½Ã¡dnÃ½ balÃÄek neposkytuje %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2968,31 +2979,31 @@ "\n" "PoÅ¾adavky nelze uspokojit z Å¾Ã¡dnÃ©ho dostupnÃ©ho zdroje." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "KvÅ¯li uvedenÃ½m nebo nÃ¡sledujÃcÃm problÃ©mÅ¯m nevyÅeÅ¡Ã toto ÅeÅ¡enÃ vÅ¡echny zÃ¡vislosti" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Nelze nainstalovat %s, protoÅ¾e zpÅ¯sobuje konflikt s %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s nebude nainstalovÃ¡n a byl oznaÄen jako nenainstalovatelnÃ½" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Vzhledem k problÃ©mÅ¯m se zÃ¡vislostÃ nelze nainstalovat %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3000,8 +3011,8 @@ msgstr "smazat %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3009,79 +3020,79 @@ msgstr "neinstalovat %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s obsahuje nevyÅeÅ¡enÃ© zÃ¡vislosti" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s mÃ¡ nesplnÄnÃ© zÃ¡vislosti" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s nelze nainstalovat kvÅ¯li nesplnÄnÃ½m zÃ¡vislostem" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s splÅuje zÃ¡vislosti %s, bude vÅ¡ak odinstalovÃ¡n" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s splÅuje zÃ¡vislosti %s, bude vÅ¡ak ponechÃ¡n v systÃ©mu" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "NenÃ potÅeba instalovat %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Nelze nainstalovat %s ke splnÄnÃ zÃ¡vislostÃ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Nelze nainstalovat %s ke splnÄnÃ zÃ¡vislostÃ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s nebude odinstalovÃ¡n, protoÅ¾e je stÃ¡le vyÅ¾adovÃ¡n" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s je novÄjÅ¡Ã neÅ¾ %s, ale %s nelze odstranit, protoÅ¾e je uzamÄenÃ½." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Nelze nainstalovat %s, protoÅ¾e zpÅ¯sobuje konflikt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s nelze nainstalovat, koliduje s %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "PoÅ¾adavek %s nelze splnit." @@ -3142,7 +3153,7 @@ msgstr "Neinstalovat a nemazat pÅÃsluÅ¡nÃ© zÃ¡vislosti" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "vyÅ¾adujÃcÃ %s pro %s pÅi aktualizaci %s" @@ -3500,14 +3511,22 @@ msgid "Install missing resolvables" msgstr "Nainstalovat chybÄjÃcÃ zÃ¡vislosti" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "SpustÃ ÅeÅ¡itel se zvÃ¡Å¾enÃm VÅ ECH moÅ¾nostÃ" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "V Ãºvahu jsou brÃ¡ny vÅ¡echny zÃ¡vislosti s kompatibilnÃ architekturou." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "SpustÃ ÅeÅ¡itel pouze pro nejlepÅ¡Ã architekturu." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "V Ãºvahu jsou brÃ¡ny pouze zÃ¡vislosti s nejlepÅ¡Ã architekturou." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3558,6 +3577,14 @@ msgid "%s part of %s" msgstr "%s ÄÃ¡st ze %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "DvojnÃ¡sobnÃ½ ÄasovÃ½ limit" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "PÅÃÅ¡tÄ spustÃ ÅeÅ¡itel s dvojnÃ¡sobnÃ½m ÄasovÃ½m limitem." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "odemknout vÅ¡echny zÃ¡visejÃcÃ balÃÄky" Modified: trunk/libzypp/po/cy.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cy.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/cy.po (original) +++ trunk/libzypp/po/cy.po Mon Sep 10 16:18:44 2007 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2003-09-23 10:33+0200\n" "Last-Translator: Kevin Donnelly <kevin(a)dotmon.com>\n" "Language-Team: Welsh <i18n(a)suse.de>\n" @@ -111,36 +111,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -164,27 +164,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2857,19 +2858,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "CopÃ¯o ffeiliau ffurfweddu i'r cysawd a osodwyd" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2877,13 +2878,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2892,46 +2893,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "Methodd yr arsefydliad." -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "&Ie, gosod" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, fuzzy, c-format msgid "%s remove failed" msgstr "Methodd rpm." #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2949,64 +2950,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3014,7 +3025,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -3023,14 +3034,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3038,31 +3049,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3070,68 +3081,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Arsefydlu %s: \"%s\"" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Rhaid arsefydlu'r pecynnau yma:" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3139,8 +3150,8 @@ msgstr "&Dileu" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3148,79 +3159,79 @@ msgstr "Arsefydlu %s: \"%s\"" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "&Ie, gosod" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3282,7 +3293,7 @@ msgstr "Gosod gyrrydd..." #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3644,14 +3655,22 @@ msgid "Install missing resolvables" msgstr "Gosod gyrrydd..." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3702,6 +3721,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/da.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/da.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/da.po (original) +++ trunk/libzypp/po/da.po Mon Sep 10 16:18:44 2007 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-23 15:16+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-07 14:07+0200\n" "Last-Translator: Martin Schlander <suse(a)linuxin.dk>\n" "Language-Team: <opensuse-translation(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -116,36 +116,36 @@ msgid "History:" msgstr "Historik:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm-kontrol mislykkedes." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm mislykkedes." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Pakken %s bestod ikke integritetstjek. Vil du forsÃ¸ge igen?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Ingen URL i softwarekilden." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Kan ikke levere filen %s fra softwarekilden %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "LÃ¦ser '%s' softwarekilde-cache" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "LÃ¦ser rettelses- og deltarpms fra '%s' softwarekilde-cache" @@ -169,27 +169,28 @@ msgid "Cleaning repository '%s' cache" msgstr "TÃ¸mmer cache for softwarekilden '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Ingen gyldig metadata fundet pÃ¥ specificerede URL(s)" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Opbygger cache for softwarekilden '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "LÃ¦ser cache for softwarekilden '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "TilfÃ¸jer softwarekilden '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Fjerner softwarekilden '%s'" @@ -2716,19 +2717,19 @@ # #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Konfigurationsfiler er Ã¦ndret for %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm gemte %s som %s, men det var umuligt at bestemme forskellen" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2738,13 +2739,13 @@ "Her er de fÃ¸rste 25 linjer af forskelle:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm oprettede %s som %s, men det var umuligt at bestemme forskellen" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2755,46 +2756,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Installation af %s mislykkedes" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm output:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s blev installeret" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Yderligere rpm output:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Fjernelse af %s mislykkedes" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s fjernelse ok" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "backup %s blev oprettet" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Installation er blevet afbrudt som Ã¸nsket." @@ -2812,64 +2813,74 @@ msgstr "%s erstattet af %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s vil blive slettet af brugeren.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s vil blive slettet af et andet program (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s vil blive installeret af brugeren.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s vil blive installeret af et andet program. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "Ingen gyldig lÃ¸sning fundet indenfor %d sekunder" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "AfhÃ¦ngighedslÃ¸seren har nÃ¥et en defineret timeout" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Ingen gyldig lÃ¸sning fundet udelukkende med resolvables fra bedste arktitektur." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "I denne kÃ¸rsel er kun resolvables med den bedste arkitektur taget i betragtning.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "At tage alle mulige resolvables i betragtning tager tid men kan give et godt resultat." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Ugyldig information" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s behÃ¸ves af andre Ã¦ndringer" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s er nÃ¸dvendig for %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2879,7 +2890,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s konflikter med andre Ã¦ndringer" @@ -2888,14 +2899,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s konflikter med %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2905,24 +2916,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s forÃ¦lder andre Ã¦ndringer" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s forÃ¦lder %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s forÃ¦lder %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2931,7 +2942,7 @@ "Disse resolvables vil blive slettet fra systemet." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s afhÃ¦nger af andre resolvables" @@ -2939,38 +2950,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s afhÃ¦nger af %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s afhÃ¦nger af %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Barn af" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s kan ikke installeres" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Ingen tilbyder %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2978,31 +2989,31 @@ "\n" "Der er ingen tilgÃ¦ngelige ressourcer, der understÃ¸tter dette krav." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Grundet problemerne beskrevet ovenfor/nedenunder vil denne beslutning ikke lÃ¸se alle afhÃ¦ngigheder" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Kan ikke installere %s, fordi den konflikter med %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s er ikke blevet installeret og er markeret som ikke-installerbar" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Kan ikke installere %s grundet afhÃ¦ngighedsproblemer" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3010,8 +3021,8 @@ msgstr "slet %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3019,81 +3030,81 @@ msgstr "installÃ©r ikke %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s har ikke-opfyldte krav" # #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s har manglende afhÃ¦ngigheder" # #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Kan ikke installere %s grundet afhÃ¦ngighedsproblemer" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s opfylder afhÃ¦ngighedskravene til %s, men vil blive afinstalleret" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s opfylder afhÃ¦ngighederne for %s, men vil blive bevaret pÃ¥ systemet" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Det er ikke nÃ¸dvendigt at installere %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Kan ikke installere %s, for at opfylde afhÃ¦ngighedskravene til %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Kan ikke installere %s, for at opfylde afhÃ¦ngighedskravene til %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s vil ikke blive afinstalleret, da den stadig krÃ¦ves" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s forÃ¦lder %s. Men %s kan ikke slettes, fordi den er lÃ¥st." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Kan ikke installere %s, fordi den konflikter" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s kan ikke installeres pÃ¥ grund af konflikter med %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Kravet %s kan ikke opfyldes." @@ -3154,7 +3165,7 @@ msgstr "InstallÃ©r ikke, eller slet de pÃ¥gÃ¦ldende resolvables" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "for at krÃ¦ve %s til %s nÃ¥r du opgraderer %s" @@ -3515,14 +3526,22 @@ msgid "Install missing resolvables" msgstr "Installer manglende resolvables" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "FÃ¥ afhÃ¦ngighedslÃ¸seren til at kÃ¸re med ALLE muligheder." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Tager alle resolvables med kompatibel arkitektur i betragtning." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "FÃ¥ afhÃ¦ngighedslÃ¸seren til kun at kÃ¸re med bedste arkitektur." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "Tager kun resolvables med bedste arkitektur i betragtning." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3573,6 +3592,14 @@ msgid "%s part of %s" msgstr "%s del af %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "Dobbel timeout" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "Start nÃ¦ste kÃ¸rsel af afhÃ¦ngighedslÃ¸seren med fordoblet timeout." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "LÃ¥s alle resolvables op" Modified: trunk/libzypp/po/de.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/de.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/de.po (original) +++ trunk/libzypp/po/de.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2005-03-09 13:54+0100\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -112,36 +112,36 @@ msgid "History:" msgstr "Folgende Fehler sind aufgetreten:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Applydeltarpm-PrÃ¼fung nicht bestanden." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "Fehler bei applydeltarpm" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Paket %s besteht IntegritÃ¤tsprÃ¼fung nicht. Soll ein erneuter Download-Versuch gestartet werden?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Das Repository enthÃ¤lt keine URL." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "%s kann nicht vom Repository %s bereitgestellt werden." -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Lese '%s' Repository Cache" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Lese Patch- und Delta-RPMs vom '%s' Repository Cache." @@ -165,27 +165,28 @@ msgid "Cleaning repository '%s' cache" msgstr "SÃ¤ubere Cache fÃ¼r Repository '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Keine gÃ¼ltigen Metadaten an der angegebenen Adresse (URL) gefunden" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Erzeuge Cache fÃ¼r Repository '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Lese Cache fÃ¼r Repository '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "FÃ¼ge Repository '%s' hinzu" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Entferne Repository '%s'" @@ -2636,19 +2637,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "GeÃ¤nderte Konfigurationsdateien fÃ¼r %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm hat %s als %s gespeichert, der Unterschied konnte jedoch nicht ermittelt werden" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2658,13 +2659,13 @@ "Hier die ersten 25 Zeilen mit Unterschieden:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm hat %s als %s erstellt, der Unterschied konnte jedoch nicht ermittelt werden" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2675,46 +2676,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Fehler bei der Installation von %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm-Ausgabe:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s ordnungsgemÃ¤Ã installiert" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "ZusÃ¤tzliche rpm-Ausgabe:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Fehler beim Entfernen von %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s ordnungsgemÃ¤Ã entfernt" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "Sicherung %s erstellt" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Die Installation wurde gemÃ¤Ã Anweisung abgebrochen." @@ -2732,67 +2733,77 @@ msgstr "%s ersetzt durch %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s wird durch Benutzerinteraktion gelÃ¶scht.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s werden durch ein anderes Programm gelÃ¶scht.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s wird vom Benutzer installiert.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s wird durch ein andere Programm installiert.\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "Wenn nur AbhÃ¤ngigkeiten der besten Architektur fÃ¼r diese Maschine verwendet werden, wird keine eindeutige LÃ¶sung gefunden." + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 #, fuzzy msgid "No valid solution found with just resolvables of best architecture." msgstr "Wenn nur AbhÃ¤ngigkeiten der besten Architektur fÃ¼r diese Maschine verwendet werden, wird keine eindeutige LÃ¶sung gefunden." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 #, fuzzy msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Bei diesem Resolver-Lauf wurden nur AbhÃ¤ngigkeiten fÃ¼r die beste Architektur berÃ¼cksichtigt.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 #, fuzzy msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Alle evtl. mÃ¶glichen auflÃ¶sbaren Objekte zu berÃ¼cksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis fÃ¼hren." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "UngÃ¼ltige Informationen" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s wird von anderen auflÃ¶sbaren Objekten benÃ¶tigt." #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s wird benÃ¶tigt von %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2802,7 +2813,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s steht in Konflikt mit anderen auflÃ¶sbaren Objekten" @@ -2811,14 +2822,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s steht in Konflikt mit %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2828,24 +2839,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s ersetzt andere auflÃ¶sbare Objekte" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s ersetzt %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s ersetzt:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2854,7 +2865,7 @@ "Diese auflÃ¶sbaren Objekte werden aus dem System gelÃ¶scht." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s hÃ¤ngt von anderen auflÃ¶sbaren Objekten ab" @@ -2862,38 +2873,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s hÃ¤ngig von %s ab" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s ist abhÃ¤ngig von:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Untergeordnetes Element von" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Installation von %s nicht mÃ¶glich" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Kein Objekt stellt %s bereit." -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2902,32 +2913,32 @@ "\n" "Es ist keine Ressource verfÃ¼gbar, die diese Anforderung unterstÃ¼tzt." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Aufgrund der oben/unten beschriebenen Problemen lÃ¶st diese AuflÃ¶sung nicht alle AbhÃ¤ngigkeiten" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Installation von %s aufgrund eines Konflikts mit %s nicht mÃ¶glich" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ist nicht installiert und als nicht installierbar gekennzeichnet" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Installation von %s aufgrund von AbhÃ¤ngigkeitsproblemen nicht mÃ¶glich" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2935,8 +2946,8 @@ msgstr "%s lÃ¶schen" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2944,79 +2955,79 @@ msgstr "%s nicht installieren" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "UnerfÃ¼llbare Anforderungen von %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "Fehlende AbhÃ¤ngigkeiten von %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s kann aufgrund fehlender AbhÃ¤ngigkeiten nicht installiert werden" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s erfÃ¼llt die AbhÃ¤ngigkeiten von %s, wird jedoch deinstalliert" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s erfÃ¼llt die AbhÃ¤ngigkeiten von %s, wird jedoch in Ihrem System beibehalten" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s muss nicht installiert werden" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Installation von %s zur ErfÃ¼llung der AbhÃ¤ngigkeiten von %s nicht mÃ¶glich" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Installation von %s zur ErfÃ¼llung der AbhÃ¤ngigkeiten von %s nicht mÃ¶glich" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s wird nicht deinstalliert; wird noch immer benÃ¶tigt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s ersetzt %s. %s kann aber nicht gelÃ¶scht werden, weil gesperrt." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Installation von %s aufgrund eines Konflikts nicht mÃ¶glich" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s kann nicht installiert werden aufgrund von Konflikten mit %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3079,7 +3090,7 @@ msgstr "Betreffende auflÃ¶sbare Objekte nicht installieren oder lÃ¶schen" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "fÃ¼r die Voraussetzung von %s fÃ¼r %s beim AufrÃ¼sten von %s" @@ -3437,15 +3448,25 @@ msgid "Install missing resolvables" msgstr "Fehlende auflÃ¶sbare Objekte installieren" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 #, fuzzy msgid "Regarding all resolvables with a compatible architecture." msgstr "Alle evtl. mÃ¶glichen auflÃ¶sbaren Objekte zu berÃ¼cksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis fÃ¼hren." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "Alle evtl. mÃ¶glichen auflÃ¶sbaren Objekte zu berÃ¼cksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis fÃ¼hren." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "Alle evtl. mÃ¶glichen auflÃ¶sbaren Objekte zu berÃ¼cksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis fÃ¼hren." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3496,6 +3517,14 @@ msgid "%s part of %s" msgstr "%s ist Teil von %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "Entsperren aller auflÃ¶sbaren Objekte" Modified: trunk/libzypp/po/el.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/el.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/el.po (original) +++ trunk/libzypp/po/el.po Mon Sep 10 16:18:44 2007 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: zypp.el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-16 18:04+0300\n" "Last-Translator: Vasileios Giannakopoulos <billg(a)hellug.gr>\n" "Language-Team: ÎÎ»Î»Î·Î½Î¹ÎºÎ¬\n" @@ -117,37 +117,37 @@ msgid "History:" msgstr "ÎÎ±ÏÎ¬Î»Î¿Î³Î¿Ï:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "ÎÎ»ÎµÎ³ÏÎ¿Ï applydeltarpm Î±ÏÎÏÏÏÎµ." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm Î±ÏÎÏÏÏÎµ." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Î¤Î¿ ÏÎ±ÎºÎÏÎ¿ %s Î±ÏÎÏÏÏÎµ ÏÏÎ¿Î½ ÎÎ»ÎµÎ³ÏÎ¿ Î±ÎºÎµÏÎ±Î¹ÏÏÎ·ÏÎ±Ï. ÎÎÎ»ÎµÏÎµ Î½Î± ÏÏÎ½ÎµÏÎ¯ÏÎµÏÎµ;" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÏÎ±ÏÎ¿ÏÎ®Ï %s Î±ÏÏ %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, fuzzy, c-format msgid "Reading '%s' repository cache" msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'." -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -171,27 +171,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'." -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, fuzzy, c-format msgid "Building repository '%s' cache" msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'." #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, fuzzy, c-format msgid "Reading repository '%s' cache" msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'." -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'." -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'." @@ -2645,19 +2646,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "ÎÎ»Î»Î±Î³Î® Î±ÏÏÎµÎ¯ÏÎ½ ÏÏÎ¸Î¼Î¹ÏÎ·Ï Î³Î¹Î± %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "Î¤Î¿ rpm Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎµ %s ÏÏ %s Î±Î»Î»Î¬ Î®ÏÎ±Î½ Î±Î´ÏÎ½Î±ÏÎ¿ Î½Î± Î´Î¹Î±ÏÎ±Î½ÎµÎ¯ Î· Î´Î¹Î±ÏÎ¿ÏÎ¬" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2667,13 +2668,13 @@ "ÎÎ´Ï ÎµÎ¯Î½Î±Î¹ Î¿Î¹ ÏÏÏÏÎµÏ 25 Î³ÏÎ±Î¼Î¼ÎÏ ÏÎ·Ï Î´Î¹Î±ÏÎ¿ÏÎ¬Ï:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "Î¤Î¿ rpm Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎµ %s ÏÏ %s Î±Î»Î»Î¬ Î®ÏÎ±Î½ Î±Î´ÏÎ½Î±ÏÎ¿ Î½Î± Î´Î¹Î±ÏÎ±Î½ÎµÎ¯ Î· Î´Î¹Î±ÏÎ¿ÏÎ¬" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2684,46 +2685,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î±ÏÎÏÏÏÎµ" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Î±ÏÎ¿ÏÎÎ»ÎµÏÎ¼Î± rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ok" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "ÎÏÎ¹ÏÏÏÏÎ¸ÎµÏÎ¿ Î±ÏÎ¿ÏÎÎ»ÎµÏÎ¼Î± rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s Î±ÏÎ±Î¯ÏÎµÏÎ· Î±ÏÎÏÏÏÎµ" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s Î±ÏÎ±Î¯ÏÎµÏÎ· ok" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î±Î½ÏÎ¹Î³ÏÎ¬ÏÎ¿Ï Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Î ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î±ÎºÏÏÏÎ¸Î·ÎºÎµ ÏÏÏÏ Î´Î¹Î±ÏÎ¬ÏÎ¸Î·ÎºÎµ." @@ -2741,7 +2742,7 @@ msgstr "%s Î±Î½ÏÎ¹ÎºÎ±ÏÎ±ÏÏÎ¬Î¸Î·ÎºÎµ Î±ÏÏ %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2749,61 +2750,71 @@ "ÎÏÏÎ¬ ÏÎ± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î± Î¸Î± Î´Î¹Î±Î³ÏÎ±ÏÎ¿ÏÎ½ Î±ÏÏ ÏÎ¿ ÏÏÏÏÎ·Î¼Î±." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "Î¤Î¿ %s Î´ÎµÎ½ Î¸Î± Î±ÏÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯ Î³Î¹Î±ÏÎ¯ Î±ÎºÏÎ¼Î· Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "ÎÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ ÎÎ³ÎºÏÏÎ· Î»ÏÏÎ· Î¼Îµ Î¼Î¿Î½Î±Î´Î¹ÎºÎ¬ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î± ÏÎ·Ï ÎºÎ±Î»ÏÏÎµÏÎ·Ï Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®Ï" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 #, fuzzy msgid "No valid solution found with just resolvables of best architecture." msgstr "ÎÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ ÎÎ³ÎºÏÏÎ· Î»ÏÏÎ· Î¼Îµ Î¼Î¿Î½Î±Î´Î¹ÎºÎ¬ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î± ÏÎ·Ï ÎºÎ±Î»ÏÏÎµÏÎ·Ï Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®Ï" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 #, fuzzy msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "ÎÎµ Î±ÏÏÏ ÎµÎºÏÎµÎ»ÎµÎ¯ÏÎµ Î¼ÏÎ½Î¿ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î± Î¼Îµ ÏÎ·Î½ ÎºÎ±Î»ÏÏÎµÏÎ· Î¸ÎµÏÏÎ¿ÏÎ¼ÎµÎ½Î· Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 #, fuzzy msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "ÎÏÎ¿Î½ Î±ÏÎ¿ÏÎ¬ ÏÎ»Î± ÏÎ± ÏÎ¹Î¸Î±Î½Î¬ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±, ÏÎ±Î¯ÏÎ½ÎµÎ¹ ÏÏÏÎ½Î¿ Î±Î»Î»Î¬ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÏÎ¬ÏÎ¾ÎµÎ¹ ÎÎ³ÎºÏÏÎ¿ Î±ÏÎ¿ÏÎÎ»ÎµÏÎ¼Î±." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î· ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯Î±" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "Î¤Î¿ %s ÏÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î±ÏÏ Î¬Î»Î»Î± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "Î¤Î¿ %s ÏÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î±ÏÏ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2813,7 +2824,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "Î¤Î¿ %s ÏÏÎ³ÎºÏÎ¿ÏÎµÏÎ±Î¹ Î¼Îµ Î¬Î»Î»Î± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±" @@ -2822,14 +2833,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "Î¤Î¿ %s ÏÏÎ³ÎºÏÎ¿ÏÎµÏÎ±Î¹ Î¼Îµ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2839,24 +2850,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "Î¤Î¿ %s ÏÎµÏÎ±Î»Î±Î¹ÏÎ½ÎµÎ¹ Î¬Î»Î»Î± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "Î¤Î¿ %s ÏÎµÏÎ±Î»Î±Î¹ÏÎ½ÎµÎ¹ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "Î¤Î¿ %s ÏÎµÏÎ±Î»Î±Î¹ÏÎ½ÎµÎ¹: %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2865,7 +2876,7 @@ "ÎÏÏÎ¬ ÏÎ± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î± Î¸Î± Î´Î¹Î±Î³ÏÎ±ÏÎ¿ÏÎ½ Î±ÏÏ ÏÎ¿ ÏÏÏÏÎ·Î¼Î±." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "Î¤Î¿ %s ÎµÎ¾Î±ÏÏÎ¬ÏÎ±Î¹ Î±ÏÏ Î¬Î»Î»Î± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±" @@ -2873,38 +2884,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "Î¤Î¿ %s ÎµÎ¾Î±ÏÏÎ¬ÏÎ±Î¹ Î±ÏÏ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "Î¤Î¿ %s ÎµÎ¾Î±ÏÏÎ¬ÏÎ±Î¹ Î±ÏÏ:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Î Î±Î¹Î´Î¯ ÏÎ¿Ï" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "ÎÎ±Î½ÎÎ½Î±Ï Î´ÎµÎ½ ÏÎ±ÏÎÏÎµÎ¹ ÏÎ¿ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2913,32 +2924,32 @@ "\n" "ÎÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ Î´Î¹Î±Î¸ÎÏÎ¹Î¼Î¿Ï ÏÏÏÎ¿Ï ÏÎ¿Ï Î½Î± ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÎ¹ Î±ÏÏÎ® ÏÎ·Î½ Î±ÏÎ±Î¯ÏÎ·ÏÎ·." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "ÎÎ¾Î±Î¹ÏÎ¯Î±Ï ÏÏÎ¿Î²Î»Î·Î¼Î¬ÏÏÎ½ ÏÎ¿Ï ÏÎµÏÎ¹Î³ÏÎ¬ÏÎ¿Î½ÏÎ±Î¹ ÏÎ±ÏÎ±ÏÎ¬Î½Ï/ÏÎ±ÏÎ±ÎºÎ¬ÏÏ Î±ÏÏÎ® Î· ÎµÏÎ¯Î»ÏÏÎ· Î´ÎµÎ½ Î¸Î± Î»ÏÏÎµÎ¹ ÏÎ»ÎµÏ ÏÎ¹Ï ÎµÎ¾Î±ÏÏÎ®ÏÎµÎ¹Ï" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï %s ÎµÏÎµÎ¹Î´Î® ÏÏÎ³ÎºÏÎ¿ÏÎµÏÎ±Î¹ Î¼Îµ ÏÎ¿ %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Î¤Î¿ %s Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿ ÎºÎ±Î¹ ÎÏÎµÎ¹ ÏÎ·Î¼ÎµÎ¹ÏÎ¸ÎµÎ¯ ÏÏ Î¼Î· ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎ¹Î¼Î¿" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï %s ÎµÎ¾Î±Î¹ÏÎ¯Î±Ï ÏÏÎ¿Î²Î»Î·Î¼Î¬ÏÏÎ½ ÎµÎ¾Î±ÏÏÎ®ÏÎµÏÎ½" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2946,8 +2957,8 @@ msgstr "Î´Î¹Î±Î³ÏÎ±ÏÎ® %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2955,79 +2966,79 @@ msgstr "Î½Î± Î¼Î·Î½ ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯ ÏÎ¿ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "ÏÎ¿ %s ÎÏÎµÎ¹ Î¼Î· ÎµÎºÏÎ»Î·ÏÏÎ¼ÎÎ½ÎµÏ Î±ÏÎ±Î¹ÏÎ®ÏÎµÎ¹Ï" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "ÏÎ¿ %s ÎÏÎµÎ¹ ÎµÎ»Î»ÎµÎ¹ÏÎµÎ¯Ï ÎµÎ¾Î±ÏÏÎ®ÏÎµÎ¹Ï" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "ÏÎ¿ %s Î´Îµ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯ ÎµÎ¾Î±Î¹ÏÎµÎ¯Î±Ï ÎµÎ»Î»ÎµÎ¹ÏÏÎ½ ÎµÎ¾Î±ÏÏÎ®ÏÎµÏÎ½" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "ÏÎ¿ %s ÎµÎºÏÎ»Î·ÏÏÎ½ÎµÎ¹ ÏÎ¹Ï ÎµÎ¾Î±ÏÏÎ®ÏÎµÎ¹Ï ÏÎ¿Ï %s Î±Î»Î»Î¬ Î¸Î± Î±ÏÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "ÏÎ¿ %s ÎµÎºÏÎ»Î·ÏÏÎ½ÎµÎ¹ ÏÎ¹Ï ÎµÎ¾Î±ÏÏÎ®ÏÎµÎ¹Ï ÏÎ¿Ï %s Î±Î»Î»Î¬ Î¸Î± Î´Î¹Î±ÏÎ·ÏÎ·Î¸ÎµÎ¯ ÏÏÎ¿ ÏÏÏÏÎ·Î¼Î± ÏÎ±Ï" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "ÎÎ±Î¼Î¹Î± Î±Î½Î¬Î³ÎºÎ· Î³Î¹Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï %s Î¼Îµ ÏÎºÎ¿ÏÏ ÏÎ·Î½ ÎµÎºÏÎ»Î®ÏÏÏÎ· ÏÏÎ½ ÎµÎ¾Î±ÏÏÎ®ÏÎµÏÎ½ ÏÎ¿Ï %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï %s Î¼Îµ ÏÎºÎ¿ÏÏ ÏÎ·Î½ ÎµÎºÏÎ»Î®ÏÏÏÎ· ÏÏÎ½ ÎµÎ¾Î±ÏÏÎ®ÏÎµÏÎ½ ÏÎ¿Ï %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "Î¤Î¿ %s Î´ÎµÎ½ Î¸Î± Î±ÏÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯ Î³Î¹Î±ÏÎ¯ Î±ÎºÏÎ¼Î· Î±ÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "Î¤Î¿ %s ÏÎµÏÎ±Î»Î±Î¹ÏÎ½ÎµÎ¹ ÏÎ¿ %s. ÎÎ»Î»Î¬ ÏÎ¿ %s Î´ÎµÎ½ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± Î´Î¹Î±Î³ÏÎ±ÏÎµÎ¯ ÎµÏÎµÎ¹Î´Î® ÎµÎ¯Î½Î±Î¹ ÎºÎ»ÎµÎ¹Î´ÏÎ¼ÎÎ½Î¿." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï %s ÎµÏÎµÎ¹Î´Î® ÏÏÎ³ÎºÏÎ¿ÏÎµÏÎ±Î¹" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "Î¤Î¿ %s ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎ¹Î¼Î¿ ÎµÎ¾Î±Î¹ÏÎ¯Î±Ï ÏÏÎ³ÎºÏÎ¿ÏÏÎµÏÎ½ Î¼Îµ ÏÎ¿ %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3090,7 +3101,7 @@ msgstr "ÎÎ± Î¼Î·Î½ Î³Î¯Î½ÎµÎ¹ ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î® Î´Î¹Î±Î³ÏÎ±ÏÎ® ÏÎ¿Ï Î±ÏÎ¿ÏÎ¬ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "Î³Î¹Î± ÏÎ·Î½ Î±ÏÎ±Î¯ÏÎ·ÏÎ· %s Î³Î¹Î± %s ÏÏÎ±Î½ Î±Î½Î±Î²Î±Î¸Î¼Î¯Î¶ÎµÏÎ±Î¹ ÏÎ¿ %s" @@ -3448,15 +3459,25 @@ msgid "Install missing resolvables" msgstr "ÎÎ³ÎºÎ±ÏÎÏÏÎ·ÏÎµ ÏÎ± ÏÎ±Î¼ÎÎ½Î± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "ÎÎ¬Î½Îµ Î¼Î¹Î± ÏÏÏÏÎ±ÏÎ· ÎÎÎ©Î ÏÏÎ½ ÏÎ¹Î¸Î±Î½Î¿ÏÎ®ÏÏÎ½." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 #, fuzzy msgid "Regarding all resolvables with a compatible architecture." msgstr "ÎÏÎ¿Î½ Î±ÏÎ¿ÏÎ¬ ÏÎ»Î± ÏÎ± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î± Î¼Îµ ÏÏÎ¼Î²Î±ÏÎ® Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "ÎÎ¬Î½Îµ Î¼Î¹Î± ÏÏÏÏÎ±ÏÎ· ÎÎÎ©Î ÏÏÎ½ ÏÎ¹Î¸Î±Î½Î¿ÏÎ®ÏÏÎ½." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "ÎÏÎ¿Î½ Î±ÏÎ¿ÏÎ¬ ÏÎ»Î± ÏÎ± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î± Î¼Îµ ÏÏÎ¼Î²Î±ÏÎ® Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3507,6 +3528,15 @@ msgid "%s part of %s" msgstr "Î¤Î¿ %s ÎµÎ¯Î½Î±Î¹ Î¼ÎÏÎ¿Ï ÏÎ¿Ï %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "ÎÎ¬Î½Îµ Î¼Î¹Î± ÏÏÏÏÎ±ÏÎ· ÎÎÎ©Î ÏÏÎ½ ÏÎ¹Î¸Î±Î½Î¿ÏÎ®ÏÏÎ½." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "ÎÎµÎºÎ»ÎµÎ¯Î´ÏÎ¼Î± ÏÎ»ÏÎ½ ÏÏÎ½ ÎµÏÎ¹Î»ÏÏÎ¹Î¼ÏÎ½" Modified: trunk/libzypp/po/en_GB.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_GB.po?rev=7166&r1=… ============================================================================== --- trunk/libzypp/po/en_GB.po (original) +++ trunk/libzypp/po/en_GB.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-19 16:20+0100\n" "Last-Translator: Benjamin Weber <b.weber(a)warwick.ac.uk>\n" "Language-Team: <en(a)li.org>\n" @@ -115,36 +115,36 @@ msgid "History:" msgstr "History:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm check failed." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm failed." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Package %s fails integrity check. Do you want to retry?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "No url in repository." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Can't provide file %s from repository %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Reading '%s' repository cache" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Reading patch and delta rpms from '%s' repository cache" @@ -168,27 +168,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Cleaning repository '%s' cache" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Valid metadata not found at specified URL(s)" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Building repository '%s' cache" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Reading repository '%s' cache" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "Adding repository '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Removing repository '%s'" @@ -2639,19 +2640,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Changed configuration files for %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm saved %s as %s, but it was impossible to determine the difference" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2661,13 +2662,13 @@ "Here are the first 25 lines of difference:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm created %s as %s, but it was impossible to determine the difference" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2678,46 +2679,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s install failed" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm output:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s installed ok" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Additional rpm output:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s remove failed" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s remove ok" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "created backup %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Installation has been aborted as directed." @@ -2735,64 +2736,74 @@ msgstr "%s replaced by %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s will be deleted by the user.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s will be deleted by another application. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s will be installed by the user.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s will be installed by another application. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "No valid solution found with just resolvables of best architecture." + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "No valid solution found with just resolvables of best architecture." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "With this run only resolvables with the best architecture have been regarded.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Regarding all possible resolvables takes time, but can come to a valid result." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Invalid information" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s is needed by other resolvables" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s is needed by %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2802,7 +2813,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s conflicts with other resolvables" @@ -2811,14 +2822,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s conflicts with %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2828,24 +2839,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s obsoletes other resolvables" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s obsoletes %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s obsoletes:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2854,7 +2865,7 @@ "These resolvables will be deleted from the system." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s depends on other resolvables" @@ -2862,38 +2873,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s depends on %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s depends on:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Child of" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Cannot install %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "None provides %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2901,31 +2912,31 @@ "\n" "There is no resource available which supports this requirement." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Due to the problems described above/below, this resolution will not solve all dependencies" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Cannot install %s, because it is conflicting with %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s is not installed and has been marked as not installable" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Cannot install %s due to dependency problems" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2933,8 +2944,8 @@ msgstr "delete %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2942,79 +2953,79 @@ msgstr "do not install %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s has unfulfilled requirements" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s has missing dependencies" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s cannot be installed due to missing dependencies" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s fulfils dependencies of %s but will be uninstalled" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s fulfils dependencies of %s but will be kept on your system" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "No need to install %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Cannot install %s to fulfil the dependencies of %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Cannot install %s to fulfil the dependencies of %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s will not be uninstalled, because it is still required" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s obsoletes %s. But %s cannot be deleted, because it is locked." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Cannot install %s, because it is conflicting" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s is not installable due to conflicts with %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Requirement %s cannot be fulfilled." @@ -3075,7 +3086,7 @@ msgstr "Do not install or delete the resolvables concerned" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "for requiring %s for %s when upgrading %s" @@ -3433,14 +3444,24 @@ msgid "Install missing resolvables" msgstr "Install missing resolvables" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "Make a solver run with ALL possibilities." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Regarding all resolvables with a compatible architecture." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "Make a solver run with ALL possibilities." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "Regarding all resolvables with compatible architecture." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3491,6 +3512,15 @@ msgid "%s part of %s" msgstr "%s part of %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "Make a solver run with ALL possibilities." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "unlock all resolvables" Modified: trunk/libzypp/po/en_US.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_US.po?rev=7166&r1=… ============================================================================== --- trunk/libzypp/po/en_US.po (original) +++ trunk/libzypp/po/en_US.po Mon Sep 10 16:18:44 2007 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-28 11:53+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-22 14:13+0200\n" "Last-Translator: proofreader <i18n(a)suse.de>\n" "Language-Team: English <i18n(a)suse.de>\n" @@ -110,36 +110,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "Reading log entries from %s." -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -164,27 +164,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2642,19 +2643,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2662,13 +2663,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2677,46 +2678,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2734,64 +2735,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2799,7 +2810,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2808,14 +2819,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2823,31 +2834,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2855,68 +2866,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2924,8 +2935,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2933,79 +2944,79 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Requirement %s cannot be fulfilled." @@ -3066,7 +3077,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3424,14 +3435,22 @@ msgid "Install missing resolvables" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3482,6 +3501,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "" Modified: trunk/libzypp/po/es.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/es.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/es.po (original) +++ trunk/libzypp/po/es.po Mon Sep 10 16:18:44 2007 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-05-31 13:42\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -116,37 +116,37 @@ msgid "History:" msgstr "XF86Historial" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "ComprobaciÃ³n de applydeltarpm incorrecta." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "Error de applydeltarpm." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "El paquete %s no ha superado la comprobaciÃ³n de integridad. Â¿Desea volver a intentar descargarlo?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "No se encuentra el archivo %1 en el repositorio." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "No es posible proporcionar %s de %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -171,27 +171,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "AÃ±adiendo recursos" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "AÃ±adiendo recursos" @@ -2650,19 +2651,19 @@ # modules/Mail.ycp:563 #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Modificados archivos de configuraciÃ³n para %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm guardado %s como %s, pero no es posible determinar la diferencia" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2672,13 +2673,13 @@ "A continuaciÃ³n se presentan las primeras 25 lÃneas de diferencia:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm creado %s como %s, pero no es posible determinar la diferencia" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2691,23 +2692,23 @@ # clients/online_update_start.ycp:188 #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Error al instalar %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Salida de rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "InstalaciÃ³n correcta de %s" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Salida de rpm adicional:" @@ -2716,13 +2717,13 @@ # clients/inst_prepdisk.ycp:507 clients/inst_prepdisk.ycp:526 #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Error al eliminar %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "EliminaciÃ³n de %s correcta" @@ -2730,12 +2731,12 @@ # include/nis_server/io.ycp:582 # include/backup/ui.ycp:1286 #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "creada copia de seguridad %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "La instalaciÃ³n se ha cancelado siguiendo las indicaciones." @@ -2753,7 +2754,7 @@ msgstr "%s es sustituido por %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2761,58 +2762,68 @@ "Estas resoluciones se suprimirÃ¡n del sistema." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s no se desinstalarÃ¡ porque aÃºn es necesario" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "InformaciÃ³n no vÃ¡lida" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "Otras resoluciones necesitan %s" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s es necesario para %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2822,7 +2833,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s entra en conflicto con otras resoluciones" @@ -2831,14 +2842,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s estÃ¡ en conflicto con %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2848,24 +2859,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s deja obsoletas a otras resoluciones" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s deja obsoleto a %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s deja obsoleto a:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2874,7 +2885,7 @@ "Estas resoluciones se suprimirÃ¡n del sistema." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s depende de otras resoluciones" @@ -2882,20 +2893,20 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s depende de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s depende de:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Elemento secundario de" @@ -2904,19 +2915,19 @@ # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "No es posible instalar %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "No se proporciona %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2925,32 +2936,32 @@ "\n" "No hay ningÃºn recurso disponible que cumpla este requisito." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Debido a los problemas descritos a continuaciÃ³n o anteriormente, esta resoluciÃ³n no resolverÃ¡ todas las dependencias" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "No es posible instalar %s porque entra en conflicto con %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s no se ha instalado y se ha marcado como no instalable" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "No es posible instalar %s debido a problemas de dependencias" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2961,8 +2972,8 @@ # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2970,80 +2981,80 @@ msgstr "no instalar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s tiene requisitos sin cumplir" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "Faltan dependencias de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s no se puede instalar debido a dependencias que no estÃ¡n presentes" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s satisface las dependencias de %s, pero se desinstalarÃ¡" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s satisface las dependencias de %s, pero se conservarÃ¡ en el sistema" # clients/online_update_load.ycp:1004 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "No es necesario instalar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "No es posible instalar %s para satisfacer las dependencias de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "No es posible instalar %s para satisfacer las dependencias de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s no se desinstalarÃ¡ porque aÃºn es necesario" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s deja obsoleto a %s. Pero no se puede suprimir %s porque estÃ¡ bloqueado." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "No es posible instalar %s porque tiene un conflicto" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s no se puede instalar debido a conflictos con %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3109,7 +3120,7 @@ msgstr "No instalar ni suprimir las resoluciones relativas" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "para requerir %s para %s al actualizar %s" @@ -3478,14 +3489,22 @@ msgid "Install missing resolvables" msgstr "Instalar resoluciones que faltan" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3536,6 +3555,15 @@ msgid "%s part of %s" msgstr "%s forma parte de %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "Tiempo lÃmite para hacer doble clic " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "desbloquear todas las resoluciones" Modified: trunk/libzypp/po/et.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/et.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/et.po (original) +++ trunk/libzypp/po/et.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: zypp.et\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-05-04 13:39+0300\n" "Last-Translator: Ain Vagula <avagula(a)gmail.com>\n" "Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\n" @@ -114,37 +114,37 @@ msgid "History:" msgstr "XF86History" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "Probleem hoidla andmete parsimisel." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -168,27 +168,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Hoidla '%s' lisamine." @@ -2649,19 +2650,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2669,13 +2670,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2684,46 +2685,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Paketi %s paigaldamine nurjus" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm-i vÃ¤ljund:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "Paketi %s paigaldamine Ãµnnestus" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "TÃ¤iendav rpm-i vÃ¤ljund:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Paketi %s eemaldamine nurjus" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "Paketi %s eemaldamine Ãµnnestus" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2741,64 +2742,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s tuleb paigaldada." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Vigane teave" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2806,7 +2817,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2815,14 +2826,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2830,31 +2841,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2862,68 +2873,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2931,8 +2942,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2940,79 +2951,79 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s tuleb paigaldada." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3073,7 +3084,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3431,14 +3442,22 @@ msgid "Install missing resolvables" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3489,6 +3508,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "" Modified: trunk/libzypp/po/fi.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fi.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/fi.po (original) +++ trunk/libzypp/po/fi.po Mon Sep 10 16:18:44 2007 @@ -13,10 +13,10 @@ msgstr "" "Project-Id-Version: zypp.fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-23 21:18+0300\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-06 16:40+0300\n" "Last-Translator: Jyri Palokangas <jmp(a)opensuse.fi>\n" -"Language-Team: Suomi <fi(a)li.org>\n" +"Language-Team: Suomi <en(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -118,36 +118,36 @@ msgid "History:" msgstr "Historia:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "rpm-muunnospaketin tarkistus epÃ¤onnistui." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "rpm-muunnos epÃ¤onnistui" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Paketin %s yhtenÃ¤isyystarkistus epÃ¤onnistui. Haluatko yrittÃ¤Ã¤ uudelleen?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Ei verkko-osoitetta asennuslÃ¤hteessÃ¤." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Tiedostoa %s ei voitu ladata asennuslÃ¤hteestÃ¤ %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Luetaan '%s' -asennuslÃ¤hteen vÃ¤limuistia" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Luetaan paikkaus- ja muutosrpm -tiedostoja '%s' -asennuslÃ¤hteen vÃ¤limuistista." @@ -171,27 +171,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Puhdistetaan '%s' -asennuslÃ¤hteen vÃ¤limuisti" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Annetuista verkko-osoitteista ei lÃ¶ytynyt kelpaavaa metatietoa" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Rakennetaan '%s' -asennuslÃ¤hteen vÃ¤limuistia" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" -msgstr "Luetaan '%s' -asennuslÃ¤hteen vÃ¤lumuistia" +msgstr "Luetaan '%s' -asennuslÃ¤hteen vÃ¤limuistia" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "LisÃ¤tÃ¤Ã¤n asennuslÃ¤hdettÃ¤ '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Poistetaan asennuslÃ¤hdettÃ¤ '%s'" @@ -2769,19 +2770,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Muunnettiin mÃ¤Ã¤ritystiedostoja paketille %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm tallensi tiedoston %s tiedostona %s, mutta erojen selvittÃ¤minen ei onnistunut" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2791,13 +2792,13 @@ "TÃ¤ssÃ¤ on ensimmÃ¤iset 25 vaihtunutta riviÃ¤:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm loi tiedoston %s tiedostona %s, mutta erojen selvittÃ¤minen ei onnistunut" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2808,46 +2809,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s asennus epÃ¤onnistui" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm-tuloste:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s asennettu" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "rpm-lisÃ¤tuloste:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s poistaminen epÃ¤onnistui" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s poistaminen onnistui" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "luotiin varmuuskopio %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Asennus on keskeytetty ohjeiden mukaan." @@ -2865,64 +2866,74 @@ msgstr "%s korvataan osalla %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s poistetaan kÃ¤yttÃ¤jÃ¤n mukana.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s poistetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s asennetaan kÃ¤yttÃ¤jÃ¤n mukana.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s asennetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "Parhaiten soveltuvasta arkkitehtuurin paketeista ei lÃ¶ytynyt sopivia ratkaisuja pakettiriivuuksien tyydyttÃ¤miseksi." + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Parhaiten soveltuvasta arkkitehtuurin paketeista ei lÃ¶ytynyt sopivia ratkaisuja pakettiriivuuksien tyydyttÃ¤miseksi." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "TÃ¤llÃ¤ ajolla harkitaan ainoastaan parhaiten soveltuvan arkkitehtuuria.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Tarkastelemalla kaikkia mahdollisia vaihtoehtoja voidaan lÃ¶ytÃ¤Ã¤ sopiva ratkaisu, mutta se vie aikaa." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "EpÃ¤kelvot tiedot" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "Muut osat tarvitsevat %s" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%2$s tarvisee osaa %1$s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2932,7 +2943,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s on ristiriidassa muiden osien kanssa" @@ -2941,14 +2952,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s on ristiriidassa osan %s kanssa" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2958,24 +2969,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s vanhentaa muut osat" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s vanhentaa %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s vanhentaa:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2984,7 +2995,7 @@ "NÃ¤mÃ¤ osat poistetaan jÃ¤rjestelmÃ¤stÃ¤." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s on riippuvainen muista osista" @@ -2992,38 +3003,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s on riippuvainen osasta %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s riippuu osasta:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Lapsi" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Ei voida asentaa %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "MikÃ¤Ã¤n ei tarjoa %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -3031,31 +3042,31 @@ "\n" "Ei ole saatavilla osaa, joka tÃ¤yttÃ¤isi tÃ¤mÃ¤n riippuvuuden." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "YllÃ¤ tai alla kuvattujen ongelmien takia tÃ¤mÃ¤ ehdotus ei ratkaise kaikkia riippuvuuksia" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Ei voida asentaa osaa %s, koska se on ristiriidassa osan %s kanssa" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ei asennettu ja se on merkitty poistettavaksi" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Ei voida asentaa %s riippuvuusongelmien vuoksi" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3063,8 +3074,8 @@ msgstr "poista %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3072,79 +3083,79 @@ msgstr "Ã¤lÃ¤ asenna %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "Osalla %s on tÃ¤yttÃ¤mÃ¤ttÃ¶miÃ¤ vaatimuksia" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "osalla %s on puuttuvia riippuvuuksia" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Osaa %s ei voida asentaa puuttuvien riippuvuuksien takia" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "Osa %s tÃ¤yttÃ¤Ã¤ osan %s riippuvuudet, mutta se poistetaan" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "Osa %s tÃ¤yttÃ¤Ã¤ osan %s riippuvuudet ja se sÃ¤ilytetÃ¤Ã¤n jÃ¤rjestelmÃ¤ssÃ¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Ei tarvetta asentaa %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Ei voida asentaa %s tÃ¤yttÃ¤mÃ¤Ã¤n osan %s riippuvuudet" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Ei voida asentaa %s tÃ¤yttÃ¤mÃ¤Ã¤n osan %s riippuvuudet" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s ei poisteta, koska sitÃ¤ tarvitaan edelleen" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "osa %s vanhentaa %s. Mutta %s ei voida poistaa koska se on lukittu." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "osaa %s ei voida asentaa, koska se on ristiriidassa" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s on poistettavissa, koska se on ristiriidassa osan %s kanssa" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Tarvetta %s ei voida tÃ¤yttÃ¤Ã¤." @@ -3205,7 +3216,7 @@ msgstr "ÃlÃ¤ asenna tai poista tÃ¤tÃ¤ koskevia osia" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "tarvitaan %s osaa %s varten, kun pÃ¤ivitetÃ¤Ã¤n %s" @@ -3563,14 +3574,24 @@ msgid "Install missing resolvables" msgstr "Asenna puuttuvat osat" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "EtsitÃ¤Ã¤n KAIKKI mahdolliset vaihtoehdot." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Harkitaan kaikkia osia, jotka ovat yhteensopivaa arkkitehtuuria." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "EtsitÃ¤Ã¤n KAIKKI mahdolliset vaihtoehdot." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "Harkitaan kaikkia osia, jotka ovat yhteensopivaa arkkitehtuuria." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3621,6 +3642,15 @@ msgid "%s part of %s" msgstr "%s kuuluu osaan %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "EtsitÃ¤Ã¤n KAIKKI mahdolliset vaihtoehdot." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "Poista kaikki lukitukset" @@ -5117,4 +5147,3 @@ "Tiedoston %s tarkistussumma on virheellinen.\n" "Odotettiin arvoa %s, saatiin %s\n" "KÃ¤ytetÃ¤Ã¤nkÃ¶ tiedostoa silti?" - Modified: trunk/libzypp/po/fr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fr.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/fr.po (original) +++ trunk/libzypp/po/fr.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-29 17:29+0200\n" "Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n" "Language-Team: French Team <opensuse-fr(a)opensuse.org>\n" @@ -38,8 +38,7 @@ msgid "Path parameter parsing not supported for this URL" msgstr "Analyse du paramÃ¨tre de chemin non prise en charge pour cette URL" -#: ../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 "Analyse de la chaÃ®ne de requÃªte non prise en charge pour cette URL" @@ -86,8 +85,7 @@ msgid "Url scheme requires path name" msgstr "Le schÃ©ma de l'Url requiert un nom de chemin" -#: ../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 "Chemin relatif non autorisÃ© en prÃ©sence d'une autoritÃ©" @@ -116,36 +114,36 @@ msgid "History:" msgstr "Historique:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "La vÃ©rification d'applydeltarpm a Ã©chouÃ©." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm a Ã©chouÃ©." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Ãchec de la vÃ©rification de l'intÃ©gritÃ© du paquetage %s. Souhaitez-vous tenter de le tÃ©lÃ©charger de nouveau ?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Pas d'URL dans le rÃ©fÃ©rentiel." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Impossible de fournir %s Ã partir de %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Lecture de '%s' depuis le cache du dÃ©pÃ´t" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Lecture du correctif et du delta du RPM depuis '%s' le dÃ©pÃ´t" @@ -155,13 +153,11 @@ msgid "Unsupported HTTP authentication method '%s'" msgstr "MÃ©thode d'autentification HTTP '%s' non supportÃ©e" -#: ../zypp/media/MediaCurl.cc:715 -#: ../zypp/media/MediaCurl.cc:784 +#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784 msgid "Invalid user name or password." msgstr "Mot de passe ou nom d'utilisateur invalide." -#: ../zypp/media/MediaCurl.cc:718 -#: ../zypp/media/MediaCurl.cc:787 +#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787 #, c-format msgid "Authentication required for '%s'" msgstr "Authentification requise pour '%s'" @@ -171,27 +167,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Nettoyage du cache du dÃ©pÃ´t '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Metadata valide non trouvÃ©e Ã l'URL spÃ©cifiÃ©e" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Construction du cache du dÃ©pÃ´t '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Lecture du cache du dÃ©pÃ´t '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "Ajout du rÃ©fÃ©rentiel '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Suppression du rÃ©fÃ©rentiel '%s'" @@ -213,8 +210,7 @@ msgid "Invalid empty Url object reference" msgstr "RÃ©fÃ©rence de l'objet d'Url vide non valide" -#: ../zypp/Url.cc:321 -#: ../zypp/Url.cc:335 +#: ../zypp/Url.cc:321 ../zypp/Url.cc:335 msgid "Unable to parse Url components" msgstr "Impossible d'analyser les composants de l'Url" @@ -224,8 +220,7 @@ #. 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 "Pas de code" @@ -290,8 +285,7 @@ msgstr "Akkadien" #. language code: alb sqi sq -#: ../zypp/LanguageCode.cc:262 -#: ../zypp/LanguageCode.cc:264 +#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 msgid "Albanian" msgstr "Albanais" @@ -341,8 +335,7 @@ msgstr "Aragonais" #. 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Ã©nien" @@ -442,8 +435,7 @@ msgstr "Balinais" #. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 -#: ../zypp/LanguageCode.cc:328 +#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 msgid "Basque" msgstr "Basque" @@ -553,8 +545,7 @@ msgstr "Bulgare" #. language code: bur mya my -#: ../zypp/LanguageCode.cc:372 -#: ../zypp/LanguageCode.cc:374 +#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 msgid "Burmese" msgstr "Birman" @@ -619,8 +610,7 @@ msgstr "Djaghatai" #. language code: chi zho zh -#: ../zypp/LanguageCode.cc:400 -#: ../zypp/LanguageCode.cc:402 +#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "Chinois" @@ -730,8 +720,7 @@ msgstr "Couchitiques (autres langues)" #. language code: cze ces cs -#: ../zypp/LanguageCode.cc:446 -#: ../zypp/LanguageCode.cc:448 +#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "TchÃ¨que" @@ -806,8 +795,7 @@ msgstr "NÃ©erlandais moyen (vers 1050-1350)" #. language code: dut nld nl -#: ../zypp/LanguageCode.cc:478 -#: ../zypp/LanguageCode.cc:480 +#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "Hollandais" @@ -912,8 +900,7 @@ msgstr "Fon" #. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 -#: ../zypp/LanguageCode.cc:524 +#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 msgid "French" msgstr "FranÃ§ais" @@ -963,14 +950,12 @@ msgstr "Germaniques (autres langues)" #. language code: geo kat ka -#: ../zypp/LanguageCode.cc:544 -#: ../zypp/LanguageCode.cc:546 +#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546 msgid "Georgian" msgstr "GÃ©orgien" #. language code: ger deu de -#: ../zypp/LanguageCode.cc:548 -#: ../zypp/LanguageCode.cc:550 +#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550 msgid "German" msgstr "Allemand" @@ -1040,8 +1025,7 @@ msgstr "Grec ancien (jusqu'Ã 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 "Grec moderne (aprÃ¨s 1453)" @@ -1146,8 +1130,7 @@ msgstr "Igbo" #. language code: ice isl is -#: ../zypp/LanguageCode.cc:622 -#: ../zypp/LanguageCode.cc:624 +#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 msgid "Icelandic" msgstr "Islandais" @@ -1518,8 +1501,7 @@ msgstr "Lushai" #. language code: mac mkd mk -#: ../zypp/LanguageCode.cc:772 -#: ../zypp/LanguageCode.cc:774 +#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "MacÃ©donien" @@ -1559,8 +1541,7 @@ msgstr "Mandingue" #. language code: mao mri mi -#: ../zypp/LanguageCode.cc:790 -#: ../zypp/LanguageCode.cc:792 +#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "Maori" @@ -1580,8 +1561,7 @@ msgstr "Masai" #. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 -#: ../zypp/LanguageCode.cc:802 +#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 msgid "Malay" msgstr "Malais" @@ -1722,8 +1702,7 @@ #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 -#: ../zypp/CountryCode.cc:380 +#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380 msgid "Nauru" msgstr "Nauruan" @@ -1923,8 +1902,7 @@ msgstr "Perse, ancien (vers 600-400 av. J.-C.)" #. language code: per fas fa -#: ../zypp/LanguageCode.cc:938 -#: ../zypp/LanguageCode.cc:940 +#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 msgid "Persian" msgstr "Persan" @@ -2009,8 +1987,7 @@ msgstr "Tsigane" #. language code: rum ron ro -#: ../zypp/LanguageCode.cc:974 -#: ../zypp/LanguageCode.cc:976 +#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "Roumain" @@ -2070,8 +2047,7 @@ msgstr "Santal" #. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 -#: ../zypp/LanguageCode.cc:1002 +#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 msgid "Serbian" msgstr "Serbe" @@ -2086,8 +2062,7 @@ msgstr "Ãcossais" #. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 -#: ../zypp/LanguageCode.cc:1010 +#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 msgid "Croatian" msgstr "Croate" @@ -2142,8 +2117,7 @@ msgstr "Slaves (autres langues)" #. language code: slo slk sk -#: ../zypp/LanguageCode.cc:1032 -#: ../zypp/LanguageCode.cc:1034 +#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034 msgid "Slovak" msgstr "Slovaque" @@ -2338,8 +2312,7 @@ msgstr "ThaÃ¯" #. language code: tib bod bo -#: ../zypp/LanguageCode.cc:1112 -#: ../zypp/LanguageCode.cc:1114 +#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 msgid "Tibetan" msgstr "TibÃ©tain" @@ -2360,8 +2333,7 @@ #. language code: tkl #. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 -#: ../zypp/CountryCode.cc:428 +#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428 msgid "Tokelau" msgstr "Tokelau" @@ -2437,8 +2409,7 @@ #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 -#: ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435 msgid "Tuvalu" msgstr "Tuvalu" @@ -2538,8 +2509,7 @@ 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 "Gallois" @@ -2623,8 +2593,7 @@ msgid "Zuni" msgstr "Zuni" -#: ../zypp/ZYppFactory.cc:279 -#: ../zypp/ZYppFactory.cc:334 +#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334 msgid "Software management is already running." msgstr "La gestion des logiciels est dÃ©jÃ en cours d'exÃ©cution." @@ -2665,8 +2634,7 @@ msgid "Not a CDROM drive" msgstr "Pas un lecteur de CDROM" -#: ../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 "Exception Hal" @@ -2674,19 +2642,19 @@ # TLABEL sw_single_2002_01_04_0147__11 #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Fichiers de configuration modifiÃ©s pour %s :" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm a enregistrÃ© %s sous le nom de %s mais il a Ã©tÃ© impossible de dÃ©terminer la diffÃ©rence" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2696,13 +2664,13 @@ "Dans les 25 premiÃ¨res lignes, la diffÃ©rence se prÃ©sente comme suit :\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm a crÃ©Ã© %s sous le nom de %s mais il a Ã©tÃ© impossible de dÃ©terminer la diffÃ©rence" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2714,53 +2682,51 @@ # TLABEL online_update_2002_01_04_0147__112 #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Ãchec de l'installation de %s" # TLABEL firewall_2002_03_14_2340__2 -#: ../zypp/target/rpm/RpmDb.cc:1927 -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Sortie rpm :" # TLABEL online_update_2002_01_04_0147__83 #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s installÃ©." # TLABEL firewall_2002_03_14_2340__51 -#: ../zypp/target/rpm/RpmDb.cc:1936 -#: ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Sortie rpm supplÃ©mentaire :" # TLABEL partitioning_2002_01_04_0147__99 #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Ãchec du retrait de %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "RÃ©ussite du retrait de %s" # TLABEL backup_2002_03_14_2340__102 #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "- sauvegarde %s crÃ©Ã©e" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "L'installation a Ã©tÃ© abandonnÃ©e comme indiquÃ©." @@ -2778,67 +2744,77 @@ msgstr "%s remplacÃ© par %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s sera supprimÃ© par l'utilisateur.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s sera supprimÃ© par une autre apllication. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s sera installÃ© par l'utilisateur.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s sera installÃ© par une autre application. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "Aucune solution trouvÃ©e avec les solutions de la meillleur architecture." + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 #, fuzzy msgid "No valid solution found with just resolvables of best architecture." msgstr "Aucune solution trouvÃ©e avec les solutions de la meillleur architecture." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 #, fuzzy msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Par ce processus, seuls les rÃ©solutions avec la meilleur architecture ont Ã©tÃ© considÃ©rÃ©es.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 #, fuzzy msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "ConsidÃ©rer toutes les rÃ©solutions possibles prend du temps mais peut amener Ã un rÃ©sultat valide." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Informations incorrectes" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s est requis par d'autres correctifs" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s est requis par %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2848,7 +2824,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s est en conflit avec d'autres correctifs" @@ -2857,14 +2833,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s en conflit avec %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2874,24 +2850,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s rend d'autres correctifs obsolÃ¨tes" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s rend obsolÃ¨te %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s rend obsolÃ¨te :%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2900,7 +2876,7 @@ "Ces correctifs seront supprimÃ©s du systÃ¨me." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s dÃ©pend d'autres correctifs" @@ -2908,39 +2884,39 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s dÃ©pend de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s dÃ©pend de :%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Enfant de" # TLABEL partitioning_2002_01_04_0147__180 #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Impossible d'installer %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Aucun ne fournit %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2949,34 +2925,34 @@ "\n" "Aucune ressource disponible qui prenne en charge cette exigence." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Ãtant donnÃ© les problÃ¨mes dÃ©crits ci-dessus/dessous, cette solution ne rÃ©soudra pas toutes les dÃ©pendances" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Impossible d'installer %s car il est en conflit avec %s" # TLABEL autoinst_2002_08_07_0216__335 #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s n'est pas installÃ© et est marquÃ© comme non installable" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Impossible d'installer %s Ã cause de problÃ¨mes de dÃ©pendance" # TLABEL packages_2002_01_04_0147__198 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2985,8 +2961,8 @@ # TLABEL partitioning_2002_01_04_0147__180 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2994,80 +2970,80 @@ msgstr "ne pas installer %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s ne respecte pas certaines exigences" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s comporte des dÃ©pendances manquantes" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Impossible d'installer %s Ã cause de dÃ©pendances manquantes" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s satisfait les dÃ©pendances de %s mais sera dÃ©sinstallÃ©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s satisfait les dÃ©pendances de %s mais sera conservÃ© sur votre systÃ¨me" # TLABEL online_update_2002_01_04_0147__92 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Aucune nÃ©cessitÃ© d'installer %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Impossible d'installer %s pour satisfaire les dÃ©pendances de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Impossible d'installer %s pour satisfaire les dÃ©pendances de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s ne sera pas dÃ©sinstallÃ© car il est toujours requis" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s %s obsolÃ¨tes. Mais il est impossible de supprimer %s qui est verrouillÃ©." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Impossible d'installer %s Ã cause d'un conflit" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s ne peut pas Ãªtre installÃ© car il est en conflit avec %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3131,7 +3107,7 @@ msgstr "Ne pas installer ou supprimer les correctifs concernÃ©s" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "pour l'exigence %s destinÃ©e Ã %s lors de la mise Ã niveau de %s" @@ -3497,15 +3473,25 @@ msgid "Install missing resolvables" msgstr "Installer les correctifs manquants" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "CrÃ©er un solutionneur qui couvre toutes les possibilitÃ©s." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 #, fuzzy msgid "Regarding all resolvables with a compatible architecture." msgstr "Regarder toutes les solutions compatible avec cette architecture." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "CrÃ©er un solutionneur qui couvre toutes les possibilitÃ©s." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "Regarder toutes les solutions compatible avec cette architecture." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3556,6 +3542,16 @@ msgid "%s part of %s" msgstr "%s - partie de %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "Timeout du double-clic " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "CrÃ©er un solutionneur qui couvre toutes les possibilitÃ©s." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "dÃ©verrouiller tous les correctifs" @@ -3785,8 +3781,7 @@ #. :CCK:166: #. :CAF:140: -#: ../zypp/CountryCode.cc:255 -#: ../zypp/CountryCode.cc:257 +#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257 msgid "Congo" msgstr "Congo" @@ -4853,65 +4848,89 @@ #~ msgid "%s is freshened by %s" #~ msgstr "%s est rafraichis par %s" + #~ msgid "Unable to parse Url authority" #~ msgstr "Impossible d'analyser l'autoritÃ© de l'Url" + #~ msgid "Ignore this requirement generally" #~ msgstr "Ignorer cette exigence en rÃ¨gle gÃ©nÃ©rale" + #~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked." #~ msgstr "%s est requis par un autre correctif Ã installer, donc sa liaison ne sera pas supprimÃ©e." + #~ msgid "Cannot create a file needed to perform update installation." #~ msgstr "Impossible de crÃ©er un fichier nÃ©cessaire pour installer la mise Ã jour." + #~ msgid "Unable to restore all sources." #~ msgstr "Impossible de restaurer toutes les sources." + #~ msgid "At least one source already registered, stored sources cannot be restored." #~ msgstr "Au moins une source est dÃ©jÃ enregistrÃ©e ; les sources stockÃ©es ne peuvent pas Ãªtre restaurÃ©es." + #~ msgid "Cannot be install %s to fulfil the dependencies of %s" #~ msgstr "Impossible d'installer %s pour satisfaire les dÃ©pendances de %s" + #~ msgid "%s dependend on %s" #~ msgstr "%s dÃ©pendant de %s" + #~ msgid "Reading index files" #~ msgstr "Lecture des fichiers d'index" + #~ msgid "The signed repomd.xml file failed the signature check." #~ msgstr "Le fichier repomd.xml signÃ© a Ã©chouÃ© au contrÃ´le de signature." # TLABEL restore_2002_08_07_0216__60 #~ msgid "Reading product from %s" #~ msgstr "Lecture du produit depuis %s" + # TLABEL restore_2002_08_07_0216__60 #~ msgid "Reading filelist from %s" #~ msgstr "Lecture de la liste de fichiers depuis %s" + # TLABEL restore_2002_08_07_0216__60 #~ msgid "Reading packages from %s" #~ msgstr "Lecture des paquetages depuis %s" + # TLABEL restore_2002_08_07_0216__60 #~ msgid "Reading selection from %s" #~ msgstr "Lecture de la sÃ©lection depuis %s" + # TLABEL restore_2002_08_07_0216__60 #~ msgid "Reading pattern from %s" #~ msgstr "Lecture du modÃ¨le depuis %s" + #~ msgid "Reading patches index %s" #~ msgstr "Lecture de l'index des correctifs %s" + # TLABEL autoinst_2002_08_07_0216__71 #~ msgid "Reading patch %s" #~ msgstr "Lecture du correctif %s" + #~ msgid "The script file failed the checksum test." #~ msgstr "Ãchec du fichier de script lors du test relatif Ã la somme de contrÃ´le." + #~ msgid "Reading packages file" #~ msgstr "Lecture du fichier des paquetages" + # progress indicator label #~ msgid "Reading translation: %s" #~ msgstr "Lecture de la traduction : %s" + #, fuzzy #~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?" #~ msgstr "Ãchec de la vÃ©rification de l'intÃ©gritÃ© du paquetage %s. Souhaitez-vous tenter de le tÃ©lÃ©charger de nouveau, ou voulez-vous annuler l'installation ?" + #~ msgid " miss checksum." #~ msgstr " a manquÃ© la somme de contrÃ´le." + #~ msgid " fails checksum verification." #~ msgstr " a Ã©chouÃ© lors de la vÃ©rification des sommes de contrÃ´le." + #~ msgid "Downloading %s" #~ msgstr "TÃ©lÃ©chargement de %s" + #~ msgid "Downloaded %s from %s" #~ msgstr "TÃ©lÃ©chargement de %s Ã partir de %s" + #~ msgid "%s needed by %s" #~ msgstr "%s requis par %s" - Modified: trunk/libzypp/po/gl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gl.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/gl.po (original) +++ trunk/libzypp/po/gl.po Mon Sep 10 16:18:44 2007 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2002-07-23 11:51+0200\n" "Last-Translator: JesÃºs Bravo Ãlvarez <jba(a)pobox.com>\n" "Language-Team: Galician <i18n(a)suse.de>\n" @@ -115,36 +115,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -168,27 +168,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -3016,19 +3017,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "Vaise gardar agora a configuraciÃ³n do son." #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -3036,13 +3037,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -3051,46 +3052,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3108,64 +3109,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3173,7 +3184,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -3182,14 +3193,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3197,31 +3208,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3229,68 +3240,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instalando en:" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3298,8 +3309,8 @@ msgstr "Eliminar" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3307,79 +3318,79 @@ msgstr "Instalando en:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3441,7 +3452,7 @@ msgstr "Instalando o controlador..." #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3802,14 +3813,22 @@ msgid "Install missing resolvables" msgstr "Instalando o controlador..." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3860,6 +3879,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/gu.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gu.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/gu.po (original) +++ trunk/libzypp/po/gu.po Mon Sep 10 16:18:44 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: nis\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-11-11 18:41+0530\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n" @@ -107,37 +107,37 @@ msgid "History:" msgstr "XF86History " -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm àªàªàª¾àª¸àª£à« àªàª°àªµàª¾àª®àª¾àª àª¨àª¿àª·à«àª«àª³." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm àª¨àª¿àª·à«àª«àª³." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "%s àªªà«àªà«àª àªªà«àª°à«àª£àª¤àª¾ àªàªàª¾àª¸àª£à«àª®àª¾àª àª¨àª¿àª·à«àª«àª³ àªàª àªà«. àª¤àª®à« àª¤à« àª«àª°à«àª¥à« àª¡àª¾àªàª¨àª²à«àª¡ àªàª°àªµàª¾àª¨à« àªªà«àª°àª¯àª¤à«àª¨ àªàª°àªµàª¾ àª®àª¾àªàªà« àªà«?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "àª°àª¿àªªà«àª¸à«àªàª°à«àª®àª¾àª àª«àª¾àªàª² %1 àª®àª³à« àª¨àª¹à«àª." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "%s àª®àª¾àªàª¥à« %s àªªà«àª°à«àª àªªàª¾àª¡à« àª¶àªàª¾àª¤à«àª àª¨àª¥à«" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -161,27 +161,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "àª¸àª¾àª§àª¨à« àªàª®à«àª°àª¾àª¯ àªà«" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "àª¸àª¾àª§àª¨à« àªàª®à«àª°àª¾àª¯ àªà«" @@ -2632,19 +2633,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s àª®àª¾àªà« àªàª¨à«àª«àª¿àªà«àª¯à«àª°à«àª¶àª¨ àª«àª¾àªàª²à« àª¬àª¦àª²àª¾àª:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "%s àª¤àª°à«àªà« rpm àª %s àª¸àª¾àªàªµà«àª¯à«àª àªªàª°àªàª¤à« àª¤àª«àª¾àªµàª¤ àªà«àª¦à« àªªàª¾àª¡àªµàª¾ àª¤à« àªàª¶àªà«àª¯ àª¹àª¤à«àª" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2654,13 +2655,13 @@ "àªàª¹à«àª àª¤àª«àª¾àªµàª¤à«àª¨àª¾ àªªà«àª°àª¥àª® 25 àª²àª¾àªàª¨à« àªà«: \n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "%s àª¤àª°à«àªà« rpm àª %s àª°àªà«àª¯à«àª àªªàª°àªàª¤à« àª¤àª«àª¾àªµàª¤ àªà«àª¦à« àªªàª¾àª¡àªµàª¾ àª¤à«àªàª¶àªà«àª¯ àª¹àª¤à«àª" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2671,46 +2672,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s àª¨à«àª àª¸à«àª¥àª¾àªªàª¨ àª¨àª¿àª·à«àª«àª³" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm àªàªàªàªªà«àª:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s àª¨à«àª àª¸à«àª¥àª¾àªªàª¨ àª¬àª°àª¾àª¬àª°" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "àªµàª§àª¾àª°àª¾àª¨à«àª rpm àªàªàªàªªà«àª:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s àª¨à« àª¦à«àª° àªàª°àªµàª¾àª®àª¾àª àª¨àª¿àª·à«àª«àª³" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s àª¨à« àª¦à«àª° àªàª°àªµàª¾àª®àª¾àª àª¬àª°àª¾àª¬àª°" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "%s àª¨à«àª àª¬à«àªàªàªª àª°àªàª¾àª¯à«àª" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "àª¸à«àªàª¨àª¾ àªªà«àª°àª®àª¾àª£à« àª¸à«àª¥àª¾àªªàª¨ àªàªàªàª¾àªµà«àª²à«àª àª¹àª¤à«àª." @@ -2728,7 +2729,7 @@ msgstr "%s àª¦à«àªµàª¾àª°àª¾ %s àª¨à« àªàªà«àª¯àª¾àª àª®à«àªàª¾àª¯à«àª" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2736,58 +2737,68 @@ "àª àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àª¸àª¿àª¸à«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« àª¨àª¾àªàªµàª¾àª®àª¾àª àªàªµàª¶à«." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s àªàª¸à«àª¥àª¾àªªàª¿àª¤ àª¥àª¶à« àª¨àª¹à«àª àªàª¾àª°àª£àªà« àª¤à« àª¹àªà« àªàª°à«àª°à« àªà«" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "àªàª®àª¾àª¨à«àª¯ àª®àª¾àª¹àª¿àª¤à«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "àªàª¨à«àª¯ àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àª¦à«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« àª¹àª¤à«àª" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s àª¦à«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« àª¹àª¤à«àª" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2797,7 +2808,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s, àªàª¨à«àª¯ àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àª¸àª¾àª¥à« àªµàª¿àª¸àªàªàª¤ àªà«" @@ -2806,14 +2817,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s, %s àª¸àª¾àª¥à« àªµàª¿àª¸àªàªàª¤ àªà«" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2823,24 +2834,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s àªàª¨à«àª¯ àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àªàª²àª àªªàª¾àª¡à« àªà«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s àªàª²àª àªªàª¾àª¡àªµà«àª %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s àªàª²àª àªªàª¾àª¡àªµà«àª : %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2849,7 +2860,7 @@ "àª àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àª¸àª¿àª¸à«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« àª¨àª¾àªàªµàª¾àª®àª¾àª àªàªµàª¶à«." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s àªàª¨à«àª¯ àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àªªàª° àªàª§àª¾àª° àª°àª¾àªà« àªà«" @@ -2857,38 +2868,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s, %s àªªàª° àªàª§àª¾àª° àª°àª¾àªà« àªà«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s àªªàª° àªàª§àª¾àª° àª°àª¾àªà« àªà« : %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "àª¨à«àª àªàª¾àªàª²à«àª¡" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s àª¸à«àª¥àª¾àªªàª¿ àª¶àªàª¾àª¶à« àª¨àª¹à«àª" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "%s àªà«àª àªàªªàª¤à«àª àª¨àª¥à«" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2897,32 +2908,32 @@ "\n" "àªà«àª àª¸à«àª¤à«àª°à«àª¤ àªªà«àª°àª¾àªªà«àª¯ àª¨àª¥à« àªà« àª àªàª°à«àª°àª¿àª¯àª¾àª¤àª¨à« àª¸àª¹àª¾àª¯ àªàª°à«." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "àª àª°àª¿àªà«àª²à«àª¯à«àª¶àª¨àª¨à« àªàªªàª°/àª¨à«àªà« àª¦àª°à«àª¶àª¾àªµà«àª² àª¬àª¾àªà« àª¨àª¿àªàª³àª¤à« àª®à«àª¶à«àªà«àª²à«àª àª¬àª§à« àªªàª°àª¾àª§àª¿àª¨àª¤àª¾àªàª¨à« àªàªà«àª²àª²àª¾àªµà« àª¶àªàª¶à« àª¨àª¹à«àª" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s àª¸à«àª¥àª¾àªªàª¿ àª¶àªàª¾àª¶à« àª¨àª¹à«àª àªàª¾àª°àª£àªà« àª¤à« %s àª¸àª¾àª¥à« àªµàª¿àª¸àªàªàª¤ àªà«" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s àª¸à«àª¥àªªàª¾àª¯à«àª àª¨àª¥à« àªàª¨à« àªàª¸à«àª¥àª¾àªªàª¨ àª¤àª°à«àªà« àªàª¿àª¹àª¿àª¤ àªàª°à«àª¯à«àª àª¹àª¤à«àª" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "àªªàª°àª¾àª§àª¿àª¨àª¤àª¾ àª®à«àª¶à«àªà«àª²à«àªàª¨à« àªàª¾àª°àª£à« %s àª¸à«àª¥àª¾àªªàª¿ àª¶àªàª¾àª¯à«àª àª¨àª¥à«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2930,8 +2941,8 @@ msgstr "%s àªàª¾àª¢à« àª¨àª¾àªà«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2939,79 +2950,79 @@ msgstr "%s àª¸à«àª¥àª¾àªªàª¶à« àª¨àª¹à«àª" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s àªªàª¾àª¸à« àªàªªà«àª°à«àª£ àªàª°à«àª°àª¿àª¯àª¾àª¤à« àªà«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s àªªàª¾àª¸à« àªà«àªà« àªàª¯à«àª²à« àªªàª°àª¾àª§àª¿àª¨àª¤àª¾ àªà«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "àªà«àªà« àªàª¯à«àª²à« àªªàª°àª¾àª§àª¿àª¨àª¤àª¾àª¨à« àªàª¾àª°àª£à« %s àª¸à«àª¥àª¾àªªàª¿ àª¶àªàª¾àª¯à«àª àª¨àª¥à«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s, %s àª¨à« àªªàª°àª¾àª§àª¿àª¨àª¤àª¾ àªªà«àª°à«àª£ àªàª°à« àªà« àªªàª°àªàª¤à« àª¤à« àªàª¸à«àª¥àª¾àªªàª¿àª¤ àªàª°àª¾àª¶à«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s, %s àª¨à« àªªàª°àª¾àª§àª¿àª¨àª¤àª¾ àªªà«àª°à«àª£ àªàª°à« àªà« àªªàª°àªàª¤à« àª¤à« àª¤àª®àª¾àª°àª¾ àª¸àª¿àª¸à«àªàª® àªªàª° àª°àª¾àªàª¶à«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s àª¸à«àª¥àª¾àªªàªµàª¾àª¨à« àªàª°à«àª° àª¨àª¥à«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s àª¨à« àªªàª°àª¾àª§àª¿àª¨àª¤àª¾ àªªà«àª°à«àª£ àªàª°àªµàª¾ %s àª¸à«àª¥àª¾àªªà« àª¶àªàª¶à« àª¨àª¹à«àª" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s àª¨à« àªªàª°àª¾àª§àª¿àª¨àª¤àª¾ àªªà«àª°à«àª£ àªàª°àªµàª¾ %s àª¸à«àª¥àª¾àªªà« àª¶àªàª¶à« àª¨àª¹à«àª" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s àªàª¸à«àª¥àª¾àªªàª¿àª¤ àª¥àª¶à« àª¨àª¹à«àª àªàª¾àª°àª£àªà« àª¤à« àª¹àªà« àªàª°à«àª°à« àªà«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s àªàª²àª àªªàª¾àª¡àªµà«àª %s. àªªàª°àªàª¤à« %s àªàª¾àª¢à« àª¶àªàª¾àª¶à« àª¨àª¹à«àª àªàª¾àª°àª£àªà« àª¤à« àª²à«àª àªàª°à«àª²à«àª àªà«." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%s àª¸à«àª¥àª¾àªªàª¿àª¤ àªàª°à« àª¶àªàª¾àª¶à« àª¨àª¹à«àª àªàª¾àª°àª£àªà« àª¤à« àªµàª¿àª¸àªàªàª¤ àªà«" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s àª¸àª¾àª¥à« àªµàª¿àª¸àªàªàª¤ àª¹à«àªµàª¾àª¥à« %s àªàª¸à«àª¥àª¾àªªàª¿àª¤ àªà«" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3074,7 +3085,7 @@ msgstr "àª¸àªàª¬àªàª§àª¿àª¤ àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àª¸à«àª¥àª¾àªªà« àªà« àªàª¾àª¢à« àª¨àª¹à«àª" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "àªà«àª¯àª¾àª°à« %s àªàª¦à«àª¯àª¤àª¨ àªàª°àª¤àª¾ àª¹à«àªµ àª¤à«àª¯àª¾àª°à« %s àª®àª¾àªà« %s àªàª°à«àª°à« àªà«" @@ -3432,14 +3443,22 @@ msgid "Install missing resolvables" msgstr "àªà«àªà« àªàª¯à«àª²àª¾ àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àª¸à«àª¥àª¾àªªà«" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3490,6 +3509,15 @@ msgid "%s part of %s" msgstr "%s, %s àª¨à« àªàª¾àª àªà«" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr " àª¡àª¬àª²-àªà«àª²àª¿àª àªàª¾àªàª®àªàªàª " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "àª¬àª§àª¾ àª°àª¿àªà«àª²à«àªµà«àª¬àª²à«àª¸ àªàª¨àª²à«àª àªàª°à«" Modified: trunk/libzypp/po/he.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/he.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/he.po (original) +++ trunk/libzypp/po/he.po Mon Sep 10 16:18:44 2007 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2004-08-09 10:24+0200\n" "Last-Translator: xxx <yyy(a)example.org>\n" "Language-Team: Hebrew <i18n(a)suse.de>\n" @@ -110,36 +110,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -163,27 +163,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2953,19 +2954,19 @@ # Commandline help title #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "×§××¨× ×§×××¥ ××××¨××ª" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2973,13 +2974,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2988,47 +2989,47 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "××ª×§× × × ××©××" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "××××¢ × ××¡×£" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm × ××©×." #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, fuzzy, c-format msgid "created backup %s" msgstr "×× ×ª××¦××¨ ×××××××" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3046,64 +3047,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3111,7 +3122,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -3120,14 +3131,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3135,31 +3146,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3167,70 +3178,70 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" # Frame title for installation target hard disk / partition(s) #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "××ª×§×× ×¢×:" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" # main dialog: Button Delete partition #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3239,8 +3250,8 @@ # Frame title for installation target hard disk / partition(s) #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3248,79 +3259,79 @@ msgstr "××ª×§×× ×¢×:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "&××× ××¢×¨××ª ×§××××ª" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3382,7 +3393,7 @@ msgstr "××ª×§×× ××¨×××¨..." #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3747,14 +3758,22 @@ msgid "Install missing resolvables" msgstr "××ª×§×× ××¨×××¨..." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3805,6 +3824,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/hi.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hi.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/hi.po (original) +++ trunk/libzypp/po/hi.po Mon Sep 10 16:18:44 2007 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: zypp.hi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-24 22:33+0530\n" "Last-Translator: Sangeeta Kumari <k.sangeeta09(a)gmail.com>\n" "Language-Team: Hindi <en(a)li.org>\n" @@ -109,37 +109,37 @@ msgid "History:" msgstr "à¤à¤¤à¤¿à¤¹à¤¾à¤¸:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm à¤à¤¾à¤à¤ à¤¨à¤¾à¤à¤¾à¤® à¤°à¤¹à¥à¥¤" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm à¤¨à¤¾à¤à¤¾à¤® à¤°à¤¹à¤¾à¥¤" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "à¤ªà¥à¤à¥à¤ %s à¤¨à¥ à¤à¤à¥à¤à¤°à¤£ à¤à¤¾à¤à¤ à¤à¥ à¤¨à¤¾à¤à¤¾à¤® à¤à¤¿à¤¯à¤¾à¥¤ à¤à¥à¤¯à¤¾ à¤à¤ª à¤à¤¸à¤à¥ à¤¡à¤¾à¤à¤¨à¤²à¥à¤¡à¤¿à¤à¤ à¤à¤¾ à¤ªà¥à¤°à¤¯à¤¾à¤¸ à¤«à¤¿à¤° à¤¸à¥ à¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ à¤¹à¥à¤?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "à¤à¥à¤· à¤®à¥à¤ à¤«à¤¾à¤à¤² %1 à¤¨à¤¹à¥à¤ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤¹à¥à¤à¥¤" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "%s à¤¸à¥ %s à¤ªà¥à¤°à¤¦à¤¾à¤¨ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -164,27 +164,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "à¤¸à¤à¤¸à¤¾à¤§à¤¨ à¤à¥à¤¡à¤¼ à¤°à¤¹à¤¾" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "à¤¸à¤à¤¸à¤¾à¤§à¤¨ à¤à¥à¤¡à¤¼ à¤°à¤¹à¤¾" @@ -2635,19 +2636,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s: à¤à¥ à¤²à¤¿à¤ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¿à¤¤ à¤à¤à¤«à¤¿à¤à¤°à¥à¤¶à¤¨ à¤«à¤¾à¤à¤²à¥à¤" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm à¤¨à¥ %s à¤à¥ à¤°à¥à¤ª à¤®à¥à¤ %s à¤¸à¤¹à¥à¤à¤¾ à¤²à¥à¤à¤¿à¤¨ à¤à¤à¤¤à¤° à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤à¤¸à¤à¤à¤µ à¤¥à¤¾ " #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2657,13 +2658,13 @@ "à¤¯à¤¹à¤¾à¤ à¤à¤à¤¤à¤° à¤à¥ à¤ªà¤¹à¤²à¥ 25 à¤ªà¤à¤à¥à¤¤à¤¿à¤¯à¤¾à¤ à¤¹à¥à¤ :\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm à¤¨à¥ %s à¤à¥ à¤°à¥à¤ª à¤®à¥à¤ %s à¤¸à¥à¤à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤²à¥à¤à¤¿à¤¨ à¤à¤à¤¤à¤° à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤à¤¸à¤à¤à¤µ à¤¥à¤¾" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2674,46 +2675,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤à¤¸à¤«à¤² " -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm à¤à¤à¤à¤ªà¥à¤ :" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤ à¥à¤" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "à¤à¤¤à¤¿à¤°à¤¿à¤à¥à¤¤ rpm à¤à¤à¤à¤ªà¥à¤ :" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s à¤¸à¥à¤¥à¤¾à¤¨à¤¾à¤à¤¤à¤°à¤£ à¤à¤¸à¤«à¤² à¤°à¤¹à¤¾" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s à¤¸à¥à¤¥à¤¾à¤¨à¤¾à¤à¤¤à¤°à¤£ à¤ à¥à¤" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "à¤¬à¥à¤à¤à¤ª %s à¤¸à¥à¤à¤¿à¤¤" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "à¤à¥à¤¸à¤¾ à¤¨à¤¿à¤°à¥à¤¦à¥à¤¶à¤¿à¤¤ à¤¥à¤¾, à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤à¥à¤¡à¤¼ à¤¦à¤¿à¤¯à¤¾ à¤à¤¯à¤¾à¥¤" @@ -2731,7 +2732,7 @@ msgstr "%s à¤¸à¥ %s à¤à¥ à¤ªà¥à¤°à¤¤à¤¿à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2739,58 +2740,68 @@ "à¤¯à¥ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤¸à¤¿à¤¸à¥à¤à¤® à¤¸à¥ à¤®à¤¿à¤à¤¾ à¤¦à¤¿à¤ à¤à¤¾à¤à¤à¤à¥à¥¤" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s à¤à¥ à¤à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¤¬ à¤à¥ à¤¹à¥" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "à¤à¤®à¤¾à¤¨à¥à¤¯ à¤¸à¥à¤à¤¨à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "à¤à¤¨à¥à¤¯ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤¹à¥" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2798,7 +2809,7 @@ msgstr "%s à¤à¥ à¤à¤¨à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤¹à¥ :%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s à¤à¤¾ à¤à¤¨à¥à¤¯ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤¸à¥ à¤à¤à¤°à¤¾à¤µ à¤¹à¥" @@ -2807,14 +2818,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s à¤à¤¾ %s à¤¸à¥ à¤à¤à¤°à¤¾à¤µ à¤¹à¥ " -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2824,24 +2835,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s à¤à¤¨à¥à¤¯ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° à¤¦à¥à¤¤à¤¾ à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s à¤à¥ %s à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° à¤¦à¥à¤¤à¤¾ à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° à¤¦à¥à¤¤à¤¾ à¤¹à¥ : %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2850,7 +2861,7 @@ "à¤¯à¥ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤¸à¤¿à¤¸à¥à¤à¤® à¤¸à¥ à¤®à¤¿à¤à¤¾ à¤¦à¤¿à¤ à¤à¤¾à¤à¤à¤à¥à¥¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s à¤à¤¨à¥à¤¯ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤ªà¤° à¤¨à¤¿à¤°à¥à¤à¤° à¤à¤°à¤¤à¤¾ à¤¹à¥" @@ -2858,38 +2869,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s à¤ªà¤° %s à¤¨à¤¿à¤°à¥à¤à¤° à¤à¤°à¤¤à¤¾ à¤¹à¥ " #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s à¤à¤¨ à¤ªà¤° à¤¨à¤¿à¤°à¥à¤à¤° à¤à¤°à¤¤à¤¾ à¤¹à¥ :%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "à¤à¥ à¤¸à¤à¤¤à¤¤à¤¿" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s à¤à¤¾ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "à¤à¥à¤ à¤¨à¤¹à¥à¤ %s à¤ªà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2898,32 +2909,32 @@ "\n" "à¤à¥à¤ à¤¸à¥à¤°à¥à¤¤ à¤à¤ªà¤²à¤¬à¥à¤§ à¤¨à¤¹à¥à¤ à¤¹à¥ à¤à¥ à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ à¤¸à¤®à¤°à¥à¤¥à¤¨ à¤¦à¥à¥¤" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "à¤à¤¸ à¤°à¤¿à¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨ à¤à¥ à¤à¤ªà¤°/à¤¨à¥à¤à¥ à¤µà¤°à¥à¤£à¤¿à¤¤ à¤¶à¥à¤· à¤¸à¤®à¤¸à¥à¤¯à¤¾à¤à¤ à¤¸à¤à¥ à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¤¾à¤¸à¤®à¤¾à¤§à¤¾à¤¨ à¤¨à¤¹à¥à¤ à¤à¤°à¥à¤à¤à¥" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s à¤à¤¾ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¤¾ %s à¤à¥ à¤¸à¤¾à¤¥ à¤à¤à¤°à¤¾à¤µ à¤¹à¥" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾ à¤¹à¥ à¤à¤° à¤à¤¨à¤à¤à¤¸à¥à¤à¤¾à¤² à¤¯à¥à¤à¥à¤¯ à¤à¥ à¤°à¥à¤ª à¤®à¥à¤ à¤à¤¿à¤¹à¥à¤¨à¤¿à¤¤ à¤à¤° à¤¦à¤¿à¤¯à¤¾ à¤à¤¯à¤¾ à¤¹à¥" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾ à¤¸à¤®à¤¸à¥à¤¯à¤¾à¤à¤ à¤à¥ à¤à¤¾à¤°à¤£ %s à¤à¤¾ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2931,8 +2942,8 @@ msgstr "%s à¤®à¤¿à¤à¤¾à¤à¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2940,79 +2951,79 @@ msgstr "%s à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨ à¤à¤°à¥à¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s à¤à¥ à¤ªà¤¾à¤¸ à¤à¤¸à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾à¤à¤ à¤¹à¥à¤ à¤à¥ à¤¸à¤à¤¤à¥à¤·à¥à¤ à¤¨à¤¹à¥à¤ à¤¹à¥à¤ à¤¹à¥à¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s à¤à¥ à¤à¥à¤à¥ à¤¹à¥à¤ à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾à¤à¤ à¤¹à¥à¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s à¤à¥ à¤à¥à¤à¥ à¤¹à¥à¤ à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ à¤à¤¾à¤°à¤£ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ à¤¸à¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s à¤à¥ à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾à¤à¤ %s à¤ªà¥à¤°à¥ à¤à¤°à¤¤à¤¾ à¤¹à¥ à¤²à¥à¤à¤¿à¤¨ à¤à¤¸à¥ à¤à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤° à¤¦à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s à¤à¥ à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾à¤à¤ %s à¤ªà¥à¤°à¥ à¤à¤°à¤¤à¤¾ à¤¹à¥ à¤²à¥à¤à¤¿à¤¨ à¤à¤¸à¥ à¤à¤ªà¤à¥ à¤¸à¤¿à¤¸à¥à¤à¤® à¤ªà¤° à¤°à¤à¤¾ à¤à¤¾à¤à¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s à¤à¥ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤¨à¤¹à¥à¤ à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s à¤à¥ à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ à¤ªà¥à¤°à¤¾ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤ %s à¤à¥ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s à¤à¥ à¤¨à¤¿à¤°à¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ à¤ªà¥à¤°à¤¾ à¤à¤°à¤¨à¥ à¤à¥ à¤²à¤¿à¤ %s à¤à¥ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s à¤à¥ à¤à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¤¬ à¤à¥ à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s à¤ªà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° à¤¦à¥à¤¤à¤¾ à¤¹à¥ %s à¤à¥à¥¤ à¤²à¥à¤à¤¿à¤¨ %s à¤à¥ à¤®à¤¿à¤à¤¾à¤¯à¤¾ à¤¨à¤¹à¥à¤ à¤à¤¾ à¤¸à¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤¯à¤¹ à¤²à¥à¤ à¤¹à¥à¥¤" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%s à¤à¥ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¹à¥à¤ à¤à¤° à¤¸à¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤¯à¤¹ à¤à¤à¤°à¤¾à¤µ à¤ªà¥à¤¦à¤¾ à¤à¤°à¤¤à¤¾ à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s à¤à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¥à¤¯ à¤¹à¥ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¤¾ %s à¤à¥ à¤¸à¤¾à¤¥ à¤à¤à¤°à¤¾à¤µ à¤¹à¥" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3075,7 +3086,7 @@ msgstr "à¤¸à¤à¤¬à¤à¤§à¤¿à¤¤ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¯à¤¾ à¤®à¤¿à¤à¤¾à¤à¤ à¤¨à¤¹à¥à¤" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "%s à¤à¥ à¤à¤ªà¤à¥à¤°à¥à¤¡ à¤à¤°à¤¤à¥ à¤¸à¤®à¤¯ %s à¤¹à¥à¤¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ à¤²à¤¿à¤" @@ -3433,14 +3444,22 @@ msgid "Install missing resolvables" msgstr "à¤à¥à¤à¥ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ à¤¸à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3491,6 +3510,14 @@ msgid "%s part of %s" msgstr "%s à¤à¤¾ %s à¤à¤¾à¤" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "à¤¸à¤®à¤¸à¥à¤¤ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ à¤à¤¨à¤²à¥à¤ à¤à¤°à¥à¤" @@ -4784,4 +4811,3 @@ "à¤«à¤¾à¤à¤² %s à¤®à¥à¤ à¤à¤ à¤à¤®à¤¾à¤¨à¥à¤¯ à¤à¥à¤à¤¸à¤® à¤¹à¥à¥¤\n" "%s à¤à¥ à¤à¤®à¥à¤®à¥à¤¦ à¤¥à¥, %s à¤®à¤¿à¤²à¤¾\n" "à¤«à¤¿à¤° à¤à¥ à¤«à¤¾à¤à¤² à¤à¤¾ à¤ªà¥à¤°à¤¯à¥à¤ à¤à¤°à¥à¤?" - Modified: trunk/libzypp/po/hr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hr.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/hr.po (original) +++ trunk/libzypp/po/hr.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2001-07-17 16:22+0200\n" "Last-Translator: Vlatko Kosturjak <kost(a)iname.com>\n" "Language-Team: Croatian <i18n(a)suse.de>\n" @@ -112,36 +112,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -166,27 +166,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2968,19 +2969,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "Pohraniti postavke u datoteke" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2988,13 +2989,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -3003,46 +3004,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "Instaliraj &inetd" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "Äe biti instaliran kao:" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, fuzzy, c-format msgid "created backup %s" msgstr "Stvori Arhiv Pohrane Podataka" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3060,64 +3061,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3125,7 +3136,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -3134,14 +3145,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3149,31 +3160,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3181,68 +3192,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instaliram na:" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Ovi paketi trebaju biti instalirani:" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3250,8 +3261,8 @@ msgstr "&ObriÅ¡i" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3259,79 +3270,79 @@ msgstr "Instaliram na:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "Äe biti instaliran kao:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3393,7 +3404,7 @@ msgstr "Postaviti konfiguracijske vrijednosti." #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3756,14 +3767,22 @@ msgid "Install missing resolvables" msgstr "Instaliram upravljaÄki program..." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3814,6 +3833,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/hu.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hu.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/hu.po (original) +++ trunk/libzypp/po/hu.po Mon Sep 10 16:18:44 2007 @@ -15,15 +15,15 @@ msgstr "" "Project-Id-Version: zypp.hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-25 16:50+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-07 09:01+0200\n" "Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n" "Language-Team: <hu(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: Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../zypp/url/UrlBase.cc:154 #, c-format @@ -120,36 +120,36 @@ msgid "History:" msgstr "ElÅzmÃ©nyek:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "az applydeltarpm ellenÅrzÃ©s sikertelen." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "az applydeltarpm futtatÃ¡sa sikertelen." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "A(z) %s csomag integritÃ¡svizsgÃ¡lata sikertelen. MegprÃ³bÃ¡lja Ãºjra?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "A telepÃtÃ©s forrÃ¡s nem tartalmaz url-t." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "A(z) %s programkÃ¶nyvtÃ¡rat nem biztosÃtja a(z) %s telepÃtÃ©si forrÃ¡s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "A(z) '%s' telepÃtÃ©si forrÃ¡s betÃ¶ltÃ©se" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "FrissÃtÃ©s Ã©s kÃ¼lÃ¶nbsÃ©g rpm beolvasÃ¡sa a(z) '%s' telepÃtÃ©si forrÃ¡sbÃ³l" @@ -173,27 +173,28 @@ msgid "Cleaning repository '%s' cache" msgstr "A(z) '%s' telepÃtÃ©si forrÃ¡s gyorsÃtÃ³tÃ¡rÃ¡nak kiÃ¼rÃtÃ©sÃ©nek" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "A megadokt URL nem tartalmaz Ã©rvÃ©nyes metaadatot" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "A(z) '%s' telepÃtÃ©si forrÃ¡s gyorsÃtÃ³tÃ¡rÃ¡nak felÃ©pÃtÃ©se" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "A(z) '%s' telepÃtÃ©si forrÃ¡s gyorsÃtÃ³tÃ¡rÃ¡nak beolvasÃ¡sa" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "A(z) '%s' telepÃtÃ©si forrÃ¡s hozzÃ¡adÃ¡sa" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "A(z) '%s' telepÃtÃ©si forrÃ¡s eltÃ¡volÃtÃ¡sa" @@ -2771,19 +2772,19 @@ # menuentries/menuentry_lan_sendmail.ycp:14 #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s mÃ³dosÃtott konfigurÃ¡ciÃ³s fÃ¡jljai:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "Az rpm elmentette %s-t, mint %s, de nem sikerÃ¼lt megÃ¡llapÃtani a kÃ¼lÃ¶nbsÃ©get" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2793,13 +2794,13 @@ "A kÃ¼lÃ¶nbsÃ©g elsÅ 25 sora:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "Az rpm lÃ©trehozta %s-t, mint %s, de nem sikerÃ¼lt megÃ¡llapÃtani a kÃ¼lÃ¶nbsÃ©get" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2810,46 +2811,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s telepÃtÃ©se nem sikerÃ¼lt" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Az rpm parancs kimenete:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s telepÃtÃ©se OK" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "TovÃ¡bbi rpm kimenet:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s eltÃ¡volÃtÃ¡sa meghiÃºsult" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s eltÃ¡volÃtÃ¡sa OK" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "%s mÃ¡solata lÃ©trehozva" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "A kÃ©rÃ©snek megfelelÅen a telepÃtÃ©s megszakad." @@ -2867,64 +2868,74 @@ msgstr "A(z) %s csomagot felvÃ¡ltja %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "A felhasznÃ¡lÃ³ tÃ¶rli a(z) %s csomagot.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "Egy alkalmazÃ¡s tÃ¶rli a(z) %s csomagot. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "A felhasznÃ¡lÃ³ telepÃti a(z) %s csomagot.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "Egy alkalmazÃ¡s telepÃti a(z) %s csomagot. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "Nem talÃ¡lhatÃ³ Ã©rvÃ©nyes megoldÃ¡s %d mÃ¡sodpercen belÃ¼l" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "A feloldÃ¡svizsgÃ¡lat tÃºllÃ©pte a megadott idÅt" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Nem talÃ¡lhatÃ³ Ã©rvÃ©nyes megoldÃ¡s kizÃ¡rÃ³lag a legmegfelelÅbb architektÃºra feloldhatÃ³inak hasznÃ¡latÃ¡val." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Ez a futtatÃ¡s csak a legmegfelelÅbb architektÃºra feloldhatÃ³it veszi figyelembe.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Az Ã¶sszes lehetsÃ©ges feloldandÃ³ vizsgÃ¡lata hosszabb ideig tart, de megbÃzhatÃ³bb eredmÃ©nyt ad." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ÃrvÃ©nytelen informÃ¡ciÃ³" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "A(z) %s csomagot mÃ¡s feloldhatÃ³k igÃ©nylik" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "A(z) %s csomagot igÃ©nyli %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2934,7 +2945,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s Ã¼tkÃ¶zik mÃ¡s feloldhatÃ³kkal" @@ -2943,14 +2954,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s Ã©s %s Ã¼tkÃ¶zik" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2960,24 +2971,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s elavulttÃ¡ tesz mÃ¡s feloldhatÃ³kat" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s elavulttÃ¡ teszi a(z) %s csomagot" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s elavulttÃ¡ teszi: %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2986,7 +2997,7 @@ "Ezek a feloldhatÃ³k tÃ¶rlÃ©sre kerÃ¼lnek a rendszerbÅl." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s fÃ¼gg mÃ¡s feloldhatÃ³ktÃ³l" @@ -2994,39 +3005,39 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s fÃ¼gg a(z) %s csomagtÃ³l" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s fÃ¼gg ettÅl: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "SzÃ¼lÅje " # modules/inst_target_part.ycp:676 #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s nem telepÃthetÅ" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "A(z) %s kÃ©pessÃ©get semmi nem biztosÃtja" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -3034,31 +3045,31 @@ "\n" "Nem Ã¡ll rendelkezÃ©sre ezt a kÃ¶vetelmÃ©nyt kielÃ©gÃtÅ erÅforrÃ¡s." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "A fent/lent leÃrt problÃ©mÃ¡k miatt ez a feloldÃ¡s nem oldja fel az Ã¶sszes fÃ¼ggÅsÃ©get" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s nem telepÃthetÅ, mert Ã¼tkÃ¶zik (%s)" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s nincs telepÃtve Ã©s nem telepÃthetÅnek lett megjelÃ¶lve" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "%s nem telepÃthetÅ fÃ¼ggÅsÃ©gi problÃ©mÃ¡k miatt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3067,8 +3078,8 @@ # modules/inst_target_part.ycp:676 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3076,79 +3087,79 @@ msgstr "%s nem telepÃthetÅ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s egyes kÃ¶vetelmÃ©nyei nincsenek kielÃ©gÃtve" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s fÃ¼ggÅsÃ©gei hiÃ¡nyoznak" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s nem telepÃthetÅ hiÃ¡nyzÃ³ fÃ¼ggÅsÃ©gek miatt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s kielÃ©gÃti %s fÃ¼ggÅsÃ©geit, de eltÃ¡volÃtÃ¡sra kerÃ¼l" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "A(z) %s kielÃ©gÃti a(z) %s fÃ¼ggÅsÃ©geit, de a rendszeren marad" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Nincs szÃ¼ksÃ©g %s telepÃtÃ©sÃ©re" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s nem telepÃthetÅ %s fÃ¼ggÅsÃ©geinek teljesÃtÃ©sÃ©hez" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s nem telepÃthetÅ %s fÃ¼ggÅsÃ©geinek teljesÃtÃ©sÃ©hez" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s nem tÃ¡volÃthatÃ³ el, mert mÃ©g mindig szÃ¼ksÃ©ges" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s miatt %s elavult, de %s zÃ¡rolÃ¡s miatt nem tÃ¶rÃ¶lhetÅ." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "A(z) %s nem telepÃthetÅ, mert Ã¼tkÃ¶zik" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s nem telepÃthetÅ, mert Ã¼tkÃ¶zik (%s)" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "A(z) %s kÃ¶vetelmÃ©ny nem teljesÃthetÅ." @@ -3209,7 +3220,7 @@ msgstr "Ne telepÃtse vagy tÃ¶rÃ¶lje a vonatkozÃ³ feloldhatÃ³kat" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "mert %s szÃ¼ksÃ©ges %s esetÃ©n, %s frissÃtÃ©sekor" @@ -3569,14 +3580,22 @@ msgid "Install missing resolvables" msgstr "HiÃ¡nyzÃ³ feloldhatÃ³k telepÃtÃ©se" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "Az Ã¶sszes lehetÅsÃ©g bekapcsolÃ¡sa." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Minden feloldandÃ³ figyelembevÃ©tele a kompatibilis architektÃºrÃ¡n." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "Csak a legmegfelelÅbb architektÃºra hasznÃ¡lata." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "Minden feloldandÃ³ figyelembevÃ©tele a legmegfelelÅbb architektÃºrÃ¡n." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3627,6 +3646,14 @@ msgid "%s part of %s" msgstr "%s %s rÃ©sze" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "KÃ©tszeres idÅtÃºllÃ©pÃ©s" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "A kÃ¶vetkezÅ feloldÃ¡svizsgÃ¡lat indÃtÃ¡sa kÃ©tszeres idÅtÃºllÃ©pÃ©si Ã©rtÃ©kkel." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "Ãsszes feloldhatÃ³k zÃ¡rolÃ¡sÃ¡nak feloldÃ¡sa" Modified: trunk/libzypp/po/id.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/id.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/id.po (original) +++ trunk/libzypp/po/id.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2002-10-08 13:38+0200\n" "Last-Translator: I Made Wiryana <made(a)nakula.rvs.uni-bielefeld.de>\n" "Language-Team: Indonesian <i18n(a)suse.de>\n" @@ -122,36 +122,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -175,27 +175,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -3045,19 +3046,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -3065,13 +3066,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -3080,46 +3081,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3137,64 +3138,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3202,7 +3213,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -3211,14 +3222,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3226,31 +3237,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3258,68 +3269,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Italia" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3327,8 +3338,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3336,79 +3347,79 @@ msgstr "Italia" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3469,7 +3480,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3828,14 +3839,22 @@ msgid "Install missing resolvables" msgstr "Italia" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3886,6 +3905,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/it.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/it.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/it.po (original) +++ trunk/libzypp/po/it.po Mon Sep 10 16:18:44 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-23 20:01+0100\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-06 19:44+0100\n" "Last-Translator: Alberto Passalacqua <alberto.passalacqua(a)tin.it>\n" "Language-Team: Novell Language <opensuse-translation(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -117,36 +117,36 @@ msgid "History:" msgstr "Cronologia:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Verifica di applydeltarpm non riuscita." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm non riuscito." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Controllo dell'integritÃ del pacchetto %s non riuscito. Provare di nuovo?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Nessuna URL nella sorgente di installazione." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Impossibile fornire il file %s dalla sorgente di installazione %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Lettura della cache del repository '%s'" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Lettura degli rpm delle patch e dei delta dalla cache del repository '%s'" @@ -172,27 +172,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Pulizia della cache del repository '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Non sono stati trovati metadati validi all'URL specificato" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Costruzione della cache del repository '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Lettura della cache del repository '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "Sto aggiungendo il repository '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Rimozione della sorgente di installazione '%s'" @@ -2673,19 +2674,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "File di configurazione modificati per %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm ha salvato %s come %s, tuttavia non Ã¨ stato possibile determinare la differenza" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2695,13 +2696,13 @@ "Di seguito sono riportate le prime 25 righe di differenza:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm creato %s come %s, tuttavia non Ã¨ stato possibile determinare la differenza" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2712,49 +2713,49 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Impossibile installare %s " -#: ../zypp/target/rpm/RpmDb.cc:1927 -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 +#: ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Output rpm:" # TLABEL modules/inst_target_part.ycp:680 #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "Installazione di %s completata" -#: ../zypp/target/rpm/RpmDb.cc:1936 -#: ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 +#: ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Output aggiuntivo di rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Impossibile rimuovere %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "Rimozione di %s completata" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "Copia di backup di %s creata" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "L'installazione Ã¨ stata interrotta come indicato." @@ -2772,64 +2773,74 @@ msgstr "%s sostituito da %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s verrÃ cancellato dall'utente.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "'%s' verrÃ cancellato da un'altra applicazione. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s verrÃ installato dall'utente.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s verrÃ installato da un'altra applicazione. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "Non Ã¨ stata trovata alcuna soluzione valida in %d secondi" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "Il risolutore ha raggiunto il timeout predefinito" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Usando solo i risolubili per la migliore architettura compatibile non Ã¨ stata trovata alcuna soluzione valida." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Con questo tentativo sono stati analizzati solo i risolubili con la migliore architettura.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Analizzare tutti i possibili risolvibili richiede del tempo ma puÃ² anche fornire un risultato valido." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Informazioni non valide" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s Ã¨ richiesto da altri risolvibili" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s Ã¨ richiesto da %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2839,7 +2850,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s Ã¨ in conflitto con altri risolvibili" @@ -2848,14 +2859,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s in conflitto con %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2865,24 +2876,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s non Ã¨ piÃ¹ utilizzato dagli altri risolvibili" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s non piÃ¹ utilizzato %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s non piÃ¹ utilizzato:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2891,7 +2902,7 @@ "Questi risolvibili verranno eliminati dal sistema." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s dipende da altri risolvibili" @@ -2899,39 +2910,39 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s dipende da %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s dipende da:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Figlio di" # TLABEL modules/inst_target_part.ycp:680 #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Impossibile installare %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Nessun componente fornisce %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2939,31 +2950,31 @@ "\n" "Nessuna risorsa disponibile che supporta questo requisito." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "A causa dei problemi descritti in alto o di seguito, questa risoluzione non risolverÃ le dipendenze" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Impossibile installare %s perchÃ© in conflitto con %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s non Ã¨ installato ed Ã¨ stato contrassegnato come non installabile" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Impossibile installare %s a causa di problemi di dipendenze" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2972,8 +2983,8 @@ # TLABEL modules/inst_target_part.ycp:680 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2981,79 +2992,79 @@ msgstr "non installare %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s presenta requisiti non soddisfatti" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "Dipendenze mancanti in %s " #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Impossibile installare %s. Alcune dipendenze sono mancanti" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s soddisfa le dipendenze di %s ma verrÃ disinstallato" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s soddisfa le dipendenze di %s ma verrÃ mantenuto nel sistema" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Non Ã¨ necessario installare %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Impossibile installare %s per soddisfare le dipendenze di %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Impossibile installare %s per soddisfare le dipendenze di %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s non sarÃ disinstallato perchÃ© ancora richiesto" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s rende obsoleto %s. Tuttavia, non Ã¨ possibile eliminare %s perchÃ© bloccato." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Impossibile installare %s perchÃ© in conflitto" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s non puÃ² essere installato perchÃ© in conflitto con %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Il requisito %s non puÃ² essere soddisfatto." @@ -3114,7 +3125,7 @@ msgstr "Non installare o eliminare i risolvibili di pertinenza" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "affinchÃ© %s richieda %s durante l'aggiornamento di %s" @@ -3475,14 +3486,22 @@ msgid "Install missing resolvables" msgstr "Installa risolvibili mancanti" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "Esegui un tentativo risolutore usando TUTTE le possibilitÃ ." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Analisi di tutti i risolvibili con un'architettura compatibile." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "Eseguire il solver solo con la miglior architettura." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "Riguarda i risolubili solo la sola migliore architettura." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3533,6 +3552,14 @@ msgid "%s part of %s" msgstr "%s parte di %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "Doppio timeout" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "Eseguire il prossimo risolutore con il timeout raddoppiato." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "sblocca tutti i risolvibili" Modified: trunk/libzypp/po/ja.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ja.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ja.po (original) +++ trunk/libzypp/po/ja.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-06-16 14:06\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -113,37 +113,37 @@ msgid "History:" msgstr "XF86History" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpmãã§ãã¯ã«å¤±æãã¾ããã" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpmãå¤±æãã¾ããã" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "ããã±ã¼ã¸ %s ã®æ´åæ§ãã§ãã¯ã«å¤±æãã¾ããã ãã¦ã³ãã¼ããåè©¦è¡ãã¾ãã?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "ãã¡ã¤ã« %1 ããªãã¸ããªåã§æ¤åºã§ãã¾ããã§ããã" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "%s ãã %s ãæä¾ã§ãã¾ãã" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -168,27 +168,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "ãªã½ã¼ã¹ãè¿½å ãã¦ãã¾ã" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "ãªã½ã¼ã¹ãè¿½å ãã¦ãã¾ã" @@ -2639,19 +2640,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s åãã®å¤æ´ãããè¨å®ãã¡ã¤ã«:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpmã¯ %s ã %s ã¨ãã¦ä¿åãã¾ããããå·®ç°ãå¤å¥ã§ãã¾ããã§ãã" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2661,13 +2662,13 @@ "ä»¥ä¸ã¯å·®ç°ã®ããæåã®25è¡ã§ãã\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpmã¯ %s ã %s ã¨ãã¦ä½æãã¾ããããå·®ç°ãå¤å¥ã§ãã¾ããã§ãã" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2678,46 +2679,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s ã®ã¤ã³ã¹ãã¼ã«ãå¤±æãã¾ãã" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpmåºå:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s ã¯åé¡ãªãã¤ã³ã¹ãã¼ã«ããã¾ãã" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "è¿½å ã®rpmåºå:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s ã®åé¤ã«å¤±æãã¾ãã" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s ã¯åé¡ãªãåé¤ããã¾ãã" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "ããã¯ã¢ãã %s ãä½æããã¾ãã" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "æç¤ºéãã«ã¤ã³ã¹ãã¼ã«ãä¸æ¢ããã¾ããã" @@ -2735,7 +2736,7 @@ msgstr "%s ã¯ %s ã«ç½®ãæãããã¾ã" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2743,58 +2744,68 @@ "ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s ã¯ã¾ã å¿è¦ãªã®ã§ãã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ãã" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ç¡å¹ãªæå ±" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s ã¯ä»ã®resolvableãå¿è¦ã¨ãã¦ãã¾ã" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s ã¯ %s ãå¿è¦ã¨ãã¦ãã¾ã" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2804,7 +2815,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s ã¯ä»ã®resolvableã¨ç«¶åãã¦ãã¾ã" @@ -2813,14 +2824,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s %s ã¨ç«¶åãã¾ã" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2830,24 +2841,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s ã¯ä»ã®resolvableãå»æ¢ãã¾ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s ã¯ %s ãå»æ¢ãã¾ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s å»æ¢:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2856,7 +2867,7 @@ "ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s ã¯ä»ã®resolvableã«ä¾åãã¾ã" @@ -2864,38 +2875,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s ã¯ %s ã«ä¾åãã¾ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s ã¯ä»¥ä¸ã«ä¾åãã¾ã:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "ã®å" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "ãããã %s ãæä¾ãã¾ãã" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2904,32 +2915,32 @@ "\n" "ãã®è¦æ±ããµãã¼ããã¦ããä½¿ç¨å¯è½ãªãªã½ã¼ã¹ãããã¾ããã" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "ä¸è¨/ä¸è¨ã®åé¡ã«ããããã®è©¦ã¿ã§ã¯ãã¹ã¦ã®ä¾åé¢ä¿ãè§£æ±ºããã¾ããã" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s ã¯ %s ã¨ç«¶åãã¦ããã®ã§ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ãã¤ã³ã¹ãã¼ã«ããã¦ããããã¢ã³ã¤ã³ã¹ãã¼ã«ä¸å¯è½ã¨ãã¼ã¯ããã¦ãã¾ã" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "ä¾åé¢ä¿ã®åé¡ã«ããã%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2937,8 +2948,8 @@ msgstr "%s ãåé¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2946,79 +2957,79 @@ msgstr "%s ãã¤ã³ã¹ãã¼ã«ããªã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s ã«ã¯æºãããã¦ããªãè¦ä»¶ãããã¾ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s ã¯ä¾åé¢ä¿ãä¸è¶³ãã¦ãã¾ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "ä¾åé¢ä¿ããªãããã%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s ã¯ %s ã®ä¾åé¢ä¿ãæºããã¦ãã¾ãããã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s ã¯ã%s ã®ä¾åé¢ä¿ãæºããã¦ãã¾ããããå©ç¨ã®ã·ã¹ãã ã«ä¿æããã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s ãã¤ã³ã¹ãã¼ã«ããå¿è¦ã¯ããã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s ãã¤ã³ã¹ãã¼ã«ãã¦ %s ã®ä¾åé¢ä¿ãæºãããã¨ãã§ãã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s ãã¤ã³ã¹ãã¼ã«ãã¦ %s ã®ä¾åé¢ä¿ãæºãããã¨ãã§ãã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s ã¯ã¾ã å¿è¦ãªã®ã§ãã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s å»æ¢ %s. ããã¯ããã¦ãããã %s ãåé¤ã§ãã¾ããã" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%s ã¯ç«¶åãã¦ããã®ã§ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s ã¯æ¬¡ã¨ç«¶åãã¦ãããããã¢ã³ã¤ã³ã¹ãã¼ã«ã§ãã¾ã: %s " #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3081,7 +3092,7 @@ msgstr "é¢é£ããresolavlesãã¤ã³ã¹ãã¼ã«ãã¾ãã¯åé¤ããªã" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "%s ã® %s åãã®ãã®ãè¦æ±ãããã(%s ãæ´æ°)" @@ -3439,14 +3450,22 @@ msgid "Install missing resolvables" msgstr "ä¸è¶³ãã¦ããresolvableãã¤ã³ã¹ãã¼ã«ãã¾ã" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3497,6 +3516,15 @@ msgid "%s part of %s" msgstr "%s %s ã®ä¸é¨" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "ããã«ã¯ãªãã¯ã¿ã¤ã ã¢ã¦ã " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "ãã¹ã¦ã®è§£æ±ºå¯¾è±¡ãã¢ã³ããã¯ãã" Modified: trunk/libzypp/po/ka.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ka.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ka.po (original) +++ trunk/libzypp/po/ka.po Mon Sep 10 16:18:44 2007 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2005-05-18 10:33+0200\n" "Last-Translator: Aiet Kolkhi <aiet(a)qartuli.net>\n" "Language-Team: Georgian <i18n(a)suse.de>\n" @@ -111,36 +111,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -164,27 +164,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2635,19 +2636,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2655,13 +2656,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2670,46 +2671,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2727,64 +2728,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2792,7 +2803,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2801,14 +2812,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2816,31 +2827,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2848,68 +2859,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2917,8 +2928,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2926,79 +2937,79 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3059,7 +3070,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3417,14 +3428,22 @@ msgid "Install missing resolvables" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3475,6 +3494,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "" Modified: trunk/libzypp/po/km.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/km.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/km.po (original) +++ trunk/libzypp/po/km.po Mon Sep 10 16:18:44 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: zypp.km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-24 02:30+0700\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-07 08:39+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" @@ -114,36 +114,36 @@ msgid "History:" msgstr "áááááááá·Â á" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "áá¶áâáá·áá·ááá applydeltarpm áá¶áâááá¶áááÂ á" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm áá¶áâááá¶áááÂ á" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "áááááá %s ááá¶áááâáááá»áâáá¶áâáá·áá·áááâáá¶áâáááá¹ááááá¼áÂ á áá¾á¢áááâáááâáááá¶áá¶áâáááááááâá¬ááÂ ?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "áááá¶á url ááâáááá»áâáááá¶ááÂ á" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "áá·áâá¢á¶áâáááááâá¯ááá¶á %s áá¸âáááá¶áá %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "áááá»áâá¢á¶áâáááá¶áá '%s'" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "áááá»áâá¢á¶áâáááá áá·áâ rpms áááâáá¶âáá¸áááá¶áá '%s'" @@ -167,27 +167,28 @@ msgid "Cleaning repository '%s' cache" msgstr "áááá»áâáááá¢á¶ááááá¶áá '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "ááâáá·áâáá¾áâáá·ááááááâáááá¶âáááâáááá¹ááááá¼áâáá URL áááâáá¶áâááááá¶áá" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "áááá»áâáááá¶ááá¶âáááá¶áá '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "áááá»áâá¢á¶áââáááá¶áá '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "áááá»áâááááááâáááá¶áá '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "ááâáááá¶áá '%s' ááá" @@ -2640,19 +2641,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "áá¶áâáááá¼áâá¯ááá¶áâáááááâáááá¶ááááááááâááááá¶áá %sÂ á" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm áá¶ááâáááá¶âáá»á %s áá¶ %s ááá»ááááâáá¶âá¢á¶áâáááááâáá¶áâáá»áâáááá¶" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2662,13 +2663,13 @@ "áááâáá¶âááááá¶áá á¢á¥ áá½áâáááá¼áâáá»ááááá¶á\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm áá¶áâááááá¾á %s áá¶ %s ááá»ááááâáá¶âáá·áâá¢á¶áâáááááâáá¶áâáá»áâáááá¶" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2679,46 +2680,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "áá¶áâááá¡á¾á %s áá¶áâááá¶ááá" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "áááááá rpmÂ á" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "áá¶áâááá¡á¾á %s áááâáááááá" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "áááááá rpm áááááááááÂ á" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "ááá¶áááâáááá»ááá¶áâáá %s ááá" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "áá¶áâáá %s áááâáááâáááááá" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "áá¶áâááááá¾áâáááááá¶áâááááá»á %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "áá¶áâááá¡á¾á áááá¼ááá¶áâááááááâáááâáááá¶ááÂ á" @@ -2736,64 +2737,74 @@ msgstr "%s áá¶áâáááá½áâááá %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s áá¹áâáááá¼áâáá¶áâáá»áâáááâá¢áááâáááá¾Â á\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s áá¹áâáááá¼áâáá¶ááá»áâáááâáááááá·áá¸âáááááÂ á (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s áá¹áâáááá¼áâáá¶áâááá¡á¾áâáááââá¢áááâáááá¾Â á\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s áá¹áâáááá¼áâáá¶áâááá¡á¾áâáááâáááááá·áá¸âáááááÂ á (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "ááâáá·áâáá¾áâáááááâáááá¶áâáááá¹ááááá¼áâáááá»áâáááâááá %d áá·áá¶áá¸Â á" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "áááááá·áá¸âááááááá¶áâáá¶áâáá¶áâáááâáááâááááá¶áâáááâáá¶áâááááá" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "ááâáá·áâáá¾áâáááááâáááá¶áâ áááâáá·áâá¢á¶áâááááááá¶áâááâáááá¶ááááááááâááâááá¢âáááá»áÂ á" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "áááâá²áááá¶âáááâááááá¶ááâááâá¢ááá¸âá¢á¶áâááááááá¶áâáá¶áâáá¶âáá½áâáááá¶ááááááááâááâááá¢âáááá»áâáááá¼áâáá¶áâááâáá·áá¶ááá¶Â á\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "áááâáá¶ááááâááâáá¹áâá¢ááá¸âáááâá¢á¶áâááááááá¶áâáá¶áâáá¶ááâá¢ááâáááá¼áâáá¶áâááááááá¶â ááá»ááááâá¢á¶áâááá½áâáá¶áááááááâáááá¹ááááá¼áÂ á" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "áááááá¶áâáá·áâáááá¹ááááá¼á" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s áááá¼ááá¶áâáááâááááááâááááááá¶áâáááááá" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s áááá¼ááá¶áâááá %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2803,7 +2814,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s áááááááá·áâáá¶áá½áâááááááááááááá¶áâáááááá" @@ -2812,14 +2823,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s áááâááááá·áâáá¶áá½áâáá¹á %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2829,24 +2840,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s áááâáááá¾âááááááááááááá¶áâáááááá" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s áááâáááá¾ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s áááâáááá¾Â Â á %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2855,7 +2866,7 @@ "ááááááááááááá¶ááá¶áááááâáá¹áâáááá¼áâáá¶áâáá»áâáááâáá¸âááááááááÂ á" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s ááá¢ááâáá¾ááááááááááááá¶áâáááááá" @@ -2863,38 +2874,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s ááá¢áááá¾ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s ááá¢áááá¾Â á %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "áá¼áâáááá" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "áá·áâá¢á¶áâááá¡á¾á %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "áááá¶áâááááááâáá¶âááááá %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2902,31 +2913,31 @@ "\n" "áá·ááá¶áâáááá¶áâáááâáá¶ááááâááááá¼áâáá¶áâáááÂ á" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "áááâáá¶áâááâáá¶áâáááá á¶ââáá¼áâáá¶áâáá·ááááá¶âáá¶áâáá¾/áá¶áâááááá ááááááááá¶áâáááâáá¹áâáá·áâá¢á¶áâááááááá¶áâáá¶áâá¢á¶áááááâáá¶ááá¢ááâáá¶áâáá" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "áá·áâá¢á¶áâááá¡á¾á %s áá¸áááááâáá¶âáááááááá·áâáá¶âáá½á %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "áá·áâáá¶áâááá¡á¾á %s á¡á¾á á á¾áâáá¶áâááááá¶ááâáá¶âáá¶ á¢á¶áâáá»áâáá¶á" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "áá·áâá¢á¶áâááá¡á¾á %s áááâáá¶áâáááá¶ááááá á¶âáá¶áâá¢á¶ááááá" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2934,8 +2945,8 @@ msgstr "áá»á %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2943,79 +2954,79 @@ msgstr "áá»áâááá¡á¾á %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s áá¶áâááááá¼áâáá¶áâáááâáá·áâáá¶áâááááá" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s áá¶áâáá¶áâá¢á¶áááááâáááâáá¶áá" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "áá·áâá¢á¶áâááá¡á¾á %s áá¶ááá áááâáá¶áâáá¶ááâáá¶áâá¢á¶ááááá" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s áááááâáá¶áâá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶ááá»á" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s áááááâáá¶áá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶áâááááá¶áá»áâááâáááá»áâááááááááâááááâá¢ááá" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "áá·áâáá¶ááá¶ááâááá¡á¾á %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "áá·áâá¢á¶áâááá¡á¾á %s áá¾áááá¸âáááááâáá¶áâá¢á¶áááááâáááá %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "áá·áâá¢á¶áâááá¡á¾á %s áá¾áááá¸âáááááááááááâááááá¼ááá¶áâáááá %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s áá¹áâáá·áâáááá¼áâáá¶áâáá»áâáá áá¸áááááâáá¶âááâááâáááá¼áâáá¶á" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s ááááááá¾ %sÂ á ááá»áááá %s áá·áâá¢á¶áâáááá¼áâáá¶ááá»á áá¸áááááâáá¶âáá¶ááááÂ á" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "áá·áâá¢á¶áâááá¡á¾á %s áá¸áááááâáá¶âáááá»áâáááááááá·á" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "áá·áâá¢á¶áâáá»á %s áá¶áááâ áááááâáá¶âáááááááá·áâáá¶âáá½áâáá¹á %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "áá·áâá¢á¶áâáááááâááááá¼áâáá¶á %s" @@ -3076,7 +3087,7 @@ msgstr "áá»áâááá¡á¾á á¬âáá»áâá¢ááá¸âáááá¢á¶áâááááááá¶áâáá¶áâáááâáá¶áááá" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "ááááá¶ááâáá¶ááá¶ááá¶á %s ááááá %s ááááááâáááá¾âá²áá %s áá¶ááâáááá" @@ -3434,14 +3445,22 @@ msgid "Install missing resolvables" msgstr "ááá¡á¾áâááááááâááááááá¶áâáááâáá¶áá" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "áááá¾á²ááâá¢áááâááááááá¶áâáááâáá¶áá½áâáááááá¶áâáá¶ááá¢ááÂ á" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "áá¶ááááâáá¹áâá¢ááá¸âáááâá¢á¶áâááááááá¶áâáá¶áâáá¶ááâá¢ááââáá¶âáá½áâáááá¶ááááâááááâáááâááâáááá¶Â á" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "áááá¾á²ááâáááááá·áá¸ââááááááá¶áâáááââááâáá¶âáá½áâáááá¶ááááááááâáááâááá¢âáááá»áâââááá»áááááÂ á" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "áá¶ááááâáá¹áâá¢ááá¸âáááâá¢á¶áâááááááá¶áâáá¶áââááâââáá¶âáá½áâáááá¶ááááááááâáááâááá¢âáááá»áâááá»áááááÂ á" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3492,6 +3511,14 @@ msgid "%s part of %s" msgstr "%s áá¶âáááááâáá %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "áááááááá¶áâáááááá" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "áá¶áááááá¾áâáááááá·áá¸âááááááá¶áâááááá¶ááââáááâáá¶âáá½áâáááâááááá¶áâááááááÂ á" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "ááááááâááááááâáááâáááá¶áâáá¶ááá¢áá" Modified: trunk/libzypp/po/ko.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ko.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ko.po (original) +++ trunk/libzypp/po/ko.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2001-07-18 11:05+0200\n" "Last-Translator: Hwang, Sang-Jin <violiet(a)suse.de>\n" "Language-Team: Korean <i18n(a)suse.de>\n" @@ -112,36 +112,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -165,27 +165,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -3049,19 +3050,19 @@ # progress stage #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "êµ¬ì± íì¼ ì ì¥" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -3069,13 +3070,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -3084,12 +3085,12 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "ì¤ì¹ ì¤í¨." -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 #, fuzzy msgid "rpm output:" msgstr "" @@ -3098,37 +3099,37 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "ì, ì¤ì¹ì§í(&Y)" # dialog caption -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "ì¶ê° ê·¸ë£¹ ì¤ì " #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpmì´ ì¤í¨íìµëë¤." #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, fuzzy, c-format msgid "created backup %s" msgstr "ë°±ìì ìì±íì§ ìì" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3146,64 +3147,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3211,7 +3222,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, fuzzy, c-format msgid "%s conflicts with other resolvables" msgstr "%1ì %2ì ì¶©ëí©ëë¤" @@ -3220,14 +3231,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, fuzzy, c-format msgid "%s conflicts with %s" msgstr "%1ì %2ì ì¶©ëí©ëë¤" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, fuzzy, c-format msgid "" "%s conflicts with:\n" @@ -3235,31 +3246,31 @@ msgstr "%1ì %2ì ì¶©ëí©ëë¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3267,69 +3278,69 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" # Frame title for installation target hard disk / partition(s) #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "ì¤ì¹ì¤:" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%1ì %2ì ì¶©ëí©ëë¤" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "ì´ í¨í¤ì§ë ì´ë¯¸ ì¤ì¹ëì´ ìì´ì ì¤ì¹ê° ëì§ ììµëë¤." #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3338,8 +3349,8 @@ # Frame title for installation target hard disk / partition(s) #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3347,80 +3358,80 @@ msgstr "ì¤ì¹ì¤:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, fuzzy, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" # text is shown in a line of a package list #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "ë¤ì ì¤ì¹í´ì¼ í©ëë¤." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, fuzzy, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%1ì %2ì ì¶©ëí©ëë¤" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3486,7 +3497,7 @@ msgstr "%1ì %2ì ì¶©ëí©ëë¤" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3851,14 +3862,22 @@ msgid "Install missing resolvables" msgstr "ëë½ë í¨í¤ì§ ì¤ì¹" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3909,6 +3928,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/lo.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lo.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/lo.po (original) +++ trunk/libzypp/po/lo.po Mon Sep 10 16:18:44 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-01-04 08:58+0100\n" "Last-Translator: i18n(a)suse.de\n" "Language-Team: Lao <i18n(a)suse.de>\n" @@ -109,36 +109,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -162,27 +162,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2633,19 +2634,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2653,13 +2654,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2668,46 +2669,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2725,64 +2726,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2790,7 +2801,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2799,14 +2810,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2814,31 +2825,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2846,68 +2857,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2915,8 +2926,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2924,79 +2935,79 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3057,7 +3068,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3415,14 +3426,22 @@ msgid "Install missing resolvables" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3473,6 +3492,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "" Modified: trunk/libzypp/po/lt.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lt.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/lt.po (original) +++ trunk/libzypp/po/lt.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-05-01 15:00+0300\n" "Last-Translator: Andrius Å tikonas <stikonas(a)gmail.com>\n" "Language-Team: LietuviÅ³ <komp_lt(a)konf.lt>\n" @@ -116,37 +116,37 @@ msgid "History:" msgstr "PerÅ¾iÅ«rÄti istorijÄ" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm tikrinimas napavyko." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm nepavyko." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "Pridedami resursai" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "Niekas nepateikia %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -171,27 +171,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "Pridedami resursai" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Pridedami resursai" @@ -2885,19 +2886,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Pakeistos %s konfigÅ«racios bylos:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2905,13 +2906,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2920,46 +2921,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s Ä¯diegimas nesÄkmingas" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm iÅ¡vestis:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s Ä¯diegtas sÄkmingai" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Papildoma rpm iÅ¡vestis:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s Å¡alinimas nepavyko" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "padaryta %s atsarginÄ kopija" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2977,64 +2978,74 @@ msgstr "%s pakeistas %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s nebus paÅ¡alintas, nes jis vis dar reikalingas" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Klaidinga informacija" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s reikalingas %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3042,7 +3053,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, fuzzy, c-format msgid "%s conflicts with other resolvables" msgstr "%1 konfliktuoja su %2" @@ -3051,14 +3062,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s konfliktuoja su %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3068,31 +3079,31 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3100,68 +3111,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s priklauso nuo %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s priklauso nuo:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Negaliu Ä¯diegti %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Niekas nepateikia %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Nepavyksta Ä¯diegti %s, nes jis konfliktuoja" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s neÄ¯diegtas ir paÅ¾ymÄtas kaip neÄ¯diegiamas" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Nepavyksta Ä¯diegti %s dÄl priklausomybiÅ³ problemÅ³" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3169,8 +3180,8 @@ msgstr "paÅ¡alinti %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3178,79 +3189,79 @@ msgstr "neÄ¯diegti %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s turi neiÅ¡pildytÅ³ reikalavimÅ³" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s turi trÅ«kstamÅ³ priklausomybiÅ³" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, fuzzy, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Netenkinami ryÅ¡iai:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "NebÅ«tina Ä¯diegti %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Nepavyksta Ä¯diegti %s dÄl priklausomybiÅ³ problemÅ³" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s nebus paÅ¡alintas, nes jis vis dar reikalingas" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Nepavyksta Ä¯diegti %s, nes jis konfliktuoja" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, fuzzy, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%1 konfliktuoja su %2" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3314,7 +3325,7 @@ msgstr "%1 konfliktuoja su %2" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3675,14 +3686,22 @@ msgid "Install missing resolvables" msgstr "Ä®diegti trÅ«kstamus paketus" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3733,6 +3752,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/mk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mk.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/mk.po (original) +++ trunk/libzypp/po/mk.po Mon Sep 10 16:18:44 2007 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2001-07-17 16:12+0200\n" "Last-Translator: ÐÐ¾ÑÐ°Ð½ ÐÐ¸Ð¼Ð¾Ð²ÑÐºÐ¸ <zoki.dimovski(a)gmail.com>\n" "Language-Team: Macedonian <i18n(a)suse.de>\n" @@ -110,36 +110,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -163,27 +163,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2780,19 +2781,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2800,13 +2801,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2815,46 +2816,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2872,64 +2873,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2937,7 +2948,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2946,14 +2957,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2961,31 +2972,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2993,70 +3004,70 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" # CL #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 #, fuzzy msgid "Child of" msgstr "Ð§Ð¸Ð»Ðµ" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3064,8 +3075,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3073,79 +3084,79 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3206,7 +3217,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3564,14 +3575,22 @@ msgid "Install missing resolvables" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3622,6 +3641,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "" Modified: trunk/libzypp/po/mr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mr.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/mr.po (original) +++ trunk/libzypp/po/mr.po Mon Sep 10 16:18:44 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Check hardware-2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-11-13 12:55+0530\n" "Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n" @@ -107,37 +107,37 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm à¤à¥à¤ à¤à¤¯à¤¶à¤¸à¥à¤µà¥" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm à¤à¤¯à¤¶à¤¸à¥à¤µà¥" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "à¤ªà¥à¤à¥à¤ %s à¤à¤à¤¤à¥à¤°à¤¿à¤¤ à¤¤à¤ªà¤¾à¤¸à¤£à¥à¤¤ à¤à¤¯à¤¶à¤¸à¥à¤µà¥. à¤à¤ªà¤²à¥à¤¯à¤¾à¤²à¤¾ à¤¤à¥ à¤ªà¥à¤¨à¥à¤¹à¤¾ à¤¡à¤¾à¤à¤¨à¤²à¥à¤¡ à¤à¤°à¤£à¥à¤¯à¤¾à¤à¤¾ à¤ªà¥à¤°à¤¯à¤¤à¥à¤¨ à¤à¤°à¤¾à¤¯à¤à¤¾à¤à¤¹à¥?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "à¤à¤¾à¤à¤¡à¤¾à¤°à¤¾à¤¤ à¤«à¤¾à¤à¤² %1 à¤à¤¢à¤³à¤²à¥ à¤¨à¤¾à¤¹à¥" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "%s à¤µà¤°à¥à¤¨ %s à¤ªà¥à¤°à¤µà¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -161,27 +161,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "à¤°à¤¿à¤¸à¥à¤°à¥à¤¸à¥à¤¸ à¤à¤¤à¤¨ à¤à¤°à¤¤ à¤à¤¹à¥" @@ -2632,19 +2633,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s à¤¸à¤¾à¤ à¥ à¤¬à¤¦à¤²à¤²à¥à¤²à¥à¤¯à¤¾ à¤à¤à¥à¤¤à¥à¤¬à¤à¤§ à¤«à¤¾à¤à¤²à¥à¤¸" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm à¤¨à¥ %s à¤¹à¥ %s à¤®à¥à¤¹à¤£à¤¨ à¤à¤¤à¤¨ à¤à¥à¤²à¥, à¤ªà¤°à¤à¤¤à¥ à¤«à¤°à¤ à¤¸à¤¾à¤à¤à¤£à¥ à¤à¤¶à¤à¥à¤¯" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2652,13 +2653,13 @@ msgstr "rpm à¤¨à¥ %s à¤¹à¥ %s à¤®à¥à¤¹à¤£à¥à¤¨ à¤à¤¤à¤¨ à¤à¥à¤²à¥/nà¤«à¤°à¤à¤¾à¤à¥à¤¯à¤¾ à¤¯à¤¾ à¤ªà¤¹à¤¿à¤²à¥à¤¯à¤¾ 25 à¤à¤³à¥\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm à¤¨à¥ %s à¤¹à¥ %s à¤®à¥à¤¹à¤£à¥à¤¨ à¤à¤¤à¤¨ à¤à¥à¤²à¥ à¤«à¤°à¤à¤¾à¤à¥à¤¯à¤¾ à¤¯à¤¾ à¤ªà¤¹à¤¿à¤²à¥à¤¯à¤¾" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2667,46 +2668,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¤¾ à¤à¤¯à¤¶à¤¸à¥à¤µà¥" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm à¤à¤à¤à¤ªà¥à¤" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¤¾ à¤ à¥à¤ à¤à¤¹à¥" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "à¤à¤¤à¤¿à¤°à¤¿à¤à¥à¤¤ rpm à¤à¤à¤à¤ªà¥à¤" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s à¤à¤¾à¤¢à¥à¤¨ à¤à¤¾à¤à¤£à¥ à¤à¤¯à¤¶à¤¸à¥à¤µà¥" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s à¤à¤¾à¤à¤£à¥ à¤ à¥à¤ à¤à¤¹à¥" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "à¤¬à¥à¤à¤à¤ª %s à¤¨à¤¿à¤°à¥à¤®à¤¾à¤£ à¤à¥à¤²à¥" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "à¤¨à¤¿à¤°à¥à¤¦à¥à¤¶à¤¾à¤¨à¥à¤¸à¤¾à¤° à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¤¾ à¤®à¤§à¥à¤ à¤¸à¥à¤¡à¤²à¥" @@ -2724,7 +2725,7 @@ msgstr "%s à¤à¥à¤¯à¤¾ à¤à¤¾à¤à¥ %s " #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2732,58 +2733,68 @@ "à¤¹à¥ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ à¤ªà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ à¤ªà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¹à¥à¤£à¤¾à¤° à¤¨à¤¾à¤¹à¥ à¤à¤¾à¤°à¤£ à¤¤à¥ à¤à¤à¥à¤¨ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "à¤à¤µà¥à¤§ à¤®à¤¾à¤¹à¤¿à¤¤à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "à¤à¤¤à¤° à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤¨à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s à¤²à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2791,7 +2802,7 @@ msgstr "%s à¤²à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥:/n" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s à¤à¥ à¤à¤¨à¥à¤¯ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤¶à¥ à¤ªà¤à¤¤ à¤¨à¤¾à¤¹à¥" @@ -2800,14 +2811,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s à¤à¥ %s à¤¶à¥ à¤ªà¤à¤¤ à¤¨à¤¾à¤¹à¥" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2817,24 +2828,24 @@ "%s à¤¶à¥ à¤ªà¤à¤¤ à¤¨à¤¾à¤¹à¥:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s à¤à¤¨à¥à¤¯ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤¨à¤¾ à¤¬à¤¾à¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s %s à¤²à¤¾ à¤¬à¤¾à¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s :%s à¤²à¤¾ à¤¬à¤¾à¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2843,7 +2854,7 @@ "à¤¹à¥ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ à¤ªà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ à¤ªà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s à¤à¤¤à¤° à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤µà¤° à¤à¤µà¤²à¤à¤¬à¥à¤¨" @@ -2851,38 +2862,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s %s à¤µà¤° à¤à¤µà¤²à¤à¤¬à¥à¤¨" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s :%s à¤µà¤° à¤à¤µà¤²à¤à¤¬à¥à¤¨" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "à¤à¤¾à¤à¤²à¥à¤¡ à¤à¤«" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤à¥à¤·à¥à¤ %s à¤ªà¥à¤°à¤µà¤¤ à¤¨à¤¾à¤¹à¥" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2891,32 +2902,32 @@ "\n" "à¤à¤¸à¥ à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤¸à¤¾à¤§à¤¨ à¤à¤ªà¤²à¤¬à¥à¤§ à¤¨à¤¾à¤¹à¥ à¤à¥ à¤¯à¤¾ à¤à¤°à¤à¥à¤²à¤¾ à¤¸à¤®à¤°à¥à¤¥à¤¨ à¤¦à¥à¤¤à¥." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "à¤¯à¥à¤ à¤à¤¾à¤¤à¤²à¥à¤²à¥à¤¯à¤¾ à¤¸à¤®à¤¸à¥à¤¯à¤¾, à¤à¥à¤¯à¤¾ à¤¯à¤¾ à¤°à¤¿à¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨à¤à¥à¤¯à¤¾ à¤µà¤°/à¤à¤¾à¤²à¥ à¤¨à¤®à¥à¤¦ à¤à¥à¤²à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤, à¤¤à¥à¤¯à¤¾à¤¸à¤°à¥à¤µ à¤à¤µà¤²à¤à¤¬à¥à¤¨ à¤à¥à¤·à¥à¤à¥ à¤¸à¥à¤¡à¤µà¤£à¤¾à¤° à¤¨à¤¾à¤¹à¥à¤¤" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥ à¤à¤¾à¤°à¤£ à¤¤à¥à¤¯à¤¾à¤à¤à¥ %s à¤¶à¥ à¤ªà¤à¤¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨à¤¾à¤¹à¥ à¤µ à¤¤à¥à¤¯à¤¾à¤µà¤° à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¨ à¤à¤°à¤¤à¤¾ à¤¯à¥à¤£à¤¾à¤°à¤¾ à¤à¤¶à¥ à¤à¥à¤£ à¤à¤¹à¥" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "à¤à¤µà¤²à¤à¤¬à¥à¤¨ à¤à¤¸à¤£à¥à¤¯à¤¾à¤à¥à¤¯à¤¾ (à¤¡à¤¿à¤ªà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥) à¤¸à¤®à¤¸à¥à¤¯à¥à¤®à¥à¤³à¥ %s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2924,8 +2935,8 @@ msgstr "%s à¤ªà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2933,79 +2944,79 @@ msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ à¤¨à¤à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, fuzzy, c-format msgid "%s has unfulfilled requirements" msgstr "à¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ à¤ªà¥à¤°à¥à¤£ à¤¨ à¤¹à¥à¤£à¤¾à¤°à¥à¤¯à¤¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%sà¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ à¤ªà¥à¤°à¥à¤£ à¤¨ à¤¹à¥à¤£à¤¾à¤°à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s à¤®à¤§à¥ à¤à¤¾à¤¯à¤¬ à¤¡à¤¿à¤ªà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ à¤à¤¹à¥à¤¤." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "à¤à¤¾à¤¯à¤¬ à¤¡à¤¿à¤ªà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤¡à¤®à¥à¤³à¥ %s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s %s à¤à¥à¤¯à¤¾ à¤¡à¤¿à¤ªà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ à¤ªà¥à¤°à¥à¤£ à¤à¤°à¤¤à¥, à¤ªà¤°à¤à¤¤à¥ à¤à¤ªà¤²à¥à¤¯à¤¾ à¤ªà¥à¤°à¤£à¤¾à¤²à¥à¤µà¤° à¤ à¥à¤µà¤£à¥à¤¯à¤¾à¤¤ à¤¯à¥à¤à¤²" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤£à¥à¤¯à¤¾à¤à¥ à¤à¤°à¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s à¤à¥à¤¯à¤¾ à¤¡à¤¿à¤ªà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ à¤ªà¥à¤°à¥à¤£ à¤à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥ %s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s à¤à¥à¤¯à¤¾ à¤¡à¤¿à¤ªà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ à¤ªà¥à¤°à¥à¤£ à¤à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥ %s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s à¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤¹à¥à¤£à¤¾à¤° à¤¨à¤¾à¤¹à¥ à¤à¤¾à¤°à¤£ à¤¤à¥ à¤à¤à¥à¤¨ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s %s à¤²à¤¾ à¤¬à¤¾à¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥, à¤ªà¤°à¤à¤¤à¥ %s à¤ªà¥à¤¸à¤¤à¤¾ à¤¯à¥à¤¤ à¤¨à¤¾à¤¹à¥ à¤à¤¾à¤°à¤£ à¤¤à¥ à¤²à¥à¤à¥à¤¡ à¤à¤¹à¥" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¤à¤¾ à¤¯à¥à¤ à¤¶à¤à¤¤ à¤¨à¤¾à¤¹à¥ à¤à¤¾à¤°à¤£ à¤¤à¥ à¤µà¤¿à¤µà¤¾à¤¦à¤¾à¤¸à¥à¤ªà¤¦ à¤à¤¹à¥" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¤à¤¾ à¤¯à¥à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤°à¤à¥ à¤¨à¤¾à¤¹à¥ à¤à¤¾à¤°à¤£ à¤¤à¥à¤¯à¤¾à¤à¥ %s à¤¶à¥ à¤ªà¤à¤¤ à¤¨à¤¾à¤¹à¥" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3068,7 +3079,7 @@ msgstr "à¤¸à¤à¤¬à¤à¤§à¤¿à¤¤ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤à¤µà¤¾ à¤ªà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¥ à¤¨à¤à¤¾" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "%s à¤à¥ à¤à¤ªà¤à¥à¤°à¥à¤¡à¤¿à¤à¤ à¤à¤°à¤¤à¤¾à¤à¤¨à¤¾ %s à¤¸à¤¾à¤ à¥ %s à¤à¥ à¤à¤°à¤" @@ -3426,14 +3437,22 @@ msgid "Install missing resolvables" msgstr "à¤à¤¾à¤¯à¤¬ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¾" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3484,6 +3503,14 @@ msgid "%s part of %s" msgstr "%s à¤¹à¤¾ %s à¤à¤¾ à¤à¤¾à¤ à¤à¤¹à¥" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "à¤¸à¤°à¥à¤µ à¤°à¤¿à¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ à¤à¤¨à¤²à¥à¤ à¤à¤°à¤¾" Modified: trunk/libzypp/po/nb.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nb.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/nb.po (original) +++ trunk/libzypp/po/nb.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp.nb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-23 13:41+0200\n" "Last-Translator: Rune NordbÃ¸e Skillingstad <rune(a)skillingstad.no>\n" "Language-Team: Norwegian\n" @@ -115,36 +115,36 @@ msgid "History:" msgstr "Historie:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm-kontroll mislyktes." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm mislyktes." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Pakken %s bestÃ¥r ikke integritetskontrollen. Vil du prÃ¸ve Ã¥ laste den ned pÃ¥ nytt?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Ingen nettadresse i arkiv." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Kan ikke finne filen %s i arkivet %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Leser arkivmellomlager '%s'" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Leser oppdaterings- og delta-RPM-er fra arkivmellomlager '%s'" @@ -168,27 +168,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Vasker arkivmellomlager '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Ingen gyldige metadata funnet pÃ¥ spesifisert(e) nettadresse(r)" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Bygger arkivmellomlager '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Leser arkivmellomlager '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "Legger til arkiv '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Fjerner arkivet '%s'" @@ -2679,19 +2680,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Endrede konfigurasjonsfiler for %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm lagret %s som %s, men det var umulig Ã¥ finne noen forskjell" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2701,13 +2702,13 @@ "Her er de 25 fÃ¸rste avvikende linjene:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm opprettet %s som %s, men det var umulig Ã¥ finne noen forskjell" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2718,46 +2719,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s installasjon mislyktes" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm-resultat:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s installasjon ok" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Flere rpm-resultater:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s avinstallasjon mislyktes" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s avinstallasjon ok" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "opprettet sikkerhetskopi %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Installasjonen er avbrutt som angitt." @@ -2775,64 +2776,74 @@ msgstr "%s erstattet av %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s blir fjernet av brukeren.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s blir fjernet av et annet program. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s blir installert av brukeren.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s blir installert av et annet program. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "Fant ingen gyldig lÃ¸sning med ressurser basert pÃ¥ beste arktiektur." + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Fant ingen gyldig lÃ¸sning med ressurser basert pÃ¥ beste arktiektur." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Benytter bare ressurser basert pÃ¥ beste arkitektur.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Analyse av alle mulige ressurser tar lang tid, men kan resultere i et gyldig resultat." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Ugyldig informasjon" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s kreves av andre nÃ¸dvendige pakker" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s kreves av %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2842,7 +2853,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s er i konflikt med andre nÃ¸dvendige pakker" @@ -2851,14 +2862,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s er i konflikt med %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2868,24 +2879,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s gjÃ¸r andre nÃ¸dvendige pakker foreldet" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s forelder %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s forelder:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2894,7 +2905,7 @@ "Disse nÃ¸dvendige pakkene vil bli fjernet fra systemet." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s avhenger av andre nÃ¸dvendige pakker" @@ -2902,38 +2913,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s avhenger av %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s avhenger av:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Underordnet" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Kan ikke installere %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Ingen pakker inneholder %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2941,31 +2952,31 @@ "\n" "Det er ingen tilgjengelig ressurs som stÃ¸tter dette kravet." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "PÃ¥ grunn av problemene som er beskrevet over/under, vil ikke denne lÃ¸sningen lÃ¸se alle avhengigheter" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Kan ikke installere %s fordi den er i konflikt med %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s er ikke installert, og er merket som ikke installerbar" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Kan ikke installere %s pÃ¥ grunn av problemer med nÃ¸dvendige pakker" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2973,8 +2984,8 @@ msgstr "slett %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2982,79 +2993,79 @@ msgstr "Ikke installer %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s har ressurskrav som ikke er oppfylt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s mangler nÃ¸dvendige pakker" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s kan ikke installeres pÃ¥ grunn av manglende nÃ¸dvendige pakker" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s kreves av %s, men vil bli avinstallert" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s oppfyller krav om nÃ¸dvendige pakker for %s men beholdes pÃ¥ systemet" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Det er ikke nÃ¸dvendig Ã¥ installere %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Kan ikke installere %s, som er nÃ¸dvendig for %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Kan ikke installere %s, som er nÃ¸dvendig for %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s vil ikke be avinstallert fordi den fremdeles er nÃ¸dvendig" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s forelder %s. Men %s kan ikke fjernes fordi den er lÃ¥st." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Kan ikke installere %s fordi den skaper en konflikt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s kan ikke avinstalleres pÃ¥ grunn av konflikter med %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Kravet %s kan ikke lÃ¸ses." @@ -3115,7 +3126,7 @@ msgstr "Ikke installer eller slett berÃ¸rte nÃ¸dvendige ressurser" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "som krever %s for %s ved oppgradering av %s" @@ -3473,14 +3484,24 @@ msgid "Install missing resolvables" msgstr "Installer manglende nÃ¸dvendige pakker" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "La avhengighetslÃ¸ser kjÃ¸re med ALLE mulighetene." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "AngÃ¥ende alle ressurser med sammenfallende arkitektur." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "La avhengighetslÃ¸ser kjÃ¸re med ALLE mulighetene." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "AngÃ¥ende alle ressurser med sammenfallende arkitektur." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3531,6 +3552,16 @@ msgid "%s part of %s" msgstr "%s del av %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "Tidsavbrudd for dobbeltklikking " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "La avhengighetslÃ¸ser kjÃ¸re med ALLE mulighetene." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "fjern beskyttelse for alle nÃ¸dvendige pakker" @@ -4916,4 +4947,3 @@ "Filen %s har en ukjent kontrollsum \n" ".Forventet %s, men finner %s\n" " Vil du bruke filen likevel?" - Modified: trunk/libzypp/po/nl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nl.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/nl.po (original) +++ trunk/libzypp/po/nl.po Mon Sep 10 16:18:44 2007 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-24 13:24+0200\n" "Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n" "Language-Team: Dutch <nl(a)li.org>\n" @@ -119,36 +119,36 @@ msgid "History:" msgstr "Geschiedenis:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "controle van applydeltarpm is mislukt." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm mislukt." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Pakket %s voldoet niet aan integriteitscontrole. Wilt u het opnieuw proberen?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Geen url in bron." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Kan bestand %s niet leveren van bron %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Broncache van '%s' lezen" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Patch- en delta-prm's van broncache '%s' lezen" @@ -172,27 +172,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Cache van bron '%s' opschonen" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Geen geldige metadata gevonden op opgeven URL('s)" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Cache van bron '%s' bouwen" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Cache van bron '%s' lezen" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "Bron '%s' toevoegen" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Bron '%s' verwijderen" @@ -2645,19 +2646,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Configuratiebestanden gewijzigd voor %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm sloeg %s op als %s, maar het was niet mogelijk om het verschil te achterhalen" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2667,13 +2668,13 @@ "Dit zijn de eerste 25 regels die verschillend zijn:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm maakte %s aan als %s, maar het was niet mogelijk om het verschil te achterhalen" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2684,47 +2685,47 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Installeren van %s is mislukt" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm-uitvoer:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s is met succes geÃ¯nstalleerd" # /usr/lib/YaST2/clients/lan_inetd_custom.ycp:162 -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Aanvullende rpm-uitvoer:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Verwijderen van %s is mislukt" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s is met succes verwijderd" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "reservekopie %s aangemaakt" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Installatie is afgebroken volgens de instructies." @@ -2742,64 +2743,74 @@ msgstr "%s vervangen door %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s zal worden verwijderd door de gebruiker.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s zal worden verwijderd door een ander programma (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s zal worden geÃ¯nstalleerd door de gebruiker.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s zal worden geÃ¯nstalleerd door een ander programma (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "Geen geldige oplossing gevonden met alleen oplosbaren van de beste architectuur." + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Geen geldige oplossing gevonden met alleen oplosbaren van de beste architectuur." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Bij deze draai zijn alleen oplosbaren met de beste architectuur overwogen.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Het overwegen van alle mogelijke oplosbaren neemt enige tijd in beslag maar kan een bruikbaar resultaat opleveren." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Ongeldige informatie" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s is nodig voor andere oplosbare" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s is nodig voor %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2809,7 +2820,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s is in conflict met andere oplosbaren" @@ -2818,14 +2829,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s is in conflict met %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2835,24 +2846,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s vervangt andere oplosbaren" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s vervangt %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s vervangt: %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2861,7 +2872,7 @@ "Deze oplosbaren zullen worden verwijderd van het systeem." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s is afhankelijk van andere oplosbaren" @@ -2869,38 +2880,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s is afhankelijk van %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s is afhankelijk van: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Subonderdeel van" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Kan %s niet installeren" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Niemand levert %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2908,31 +2919,31 @@ "\n" "Er is momenteel geen gegevensbron beschikbaar die deze vereiste aanlevert." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Vanwege bovenstaande/onderstaande problemen zal deze oplossing niet alle afhankelijkheden verhelpen." -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Kan %s niet installeren omdat het in conflict is met %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s is niet geÃ¯nstalleerd en is gemarkeerd als deÃ¯nstalleerbaar" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "%s kan niet worden geÃ¯nstalleerd vanwege afhankelijkheidsproblemen" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2940,8 +2951,8 @@ msgstr "%s verwijderen" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2949,79 +2960,79 @@ msgstr "%s niet installeren" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "er is niet voldaan aan de vereisten voor %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "afhankelijkheden voor %s ontbreken" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s kan niet worden geÃ¯nstalleerd omdat afhankelijkheden ontbreken" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s lost de afhankelijkheden van %s op, maar zal worden gedeÃ¯nstalleerd." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s lost de afhankelijkheden van %s op, maar zal op het systeem blijven staan" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s hoeft niet te worden geÃ¯nstalleerd" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s zal niet worden gedeÃ¯nstalleerd omdat het nog steeds vereist wordt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s vervangt %s. Maar %s kan niet worden verwijderd omdat het is vergrendeld." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Kan %s niet installeren omdat het conflicten geeft" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s kan niet worden geÃ¯nstalleerd vanwege conflicten met %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Aan vereiste %s kan niet worden voldaan." @@ -3082,7 +3093,7 @@ msgstr "Installeer of verwijder de desbetreffende oplosbare pakketten niet" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "voor het verkrijgen van %s voor %s bij het upgraden van %s" @@ -3440,14 +3451,24 @@ msgid "Install missing resolvables" msgstr "Ontbrekende oplosbare pakketten installeren" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Alle oplosbaren met geschikte architectuur worden overwogen." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "Alle oplosbaren met geschikte architectuur worden overwogen." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3498,6 +3519,16 @@ msgid "%s part of %s" msgstr "%s onderdeel van %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "Time-out voor dubbelklikken " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "alle oplosbare pakketten ontgrendelen" @@ -4792,4 +4823,3 @@ "Bestand %s heeft een ongeldige checksum.\n" "%s verwacht, %s gevonden\n" "Wilt u het toch gebruiken?" - Modified: trunk/libzypp/po/pa.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pa.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/pa.po (original) +++ trunk/libzypp/po/pa.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp.pa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-23 19:28+0530\n" "Last-Translator: A S Alam <aalam(a)users.sf.net>\n" "Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\n" @@ -115,36 +115,36 @@ msgid "History:" msgstr "à¨à¨¤à©à¨¤:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm à¨à©à©±à¨ à¨«à©à¨²à©à¨¹ à¨¹à©à¥¤" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm à¨«à©à¨²à©à¨¹ à¨¹à©à¨à¨à¥¤" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "à¨ªà©à¨à©à¨ %s à¨à¨à¨à©à¨à¨°à©à¨à© à¨à©à¨ à¨à¨°à¨¨ à¨²à¨ à¨«à©à¨²à©à¨¹ à¨¹à©à¥¤ à¨à© à¨¤à©à¨¸à©à¨ à¨®à©à©-à¨à©à¨¸à¨¼à¨¿à¨¸à¨¼ à¨à¨°à¨¨à© à¨à¨¾à¨¹à©à©°à¨¦à© à¨¹à©?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "à¨°à¨¿à¨ªà©à¨à¨¼à¨à¨°à© à¨µà¨¿à©±à¨ à¨à©à¨ URL à¨¨à¨¹à©à¨ à¨¹à©à¥¤" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "'%s' à¨°à¨¿à¨ªà©à¨à¨¼à¨à¨°à© à¨à©à¨à© à¨ªà©à©à¨¹à© à¨à¨¾ à¨°à¨¹à© à¨¹à©" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -168,27 +168,28 @@ msgid "Cleaning repository '%s' cache" msgstr "à¨°à¨¿à¨ªà©à¨à¨¼à¨à¨°à© '%s' à¨à©à¨à© à¨¸à¨¾à¨«à¨¼ à¨à©à¨¤à© à¨à¨¾ à¨°à¨¹à© à¨¹à©" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "à¨°à¨¿à¨ªà©à¨à¨¼à¨à¨°à© '%s' à¨à©à¨à© à¨¬à¨¿à¨²à¨¡ à¨à©à¨¤à© à¨à¨¾ à¨°à¨¹à© à¨¹à©" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "à¨°à¨¿à¨ªà©à¨à¨¼à¨à¨°à© '%s' à¨à©à¨à© à¨ªà©à©à¨¹à© à¨à¨¾ à¨°à¨¹à© à¨¹à©" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "à¨°à¨¿à¨ªà©à¨à¨¼à¨à¨°à© '%s' à¨¸à¨¼à¨¾à¨®à¨² à¨à©à¨¤à© à¨à¨¾ à¨°à¨¹à© à¨¹à©" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "à¨°à¨¿à¨ªà©à¨à¨¼à¨à¨°à© '%s' à¨¹à¨à¨¾à¨ à¨à¨¾ à¨°à¨¹à© à¨¹à©à¥¤" @@ -2639,19 +2640,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s à¨²à¨ à¨¸à©°à¨°à¨à¨¨à¨¾ à¨«à¨¾à¨à¨²à¨¾à¨ à¨¬à¨¦à¨²à©à¨à¨:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2659,13 +2660,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2674,46 +2675,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨«à©à¨²à©à¨¹ à¨¹à©" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm à¨à¨à¨à¨ªà©à©±à¨:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨¹à©à¨à¨" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "à¨¹à©à¨° rpm à¨à¨à¨à¨ªà©à©±à¨:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s à¨¹à¨à¨¾à¨à¨£à¨¾ à¨«à©à¨²à©à¨¹" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s à¨¹à¨à¨¾à¨à¨" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "%s à¨¦à¨¾ à¨¬à©à¨à¨à©±à¨ª à¨¬à¨£à¨¿à¨" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ à¨¹à¨¦à¨¾à¨à¨¤à¨¾à¨ à¨®à©à¨¤à¨¾à¨¬à¨ à¨à¨§à©à¨°à© à¨à©±à¨¡à© à¨à¨ à¨¹à©à¥¤" @@ -2731,64 +2732,74 @@ msgstr "%s à¨¨à©à©° %s à¨¨à¨¾à¨² à¨¬à¨¦à¨²à¨¿à¨ à¨à¨¿à¨" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s à¨¨à©à©° à¨¯à©à¨à¨¼à¨° à¨µà¨²à©à¨ à¨¹à¨à¨¾à¨à¨ à¨à¨¾à¨µà©à¨à¨¾à¥¤\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s à¨¨à©à©° à¨¹à©à¨° à¨à¨¾à¨°à¨ à¨µà¨²à©à¨ à¨¹à¨à¨¾à¨à¨ à¨à¨¾à¨µà©à¨à¨¾à¥¤ (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s à¨¨à©à©° à¨¯à©à¨à¨¼à¨° à¨µà¨²à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾à¨µà©à¨à¨¾à¥¤\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "à¨à¨²à¨¤ à¨à¨¾à¨£à¨à¨¾à¨°à©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s %s à¨°à¨¾à¨¹à©à¨ à¨à¨¾à¨¹à©à¨¦à¨¾ à¨¹à©" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2798,7 +2809,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2807,14 +2818,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s à¨¦à¨¾ %s à¨¨à¨¾à¨² à¨à¨ªà¨µà¨¾à¨¦ à¨¹à©" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2824,24 +2835,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2850,7 +2861,7 @@ "à¨à¨¹ à¨¹à©±à¨²-à¨à¨°à¨¨-à¨¯à©à¨ à¨¸à¨¿à¨¸à¨à¨® à¨¤à©à¨ à¨¹à¨à¨¾à¨ à¨à¨¾à¨£à¨à©à¥¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2858,38 +2869,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s %s à¨à©±à¨¤à© à¨¨à¨¿à¨°à¨à¨° à¨¹à©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s à¨¨à¨¿à¨°à¨à¨° à¨¹à©: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "à¨à¨¾à¨à¨²à¨¡" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "%s à¨à©à¨ à¨¨à¨¹à©à¨ à¨¦à¨¿à©°à¨¦à¨¾ à¨¹à©" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2897,31 +2908,31 @@ "\n" "à¨à¨¹ à¨²à©à© à¨¨à©à©° à¨ªà©à¨°à© à¨à¨°à¨¨ à¨²à¨ à¨à©à¨ à¨¸à¨°à©à¨¤ à¨à¨ªà¨²à©±à¨¬à¨§ à¨¨à¨¹à©à¨ à¨¹à©à¥¤" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s à¨¨à©à©° à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¸ à¨¦à¨¾ %s à¨¨à¨¾à¨² à¨à¨ªà¨µà¨¾à¨¦ à¨¹à©à¥¤" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨¹à© à¨à¨¤à© à¨à¨£-à¨à©°à¨¸à¨à¨¾à¨²à¨¯à©à¨ à¨®à¨¾à¨°à¨ à¨à©à¨¤à¨¾ à¨à¨¿à¨" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "à¨¨à¨¿à¨°à¨à¨°à¨¤à¨¾ à¨¸à¨®à©±à¨¸à¨¿à¨à¨µà¨¾à¨ à¨à¨°à¨à© %s à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾ à¨¹à©à¥¤" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2929,8 +2940,8 @@ msgstr "%s à¨¹à¨à¨¾à¨" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2938,79 +2949,79 @@ msgstr "%s à¨¨à©à©° à¨¨à¨¾ à¨¹à¨à¨¾à¨" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s à¨²à¨ à¨¨à¨¿à¨°à¨à¨°à¨¤à¨¾ à¨à¨§à©à¨°à© à¨¹à©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s à¨¨à©à©° à¨¨à¨¿à¨°à¨à¨°à¨¤à¨¾ à¨à¨§à©à¨°à© à¨¹à©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ à¨¦à© à¨²à©à© à¨¨à¨¹à©à¨ à¨¹à©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%s à¨¨à©à©° %s à¨¦à© à¨¨à¨¿à¨°à¨à¨°à¨¤à¨¾ à¨ªà©à¨°à© à¨¨à¨¾ à¨¹à©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s à¨¨à©à©° %s à¨¦à© à¨¨à¨¿à¨°à¨à¨°à¨¤à¨¾ à¨ªà©à¨°à© à¨¨à¨¾ à¨¹à©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s à¨¨à©à©° à¨à¨£-à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾à¨µà©à¨à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¹ à¨¹à¨¾à¨²à© à¨µà© à¨²à©à©à©à¨¦à¨¾ à¨¹à©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%s à¨¨à©à©° à¨à©°à¨¸à¨à¨¾à¨² à¨¨à¨¹à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ à¨¸à¨à¨¦à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¹ à¨à¨ªà¨µà¨¾à¨¦ à¨ªà©à¨¦à¨¾ à¨à¨°à¨¦à¨¾ à¨¹à©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "%s à¨²à©à© à¨ªà©à¨°à© à¨¨à¨¹à©à¨ à¨à©à¨¤à© à¨à¨¾ à¨¸à¨à¨¦à© à¨¹à©à¥¤" @@ -3071,7 +3082,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3429,14 +3440,23 @@ msgid "Install missing resolvables" msgstr "à¨à©à©°à¨® à¨¹à©±à¨²-à¨¯à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à©" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "à¨¸à©à¨²à¨µà¨° à¨¨à©à©° _à¨¸à¨_ à¨¸à©°à¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ à¨¨à¨¾à¨² à¨à¨²à¨¾à¨" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "à¨¸à©à¨²à¨µà¨° à¨¨à©à©° _à¨¸à¨_ à¨¸à©°à¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ à¨¨à¨¾à¨² à¨à¨²à¨¾à¨" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3487,6 +3507,15 @@ msgid "%s part of %s" msgstr "%s %s à¨¦à¨¾ à¨à¨¾à¨ à¨¹à©" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "à¨¸à©à¨²à¨µà¨° à¨¨à©à©° _à¨¸à¨_ à¨¸à©°à¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ à¨¨à¨¾à¨² à¨à¨²à¨¾à¨" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "à¨¸à¨ à¨¹à©±à¨²à¨¯à©à¨ à¨à¨£à¨²à¨¾à¨ à¨à¨°à©" @@ -4780,4 +4809,3 @@ "à¨«à¨¾à¨à¨² %s à¨¦à¨¾ à¨à©à¨à¨¸à¨® à¨à¨²à¨¤ à¨¹à©à¥¤\n" "%s à¨¦à© à¨²à©à© à¨¸à©, à¨®à¨¿à¨²à¨¿à¨ %s\n" "à¨à© à¨«à¨¾à¨à¨² à¨à©°à¨ à¨¹à© à¨µà¨°à¨¤à¨£à© à¨¹à©?" - Modified: trunk/libzypp/po/pl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pl.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/pl.po (original) +++ trunk/libzypp/po/pl.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-24 08:53+0100\n" "Last-Translator: wadim dziedzic <wdziedzic(a)aviary.pl>\n" "Language-Team: <pl(a)li.org>\n" @@ -114,36 +114,36 @@ msgid "History:" msgstr "Historia:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Sprawdzenie applydeltarpm zakoÅczone niepowodzeniem." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm zakoÅczone niepowodzeniem." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Pakiet %s nie speÅnia testu integralnoÅci. Czy sprÃ³bowaÄ ponownie?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "W repozytorium nie ma Å¼adnego adresu URL." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr " Nie moÅ¼na pobraÄ pliku %s z repozytorium %s." -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Wczytywanie pamiÄci podrÄcznej repozytorium \"%s\"" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Wczytywanie pakietÃ³w rpm z pamiÄci podrÄcznej repozytorium \"%s\"" @@ -167,27 +167,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Czyszczenie pamiÄci podrÄcznej repozytorium \"%s\"" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Pod podanymi adresami URL nie znaleiono poprawnych metadanych." -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Budowanie pamiÄci podrÄcznej repozytorium \"%s\"" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Wczytywanie pamiÄci podrÄcznej repozytorium \"%s\"" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "Dodawanie repozytorium \"%s\"" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Usuwanie repozytorium '%s'" @@ -2660,19 +2661,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Zmienione pliki konfiguracyjne dla %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm zapisaÅ %s jako %s, ale moÅ¼na byÅo okreÅliÄ rÃ³Å¼nicy" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2682,13 +2683,13 @@ "Oto pierwszych 25 linii rÃ³Å¼nicy:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm utworzyÅ %s jako %s, ale moÅ¼na byÅo okreÅliÄ rÃ³Å¼nicy" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2699,46 +2700,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Instalacja %s nie powiodÅa siÄ" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "WyjÅcie rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "Pakiet %s poprawnie zainstalowany" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Dodatkowe wyjÅcie rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "UsuniÄcie %s nie powiodÅo siÄ" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "UsuniÄcie %s powiodÅo siÄ" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "utworzono zapasowy %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Instalacja przerwana zgodnie z Å¼yczeniem." @@ -2756,64 +2757,74 @@ msgstr "%s zastÄpiony przez %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s zostanie usuniÄty przez uÅ¼ytkownika.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s zostanie usuniÄty przez innÄ aplikacjÄ. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s zostanie zainstalowany przez uÅ¼ytkownika.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s zostanie zainstalowany przez innÄ aplikacjÄ. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "Brak rozwiÄzania z tylko z obiektami z najlepszÄ architekturÄ." + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "Brak rozwiÄzania z tylko z obiektami z najlepszÄ architekturÄ." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "W tym przebiegu pod uwagÄ wziÄto tylko obiekty z najlepszÄ architekturÄ.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "UwzglÄdnienie wszystkich obiektÃ³w moÅ¼e daÄ poprawne rozwiÄzanie, ale wymaga czasu." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "NieprawidÅowa informacja" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s jest wymagany przez inne pakiety" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s jest wymagany przez %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2823,7 +2834,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s jest w konflikcie z innymi pakietami" @@ -2832,14 +2843,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s jest w konflikcie z %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2849,24 +2860,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s dezaktualizuje inne pakiety" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s dezaktualizuje %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s dezaktualizuje:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2875,7 +2886,7 @@ "Te pakiety zostanÄ usuniÄte z systemu." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s zaleÅ¼y od innych pakietÃ³w" @@ -2883,38 +2894,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s zaleÅ¼y od %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s zaleÅ¼y od:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Potomek" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Nie moÅ¼na zainstalowaÄ %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Å»aden nie dostarcza %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2922,31 +2933,31 @@ "\n" "Nie ma dostÄpnego zasobu, ktÃ³ry speÅniaÅby te wymaganie." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Z powodu powyÅ¼ej/poniÅ¼ej opisanych problemÃ³w, rozwiÄzanie to nie bÄdzie mogÅo zaspokoiÄ wszystkich zaleÅ¼noÅci" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Nie moÅ¼na zainstalowaÄ %s, poniewaÅ¼ jest w konflikcie z %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s nie jest zainstalowany i zostaÅ oznaczony jako nie do odinstalowania" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Nie moÅ¼na zainstalowaÄ %s z powodu problemÃ³w z zaleÅ¼noÅciami" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2954,8 +2965,8 @@ msgstr "usuÅ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2963,79 +2974,79 @@ msgstr "nie instaluj %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s ma niespeÅnione wymagania" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s ma brakujÄce zaleÅ¼noÅci" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s nie moÅ¼e zostaÄ zainstalowany z powodu brakujÄcych zaleÅ¼noÅci" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s speÅnia zaleÅ¼noÅci %s, ale zostanie odinstalowany" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s speÅnia zaleÅ¼noÅci %s, ale bÄdzie pozostawiony" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Nie ma potrzeby instalowaÄ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Nie moÅ¼na zainstalowaÄ %s by speÅniÄ zaleÅ¼noÅci %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Nie moÅ¼na zainstalowaÄ %s by speÅniÄ zaleÅ¼noÅci %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s nie zostanie odinstalowany, poniewaÅ¼ jest nadal wymagany" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s dezaktualizuje %s, ale %s nie moÅ¼e zostaÄ usuniÄty, poniewaÅ¼ jest zablokowany." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Nie moÅ¼na zainstalowaÄ %s, poniewaÅ¼ jest w konflikcie" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s jest nie do odinstalowania z powodu konfliktu z %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Wymaganie %s nie moÅ¼e byÄ speÅnione." @@ -3096,7 +3107,7 @@ msgstr "Nie instaluj ani nie usuwaj danych obiektÃ³w" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "dla wymagania %s dla %s, podczas aktualizacji %s" @@ -3454,14 +3465,24 @@ msgid "Install missing resolvables" msgstr "Zainstaluj brakujÄce pakiety" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "Uruchom rozwiÄzywanie z WSZYSTKIMI moÅ¼liwoÅciami" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Z uwzglÄdnieniem wszystkich obiektÃ³w o kompatybilnej architekturze." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "Uruchom rozwiÄzywanie z WSZYSTKIMI moÅ¼liwoÅciami" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "Z uwzglÄdnieniem wszystkich obiektÃ³w o kompatybilnej architekturze." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3512,6 +3533,15 @@ msgid "%s part of %s" msgstr "%s jest czÄÅciÄ %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "Uruchom rozwiÄzywanie z WSZYSTKIMI moÅ¼liwoÅciami" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "Odblokuj wszystkie pakiety rozwiÄzywalne" Modified: trunk/libzypp/po/pt.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/pt.po (original) +++ trunk/libzypp/po/pt.po Mon Sep 10 16:18:44 2007 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-24 13:47+0100\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-06 12:45+0100\n" "Last-Translator: Carlos GonÃ§alves <carlos(a)pinguix.com>\n" "Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -117,36 +117,36 @@ msgid "History:" msgstr "HistÃ³rico:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "falhou a verificaÃ§Ã£o applydeltarpm." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "falhou o applydeltarpm." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "O pacote %s falhou a verificaÃ§Ã£o de integridade. Pretende tentar novamente?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Nenhum url no repositÃ³rio." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "NÃ£o Ã© possÃvel fornecer o ficheiro %s do repositÃ³rio %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "A ler cache do repositÃ³rio '%s'" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "A ler as correcÃ§Ãµes e delta rpms da cache do repositÃ³rio '%s'" @@ -170,27 +170,28 @@ msgid "Cleaning repository '%s' cache" msgstr "A limpar a cache do repositÃ³rio '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "NÃ£o foi encontrada uma metadata vÃ¡lida no(s) URL(s) especificado(s)" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "A construir a cache do repositÃ³rio '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "A ler a cache do repositÃ³rio '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "A Adicionar repositÃ³rio '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "A remover o repositÃ³rio '%s'" @@ -2723,19 +2724,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Ficheiros de configuraÃ§Ã£o modificados para %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "o rpm %s foi guardado como %s, mas foi impossÃvel determinar a diferenÃ§a" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2745,13 +2746,13 @@ "Tem as primeiras 25 linhas diferentes:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "o rpm %s foi criado como %s, mas foi impossÃvel determinar a diferenÃ§a" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2762,46 +2763,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Falhou a instalaÃ§Ã£o de %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Resultado do rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s instalado com sucesso" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Resultado adicional do rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Falha ao remover %s " #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s removido com sucesso" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "Criar CÃ³pia de SeguranÃ§a %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "A instalaÃ§Ã£o foi interrompida conforme indicado." @@ -2819,64 +2820,74 @@ msgstr "%s Ã© substituÃdo por %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s serÃ¡ apagado pelo utilizador.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s serÃ¡ apagado por outra aplicaÃ§Ã£o. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s serÃ¡ instalado pelo utilizador.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s serÃ¡ instalado por outra aplicaÃ§Ã£o (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "NÃ£o foi encontrada uma soluÃ§Ã£o vÃ¡lida em %d segundos" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "O solvente atingiu o tempo-limite definido" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "NÃ£o foi encontrada uma soluÃ§Ã£o vÃ¡lida apenas com os resolÃºveis da melhor arquitectura." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Nesta execuÃ§Ã£o apenas foram tomados em consideraÃ§Ã£o os resolÃºveis com a melhor arquitectura.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Ter em conta todos os resolÃºveis leva tempo, mas pode alcanÃ§ar um resultado vÃ¡lido." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "InformaÃ§Ã£o InvÃ¡lida" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s Ã© necessÃ¡rio por outros resolÃºveis" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s necessita o %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2886,7 +2897,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s conflitua com outros resolÃºveis" @@ -2895,14 +2906,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s em conflicto com %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2912,24 +2923,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s torna obsoletos outros resolÃºveis" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s obsoleto %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s obsoleto:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2938,7 +2949,7 @@ "Estes resolÃºveis serÃ£o apagados do sistema." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s depende de outros resolÃºveis" @@ -2946,38 +2957,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s depende de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s depende de:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Filho de" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "NÃ£o foi possÃvel instalar %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "NÃ£o fornece %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2985,31 +2996,31 @@ "\n" "NÃ£o existe nenhum recurso disponÃvel com suporte para este requisito." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Devido aos problemas descritos acima/abaixo, esta resoluÃ§Ã£o nÃ£o irÃ¡ solucionar todas as dependÃªncias" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "NÃ£o foi possÃvel instalar %s devido a um conflicto com %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "o %s nÃ£o estÃ¡ instalado e foi marcado como possÃvel de desinstalar" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "NÃ£o foi possÃvel instalar %s devido a problemas de dependÃªncias" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3017,8 +3028,8 @@ msgstr "apagar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3026,79 +3037,79 @@ msgstr "nÃ£o instalar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s tem requisitos nÃ£o satisfeitos" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s tem dependÃªncias em falta" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s nÃ£o pode ser instalado devido a dependÃªncias em falta" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s satisfaz as dependÃªncias de %s mas vai ser desinstalado" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s satisfaz as dependÃªncias de %s mas vai ser mantido no seu sistema" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "NÃ£o Ã© necessÃ¡rio instalar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "NÃ£o Ã© possÃvel instalar %s para satisfazer as dependÃªncias de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "NÃ£o Ã© possÃvel instalar %s para satisfazer as dependÃªncias de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s nÃ£o irÃ¡ ser desinstalado porque ainda Ã© requerido" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s torna %s obsoleto. Mas %s nÃ£o pode ser apagado porque estÃ¡ trancado." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "NÃ£o foi possÃvel instalar %s devido a estar em conflito" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "nÃ£o Ã© possÃvel desinstalar %s devido a conflitos com %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "O requisito %s nÃ£o pÃ´de ser satisfeito." @@ -3159,7 +3170,7 @@ msgstr "NÃ£o instalar ou apagar os resolÃºveis em causa" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "por requerer %s para %s quando esta a actualizar %s" @@ -3518,14 +3529,22 @@ msgid "Install missing resolvables" msgstr "Instalar resolÃºveis em falta" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "Fazer o solvente executar com TODAS as possibilidades." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Tomar em consideraÃ§Ã£o todos os resolÃºveis com uma arquitectura compatÃvel." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "Fazer um solvente executar apenas com a melhor arquitectura." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "Tomar em consideraÃ§Ã£o todos os resolÃºveis apenas com a melhor arquitectura." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3576,6 +3595,14 @@ msgid "%s part of %s" msgstr "%s faz parte de %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "Tempo-limite duplo" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "Iniciar a execuÃ§Ã£o do prÃ³ximo solvente com tempo-limite duplo." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "destrancar todos os resolÃºveis" Modified: trunk/libzypp/po/pt_BR.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt_BR.po?rev=7166&r1=… ============================================================================== --- trunk/libzypp/po/pt_BR.po (original) +++ trunk/libzypp/po/pt_BR.po Mon Sep 10 16:18:44 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-05-31 14:44\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -114,37 +114,37 @@ msgid "History:" msgstr "XF86History" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Falha na verificaÃ§Ã£o de applydeltarpm." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "Falha de applydeltarpm." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Falha na verificaÃ§Ã£o de integridade do pacote %s. Deseja repetir o download?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "Arquivo %1 nÃ£o encontrado no repositÃ³rio." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "ImpossÃvel fornecer %s a partir de %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -169,27 +169,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "Adicionando recursos" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Adicionando recursos" @@ -2640,19 +2641,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Arquivos de configuraÃ§Ã£o alterados para %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm gravou %s como %s, mas nÃ£o foi possÃvel determinar a diferenÃ§a" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2662,13 +2663,13 @@ "Aqui estÃ£o as 25 primeiras linhas de diferenÃ§a:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm criou %s como %s, mas nÃ£o foi possÃvel determinar a diferenÃ§a" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2679,46 +2680,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Falha na instalaÃ§Ã£o de %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "saÃda de rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s instalado com Ãªxito" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "SaÃda de rpm adicional:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Falha na remoÃ§Ã£o de %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s removido com Ãªxito" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "backup %s criado" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "A instalaÃ§Ã£o foi interrompida conforme instruÃ§Ãµes." @@ -2736,7 +2737,7 @@ msgstr "%s substituÃdo por %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2744,58 +2745,68 @@ "Esses resolvÃveis serÃ£o apagados do sistema." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s nÃ£o serÃ¡ desinstalado porque ainda Ã© necessÃ¡rio" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "InformaÃ§Ãµes invÃ¡lidas" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s Ã© necessÃ¡rio a outros resolvÃveis" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s Ã© necessÃ¡rio a %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2805,7 +2816,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s estÃ¡ em conflito com outros resolvÃveis" @@ -2814,14 +2825,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s conflitos com %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2831,24 +2842,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s torna outros resolvÃveis obsoletos" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s torna obsoleto %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s torna obsoleto:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2857,7 +2868,7 @@ "Esses resolvÃveis serÃ£o apagados do sistema." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s depende de outros resolvÃveis" @@ -2865,38 +2876,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s depende de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s depende de:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Filho de " #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "NÃ£o Ã© possÃvel instalar %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Nenhum fornece %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2905,32 +2916,32 @@ "\n" "NÃ£o hÃ¡ nenhum recurso disponÃvel que atenda a esse requisito." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Devido aos problemas descritos acima/abaixo, essa soluÃ§Ã£o nÃ£o resolverÃ¡ todas as dependÃªncias" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "NÃ£o Ã© possÃvel instalar %s porque ele entra em conflito com %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s nÃ£o estÃ¡ instalado e foi marcado como nÃ£o instalÃ¡vel" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "NÃ£o Ã© possÃvel instalar %s devido a problemas de dependÃªncia" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2938,8 +2949,8 @@ msgstr "apagar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2947,79 +2958,79 @@ msgstr "nÃ£o instalar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s tem requisitos nÃ£o atendidos" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s tem dependÃªncias ausentes" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s nÃ£o pode ser instalado devido Ã ausÃªncia de dependÃªncias" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s preenche as dependÃªncias de %s, mas serÃ¡ desinstalado" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s preenche as dependÃªncias de %s, mas serÃ¡ mantido no sistema" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "NÃ£o Ã© necessÃ¡rio instalar %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "NÃ£o Ã© possÃvel instalar %s para preencher as dependÃªncias de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "NÃ£o Ã© possÃvel instalar %s para preencher as dependÃªncias de %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s nÃ£o serÃ¡ desinstalado porque ainda Ã© necessÃ¡rio" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s torna %s obsoleto. Mas %s nÃ£o pode ser apagado porque estÃ¡ bloqueado." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "NÃ£o Ã© possÃvel instalar %s porque ele estÃ¡ em conflito" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s nÃ£o pode ser desinstalado devido a conflitos com %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3082,7 +3093,7 @@ msgstr "NÃ£o instalar ou apagar resolvÃveis de interesse" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "para exigir %s para %s ao fazer o upgrade de %s" @@ -3440,14 +3451,22 @@ msgid "Install missing resolvables" msgstr "Instalar resolvÃveis ausentes" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3498,6 +3517,15 @@ msgid "%s part of %s" msgstr "%s parte de %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "Tempo de Espera de Clique Duplo " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "desbloquear todos os resolvÃveis" Modified: trunk/libzypp/po/ro.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ro.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ro.po (original) +++ trunk/libzypp/po/ro.po Mon Sep 10 16:18:44 2007 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2003-02-25 15:04+0100\n" "Last-Translator: <i18n(a)suse.de>\n" "Language-Team: Romanian <i18n(a)suse.de>\n" @@ -110,36 +110,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -163,27 +163,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2894,19 +2895,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "Salvez fiÅierele de configuraÅ£ie" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2914,13 +2915,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2929,12 +2930,12 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "InstaleazÄ &inetd" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 #, fuzzy msgid "rpm output:" msgstr "" @@ -2943,36 +2944,36 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "MÄrime instalatÄ:" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "&OpÅ£iuni ipppd adiÅ£ionale" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, fuzzy, c-format msgid "created backup %s" msgstr "CreeazÄ arhiva backup" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2990,64 +2991,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3055,7 +3066,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, fuzzy, c-format msgid "%s conflicts with other resolvables" msgstr "%1 intrÄ Ã®n conflict cu %2" @@ -3064,14 +3075,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, fuzzy, c-format msgid "%s conflicts with %s" msgstr "%1 intrÄ Ã®n conflict cu %2" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, fuzzy, c-format msgid "" "%s conflicts with:\n" @@ -3079,31 +3090,31 @@ msgstr "%1 intrÄ Ã®n conflict cu %2" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3111,68 +3122,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "InstaleazÄ %1" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%1 intrÄ Ã®n conflict cu %2" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Acest pachet nu este instalat Åi nici nu va fi instalat." #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3180,8 +3191,8 @@ msgstr "Återge %1" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3189,79 +3200,79 @@ msgstr "InstaleazÄ %1" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Verific dependenÅ£ele..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, fuzzy, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Verific dependenÅ£ele..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "Instalare automatÄ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Verific dependenÅ£ele..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "Verific dependenÅ£ele..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, fuzzy, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%1 intrÄ Ã®n conflict cu %2" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3325,7 +3336,7 @@ msgstr "%1 intrÄ Ã®n conflict cu %2" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3688,14 +3699,22 @@ msgid "Install missing resolvables" msgstr "Instalez driver-ul..." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3746,6 +3765,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/ru.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ru.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ru.po (original) +++ trunk/libzypp/po/ru.po Mon Sep 10 16:18:44 2007 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-24 14:01+0400\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-09 12:11+0400\n" "Last-Translator: Nikolay Derkach <nderkach(a)gmail.com>\n" "Language-Team: <opensuse-ru(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -121,36 +121,36 @@ msgid "History:" msgstr "ÐÑÑÐ¾ÑÐ¸Ñ:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "ÑÐ±Ð¾Ð¹ Ð¿ÑÐ¸ Ð¿ÑÐ¾Ð²ÐµÑÐºÐµ applydeltarpm." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "ÑÐ±Ð¾Ð¹ Ð² applydeltarpm." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Ð¡Ð±Ð¾Ð¹ Ð¿ÑÐ¸ Ð¿ÑÐ¾Ð²ÐµÑÐºÐµ ÑÐµÐ»Ð¾ÑÑÐ½Ð¾ÑÑÐ¸ Ð¿Ð°ÐºÐµÑÐ° %s. ÐÐ¾Ð¿ÑÐ¾Ð±Ð¾Ð²Ð°ÑÑ Ð·Ð°Ð½Ð¾Ð²Ð¾?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "ÐÐµÑ url Ð² ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ð¸." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÑÐ°Ð¹Ð» %s Ð¸Ð· ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ñ %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Ð§Ð¸ÑÐ°ÐµÑÑÑ ÐºÑÑ ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ñ '%s'" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Ð§Ð¸ÑÐ°ÑÑÑÑ Ð¸ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ delta rpm Ð¸Ð· '%s' ÐºÑÑÐ° ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ñ" @@ -174,27 +174,28 @@ msgid "Cleaning repository '%s' cache" msgstr "ÐÑÐ¸ÑÐ°ÐµÑÑÑ ÐºÑÑ ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ñ '%s'" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "ÐÐµÐ¹ÑÑÐ²ÑÑÑÐ¸Ðµ Ð¼ÐµÑÐ°Ð´Ð°Ð½Ð½ÑÐµ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð¿Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¼ URL" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Ð¡Ð¾Ð±Ð¸ÑÐ°ÐµÑÑÑ ÐºÑÑ ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ñ '%s'" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Ð§Ð¸ÑÐ°ÐµÑÑÑ ÐºÑÑ ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ñ '%s'" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "ÐÐ¾Ð±Ð°Ð²Ð»ÑÐµÑÑÑ ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ð¹ '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Ð£Ð´Ð°Ð»ÑÐµÑÑÑ ÑÐµÐ¿Ð¾Ð·Ð¸ÑÐ°ÑÐ¸Ð¹ '%s'" @@ -2698,19 +2699,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¸ Ð´Ð»Ñ %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm ÑÐ¾ÑÑÐ°Ð½ÐµÐ½ %s ÐºÐ°Ðº %s, Ð½Ð¾ Ð½Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð·Ð»Ð¸ÑÐ¸Ñ" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2720,13 +2721,13 @@ "ÐÐµÑÐ²ÑÐµ 25 ÑÑÑÐ¾Ðº ÑÐ°Ð·Ð»Ð¸ÑÐ¸Ð¹:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm ÑÐ¾Ð·Ð´Ð°Ð» %s ÐºÐ°Ðº %s, Ð½Ð¾ ÑÑÐ¾ Ð±ÑÐ»Ð¾ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ°Ð·Ð»Ð¸ÑÐ¸Ñ" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2737,48 +2738,48 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "ÑÐ±Ð¾Ð¹ Ð¿ÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐµ %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "Ð²ÑÑÐ¾Ð´ rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ ÑÑÐ¿ÐµÑÐ½Ð¾" # dialog caption -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¹ Ð²ÑÐ²Ð¾Ð´ rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "ÑÐ±Ð¾Ð¹ Ð¿ÑÐ¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ð¸ %s " #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s ÑÐ´Ð°Ð»ÐµÐ½ ÑÑÐ¿ÐµÑÐ½Ð¾" # Proposal for backup during update #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "ÑÐ¾Ð·Ð´Ð°Ð½Ð½Ð°Ñ ÑÐµÐ·ÐµÑÐ²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð¿ÑÐµÑÐ²Ð°Ð½Ð° ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¸." @@ -2796,64 +2797,74 @@ msgstr "%s Ð·Ð°Ð¼ÐµÐ½ÐµÐ½ Ð½Ð° %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s Ð±ÑÐ´ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s Ð±ÑÐ´ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÐ¼. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð° %d ÑÐµÐºÑÐ½Ð´" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "Ð ÐµÑÐ°ÑÑÐµÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð´Ð¾ÑÑÐ¸Ð³Ð»Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð²ÑÐµÐ¼ÐµÐ½Ð¸ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ ÑÐµÑÐµÐ½Ð¸Ñ Ñ Ð¾Ð±ÑÐµÐºÑÐ°Ð¼Ð¸ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹ ÑÐ¾Ð»ÑÐºÐ¾ Ñ Ð¿Ð¾Ð´ÑÐ¾Ð´ÑÑÐµÐ¹ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ¾Ð¹." -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "Ð ÑÑÐ¾Ð¼ ÑÐ¸ÐºÐ»Ðµ ÑÐ°ÑÑÐ¼Ð°ÑÑÐ¸Ð²Ð°Ð»Ð¸ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹ Ñ Ð»ÑÑÑÐµÐ¹ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ¾Ð¹.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "Ð§ÑÐµÐ½Ð¸Ðµ Ð²ÑÐµÑ Ð¾Ð±ÑÐµÐºÑÐ¾Ð² ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹ Ð·Ð°Ð¹Ð¼ÐµÑ Ð½ÐµÐºÐ¾ÑÐ¾ÑÐ¾Ðµ Ð²ÑÐµÐ¼Ñ, Ð½Ð¾ Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ð¼Ñ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÑ." -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð°Ñ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´ÑÑÐ³Ð¸Ð¼ Ð¾Ð±ÑÐµÐºÑÐ°Ð¼ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð´Ð»Ñ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2863,7 +2874,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑÐµÑ Ñ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ Ð¾Ð±ÑÐµÐºÑÐ°Ð¼Ð¸ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" @@ -2872,14 +2883,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑÐµÑ Ñ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2889,24 +2900,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¼Ð¸ Ð´ÑÑÐ³Ð¸Ðµ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¼ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¼:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2915,7 +2926,7 @@ "ÐÑÐ¸ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹ Ð±ÑÐ´ÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ñ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s Ð·Ð°Ð²Ð¸ÑÐ¸Ñ Ð¾Ñ Ð´ÑÑÐ³Ð¸Ñ Ð¾Ð±ÑÐµÐºÑÐ¾Ð² ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" @@ -2923,38 +2934,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s Ð·Ð°Ð²Ð¸ÑÐ¸Ñ Ð¾Ñ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s Ð·Ð°Ð²Ð¸ÑÐ¸Ñ Ð¾Ñ:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "ÐÐ¾ÑÐµÑÐ½ÐµÐµ" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "ÐÐ¸ÑÑÐ¾ Ð½Ðµ Ð¿ÑÐµÐ´Ð¾ÑÑÐ¾Ð²Ð»ÑÐµÑ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2962,31 +2973,31 @@ "\n" "ÐÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð½ÑÑ ÑÐµÑÑÑÑÐ¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÑÑ ÑÑÐ¾Ð¼Ñ ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "ÐÐ·-Ð·Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼, Ð¾Ð¿Ð¸ÑÐ°Ð½Ð½ÑÑ Ð²ÑÑÐµ/Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ðµ Ð½Ðµ ÑÐµÑÐ¸Ñ Ð²ÑÐµ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ %s, ÑÐ°Ðº ÐºÐ°Ðº ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑÐµÑ Ñ %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð¸ Ð¿Ð¾Ð¼ÐµÑÐµÐ½ ÐºÐ°Ðº Ð½ÐµÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ %s Ð¸Ð·-Ð·Ð° Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼ Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÑÐ¼Ð¸" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2994,8 +3005,8 @@ msgstr "ÑÐ´Ð°Ð»Ð¸ÑÑ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3003,79 +3014,79 @@ msgstr "Ð½Ðµ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÐµÐ½Ð½ÑÐµ ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÐ´Ð¾ÑÑÐ°ÑÑÐ¸Ðµ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s: ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð° Ð¸Ð·-Ð·Ð° Ð¾ÑÑÑÑÑÑÐ²Ð¸Ñ Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÑ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÐµÑ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ %s, Ð¾Ð´Ð½Ð°ÐºÐ¾ Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÑÐµÑ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ %s, Ð¾Ð´Ð½Ð°ÐºÐ¾ Ð±ÑÐ´ÐµÑ Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½ Ð² ÑÐ¸ÑÑÐµÐ¼Ðµ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "ÐÐµÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ÑÑÐ¸ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ %s, ÑÑÐ¾Ð±Ñ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÐ¸ÑÑ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ %s, ÑÑÐ¾Ð±Ñ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÐ¸ÑÑ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s Ð½Ðµ Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½, ÑÐ°Ðº ÐºÐ°Ðº Ð²ÑÐµ ÐµÑÐµ ÑÑÐµÐ±ÑÐµÑÑÑ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ð¼ %s. ÐÐ¾ %s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½, ÑÐ°Ðº ÐºÐ°Ðº Ð¾Ð½ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ %s ÑÐ°Ðº ÐºÐ°Ðº Ð¾Ð½ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑÐµÑ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s Ð¿Ð¾Ð¼ÐµÑÐµÐ½ ÐºÐ°Ðº Ð½ÐµÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ Ð¸Ð·-Ð·Ð° ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ° Ñ %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "ÐÐµÐ»ÑÐ·Ñ ÑÐ´Ð¾Ð²Ð»ÐµÑÐ²Ð¾ÑÐ¸ÑÑ ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ðµ %s." @@ -3086,7 +3097,7 @@ #: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64 msgid "Generally ignore this requirement" -msgstr "ÐÐ³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾ ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¾Ð»ÑÐºÐ¾ Ð·Ð´ÐµÑÑ" +msgstr "ÐÐ³Ð½Ð¾ÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾ ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð²ÐµÐ·Ð´Ðµ" #. TranslatorExplanation %s = name of package, patch, selection ... #: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76 @@ -3136,7 +3147,7 @@ msgstr "ÐÐµ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ Ð¸Ð»Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°ÑÑÐ°Ð³Ð¸Ð²Ð°ÐµÐ¼ÑÑ Ð¾Ð±ÑÐµÐºÑÐ¾Ð² ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "Ð¸Ð·-Ð·Ð° Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ÑÑÐ¸ %s Ð´Ð»Ñ %s Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¸ %s" @@ -3496,13 +3507,21 @@ msgid "Install missing resolvables" msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¾ÑÑÑÑÑÑÐ²ÑÑÑÐ¸Ðµ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÑÐ°ÑÑÐµÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ¾ ÐÐ¡ÐÐÐ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." -msgstr "Ð Ð°ÑÑÐ¼Ð¾ÑÑÐµÑÑ Ð²ÑÐµ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹ Ñ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾Ð¹ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ¾Ð¹." +msgstr "Ð Ð°ÑÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÑÑÑÑ Ð²ÑÐµ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹ Ñ ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾Ð¹ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ¾Ð¹." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÑÐ°ÑÑÐµÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ ÑÐ¾Ð»ÑÐºÐ¾ Ð´Ð»Ñ Ð½Ð°Ð¸Ð»ÑÑÑÐµÐ¹ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÑ." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "Ð Ð°ÑÑÐ¼Ð°ÑÑÐ¸Ð²Ð°ÑÑÑÑ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹ ÑÐ¾Ð»ÑÐºÐ¾ Ñ Ð½Ð°Ð¸Ð»ÑÑÑÐµÐ¹ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ¾Ð¹." #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -3554,6 +3573,14 @@ msgid "%s part of %s" msgstr "%s ÑÐ°ÑÑÑ %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "Ð£Ð´Ð²Ð¾Ð¸ÑÑ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð² ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÐ°Ð· ÑÐµÑÐ°ÑÑÐµÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ñ ÑÐ´Ð²Ð¾ÐµÐ½Ð½ÑÐ¼ Ð²ÑÐµÐ¼ÐµÐ½ÐµÐ¼ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ." + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð²ÑÐµ Ð¾Ð±ÑÐµÐºÑÑ ÑÐ°Ð·ÑÐµÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐµÐ¹" Modified: trunk/libzypp/po/si.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/si.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/si.po (original) +++ trunk/libzypp/po/si.po Mon Sep 10 16:18:44 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: i18n(a)suse.de\n" "Language-Team: Sinhala <i18n(a)suse.de>\n" @@ -109,36 +109,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -162,27 +162,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2651,19 +2652,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2671,13 +2672,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2686,46 +2687,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2743,64 +2744,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2808,7 +2819,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2817,14 +2828,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2832,31 +2843,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2864,68 +2875,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2933,8 +2944,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2942,79 +2953,79 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3075,7 +3086,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3433,14 +3444,22 @@ msgid "Install missing resolvables" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3491,6 +3510,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "" Modified: trunk/libzypp/po/sk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sk.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/sk.po (original) +++ trunk/libzypp/po/sk.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp.sk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-03-05 10:26+0100\n" "Last-Translator: Jan Kupec <jkupec(a)suse.cz>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n" @@ -116,37 +116,37 @@ msgid "History:" msgstr "HistÃ³ria rÃ½chlosti" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Kontrola aplikovania delta rpm zlyhala." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "Aplikovanie delta rpm zlyhalo." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Kontrola integrity balÃÄka %s zlyhala. Chce sa znova pokÃºsiÅ¥ o jeho stiahnutie?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "PridÃ¡vam zdroje" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "Nepodarilo sa poskytnÃºÅ¥ %s z %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -171,27 +171,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "PridÃ¡vam zdroje" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "PridÃ¡vam zdroje" @@ -2909,19 +2910,19 @@ # progress stage #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "ZmenenÃ© konfiguraÄnÃ© sÃºbory pre '%s':" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "PrÃkaz rpm uloÅ¾il %s ako %s, ale nebolo moÅ¾nÃ© urÄiÅ¥ rozdiel" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2931,13 +2932,13 @@ "Tu je prvÃ½ch 25 riadkov rozdielov:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "PrÃkaz rpm vytvoril %s as %s, ale nebolo moÅ¾nÃ© urÄiÅ¥ rozdiel" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2948,46 +2949,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "InÅ¡talÃ¡cia %s zlyhala." -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "VÃ½stup prÃkazu rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s bol ÃºspeÅ¡ne nainÅ¡talovanÃ½" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "ÄalÅ¡Ã vÃ½stup prÃkazu rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "OdstrÃ¡nenie %s zlyhalo" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s bol ÃºspeÅ¡ne odstrÃ¡nenÃ½" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "Bola vytvorenÃ¡ zÃ¡loha %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "InÅ¡talÃ¡cia bola podÄ¾a prÃkazu zruÅ¡enÃ¡." @@ -3005,7 +3006,7 @@ msgstr "%s nahradenÃ© %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -3013,58 +3014,68 @@ "Tieto balÃÄky budÃº zo systÃ©mu odstÃ¡nenÃ©." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s nie je moÅ¾nÃ© odinÅ¡talovaÅ¥ pretoÅ¾e je stÃ¡le vyÅ¾adovanÃ½ inÃ½m balÃÄkom" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "NeplatnÃ¡ informÃ¡cia" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s je vyÅ¾adovanÃ½ inÃ½mi balÃÄkami" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s je vyÅ¾adovanÃ½ balÃÄkom %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3074,7 +3085,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s je v konflikte s inÃ½mi balÃÄkami" @@ -3083,14 +3094,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s je v konflikte s %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -3100,24 +3111,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s nahrÃ¡dza inÃ© balÃÄky" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s nahrÃ¡dza %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s nahrÃ¡dza: %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -3126,7 +3137,7 @@ "Tieto balÃÄky budÃº zo systÃ©mu odstÃ¡nenÃ©." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s zÃ¡visÃ na inÃ½ch balÃÄkoch" @@ -3134,38 +3145,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s zÃ¡visÃ na %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s zÃ¡visÃ na: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Potomok" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Å½iaden balÃÄek neposkytuje %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -3174,32 +3185,32 @@ "\n" "Nie je k dispozÃcii Å¾iaden prostriedok, ktorÃ½ by mohol splniÅ¥ tento poÅ¾iadavok" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "KvÃ´li vyÅ¡Å¡ie/niÅ¾Å¡ie popÃsanÃ½m problÃ©mom nie je moÅ¾nÃ© vyrieÅ¡iÅ¥ vÅ¡etky zÃ¡vislosti" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s pretoÅ¾e je v konflikte s %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "BalÃk %s nie je nainÅ¡talovanÃ½ a je oznaÄenÃ½ ako nenainÅ¡talovateÄ¾nÃ½" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s kvÃ´li problÃ©mom so zÃ¡vislosÅ¥ami" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -3207,8 +3218,8 @@ msgstr "odstrÃ¡niÅ¥ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3216,79 +3227,79 @@ msgstr "neinÅ¡taluj %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s mÃ¡ nesplnenÃ© poÅ¾iadavky" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "BalÃku %s chÃ½bajÃº zÃ¡vislÃ© balÃky" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ kvÃ´li chÃ½bajÃºcim zÃ¡vislostiam" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s spÄºÅa zÃ¡vislosti %s ale mÃ¡ byÅ¥ odinÅ¡talovanÃ½" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s spÄºÅa zÃ¡vislosti %s ale mÃ¡ byÅ¥ ponechanÃ½ v systÃ©me" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "nie je potrebnÃ© inÅ¡talovaÅ¥ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s aby splnil zÃ¡vislosti balÃka %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s aby splnil zÃ¡vislosti balÃka %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s nie je moÅ¾nÃ© odinÅ¡talovaÅ¥ pretoÅ¾e je stÃ¡le vyÅ¾adovanÃ½ inÃ½m balÃÄkom" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s nahradzuje %s, ale %s nie je moÅ¾nÃ© odstrÃ¡niÅ¥ pretoÅ¾e je zamknutÃ½" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ %s lebo je v konflikte s inÃ½m balÃkom" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s nie je moÅ¾nÃ© nainÅ¡talovaÅ¥ kvÃ´li konfliktom s %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3351,7 +3362,7 @@ msgstr "NeinÅ¡taluj ani neodstraÅuj tieto balÃÄky" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "pre vyÅ¾adovanie %s pre %s kvÃ´li aktualizÃ¡cii %s" @@ -3711,15 +3722,25 @@ msgid "Install missing resolvables" msgstr "NainÅ¡taluj chÃ½bajÃºce balÃÄky" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 #, fuzzy msgid "Regarding all resolvables with a compatible architecture." msgstr "PrednaÄÃtavam nainÅ¡talovanÃ© balÃÄky vyhovujÃºce kritÃ©riam vyhÄ¾adÃ¡vania... " +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "PrednaÄÃtavam nainÅ¡talovanÃ© balÃÄky vyhovujÃºce kritÃ©riam vyhÄ¾adÃ¡vania... " + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "PrednaÄÃtavam nainÅ¡talovanÃ© balÃÄky vyhovujÃºce kritÃ©riam vyhÄ¾adÃ¡vania... " + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3770,6 +3791,14 @@ msgid "%s part of %s" msgstr "%s sÃºÄasÅ¥ou %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "odomkni vÅ¡etky balÃÄky" Modified: trunk/libzypp/po/sl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sl.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/sl.po (original) +++ trunk/libzypp/po/sl.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2001-10-18 11:02+0200\n" "Last-Translator: Janez Krek <janez.krek(a)euroteh.si>\n" "Language-Team: Slovenian\n" @@ -113,36 +113,36 @@ msgid "History:" msgstr "Preglejte zgodovino" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -167,27 +167,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2966,19 +2967,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "Shrani nastavivene datoteke" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2986,13 +2987,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -3001,12 +3002,12 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "Namestitev ni uspela." -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 #, fuzzy msgid "rpm output:" msgstr "" @@ -3015,36 +3016,36 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "NameÅ¡Äena verzija" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "Dodatne nastavitve skupine" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm neuspeÅ¡en." #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, fuzzy, c-format msgid "created backup %s" msgstr "Ne Kreiraj Varnostnih Kopij" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3062,64 +3063,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "Potrebno je namestiti %s " #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3127,7 +3138,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, fuzzy, c-format msgid "%s conflicts with other resolvables" msgstr "%1 je v sporu s/z %2" @@ -3136,14 +3147,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, fuzzy, c-format msgid "%s conflicts with %s" msgstr "%1 je v sporu s/z %2" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, fuzzy, c-format msgid "" "%s conflicts with:\n" @@ -3151,31 +3162,31 @@ msgstr "%1 je v sporu s/z %2" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3183,68 +3194,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "NameÅ¡Äam na:" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%1 je v sporu s/z %2" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Ta paket ni nameÅ¡Äen in ne bo nameÅ¡Äen." #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3252,8 +3263,8 @@ msgstr "ZbriÅ¡i %1" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3261,79 +3272,79 @@ msgstr "NameÅ¡Äam na:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "NezadoÅ¡Äene odvisnosti:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, fuzzy, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "NezadoÅ¡Äene odvisnosti:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "potrebno je ponovno namestiti" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "NezadoÅ¡Äene odvisnosti:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "NezadoÅ¡Äene odvisnosti:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, fuzzy, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%1 je v sporu s/z %2" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3397,7 +3408,7 @@ msgstr "%1 je v sporu s/z %2" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3760,14 +3771,22 @@ msgid "Install missing resolvables" msgstr "Namesti manjkajoÄe pakete" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3818,6 +3837,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/sr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sr.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/sr.po (original) +++ trunk/libzypp/po/sr.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2004-03-31 11:34+0200\n" "Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n" "Language-Team: Serbian <i18n(a)suse.de>\n" @@ -113,36 +113,36 @@ msgid "History:" msgstr "XF86History" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -166,27 +166,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2728,19 +2729,19 @@ # progress stage #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "Snimi konfiguracione fajlove" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2748,13 +2749,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2763,12 +2764,12 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "Instalacioni proces nije uspeÅ¡no zavrÅ¡en." -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 #, fuzzy msgid "rpm output:" msgstr "" @@ -2779,38 +2780,38 @@ # PushButton: Allright, really start installation #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "&Da, instaliraj" # TextEntry label -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "&Dodatne ipppd opcije" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm greÅ¡ka." #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" # Proposal for backup during update #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, fuzzy, c-format msgid "created backup %s" msgstr "Ne pravite sigurnosnu kopiju" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2828,64 +2829,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2893,7 +2904,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, fuzzy, c-format msgid "%s conflicts with other resolvables" msgstr "%1 je u konfliktu sa %2" @@ -2902,14 +2913,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, fuzzy, c-format msgid "%s conflicts with %s" msgstr "%1 je u konfliktu sa %2" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, fuzzy, c-format msgid "" "%s conflicts with:\n" @@ -2917,31 +2928,31 @@ msgstr "%1 je u konfliktu sa %2" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2949,69 +2960,69 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" # Frame title for installation target hard disk / partition(s) #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instaliram na:" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%1 je u konfliktu sa %2" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Ovaj paket nije i neÄe biti instaliran." #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3020,8 +3031,8 @@ # Frame title for installation target hard disk / partition(s) #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3029,79 +3040,79 @@ msgstr "Instaliram na:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Proveravam meÄuzavisnost..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, fuzzy, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Proveravam meÄuzavisnost..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "mora da se reinstalira" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Proveravam meÄuzavisnost..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "Proveravam meÄuzavisnost..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, fuzzy, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%1 je u konfliktu sa %2" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3166,7 +3177,7 @@ msgstr "%1 je u konfliktu sa %2" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3533,14 +3544,22 @@ msgid "Install missing resolvables" msgstr "Instaliranje nedostajuÄih paketa" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3591,6 +3610,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/sv.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sv.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/sv.po (original) +++ trunk/libzypp/po/sv.po Mon Sep 10 16:18:44 2007 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" -"PO-Revision-Date: 2007-08-25 11:00+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" +"PO-Revision-Date: 2007-09-08 11:23+0200\n" "Last-Translator: Mattias Newzella <newzella(a)linux.se>\n" "Language-Team: <sv(a)li.org>\n" "MIME-Version: 1.0\n" @@ -116,36 +116,36 @@ msgid "History:" msgstr "Historik:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm-kontrollen misslyckades." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm misslyckades." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Integritetskontroll misslyckades fÃ¶r paket %s. Vill du fÃ¶rsÃ¶ka igen?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Ingen URL i arkiv." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "Kan inte tillhandahÃ¥lla fil %s frÃ¥n arkiv %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "LÃ¤ser \"%s\" arkivcache" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -169,27 +169,28 @@ msgid "Cleaning repository '%s' cache" msgstr "Rensar arkivcache \"%s\"" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Giltig metadata hittades inte pÃ¥ specificerad URL" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Bygger cache fÃ¶r arkiv \"%s\"" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "LÃ¤ser cache fÃ¶r arkiv \"%s\"" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "LÃ¤gger till arkiv \"%s\"" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "Tar bort arkiv \"%s\"" @@ -2704,19 +2705,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "InstÃ¤llningsfiler har Ã¤ndrats fÃ¶r %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm sparade %s som %s, men det gick inte att avgÃ¶ra skillnaden" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2726,13 +2727,13 @@ "HÃ¤r visas de fÃ¶rsta 25 raderna med skillnader:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm skapade %s som %s, men det gick inte att avgÃ¶ra skillnaden" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2743,46 +2744,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "Det gick inte att installera %s" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm-utmatning:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s har installerats" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Ytterligare rpm-utmatning:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Det gick inte att ta bort %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s borttagen OK" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "skapade sÃ¤kerhetskopian %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Installationen har avbrutits enligt instruktionerna." @@ -2800,64 +2801,74 @@ msgstr "%s ersatt av %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s kommer att tas bort av anvÃ¤ndaren.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s kommer att installeras av anvÃ¤ndaren.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "Ingen giltig lÃ¶sning hittades inom %d sekunder" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Ogiltig information" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s behÃ¶vs av andra resurser" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s behÃ¶vs av %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2867,7 +2878,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s Ã¤r i konflikt med andra resurser" @@ -2876,14 +2887,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s Ã¤r i konflikt med %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2893,24 +2904,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s gÃ¶r andra resurser inaktuella" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s gÃ¶r %s inaktuell" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s gÃ¶r %s inaktuell" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2919,7 +2930,7 @@ "Dessa resurser tas bort frÃ¥n systemet." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s beror pÃ¥ andra resurser" @@ -2927,38 +2938,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s Ã¤r beroende av %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s Ã¤r beroende av: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Barn till" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Det gÃ¥r inte att installera %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Ingen tillhandahÃ¥ller %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2966,31 +2977,31 @@ "\n" "Det finns ingen resurs tillgÃ¤nglig vilken stÃ¶djer det hÃ¤r kravet." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "PÃ¥ grund av problemen som beskrivs ovan/nedan, lÃ¶ser inte den hÃ¤r resursen alla beroenden" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Kan inte installera %s eftersom den Ã¤r i konflikt med %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s har inte installerats och har markerats som avinstallerbar" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Kan inte installera %s pÃ¥ grund av beroendeproblem" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2998,8 +3009,8 @@ msgstr "ta bort %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3007,79 +3018,79 @@ msgstr "installera inte %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s har ouppfyllda krav" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s har beroenden som saknas" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s kan inte installeras pÃ¥ grund av att beroenden saknas" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s uppfyller beroenden fÃ¶r %s men kommer att avinstalleras" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s uppfyller beroenden fÃ¶r %s men kommer att lÃ¤mnas kvar pÃ¥ systemet" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%s behÃ¶ver inte installeras" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Det gÃ¥r inte att installera %s sÃ¥ att beroendena fÃ¶r %s uppfylls" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Det gÃ¥r inte att installera %s sÃ¥ att beroendena fÃ¶r %s uppfylls" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s kommer inte att avinstalleras eftersom den fortfarande krÃ¤vs" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s gÃ¶r %s inaktuell. Det gÃ¥r dock inte att ta bort %s eftersom det Ã¤r lÃ¥st." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Kan inte installera %s eftersom det Ã¤r i konflikt" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s Ã¤r avinstallerbart pÃ¥ grund av konflikter med %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Kravet %s kan inte uppfyllas." @@ -3140,7 +3151,7 @@ msgstr "Installera inte och ta inte bort resurser som berÃ¶rs" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "fÃ¶r krav av %s fÃ¶r %s nÃ¤r %s uppgraderas" @@ -3498,14 +3509,22 @@ msgid "Install missing resolvables" msgstr "Installera resurser som saknas" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3556,6 +3575,15 @@ msgid "%s part of %s" msgstr "%s del av %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "TidsgrÃ¤ns fÃ¶r dubbelklick " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "lÃ¥s upp alla resurser" Modified: trunk/libzypp/po/ta.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ta.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/ta.po (original) +++ trunk/libzypp/po/ta.po Mon Sep 10 16:18:44 2007 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2005-06-26 01:20+0200\n" "Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <www.agreeya.com>\n" @@ -106,37 +106,37 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "à®à®ªà¯à®³à¯à®à¯à®²à¯à®à®¾à®à®°à¯à®ªà®¿à®à®®à¯ à®à¯à®¾à®¤à®©à¯ à®¤à¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "à®à®ªà¯à®³à¯à®à¯à®²à¯à®à®¾à®à®°à¯à®ªà®¿à®à®®à¯ à®¤à¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "à®¨à¯à®°à¯à®®à¯ à®à¯à®¾à®¤à®©à¯à®¯à®¿à®²à¯ %s à®ªà¯à®à¯à®à¯à®à¯ à®¤à¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯. à®à®¤à®©à¯ à®¤à®à®µà®²à®¿à®±à®à¯à®à®®à¯ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ à®¨à¯à®à¯à®à®³à¯ à®®à¯à®£à¯à®à¯à®®à¯ à®®à¯à®¯à®±à¯à®à®¿à®à¯à®à®ªà¯ à®ªà¯à®¾à®à®¿à®±à¯à®°à¯à®à®³à®¾?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "à®à¯à®®à®¿à®ªà¯à®ªà®¿à®à®¤à¯à®¤à®¿à®²à¯ à®à¯à®¾à®ªà¯à®ªà¯ %1 à®à®¾à®£à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "%sà®²à®¿à®°à¯à®¨à¯à®¤à¯ %sà® à®à®³à®¿à®à¯à® à®à®¯à®²à®¾à®¤à¯" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -161,27 +161,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "à®®à¯à®²à®à¯à®à®³à¯ à®à¯à®°à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¿à®©à¯à®±à®©" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "à®®à¯à®²à®à¯à®à®³à¯ à®à¯à®°à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¿à®©à¯à®±à®©" @@ -2632,19 +2633,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s:à®à¯à®à®¾à® à®à®³à¯à®³à®®à¯à®¤à¯à®¤à®²à¯ à®à¯à®¾à®ªà¯à®ªà¯à®à®³à¯ à®®à®¾à®±à¯à®±à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®©" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "%s à®à® à®à®°à¯à®ªà®¿à®à®®à¯ à®à¯à®®à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯, à®à®©à®¾à®²à¯ à®µà¯à®±à¯à®ªà®¾à®à¯à®à¯ à®¨à®¿à®°à¯à®£à®¯à®¿à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, fuzzy, c-format msgid "" "rpm saved %s as %s.\n" @@ -2654,13 +2655,13 @@ "à®µà¯à®±à¯à®ªà®¾à®à¯à®à®³à®¿à®©à¯ à®®à¯à®¤à®²à¯ 25 à®µà®°à®¿à®à®³à¯ à®à®à¯à®à¯à®³à¯à®³à®©:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "%s à®à® à®à®°à¯à®ªà®¿à®à®®à¯ à®à®°à¯à®µà®¾f;à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯, à®à®©à®¾à®²à¯ à®µà¯à®±à¯à®ªà®¾à®à¯à®à¯ à®¨à®¿à®°à¯à®£à®¯à®¿à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, fuzzy, c-format msgid "" "rpm created %s as %s.\n" @@ -2671,46 +2672,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s à®¨à®¿à®±à¯à®µà¯à®¤à®²à¯ à®¤à¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "à®à®°à¯à®ªà®¿à®à®®à¯ à®à®µà¯à®à¯à®ªà¯à®à¯:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s à®¨à®¿à®±à¯à®µà¯à®¤à®²à¯ à®à®°à®¿à®¯à®¾à®©à®¤à¯" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "à®à¯à®à¯à®¤à®²à¯ à®à®°à¯à®ªà®¿à®à®®à¯ à®à®µà¯à®à¯à®ªà¯à®à¯:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s à®¨à¯à®à¯à®à¯à®¤à®²à¯ à®¤à¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s à®¨à¯à®à¯à®à¯à®¤à®²à¯ à®à®°à®¿à®¯à®¾à®©à®¤à¯" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "%s à®®à®±à¯à®ªà®¿à®°à®¤à®¿ à®à®°à¯à®µà®¾à®à¯à®à®ªà¯à®ªà®à¯à®à®¤à¯" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à¯à®à¯à®³à¯à®³à®ªà®à®¿ à®¨à®¿à®±à¯à®µà¯à®¤à®²à¯ à®à®à¯à®¯à®¿à®²à¯ à®¨à®¿à®±à¯à®¤à¯à®¤à®ªà¯à®ªà®à¯à®à®¤à¯." @@ -2728,7 +2729,7 @@ msgstr "%s %sà®à®²à¯ à®®à®¾à®±à¯à®±à®¿à®¯à®®à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¤à¯" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2736,58 +2737,68 @@ "à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "à®à®¤à¯ à®à®©à¯à®©à®®à¯à®®à¯ à®¤à¯à®µà¯à®ªà¯à®ªà®à¯à®µà®¤à®¾à®²à¯, %s à®¨à¯à®à¯à®à®ªà¯à®ªà® à®®à®¾à®à¯à®à®¾à®¤à¯" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®¤à®à®µà®²à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "à®®à®±à¯à®± à®¤à¯à®°à¯à®µà¯à®à®³à¯à®à¯à®à¯ %s à®¤à¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s, %sà®à¯à®à¯ à®¤à¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2797,7 +2808,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s à®®à®±à¯à®± à®¤à¯à®°à¯à®µà¯à®à®³à¯à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯" @@ -2806,14 +2817,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s %sà®à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2823,24 +2834,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s à®®à®±à¯à®± à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®µà®´à®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s %sà® à®µà®´à®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s %sà® à®µà®´à®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯:" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2849,7 +2860,7 @@ "à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s à®®à®±à¯à®± à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯" @@ -2857,38 +2868,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s %sà® à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s %sà® à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯:" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "à®à®¤à®©à¯ à®à®°à¯à®µà®¾à®à¯à®à®®à¯" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "%sà® à®¨à®¿à®±à¯à®µ à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "%s à®¯à®¾à®°à¯à®®à¯ à®à®³à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2897,32 +2908,32 @@ "\n" "à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ à®ªà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®¤à®¾à®°à®®à¯ à®à®¤à¯à®µà¯à®®à¯ à®à®²à¯à®²à¯" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "à®à®¤à¯à®¤à¯à®°à¯à®µà®¿à®©à¯ à®®à¯à®²à¯ à®®à®±à¯à®±à¯à®®à¯ à®à¯à®´à¯ à®µà®¿à®³à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ à®ªà®¿à®°à®à¯à®©à¯à®à®³à¯, à®à®©à¯à®¤à¯à®¤à¯ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®¯à¯à®®à¯ à®¤à¯à®°à¯à®à¯à®à®à¯à®à¯à®à®¿à®¯à®µà¯ à®à®²à¯à®²" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%s à® à®¨à®¿à®±à¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯ à®à®©à¯à®©à®¿à®²à¯ à®à®¤à¯ %s à®à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s à®¨à®¿à®±à¯à®µà®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯ à®®à®±à¯à®±à¯à®®à¯ à®à®¤à¯ à®¨à®¿à®±à¯à®µ à®à®¯à®²à®¾à®¤à®¤à®¾à® à®à¯à®±à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯ à®ªà®¿à®°à®à¯à®©à¯à®à®³à¯ à®à®¾à®°à®£à®®à®¾à® %s à® à®¨à®¿à®±à¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2930,8 +2941,8 @@ msgstr "%s à® à®¨à¯à®à¯à®à®µà¯à®®à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2939,79 +2950,79 @@ msgstr "%sà® à®¨à®¿à®±à¯à®µ à®µà¯à®£à¯à®à®¾à®®à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s à®¤à¯à®°à¯à®à¯à®à®ªà¯à®ªà®à®¾à®¤ à®¤à¯à®µà¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s à®à®¾à®£à®ªà¯à®ªà®à®¾à®¤ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "à®à®¾à®£à®ªà¯à®ªà®à®¾à®¤ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %sà® à®à®¾à®°à®£à®®à®¾à® à®¨à®¿à®±à¯à®µ à®à®¯à®²à®¾à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %s à®ªà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®©à®¾à®²à¯ à®¨à®¿à®±à¯à®µà¯à®¤à®²à¯ à®¨à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®µà®¿à®à¯à®®à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %s à®ªà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®©à®¾à®²à¯ à®à®à¯à®à®³à¯ à®à®®à¯à®ªà¯à®ªà®¿à®²à¯ à®µà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "%sà® à®¨à®¿à®±à¯à®µà®¤à¯ à®¤à¯à®µà¯à®¯à®¿à®²à¯à®²à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "%sà®©à¯ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ à®ªà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ %sà® à®¨à®¿à®±à¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%sà®©à¯ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ à®ªà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ %sà® à®¨à®¿à®±à¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "à®à®¤à¯ à®à®©à¯à®©à®®à¯à®®à¯ à®¤à¯à®µà¯à®ªà¯à®ªà®à¯à®µà®¤à®¾à®²à¯, %s à®¨à¯à®à¯à®à®ªà¯à®ªà® à®®à®¾à®à¯à®à®¾à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%sà® %s à®µà®´à®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à®¿à®µà®¿à®à¯à®®à¯. à®à®©à®¾à®²à¯ %sà® à®¨à¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯ à®à®©à¯à®©à®¿à®²à¯ à®à®¤à¯ à®ªà¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "%sà® à®¨à®¿à®±à¯à®µ à®®à¯à®à®¿à®¯à®¾à®¤à¯ à®à®©à¯à®©à®¿à®²à¯ à®à®¤à¯ à®®à¯à®°à®£à®¾à®©à®¤à¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s à®à®à®©à¯ à®à®³à¯à®³ à®®à¯à®°à®£à¯à®ªà®¾à®à¯ à®à®¾à®°à®£à®®à®¾à® %sà®©à¯ à®¨à®¿à®±à¯à®µà¯à®¤à®²à¯ à®¨à¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3074,7 +3085,7 @@ msgstr "à®¤à¯à®¾à®à®°à¯à®ªà¯à®³à¯à®³ à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®¨à®¿à®±à¯à®µà®µà¯à®¾ à®à®²à¯à®²à®¤à¯ à®¨à¯à®à¯à®à®µà¯à®¾ à®µà¯à®£à¯à®à®¾à®®à¯" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "%sà® à®ªà¯à®¤à¯à®ªà¯à®ªà®¿à®à¯à®à¯à®®à¯à®ªà¯à®¾à®¤à¯ %sà®à¯à®à®¾à® %s à®¤à¯à®µà¯à®ªà¯âà®ªà®à¯à®®à¯à®ªà¯à®¾à®¤à¯" @@ -3434,14 +3445,22 @@ msgid "Install missing resolvables" msgstr "ÂÃ²Â¾Â¡ÃÂ¢ÃÃ½" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3492,6 +3511,14 @@ msgid "%s part of %s" msgstr "%s, %sà®©à¯ à®à®°à¯ à®ªà®à¯à®¤à®¿à®¯à®¾à®à¯à®®à¯" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "ÂÃ²Â¾Â¡ÃÂ¢ÃÃ½" Modified: trunk/libzypp/po/tr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/tr.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/tr.po (original) +++ trunk/libzypp/po/tr.po Mon Sep 10 16:18:44 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2001-10-18 10:13+0200\n" "Last-Translator: GÃ¶rkem Ãetin <gorkem(a)gelecek.com.tr>\n" "Language-Team: turkish <i18n(a)suse.de>\n" @@ -118,36 +118,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -171,27 +171,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -3147,19 +3148,19 @@ # clients/sw_single.ycp:310 #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "YapÄ±landÄ±rma dosyalarÄ±nÄ± kaydet" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -3167,13 +3168,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -3183,49 +3184,49 @@ # clients/online_update_start.ycp:171 #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, fuzzy, c-format msgid "%s install failed" msgstr "Kurulum iÅlemi baÅarÄ±sÄ±z oldu." -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 #, fuzzy msgid "rpm output:" msgstr "Program Ã§Ä±ktÄ±sÄ±:\n" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, fuzzy, c-format msgid "%s installed ok" msgstr "&Evet, kur" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "Ek grÄ±p ayarlarÄ±" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm baÅarÄ±sÄ±z oldu." #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" # clients/inst_sw_backup.ycp:260 #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, fuzzy, c-format msgid "created backup %s" msgstr "Yedek oluÅturma" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -3243,64 +3244,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -3308,7 +3319,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, fuzzy, c-format msgid "%s conflicts with other resolvables" msgstr "%1, %2 ile Ã§akÄ±ÅÄ±yor" @@ -3317,14 +3328,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, fuzzy, c-format msgid "%s conflicts with %s" msgstr "%1, %2 ile Ã§akÄ±ÅÄ±yor" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, fuzzy, c-format msgid "" "%s conflicts with:\n" @@ -3332,31 +3343,31 @@ msgstr "%1, %2 ile Ã§akÄ±ÅÄ±yor" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -3364,69 +3375,69 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Kurulan disk:" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "%1, %2 ile Ã§akÄ±ÅÄ±yor" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Bu paket kurulu deÄildir ve kurulmayacaktÄ±r." #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -3435,8 +3446,8 @@ # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -3444,84 +3455,84 @@ msgstr "Kurulan disk:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" # clients/inst_sw_single.ycp:742 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Yetersiz baÄÄ±mlÄ±lÄ±klar:" # clients/inst_sw_single.ycp:742 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, fuzzy, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Yetersiz baÄÄ±mlÄ±lÄ±klar:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" # clients/online_update_load.ycp:923 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "yeniden kurulmalÄ±" # clients/inst_sw_single.ycp:742 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Yetersiz baÄÄ±mlÄ±lÄ±klar:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" # clients/inst_sw_single.ycp:742 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "Yetersiz baÄÄ±mlÄ±lÄ±klar:" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, fuzzy, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%1, %2 ile Ã§akÄ±ÅÄ±yor" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3585,7 +3596,7 @@ msgstr "%1, %2 ile Ã§akÄ±ÅÄ±yor" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3953,14 +3964,22 @@ msgid "Install missing resolvables" msgstr "Eksik paketleri kur" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -4011,6 +4030,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/uk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/uk.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/uk.po (original) +++ trunk/libzypp/po/uk.po Mon Sep 10 16:18:44 2007 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zypp.uk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-23 20:52-0700\n" "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n" "Language-Team: Ukrainian <translation(a)linux.org.ua>\n" @@ -114,36 +114,36 @@ msgid "History:" msgstr "ÐÑÑÐ¾ÑÑÑ:" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Ð¿ÐµÑÐµÐ²ÑÑÐºÐ° applydeltarpm Ð·Ð°Ð·Ð½Ð°Ð»Ð° Ð½ÐµÐ²Ð´Ð°ÑÑ." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "Ð·Ð°ÑÑÐ¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð´ÐµÐ»ÑÑÐ¸ rpm Ð·Ð°Ð·Ð½Ð°Ð»Ð¾ Ð½ÐµÐ²Ð´Ð°ÑÑ." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "ÐÐ°ÐºÑÐ½Ð¾Ðº %s Ð½Ðµ Ð¿ÑÐ¾ÑÐ¾Ð² Ð¿ÐµÑÐµÐ²ÑÑÐºÑ Ð´Ð¾ÑÑÐ¾Ð²ÑÑÐ½Ð¾ÑÑÑ. ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ ÑÐ¿ÑÐ¾Ð±Ñ?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "Ð ÑÑÐ¾Ð²Ð¸ÑÑ Ð½ÐµÐ¼Ð°Ñ url." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð½Ð°Ð´Ð°ÑÐ¸ ÑÐ°Ð¹Ð» %s Ð·Ñ ÑÑÐ¾Ð²Ð¸ÑÐ° %s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "Ð§Ð¸ÑÐ°Ð½Ð½Ñ ÐºÐµÑÑ ÑÑÐ¾Ð²Ð¸ÑÐ° \"%s\"" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "Ð§Ð¸ÑÐ°Ð½Ð½Ñ Ð»Ð°ÑÐ¾Ðº Ñ Ð´ÐµÐ»ÑÑ Ð¿Ð°ÐºÑÐ½ÐºÑÐ² Ð· ÐºÐµÑÑ ÑÑÐ¾Ð²Ð¸ÑÐ° \"%s\"" @@ -167,27 +167,28 @@ msgid "Cleaning repository '%s' cache" msgstr "ÐÑÐ¸ÑÐµÐ½Ð½Ñ ÐºÐµÑÑ ÑÑÐ¾Ð²Ð¸ÑÐ° \"%s\"" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "Ð£ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð°Ð´ÑÐµÑÐ°Ñ URL Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ¸Ð½Ð½Ð¸Ñ Ð¼ÐµÑÐ°Ð´Ð°Ð½Ð¸Ñ" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "Ð¡ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÐºÐµÑÑ ÑÑÐ¾Ð²Ð¸ÑÐ° \"%s\"" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "Ð§Ð¸ÑÐ°Ð½Ð½Ñ ÐºÐµÑÑ ÑÑÐ¾Ð²Ð¸ÑÐ° \"%s\"" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "ÐÐ¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ ÑÑÐ¾Ð²Ð¸ÑÐ° \"%s\"" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "ÐÐ¸Ð»ÑÑÐµÐ½Ð½Ñ ÑÑÐ¾Ð²Ð¸ÑÐ° \"%s\"" @@ -2702,19 +2703,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "ÐÐ¼ÑÐ½ÐµÐ½Ð¾ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÐ¹Ð½Ñ ÑÐ°Ð¹Ð»Ð¸ Ð´Ð»Ñ %s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm Ð·Ð±ÐµÑÐµÐ³Ð»Ð° %s ÑÐº %s, Ð°Ð»Ðµ Ð±ÑÐ»Ð¾ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸ÑÐ²Ð¸ÑÐ¸ ÑÑÐ·Ð½Ð¸ÑÑ" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2724,13 +2725,13 @@ "ÐÑÑ Ð¿ÐµÑÑÑ 25 ÑÑÐ´ÐºÑÐ² Ð²ÑÐ´Ð¼ÑÐ½Ð½Ð¾ÑÑÐµÐ¹:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm ÑÑÐ²Ð¾ÑÐ¸Ð»Ð° %s ÑÐº %s, Ð°Ð»Ðµ Ð±ÑÐ»Ð¾ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸ÑÐ²Ð¸ÑÐ¸ ÑÑÐ·Ð½Ð¸ÑÑ" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2741,46 +2742,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ %s Ð·Ð°Ð·Ð½Ð°Ð»Ð¾ Ð½ÐµÐ²Ð´Ð°ÑÑ" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "ÐÐ¸Ð²ÑÐ´ rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð±ÐµÐ· Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð¸Ð¹ Ð²Ð¸Ð²ÑÐ´ rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "ÐÐ¸Ð»ÑÑÐµÐ½Ð½Ñ %s Ð·Ð°Ð·Ð½Ð°Ð»Ð¾ Ð½ÐµÐ²Ð´Ð°ÑÑ" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s Ð²Ð¸Ð»ÑÑÐµÐ½Ð¾ Ð±ÐµÐ· Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "ÑÑÐ²Ð¾ÑÐµÐ½Ð¾ ÑÐµÐ·ÐµÑÐ²Ð½Ñ ÐºÐ¾Ð¿ÑÑ %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑÐµÑÐ²Ð°Ð½Ð¾ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ð½Ð¾ Ð´Ð¾ Ð²ÐºÐ°Ð·ÑÐ²ÐºÐ¸." @@ -2798,64 +2799,74 @@ msgstr "%s Ð·Ð°Ð¼ÑÐ½ÐµÐ½Ð¾ %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s Ð±ÑÐ´Ðµ Ð²Ð¸Ð»ÑÑÐµÐ½Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐµÐ¼.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s Ð±ÑÐ´Ðµ Ð²Ð¸Ð»ÑÑÐµÐ½Ð¾ ÑÐ½ÑÐ¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ñ. (ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s Ð±ÑÐ´Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐµÐ¼.\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s Ð±ÑÐ´Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ ÑÐ½ÑÐ¾Ñ Ð¿ÑÐ¾Ð³Ð°Ð¼Ð¾Ñ. (ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ÐÐµ ÑÐ¸Ð½Ð½Ð° ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ð¹ Ð´Ð»Ñ ÑÐ½ÑÐ¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ²" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ð¹ Ð´Ð»Ñ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2865,7 +2876,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s ÐºÐ¾Ð½ÑÐ»ÑÐºÑÑÑ Ð· ÑÐ½ÑÐ¸Ð¼Ð¸ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ð¼Ð¸" @@ -2874,14 +2885,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s ÐºÐ¾Ð½ÑÐ»ÑÐºÑÑÑ Ð· %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2891,24 +2902,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s ÑÐ¾Ð±Ð¸ÑÑ Ð·Ð°ÑÑÐ°ÑÑÐ»Ð¸Ð¼Ð¸ ÑÐ½ÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s ÑÐ¾Ð±Ð¸ÑÑ Ð·Ð°ÑÑÐ°ÑÑÐ»Ð¸Ð¼ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s ÑÐ¾Ð±Ð¸ÑÑ Ð·Ð°ÑÑÐ°ÑÑÐ»Ð¸Ð¼: %s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2917,7 +2928,7 @@ "Ð¦Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð±ÑÐ´Ðµ Ð²Ð¸Ð»ÑÑÐµÐ½Ð¾ Ð· ÑÐ¸ÑÑÐµÐ¼Ð¸." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s Ð·Ð°Ð»ÐµÐ¶Ð¸ÑÑ Ð²ÑÐ´ ÑÐ½ÑÐ¸Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ²" @@ -2925,38 +2936,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s Ð·Ð°Ð»ÐµÐ¶Ð¸ÑÑ Ð²ÑÐ´ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s Ð·Ð°Ð»ÐµÐ¶Ð¸ÑÑ Ð²ÑÐ´: %s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "ÐÐ°ÑÐ°Ð´Ð¾Ðº" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "ÐÑÑÐ¾ Ð½Ðµ Ð½Ð°Ð´Ð°Ñ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2964,31 +2975,31 @@ "\n" "ÐÐµÐ¼Ð° Ð½Ð°ÑÐ²Ð½Ð¾Ð³Ð¾ ÑÐµÑÑÑÑÑ, ÑÐºÐ¸Ð¹ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Ð£ Ð·Ð²'ÑÐ·ÐºÑ Ð· Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð°Ð¼Ð¸ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¼Ð¸ Ð²Ð¸ÑÐµ/Ð½Ð¸Ð¶ÑÐµ ÑÐµ ÑÐ¾Ð·Ð²'ÑÐ·Ð°Ð½Ð½Ñ Ð½Ðµ Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ½Ð¸ÑÑ Ð²ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s, Ð±Ð¾ Ð²ÑÐ½ ÐºÐ¾Ð½ÑÐ»ÑÐºÑÑÑ Ð· %s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s Ð½Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ñ Ð¿Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐº ÑÐ°ÐºÐ¸Ð¹, ÑÐ¾ Ð¹Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s ÑÐµÑÐµÐ· Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÐµÐ¹" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2996,8 +3007,8 @@ msgstr "Ð²Ð¸Ð»ÑÑÐ¸ÑÐ¸ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -3005,79 +3016,79 @@ msgstr "Ð½Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÑÐ²Ð°ÑÐ¸ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s Ð¼Ð°Ñ Ð²Ð¸Ð¼Ð¾Ð³Ð¸, ÑÐºÑ Ð½Ðµ Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s Ð¼Ð°Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ, ÑÐºÑ Ð½Ðµ Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ ÑÐµÑÐµÐ· Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ, ÑÐºÑ Ð½ÐµÐ·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ½ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s, Ð°Ð»Ðµ Ð¹Ð¾Ð³Ð¾ Ð±ÑÐ´Ðµ Ð²Ð¸Ð»ÑÑÐµÐ½Ð¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ½ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s, Ð°Ð»Ðµ Ð¹Ð¾Ð³Ð¾ Ð±ÑÐ´Ðµ Ð·Ð°Ð»Ð¸ÑÐµÐ½Ð¾ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "ÐÐµÐ¼Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÑÐ²Ð°ÑÐ¸ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s, ÑÐ¾Ð± Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ½Ð¸ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s, ÑÐ¾Ð± Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ½Ð¸ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s Ð½Ðµ Ð±ÑÐ´Ðµ Ð²Ð¸Ð»ÑÑÐµÐ½Ð¾, Ð±Ð¾ Ð¹Ð¾Ð³Ð¾ ÑÐµ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s ÑÐ¾Ð±Ð¸ÑÑ Ð·Ð°ÑÑÐ°ÑÑÐ»Ð¸Ð¼ %s. ÐÐ»Ðµ %s Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð»ÑÑÐ¸ÑÐ¸, Ð±Ð¾ Ð²ÑÐ½ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s, Ð±Ð¾ Ð²ÑÐ½ ÐºÐ¾Ð½ÑÐ»ÑÐºÑÑÑ" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s ÑÐµÑÐµÐ· ÐºÐ¾Ð½ÑÐ»ÑÐºÑ Ð· %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ½Ð¸ÑÐ¸ Ð²Ð¸Ð¼Ð¾Ð³Ñ %s." @@ -3138,7 +3149,7 @@ msgstr "ÐÐµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÑÐ²Ð°ÑÐ¸ Ñ Ð½Ðµ Ð²Ð¸Ð»ÑÑÐ°ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿Ð°ÐºÑÐ½ÐºÐ¸" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "Ð¿Ð¾ÑÑÐµÐ±ÑÑ %s Ð´Ð»Ñ %s, ÐºÐ¾Ð»Ð¸ Ð¾Ð½Ð¾Ð²Ð»ÑÑÑÑÑÑ %s" @@ -3496,14 +3507,24 @@ msgid "Install missing resolvables" msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑÐ½ÐºÐ¸" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "ÐÑÐ´Ð½Ð¾ÑÐ½Ð¾ Ð²ÑÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ² Ð· ÑÑÐ¼ÑÑÐ½Ð¾Ñ Ð°ÑÑÑÑÐµÐºÑÑÑÐ¾Ñ." +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "ÐÑÐ´Ð½Ð¾ÑÐ½Ð¾ Ð²ÑÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ² Ð· ÑÑÐ¼ÑÑÐ½Ð¾Ñ Ð°ÑÑÑÑÐµÐºÑÑÑÐ¾Ñ." + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "ÐÑÐ´Ð½Ð¾ÑÐ½Ð¾ Ð²ÑÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ² Ð· ÑÑÐ¼ÑÑÐ½Ð¾Ñ Ð°ÑÑÑÑÐµÐºÑÑÑÐ¾Ñ." + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3554,6 +3575,14 @@ msgid "%s part of %s" msgstr "%s ÑÐ°ÑÑÐ¸Ð½Ð° %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "ÑÐ¾Ð·Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑÐ½ÐºÐ¸" @@ -4965,4 +4994,3 @@ "Ð¤Ð°Ð¹Ð» %s Ð¼Ð°Ñ Ð½Ðµ ÑÐ¸Ð½Ð½Ñ ÐºÐ¾Ð½ÑÑÐ¾Ð»ÑÐ½Ñ ÑÑÐ¼Ñ.\n" "ÐÑÑÐºÑÐ²Ð°Ð»Ð°ÑÑ %s, Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ %s\n" "ÐÐ¶Ð¸Ð²Ð°ÑÐ¸ Ð¿Ð¾Ð¿ÑÐ¸ Ð²ÑÐµ?" - Modified: trunk/libzypp/po/vi.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/vi.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/vi.po (original) +++ trunk/libzypp/po/vi.po Mon Sep 10 16:18:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-07-12 07:32+0200\n" "Last-Translator: Phan VÄ©nh Thá»nh <teppi82(a)gmail.com>\n" "Language-Team: Vietnamese <i18n(a)suse.de>\n" @@ -112,36 +112,36 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -165,27 +165,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2636,19 +2637,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2656,13 +2657,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2671,46 +2672,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2728,64 +2729,74 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2793,7 +2804,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "" @@ -2802,14 +2813,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2817,31 +2828,31 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "" @@ -2849,68 +2860,68 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2918,8 +2929,8 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2927,79 +2938,79 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3060,7 +3071,7 @@ msgstr "" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3418,14 +3429,22 @@ msgid "Install missing resolvables" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3476,6 +3495,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "" Modified: trunk/libzypp/po/wa.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/wa.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/wa.po (original) +++ trunk/libzypp/po/wa.po Mon Sep 10 16:18:44 2007 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lcn memory\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2004-04-05 17:37+0200\n" "Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n" "Language-Team: Walloon <i18n(a)suse.de>\n" @@ -112,36 +112,36 @@ msgid "History:" msgstr "Ridant: " -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -166,27 +166,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "" @@ -2680,19 +2681,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, fuzzy, c-format msgid "Changed configuration files for %s:" msgstr "Racourti d' l' apontiaedje di lingaedje" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2700,13 +2701,13 @@ msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2715,47 +2716,47 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 #, fuzzy msgid "Additional rpm output:" msgstr "InformÃ¥cion e pus" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "" @@ -2773,65 +2774,75 @@ msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 #, fuzzy msgid "Invalid information" msgstr "&InformÃ¥cion" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, fuzzy, c-format msgid "%s is needed by other resolvables" msgstr "Coridjaedjes ricomandÃ©s" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2839,7 +2850,7 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, fuzzy, c-format msgid "%s conflicts with other resolvables" msgstr "Afrontmint etur les coridjaedjes" @@ -2848,14 +2859,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, fuzzy, c-format msgid "%s conflicts with %s" msgstr "afrontmint avou..." -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, fuzzy, c-format msgid "" "%s conflicts with:\n" @@ -2863,31 +2874,31 @@ msgstr "afrontmint avou..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, fuzzy, c-format msgid "%s obsoletes other resolvables" msgstr "Coridjaedjes di radjoutÃ©s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, fuzzy, c-format msgid "%s obsoletes %s" msgstr "trop vÃ®s..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, fuzzy, c-format msgid "%s obsoletes:%s" msgstr "trop vÃ®s..." -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, fuzzy, c-format msgid "%s depends on other resolvables" msgstr "Coridjaedjes ricomandÃ©s" @@ -2895,70 +2906,70 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 #, fuzzy msgid "Child of" msgstr "Tchili" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, fuzzy, c-format msgid "Cannot install %s" msgstr "N' nÃ©n astaler" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" "There is no resource available which supports this requirement." msgstr "Gn a pont d' eterface uzeu po Ã§' module." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, fuzzy, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "Ãou paket n' est nÃ©n astalÃ© et n' serÃ¨ nÃ©n astalÃ©." #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, fuzzy, c-format @@ -2966,8 +2977,8 @@ msgstr "Dis&facer" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, fuzzy, c-format @@ -2975,79 +2986,79 @@ msgstr "N' nÃ©n astaler" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, fuzzy, c-format msgid "%s has unfulfilled requirements" msgstr "a des dmandes nÃ©n rezoudowes..." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, fuzzy, c-format msgid "No need to install %s" msgstr "CopyÃ® les fitchÃ®s sol sistinme d' astalÃ©" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3109,7 +3120,7 @@ msgstr "Coridjaedjes di radjoutÃ©s" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -3479,14 +3490,22 @@ msgid "Install missing resolvables" msgstr "Afrontmint etur les coridjaedjes" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3537,6 +3556,14 @@ msgid "%s part of %s" msgstr "" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 #, fuzzy msgid "unlock all resolvables" Modified: trunk/libzypp/po/xh.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/xh.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/xh.po (original) +++ trunk/libzypp/po/xh.po Mon Sep 10 16:18:44 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -108,37 +108,37 @@ msgid "History:" msgstr "" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "kusilele ukukhangela ukusetyenziswa kwe-deltarpm. " -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "kusilele ukusetyenziswa kwe-deltarpm." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Umbekelo%s usilele ukukhangela imfezekiso. Ingaba usafuna ukuzama kwakhona ukuyikhuphela?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "Ifayili %1 ayifunyenwanga elugcinweni." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "Ayikwazi kubonelela%s ukusuka ku%s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -163,27 +163,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Ibuyisela oovimba" @@ -2634,19 +2635,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Iifayili zobumbeko ezitshintshileyo zika%s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "i-rpm igcine %s njenge %s kodwa kwakungenzeki ukumisela umahluko" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2656,13 +2657,13 @@ "Nantsi imigca eyi-25 yokuqala yomahluko:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "i-rpm idalwe %s njenge %s kodwa kwakungenzeki ukumisela umahluko" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2673,46 +2674,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s ukuhlohla kusilele" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "isivelisi se-rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s ukuhlohla kulungile" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Isivelisi se-rpm Esongezelelweyo:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s ukushenxisa kusilele" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s ukushenxisa kulungile" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "idale ugcino olukhuselekileyo %s " -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Ukuhlohla kuye kwalahlwa njengoko bekuyalelwe." @@ -2730,7 +2731,7 @@ msgstr "%s ibuyiselwe ngo %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2738,58 +2739,68 @@ "Ezi ziconjululwa ziza kucinywa kwisixokelelwano." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s ayizukuhlohlwa kuba isafuneka" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Ulwazi olungasebenzi" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s iyafunwa zezinye iziconjululwa" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s ifunwa ngu %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2799,7 +2810,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s iimpixano nezinye iziconjululwa" @@ -2808,14 +2819,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s iimpixano ne %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2825,24 +2836,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s yenza ezinye iziconjululwa ziphelelwe lixesha" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s ziphelelwe lixehsa %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s ziphelelwe lixehsa:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2851,7 +2862,7 @@ "Ezi ziconjululwa ziza kucinywa kwisixokelelwano." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s ixhomekeke kwezinye iziconjululwa" @@ -2859,38 +2870,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s ixhomekeke kwi %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s ixhomekeke kwi:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Umntwana ka" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Ayikwazi kuhlohla%s " #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Akukho nanye ebonelela ngo%s " -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2899,32 +2910,32 @@ "\n" "Akukho vimba ufumanekayo oxhasa le mfuneko." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Ngenxa yeengxaki ezichazwe ngentla/ngezantsi kwesi sigqibo akuyikusombulula zonke izixhomekeki." -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Ayikwazi kuhlohla u%s kuba kuyaphixana ne%s " #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ayihlohlwanga kwaye iphawulwe njengengahlohleki" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Ayikwazi kuhlohla%s ngenxa yeengxaki zoxhomekeko" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2932,8 +2943,8 @@ msgstr "Cima %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2941,79 +2952,79 @@ msgstr "ungahlohli %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s inemfuneko ezingazalisekiswanga" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s inezixhomekeki ezilahlekileyo" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s ayikwazi kuhlohla ngenxa yezixhomekeki ezilahlekikeyo" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s zalisekisa izixhomekeki zika%s kodwa aziyi kuhlohlwa" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s zaliseka izixhomekeki zika%s kodwa ziza kugcinwa kwisixokelelwano sakho" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Akukho mfuno yokuhlohla%s " #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Ayikwazi kuhlohla%s ukuzalisekisa izixhomekeki zika%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Ayikwazi kuhlohla%s ukuzalisekisa izixhomekeki zika%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s ayizukuhlohlwa kuba isafuneka" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s ziphelelwe lixehsa%s . Kodwa%s ayikwazi kucima kuba itshixiwe." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Ayikwazi kuhlohla u%s kuba kuyaphixana " #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s ayihlohleki ngenxa yeempixano ne %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3076,7 +3087,7 @@ msgstr "Ungahlohli okanye cima izicombululi ezinxulumeneyo" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "ukufuna%s ka%s xa ihlaziya%s" @@ -3434,14 +3445,22 @@ msgid "Install missing resolvables" msgstr "Hlohla izicombululi ezilahlekileyo" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3492,6 +3511,14 @@ msgid "%s part of %s" msgstr "%s inxenye ka %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +msgid "Double timeout" +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "vula zonke izicombululi" Modified: trunk/libzypp/po/zh_CN.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_CN.po?rev=7166&r1=… ============================================================================== --- trunk/libzypp/po/zh_CN.po (original) +++ trunk/libzypp/po/zh_CN.po Mon Sep 10 16:18:44 2007 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2007-08-26 00:50+0800\n" "Last-Translator: Thruth Wang <gubotruth(a)gmail.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -35,8 +35,7 @@ msgid "Path parameter parsing not supported for this URL" msgstr "ä¸æ¯æå¯¹æ¤ URL çè·¯å¾åæ°è¿è¡è¯æ³åæ" -#: ../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 "ä¸æ¯æå¯¹æ¤ URL çæ¥è¯¢åç¬¦ä¸²è¿è¡è¯æ³åæ" @@ -83,8 +82,7 @@ msgid "Url scheme requires path name" msgstr "URL çº²è¦è¦æ±æè·¯å¾å" -#: ../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 "å¦æåå¨è®¤è¯ï¼åä¸åè®¸ç¸å¯¹è·¯å¾" @@ -113,37 +111,37 @@ msgid "History:" msgstr "åå²ï¼" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "Applydeltarpm æ£æ¥å·²å¤±è´¥ã" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "Applydeltarpm å·²å¤±è´¥ã" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "%s åæªè½éè¿å®æ´æ§æ£æ¥ãæ¯å¦è¦éè¯ä¸è½½å®ï¼" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "æªå¨åå¨åºä¸æ¾å°æä»¶ %1ã" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "æ æ³è·å¾ %s ç± %s æä¾" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "æ£å¨è¯»å '%s' å®è£æºç¼å" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "æ£å¨ä» '%s' å®è£æºç¼åè¯»åè¡¥ä¸åå¢éå" @@ -153,13 +151,11 @@ msgid "Unsupported HTTP authentication method '%s'" msgstr "ä¸æ¯æ HTTP è®¤è¯æ¹æ³ '%s'" -#: ../zypp/media/MediaCurl.cc:715 -#: ../zypp/media/MediaCurl.cc:784 +#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784 msgid "Invalid user name or password." msgstr "æ æç¨æ·åæå¯ç ã" -#: ../zypp/media/MediaCurl.cc:718 -#: ../zypp/media/MediaCurl.cc:787 +#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787 #, c-format msgid "Authentication required for '%s'" msgstr "'%s' éè¦èº«ä»½éªè¯" @@ -169,27 +165,28 @@ msgid "Cleaning repository '%s' cache" msgstr "æ£å¨æ¸é¤ '%s' å®è£æºç¼å" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "æ£å¨æå»º '%s' å®è£æºç¼å" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "æ£å¨è¯»å '%s' å®è£æºç¼å" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "æ£å¨æ·»å å®è£æº '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "æ£å¨ç§»é¤å®è£æº '%s'" @@ -211,8 +208,7 @@ msgid "Invalid empty Url object reference" msgstr "æ æçç©º URL å¯¹è±¡åç§" -#: ../zypp/Url.cc:321 -#: ../zypp/Url.cc:335 +#: ../zypp/Url.cc:321 ../zypp/Url.cc:335 msgid "Unable to parse Url components" msgstr "æ æ³å¯¹ URL ç»ä»¶è¿è¡è¯æ³åæ" @@ -222,8 +218,7 @@ #. 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 "æ ä»£ç " @@ -288,8 +283,7 @@ msgstr "é¿å¡å¾·è¯" #. language code: alb sqi sq -#: ../zypp/LanguageCode.cc:262 -#: ../zypp/LanguageCode.cc:264 +#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 msgid "Albanian" msgstr "é¿å°å·´å°¼äºè¯" @@ -339,8 +333,7 @@ msgstr "é¿æè´¡è¯" #. language code: arm hye hy -#: ../zypp/LanguageCode.cc:284 -#: ../zypp/LanguageCode.cc:286 +#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286 msgid "Armenian" msgstr "äºç¾å°¼äºè¯" @@ -440,8 +433,7 @@ msgstr "å·´åè¯" #. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 -#: ../zypp/LanguageCode.cc:328 +#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 msgid "Basque" msgstr "å·´æ¯åè¯" @@ -551,8 +543,7 @@ msgstr "ä¿å å©äºè¯" #. language code: bur mya my -#: ../zypp/LanguageCode.cc:372 -#: ../zypp/LanguageCode.cc:374 +#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 msgid "Burmese" msgstr "ç¼ç¸è¯" @@ -617,8 +608,7 @@ msgstr "æ¥å è¯" #. language code: chi zho zh -#: ../zypp/LanguageCode.cc:400 -#: ../zypp/LanguageCode.cc:402 +#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "ä¸æ" @@ -728,8 +718,7 @@ msgstr "åºæ½ç¹è¯¸è¯è¨ï¼å¶å®ï¼" #. language code: cze ces cs -#: ../zypp/LanguageCode.cc:446 -#: ../zypp/LanguageCode.cc:448 +#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "æ·åè¯" @@ -804,8 +793,7 @@ msgstr "ä¸å¤è·å°è¯ï¼çº¦ 1050-1350ï¼" #. language code: dut nld nl -#: ../zypp/LanguageCode.cc:478 -#: ../zypp/LanguageCode.cc:480 +#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "è·å°è¯" @@ -910,8 +898,7 @@ msgstr "ä¸°è¯" #. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 -#: ../zypp/LanguageCode.cc:524 +#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 msgid "French" msgstr "æ³è¯" @@ -961,14 +948,12 @@ msgstr "æ¥å°æ¼è¯¸è¯è¨ï¼å¶å®ï¼" #. language code: geo kat ka -#: ../zypp/LanguageCode.cc:544 -#: ../zypp/LanguageCode.cc:546 +#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546 msgid "Georgian" msgstr "ä¹æ²»äºè¯" #. language code: ger deu de -#: ../zypp/LanguageCode.cc:548 -#: ../zypp/LanguageCode.cc:550 +#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550 msgid "German" msgstr "å¾·è¯" @@ -1038,8 +1023,7 @@ msgstr "å¤å¸èè¯ï¼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 "ç°ä»£å¸èè¯ (1453-)" @@ -1144,8 +1128,7 @@ msgstr "ä¼åè¯" #. language code: ice isl is -#: ../zypp/LanguageCode.cc:622 -#: ../zypp/LanguageCode.cc:624 +#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 msgid "Icelandic" msgstr "å°å²è¯" @@ -1515,8 +1498,7 @@ msgstr "å¢è¨è¯" #. language code: mac mkd mk -#: ../zypp/LanguageCode.cc:772 -#: ../zypp/LanguageCode.cc:774 +#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "é©¬å¶é¡¿è¯" @@ -1556,8 +1538,7 @@ msgstr "æ¼ä¸å¥è¯" #. language code: mao mri mi -#: ../zypp/LanguageCode.cc:790 -#: ../zypp/LanguageCode.cc:792 +#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "æ¯å©è¯" @@ -1577,8 +1558,7 @@ msgstr "é©¬è¨ä¼è¯" #. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 -#: ../zypp/LanguageCode.cc:802 +#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 msgid "Malay" msgstr "é©¬æ¥è¯" @@ -1719,8 +1699,7 @@ #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 -#: ../zypp/CountryCode.cc:380 +#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380 msgid "Nauru" msgstr "çé²è¯" @@ -1920,8 +1899,7 @@ msgstr "å¤æ³¢æ¯è¯ï¼çº¦å¬åå 600-400ï¼" #. language code: per fas fa -#: ../zypp/LanguageCode.cc:938 -#: ../zypp/LanguageCode.cc:940 +#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 msgid "Persian" msgstr "æ³¢æ¯è¯" @@ -2006,8 +1984,7 @@ msgstr "åæ®èµè¯" #. language code: rum ron ro -#: ../zypp/LanguageCode.cc:974 -#: ../zypp/LanguageCode.cc:976 +#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "ç½é©¬å°¼äºè¯" @@ -2067,8 +2044,7 @@ msgstr "æ¡å¡å©è¯" #. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 -#: ../zypp/LanguageCode.cc:1002 +#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 msgid "Serbian" msgstr "å¡å°ç»´äºè¯" @@ -2083,8 +2059,7 @@ msgstr "èæ ¼å°è¯" #. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 -#: ../zypp/LanguageCode.cc:1010 +#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 msgid "Croatian" msgstr "åç½å°äºè¯" @@ -2139,8 +2114,7 @@ msgstr "æ¯æå¤«è¯¸è¯è¨ï¼å¶å®ï¼" #. language code: slo slk sk -#: ../zypp/LanguageCode.cc:1032 -#: ../zypp/LanguageCode.cc:1034 +#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034 msgid "Slovak" msgstr "æ¯æ´ä¼åè¯" @@ -2335,8 +2309,7 @@ msgstr "æ³°å½è¯" #. language code: tib bod bo -#: ../zypp/LanguageCode.cc:1112 -#: ../zypp/LanguageCode.cc:1114 +#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 msgid "Tibetan" msgstr "è¥¿èè¯" @@ -2357,8 +2330,7 @@ #. language code: tkl #. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 -#: ../zypp/CountryCode.cc:428 +#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428 msgid "Tokelau" msgstr "æåå³è¯" @@ -2434,8 +2406,7 @@ #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 -#: ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435 msgid "Tuvalu" msgstr "å¾ç¦å¢è¯" @@ -2535,8 +2506,7 @@ msgstr "ç¦èè¯" #. language code: wel cym cy -#: ../zypp/LanguageCode.cc:1192 -#: ../zypp/LanguageCode.cc:1194 +#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194 msgid "Welsh" msgstr "å¨å°å£«è¯" @@ -2620,8 +2590,7 @@ msgid "Zuni" msgstr "ç¥å°¼è¯" -#: ../zypp/ZYppFactory.cc:279 -#: ../zypp/ZYppFactory.cc:334 +#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334 msgid "Software management is already running." msgstr "è½¯ä»¶ç®¡çå·²å¤äºè¿è¡ç¶æã" @@ -2661,27 +2630,26 @@ msgid "Not a CDROM drive" msgstr "ä¸æ¯ CDROM é©±å¨å¨" -#: ../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 "Hal ä¾å¤" #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s çå·²æ´æ¹éç½®æä»¶ï¼" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm å·²å° %s å¦åä¸º %sï¼ä½æ¯æ æ³ç¡®å®ä¹é´çå·®å¼ã" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2691,13 +2659,13 @@ "ä»¥ä¸æ¯å 25 è¡å·®å¼ï¼\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm å·²å° %s åå»ºä¸º %sï¼ä½æ¯æ æ³ç¡®å®ä¹é´çå·®å¼ã" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2708,48 +2676,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s å®è£å¤±è´¥" -#: ../zypp/target/rpm/RpmDb.cc:1927 -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm è¾åºï¼" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s å®è£æå" -#: ../zypp/target/rpm/RpmDb.cc:1936 -#: ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "å¶ä» rpm è¾åºï¼" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s å»é¤å¤±è´¥" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s å»é¤æå" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "å·²åå»ºå¤ä»½ %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "å®è£å·²ç»æç§æç¤ºè¢«ä¸æ¢ã" @@ -2767,67 +2733,77 @@ msgstr "%s æ¿æ¢ä¸º %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s å°è¢«ç¨æ·å é¤ã\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s å°è¢«å¦ä¸ä¸ªç¨åºå é¤ã(ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s å°è¢«ç¨æ·å®è£ã\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s å°è¢«å¦ä¸ä¸ªç¨åºå®è£ã(ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "ä»ä½¿ç¨æä½³æ¶æè§£æé¡¹æªå¾å°æææ¹æ¡ã" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 #, fuzzy msgid "No valid solution found with just resolvables of best architecture." msgstr "ä»ä½¿ç¨æä½³æ¶æè§£æé¡¹æªå¾å°æææ¹æ¡ã" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 #, fuzzy msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "æ¤è¯ä¾ä¸ä»ä½¿ç¨æä½³æ¶æçå¯è§£æé¡¹ã\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 #, fuzzy msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "ä½¿ç¨ææå¯è½çå¯è§£æé¡¹ï¼è´¹æ¶ä½ææã" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "æ æä¿¡æ¯" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s å¯¹äºå¶å®å¯è§£æé¡¹æ¯å¿éç" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s å¯¹äºä»¥ä¸å¯¹è±¡æ¯å¿éçï¼ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2837,7 +2813,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s ä¸å¶å®å¯è§£æé¡¹å²çª" @@ -2846,14 +2822,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s å²çª %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2863,24 +2839,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s å°åºå¼å¶å®å¯è§£æé¡¹" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s åºå¼ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s åºå¼ï¼%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2889,7 +2865,7 @@ "å°ä»ç³»ç»å é¤è¿äºå¯è§£æé¡¹ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s åå³äºå¶å®å¯è§£æé¡¹" @@ -2897,38 +2873,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s ä¾èµäº %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s ä¾èµäºï¼%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "åé" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "æ æ³å®è£ %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "åä¸æä¾ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2937,32 +2913,32 @@ "\n" "æ²¡ææ¯ææ¤éæ±çèµæºå¯ç¨ã" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "ç±äºä¸ï¼ä¸æè¿°çé®é¢ï¼æ¤è§£æå°ä¸è§£æææä¾èµæ§ã" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "æ æ³å®è£ %sï¼å ä¸ºå®ä¸ %s å²çª" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s æªå®è£ï¼ä¸å·²è¢«æ è®°ä¸ºä¸å¯å®è£" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "ç±äºä¾èµæ§é®é¢ï¼æä»¥æ æ³å®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2970,8 +2946,8 @@ msgstr "å é¤ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2979,79 +2955,79 @@ msgstr "ä¸å®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s å·ææªæ»¡è¶³çéæ±" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s ç¼ºå°ä¾èµæ§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "ç±äºç¼ºå°ä¾èµæ§ï¼æä»¥æ æ³å®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s å°å®ç° %s çä¾èµæ§ï¼ä½æ¯å°ä¼è¢«å¸è£" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s å°å®ç° %s çä¾èµæ§ï¼ä½æ¯å°ä¼è¢«ä¿çå¨ç³»ç»ä¸" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "æ éå®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "æ æ³å®è£ %s ä»¥å®ç° %s çä¾èµæ§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "æ æ³å®è£ %s ä»¥å®ç° %s çä¾èµæ§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s å°ä¸å¸è£ï¼åå æ¯å®ä»è¢«éè¦" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s åºå¼ %sãä½ %s æ æ³å é¤ï¼å ä¸ºå®æ¯éå®çã" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "æ æ³å®è£ %sï¼å ä¸ºå²çª" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s ç±äºä¸ä»¥ä¸å¯¹è±¡å²çªæä»¥ä¸å¯å¸è£ï¼ %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3114,7 +3090,7 @@ msgstr "ä¸å®è£æå é¤ç¸å³çå¯è§£æé¡¹" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "å ä¸ºéè¦ %sï¼å¯¹äº %sï¼ï¼ å¨åçº§ %s æ¶" @@ -3472,15 +3448,25 @@ msgid "Install missing resolvables" msgstr "å®è£ç¼ºå°çå¯è§£æé¡¹" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "ä¸ºææå¯è½çæè§£å³è¯ä¾ã" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 #, fuzzy msgid "Regarding all resolvables with a compatible architecture." msgstr "ä½¿ç¨ææå¼å®¹æ¶æçå¯è§£æé¡¹" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "ä¸ºææå¯è½çæè§£å³è¯ä¾ã" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "ä½¿ç¨ææå¼å®¹æ¶æçå¯è§£æé¡¹" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3531,6 +3517,16 @@ msgid "%s part of %s" msgstr "%s ä¸é¨å %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "åå»è¶æ¶ " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "ä¸ºææå¯è½çæè§£å³è¯ä¾ã" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "è§£éææå¯è§£æé¡¹" @@ -3760,8 +3756,7 @@ #. :CCK:166: #. :CAF:140: -#: ../zypp/CountryCode.cc:255 -#: ../zypp/CountryCode.cc:257 +#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257 msgid "Congo" msgstr "åæ" @@ -4827,42 +4822,60 @@ #~ msgid "%s is freshened by %s" #~ msgstr "%s è¢«ä»¥ä¸å¯¹è±¡å·æ°ï¼ %s" + #~ msgid "Unable to parse Url authority" #~ msgstr "æ æ³å¯¹ URL ææè¿è¡è¯æ³åæ" + #~ msgid "Ignore this requirement generally" #~ msgstr "éå¸¸å¿½ç¥æ¤éæ±" + #~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked." #~ msgstr "%s æ¯å¶ä»å°å®è£çå¯è§£æé¡¹æéè¦çï¼å æ¤ä¸ä¼å°å¶åæ¶é¾æ¥ã" + #~ msgid "Cannot create a file needed to perform update installation." #~ msgstr "æ æ³åå»ºæ§è¡æ´æ°å®è£æéè¦çæä»¶ã" + #~ msgid "Unable to restore all sources." #~ msgstr "æ æ³æ¢å¤æææº" + #~ msgid "At least one source already registered, stored sources cannot be restored." #~ msgstr "è³å°å·²æ³¨åäºä¸ä¸ªæºï¼ä¿åçæºæ æ³æ¢å¤ã" + #~ msgid "Cannot be install %s to fulfil the dependencies of %s" #~ msgstr "æ æ³å®è£ %s ä»¥å®ç° %s çä¾èµæ§" + #~ msgid "%s dependend on %s" #~ msgstr "%s ä¾èµäº %s" + #~ msgid "Reading index files" #~ msgstr "æ£å¨è¯»åç´¢å¼æä»¶" + #~ msgid "The signed repomd.xml file failed the signature check." #~ msgstr "å·²ç¾åç repomd.xml æä»¶æªè½éè¿ç¾åæ£æ¥ã" + #~ msgid "Reading product from %s" #~ msgstr "æ£å¨ä» %s è¯»åäº§å" + #~ msgid "Reading filelist from %s" #~ msgstr "æ£å¨ä» %s è¯»åæä»¶åè¡¨" + #~ msgid "Reading packages from %s" #~ msgstr "æ£å¨ä» %s è¯»åå" + #~ msgid "Reading selection from %s" #~ msgstr "æ£å¨ä» %s è¯»åéæ©" + #~ msgid "Reading pattern from %s" #~ msgstr "æ£å¨ä» %s è¯»åæ¨¡å¼" + #~ msgid "Reading patches index %s" #~ msgstr "æ£å¨è¯»åå¢è¡¥ç¨åºç´¢å¼ %s" + #~ msgid "Reading patch %s" #~ msgstr "æ£å¨è¯»åå¢è¡¥ç¨åº %s" + #~ msgid "The script file failed the checksum test." #~ msgstr "èæ¬æä»¶æªè½éè¿æ ¡éªåæµè¯ã" + #~ msgid "Reading packages file" #~ msgstr "æ£å¨è¯»ååæä»¶" - Modified: trunk/libzypp/po/zh_TW.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_TW.po?rev=7166&r1=… ============================================================================== --- trunk/libzypp/po/zh_TW.po (original) +++ trunk/libzypp/po/zh_TW.po Mon Sep 10 16:18:44 2007 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-05-31 13:41\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -111,36 +111,36 @@ msgid "History:" msgstr "æ·å²è¨éï¼" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "applydeltarpm æª¢æ¥å¤±æã" -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "applydeltarpm å¤±æã" #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "å¥ä»¶ %s å®æ´æ§æª¢æ¥å¤±æã æ¨è¦éè©¦ä¸è¼åï¼" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 msgid "No url in repository." msgstr "å¥ä»¶åº«ä¸æ²æ urlã" #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, c-format msgid "Can't provide file %s from repository %s" msgstr "æªæ¡ %s ç¡æ³ç±å¥ä»¶åº« %s æä¾" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "æ£å¨è®å '%s' å¥ä»¶åº«å¿«å" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "æ£å¨ç± '%s' å¥ä»¶åº«å¿«åè®åè·¯å¾å delta rpm" @@ -164,27 +164,28 @@ msgid "Cleaning repository '%s' cache" msgstr "æ£å¨æ¸é¤å¥ä»¶åº« '%s' çå¿«å" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "å¨æå®ç URL ä¸æ¾ä¸å°ææçä¸ç¹¼è³è¨" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "æ£å¨å»ºç«å¥ä»¶åº« '%s' çå¿«å" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "æ£å¨è®åå¥ä»¶åº« '%s' çå¿«å" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "æ£å¨æ°å¢å¥ä»¶åº« '%s'" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, c-format msgid "Removing repository '%s'" msgstr "æ£å¨ç§»é¤å¥ä»¶åº« '%s'" @@ -2635,19 +2636,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "%s çå·²è®æ´çµææªï¼" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "rpm å·²å° %s å²åçº %sï¼ä½çä¸åºå·®ç°" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2657,13 +2658,13 @@ "éæ¯å 25 è¡å·®ç°ï¼\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "rpm å·²å° %s å»ºç«çº %sï¼ä½çä¸åºå·®ç°" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2674,46 +2675,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "%s å®è£å¤±æ" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "rpm è¼¸åºï¼" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s å®è£æå" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "å¶ä» rpm è¼¸åºï¼" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "%s ç§»é¤å¤±æ" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "%s ç§»é¤æå" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "å·²å»ºç«åä»½ %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "å®è£å·²å¦æç¤ºä¸æ¢ã" @@ -2731,64 +2732,74 @@ msgstr "%s å·²è¢« %s åä»£" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, c-format msgid "%s will be deleted by the user.\n" msgstr "%s å°è¢«ä½¿ç¨èåªé¤ã\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s å°è¢«å¶ä»æç¨ç¨å¼åªé¤ã(ApplLow/ApplHigh)\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, c-format msgid "%s will be installed by the user.\n" msgstr "%s å°è¢«ä½¿ç¨èå®è£ã\n" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s å°è¢«å¶ä»æç¨ç¨å¼å®è£ã(ApplLow/ApplHigh)\n" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, fuzzy, c-format +msgid "No valid solution found within %d seconds" +msgstr "å¨æ¤å¯ä¸æä½³æ¶æ§ä¸æ²æå¯ç¨çè§£æ±ºæ¹æ¡ã" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "å¨æ¤å¯ä¸æä½³æ¶æ§ä¸æ²æå¯ç¨çè§£æ±ºæ¹æ¡ã" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "å¨éç¨®å·è¡ææ³ä¸ï¼åªç½æ¶æ¤å¯ä¸æä½³æ¶æ§çè§£æ±ºæ¹æ¡ã\n" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "ç½æ¶æææ¶æ§çè§£æ±ºæ¹æ¡æè±è¼é·æéï¼ä½å¯è½æå¾å°å¯ç¨ççµæã" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ç¡æçè³è¨" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s æ¯å¶ä»å¯è§£æ±ºæ¹æ¡çå¿è¦é ç®" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s æ¯ %s çå¿è¦é ç®" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2798,7 +2809,7 @@ "%s çå¿è¦é ç®ï¼" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s èå¶ä»è§£æ±ºæ¹æ¡ç¼çè¡çª" @@ -2807,14 +2818,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s è %s è¡çª" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2824,24 +2835,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s ææ±°æå¶ä»è§£æ±ºæ¹æ¡" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s æ±°æ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s æ±°æï¼%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2850,7 +2861,7 @@ "éäºå¯è§£æ±ºæ¹æ¡å°å¾ç³»çµ±ä¸åªé¤ã" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s ä¾è³´æ¼å¶ä»è§£æ±ºæ¹æ¡" @@ -2858,38 +2869,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s ä¾è³´æ¼ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s ä¾è³´æ¼ï¼%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "åä»¶å±¬æ¼" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "ç¡æ³å®è£ %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "æ²æä»»ä½æä¾ %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2897,31 +2908,31 @@ "\n" "æ²ææ¯æ´æ¤éæ±çå¯ç¨è³æºã" -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "å çºå¦ä¸/ä¸ææè¿°çåé¡ï¼å°è´æ¤è§£æ±ºæ¹æ¡ç¡æ³è§£æ±ºææç¸ä¾æ§ã" -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "ç¡æ³å®è£ %sï¼å çºå®è %s è¡çª" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "æªå®è£ %s ä¸å·²å°å¶æ¨ç¤ºçºä¸å¯å®è£" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "å çºç¸ä¾æ§åé¡ï¼å°è´ç¡æ³å®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2929,8 +2940,8 @@ msgstr "åªé¤ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2938,79 +2949,79 @@ msgstr "è«å¿å®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s æç¡æ³æ»¿è¶³çéæ±" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s ç¼ºå°ç¸ä¾æ§" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "å çºç¼ºå°ç¸ä¾æ§ï¼å°è´ç¡æ³å®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s æ»¿è¶³å° %s çç¸ä¾ï¼ä½æ¯å°è¢«è§£é¤å®è£" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s æ»¿è¶³å° %s çç¸ä¾æ§ï¼ä½æä¿çå¨æ¨çç³»çµ±ä¸" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "ä¸éè¦å®è£ %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "ç¡æ³å®è£ %s ä»¥æ»¿è¶³å°æ¼ %s çç¸ä¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "ç¡æ³å®è£ %s ä»¥æ»¿è¶³å°æ¼ %s çç¸ä¾" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "ä¸æè§£é¤å®è£ %sï¼å çºä»éä½¿ç¨å®" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s æ±°æ %sï¼ä½ç¡æ³åªé¤ %sï¼å çºå·²ç¶è¢«éå®ã" -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, c-format msgid "Cannot install %s, because it is conflicting" msgstr "ç¡æ³å®è£ %sï¼å çºæè¡çª" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s ç¡æ³å®è£ï¼å çºè %s è¡çª" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "éæ± %s ç¡æ³è¢«æ»¿è¶³ã" @@ -3037,11 +3048,13 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89 +#, c-format msgid "Install %s although it would change the vendor" msgstr "å®è£ %sï¼å³ä½¿å®æè®æ´å» å" #. TranslatorExplanation %s = name of package, patch, selection ... #: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92 +#, c-format msgid "%s provides this dependency, but would change the vendor of the installed item" msgstr "%s å¯æä¾éé ç¸ä¾æ§ï¼ä½æ¯å®æè®æ´å·²å®è£é ç®çå» å" @@ -3069,7 +3082,7 @@ msgstr "è«å¿å®è£æåªé¤ç¸éè§£æ±ºæ¹æ¡" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "å¿é å·å %s ç %sï¼æè½åç´ %s" @@ -3322,6 +3335,7 @@ #. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID #: ../zypp/solver/detail/ResolverInfoMisc.cc:469 +#, c-format msgid "%s provides %s, but has another vendor (%s)." msgstr "%s å¯æä¾ %sï¼ä½å®æ¯ä¸åå» å (%s) æä¾çã" @@ -3426,14 +3440,24 @@ msgid "Install missing resolvables" msgstr "å®è£ç¼ºå°çè§£æ±ºæ¹æ¡" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "å»ºç«ä¸åéå°ä»»ä½å¯è½çè§£æ±ºæ¹æ¡" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "éæ¼å°ç¸å®¹æ¶æ§çææè§£æ±ºæ¹æ¡ã" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +#, fuzzy +msgid "Make a solver run with best architecture only." +msgstr "å»ºç«ä¸åéå°ä»»ä½å¯è½çè§£æ±ºæ¹æ¡" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +#, fuzzy +msgid "Regarding resolvables with best architecture only." +msgstr "éæ¼å°ç¸å®¹æ¶æ§çææè§£æ±ºæ¹æ¡ã" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3484,6 +3508,16 @@ msgid "%s part of %s" msgstr "%sï¼å¨é¨ %s)" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "é£æå©ä¸é¾æ " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +#, fuzzy +msgid "Start the next solver run with doubled timeout." +msgstr "å»ºç«ä¸åéå°ä»»ä½å¯è½çè§£æ±ºæ¹æ¡" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "è§£é¤éå®ææè§£æ±ºæ¹æ¡" Modified: trunk/libzypp/po/zu.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zu.po?rev=7166&r1=716… ============================================================================== --- trunk/libzypp/po/zu.po (original) +++ trunk/libzypp/po/zu.po Mon Sep 10 16:18:44 2007 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-23 10:21+0200\n" +"POT-Creation-Date: 2007-09-03 13:53+0200\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -109,37 +109,37 @@ msgid "History:" msgstr "Linganisa Umlando" -#: ../zypp/repo/PackageProvider.cc:222 +#: ../zypp/repo/PackageProvider.cc:237 msgid "applydeltarpm check failed." msgstr "ukuhlola i-applydeltarpm kuhlulekile." -#: ../zypp/repo/PackageProvider.cc:236 +#: ../zypp/repo/PackageProvider.cc:251 msgid "applydeltarpm failed." msgstr "i-applydeltarpm ihlulekile." #. TranslatorExplanation %s = package being checked for integrity -#: ../zypp/repo/PackageProvider.cc:303 +#: ../zypp/repo/PackageProvider.cc:318 #, fuzzy, c-format msgid "Package %s fails integrity check. Do you want to retry?" msgstr "Iphakheji %s ihlulekile lapho ihlolwa ukuthembeka. Ufuna ukuphinde uzame ukuyilanda futhi?" -#: ../zypp/repo/RepoProvideFile.cc:205 +#: ../zypp/repo/RepoProvideFile.cc:206 #, fuzzy msgid "No url in repository." msgstr "Ifayela %1 ayitholakali enqolobaneni yamafayela." #. iteration over urls -#: ../zypp/repo/RepoProvideFile.cc:267 +#: ../zypp/repo/RepoProvideFile.cc:278 #, fuzzy, c-format msgid "Can't provide file %s from repository %s" msgstr "Ayikwazi ukuhlinzeka nge-%s kwi-%s" -#: ../zypp/repo/cached/RepoImpl.cc:78 +#: ../zypp/repo/cached/RepoImpl.cc:73 #, c-format msgid "Reading '%s' repository cache" msgstr "" -#: ../zypp/repo/cached/RepoImpl.cc:199 +#: ../zypp/repo/cached/RepoImpl.cc:194 #, c-format msgid "Reading patch and delta rpms from '%s' repository cache" msgstr "" @@ -164,27 +164,28 @@ msgid "Cleaning repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:614 +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:521 msgid "Valid metadata not found at specified URL(s)" msgstr "" -#: ../zypp/RepoManager.cc:664 +#: ../zypp/RepoManager.cc:677 #, c-format msgid "Building repository '%s' cache" msgstr "" #. progress.sendTo( progressrcv ); -#: ../zypp/RepoManager.cc:809 +#: ../zypp/RepoManager.cc:822 #, c-format msgid "Reading repository '%s' cache" msgstr "" -#: ../zypp/RepoManager.cc:899 +#: ../zypp/RepoManager.cc:912 #, c-format msgid "Adding repository '%s'" msgstr "" -#: ../zypp/RepoManager.cc:1004 +#: ../zypp/RepoManager.cc:1017 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Ukubuyisela imithombo yokwaziswa" @@ -2635,19 +2636,19 @@ #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1749 +#: ../zypp/target/rpm/RpmDb.cc:1779 #, c-format msgid "Changed configuration files for %s:" msgstr "Amafayela okuhlela ashintshile e-%s:" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1913 +#: ../zypp/target/rpm/RpmDb.cc:1943 #, fuzzy, c-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" msgstr "I-rpm igcine %s njenge-%s kodwa bekungenakwenzeka ukubona umehluko" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1915 +#: ../zypp/target/rpm/RpmDb.cc:1945 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -2657,13 +2658,13 @@ "Nansi imigqa yokuqala engu-25 yomehluko:\n" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1918 +#: ../zypp/target/rpm/RpmDb.cc:1948 #, fuzzy, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" msgstr "I-rpm yakhe %s njenge-%s kodwa bekungenakwenzeka ukubona umehluko" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1920 +#: ../zypp/target/rpm/RpmDb.cc:1950 #, c-format msgid "" "rpm created %s as %s.\n" @@ -2674,46 +2675,46 @@ #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1926 +#: ../zypp/target/rpm/RpmDb.cc:1956 #, c-format msgid "%s install failed" msgstr "ukufakwa kwe-%s akuphumelelanga" -#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 msgid "rpm output:" msgstr "okukhishiwe kwe-rpm:" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1933 +#: ../zypp/target/rpm/RpmDb.cc:1963 #, c-format msgid "%s installed ok" msgstr "%s efakiwe ilungile" -#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053 +#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 msgid "Additional rpm output:" msgstr "Okunye okukhishiwe kwe-rpm:" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2044 +#: ../zypp/target/rpm/RpmDb.cc:2074 #, c-format msgid "%s remove failed" msgstr "Ukususa i-%s akuphumelelanga" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2080 #, c-format msgid "%s remove ok" msgstr "ukususa i-%s kuphumelele" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2195 +#: ../zypp/target/rpm/RpmDb.cc:2225 #, c-format msgid "created backup %s" msgstr "yakhe i-backup %s" -#: ../zypp/target/TargetImpl.cc:730 +#: ../zypp/target/TargetImpl.cc:731 msgid "Installation has been aborted as directed." msgstr "Ukufaka kuyekiwe njengoba kunikezwe isiqondiso." @@ -2731,7 +2732,7 @@ msgstr "%s ingenelwe esikhundleni yi- %s" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:262 +#: ../zypp/solver/detail/Resolver_problems.cc:263 #, fuzzy, c-format msgid "%s will be deleted by the user.\n" msgstr "" @@ -2739,58 +2740,68 @@ "Lezi zixazululi zizosulwa kwisistimu." #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:267 +#: ../zypp/solver/detail/Resolver_problems.cc:268 #, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:273 +#: ../zypp/solver/detail/Resolver_problems.cc:274 #, fuzzy, c-format msgid "%s will be installed by the user.\n" msgstr "%s ayinakukhishwa ngoba isadingeka namanje" #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:278 +#: ../zypp/solver/detail/Resolver_problems.cc:279 #, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "" +#. This can be generated by a timout only +#: ../zypp/solver/detail/Resolver_problems.cc:356 +#, c-format +msgid "No valid solution found within %d seconds" +msgstr "" + +#: ../zypp/solver/detail/Resolver_problems.cc:357 +msgid "The solver has reached a defined timout" +msgstr "" + #. a second run with ALL possibilities has not been tried #. possible other solutions skipped #. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:337 +#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:338 +#: ../zypp/solver/detail/Resolver_problems.cc:384 msgid "With this run only resolvables with the best architecture have been regarded.\n" msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:339 +#: ../zypp/solver/detail/Resolver_problems.cc:385 msgid "Regarding all possible resolvables takes time, but can come to a valid result." msgstr "" -#: ../zypp/solver/detail/Resolver_problems.cc:365 +#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "ukwaziswa okungasebenzi" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:372 +#: ../zypp/solver/detail/Resolver_problems.cc:418 #, c-format msgid "%s is needed by other resolvables" msgstr "%s idingwa ezinye izixazululi" #. TranslatorExplanation %s = name of package, patch, selection ... #. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:375 +#: ../zypp/solver/detail/Resolver_problems.cc:421 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 #: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 #, c-format msgid "%s is needed by %s" msgstr "%s idingwa yi- %s" -#: ../zypp/solver/detail/Resolver_problems.cc:376 +#: ../zypp/solver/detail/Resolver_problems.cc:422 #, c-format msgid "" "%s is needed by:\n" @@ -2800,7 +2811,7 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:383 +#: ../zypp/solver/detail/Resolver_problems.cc:429 #, c-format msgid "%s conflicts with other resolvables" msgstr "%s ixabana nezinye izixazululi" @@ -2809,14 +2820,14 @@ #. Translator: all.%s = name of package, patch,... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:386 +#: ../zypp/solver/detail/Resolver_problems.cc:432 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 #, c-format msgid "%s conflicts with %s" msgstr "%s ixabana ne- %s" -#: ../zypp/solver/detail/Resolver_problems.cc:388 +#: ../zypp/solver/detail/Resolver_problems.cc:434 #, c-format msgid "" "%s conflicts with:\n" @@ -2826,24 +2837,24 @@ "%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:417 +#: ../zypp/solver/detail/Resolver_problems.cc:463 #, c-format msgid "%s obsoletes other resolvables" msgstr "%s yenza ezinye izixazululi zingasebenzi" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:420 +#: ../zypp/solver/detail/Resolver_problems.cc:466 #, c-format msgid "%s obsoletes %s" msgstr "%s yenza zingasebenzi %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:422 +#: ../zypp/solver/detail/Resolver_problems.cc:468 #, c-format msgid "%s obsoletes:%s" msgstr "%s yenza zingasebenzi:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:423 +#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2852,7 +2863,7 @@ "Lezi zixazululi zizosulwa kwisistimu." #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:431 +#: ../zypp/solver/detail/Resolver_problems.cc:477 #, c-format msgid "%s depends on other resolvables" msgstr "%s yenzike kwezinye izixazululi" @@ -2860,38 +2871,38 @@ #. TranslatorExplanation %s = name of package, patch, selection ... #. TranslatorExplanation: 1.%s name of package, 2.%s list of names #. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:435 +#: ../zypp/solver/detail/Resolver_problems.cc:481 #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 #, c-format msgid "%s depends on %s" msgstr "%s yencike kwi- %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:438 +#: ../zypp/solver/detail/Resolver_problems.cc:484 #, c-format msgid "%s depends on:%s" msgstr "%s yencike kwi-:%s" #. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:444 +#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Ingane ka-" #. TranslatorExplanation %s = dependency #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:450 -#: ../zypp/solver/detail/Resolver_problems.cc:534 +#: ../zypp/solver/detail/Resolver_problems.cc:496 +#: ../zypp/solver/detail/Resolver_problems.cc:580 #, c-format msgid "Cannot install %s" msgstr "Ayikwazi ukufaka %s" #. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:452 +#: ../zypp/solver/detail/Resolver_problems.cc:498 #, c-format msgid "None provides %s" msgstr "Akukho okunikeza %s" -#: ../zypp/solver/detail/Resolver_problems.cc:453 +#: ../zypp/solver/detail/Resolver_problems.cc:499 #, fuzzy msgid "" "\n" @@ -2900,32 +2911,32 @@ "\n" "Awukho umthombo otholakalayo osekela lemfuneko." -#: ../zypp/solver/detail/Resolver_problems.cc:461 +#: ../zypp/solver/detail/Resolver_problems.cc:507 #, fuzzy msgid "Due to the problems described above/below, this resolution will not solve all dependencies" msgstr "Izinkinga ezidlulelwe yisikhathi ezichazwe ngenhla/ngezansi kwalokhu ngeke zixazulule zonke izinhlelo okuncikwe kuzo." -#: ../zypp/solver/detail/Resolver_problems.cc:472 -#: ../zypp/solver/detail/Resolver_problems.cc:854 +#: ../zypp/solver/detail/Resolver_problems.cc:518 +#: ../zypp/solver/detail/Resolver_problems.cc:900 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Ayikwazi ukufaka %s ngoba ixabana ne-%s" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:490 +#: ../zypp/solver/detail/Resolver_problems.cc:536 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ayifakwanga futhi iye yaphawulwa njengengafakeki" #. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:502 +#: ../zypp/solver/detail/Resolver_problems.cc:548 #, c-format msgid "Cannot install %s due to dependency problems" msgstr "Ayikwazi ukufaka %s ngenxa yezinkinga zohlelo oluncike kwezinye" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:544 -#: ../zypp/solver/detail/Resolver_problems.cc:554 +#: ../zypp/solver/detail/Resolver_problems.cc:590 +#: ../zypp/solver/detail/Resolver_problems.cc:600 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 #, c-format @@ -2933,8 +2944,8 @@ msgstr "Susa %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:547 -#: ../zypp/solver/detail/Resolver_problems.cc:557 +#: ../zypp/solver/detail/Resolver_problems.cc:593 +#: ../zypp/solver/detail/Resolver_problems.cc:603 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 #: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 #, c-format @@ -2942,79 +2953,79 @@ msgstr "ungafaki %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:570 +#: ../zypp/solver/detail/Resolver_problems.cc:616 #, c-format msgid "%s has unfulfilled requirements" msgstr "%s inezimfuneko ezingagcwalisiwe" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:609 +#: ../zypp/solver/detail/Resolver_problems.cc:655 #, c-format msgid "%s has missing dependencies" msgstr "%s inezinhlelo encike kuzo ezilahlekile" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:657 +#: ../zypp/solver/detail/Resolver_problems.cc:703 #, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "%s ayikwazi ukufkwa ngenxa yezinhlelo encike kuzo ezilahlekile" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:714 +#: ../zypp/solver/detail/Resolver_problems.cc:760 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "%s igcwalisa izinhlelo okuncikwe kuzo ze-%s kodwa izokhishwa" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:724 +#: ../zypp/solver/detail/Resolver_problems.cc:770 #, fuzzy, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "%s igcwalisa izinhlelo okuncikwe kuzo ze-%s kodwa izogcinwa kwisistimu yakho" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:734 +#: ../zypp/solver/detail/Resolver_problems.cc:780 #, c-format msgid "No need to install %s" msgstr "Asikho isidingo sokuyifaka %s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:742 +#: ../zypp/solver/detail/Resolver_problems.cc:788 #, fuzzy, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Ayikwazi ukufaka %s ukuze igcwalise izinhlelo okuncikwe kuzo ze-%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:757 +#: ../zypp/solver/detail/Resolver_problems.cc:803 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Ayikwazi ukufaka %s ukuze igcwalise izinhlelo okuncikwe kuzo ze-%s" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:795 -#: ../zypp/solver/detail/Resolver_problems.cc:803 +#: ../zypp/solver/detail/Resolver_problems.cc:841 +#: ../zypp/solver/detail/Resolver_problems.cc:849 #, fuzzy, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s ayinakukhishwa ngoba isadingeka namanje" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:826 +#: ../zypp/solver/detail/Resolver_problems.cc:872 #, fuzzy, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "%s yenza ingasebenzi i-%s. Kodwa %s ayikwazi ukususwa ngoba ihluthulelwe." -#: ../zypp/solver/detail/Resolver_problems.cc:858 +#: ../zypp/solver/detail/Resolver_problems.cc:904 #, fuzzy, c-format msgid "Cannot install %s, because it is conflicting" msgstr "Ayikwazi ukufaka %s ngoba iyaxabana" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:880 +#: ../zypp/solver/detail/Resolver_problems.cc:926 #, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s ayifakeki ngenxa yokuxabana ne- %s" #. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:894 +#: ../zypp/solver/detail/Resolver_problems.cc:940 #, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "" @@ -3077,7 +3088,7 @@ msgstr "Ungafaki noma ususe maqondana nezixazululi" #. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:763 +#: ../zypp/solver/detail/QueueItemRequire.cc:791 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "ngokudinga i-%s ye-%s lapho kuvuselelwa uhlelo %s" @@ -3435,14 +3446,22 @@ msgid "Install missing resolvables" msgstr "Faka izixazululi ezilahlekile" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "" -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51 +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "" +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 +msgid "Make a solver run with best architecture only." +msgstr "" + +#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 +msgid "Regarding resolvables with best architecture only." +msgstr "" + #. Translator: all.%s = name of package,patch,.... #: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -3493,6 +3512,15 @@ msgid "%s part of %s" msgstr "%s ingxenye ye- %s" +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 +#, fuzzy +msgid "Double timeout" +msgstr "Ukuchofoza Kabili Kuphelelwe Isikhathi " + +#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 +msgid "Start the next solver run with doubled timeout." +msgstr "" + #: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 msgid "unlock all resolvables" msgstr "Vula izihluthulelo zezixazululi" -- 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] r7165 - in /trunk/libzypp: package/libzypp.changes zypp/DiskUsageCounter.cc
by lslezak＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: lslezak Date: Mon Sep 10 15:53:08 2007 New Revision: 7165 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7165&view=rev Log: - fixed disk usage counting of updated packages (#308362) Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/DiskUsageCounter.cc 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 Mon Sep 10 15:53:08 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 10 15:50:49 CEST 2007 - lslezak(a)suse.cz + +- fixed disk usage counting of updated packages (#308362) + +------------------------------------------------------------------- Mon Sep 10 14:17:29 CEST 2007 - schubi(a)suse.de - Splitting packages: Take the package with the best Modified: trunk/libzypp/zypp/DiskUsageCounter.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.cc… ============================================================================== --- trunk/libzypp/zypp/DiskUsageCounter.cc (original) +++ trunk/libzypp/zypp/DiskUsageCounter.cc Mon Sep 10 15:53:08 2007 @@ -95,7 +95,7 @@ { if (inst) { - if (nameit->status().isInstalled()) + if (nameit->status().isInstalled() && !nameit->status().isToBeUninstalled()) { found_installed = true; XXX << name << '-' << (*it)->edition() << ": found already installed package (" << (*nameit)->edition() << ")" << std::endl; @@ -114,7 +114,7 @@ } else { - if (inst && nameit->status().isInstalled()) + if (inst && nameit->status().isInstalled() && !nameit->status().isToBeUninstalled()) { // just freshen the package, don't change du statistics found_installed = true; -- 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] r7164 - in /trunk/zypper/src: zypper-callbacks.cc zypper-callbacks.h zypper.cc
by jkupec＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: jkupec Date: Mon Sep 10 15:29:34 2007 New Revision: 7164 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7164&view=rev Log: - report too many arguments (#307639) Modified: trunk/zypper/src/zypper-callbacks.cc trunk/zypper/src/zypper-callbacks.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-callbacks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.cc?r… ============================================================================== --- trunk/zypper/src/zypper-callbacks.cc (original) +++ trunk/zypper/src/zypper-callbacks.cc Mon Sep 10 15:29:34 2007 @@ -197,6 +197,8 @@ cerr << endl; } +// ---------------------------------------------------------------------------- + void report_problem(const zypp::Exception & e, const string & problem_desc, const string & hint) @@ -212,6 +214,16 @@ cerr << hint << endl; } +// ---------------------------------------------------------------------------- + +void report_too_many_arguments(const string & specific_help) +{ + //! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information." + cerr << _("Too many arguments") << '.' << endl; + cout_n << _("Usage") << ':' << endl; + cout_n << specific_help; +} + // Local Variables: // c-basic-offset: 2 // End: Modified: trunk/zypper/src/zypper-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.h?re… ============================================================================== --- trunk/zypper/src/zypper-callbacks.h (original) +++ trunk/zypper/src/zypper-callbacks.h Mon Sep 10 15:29:34 2007 @@ -97,4 +97,9 @@ const string & problem_desc, const string & hint = ""); +/** + * + */ +void report_too_many_arguments(const string & specific_help); + #endif Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7164&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon Sep 10 15:29:34 2007 @@ -796,6 +796,13 @@ return ZYPPER_EXIT_ERR_PRIVILEGES; } + // too many arguments + if (arguments.size() > 2) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; + } + // indeterminate indicates the user has not specified the values tribool enabled(indeterminate); tribool refresh(indeterminate); @@ -878,10 +885,19 @@ { cerr << _("Required argument missing.") << endl; ERR << "Required argument missing." << endl; + cout_n << _("Usage") << ':' << endl; cout_n << specific_help; return ZYPPER_EXIT_ERR_INVALID_ARGS; } + // too many arguments + //! \todo allow to specify multiple repos to delete + else if (arguments.size() > 1) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; + } + warn_if_zmd (); bool found = remove_repo(arguments[0]); @@ -952,6 +968,12 @@ cout_n << specific_help; return ZYPPER_EXIT_ERR_INVALID_ARGS; } + // too many arguments + else if (arguments.size() > 2) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; + } // cond_init_target (); warn_if_zmd (); @@ -992,6 +1014,12 @@ cout_n << specific_help; return ZYPPER_EXIT_ERR_INVALID_ARGS; } + // too many arguments + if (arguments.size() > 1) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; + } modify_repo(arguments[0]); } @@ -1145,9 +1173,10 @@ { ZyppSearchOptions options; - if (ghelp) { + if (ghelp) + { cout << specific_help; - return !ghelp; + return ZYPPER_EXIT_OK; } if (gSettings.disable_system_resolvables || copts.count("uninstalled-only")) @@ -1220,9 +1249,17 @@ // TODO: rug summary else if (command == ZypperCommand::PATCH_CHECK) { - if (ghelp) { + if (ghelp) + { cout << specific_help; - return !ghelp; + return ZYPPER_EXIT_OK; + } + + // too many arguments + if (arguments.size() > 0) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; } cond_init_target (); @@ -1251,9 +1288,17 @@ // --------------------------( patches )------------------------------------ else if (command == ZypperCommand::SHOW_PATCHES) { - if (ghelp) { + if (ghelp) + { cout << specific_help; - return !ghelp; + return ZYPPER_EXIT_OK; + } + + // too many arguments + if (arguments.size() > 0) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; } cond_init_target (); @@ -1269,10 +1314,17 @@ // --------------------------( list updates )------------------------------- else if (command == ZypperCommand::LIST_UPDATES) { - if (ghelp) { - // FIXME catalog... + if (ghelp) + { cout << specific_help; - return !ghelp; + return ZYPPER_EXIT_OK; + } + + // too many arguments + if (arguments.size() > 0) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; } string skind = copts.count("type")? copts["type"].front() : @@ -1307,8 +1359,11 @@ // -----------------( xml list updates and patches )------------------------ else if (command == ZypperCommand::XML_LIST_UPDATES_PATCHES) { - - if (ghelp) { cout << specific_help << endl; return !ghelp; } + if (ghelp) + { + cout << specific_help; + return ZYPPER_EXIT_OK; + } cond_init_target (); int initret = init_repos(); @@ -1330,7 +1385,11 @@ // -----------------------------( update )---------------------------------- else if (command == ZypperCommand::UPDATE) { - if (ghelp) { cout << specific_help; return !ghelp; } + if (ghelp) + { + cout << specific_help; + return ZYPPER_EXIT_OK; + } // check root user if (geteuid() != 0) @@ -1339,6 +1398,13 @@ return ZYPPER_EXIT_ERR_PRIVILEGES; } + // too many arguments + if (arguments.size() > 0) + { + report_too_many_arguments(specific_help); + return ZYPPER_EXIT_ERR_INVALID_ARGS; + } + // rug compatibility code // switch on non-interactive mode if no-confirm specified if (copts.count("no-confirm")) @@ -1396,9 +1462,19 @@ else if (command == ZypperCommand::INFO || command == ZypperCommand::RUG_PATCH_INFO) { - if (ghelp || arguments.size() == 0) { - cerr << specific_help; - return !ghelp; + if (ghelp) + { + cout << specific_help; + return ZYPPER_EXIT_OK; + } + + if (arguments.size() < 1) + { + cerr << _("Required argument missing.") << endl; + ERR << "Required argument missing." << endl; + cout_n << _("Usage") << ':' << endl; + cout_n << specific_help; + return ZYPPER_EXIT_ERR_INVALID_ARGS; } cond_init_target (); -- 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] r7163 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: tgoettlicher Date: Mon Sep 10 15:14:15 2007 New Revision: 7163 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7163&view=rev Log: changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.changes (original) +++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Sep 10 15:14:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 10 15:10:37 CEST 2007 - tgoettlicher(a)suse.de + +- fixed declining license does not abort (#308985) +- r7162 + +------------------------------------------------------------------- Fri Sep 7 14:58:25 CEST 2007 - tgoettlicher(a)suse.de - updated translations -- 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] r7162 - /trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
by tgoettlicher＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: tgoettlicher Date: Mon Sep 10 15:13:15 2007 New Revision: 7162 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7162&view=rev Log: fixed declining license does not abort (#308985) Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd… ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Sep 10 15:13:15 2007 @@ -443,6 +443,10 @@ item = (QCheckListItem*)item->nextSibling(); } + if ( installPatchList.isEmpty() && installPackageList.isEmpty() ) + return; + + resetXmlStream(); _error=false; -- 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] r7161 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: schubi2 Date: Mon Sep 10 14:18:23 2007 New Revision: 7161 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7161&view=rev Log: r 7160 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 Mon Sep 10 14:18:23 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Sep 10 14:17:29 CEST 2007 - schubi(a)suse.de + +- Splitting packages: Take the package with the best + architecture,edition ONLY; Bug 308591 +- r 7160 + +------------------------------------------------------------------- Mon Sep 10 10:55:45 CEST 2007 - lslezak(a)suse.cz - properly report fallback disk usage size (in kB instead of bytes) -- 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] r7160 - /trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
by schubi2＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: schubi2 Date: Mon Sep 10 14:16:36 2007 New Revision: 7160 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7160&view=rev Log: - Splitting packages: Take the package with the best architecture,edition ONLY; Bug 308591 Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Mon Sep 10 14:16:36 2007 @@ -612,17 +612,61 @@ if ( !toadd.size() ) { INT << "Empty SplitPkgMap entry for " << installed << endl; } else { + FindMap candidate; for ( PoolItemOrderSet::iterator ait = toadd.begin(); ait != toadd.end(); ++ait ) { - PoolItem_Ref split_candidate = *ait; - MIL << " ==> ADD (splitted): " << split_candidate << endl; - if ( probably_dropped - && split_candidate.status().staysUninstalled() - && doesObsoleteItem (split_candidate, installed)) - { - probably_dropped = false; - } + PoolItem_Ref split_candidate = *ait; + if ( probably_dropped + && split_candidate.status().staysUninstalled() + && doesObsoleteItem (split_candidate, installed)) + { + probably_dropped = false; + } + + FindMap::iterator itcandidate = candidate.find( split_candidate->name() ); + + if (itcandidate != candidate.end()) { // split canidate with the same name found + if (split_candidate.status().isToBeInstalled() + || itcandidate->second.status().isToBeInstalled()) { + + if (split_candidate.status().isToBeInstalled() + && itcandidate->second.status().isToBeInstalled()) { + ERR << "only one should be set for installation: " << itcandidate->second << "; " << split_candidate << endl; + } else { + if (split_candidate.status().isToBeInstalled()) { + itcandidate->second = split_candidate; // take thatone which is already set for installation + } + } + } else { + // not the same --> find better provider + if (itcandidate->second->arch() != installed->arch() + && split_candidate->arch() == installed->arch() ) { + // prefer candidate which the same architecture as the installed item + itcandidate->second = split_candidate; + } else { + int cmp = itcandidate->second->arch().compare( split_candidate->arch() ); + if (cmp < 0) { // new provider has better arch + itcandidate->second = split_candidate; + } + else if (cmp == 0) { // new provider has equal arch + if (itcandidate->second->edition().compare( split_candidate->edition() ) < 0) { + itcandidate->second = split_candidate; // new provider has better edition + } + } + } + } + } + else { + candidate[split_candidate->name()] = split_candidate; + } + } + + PoolItemOrderSet addcandidate; + for (FindMap::iterator itcandidate = candidate.begin() ; itcandidate != candidate.end(); itcandidate++) { + addcandidate.insert(itcandidate->second); + MIL << " ==> ADD (splitted): " << itcandidate->second << endl; } - addSplitted[installed] = toadd; + + addSplitted[installed] = addcandidate; } // count stats later } -- 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] r7159 - /trunk/zypper/po/createPot
by jkupec＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: jkupec Date: Mon Sep 10 13:51:57 2007 New Revision: 7159 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7159&view=rev Log: - --keyword=_PL:1,2 added (plural forms were not extracted without it :O( Modified: trunk/zypper/po/createPot Modified: trunk/zypper/po/createPot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/createPot?rev=7159&r1=… ============================================================================== --- trunk/zypper/po/createPot (original) +++ trunk/zypper/po/createPot Mon Sep 10 13:51:57 2007 @@ -4,4 +4,4 @@ SRCFILES=$(cat POTFILES.in | grep -v -P '#.+') #calling xgettext with the sourcefiles -xgettext --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=zypper --output=zypper.pot $SRCFILES +xgettext --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --keyword=_PL:1,2 --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=zypper --output=zypper.pot $SRCFILES -- 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] r7158 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: jkupec Date: Mon Sep 10 11:28:03 2007 New Revision: 7158 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7158&view=rev Log: - zypper repos description updated (#309041) 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=7158&r1=… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Mon Sep 10 11:28:03 2007 @@ -264,7 +264,10 @@ .B repos (lr) List all defined repositories. .IP -Following data are printed for each repository found: Enabled (whether the repository is enabled), Refresh (whether autorefresh is enabled for the repository), Type (YaST, YUM, Plaindir), Name, and URI. +The following data are printed for each repository found: # (repository number), Enabled (whether the repository is enabled), Refresh (whether autorefresh is enabled for the repository), Type (rpm-md, yast2, plaindir), Alias (shorthand for Name), and Name. If -v global option is used, an additional URI column will be displayed containing the base URI of the repository. + +Repository number is a unique identifier of the repository in current repository set. If you add, remove or change a repository, the numbers may change. Beware of that when using the numbers with the repository handling commands (although not possible right now, the feature will be reimplmented soon). On the other hand, using the alias instead of the number is always safe. + .TP .I \-e, \-\-export <FILE|-> This option causes zypper to write repository definition of all defined -- 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] r7157 - in /trunk/libzypp-bindings: examples/perl/list_target_resolvables.pl examples/perl/test.pl swig/CapSet.i swig/ResPool.i swig/ResStore.i swig/perl5/perl.i swig/zypp.i
by haass＠svn.opensuse.org 10 Sep '07

10 Sep '07

Author: haass Date: Mon Sep 10 11:07:21 2007 New Revision: 7157 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7157&view=rev Log: Changes for perl-bindings and examples Modified: trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl trunk/libzypp-bindings/examples/perl/test.pl trunk/libzypp-bindings/swig/CapSet.i trunk/libzypp-bindings/swig/ResPool.i trunk/libzypp-bindings/swig/ResStore.i trunk/libzypp-bindings/swig/perl5/perl.i trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/perl/l… ============================================================================== --- trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl (original) +++ trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl Mon Sep 10 11:07:21 2007 @@ -8,9 +8,9 @@ $repo = $zypp->target; $store = $repo->resolvables; -$it_b = $store->begin; +$it_b = $store->cBegin; -while ($store->iterator_equal($it_b, $store->end) ne 1){ +while ($store->iterator_equal($it_b, $store->cEnd) ne 1){ $pkg = $store->iterator_value($it_b); print $pkg->kindToS, " ", $pkg->name, " ", $pkg->edition->asString; print $pkg->arch->asString, "\n"; @@ -19,4 +19,16 @@ print " Vendor: ", $pkg->vendor, "\n"; print " BuildTime: ", $pkg->buildtime->asString, "\n"; $it_b = $store->iterator_incr($it_b); + + $deps = $pkg->dep($zyppc::Dep_PROVIDES); + + $it_b2 = $deps->cBegin; + + while($deps->iterator_equal($it_b2, $deps->cEnd) ne 1){ + $dep = $deps->iterator_value($it_b2); + print "Provides: ", $dep->asString, "\n"; + $it_b2 = $deps->iterator_incr($it_b2); + } + print "\n"; + } Modified: trunk/libzypp-bindings/examples/perl/test.pl URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/perl/t… ============================================================================== --- trunk/libzypp-bindings/examples/perl/test.pl (original) +++ trunk/libzypp-bindings/examples/perl/test.pl Mon Sep 10 11:07:21 2007 @@ -9,18 +9,20 @@ chomp($ipkg); print "Importing packages from pdb!\n\n"; print "This may take a while, please be patient!\n"; -$pdb->readOut; +if($pdb->readOut ne 1){ + exit; +} $store = $pdb->getStore; $zypp->addResolvables($store); $pool = $zypp->pool; -$it_b = $pool->begin; -$it_e = $pool->end; +$it_b = $pool->cBegin; +$it_e = $pool->cEnd; $checker = 0; print "Looking for package...!\n"; -while ($pool->iterator_equal($it_b, $pool->end) ne 1){ +while ($pool->iterator_equal($it_b, $pool->cEnd) ne 1){ $pkg = $pool->iterator_value($it_b); $test = $pkg->resolvable; $it_b = $pool->iterator_incr($it_b); @@ -40,7 +42,7 @@ $resolver = zypp::Resolver->new($pool); -$it_b = $pool->begin; +$it_b = $pool->cBegin; if($resolver->resolvePool ne 1){ print "Unable to solve the pool!!!\n"; print "Problem Description: "; @@ -51,7 +53,7 @@ }else{ print "These packages has to be installed: \n"; # while ($it_b ne $pool->end){ - while ($pool->iterator_equal($it_b, $pool->end) ne 1){ + while ($pool->iterator_equal($it_b, $pool->cEnd) ne 1){ $pkg = $pool->iterator_value($it_b); $it_b = $pool->iterator_incr($it_b); $test = $pkg->resolvable; Modified: trunk/libzypp-bindings/swig/CapSet.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/CapSet.i?r… ============================================================================== --- trunk/libzypp-bindings/swig/CapSet.i (original) +++ trunk/libzypp-bindings/swig/CapSet.i Mon Sep 10 11:07:21 2007 @@ -31,3 +31,7 @@ } } #endif + +#ifdef SWIGPERL5 +iter2(CapSet, Capability); +#endif Modified: trunk/libzypp-bindings/swig/ResPool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResPool.i?… ============================================================================== --- trunk/libzypp-bindings/swig/ResPool.i (original) +++ trunk/libzypp-bindings/swig/ResPool.i Mon Sep 10 11:07:21 2007 @@ -152,23 +152,7 @@ #ifdef SWIGPERL5 -%extend ResPool { - - pool::PoolTraits::const_iterator iterator_incr(pool::PoolTraits::const_iterator *it ) { - (*it)++; - return *it; - } - pool::PoolTraits::const_iterator iterator_decr(pool::PoolTraits::const_iterator it) { - (it)--; - return it; - } - bool iterator_equal(pool::PoolTraits::const_iterator it1, pool::PoolTraits::const_iterator it2) { - return (it1 == it2); - } - PoolItem_Ref iterator_value(pool::PoolTraits::const_iterator it) { - return (*it); - } -}; +iter2(ResPool, PoolItem_Ref); #endif Modified: trunk/libzypp-bindings/swig/ResStore.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResStore.i… ============================================================================== --- trunk/libzypp-bindings/swig/ResStore.i (original) +++ trunk/libzypp-bindings/swig/ResStore.i Mon Sep 10 11:07:21 2007 @@ -37,24 +37,6 @@ #ifdef SWIGPERL5 -%extend ResStore { - - ResStore::iterator begin() { - return self->begin(); - } - ResStore::iterator end() { - return self->end(); - } - ResStore::iterator iterator_incr(ResStore::iterator *it) { - (*it)++; - return *it; - } - const ResObject* iterator_value(ResStore::iterator it) { - return (&**it); - } - bool iterator_equal(ResStore::iterator it1, ResStore::iterator it2) { - return (it1 == it2); - } -}; +iter(ResStore, ResObject*); #endif Modified: trunk/libzypp-bindings/swig/perl5/perl.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/perl… ============================================================================== --- trunk/libzypp-bindings/swig/perl5/perl.i (original) +++ trunk/libzypp-bindings/swig/perl5/perl.i Mon Sep 10 11:07:21 2007 @@ -0,0 +1,49 @@ +%define iter(cls, storetype) +%extend cls { + cls::const_iterator iterator_incr(cls::const_iterator *it){ + (*it)++; + return *it; + } + cls::const_iterator iterator_decr(cls::const_iterator *it){ + (*it)--; + return *it; + } + bool iterator_equal(cls::const_iterator it1, cls::const_iterator it2) { + return (it1 == it2); + } + storetype iterator_value(cls::const_iterator it) { + return (&**it); + } + cls::const_iterator cBegin() { + return self->begin(); + } + cls::const_iterator cEnd() { + return self->end(); + } +}; +%enddef + +%define iter2(cls, storetype) +%extend cls { + cls::const_iterator iterator_incr(cls::const_iterator *it){ + (*it)++; + return *it; + } + cls::const_iterator iterator_decr(cls::const_iterator *it){ + (*it)--; + return *it; + } + bool iterator_equal(cls::const_iterator it1, cls::const_iterator it2) { + return (it1 == it2); + } + storetype iterator_value(cls::const_iterator it) { + return (*it); + } + cls::const_iterator cBegin() { + return self->begin(); + } + cls::const_iterator cEnd() { + return self->end(); + } +}; +%enddef Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev… ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Mon Sep 10 11:07:21 2007 @@ -77,6 +77,7 @@ #ifdef SWIGPERL5 %include "std_list.i" +%include "perl5/perl.i" #endif %include "Pathname.i" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
33
Older →

Jump to page: