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