[zypp-commit] r7166 - /trunk/libzypp/po/

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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Bulgarian \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=7165&r2=7166&view=diff ============================================================================== --- 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\n" "Language-Team: AgreeYa Solutions \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Bosnian \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=7165&r2=7166&view=diff ============================================================================== --- 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 "<b>Temps d'espera de doble clic </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Welsh \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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=7165&r2=7166&view=diff ============================================================================== --- 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 \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: English \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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 "<b>Tiempo límite para hacer doble clic </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Estonian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" -"Language-Team: Suomi \n" +"Language-Team: Suomi \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: French Team \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 "<b>Timeout du double-clic </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Galician \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=7165&r2=7166&view=diff ============================================================================== --- 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\n" "Language-Team: AgreeYa Solutions\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 "<b> ડબલ-ક્લિક ટાઇમઆઉટ </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Hebrew \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Hindi \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Croatian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Indonesian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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 "<b>ダブルクリックタイムアウト </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Georgian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Khmer \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Korean \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=7165&r2=7166&view=diff ============================================================================== --- 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@suse.de\n" "Language-Team: Lao \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Lietuvių \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=7165&r2=7166&view=diff ============================================================================== --- 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: Зоран Димовски \n" "Language-Team: Macedonian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: AgreeYa Solutions \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=7165&r2=7166&view=diff ============================================================================== --- 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 \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 "<b>Tidsavbrudd for dobbeltklikking </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Dutch \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 "<b>Time-out voor dubbelklikken </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Panjabi \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Portuguese \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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 "<b>Tempo de Espera de Clique Duplo </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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: \n" "Language-Team: Romanian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: \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=7165&r2=7166&view=diff ============================================================================== --- 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@suse.de\n" "Language-Team: Sinhala \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Slovak \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=7165&r2=7166&view=diff ============================================================================== --- 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 \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Serbian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: \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 "<b>Tidsgräns för dubbelklick </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: AgreeYa Solutions \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: turkish \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Ukrainian \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Vietnamese \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Walloon \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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 "<b>双击超时 </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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 "<b>連按兩下逾時 </b>" + +#: ../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=7165&r2=7166&view=diff ============================================================================== --- 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 \n" "Language-Team: Novell Language \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 "<b>Ukuchofoza Kabili Kuphelelwe Isikhathi </b>" + +#: ../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@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org